From a6138f70f9ae5a1de6e9fae4bbf77d1c1ad3d710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Fri, 2 Jul 2021 16:24:09 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20uview=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E7=9A=84tabs=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2tab=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uview-ui/components/u-tabs/u-tabs.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue index cd24818..2d83f20 100644 --- a/uview-ui/components/u-tabs/u-tabs.vue +++ b/uview-ui/components/u-tabs/u-tabs.vue @@ -178,7 +178,11 @@ // 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息 list(n, o) { // list变动时，重制内部索引，否则可能导致超出数组边界的情况 - if(n.length !== o.length) this.currentIndex = 0; + if(n.length !== o.length){ + this.currentIndex = 0; + }else{ + return; + } // 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题 this.$nextTick(() => { this.init(); From f04c7096290a405e55c06451ad314a9e81c89b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Fri, 2 Jul 2021 16:57:08 +0800 Subject: [PATCH 02/11] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=89=93=E5=BC=80=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goodsDetail/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index ce89d85..fa765fb 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -141,13 +141,13 @@ }, // 打开地图 openMap(){ - // return; + let { address, lat, lng } = this.goods_detail?.store || {}; uni.openLocation({ - longitude: 108.36637, - latitude: 22.817746, - scale: 18, - name: this.goods_detail.store.address - }) + longitude: Number(lat), + latitude: Number(lng), + scale: 20, + name: address + }); }, // 跳转到确认下单页面 toAddOrder(){ From 4f47a26e6cd0323fd8d58dc3a87510d341d58e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Fri, 2 Jul 2021 17:47:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=BB=9A=E5=8A=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 9 ++++++--- pages/order/index.vue | 3 ++- pages/shopOrder/index.vue | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pages.json b/pages.json index 95bbaee..4a25ff8 100644 --- a/pages.json +++ b/pages.json @@ -7,21 +7,24 @@ "path": "pages/index/index", "style": { "navigationBarTitleText": "首页", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "disableScroll": true } }, { "path": "pages/order/index", "style": { "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "disableScroll": true } }, { "path": "pages/shopOrder/index", "style": { "navigationBarTitleText": "商户订单", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "disableScroll": true } }, { diff --git a/pages/order/index.vue b/pages/order/index.vue index eea3276..6fb512a 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -248,7 +248,7 @@ .title { font-size: 28rpx; color: $u-content-color; - height: 98rpx; + height: 80rpx; } // tab @@ -261,6 +261,7 @@ // 商品列表 .com { width: 100%; + height: 100%; overflow: hidden; .list { diff --git a/pages/shopOrder/index.vue b/pages/shopOrder/index.vue index 4e1a3b0..2b1031c 100644 --- a/pages/shopOrder/index.vue +++ b/pages/shopOrder/index.vue @@ -206,6 +206,7 @@ // 商品列表 .com { width: 100%; + height: 100%; overflow: hidden; .list { From 4a25180e9cf13167a50df153232199d879676d37 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Fri, 2 Jul 2021 17:48:50 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A2=E5=8D=95=E9=99=90=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/apply-details.vue | 2 +- pages/order/apply-refund.vue | 2 +- pages/order/confirm-atonce.vue | 2 +- pages/order/confirm-order.vue | 16 +++++++++++----- pages/order/index.vue | 2 +- pages/order/order-details.vue | 2 +- pages/order/unpay-details.vue | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue index 92995d1..f112d0d 100644 --- a/pages/order/apply-details.vue +++ b/pages/order/apply-details.vue @@ -8,7 +8,7 @@ - + {{orderDetails.order.goods.name}} 数量 x{{orderDetails.order.number}} diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue index ace4faf..67c43f1 100644 --- a/pages/order/apply-refund.vue +++ b/pages/order/apply-refund.vue @@ -8,7 +8,7 @@ - + {{applyDetails.order.goods.name}} 数量 x{{applyDetails.order.number}} diff --git a/pages/order/confirm-atonce.vue b/pages/order/confirm-atonce.vue index 0e00d7a..09a24b1 100644 --- a/pages/order/confirm-atonce.vue +++ b/pages/order/confirm-atonce.vue @@ -8,7 +8,7 @@ - + {{orderDetails.goods.name}} diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue index 2eeae69..ea99d15 100644 --- a/pages/order/confirm-order.vue +++ b/pages/order/confirm-order.vue @@ -8,7 +8,7 @@ - + {{orderDetails.goods.name}} @@ -133,9 +133,13 @@ methods: { changeNum(num) { if(num > this.limit) { - this.$msg('该商品限购'+this.limit+'件') - this.num = this.limit - return + if(this.limit == 0 || this.limit == '') { + this.num = num + }else { + this.$msg('该商品限购'+this.limit+'件') + this.num = this.limit + return + } }else if(num < 1) { this.num = 1 } @@ -149,12 +153,14 @@ }) }, reduce() { - if (this.num === 1) return + if (this.num === 1 || this.num === 0) return this.num-- }, add() { if(this.num < this.limit) { this.num++ + }else if(this.limit == 0 || this.limit == ''){ + this.num++ }else { this.$msg('该商品限购'+this.limit+'件') this.num = this.limit diff --git a/pages/order/index.vue b/pages/order/index.vue index eea3276..10bbd45 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -248,7 +248,7 @@ .title { font-size: 28rpx; color: $u-content-color; - height: 98rpx; + height: 93rpx; } // tab diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue index a28e213..ff24a8d 100644 --- a/pages/order/order-details.vue +++ b/pages/order/order-details.vue @@ -7,7 +7,7 @@ - + {{orderDetails.goods.name}} 数量 x{{orderDetails.number}} diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue index 8372167..733e3ba 100644 --- a/pages/order/unpay-details.vue +++ b/pages/order/unpay-details.vue @@ -8,7 +8,7 @@ - + {{orderDetails.goods.name}} 数量 x{{orderDetails.number}} From 62ac8d5b4365914c952c12d5005c99ab0e30496a Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Fri, 2 Jul 2021 18:17:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E7=BB=84=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/order/index.vue b/pages/order/index.vue index 6fb512a..7885a80 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -204,6 +204,7 @@ tab_item.page = 1; tab_item.isPage = true; tab_item.loadingClass = true; + tab_item.list = [] tab_item.loadingText = '正在加载中'; this.getUserOrder(options); } From 860bc38f7b33c8147c79e00d8c6000d2381a9d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Tue, 6 Jul 2021 15:32:03 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/shared.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/shared.js b/common/shared.js index 7ab6a62..043dfaf 100644 --- a/common/shared.js +++ b/common/shared.js @@ -11,6 +11,8 @@ export function isRight(obj) { } } else if (isValueType(obj) === 'number' && (isValueType(obj) === "number" && !isNaN(obj)) && obj !== 0) { return true; + } else if (isValueType(obj) === 'boolean') { + return obj } for (var key in obj) { return true; From c9d912ad93555cc5a131808af49cf832e4df2d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Tue, 6 Jul 2021 15:58:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[=E6=B7=BB=E5=8A=A0]=20=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E8=99=9A?= =?UTF-8?q?=E6=8B=9Fid=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA=20[=E4=BC=98?= =?UTF-8?q?=E5=8C=96]=20=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=97=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/index.vue | 4 ++-- pages/collect/index.vue | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pages/center/index.vue b/pages/center/index.vue index f2001ad..223c012 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -9,8 +9,8 @@ {{ item }} - ID {{ info.id }} - {{ hidePhone(info.tel) }} + ID {{ info.virtual_id }} + {{ hidePhone(info.tel) }} diff --git a/pages/collect/index.vue b/pages/collect/index.vue index cc3c6af..9cc922b 100644 --- a/pages/collect/index.vue +++ b/pages/collect/index.vue @@ -15,12 +15,12 @@ - 取消收藏 + 取消收藏 - 添加收藏 + 添加收藏 @@ -133,4 +133,11 @@ } } } + .collect-btn{ + display: inline-block; + padding: 2rpx 9rpx; + border: 1rpx solid #333333; + border-radius: 20rpx; + font-size: 22rpx; + } From ec82b0f78c618eab5dc904b86da6ed569f0e9b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Tue, 6 Jul 2021 16:17:11 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=BA=93=E5=AD=98=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?100=E4=BB=BD=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goodsDetail/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue index fa765fb..55cdf9f 100644 --- a/pages/goodsDetail/index.vue +++ b/pages/goodsDetail/index.vue @@ -19,7 +19,7 @@ {{ goods_detail.specs[0].sold_stock_text }} - {{ goods_detail.specs[0].stock_text }} + {{ goods_detail.specs[0].stock_text }} From 1149e3bc1bdc34b46c9eaa65bec9cf0a8b9fde36 Mon Sep 17 00:00:00 2001 From: Enzo <1284707383@qq.com> Date: Thu, 8 Jul 2021 11:10:18 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api.js | 4 ++-- common/http.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/api.js b/common/api.js index a307cb6..ba9d7d3 100644 --- a/common/api.js +++ b/common/api.js @@ -1,9 +1,9 @@ // appId: 正式 null | 测试 wxb35ef055a4dd8ad4 -export const DEV = "dev"; // dev 测试 | prod 正式 +export const DEV = "prod"; // dev 测试 | prod 正式 export const VERSION = '1.0.0'; // 版本号 export const DEVURL = 'https://gxsky.lanzulive.com'; // 测试服请求地址 // export const DEVURL = 'http://192.168.3.8'; // 测试服请求地址, 韦港电脑 -export const PRODURL = ''; // 正式服请求地址 +export const PRODURL = 'https://mall.gxsky.com'; // 正式服请求地址 /* 首页相关接口 */ export const API_CATEGORY_LIST = '/api/category/list'; // 首页-分类 diff --git a/common/http.js b/common/http.js index 50b0f44..0482d1a 100644 --- a/common/http.js +++ b/common/http.js @@ -18,8 +18,12 @@ function getsign(params) { arr.push(k + '=' + v); } s_data = arr.join('&'); - - let sign = sha1(SparkMD5.hash(s_data) + 'lanzu@123'); + + //测试 + // let sign = sha1(SparkMD5.hash(s_data) + 'lanzu@123'); + + //正式 + let sign = sha1(SparkMD5.hash(s_data) + 'base64:8oVqQuUYKI+Fg2iPP1VZwqTbMvpphc/oqhU5+Hzul+4='); params.sign = sign; return params; } From 31d98fae2d78e5a444b39fcc2b30bd6895169268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Fri, 9 Jul 2021 11:01:26 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=B7=B2?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9A=84=E5=AD=97=E6=95=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/apply-refund.vue | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue index 67c43f1..d51876b 100644 --- a/pages/order/apply-refund.vue +++ b/pages/order/apply-refund.vue @@ -77,8 +77,9 @@ 退款说明 - -