root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
tianyi 3 weeks ago
parent
080b6163f1
commit
2f496da219
3 changed files with 30 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package2/shop/merchantCenter.vue
  2. 10
      package2/shop/orderDetail.vue
  3. 36
      package2/shop/shopOrderList.vue

2
package2/shop/merchantCenter.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<view class="title2"> <view class="title2">
<view class="title22"> <view class="title22">
{{shop.shopName}} {{shop.shopName == undefined ?"":shop.shopName}}
</view> </view>
<view class="title33" @tap="updateStatus"> <view class="title33" @tap="updateStatus">
{{businessStatus == '1'?'暂停营业':'正常营业'}} {{businessStatus == '1'?'暂停营业':'正常营业'}}

10
package2/shop/orderDetail.vue
View File

@ -13,8 +13,8 @@
</view> </view>
<view class="content"> <view class="content">
<view class="box1" style="display: flex;font-size: 28rpx;font-weight: 700;"> <view class="box1" style="display: flex;font-size: 28rpx;font-weight: 700;">
<text>{{'#'+data.numberCode}}</text> <text v-if="item.numberCode" style="margin-left: 20rpx;">{{'#'+data.numberCode}}</text>
<text style="margin: 0 20rpx;">期望送达</text> <text style="margin-right: 20rpx;">期望送达</text>
<text>明天 06:30</text> <text>明天 06:30</text>
<text style="flex: 1;text-align: right;color: red;"> <text style="flex: 1;text-align: right;color: red;">
{{data.status == 0?'待支付':data.status == 2?'待配送员接单':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)?'待出餐':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime != null)?'待取货':(data.status == 3 && data.deliveryType == 2)?'待消费':data.status == 4?'待送达':data.status == 5?'已完成':data.status == 7?'待同意退款':data.status == 8?'已退款':data.status == 6?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}} {{data.status == 0?'待支付':data.status == 2?'待配送员接单':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)?'待出餐':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime != null)?'待取货':(data.status == 3 && data.deliveryType == 2)?'待消费':data.status == 4?'待送达':data.status == 5?'已完成':data.status == 7?'待同意退款':data.status == 8?'已退款':data.status == 6?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}}
@ -25,8 +25,8 @@
{{data.deliveryType == 2?'自取订单':'配送订单'}} {{data.deliveryType == 2?'自取订单':'配送订单'}}
</view> </view>
<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;"> <view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
<text style="flex: 1;">配送员：{{data.deliveryInfo.workerName}}</text> <text style="flex: 1;">配送员：{{(data.deliveryInfo.workerName == 'null' || !data.deliveryInfo.workerName) ?"":data.deliveryInfo.workerName}}</text>
<view class=""> <view class="" v-if="!data.deliveryInfo">
<img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 20rpx;" /> <img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 20rpx;" />
</view> </view>
</view> </view>
@ -122,7 +122,7 @@
{{data.receiverPhone}} {{data.receiverPhone}}
</view> </view>
</view> </view>
<view v-if="data.orderType != 1" style="display: flex;height: 60rpx;line-height: 60rpx;"> <view v-if="data.orderType != 1 && data.groupInfo != null" style="display: flex;height: 60rpx;line-height: 60rpx;">
<view style="width: 140rpx;"> <view style="width: 140rpx;">
团购信息 团购信息
</view> </view>

36
package2/shop/shopOrderList.vue
View File

@ -17,23 +17,24 @@
<view class="status-list"> <view class="status-list">
<view v-for="(item, index) in statusList" :key="index" class="status-item" <view v-for="(item, index) in statusList" :key="index" class="status-item"
:class="{ 'active': currentIndex == item.value }" :class="{ 'active': currentIndex == item.value }"
:style="{'width':item.name == '全部'?'14vw':'20vw'}"
@click="handleStatusClick(item.value)"> @click="handleStatusClick(item.value)">
<text class="status-text">{{ item.name }}</text> <text class="status-text">{{ item.name }}</text>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="box1" @tap="goDetail(item.id)" v-for="(item,index) in orderList" :key="index"> <view class="box1" @tap="goDetail(item)" v-for="(item,index) in orderList" :key="index">
<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;"> <view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
<view style="display: flex;"> <view style="display: flex;padding-right: 20rpx;" v-if="item.numberCode">
{{'#' + item.numberCode}} {{'#' + item.numberCode}}
</view> </view>
<view style="flex: 1;display: flex;padding-left: 20rpx;"> <view style="flex: 1;display: flex;">
{{item.createTime | formatISOTime}} {{item.createTime | formatISOTime}}
<!-- <text>已退款</text> --> <!-- <text>已退款</text> -->
</view> </view>
<view> <view>
{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}} {{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake != 1)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
</view> </view>
</view> </view>
<view style="height: 120rpx;padding-top: 20rpx;"> <view style="height: 120rpx;padding-top: 20rpx;">
@ -56,7 +57,7 @@
<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:80rpx;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))"> <view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:80rpx;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))">
{{item.deliveryType == 1?'配送':'自取'}} {{item.deliveryType == 1?'配送':'自取'}}
</view> </view>
<view v-if="item.orderType != 1" @tap.stop="getGroupOrders(item.id)" class="pinzi"> <view v-if="item.orderType != 1 && item.groupInfo != null" @tap.stop="getGroupOrders(item.id)" class="pinzi">
拼 拼
</view> </view>
<view style="flex: 1;"></view> <view style="flex: 1;"></view>
@ -155,13 +156,13 @@
checked: true checked: true
}, },
{ {
name: '待消费', name: '待出餐',
value: 2, value: 13,
checked: false checked: false
}, },
{ {
name: '待出餐', name: '待退/售后',
value: 13, value: 7,
checked: false checked: false
}, },
{ {
@ -180,8 +181,8 @@
checked: false checked: false
}, },
{ {
name: '待退款', name: '待消费',
value: 7, value: 2,
checked: false checked: false
}, },
{ {
@ -253,7 +254,12 @@
} else { } else {
that.orderList = [...that.orderList, ...res.result.records] that.orderList = [...that.orderList, ...res.result.records]
} }
for (let i = 0; i < that.orderList.length; i++) { for (let i = 0; i < that.orderList.length; i++) {
if (that.currentIndex == 7) {
that.orderList[i].goodsList = that.orderList[i].items
}
console.log('哈哈哈哈哈1',that.orderList)
that.orderList[i].goodsNum = 0 that.orderList[i].goodsNum = 0
for (let m = 0; m < that.orderList[i].goodsList.length; m++) { for (let m = 0; m < that.orderList[i].goodsList.length; m++) {
that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity
@ -315,7 +321,13 @@
} }
}); });
}, },
goDetail(id) { goDetail(item) {
let id = ""
if(this.currentIndex == 7){
id = item.mallOrder.id
}else{
id = item.id
}
uni.navigateTo({ uni.navigateTo({
url: '/package2/shop/orderDetail?id=' + id url: '/package2/shop/orderDetail?id=' + id
}) })

Write Preview
Loading…
Cancel
Save