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

11

master
tianyi 9 hours ago
parent
d1ff98dd05
commit
85a7e287fa
2 changed files with 94 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      package2/shop/orderDetail.vue
  2. 25
      package2/shop/shopOrderList.vue

80
package2/shop/orderDetail.vue
View File

@ -91,7 +91,7 @@
平台服务费
</view>
<view class="">
￥12.00假的
￥{{(data.chouyong).toFixed(2)}}
</view>
</view>
</view>
@ -114,12 +114,20 @@
{{data.createTime | formatISOTime}}
</view>
</view>
<view style="display: flex;height: 30px;line-height: 30px;">
<view v-if="data.receiverPhone" style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
用户账号
</view>
<view style="flex: 1;text-align: right;">
13521030111假的
{{data.receiverPhone}}
</view>
</view>
<view v-if="data.orderType != 1" style="display: flex;height: 30px;line-height: 30px;">
<view style="width: 70px;">
团购信息
</view>
<view @tap="checkGroup" style="flex: 1;text-align: right;">
查看 >
</view>
</view>
</view>
@ -131,7 +139,7 @@
预计收入
</view>
<view style="color: red;font-weight: 700;">
￥10.32假的
￥{{(data.yujishouru).toFixed(2)}}
</view>
</view>
<view style="margin-top: 10px;">
@ -143,6 +151,27 @@
</view>
</view>
</view>
<!-- 拼团信息弹出层 -->
<uni-popup ref="groupPopup" background-color="#fff">
<view class="group-content">
<view style="height: 50px;text-align: center;line-height: 50px;font-size: 18px;font-weight: 700;">
<text>{{data.groupInfo.targetMembers}}人团</text><text>已拼{{data.groupInfo.currentMembers}}人</text>
</view>
<view class="kaituan2">
<view class="kaituan22" style="display: flex;">
<img @tap="goDetail(item)" v-for="(item,index) in data.groupInfo.groupIdList" :key="index" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt="" style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view>
<view v-if="(data.groupInfo.targetMembers - data.groupInfo.currentMembers) > 0" class="kaituan22">
<view class="weipincheng">
+
</view>
</view>
</view>
<view class="">
点击头像可查看拼团订单详情
</view>
</view>
</uni-popup>
</view>
</template>
@ -183,12 +212,15 @@
//商家预计收入的计算
let price = that.data.goodsAmount+that.data.packageFee
if(that.data.orderType == 1){
that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateOne
that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateOne
that.data.yujishouru = price - that.data.chouyong
}else{
that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateMore
that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore
that.data.yujishouru = price - that.data.chouyong
}
if(that.data.groupInfo != null){
that.data.groupInfo.groupIdList = that.data.groupInfo.groupOrderIds.split(',');
}
that.data.goodsNum = 0
for(let m=0;m<that.data.goodsList.length;m++){
@ -202,6 +234,14 @@
uni.hideLoading();
}).catch((res) => {});
},
goDetail(id){
this.shopId = id
this.getDetail()
this.$refs.groupPopup.close()
},
checkGroup(){
this.$refs.groupPopup.open()
},
mealServing(item){
let that = this
uni.showModal({
@ -314,4 +354,32 @@
float: right;
margin-left: 10px;
}
.group-content{
background: #fff;
width: 300px;
height: 500px;
}
.weipincheng {
width: 90rpx;
height: 90rpx;
background: #a6ffea;
border-radius: 90rpx;
text-align: center;
font-size: 60rpx;
font-weight: 700;
margin-left: -6rpx;
z-index: 97;
color: #02fbdd;
border: 1px solid #a6ffea;
line-height: 80rpx;
margin: 0 auto;
}
.kaituan2{
display: flex;
width: 90%;
margin: 40rpx auto;
}
.kaituan22{
flex: 1;
}
</style>

25
package2/shop/shopOrderList.vue
View File

@ -25,7 +25,7 @@
</view>
<view class="box1" @tap="goDetail(item.id)" v-for="(item,index) in orderList" :key="index">
<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
<view>
<view style="display: flex;">
{{'#' + item.numberCode}}
</view>
<view style="flex: 1;display: flex;padding-left: 20rpx;">
@ -52,9 +52,10 @@
</view>
</view>
</view>
<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" style="height: 40px;border-top: 1px solid #eee;display: flex;">
<view style="height: 40px;border-top: 1px solid #eee;display: flex;">
<view v-if="item.orderType != 1" style="margin: 10px 0;background: linear-gradient(90deg, #FF4500, #FFA07A);width: 20px;height: 20px;line-height: 20px;text-align: center;border-radius: 5px;color: #fff;">拼</view>
<view style="flex: 1;"></view>
<view style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 50px;height: 30px;border-radius: 7px;line-height: 30px;text-align: center;font-weight: 700;margin-top: 10px;">
<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 5px 0 0 10px;">
已出餐
</view>
</view>
@ -196,6 +197,9 @@
uni.hideLoading();
}).catch((res) => {});
},
openPopup(){
this.$refs.groupPopup.open()
},
mealServing(item){
let that = this
uni.showModal({
@ -231,10 +235,11 @@
})
},
handleStatusClick(index, value) {
this.getList()
if (this.currentIndex === index) return;
this.currentIndex = index;
this.searchForm.searchStatus = value
this.getList()
},
back() {
uni.navigateBack()
@ -356,6 +361,16 @@
margin: 20rpx auto;
background: #fff;
border-radius: 20rpx;
padding: 20rpx;
padding: 20rpx 20rpx 0;
}
.btn{
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
padding:0 5px;
height: 25px;
border-radius: 7px;
line-height: 25px;
text-align: center;
font-weight: 700;
margin-top: 10px;
}
</style>
Write Preview
Loading…
Cancel
Save