From 256022450c55f671f1261b351e704fdb8db6568c Mon Sep 17 00:00:00 2001 From: myTest383
Date: Tue, 31 Dec 2024 16:22:15 +0800 Subject: [PATCH] 11 --- common/config.js | 4 ++-- pages/SelectAddressActivity.vue | 3 ++- pages/bind/bind_cloudCard.vue | 4 ++-- pages/good/goodsDetail.vue | 2 +- pages/good/goodsDetail2.vue | 8 ++++---- pages/good/reservation.vue | 4 ++-- pages/good/transfer.vue | 9 ++++++--- pages/home/cloudCard2.vue | 9 ++++++++- pages/home/myCellar.vue | 13 +++++++++++-- pages/home/myHome.vue | 5 +++-- 10 files changed, 41 insertions(+), 20 deletions(-) diff --git a/common/config.js b/common/config.js index 50267f2..9ede646 100644 --- a/common/config.js +++ b/common/config.js @@ -7,10 +7,10 @@ */ module.exports = { // baseUrl: 'http://uv32vz.natappfree.cc', // 本地 - // baseUrl: 'http://192.168.0.105:8116/mall/', // 本地 + baseUrl: 'http://192.168.0.105:8116/mall', // 本地 // baseUrl: 'https://39.104.100.138/lpkapi', // 测试服务器 // baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器 - baseUrl: 'https://ordermall.yxtsoft.com/lpkapi/mall', // 正式服务器 + // baseUrl: 'https://ordermall.yxtsoft.com/lpkapi/mall', // 正式服务器 // tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 diff --git a/pages/SelectAddressActivity.vue b/pages/SelectAddressActivity.vue index 2f249e9..a27c878 100644 --- a/pages/SelectAddressActivity.vue +++ b/pages/SelectAddressActivity.vue @@ -161,7 +161,8 @@ }) let _this = this _this.$api.address({ - 'name': this.page.key + 'name': this.page.key, + orgPath: getApp().globalData.orgPath }).then((resp) => { _this.dataList = resp if (resp.length == 0) { diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue index a4497e9..d8b075d 100644 --- a/pages/bind/bind_cloudCard.vue +++ b/pages/bind/bind_cloudCard.vue @@ -232,8 +232,8 @@ customerSid: this.page.customerSid, // c89f8631-e401-4010-a223-0caf3fabd5c6 transferSid: this.page.codeKey, //e2a9f5be-0abc-4146-a1e9-7e4148458d20 - customerSid: 'c89f8631-e401-4010-a223-0caf3fabd5c6', // c89f8631-e401-4010-a223-0caf3fabd5c6 - transferSid: 'e2a9f5be-0abc-4146-a1e9-7e4148458d20' //e2a9f5be-0abc-4146-a1e9-7e4148458d20 + // customerSid: 'c89f8631-e401-4010-a223-0caf3fabd5c6', // c89f8631-e401-4010-a223-0caf3fabd5c6 + // transferSid: 'e2a9f5be-0abc-4146-a1e9-7e4148458d20' //e2a9f5be-0abc-4146-a1e9-7e4148458d20 } console.log("params+++++++++++++++", params); diff --git a/pages/good/goodsDetail.vue b/pages/good/goodsDetail.vue index 504bc6f..2690c24 100644 --- a/pages/good/goodsDetail.vue +++ b/pages/good/goodsDetail.vue @@ -335,7 +335,7 @@ // console.log(resp); _this.data = resp - _this.getAllPriceOrWeight() + // _this.getAllPriceOrWeight() _this.$nextTick(() => { _this.$refs.pageView.setLoadState(2) diff --git a/pages/good/goodsDetail2.vue b/pages/good/goodsDetail2.vue index 0a88000..5839cb9 100644 --- a/pages/good/goodsDetail2.vue +++ b/pages/good/goodsDetail2.vue @@ -193,11 +193,11 @@ // console.log(resp); _this.data = resp - _this.getAllPriceOrWeight() + // _this.getAllPriceOrWeight() - // _this.$nextTick(() => { - // _this.$refs.pageView.setLoadState(2) - // }) + _this.$nextTick(() => { + _this.$refs.pageView.setLoadState(2) + }) }).catch(e => { _this.$nextTick(() => { _this.$refs.pageView.setLoadState(1) diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue index 7331157..1879ba4 100644 --- a/pages/good/reservation.vue +++ b/pages/good/reservation.vue @@ -159,7 +159,7 @@ 存量： {{item.goodsNumber}}{{item.unitName}} + style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}} @@ -349,7 +349,7 @@ } if (this.info.name == "" || this.info.phone == '') { - this.shortToast('请完善提菜人信息') + this.shortToast('请完善提货人信息') return } diff --git a/pages/good/transfer.vue b/pages/good/transfer.vue index 5405987..c6e528a 100644 --- a/pages/good/transfer.vue +++ b/pages/good/transfer.vue @@ -572,7 +572,11 @@ {{item.weight}}{{item.specificationUnit}}/{{item.unitName}} + font-size: 10px;color: #EE752F;">{{item.weight}} + {{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}} + 存量： - {{item.goodsNumber}}{{item.unitName}} + {{item.goodsNumber}} diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index 49e90c9..42cf6c7 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -769,7 +769,14 @@ _this.data = resp console.log("======", resp); _this.baseDataSuccess = true - _this.getgoods() + if (_this.data.brandVos.length != 0) { + _this.getgoods() + } else { + _this.$nextTick(() => { + _this.$refs.pageView.setLoadState(2) + }) + } + }).catch(e => { _this.$nextTick(() => { _this.$refs.pageView.setLoadState(1) diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 3ffdad3..96d942d 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -116,7 +116,7 @@ 存量： {{item.goodsNumber}}{{item.unitName}} + style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}} @@ -641,8 +641,17 @@ _this.pickingUpGoods = [] _this.baseDataSuccess = true // _this.selectIndex = 0 - _this.getgoods() + + if (_this.data.length != 0) { + _this.getgoods() + } else { + _this.$nextTick(() => { + _this.$refs.pageView.setLoadState(2) + }) + } + }).catch(e => { + console.log("vegeCellarTypeList>>>>", e); _this.$nextTick(() => { _this.$refs.pageView.setLoadState(1) }) diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index ab69be3..7d7d67b 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -71,13 +71,14 @@ 我的订单 - + +