From 6d001079445a4f3b0fc5c1adec7d36468ec0247b Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 30 Jul 2020 20:33:16 +0800 Subject: [PATCH] adv 7.30 --- common/api/shop.js | 4 ++ common/api/user.js | 3 ++ common/store/index.js | 2 +- components/mine/address-active/index.vue | 18 ++------ components/shop/list/index.vue | 6 ++- pageB/comment/index.vue | 2 +- pageC/cart/ConfirmOrder.vue | 40 ++++++++-------- pageC/groupBuy/index.vue | 59 +++++++++++++----------- pageE/mine/EditUserInfo.vue | 39 ++++++++++++++++ pageE/mine/Integral.vue | 4 +- pageE/mine/MemberServeCoupon.vue | 36 +++++++-------- pageE/order/Logistics.vue | 51 ++++++++++---------- pageE/tool/ManicureOrder.vue | 2 +- pageE/tool/SendWash.vue | 5 +- pages/index/index.vue | 26 ++++++++++- pages/mine/index.vue | 27 +++++++++-- pages/shop/index.vue | 41 ++++++++++++---- 17 files changed, 241 insertions(+), 124 deletions(-) diff --git a/common/api/shop.js b/common/api/shop.js index 2bbc626..e1764ef 100644 --- a/common/api/shop.js +++ b/common/api/shop.js @@ -253,6 +253,10 @@ export default { tabLiveList(){ return vm.$u.post('Specialci/tabLiveList') }, + // 商城-活动广告 + getStoreActivity() { + return vm.$u.post('adv/storeActivity') + }, // 获取图文视频详情 articleInfo({article_id}){ return vm.$u.post('article/articleInfo',{article_id}) diff --git a/common/api/user.js b/common/api/user.js index 60f9645..39c86d6 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -270,6 +270,9 @@ export default { getOrderEvaluateInfo({ id }) { return vm.$u.post('Order/getOrderEvaluateInfo', { id: id }); }, + orderLogistics({ id }) { + return vm.$u.post('Order/orderLogistics', { order_id: id }); + }, // 订单评价/修改评价 updateOrderEvaluate({ id, content, scores_one, scores_two, scores_three, file }) { let params = { diff --git a/common/store/index.js b/common/store/index.js index 333b9b2..00e32cf 100644 --- a/common/store/index.js +++ b/common/store/index.js @@ -21,7 +21,7 @@ const store = new Vuex.Store({ }, getters: { getOrderAddress(state) { - return state.orderAddress; + return state.orderAddress || {}; }, getGoodsType(state) { return state.goodsDetails.type; diff --git a/components/mine/address-active/index.vue b/components/mine/address-active/index.vue index 05e7d36..7602cb2 100644 --- a/components/mine/address-active/index.vue +++ b/components/mine/address-active/index.vue @@ -118,19 +118,11 @@ export default { // latitude, }).then((res)=>{ if (res.errCode == 0) { - uni.redirectTo({ - url: '/pageE/more/Address' - }); - // this.$refs.uToast.show({ - // title: res.message, - // type: 'success', - // // url: '/pageE/more/Address', - // callback() { - // uni.redirectTo({ - // url: '/pageE/more/Address' - // }); - // } - // }) + this.$refs.uToast.show({ + title: res.message, + type: 'success', + back: true, + }) } else { this.showToast(res.message, 'warning'); } diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue index 13b6c83..268be23 100644 --- a/components/shop/list/index.vue +++ b/components/shop/list/index.vue @@ -13,7 +13,7 @@ - + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 2ab7b73..1ee1c0f 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -241,6 +241,12 @@ export default { } } .mine-container { + @mixin image-size($image-width, $image-height) { + > image { + width: $image-width !important; + height: $image-height !important; + } + } @mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) { box-sizing: border-box; width: 690rpx; @@ -306,9 +312,24 @@ export default { } .content { justify-content: space-between; - > view { - text-align: center; - }; + > view:nth-child(1){ + @include image-size($image-width: 33rpx, $image-height: 36rpx); + } + > view:nth-child(2){ + @include image-size($image-width: 39rpx, $image-height: 33rpx); + } + > view:nth-child(3){ + @include image-size($image-width: 41rpx, $image-height: 33rpx); + } + > view:nth-child(4){ + @include image-size($image-width: 40rpx, $image-height: 35rpx); + } + > view:nth-child(5){ + @include image-size($image-width: 37rpx, $image-height: 37rpx); + } + > view:nth-child(6){ + @include image-size($image-width: 33rpx, $image-height: 35rpx); + } } } .tool { diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 994e236..739d2fe 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -43,7 +43,9 @@ - + + + @@ -89,6 +91,7 @@ export default { seckillTime: {}, // 秒杀时间 // couponGroupList: [], // 优惠券拼团分类 pinTuanPush: {}, // 拼团推荐 + activityInfo: {}, } }, onLoad() { @@ -98,6 +101,7 @@ export default { this.getRecommendedSpike(); this.getSpikeList(); this.getPinTuanPush(); + this.getStoreActivity(); }, methods: { sousuo() { @@ -170,6 +174,25 @@ export default { url: '/pageC/classify/index' }); }, + getStoreActivity() { + this.$u.api.getStoreActivity().then(res => { + if(res.errCode == 0) { + this.activityInfo = res.data; + } + }) + }, + activityLink({ type, id }) { + if(type == 0 || type == 2) return false; + // type 1 商品详情页, 2 店铺详情页 + const url = type == 1 ? 'pageB/sdetails/index' : ''; + let params = { id: id }; + // type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券 + if(type == 1) Object.assign(params, { type: 1 }); + this.$u.route({ + url: url, + params: params + }) + }, }, } @@ -251,13 +274,15 @@ export default { } } } - .lingquan { - width: 750rpx; - height: 177rpx; - margin-left: -33rpx; - margin-top: 29rpx; - background-color: #ececec; - } + .activity-view { + padding: 20rpx 30rpx; + text-align: center; + .lingquan { + background-color: #ececec; + width: 688rpx; + height: 138rpx; + } + } .cart { z-index: 9; position: fixed;