From a9db24d1ad7f97a595a471d942e33bb9ef917fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 27 Jul 2021 18:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=20=E4=BB=A5=E5=8F=8A=20=E5=9C=A8?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/api.js | 5 +- manifest.json | 4 +- pages.json | 22 +- pages/cart/payment/payOrder.vue | 265 +++++++++--------- pages/order/fillorder.vue | 5 +- pages/passport/onClickLogin.vue | 34 +-- .../point/pointList.vue} | 11 +- .../{navigation => promotion}/point/user.vue | 3 +- pages/tabbar/home/template/tpl.js | 7 +- 9 files changed, 182 insertions(+), 174 deletions(-) rename pages/{navigation/point/point-mall.vue => promotion/point/pointList.vue} (94%) rename pages/{navigation => promotion}/point/user.vue (92%) diff --git a/config/api.js b/config/api.js index ed1e83f..9d865b9 100644 --- a/config/api.js +++ b/config/api.js @@ -6,10 +6,7 @@ const dev = { common: "https://common-api.pickmall.cn", buyer: "https://buyer-api.pickmall.cn", - // common: 'http://192.168.0.101:8890', - // buyer: 'http://192.168.0.101:8888', - // seller: 'http://192.168.0.101:8889', - // manager: 'http://192.168.0.101:8887' + }; // 生产环境 diff --git a/manifest.json b/manifest.json index a90b4f9..36e7601 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.0.23", - "versionCode" : 4000023, + "versionName" : "4.0.24", + "versionCode" : 4000024, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages.json b/pages.json index dc811b9..ddc8d6e 100644 --- a/pages.json +++ b/pages.json @@ -36,13 +36,7 @@ } }, - { - "path": "pages/navigation/point/point-mall", - "style": { - "navigationBarTitleText": "积分商城", - "enablePullDownRefresh": true - } - }, + { "path": "pages/navigation/search/searchPage", "style": { @@ -504,6 +498,13 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" + } + },{ + "path": "point/pointList", + "style": { + "navigationBarTitleText": "积分商城" + + } } @@ -752,12 +753,7 @@ "selectedIconPath": "static/tabbar/category-s.png", "text": "分类" }, - // { - // "pagePath": "pages/navigation/point/point-mall", - // "iconPath": "static/tabbar/point-mall.png", - // "selectedIconPath": "static/tabbar/point-mall-s.png", - // "text": "积分商城" - // }, + { "pagePath": "pages/tabbar/cart/cartList", "iconPath": "static/tabbar/cart.png", diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 4f17c6b..aa69401 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -1,47 +1,46 @@ diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index 3bac509..a645f0a 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -190,10 +190,11 @@
合计： - + ¥ - {{ orderMessage.priceDetailDTO.billPrice | unitPrice }} + {{ orderMessage.priceDetailDTO.flowPrice | unitPrice }} + {{orderMessage.priceDetailDTO.payPoint | unitPrice }}积分
diff --git a/pages/passport/onClickLogin.vue b/pages/passport/onClickLogin.vue index 761fbc7..b79e618 100644 --- a/pages/passport/onClickLogin.vue +++ b/pages/passport/onClickLogin.vue @@ -117,23 +117,23 @@ export default { methods: { /** 根据参数显示登录模块 */ methodFilter(code) { - // let way = []; - // this.loginList.forEach((item) => { - // if (code.length != 0) { - // code.forEach((val) => { - // if (item.code == val) { - // way.push(item); - // } - // }); - // } else { - // uni.showToast({ - // title: '配置有误请联系管理员', - // duration: 2000, - // icon:"none" - // }); - // } - // }); - // this.loginList = way; + let way = []; + this.loginList.forEach((item) => { + if (code.length != 0) { + code.forEach((val) => { + if (item.code == val) { + way.push(item); + } + }); + } else { + uni.showToast({ + title: '配置有误请联系管理员', + duration: 2000, + icon:"none" + }); + } + }); + this.loginList = way; }, /**跳转到登录页面 */ navigateLogin(connectLogin) { diff --git a/pages/navigation/point/point-mall.vue b/pages/promotion/point/pointList.vue similarity index 94% rename from pages/navigation/point/point-mall.vue rename to pages/promotion/point/pointList.vue index 73912c7..8210d90 100644 --- a/pages/navigation/point/point-mall.vue +++ b/pages/promotion/point/pointList.vue @@ -23,7 +23,6 @@ {{ item.goodsSku.goodsName }} - {{ item.points | unitPrice }}积分 ¥{{ item.goodsSku.price | unitPrice }} @@ -97,10 +96,11 @@ export default { } }, }, - async onShow() { + async mounted() { //获取顶级分类 + let response = await getPointsCategory(); - + if (response.data.success) { let navData = response.data.result.records; navData.forEach((item) => { @@ -273,12 +273,11 @@ page { .swiper-box { // #ifdef H5 - height: calc(100vh - 294px); + height: calc(100vh - (100rpx + 300rpx + 44px)); // #endif // #ifndef H5 - - height: calc(100vh - 200px); + height: calc(100vh - 400rpx); // #endif .scroll-v { diff --git a/pages/navigation/point/user.vue b/pages/promotion/point/user.vue similarity index 92% rename from pages/navigation/point/user.vue rename to pages/promotion/point/user.vue index f8c0321..df847f5 100644 --- a/pages/navigation/point/user.vue +++ b/pages/promotion/point/user.vue @@ -1,6 +1,6 @@