From eb0faad7ecbff4006634ac8ab67c507ad4cbef14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Fri, 30 Sep 2022 09:58:08 +0800 Subject: [PATCH 01/22] =?UTF-8?q?refactor:=20:bug:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{seckill.vue => base-list.vue} | 10 +++++++- pages/cart/payment/payOrder.vue | 24 +++++++++---------- 2 files changed, 21 insertions(+), 13 deletions(-) rename components/m-goods-list/{seckill.vue => base-list.vue} (94%) diff --git a/components/m-goods-list/seckill.vue b/components/m-goods-list/base-list.vue similarity index 94% rename from components/m-goods-list/seckill.vue rename to components/m-goods-list/base-list.vue index 4e7b834..df3b036 100644 --- a/components/m-goods-list/seckill.vue +++ b/components/m-goods-list/base-list.vue @@ -3,7 +3,7 @@
- +
@@ -55,6 +55,14 @@ return [] } }, + }, + methods:{ + // 跳转到商品详情 + navigateToDetailPage(item) { + uni.navigateTo({ + url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`, + }); + }, } } diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 71be635..a145a4b 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -98,18 +98,18 @@ }, onBackPress(e) { if (e.from == "backbutton") { - if(this.routerVal.recharge_sn){ - uni.switchTab({ - url: '/pages/tabbar/user/my' - }); - } - else{ - uni.redirectTo({ - url: "/pages/order/myOrder?status=0", - }); - } - return true; //阻止默认返回行为 - } + if(this.routerVal.recharge_sn){ + uni.switchTab({ + url: '/pages/tabbar/user/my' + }); + } + else{ + uni.navigateTo({ + url: "/pages/order/myOrder?status=0", + }); + } + return true; //阻止默认返回行为 + } }, mounted() { this.cashierData(); From d101cd1b6a07458521ca288036015a2d7bc987f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Fri, 30 Sep 2022 16:29:16 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=96=B9=E6=B3=95=E5=87=BA=E9=94=99=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/deposit/index.vue | 16 ++++------- pages/order/myOrder.vue | 2 +- utils/filters.js | 56 +++++++++++++++++------------------- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/pages/mine/deposit/index.vue b/pages/mine/deposit/index.vue index 85287ee..2b9bda5 100644 --- a/pages/mine/deposit/index.vue +++ b/pages/mine/deposit/index.vue @@ -1,6 +1,6 @@ + .desc-light { + color: #999999; + + >span { + color: #333; + margin-left: 8rpx; + } + } + + .mobile { + margin-top: 80rpx; + } + + .disable { + background: linear-gradient(90deg, #ffdcba 2.21%, #ffcfb2 99.86%); + } + + .fetch { + background: linear-gradient(57.72deg, #ff8a19 18.14%, #ff5e00 98.44%); + } + + .btn { + border-radius: 100px; + width: 590rpx; + margin-top: 97rpx; + height: 80rpx; + font-size: 30rpx; + line-height: 80rpx; + text-align: center; + color: #ffffff; + } + + .tips { + font-size: 12px; + line-height: 20px; + margin-top: 32rpx; + width: 546rpx; + + >span { + color: $light-color; + } + } + + .fetch-btn { + width: 370rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background: #f2f2f2; + border-radius: 100rpx; + font-size: 28rpx; + color: #999; + + margin: 71rpx auto 0 auto; + } + + .login-list { + display: flex; + width: 590rpx; + position: absolute; + top: 1200rpx; + align-items: center; + justify-content: center; + } + + .login-item { + width: 80rpx; + border-radius: 10rpx; + height: 80rpx; + display: flex; + justify-content: center; + align-items: center; + + margin: 0 20rpx; + } + + .user-password-tips { + text-align: center; + color: $main-color; + margin: 20px 0; + } + diff --git a/project.config.json b/project.config.json new file mode 100644 index 0000000..0695933 --- /dev/null +++ b/project.config.json @@ -0,0 +1,28 @@ +{ + "appid": "wx98ebde1da5b340d4", + "compileType": "miniprogram", + "libVersion": "2.27.0", + "packOptions": { + "ignore": [], + "include": [] + }, + "setting": { + "coverView": true, + "es6": true, + "postcss": true, + "minified": true, + "enhance": true, + "showShadowRootInWxmlPanel": true, + "packNpmRelationList": [], + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + } + }, + "condition": {}, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + } +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json new file mode 100644 index 0000000..1fa0e89 --- /dev/null +++ b/project.private.config.json @@ -0,0 +1,7 @@ +{ + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "lilishop-uniapp", + "setting": { + "compileHotReLoad": true + } +} \ No newline at end of file From 6b3b61acb56c5515b4a30a580523190871f5899d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Mon, 17 Oct 2022 14:27:24 +0800 Subject: [PATCH 11/22] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E5=B1=95=E5=BC=80=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/navigation/search/searchPage.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index 449312a..765834c 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -35,7 +35,8 @@ @click="doSearch(keyword)"> {{ keyword }}
-
展示更多
+ +
展示更多
@@ -202,7 +203,7 @@ export default { empty:false, scrollTop: 0, loadIndex: 10, - oldKeywordIndex: "", + oldKeywordIndex: 0, selectedWay: { brand: [], categoryId: [], @@ -570,7 +571,7 @@ export default { key: "OldKeys", success: (res) => { var OldKeys = JSON.parse(res.data); - this.oldKeywordIndex = res.data.length; + this.oldKeywordIndex = OldKeys.length; for (let i = 0; i < index; i++) { this.oldKeywordList.push(OldKeys[i]); } From f08d166c862cba2a05998c25244c4194608a578d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Mon, 17 Oct 2022 15:28:31 +0800 Subject: [PATCH 12/22] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9C=A8=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC=E7=AD=89=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/help/tips.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/mine/help/tips.vue b/pages/mine/help/tips.vue index 5401e69..19d3086 100644 --- a/pages/mine/help/tips.vue +++ b/pages/mine/help/tips.vue @@ -1,6 +1,6 @@ From d01edbdfe2a3a2af10a9a8fcaab7956726b8d9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Wed, 19 Oct 2022 11:56:42 +0800 Subject: [PATCH 13/22] =?UTF-8?q?feat:=20:sparkles:=20=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-goods-list/base-list.vue | 458 +++++++++++++---------- pages/tabbar/home/index.vue | 5 + pages/tabbar/home/template/tpl_goods.vue | 120 +++++- pages/tabbar/home/views.vue | 11 +- 4 files changed, 385 insertions(+), 209 deletions(-) diff --git a/components/m-goods-list/base-list.vue b/components/m-goods-list/base-list.vue index a64c302..bae5637 100644 --- a/components/m-goods-list/base-list.vue +++ b/components/m-goods-list/base-list.vue @@ -1,198 +1,276 @@ - diff --git a/pages/tabbar/home/index.vue b/pages/tabbar/home/index.vue index cbeebf5..ea9406e 100644 --- a/pages/tabbar/home/index.vue +++ b/pages/tabbar/home/index.vue @@ -15,6 +15,11 @@ export default { }, }; }, + onReachBottom(){ + // 给子级监听触底加载 + uni.$emit('onReachBottom',true) + }, + onPullDownRefresh() { this.$refs.tpl.init(); diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue index 98f6b15..9075aa0 100644 --- a/pages/tabbar/home/template/tpl_goods.vue +++ b/pages/tabbar/home/template/tpl_goods.vue @@ -1,21 +1,38 @@ -