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

1

master
tianyi 1 month ago
parent
de9c55f5d4
commit
4aa397de35
5 changed files with 511 additions and 368 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. 5
      package1/buyFood/buyFood.vue
  2. 4
      package1/group/groupBuySingle.vue
  3. 298
      package1/order/orderDetail.vue
  4. 4
      package1/order/pendGroup.vue
  5. 4
      package1/runErrand/runErrand.vue

5
package1/buyFood/buyFood.vue
View File

@ -305,8 +305,9 @@
<view class="pay-popup">
<view class="content">
<view class="box1">
<view style="height: 70rpx;line-height: 70rpx;text-align: center;">
支付剩余时间 59:09
<view style="display: flex;align-items: center;justify-content: center;height: 70rpx;">
支付剩余时间
<uni-countdown :show-day="false" :hour="00" :minute="59" :second="59" />
</view>
<view
style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">

4
package1/group/groupBuySingle.vue
View File

@ -439,8 +439,8 @@
<view class="pay-popup" style="height: 580rpx;background: #fff;border-radius: 40rpx 40rpx 0 0;padding-top: 40rpx;">
<view class="content" style="height: 100%;margin-top:0">
<view class="box1">
<view style="height: 70rpx;line-height: 70rpx;text-align: center;">
支付剩余时间 59:09
<view style="display: flex;align-items: center;justify-content: center;height: 70rpx;">
支付剩余时间 <uni-countdown :show-day="false" :hour="00" :minute="59" :second="59" />
</view>
<view
style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">

298
package1/order/orderDetail.vue
View File

