From d46da55237c8a2210a713a683f4a6de152dd763a Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Wed, 1 Mar 2023 09:27:50 +0800 Subject: [PATCH] =?UTF-8?q?2023-02-28=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallplusui-uniapp-app/App.vue | 73 +- mallplusui-uniapp-app/manifest.json | 4 +- mallplusui-uniapp-app/pages.json | 12 +- mallplusui-uniapp-app/pages/index/index.vue | 20 +- mallplusui-uniapp-app/pages/index/user.vue | 21 +- .../pages/order/createOrder.vue | 2 +- .../pages/order/createStoreOrder.vue | 2 +- mallplusui-uniapp-app/pages/order/order.vue | 16 +- .../pages/order/orderDetail.vue | 1021 +++++++++-------- mallplusui-uniapp-app/pages/public/login.vue | 22 +- mallplusui-uniapp-app/pages/set/set.vue | 1 + .../pagesA/after_sale/list.vue | 2 +- mallplusui-uniapp-app/pagesA/product/list.vue | 3 + .../pagesA/product/product.vue | 8 +- .../pagesU/notice/subjectList.vue | 1 - mallplusui-uniapp-app/store/index.js | 6 +- 16 files changed, 645 insertions(+), 569 deletions(-) diff --git a/mallplusui-uniapp-app/App.vue b/mallplusui-uniapp-app/App.vue index aa85bab..1ff1310 100644 --- a/mallplusui-uniapp-app/App.vue +++ b/mallplusui-uniapp-app/App.vue @@ -11,26 +11,27 @@ } from 'vuex'; export default { methods: { - ...mapMutations(['login']) , - // util.js - // 微信公众号授权 - wxAuthorize() { - let link = window.location.href; - let params = this._getUrlParams(link); // 地址解析 - - // 已经授权登录过的就不用再授权了 - if (store.state.token) return; - - // 如果拿到code，调用授权接口，没有拿到就跳转微信授权链接获取 - if (params.code) { - api.wxAuth(params.code); // 调用后台接口，授权 - } else { - let appid = 'wx8321531c6046c924'; - let uri = encodeURIComponent(link); - let authURL = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`; - window.location.href = authURL; - } - }, + ...mapMutations(['login']), + // util.js + // 微信公众号授权 + wxAuthorize() { + let link = window.location.href; + let params = this._getUrlParams(link); // 地址解析 + + // 已经授权登录过的就不用再授权了 + if (store.state.token) return; + + // 如果拿到code，调用授权接口，没有拿到就跳转微信授权链接获取 + if (params.code) { + api.wxAuth(params.code); // 调用后台接口，授权 + } else { + let appid = 'wx8321531c6046c924'; + let uri = encodeURIComponent(link); + let authURL = + `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`; + window.location.href = authURL; + } + }, async typeGoodsList() { let params = {}; let list = await Api.apiCall('get', Api.goods.typeGoodsList, params); @@ -44,28 +45,34 @@ async sysInfoMethod() { let params = {}; let list = await Api.apiCall('get', Api.index.sysInfo, params); - console.log('sysInfo>>>>>',sysInfo) + console.log('sysInfo>>>>>', sysInfo) this.$db.set('sysInfo', list) }, - + }, onLaunch: function() { + // uni.removeStorageSync('userInfo'); + // uni.removeStorageSync('token'); + console.log('App onLaunch') let userInfo = uni.getStorageSync('userInfo') || ''; - let token = uni.getStorageSync('token') || ''; - if(token){ + let token = uni.getStorageSync('token') || ''; + console.log('App onLaunch>>>',userInfo) + console.log('App onLaunch>>>',token) + if (token) { //更新登陆状态 uni.getStorage({ key: 'userInfo', success: (res) => { + console.log('App onLaunch>>', res) this.login(res.data); } }); } - let isWeiXin = this.$common.isWeiXinBrowser() - if (isWeiXin) { - this.wxAuthorize() - } + let isWeiXin = this.$common.isWeiXinBrowser() + if (isWeiXin) { + this.wxAuthorize() + } this.typeGoodsList(); this.areaGoodsList(); this.sysInfoMethod(); @@ -419,9 +426,13 @@ video { box-sizing: border-box; } - html,body,#app{ - height: 100%; - } + + html, + body, + #app { + height: 100%; + } + /* 骨架屏替代方案 */ .Skeleton { background: #f3f3f3; diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json index 9abc085..447d838 100644 --- a/mallplusui-uniapp-app/manifest.json +++ b/mallplusui-uniapp-app/manifest.json @@ -2,8 +2,8 @@ "name" : "汇融云链", "appid" : "__UNI__FB2C9C4", "description" : "", - "versionName" : "1.0.0.2", - "versionCode" : 1002, + "versionName" : "1.0.0.3", + "versionCode" : 1003, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/mallplusui-uniapp-app/pages.json b/mallplusui-uniapp-app/pages.json index 4473eb8..aa29f05 100644 --- a/mallplusui-uniapp-app/pages.json +++ b/mallplusui-uniapp-app/pages.json @@ -89,12 +89,12 @@ }, { "path": "pages/order/orderDetail", "style": { - "navigationBarTitleText": "详情展示", - "app-plus": { - "titleNView": { - "type": "transparent" - } - } + "navigationBarTitleText": "详情展示" + // "app-plus": { + // "titleNView": { + // "type": "transparent" + // } + // } } }, { "path": "pages/order/logistics", diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue index dac2e91..7223c41 100644 --- a/mallplusui-uniapp-app/pages/index/index.vue +++ b/mallplusui-uniapp-app/pages/index/index.vue @@ -1079,11 +1079,13 @@ } .price { + font-size: 18px; color: $uni-color-primary; + line-height: 1; } - + .m-price { - font-size: $font-sm; + font-size: 16px; color: $font-color-light; margin-left: 10upx; } @@ -1180,15 +1182,16 @@ } .price { + font-size: 18px; color: $uni-color-primary; + line-height: 1; } - + .m-price { - font-size: $font-sm; + font-size: 16px; color: $font-color-light; margin-left: 10upx; } - .pro-box { display: flex; align-items: center; @@ -1250,17 +1253,16 @@ } .price { - font-size: 16px; + font-size: 18px; color: $uni-color-primary; line-height: 1; } - + .m-price { - font-size: $font-sm; + font-size: 16px; color: $font-color-light; margin-left: 10upx; } - .coupon_box { width: 100%; height: auto; diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue index c344d7f..df93940 100644 --- a/mallplusui-uniapp-app/pages/index/user.vue +++ b/mallplusui-uniapp-app/pages/index/user.vue @@ -70,13 +70,13 @@ --> - + @@ -103,7 +103,8 @@ - + {{ item.createTime }} - {{ item.id }}-- + {{ item.stateTip }} - + @@ -30,8 +30,8 @@ {{ goodsItem.productName }} {{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }} {{ goodsItem.productPrice }}
- {{ item.deliveryCompany }}:{{ item.deliverySn }} - {{ item.deliveryCompany }}:{{ item.deliverySn }} + @@ -49,10 +49,10 @@ 积分订单 - + - + @@ -168,7 +168,7 @@ export default { let params = { pageNum: this.pageNum, status: status }; let data = await Api.apiCall('get', Api.order.orderList, params); - console.log("data:------"+JSON.stringify(data)) + console.log("data:------"+data) let goodsList = data.records; let goodsListJson = JSON.stringify(goodsList) console.log("goodsList:"+goodsListJson) @@ -201,7 +201,7 @@ export default { } navItem.orderList = []; - console.log(JSON.stringify(orderList)) + console.log(orderList) orderList.forEach(item => { console.log("item-----:"+item) navItem.orderList.push(item); diff --git a/mallplusui-uniapp-app/pages/order/orderDetail.vue b/mallplusui-uniapp-app/pages/order/orderDetail.vue index 0852118..b33fd01 100644 --- a/mallplusui-uniapp-app/pages/order/orderDetail.vue +++ b/mallplusui-uniapp-app/pages/order/orderDetail.vue @@ -7,30 +7,36 @@ {{ orderInfo.createTime }} - {{ orderInfo.id }}-- - {{ orderInfo.stateTip }} - + + {{ orderInfo.stateTip }} + 订单商品 - + {{ goodsItem.productName }} - {{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }} + {{ goodsItem.productAttr }} x + {{ goodsItem.productQuantity }} {{ goodsItem.productPrice }} 订单赠品 - + {{ goodsItem.productName }} - {{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }} + {{ goodsItem.productAttr }} x + {{ goodsItem.productQuantity }} {{ goodsItem.productPrice }} @@ -39,31 +45,32 @@ {{ orderInfo.orderItemList.length }} 件商品, 会员折扣 {{ orderInfo.vipAmount }} - 优惠券抵扣 - {{ orderInfo.couponAmount }} + 优惠券抵扣 + {{ orderInfo.couponAmount }} - 积分抵扣 - {{ orderInfo.integrationAmount }} - ,运费 + 积分抵扣 + {{ orderInfo.integrationAmount }} + ,运费 {{ orderInfo.freightAmount }} 活动金额 ￥{{ groupActivity.price }} - ,实付款 + ,实付款 {{ orderInfo.payAmount }} - - - - - + + + + + @@ -74,325 +81,387 @@ diff --git a/mallplusui-uniapp-app/pages/public/login.vue b/mallplusui-uniapp-app/pages/public/login.vue index 1c3cee4..491944e 100644 --- a/mallplusui-uniapp-app/pages/public/login.vue +++ b/mallplusui-uniapp-app/pages/public/login.vue @@ -144,8 +144,16 @@ methods: { ...mapMutations(['login']), selectType(index) { - this.selectKey = index - this.show = !this.show + + if (index == 0) { + this.show = true + this.selectKey = 0 + } + + if (index == 1) { + this.show = false + this.selectKey = 1 + } }, inputChange(e) { @@ -258,7 +266,7 @@ uni.showToast({ title: '登录成功' }); - that.login(res.data.data); + that.login(res.data.data.userInfo); that.$db.set('token', res.data.data.tokenHead + res.data.data.token); that.$db.set('userInfos', res.data.data.userInfo); @@ -354,7 +362,7 @@ uni.showToast({ title: '登录成功' }); - that.login(res.data.data); + that.login(res.data.data.userInfo); that.$db.set('token', res.data.data.tokenHead + res.data.data.token); that.$db.set('userInfos', res.data.data.userInfo); @@ -520,7 +528,7 @@ //this.logining = false; if (data) { console.log(data); - that.login(data) + that.login(data.userInfo) uni.setStorageSync('userInfos', data.userInfo); uni.setStorageSync('token', data.tokenHead + data.token); console.log(uni.getStorageSync('token')) @@ -545,7 +553,7 @@ let data = await Api.apiCall('post', Api.index.login, params); if (data) { console.log(data); - that.login(data); + that.login(data.userInfo); uni.setStorageSync('userInfos', data.userInfo); uni.setStorageSync('token', data.tokenHead + data.token); // uni.setStorageSync('adminToken', data.tokenHead + data.token); @@ -588,7 +596,7 @@ // 登录成功 记录会员信息到本地 if (res) { console.log(res); - that.login(res.data.data); + that.login(res.data.data.userInfo); uni.setStorageSync('userInfos', res.data .data.userInfo); uni.setStorageSync('token', res.data.data diff --git a/mallplusui-uniapp-app/pages/set/set.vue b/mallplusui-uniapp-app/pages/set/set.vue index 7e15845..b2be1cb 100644 --- a/mallplusui-uniapp-app/pages/set/set.vue +++ b/mallplusui-uniapp-app/pages/set/set.vue @@ -85,6 +85,7 @@ Api.apiCall('post', Api.index.logout, {}); setTimeout(() => { uni.navigateBack(); + uni.removeStorageSync('userInfo'); }, 200); } } diff --git a/mallplusui-uniapp-app/pagesA/after_sale/list.vue b/mallplusui-uniapp-app/pagesA/after_sale/list.vue index 460d9a0..10f0277 100644 --- a/mallplusui-uniapp-app/pagesA/after_sale/list.vue +++ b/mallplusui-uniapp-app/pagesA/after_sale/list.vue @@ -14,7 +14,7 @@ {{ item.createTime }} - {{ item.id }}-- + 待审核 退货中 已完成 diff --git a/mallplusui-uniapp-app/pagesA/product/list.vue b/mallplusui-uniapp-app/pagesA/product/list.vue index 248e55c..ee847e7 100644 --- a/mallplusui-uniapp-app/pagesA/product/list.vue +++ b/mallplusui-uniapp-app/pagesA/product/list.vue @@ -178,6 +178,9 @@ export default { if (this.isFenxiao) { params.isFenxiao = 1; } + + console.log("params>>>>",params) + let list = await Api.apiCall('get', Api.goods.goodsList, params); let goodsList = list.records; // let goodsList = await this.$api.json('goodsList'); diff --git a/mallplusui-uniapp-app/pagesA/product/product.vue b/mallplusui-uniapp-app/pagesA/product/product.vue index 2468edc..78072fd 100644 --- a/mallplusui-uniapp-app/pagesA/product/product.vue +++ b/mallplusui-uniapp-app/pagesA/product/product.vue @@ -56,7 +56,7 @@ --> - + - + 图文详情 diff --git a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue index e4ab883..dab83ed 100644 --- a/mallplusui-uniapp-app/pagesU/notice/subjectList.vue +++ b/mallplusui-uniapp-app/pagesU/notice/subjectList.vue @@ -158,7 +158,6 @@ justify-content: space-between; .listcard-content_title { - padding-right: 30px; font-size: 14px; color: #333; font-weight: 400; diff --git a/mallplusui-uniapp-app/store/index.js b/mallplusui-uniapp-app/store/index.js index 83309ee..8758685 100644 --- a/mallplusui-uniapp-app/store/index.js +++ b/mallplusui-uniapp-app/store/index.js @@ -14,13 +14,13 @@ const store = new Vuex.Store({ console.log(provider); if (provider && provider != undefined) { console.log("provider", provider); - console.log("provider>>>", provider.userInfo.memberLevelId); + console.log("provider>>>", provider.memberLevelId); state.hasLogin = true; - state.hasVip = provider.userInfo.memberLevelId == 1 ? false : true; + state.hasVip = provider.memberLevelId == 1 ? false : true; console.log("state.hasVip >>>", state.hasVip); uni.setStorage({ //缓存用户登陆状态 key: 'userInfo', - data: provider.userInfo + data: provider }) state.userInfo = provider; }