wangfukang 1 month ago
parent
commit
78db033fba
  1. 15
      package1/order/orderDetail.vue
  2. 4
      package1/order/orderList.vue
  3. 3
      package1/order/returnOrder.vue
  4. 2
      package1/runErrand/runErrand.vue

15
package1/order/orderDetail.vue

@ -72,7 +72,7 @@
alt="" alt=""
style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" /> style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
</view> </view>
<view class="kaituan221"> <view class="kaituan221 kaituan-plus-list">
<view class="weipincheng1" <view class="weipincheng1"
v-for="(item1,index1) in (orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers)" v-for="(item1,index1) in (orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers)"
:key="index1"> :key="index1">
@ -2738,6 +2738,19 @@
margin: 12rpx 18rpx; margin: 12rpx 18rpx;
} }
.kaituan-plus-list {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
gap: 14rpx;
}
.kaituan-plus-list .weipincheng1 {
flex: 0 0 90rpx;
margin: 0;
}
.kaituan31 { .kaituan31 {
min-height: 80rpx; min-height: 80rpx;
line-height: 80rpx; line-height: 80rpx;

4
package1/order/orderList.vue

@ -126,7 +126,7 @@
<view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;"> <view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;">
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼塘' :"饭团"}} {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '鱼塘' :"饭团"}}
</view> </view>
{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '鱼塘订单' : item.shopName}} {{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 3 ? '鱼塘订单' : item.shopName}}
</view> </view>
<view v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;"> <view v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
<view class="goods-img"> <view class="goods-img">
@ -163,7 +163,7 @@
</view> </view>
</view> </view>
<view v-if="item.status != 6" style="height: 80rpx;border-bottom: 1px solid rgba(247, 248, 248, 0.6);display: flex;line-height: 80rpx;"> <view v-if="item.status != 6" style="height: 80rpx;border-bottom: 1px solid rgba(247, 248, 248, 0.6);display: flex;line-height: 80rpx;">
<view v-if="item.otherOrder == null" style="flex: 1;font-weight: 700;"> <view v-if="item.otherOrder == null || item.otherOrder == 2" style="flex: 1;font-weight: 700;">
<text v-if="tab1Checked != 'fantuan'">创建时间:</text>{{item.createTime | formatTime}} <text v-if="tab1Checked != 'fantuan'">创建时间:</text>{{item.createTime | formatTime}}
</view> </view>
<view style="font-weight: 700;"> <view style="font-weight: 700;">

3
package1/order/returnOrder.vue

@ -383,6 +383,9 @@
onLoad(option) { onLoad(option) {
if (option.order) { if (option.order) {
this.orderDetail = JSON.parse(decodeURIComponent(option.order)); this.orderDetail = JSON.parse(decodeURIComponent(option.order));
if(this.orderDetail.deliveryType == 2){
this.sellTime = 2
}
this.normalizeOrderCouponAmount() this.normalizeOrderCouponAmount()
this.updateRefundShowAmount() this.updateRefundShowAmount()
} }

2
package1/runErrand/runErrand.vue

@ -165,7 +165,7 @@
<view v-if="isKuaidi"> <view v-if="isKuaidi">
<view style="line-height:70rpx;">取件码</view> <view style="line-height:70rpx;">取件码</view>
<view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;"> <view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;">
<input type="number" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码"> <input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码">
<view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;"> <view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;">
<uni-icons type="trash" size="18"></uni-icons> <uni-icons type="trash" size="18"></uni-icons>
</view> </view>

Loading…
Cancel
Save