Browse Source

fix order bug

account
刘嘉炜 4 years ago
parent
commit
53301714d1
  1. 12
      src/components/order_list/mall/mall.vue
  2. 4
      src/components/organize_order/organize_order.vue
  3. 2
      src/pages/order_list/order_list.vue
  4. 3
      src/subpackage/device/components/order/organize_detail/organize_detail.vue
  5. 4
      src/subpackage/order/pages/mall/detail/detail.vue

12
src/components/order_list/mall/mall.vue

@ -4,6 +4,7 @@
<view class="mn-view">订单号{{ orderInfo.order_no || '-' }}</view> <view class="mn-view">订单号{{ orderInfo.order_no || '-' }}</view>
<view class="mn-view">{{ orderInfo.status_text || '-' }}</view> <view class="mn-view">{{ orderInfo.status_text || '-' }}</view>
</view> </view>
<view class="mo-after-sale-tip" v-if="orderInfo.after_sale_status == 1">{{ orderInfo.after_sale_status_text || '-' }}</view>
<view class="mo-goods-ls"> <view class="mo-goods-ls">
<view class="rgi-single" v-if="orderInfo.goods_nums == 1"> <view class="rgi-single" v-if="orderInfo.goods_nums == 1">
<image class="rs-img" mode="aspectFill" :src="orderInfo.goods[0].product_imgs"></image> <image class="rs-img" mode="aspectFill" :src="orderInfo.goods[0].product_imgs"></image>
@ -22,8 +23,8 @@
</view> </view>
<view class="mo-total"><text class="mt-txt">商品金额合计</text>¥{{ orderInfo.pay_amount || 0 }}</view> <view class="mo-total"><text class="mt-txt">商品金额合计</text>¥{{ orderInfo.pay_amount || 0 }}</view>
<view class="mo-bot"> <view class="mo-bot">
<view class="mb-express">配送方式{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
<view class="mb-btn" v-if="orderInfo.status == 1" @click.stop="toSendOut">发货</view>
<view class="mb-express" v-if="orderInfo.status == 2">配送方式{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
<view class="mb-btn" v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" @click.stop="toSendOut">发货</view>
</view> </view>
</view> </view>
</template> </template>
@ -87,6 +88,13 @@ export default {
} }
} }
} }
.mo-after-sale-tip{
margin-bottom: 12upx;
text-align: right;
font-size: 24upx;
line-height: 30upx;
color: #EA5061;
}
.mo-goods-ls{ .mo-goods-ls{
margin-bottom: 30upx; margin-bottom: 30upx;
@include centerFlex(space-between); @include centerFlex(space-between);

4
src/components/organize_order/organize_order.vue

@ -30,12 +30,12 @@
<view class="rv-view">{{orderInfo.label.Date+" "+ orderInfo.label.StartTime+" "+orderInfo.label.EndTime || '-'}}</view> <view class="rv-view">{{orderInfo.label.Date+" "+ orderInfo.label.StartTime+" "+orderInfo.label.EndTime || '-'}}</view>
</view> </view>
</view> </view>
<view class="rs-line" v-if="orderInfo.status=='End'">
<!-- <view class="rs-line" v-if="orderInfo.status=='End'">
<view class="rl-view">未发放</view> <view class="rl-view">未发放</view>
<view class="rl-view"> <view class="rl-view">
<view class="rv-view">{{orderInfo.un_amount_already_amount || '-'}}</view> <view class="rv-view">{{orderInfo.un_amount_already_amount || '-'}}</view>
</view> </view>
</view>
</view> -->
</view> </view>
<view class="ro-bot" v-if="orderInfo.original_order&&orderInfo.original_order.pay_status != 0"> <view class="ro-bot" v-if="orderInfo.original_order&&orderInfo.original_order.pay_status != 0">

2
src/pages/order_list/order_list.vue

@ -575,7 +575,7 @@
case 14: // 1,2,4 1= 4=退 2= case 14: // 1,2,4 1= 4=退 2=
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}]; return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
case 2: // 0/1/2/3/4/5/6 - /////退/退 1,2,3,6 // case 2: // 0/1/2/3/4/5/6 - /////退/退 1,2,3,6 //
return [ {id: 'assistant_all', name: '全部'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
return [ {id: 'assistant_all', name: '全部'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', name: '申请售后中'}, {id: 6, name: '退款完成'}];
case 8: // status 1,2,4 1 2 退4 5 case 8: // status 1,2,4 1 2 退4 5
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}]; return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
default: default:

3
src/subpackage/device/components/order/organize_detail/organize_detail.vue

@ -44,8 +44,8 @@
</view> </view>
</view> </view>
</view> </view>
<view>订场费用<text>{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
</block> </block>
<view v-if="orderInfo.type == 'Main'">订场费用<text>{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
<view v-if="orderInfo.type == 'Sub'">报名费用<text>{{orderInfo.price_per_person || 0}}</text></view> <view v-if="orderInfo.type == 'Sub'">报名费用<text>{{orderInfo.price_per_person || 0}}</text></view>
</view> </view>
@ -268,7 +268,6 @@ export default {
flex-shrink: 0; flex-shrink: 0;
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
background-color: skyblue;
} }
>view{ >view{

4
src/subpackage/order/pages/mall/detail/detail.vue

@ -82,7 +82,7 @@
<view class="mfb-btns"> <view class="mfb-btns">
<!-- <view>查看退款</view> --> <!-- <view>查看退款</view> -->
<view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view> <view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view>
<view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
<view v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" class="green" @click="toSendOut">发货</view>
</view> </view>
</view> </view>
</view> </view>
@ -100,7 +100,7 @@ export default {
computed: { computed: {
isRufundBtn(){ isRufundBtn(){
let { orderInfo } = this; let { orderInfo } = this;
return (orderInfo.status!=6 || orderInfo.status != 7)
return (orderInfo.status!=6 || orderInfo.status != 7) && orderInfo.after_sale_status == 0
}, },
order_custom(){ order_custom(){
let { orderInfo } = this; let { orderInfo } = this;

Loading…
Cancel
Save