diff --git a/common/js/request.js b/common/js/request.js index 23c8c7c..59d9c04 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -10,9 +10,9 @@ export default { title: '加载中' }) // request 触发前拼接 url - // args.url = 'https://www.opsoul.com' + args.url; + args.url = 'https://www.opsoul.com' + args.url; // args.url = 'http://120.79.136.57' + args.url; - args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'http://127.0.0.1:80' + args.url; if (args.data) { args.data.deptId = globalData.deptId; args.data.from = globalData.from; diff --git a/components/goods-card/horizontal-goods-card.vue b/components/goods-card/horizontal-goods-card.vue index 561e6fa..a1e5c47 100644 --- a/components/goods-card/horizontal-goods-card.vue +++ b/components/goods-card/horizontal-goods-card.vue @@ -5,7 +5,7 @@ {{product.goodsName}} - {{product.remark}} + {{product.goodsDesc}} diff --git a/components/goods-card/vertical-goods-card.vue b/components/goods-card/vertical-goods-card.vue index 195c195..fec5c0f 100644 --- a/components/goods-card/vertical-goods-card.vue +++ b/components/goods-card/vertical-goods-card.vue @@ -20,7 +20,7 @@ {{item.goodsName}} - {{item.remark}} + {{item.goodsDesc}} 自营直选,不满意重新服务,全程上险 {{item.goodsStandardList[0].goodsPrice}} diff --git a/pages.json b/pages.json index 59aaa8a..50883bd 100644 --- a/pages.json +++ b/pages.json @@ -1,7 +1,6 @@ { "pages": [{ - "path": "pages/index/index" - // "path": "components/multi-level-nav/vertical-nav" + "path": "pages/index/index" }], "subPackages": [{ "root": "pages/order/", @@ -33,14 +32,6 @@ "path": "my-address" }, { "path": "edit-address" - }, { - "path": "my-operator" - }, { - "path": "contract" - }, { - "path": "apply-operator" - }, { - "path": "Certification" }, { "path": "my-team-member" }, { diff --git a/pages/my/Certification.vue b/pages/my/Certification.vue index 557e1af..9563bc4 100644 --- a/pages/my/Certification.vue +++ b/pages/my/Certification.vue @@ -1,12 +1,12 @@ diff --git a/pages/my/b-account-bind.vue b/pages/my/b-account-bind.vue index 0f784b2..01ee4f4 100644 --- a/pages/my/b-account-bind.vue +++ b/pages/my/b-account-bind.vue @@ -7,11 +7,11 @@ - 支付宝 + 银行卡 - + - + 开户人姓名 @@ -55,6 +55,9 @@ + + 工圈子小程序承诺此账户只用于接收推广收益 + @@ -67,7 +70,7 @@ }, data() { return { - curAccountType: '0', + curAccountType: '1', provinceList: [], cityList: [], formData: { diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue index c9635d2..9ae9ebc 100644 --- a/pages/my/my-order.vue +++ b/pages/my/my-order.vue @@ -48,17 +48,17 @@ - - + + - - + + - + + 已售:{{curProductSpecs.saleNum}} @@ -66,7 +68,7 @@ {{productDetail.goodsName}} - {{productDetail.remark}} + {{productDetail.goodsDesc}} diff --git a/pages/product/product-pick.vue b/pages/product/product-pick.vue index b502c23..4b08df2 100644 --- a/pages/product/product-pick.vue +++ b/pages/product/product-pick.vue @@ -6,9 +6,10 @@ - {{curSpec.goodsPrice}} + {{curSpec.goodsPrice}} + /{{curSpec.goodsUnit}} - {{productInfo.remark}} + {{productInfo.goodsDesc}} @@ -81,8 +82,7 @@ }, methods: { loadData() { - this.curSpec = this.specsList[0]; - console.log(this.curSpec) + this.curSpec = this.specsList[0]; this.specsList.forEach(function(item) { this.pickList.push({ price: item.goodsPrice,