@ -16,11 +16,12 @@
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
{{orderDetail.shopName}}
</view>
<view style="display: flex;padding: 20rpx 0;background: #eee;border-radius: 20rpx;">
<view style="display: flex;padding: 20rpx 0;background: #f5f5f5;border-radius: 20rpx;">
<view class="goods-img1">
<img src="/static/images/img/shangpintu.png" alt="">
</view>
<view class="goods-content1" v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0">
<view class="goods-content1" v-for="(item1,index1) in orderDetail.goodsList" :key="index1"
v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0">
<view class="goods-name1">
{{item1.productName}}
</view>
@ -48,7 +49,8 @@
<view class="kaituan11">
<view class="kaituan1-title1">
差{{orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers}}人即可成团
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png" alt="" style="width: 120rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/21b403bd13414ce79ad73cf1c8e3de98.png"
alt="" style="width: 120rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
</view>
<view class="kaituan1-title11">
快呼唤小伙伴参加吧！
@ -56,16 +58,21 @@
</view>
<view class="kaituan21">
<view class="kaituan221">
<img 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;" />
<img 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 class="kaituan221">
<view class="weipincheng1" v-for="(item1,index1) in (orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers)" :key="index1">
<view class="weipincheng1"
v-for="(item1,index1) in (orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers)"
:key="index1">
+
</view>
</view>
</view>
<view class="kaituan41">
<button open-type="share" class="share-btn" style="background:transparent;border:none;color:inherit;font-size:inherit;display:inline-flex;align-items:center;">
<button open-type="share" class="share-btn"
style="background:transparent;border:none;color:inherit;font-size:inherit;display:inline-flex;align-items:center;">
分享至微信 <uni-icons type="weixin" size="15"></uni-icons>
</button>
</view>
@ -79,7 +86,8 @@
刷新 <uni-icons type="weixin" size="15"></uni-icons>
</view>
<view class="kaituan51">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png" alt="" style="width: 520rpx;height: 150rpx;margin: 0 auto;display: block;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c1f1b45c98fa4db1a1e5f98b3a0573c2.png"
alt="" style="width: 520rpx;height: 150rpx;margin: 0 auto;display: block;" />
</view>
</view>
</view>
@ -94,12 +102,24 @@
<view class="content">
<view class="box1" style="display: flex;min-height: 160rpx;">
<view class="status-img">
<img v-if="orderDetail.status == 0 || (orderDetail.status == 3 && orderDetail.deliveryType == 2)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6cf6fff020614ebebb34f7c371e11331.png" alt="" />
<img v-if="orderDetail.status == 2" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/35ff6276eb3a4e58b8baa724ca44d5dc.png" alt="" />
<img v-if="orderDetail.status == 5 || orderDetail.status == 8 || orderDetail.status == 12" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/dbfa6dc934e2414c912c67430d5f802c.png" alt="" />
<img v-if="orderDetail.status == 6" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/03d7e8d5914e4b9ca04728113900d1fe.png" alt="" />
<img v-if="orderDetail.status == 7 || orderDetail.status == 11" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/35ff6276eb3a4e58b8baa724ca44d5dc.png" alt="" />
<img v-if="(orderDetail.status == 3 && orderDetail.deliveryType == 1) || (orderDetail.status == 4 && orderDetail.deliveryType == 1)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0ab87a35cbca473997c679a023337df6.png" alt="" />
<img v-if="orderDetail.status == 0 || (orderDetail.status == 3 && orderDetail.deliveryType == 2)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6cf6fff020614ebebb34f7c371e11331.png"
alt="" />
<img v-if="orderDetail.status == 2"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/35ff6276eb3a4e58b8baa724ca44d5dc.png"
alt="" />
<img v-if="orderDetail.status == 5 || orderDetail.status == 8 || orderDetail.status == 12"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/dbfa6dc934e2414c912c67430d5f802c.png"
alt="" />
<img v-if="orderDetail.status == 6"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/03d7e8d5914e4b9ca04728113900d1fe.png"
alt="" />
<img v-if="orderDetail.status == 7 || orderDetail.status == 11"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/35ff6276eb3a4e58b8baa724ca44d5dc.png"
alt="" />
<img v-if="(orderDetail.status == 3 && orderDetail.deliveryType == 1) || (orderDetail.status == 4 && orderDetail.deliveryType == 1)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0ab87a35cbca473997c679a023337df6.png"
alt="" />
<!--
待支付 https://jewel-shop.oss-cn-beijing.aliyuncs.com/6cf6fff020614ebebb34f7c371e11331.png
订单取消 https://jewel-shop.oss-cn-beijing.aliyuncs.com/03d7e8d5914e4b9ca04728113900d1fe.png
@ -123,7 +143,8 @@
<text v-if="orderDetail.status == 12">订单已售后</text>
</view>
<view class="status-fu" v-if="orderDetail.deliveryInfo">
<view class="">预计<text>{{orderDetail.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达</view>
<view class="">
预计<text style="color:red;font-weight: 700;">{{orderDetail.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达</view>
<!-- <view class="">超过15分钟未支付，订单自动取消</view>
<view class="">您申请了取消订单，请等待商家同意</view>
<view class="">商家已同意取消订单，订单金额将原路返回</view>
@ -132,10 +153,12 @@
<view class="status-address" v-if="orderDetail.deliveryInfo">
送至 <text>{{orderDetail.deliveryInfo.receiverAddress}}</text>
</view>
<view class="status-btn" style="top: 0;" v-if="orderStatus(orderDetail)" @tap="returnPopupProp(orderDetail)">
<view class="status-btn" style="top: 0;" v-if="orderStatus(orderDetail)"
@tap="returnPopupProp(orderDetail)">
取消订单
</view>
<view class="status-btn" style="top: 0;" v-if="orderDetail.status == 5 && hasRefund == false" @tap="returnProducts(orderDetail)">
<view class="status-btn" style="top: 0;" v-if="orderDetail.status == 5 && hasRefund == false"
@tap="returnProducts(orderDetail)">
申请售后
</view>
<view class="status-btn" style="top: 70rpx;" @tap="refreah(orderDetail)">
@ -147,10 +170,14 @@
</view>
</view>
<view class="btn-box">
<view class="btn" v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null" @tap="openCode">
<view class="btn"
v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null"
@tap="openCode">
核销取餐码
</view>
<view class="btn" v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null" @tap="makeMeal">
<view class="btn"
v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null"
@tap="makeMeal">
立即备餐
</view>
<view class="btn" style="width: 40%;" v-if="orderDetail.status == 2" @tap="openAddFeePopup">
@ -172,11 +199,13 @@
取消申请
</view> -->
</view>
<view class="box1" v-if="orderDetail.mallRefundRecord != null && orderDetail.mallRefundRecord.length > 0">
<view class="box1"
v-if="orderDetail.mallRefundRecord != null && orderDetail.mallRefundRecord.length > 0">
<view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;">
退款/售后
</view>
<view style="display: flex;margin-top:10px;padding: 20rpx;background: #eee;border-radius: 20rpx;" v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
<view style="display: flex;margin-top:10px;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;"
v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
<view style="width: 100%;">
<view style="height: 80rpx;line-height: 80rpx;display: flex;">
@ -192,10 +221,12 @@
金额
</view>
<view style="color: #000;font-weight:700;">
{{item2.refundAmount}}
￥{{item2.refundAmount}}
</view>
</view>
<view v-for="(item3,index3) in item2.items" :key="index3" v-if="item2.items != null && item2.items.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<view v-for="(item3,index3) in item2.items" :key="index3"
v-if="item2.items != null && item2.items.length > 0"
style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;">
<view class="goods-img">
<img :src="item3.productPicture" alt="">
</view>
@ -251,7 +282,8 @@
{{item2.status == 0 ? '处理退款中' : item2.status == 1 ? '同意退款' : item2.status == 2 ? '拒绝退款' : item2.status == 3 ? '处理售后中' : item2.status == 4 ? '同意售后' : '拒绝售后' }}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="item2.successTime != null">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="item2.successTime != null">
<view style="flex: 1;color: #777;font-weight: 700;">
处理退款/售后时间
</view>
@ -265,14 +297,17 @@
</view>
<view class="box1">
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;" v-if="orderDetail.shopName != null">
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;"
v-if="orderDetail.shopName != null">
<text style="flex:1">{{orderDetail.shopName}}</text>
<img @tap="makeCall(orderDetail.shopPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 40rpx;height: 40rpx;margin-top: 14rpx;" />
</view>
<view v-for="(item1,index1) in orderDetail.goodsList" :key="index1" v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<view v-for="(item1,index1) in orderDetail.goodsList" :key="index1"
v-if="orderDetail.goodsList != null && orderDetail.goodsList.length > 0"
style="display: flex;padding: 20rpx;background: #f5f5f5;border-radius: 20rpx;">
<view class="goods-img">
<img :src="item1.productPicture" alt="">
</view>
@ -281,7 +316,7 @@
{{item1.productName}}
</view>
<view class="goods-content-center">
{{item1.specs}}
{{item1.specs | delNode}}
</view>
<view class="goods-content-bottom">
<view style="width: 50%;">
@ -294,7 +329,8 @@
</view>
</view>
<view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.packageFee != null && orderDetail.packageFee > 0">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.packageFee != null && orderDetail.packageFee > 0">
<view style="flex: 1;color: #777;font-weight: 700;">
打包费
</view>
@ -302,7 +338,8 @@
￥{{orderDetail.packageFee}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryType == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
配送费
</view>
@ -310,7 +347,8 @@
￥{{orderDetail.deliveryFee}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.userCouponNum > 0">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.userCouponNum > 0">
<view style="flex: 1;color: #777;font-weight: 700;">
优惠券
</view>
@ -319,7 +357,8 @@
</view>
</view>
</view>
<view style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;">
<view
style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;">
<view style="flex: 1;">
实付
</view>
@ -331,7 +370,8 @@
<view class="box1">
<view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.otherOrder == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.otherOrder == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
取件地址
</view>
@ -339,7 +379,8 @@
{{orderDetail.shopAddress}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.otherOrder == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.otherOrder == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
收件地址
</view>
@ -347,7 +388,8 @@
{{orderDetail.receiverAddress}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.otherOrder == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.otherOrder == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
件数
</view>
@ -355,7 +397,8 @@
{{orderDetail.deliveryInfo.allCount}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.otherOrder == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.otherOrder == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
服务类型
</view>
@ -363,7 +406,8 @@
快递/跑腿
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.numberCode != null">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.numberCode != null">
<view style="flex: 1;color: #777;font-weight: 700;">
订单号
</view>
@ -379,11 +423,13 @@
{{orderDetail.createTime | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryType == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
配送员
</view>
<view style="color: #000;font-weight: 700;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
<view style="color: #000;font-weight: 700;display: flex;"
v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
{{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}}
<img @tap="makeCall(orderDetail.deliveryInfo.workerPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
@ -393,7 +439,8 @@
未指定等待接单中
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId">
<view style="flex: 1;color: #777;font-weight: 700;">
配送员接单时间
</view>
@ -401,15 +448,18 @@
{{orderDetail.deliveryInfo.acceptTime | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1 && orderDetail.otherOrder == null">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryType == 1 && orderDetail.otherOrder == null">
<view style="flex: 1;color: #777;font-weight: 700;">
商家出餐时间
</view>
<view style="color: #000;font-weight: 700;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
<view style="color: #000;font-weight: 700;"
v-if="orderDetail.deliveryInfo && orderDetail.deliveryInfo.workerId != null && orderDetail.deliveryInfo.workerId != ''">
{{orderDetail.shopMakeTime ? orderDetail.shopMakeTime : '' | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId != '' && orderDetail.otherOrder == null">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId != '' && orderDetail.otherOrder == null">
<view style="flex: 1;color: #777;font-weight: 700;">
配送员到店时间
</view>
@ -417,7 +467,8 @@
{{orderDetail.deliveryInfo.arriveTime ? orderDetail.deliveryInfo.arriveTime : '' | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId != ''">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryInfo && orderDetail.deliveryType == 1 && orderDetail.deliveryInfo.workerId != ''">
<view style="flex: 1;color: #777;font-weight: 700;">
配送员取货时间
</view>
@ -425,7 +476,8 @@
{{orderDetail.deliveryInfo.getTime ? orderDetail.deliveryInfo.getTime : '' | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryType == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
送达时间
</view>
@ -433,7 +485,8 @@
{{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"
v-if="orderDetail.deliveryType == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
我的评价
</view>
@ -461,8 +514,7 @@
<view class="evaluate-list" v-for="(item,index) in orderDetail.comments" :key="index">
<view class="eval-title">
<view class="eval-icon">
<img :src="item.createByIcon"
alt="" />
<img :src="item.createByIcon" alt="" />
</view>
<view class="eval-name">
<view class="name1">
@ -486,7 +538,8 @@
<view class="eval-img">
<img @tap="largeImg" :src="item.picture" alt="">
</view>
<view class="reply-card" :class="{'expanded': isExpanded}" v-for="(item1,index1) in item.comments" :key="index1">
<view class="reply-card" :class="{'expanded': isExpanded}"
v-for="(item1,index1) in item.comments" :key="index1">
<!-- 标题行：商家回复 + 展开/收起按钮 -->
<view class="reply-header">
<!-- 回复内容区域（动态类控制展开/折叠） -->
@ -509,7 +562,8 @@
<uqrcode :hide='true' ref="uqrcode" size="160" sizeUnit="rpx" canvas-id="qrcode"
:value="orderDetail.id + '@@'+ orderDetail.shopId">
</uqrcode>
<img :src="newQRList" alt="" style="width: 330rpx;height: 330rpx;margin: 282rpx 0 0 136rpx;border: 20rpx solid rgba(222, 255, 248, 1);border-radius: 20rpx;">
<img :src="newQRList" alt=""
style="width: 330rpx;height: 330rpx;margin: 282rpx 0 0 136rpx;border: 20rpx solid rgba(222, 255, 248, 1);border-radius: 20rpx;">
</view>
</uni-popup>
@ -544,7 +598,8 @@
<view style="">
<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason"
style="width: 100%;height: 100rpx;padding: 10rpx;margin-top: 20rpx;"></textarea>
<view style="width: 120rpx;height: 120rpx;border: 1px solid #eee;text-align: center;line-height: 60px;">
<view
style="width: 120rpx;height: 120rpx;border: 1px solid #eee;text-align: center;line-height: 60px;">
<view class="upload-img" @tap="pictureAdd" style="">
<uni-icons type="camera" size="28" color="#777"></uni-icons>
</view>
@ -554,14 +609,19 @@
</view>
</view>
</view>
<!-- <view style="line-height: 60rpx;font-size: 24rpx;font-weight: 700;text-align: center;"> -->
<view style="margin-top: 20rpx; color: #ff5722; font-size: 24rpx; background: #fff5f5; padding: 10rpx 20rpx; border-radius: 10rpx;">
<view
style="margin-top: 20rpx; color: #ff5722; font-size: 24rpx; background: #fff5f5; padding: 10rpx 20rpx; border-radius: 10rpx;">
<uni-icons type="info" size="14" color="#ff5722"></uni-icons>
<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3) || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">
<text
v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3) || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">
取消订单需要商家同意
</text>
<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4" style="line-height: 50rpx;margin-top: 16rpx;">
<view v-if="payData.shopMakeTime == null && payData.otherOrder == null" style="text-align: right;">
<text v-else>请选择退款原因</text>
<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4"
style="line-height: 50rpx;margin-top: 16rpx;">
<view v-if="payData.shopMakeTime == null && payData.otherOrder == null"
style="text-align: right;">
<uni-icons type="info" size="14" color="#ff5722"></uni-icons>
<text style="display:inline-block;padding-left:5px;">
商家还未出餐
@ -594,8 +654,6 @@
</view>
</view>
</view>
<!-- </view> -->
<view class="btn" @tap="returnOrder()" style="margin-top: 20px;">
确认取消
</view>
@ -622,7 +680,8 @@
</view>
<view style="padding: 20rpx 40rpx;">
<view style="font-size: 28rpx;color: #777;margin-bottom: 20rpx;">请输入要增加的佣金金额（元）</view>
<input type="digit" v-model="additionalFee" placeholder="请输入金额" style="border: 1px solid #ccc;border-radius: 16rpx;height: 80rpx;line-height: 80rpx;padding: 0 20rpx;font-size: 32rpx;text-align: center;" />
<input type="digit" v-model="additionalFee" placeholder="请输入金额"
style="border: 1px solid #ccc;border-radius: 16rpx;height: 80rpx;line-height: 80rpx;padding: 0 20rpx;font-size: 32rpx;text-align: center;" />
</view>
<view class="btn" @tap="submitAddFee()">
去支付
@ -638,17 +697,21 @@
<view style="height: 70rpx;line-height: 70rpx;text-align: center;">
增加配送佣金
</view>
<view style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">
<view
style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">
￥<text style="font-size: 60rpx;">{{additionalFee || '0.00'}}</text>
</view>
</view>
<view class="btn" style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" @tap="addFeeWxPayment">
<view class="btn"
style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;"
@tap="addFeeWxPayment">
确认付款
</view>
<view class="box1" style="display: flex;padding: 40rpx;">
<view style="flex: 1;">
<view style="height: 42rpx;line-height: 42rpx;display: flex;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" alt="" style="width: 42rpx;height: 42rpx;margin-right: 20rpx;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png"
alt="" style="width: 42rpx;height: 42rpx;margin-right: 20rpx;" />
<text style="font-size: 30rpx;font-weight: 700;">微信支付</text>
</view>
<view style="text-align: right;margin-left: 60rpx;color: #777;width: 146rpx;">
@ -656,7 +719,8 @@
</view>
</view>
<view style="width: 36rpx;padding-top: 20rpx;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 36rpx;height: 36rpx;" />
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png"
alt="" style="width: 36rpx;height: 36rpx;" />
</view>
</view>
@ -709,7 +773,7 @@
const minute = String(date.getMinutes()).padStart(2, '0');
// 拼接格式：日-日-时:分
return `${day}-${hour}:${minute}`;
return `${day}日${hour}:${minute}`;
},
formatTime(value) {
if (!value) return '';
@ -736,6 +800,23 @@
// 拼接格式：年-月-日 时:分:秒
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
},
delNode(data) {
// 1. 统一转为字符串
let str;
if (typeof data === 'object' && data !== null) {
// 对象或数组 → JSON 字符串
str = JSON.stringify(data);
} else if (typeof data === 'string') {
str = data;
} else {
// 其他类型（数字、布尔等）先转字符串
str = String(data);
}
// 2. 删除所有大括号 { } 和双引号 "
const result = str.replace(/[{}"]/g, '');
return result;
}
},
onLoad(option) {
@ -763,7 +844,8 @@
let targetMembers = that.orderDetail.groupInfo.targetMembers;
let shopItemStr = encodeURIComponent(JSON.stringify(that.shopItem));
let isFTF = that.orderDetail.orderType == 3 ? 1 : 0;
let path = `/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`;
let path =
`/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`;
return {
title: '快来一起拼单吧！',
@ -889,7 +971,8 @@
}
},
orderStatus(item) {
if(item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == 1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4){
if (item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType ==
1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4) {
return true;
}
return false;
@ -984,10 +1067,19 @@
this.$refs.returnPopupBuy.open('bottom');
},
returnOrder() {
if(sellTime == 5 && remark == ""){
that.tui.toast("请填写备注");
return
}
this.$refs.returnPopup.close();
let item = this.payData
let that = this
that.tui.request("/mall/order/cancel", "POST", {refundType:this.refundType,refundTypeStatus:this.refundTypeStatus,orderId:item.id,userId:uni.getStorageSync('id')}, false, true).then((res) => {
that.tui.request("/mall/order/cancel", "POST", {
refundType: this.refundType,
refundTypeStatus: this.refundTypeStatus,
orderId: item.id,
userId: uni.getStorageSync('id')
}, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("取消订单成功");
that.getOrderDetail(item.id)
@ -1003,9 +1095,17 @@
this.$refs.returnPopupBuy.close();
let item = this.payData
let that = this
that.tui.request("/mall/order/cancel", "POST", {refundType:3,refundTypeStatus:4,orderId:item.id,userId:uni.getStorageSync('id')}, false, true).then((res) => {
that.tui.request("/mall/order/cancel", "POST", {
refundType: 3,
refundTypeStatus: 4,
orderId: item.id,
userId: uni.getStorageSync('id')
}, false, true).then((res) => {
if (res.code == 200) {
that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.payData.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => {
that.tui.request("/app/shop/getShopInfoById", "POST", {
id: that.payData.shopId,
regionId: JSON.parse(uni.getStorageSync('area')).id
}, false, true).then((res1) => {
if (res1.code == 200) {
uni.hideLoading();
// 类似普通订单结算逻辑
@ -1013,11 +1113,14 @@
for (let i = 0; i < that.payData.goodsList.length; i++) {
let productPrice = that.payData.goodsList[i].price
for (let a = 0; a < res1.result.products.length; a++) {
if(res1.result.products[a].id == that.payData.goodsList[i].productId){
if (res1.result.products[a].id == that.payData.goodsList[i]
.productId) {
let priceToUse = 0;
if (res1.result.products[a].attributeListPrice) {
try {
let pObj = typeof res1.result.products[a].attributeListPrice === 'string' ? JSON.parse(res1.result.products[a].attributeListPrice) :
let pObj = typeof res1.result.products[a]
.attributeListPrice === 'string' ? JSON.parse(res1
.result.products[a].attributeListPrice) :
res1.result.products[a].attributeListPrice;
if (Array.isArray(pObj) && pObj.length > 0) {
priceToUse = parseFloat(pObj[0].specPrice);
@ -1044,8 +1147,10 @@
});
}
uni.navigateTo({
url: '/package1/buyFood/buyFood?cart=' + encodeURIComponent(JSON.stringify(cartItems)) +
'&shopItem=' + encodeURIComponent(JSON.stringify(res1.result.shop)) + '&packageFee=' +
url: '/package1/buyFood/buyFood?cart=' + encodeURIComponent(
JSON.stringify(cartItems)) +
'&shopItem=' + encodeURIComponent(JSON.stringify(res1
.result.shop)) + '&packageFee=' +
that.payData.packageFee
});
} else {
@ -1076,7 +1181,8 @@
that.tui.request("/mall/order/detail/" + id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
that.orderDetail = res.result;
if(that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > 0){
if (that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length >
0) {
for (let i = 0; i < that.orderDetail.mallRefundRecord.length; i++) {
if (that.orderDetail.mallRefundRecord[i].status >= 3) {
that.hasRefund = true
@ -1087,7 +1193,10 @@
//还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开)
if (that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2) {
that.pintuan = true;
that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.orderDetail.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => {
that.tui.request("/app/shop/getShopInfoById", "POST", {
id: that.orderDetail.shopId,
regionId: JSON.parse(uni.getStorageSync('area')).id
}, false, true).then((res1) => {
if (res1.code == 200) {
that.shopItem = res1.result.shop
} else {
@ -1101,7 +1210,8 @@
that.orderDetail.userCouponNum = 0
if (that.orderDetail.userCoupon.length > 0) {
for (let i = 0; i < that.orderDetail.userCoupon.length; i++) {
that.orderDetail.userCouponNum += Number(that.orderDetail.userCoupon[i].discountAmount)
that.orderDetail.userCouponNum += Number(that.orderDetail.userCoupon[i]
.discountAmount)
}
}
that.$forceUpdate();
@ -1206,7 +1316,10 @@
// 模拟支付成功(用于测试环境)
if (res.code == 404 || res.code == 500 || res.code == 400 || !res.code) {
that.$refs.addFeePayPopup.close();
uni.showToast({ title: '支付成功(模拟)', icon: 'none' });
uni.showToast({
title: '支付成功(模拟)',
icon: 'none'
});
setTimeout(() => {
that.callAddFeeApi();
}, 1500);
@ -1279,7 +1392,7 @@
.title-sreach {
width: 100%;
display: flex;
height: 200rpx;
height: 260rpx;
position: relative;
}
@ -1288,6 +1401,7 @@
bottom: 0;
left: 0;
}
.box1 {
width: 95%;
margin: 0 auto 20rpx;
@ -1295,6 +1409,7 @@
border-radius: 20rpx;
padding: 20rpx;
}
.goods-img {
width: 160rpx;
height: 160rpx;
@ -1306,6 +1421,7 @@
height: 100%;
}
}
.goods-content {
flex: 1;
padding-left: 20rpx;
@ -1321,47 +1437,56 @@
margin: 16rpx 0;
color: #777;
}
.goods-content-bottom {
display: flex;
line-height: 56rpx;
color: #777;
}
.pintuan-left-price {
width: 50%;
text-align: right;
font-weight: 700;
color: #000;
}
.status-img {
width: 84rpx;
height: 84rpx;
img {
width: 84rpx;
height: 84rpx;
background-size: 100%;
}
}
.status-text {
flex: 1;
position: relative;
padding-left: 20rpx;
}
.status-zhu {
font-size: 32rpx;
font-weight: 700;
}
.status-fu {
height: 50rpx;
line-height: 50rpx;
}
.status-address {
font-weight: 700;
}
.status-btn {
position: absolute;
top: 20rpx;
right: 0;
background: #eee;
background: #f5f5f5;
width: 130rpx;
height: 50rpx;
text-align: center;
@ -1371,11 +1496,13 @@
border: 1px solid #777;
font-size: 20rpx;
}
.btn-box {
height: auto;
display: flex;
margin-bottom: 10px;
}
.btn {
width: 90%;
height: 100rpx;
@ -1387,12 +1514,14 @@
margin: 0 auto;
font-weight: 700;
}
.img-popup-content {
width: 600rpx;
height: 800rpx;
background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/73e684e3319c468d9252461ba3c9e95b.png') no-repeat;
background-size: 100%;
}
.evaluate-content {
width: 600rpx;
height: 800rpx;
@ -1427,7 +1556,9 @@
background: #fff;
border-radius: 20rpx;
padding: 20rpx;
position: absolute;top: 450rpx;left: 2.5%;
position: absolute;
top: 450rpx;
left: 2.5%;
}
.goods-img1 {
@ -1502,6 +1633,7 @@
line-height: 80rpx;
margin: 0 auto;
}
.kaituan11 {
display: flex;
height: 70rpx;
@ -1509,10 +1641,12 @@
font-weight: 700;
margin-top: 20rpx;
}
.kaituan1-title1 {
position: relative;
margin-left: 20rpx;
}
.kaituan1-title11 {
font-size: 24rpx;
background: rgba(224, 255, 222, 0.65);
@ -1524,20 +1658,24 @@
text-align: center;
margin: 10rpx 0 0 20rpx;
}
.kaituan21 {
display: flex;
width: 90%;
margin: 40rpx auto;
}
.kaituan221 {
flex: 1;
}
.kaituan31 {
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: #777;
}
.kaituan41 {
width: 95%;
height: 100rpx;
@ -1549,9 +1687,11 @@
font-weight: 700;
margin: 20rpx auto;
}
.kaituan51 {
margin: 80rpx 0 40rpx;
}
.evaluate-list {
margin-top: 40rpx;
}
@ -1610,6 +1750,7 @@
margin-right: 20rpx;
}
}
.car-close {
width: 60rpx;
height: 60rpx;
@ -1625,6 +1766,7 @@
font-size: 28rpx;
font-weight: 700;
}
.share-btn::after {
border: 0;
}

4
package1/order/pendGroup.vue
View File

@ -69,8 +69,8 @@
</view>
</view>
</view>
<view class="kaituan3">
剩余<text style="font-size: 32rpx;font-weight: 700;padding: 0 20rpx;color: red;">23:59:23</text>结束
<view class="kaituan3" style="display: flex;margin-left: auto;margin-right: auto;width: 50%;">
剩余<uni-countdown :show-day="false" :hour="23" :minute="59" :second="59" :font-size="16" color="red" />结束
</view>
<view class="kaituan4">
分享至微信 <uni-icons type="weixin" size="15"></uni-icons>

4
package1/runErrand/runErrand.vue
View File

@ -285,8 +285,8 @@
<view class="pay-popup">
<view class="content2">
<view class="box1">
<view style="height: 70rpx;line-height: 70rpx;text-align: center;">
支付剩余时间 59:09
<view style="display: flex;align-items: center;justify-content: center;height: 70rpx;">
支付剩余时间 <uni-countdown :show-day="false" :hour="00" :minute="59" :second="59" />
</view>
<view style="height: 90rpx;line-height: 90rpx;text-align: center;font-weight: 700;font-size: 30rpx;">
￥<text style="font-size: 60rpx;">{{backendTotalAmount ? backendTotalAmount.toFixed(2) : totalAmountCalc.toFixed(2)}}</text>

Write Preview
Loading…
Cancel
Save