From c03fff99e07168172124f669459e0c09929d9637 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Wed, 12 Aug 2020 18:38:14 +0800 Subject: [PATCH] fixing bug 8.12 --- common/api/user.js | 4 ++-- components/comment/index.vue | 2 +- components/shop/list/item.vue | 2 +- pageB/sdetails/index.vue | 8 ++++---- pageE/mine/MineConcerns.vue | 11 ++++++----- pageE/order/Details.vue | 6 ++++-- pageE/order/RefundOrder.vue | 1 + pageE/tool/MineHistory.vue | 14 +++++++++----- pageE/tool/SendWash.vue | 33 ++++++++++++++++++--------------- 9 files changed, 46 insertions(+), 35 deletions(-) diff --git a/common/api/user.js b/common/api/user.js index 899a148..5fc0775 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -408,8 +408,8 @@ export default { return vm.$u.post('article/articleCollectList'); }, // 关注用户列表 - attentionMemberList() { - return vm.$u.post('member/attentionMemberList'); + attentionMemberList({ page = 1 } = {}) { + return vm.$u.post('member/attentionMemberList', { page: page }); }, } } diff --git a/components/comment/index.vue b/components/comment/index.vue index 3795916..f93bb87 100644 --- a/components/comment/index.vue +++ b/components/comment/index.vue @@ -2,7 +2,7 @@ - {{ content.geval_frommembername }} + {{ content.member_nickname }} diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue index 2a4e499..315d431 100644 --- a/components/shop/list/item.vue +++ b/components/shop/list/item.vue @@ -34,7 +34,7 @@ export default { url: 'pageB/sdetails/index', params: { id: this.info.goods_id, - type: 1, + // type: 1, } }) } diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index fb20226..aa62571 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -488,7 +488,7 @@ export default { * @params {Number} num 数量 * @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀） **/ - settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) { + async settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) { if(type != 'involvement') { if(!this.showSpec) { this.showSpec = true; @@ -517,14 +517,14 @@ export default { if(this.type == 2) { if(type == 'involvement') { // 验证能否拼团 - let status = this.pintuanVerify({ + const whether = await this.pintuanVerify({ pintuan_id: this.pintuan_id, pintuangroup_headid: this.involvemenGroupInfo[0].user_id }).then(status => { if(status != 0) return true; + else return false; }) - // console.log(status); - if(status) return false; + if(whether) return false; this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id); Object.assign(params, { pintuan_id: this.pintuan_id, diff --git a/pageE/mine/MineConcerns.vue b/pageE/mine/MineConcerns.vue index 362fecd..c3886e5 100644 --- a/pageE/mine/MineConcerns.vue +++ b/pageE/mine/MineConcerns.vue @@ -3,8 +3,8 @@ - - {{ info.friend_tomname || '' }} + + {{ info.friend_tomname || '' }} 取消关注 @@ -31,14 +31,15 @@ export default { this.$u.api.attentionMemberList().then(res => { uni.stopPullDownRefresh(); if(res.errCode == 0) { - this.list = res.data; + this.list = res.data.data; } else { this.list = []; } }) }, - viewDetails(id) { - this.$u.route('pageB/details/index', { + viewDetails({ id, type }) { + let src = type == 3 ? 'pageB/details/index' : 'pageC/merchant/index'; + this.$u.route(src, { id: id }); }, diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue index d1155ef..5667811 100644 --- a/pageE/order/Details.vue +++ b/pageE/order/Details.vue @@ -67,8 +67,10 @@ 创建时间：{{ orderInfo.add_time | date}} - - 申请退款 + + + + 申请退款 查看物流 确认收货 立即评价 diff --git a/pageE/order/RefundOrder.vue b/pageE/order/RefundOrder.vue index fe9319b..16c239c 100644 --- a/pageE/order/RefundOrder.vue +++ b/pageE/order/RefundOrder.vue @@ -75,6 +75,7 @@ export default { }) // console.log(goodsList); this.goods = goodsList[0]; + this.num = this.goods.goods_num; console.log(this.goods); }, getOrderInfo(id) { diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue index cfdf1e6..dfcb728 100644 --- a/pageE/tool/MineHistory.vue +++ b/pageE/tool/MineHistory.vue @@ -6,12 +6,16 @@ - {{ item.store_name }} + {{ item.store_name }} {{ item.goods_name }} + + @@ -126,10 +130,10 @@ export default { font-size: 22rpx; color: rgba(51,51,51,1); } - > image { - width: 37rpx; - height: 8rpx; - } + // > image { + // width: 37rpx; + // height: 8rpx; + // } } } } diff --git a/pageE/tool/SendWash.vue b/pageE/tool/SendWash.vue index e07c7e8..5e088f1 100644 --- a/pageE/tool/SendWash.vue +++ b/pageE/tool/SendWash.vue @@ -21,7 +21,7 @@ {{ item.order_status | viewStatus }} - + 骑手名字：{{ item.takeawayer_name || '' }} 联系方式：{{ item.takeawayer_mobile || '' }} @@ -40,13 +40,9 @@ 商家在正路途中，请耐心等待 - - - 确认完成 - - - 去评价 - + + 确认完成 + 去评价 @@ -87,6 +83,7 @@ export default { timer: true, commentList: [], swiperHeight: '', + type: 1, // 1 平台 2 实体店 } }, components: { @@ -139,9 +136,9 @@ export default { }, methods: { async sendLaundryOrderList({ load = 'reload' } = {}) { - let type = this.list[0].name == '平台历史订单' ? 1 : 2; + // let type = this.list[0].name == '平台历史订单' ? 1 : 2; const res = await this.$u.api.sendLaundryOrderList({ - type: type, + type: this.type, page: this.page, }) uni.stopPullDownRefresh(); @@ -214,8 +211,10 @@ export default { }, replaces(e){ if(e == 1){ + this.type = 2; this.$set(this.list,0,{name: '实体店历史订单'} ) } else { + this.type = 1; this.$set(this.list,0,{name: '平台历史订单'} ) } this.sendLaundryOrderList(); @@ -322,17 +321,21 @@ export default { display: flex; justify-content: flex-end; margin-top: 30rpx; - .btn{ + .btn { + box-sizing: border-box; width: 154rpx; height: 54rpx; border-radius: 49rpx; - transform: translate(-50%, 0); + // transform: translate(-50%, 0); font-size: 26rpx; border: 1rpx solid rgba(255,120,15,1); color:rgba(255,120,15,1); - text-align: center; - line-height: 54rpx; - margin-right: -80rpx; + // text-align: center; + // line-height: 54rpx; + // margin-right: -80rpx; + display: flex; + align-items: center; + justify-content: center; } } }