theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing bug 8.12

Browse Source
This commit is contained in:
ghusermoon
2020-08-12 18:38:14 +08:00
parent eb1dce5d6b
commit c03fff99e0
9 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pageE/mine/MineConcerns.vue
View File

@@ -3,8 +3,8 @@
<view class="concerns-container">
<view v-for="(info, index) in list" :key="index">
<view class="daren-item">
<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
<text class="name" @click="viewDetails(info.friend_tomid)">{{ info.friend_tomname || '' }}</text>
<image class="head" :src="info.friend_tomavatar" @click="viewDetails({ id: info.friend_tomid, type: info.role })"></image>
<text class="name" @click="viewDetails({ id: info.friend_tomid, type: info.role })">{{ info.friend_tomname || '' }}</text>
<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
</view>
</view>
@@ -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
});
},

6
pageE/order/Details.vue
View File

@@ -67,8 +67,10 @@
<view>创建时间：{{ orderInfo.add_time | date}}</view>
</view>
</view>
<view class="btn" v-if="['1', '2', '4', '6', '8'].indexOf(orderstate) >= 0">
<view class="cancel" v-if="(orderstate == '4' || orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<!-- '4', -->
<view class="btn" v-if="['1', '2', '6', '8'].indexOf(orderstate) >= 0">
<!-- orderstate == '4' || -->
<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>

1
pageE/order/RefundOrder.vue
View File

@@ -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) {

14
pageE/tool/MineHistory.vue
View File

@@ -6,12 +6,16 @@
<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
<view class="item-title" @click="viewStoreDetails(item.store_id)">
<image :src="item.store_avatar"></image>
<view class="u-line-2">{{ item.store_name }}</view>
<view class="u-line-1">{{ item.store_name }}</view>
</view>
<image :src="item.goods_image" class="item-image" @click="viewGoodsDetails(item.goods_id)"></image>
<view class="item-info" @click="viewGoodsDetails(item.goods_id)">
<view class="info-name u-line-1">{{ item.goods_name }}</view>
<u-icon name="trash" color="#666" size="32"></u-icon>
</view>
<!-- <view @click.stop="delArticle(item.article_id)">
</view> -->
</view>
</view>
<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
@@ -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;
// }
}
}
}

33
pageE/tool/SendWash.vue
View File

@@ -21,7 +21,7 @@
<view class="order-status">{{ item.order_status | viewStatus }}</view>
</view>
<view class="order-info">
<image :src="item.goods_image"></image>
<image :src="type == 1 ? item.goods_image : item.images[0]"></image>
<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>
@@ -40,13 +40,9 @@
<view>商家在正路途中，请耐心等待</view>
</view>
</view>
<view class="send-btn" v-if="item.order_status == 20 || item.order_status == 50">
<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
确认完成
</view>
<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">
去评价
</view>
<view class="send-btn" v-if="item.order_status == 20 || (item.order_status == 50&& !item.comment)">
<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">确认完成</view>
<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">去评价</view>
</view>
</view>
</scroll-view>
@@ -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;
}
}
}