From 23e0d533d48d94e2a9253e500893f8c8dd0b49a2 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 27 Sep 2023 22:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E5=BC=B9=E7=AA=97=20=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 +- api/community.js | 6 +- api/store.js | 10 +- api/uniMP.js | 9 + components/orderGoods/index.vue | 2 +- config/app.js | 5 +- manifest.json | 16 +- pages.json | 7 +- pages/admin/orderDetail/index.vue | 7 +- pages/admin/orderList/index.vue | 1 + pages/admin/order_cancellation/index.vue | 11 +- pages/chat/customer_list/index.vue | 30 +- pages/gather/gather.vue | 152 +- pages/goods_details/index.vue | 9 +- pages/index/index.vue | 9 +- pages/margin/margin.vue | 437 +- pages/moreProject/moreProject.vue | 67 +- pages/nongKe/cloud_entrepot/index.vue | 18 +- pages/nongKe/cloud_entrepot/indexa.vue | 61 +- pages/nongKe/food/index.vue | 26 +- pages/nongKe/specialty/index.vue | 26 +- pages/nongKe/supply_chain/supplier.vue | 46 +- pages/nongKe/tourism/index.vue | 26 +- pages/order_details/index.vue | 2 +- pages/order_details/stay.vue | 2 +- pages/plantGrass/plant_detail/index.vue | 3 +- pages/product/addGoods/addGoodDetils.vue | 2 +- pages/product/addGoods/commodity.vue | 677 +++ pages/product/addGoods/index.vue | 121 +- pages/product/addGoods/price.vue | 202 + pages/product/addGoods/scss/index.scss | 10 +- pages/product/addGoods/secound.vue | 210 +- .../product/addGoods/singleSpecification.vue | 2 +- pages/product/basicSet.vue | 10 +- pages/product/components/inputGoodsDetils.vue | 6 +- pages/product/goodsOnSale/index.vue | 2 +- pages/product/list/index.vue | 65 +- pages/store/home/index.vue | 4259 +++++++++-------- pages/store/settled/index.vue | 638 ++- pages/supply_chains/supply_chains.vue | 59 +- pages/users/login/login_copy.vue | 26 +- pages/users/order_confirm/index.vue | 10 +- pages/users/order_list/index.vue | 4 +- pages/users/order_list/indexCopy.vue | 4 +- pages/users/order_list/order.vue | 4 +- pages/users/order_list/relase.vue | 4 +- pages/users/payment/payment.vue | 34 +- utils/uniMP.js | 159 +- 48 files changed, 4490 insertions(+), 3011 deletions(-) create mode 100644 pages/product/addGoods/commodity.vue create mode 100644 pages/product/addGoods/price.vue diff --git a/App.vue b/App.vue index d56d2d7..5129746 100644 --- a/App.vue +++ b/App.vue @@ -161,7 +161,7 @@ jpushModule.initJPushService() jpushModule.addConnectEventListener(result => { let connectEnable = result.connectEnable - // console.log("jpush连接", connectEnable) + console.log("jpush连接", connectEnable) }) @@ -222,7 +222,8 @@ }, onShow() { - + + let that = this // 记录H5和公众号 if (this.$store.state.app.token) { diff --git a/api/community.js b/api/community.js index fe9ec77..23d5d09 100644 --- a/api/community.js +++ b/api/community.js @@ -7,7 +7,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- -import request from "@/utils/request.js"; +import request from "@/utils/requesta.js"; /** 获取话题分类*/ export function getTopicList() { @@ -83,7 +83,9 @@ export function videoList(data) { } /**自己的视频列表*/ export function deoList(id) { - return request.get(`community/show/${id}`); + return request.get(`community/show/${id}`, { + noAuth: true + }); } export function myVideoList(id,data) { diff --git a/api/store.js b/api/store.js index 3659801..ed9b774 100644 --- a/api/store.js +++ b/api/store.js @@ -1,4 +1,5 @@ import request from "@/utils/request.js"; +import requestb from "@/utils/requestb.js"; /** * 扫码查询商品 @@ -578,8 +579,7 @@ export function vicinityStoreApi(data) { 商家入驻 -- 获取商户入驻申请协议内容 */ export function agreeiness(data) { - return request.get(`business/agree`, data, { noAuth: true }); -} - - - + return request.get(`business/agree`, data, { + noAuth: true + }); +} \ No newline at end of file diff --git a/api/uniMP.js b/api/uniMP.js index 06f8b85..3562f10 100644 --- a/api/uniMP.js +++ b/api/uniMP.js @@ -16,3 +16,12 @@ export function getGXconfig(data) { return request.get("global/config", data); } + +/** + * 获取商城小程序信息 + */ + +export function miniapp(data) { + return request.get("miniapp/version?version=1", data); +} + diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index f1c4653..4483d6e 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -2,7 +2,7 @@ - {{evaluate == 0 ? '待核销' : '已核销'}} + {{evaluate == 7 ? '待核销' : '已核销'}} {{orderData.verify_time}} diff --git a/config/app.js b/config/app.js index 1e8e1a6..2182f5b 100644 --- a/config/app.js +++ b/config/app.js @@ -6,10 +6,11 @@ let openPlantGrass = '-openPlantGrass-' let httpApi let httpApiTwo let httpApiThree +let httpApiFour // 在打包之前请检查当前环境是否正确 -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { diff --git a/manifest.json b/manifest.json index 42d12ce..c8c719f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.4.4", - "versionCode" : 144, + "versionName" : "1.4.7", + "versionCode" : 147, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -103,13 +103,13 @@ "weixin" : { "__platform__" : [ "ios", "android" ], "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "share" : { "weixin" : { "appid" : "wx9d68c92b550ddd1e", - "UniversalLinks" : "https://mer.crmeb.net/" + "UniversalLinks" : "https://shop.lihaink.cn/" } }, "geolocation" : { @@ -160,7 +160,7 @@ }, "nativePlugins" : { "JG-JCore" : { - "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e", + "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_CHANNEL_IOS" : "", "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_CHANNEL_ANDROID" : "", @@ -178,7 +178,7 @@ "JPUSH_APPKEY_IOS" : { "des" : "[iOS]极光portal配置应用信息时分配的AppKey", "key" : "JCore:APP_KEY", - "value" : "7869a2f94b120cfb4431b96f" + "value" : "daebe19b547c43128796a078" }, "JPUSH_CHANNEL_IOS" : { "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", @@ -199,9 +199,9 @@ } }, "JG-JPush" : { - "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_ISPRODUCTION_IOS" : "true", "JPUSH_ADVERTISINGID_IOS" : "", - "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "true", "JPUSH_OPPO_APPKEY" : "", "JPUSH_OPPO_APPID" : "", "JPUSH_OPPO_APPSECRET" : "", diff --git a/pages.json b/pages.json index 650d550..c26eb18 100644 --- a/pages.json +++ b/pages.json @@ -125,6 +125,7 @@ "path": "pages/moreProject/moreProject", "style": { "navigationBarTitleText": "商户平台", + "navigationStyle": "custom", "enablePullDownRefresh": false } @@ -150,7 +151,7 @@ "path" : "pages/margin/margin", "style" : { - "navigationBarTitleText": "", + "navigationBarTitleText":"缴纳保证金", "enablePullDownRefresh": false } @@ -838,7 +839,7 @@ }, { "path": "payment/payment", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "支付", "enablePullDownRefresh": false } @@ -990,6 +991,8 @@ { "path": "settled/index", "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "商家入驻" } }, { diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 4d4d325..d7fc7a7 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -146,7 +146,7 @@ - + 同意 @@ -376,8 +376,11 @@ /*核销订单*/ goCancellation() { let that = this; + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code, + // }) uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code, + url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}` }) // uni.showModal({ // title: '订单核销', diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index e01fdf4..399c417 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -553,6 +553,7 @@ uni.navigateTo({ url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` }) + }, toRefundDetail(item) { uni.navigateTo({ diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue index 2f54607..9a3d94d 100644 --- a/pages/admin/order_cancellation/index.vue +++ b/pages/admin/order_cancellation/index.vue @@ -131,8 +131,12 @@ // console.log(self.verify_code); verifierOrder(self.mer_id,self.verify_code) .then(res => { + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); + uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); }) .catch(res => { @@ -161,8 +165,11 @@ scanType: ["qrCode", "barCode"] }).then(res=>{ this.verify_code = res.resultStr + // uni.navigateTo({ + // url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + // }); uni.navigateTo({ - url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id + url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id }); // this.codeChange(); }).catch(res => { diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue index da48440..517c85c 100644 --- a/pages/chat/customer_list/index.vue +++ b/pages/chat/customer_list/index.vue @@ -62,6 +62,9 @@ serviceList, serviceUserList } from "@/api/user"; + import { + getUserInfo + } from '@/api/user.js'; import { mapGetters } from "vuex"; export default { name: "CustomerList", @@ -88,13 +91,9 @@ computed: mapGetters(['isLogin','viewColor']), onLoad(optios) { this.type = optios.type; - this.mer_id = optios.mer_id; - if(this.isLogin){ - this.getList(this.mer_id) - } else { - this.isAuto = true; - this.isShowAuth = true - } + + + this.getindex() }, onShow(option) { if(this.isLogin){ @@ -119,6 +118,21 @@ this.clear = true; }, methods: { + //获取商户信息 + getindex(){ + getUserInfo().then(res => { + + this.mer_id = res.data.service.mer_id; + if(this.isLogin){ + this.getList(this.mer_id) + } else { + this.isAuto = true; + this.isShowAuth = true + } + // this.getList(this.mer_id) + // this.getList(res.data.service.mer_id, true); + }); + }, onLoadFun() { this.isShowAuth = false; this.getList(this.mer_id); @@ -217,7 +231,7 @@ }, }; - \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index a76d52a..e681ae3 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,5 +1,20 @@