From 120e062fcdfb941d7ff75d26b398025dc6dc4eae Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Wed, 29 Jul 2020 19:01:10 +0800 Subject: [PATCH 1/2] send wash 7.29 --- common/api/user.js | 34 ++++- components/mine/comment/index.vue | 20 +-- pageE/mine/MemberServeCoupon.vue | 10 -- pageE/more/WriteComments.vue | 4 +- pageE/order/Comment.vue | 4 +- pageE/tool/SendWash.vue | 56 ++++--- pageE/tool/WashOrder.vue | 245 +++++++++++++++++++++--------- pageE/tool/washComment.vue | 98 ++++++++++++ pages.json | 13 ++ pages/mine/index.vue | 54 ++++--- 10 files changed, 391 insertions(+), 147 deletions(-) create mode 100644 pageE/tool/washComment.vue diff --git a/common/api/user.js b/common/api/user.js index b4754a0..60f9645 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -357,7 +357,39 @@ export default { return vm.$u.post('member/sendOrderConfirm', { id: id, }); - } + }, + // 提交送洗 + sendLaundrySave({ + type, + tid, + condition, + member_name, + member_phone, + area_info, + address_info, + goods_name, + order_id, + goods_id, + goods_images, + }) { + return vm.$u.post('member/sendLaundrySave', { + type: type, + tid: tid, + condition: condition, + member_name: member_name, + member_phone: member_phone, + area_info: area_info, + address_info: address_info, + goods_name: goods_name, + order_id: order_id, + goods_id: goods_id, + goods_images: goods_images, + }); + }, + // 送洗评论列表 + sendCommentList() { + return vm.$u.post('member/sendCommentList'); + }, } } } \ No newline at end of file diff --git a/components/mine/comment/index.vue b/components/mine/comment/index.vue index 667085b..70c0c0e 100644 --- a/components/mine/comment/index.vue +++ b/components/mine/comment/index.vue @@ -1,13 +1,13 @@ @@ -487,7 +580,7 @@ export default { background: rgba(236,236,236,1); border-radius: 10rpx; text-align: center; - > img { + > image { width: 54rpx; height: 49rpx; margin-top: 48rpx; diff --git a/pageE/tool/washComment.vue b/pageE/tool/washComment.vue new file mode 100644 index 0000000..17cc029 --- /dev/null +++ b/pageE/tool/washComment.vue @@ -0,0 +1,98 @@ + + + \ No newline at end of file diff --git a/pages.json b/pages.json index b073bf6..985e461 100644 --- a/pages.json +++ b/pages.json @@ -604,6 +604,19 @@ } } }, + { + "path": "tool/washComment", + "style": { + "navigationBarTitleText": "送洗评价", + "app-plus": { + "titleSize": "36px", + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF" + } + } + } + }, { "path": "tool/WashOrder", "style": { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 80aecbd..2ab7b73 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -7,7 +7,7 @@ {{ userInfo.member_nickname }} - + {{ userInfo.member_grade_name }} @@ -47,32 +47,32 @@ 我的订单 查看全部订单 - + - + 待支付 - + 已取消 - + 待收货 - + 试穿试送 - + 待评价 - + 售后 @@ -81,19 +81,19 @@ 我的工具 - + 送洗 - + 美甲 - + 足迹 - + 优惠券 @@ -102,19 +102,19 @@ 更多工具 - + 收货地址 - + 售后政策 - + 使用帮助 - + 投诉意见 @@ -189,10 +189,11 @@ export default { border-radius: 13rpx; align-items: center; padding: 0 17rpx 0 10rpx; - > img { + > image { margin-right: 9rpx; width: 20rpx; height: 22rpx; + flex-shrink: 0; } .rank-title { font-size: 16rpx; @@ -240,7 +241,7 @@ export default { } } .mine-container { - @mixin common-mine($content-padding-top, $content-padding-bottom, $image-height) { + @mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) { box-sizing: border-box; width: 690rpx; background: rgba(255,255,255,1); @@ -270,9 +271,11 @@ export default { display: flex; > view { text-align: center; - > img { + > image { + width: $image-width; height: $image-height; margin-bottom: 15rpx; + flex-shrink: 0; } > view { font-size: 22rpx; @@ -285,16 +288,19 @@ export default { @include common-mine( $content-padding-top: 22rpx, $content-padding-bottom: 30rpx, - $image-height: 36rpx + $image-height: 36rpx, + $image-width: 36rpx, ); .title { justify-content: space-between; .more { display: flex; align-items: center; - > img { + > image { + width: 19rpx; height: 19rpx; margin-left: 10rpx; + flex-shrink: 0; } } } @@ -309,7 +315,8 @@ export default { @include common-mine( $content-padding-top: 8rpx, $content-padding-bottom: 25rpx, - $image-height: 71rpx + $image-height: 71rpx, + $image-width: 71rpx, ); .content { > view:not(:last-child) { @@ -321,7 +328,8 @@ export default { @include common-mine( $content-padding-top: 8rpx, $content-padding-bottom: 48rpx, - $image-height: 71rpx + $image-height: 71rpx, + $image-width: 71rpx, ); .content { > view:not(:last-child) { 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 2/2] 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;