浏览代码

订单列表修改

master
chenchaod 1 天前
父节点
当前提交
dd4200c680
共有 2 个文件被更改,包括 23 次插入26 次删除
  1. 12
    13
      pages/order/components/order-list-item-new.vue
  2. 11
    13
      subpackage/orders/order-details-new.vue

+ 12
- 13
pages/order/components/order-list-item-new.vue 查看文件

@@ -62,23 +62,22 @@

<view v-if="item.orderStatus == 'NORMAL'">
<view class="btns">
<view v-if="item.orderSource == 'WECHAT'">
<view v-if=" item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD' " class="btn btn-primary"
@click.stop="gotoEditUserOrUnitInfo(item)">继续申请</view>
<view v-if="item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货</view>
<view v-if="item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
<view v-if="item.orderStep=='WAITING_RECEIVE' && item.shippingStatus=='WAIT_RECEIVING'" class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
<view v-if="(item.orderStep=='WAITING_AUDIT' || item.orderStep=='WAITING_SEND') && item.shippingStatus=='WAIT_SHIPPING'"
class="btn btn-primary" @click.stop="gotoEditAddressNew(item)">修改地址</view>
<!--评价暂不上线
<view v-if="item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>-->
<view v-if="(item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'||item.orderStep=='VEHICLE_UPLOAD'||item.orderStep=='ORDER_PAID'||item.orderStep=='ORDER_SIGNED'||item.orderStep=='WAITING_AUDIT'||item.orderStep=='AUDIT_FAIL'||item.orderStep=='WAITING_SEND')"
class="btn btn-primary" @click.stop="gotoCancelOrder(item)">取消订单</view>
</view>
<view v-if="item.orderSource == 'WECHAT' && (item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD') " class="btn btn-primary"
@click.stop="gotoEditUserOrUnitInfo(item)">继续申请</view>
<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货</view>
<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_ACTIVE' && item.shippingStatus == 'RECEIVED'" class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_RECEIVE' && item.shippingStatus=='WAIT_RECEIVING'" class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
<view v-if="item.orderSource == 'WECHAT' && (item.orderStep=='WAITING_AUDIT' || item.orderStep=='WAITING_SEND') && item.shippingStatus=='WAIT_SHIPPING'"
class="btn btn-primary" @click.stop="gotoEditAddressNew(item)">修改地址</view>
<!--评价暂不上线
<view v-if="item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>-->
<view v-if="item.orderSource == 'WECHAT' && (item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'||item.orderStep=='VEHICLE_UPLOAD'||item.orderStep=='ORDER_PAID'||item.orderStep=='ORDER_SIGNED'||item.orderStep=='WAITING_AUDIT'||item.orderStep=='AUDIT_FAIL'||item.orderStep=='WAITING_SEND')"
class="btn btn-primary" @click.stop="gotoCancelOrder(item)">取消订单</view>
<view v-if="item.orderStep=='VEHICLE_UPLOAD'" class="btn btn-primary" @click.stop="gotoOrderDetailsPay(item)">支付</view>
<view v-if="item.orderStep=='WAITING_ACTIVE'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(item)">签约</view>
</view>
</view>
</view>


+ 11
- 13
subpackage/orders/order-details-new.vue 查看文件

@@ -108,19 +108,17 @@
</view>
<view v-if="state.orderInfo.orderStatus == 'NORMAL'">
<view class="btns">
<view v-if="state.orderInfo.orderSource == 'WECHAT'">
<view v-if=" state.orderInfo.orderStep=='ORDER_INIT'||state.orderInfo.orderStep=='CUSTOMER_UPLOAD' " class="btn btn-primary"
@click.stop="gotoEditUserOrUnitInfo(state.orderInfo)">继续申请</view>
<view v-if="state.orderInfo.orderStep=='WAITING_ACTIVE' && state.orderInfo.shippingStatus == 'RECEIVED'" class="btn btn-primary" @click.stop="gotoReturnOrder(state.orderInfo)">申请退货</view>
<view v-if="state.orderInfo.orderStep=='WAITING_ACTIVE' && state.orderInfo.shippingStatus == 'RECEIVED'" class="btn btn-primary" @click.stop="gotoExchangeOrder(state.orderInfo)">申请换货</view>
<view v-if="state.orderInfo.orderStep=='WAITING_RECEIVE' && state.orderInfo.shippingStatus=='WAIT_RECEIVING'" class="btn btn-primary" @click.stop="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
<view v-if="(state.orderInfo.orderStep=='WAITING_AUDIT' || state.orderInfo.orderStep=='WAITING_SEND') && state.orderInfo.shippingStatus=='WAIT_SHIPPING'"
class="btn btn-primary" @click.stop="gotoEditAddressNew(state.orderInfo)">修改地址</view>
<!--//评价暂不上线
<view v-if="state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>-->
<view v-if="(state.orderInfo.orderStep=='ORDER_INIT'||state.orderInfo.orderStep=='CUSTOMER_UPLOAD'||state.orderInfo.orderStep=='VEHICLE_UPLOAD'||state.orderInfo.orderStep=='ORDER_PAID'||state.orderInfo.orderStep=='ORDER_SIGNED'||state.orderInfo.orderStep=='WAITING_AUDIT'||state.orderInfo.orderStep=='AUDIT_FAIL'||state.orderInfo.orderStep=='WAITING_SEND')"
class="btn btn-primary" @click.stop="gotoCancelOrder(state.orderInfo)">取消订单</view>
</view>
<view v-if=" state.orderInfo.orderSource == 'WECHAT' && (state.orderInfo.orderStep=='ORDER_INIT'||state.orderInfo.orderStep=='CUSTOMER_UPLOAD') " class="btn btn-primary"
@click.stop="gotoEditUserOrUnitInfo(state.orderInfo)">继续申请</view>
<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_ACTIVE' && state.orderInfo.shippingStatus == 'RECEIVED'" class="btn btn-primary" @click.stop="gotoReturnOrder(state.orderInfo)">申请退货</view>
<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_ACTIVE' && state.orderInfo.shippingStatus == 'RECEIVED'" class="btn btn-primary" @click.stop="gotoExchangeOrder(state.orderInfo)">申请换货</view>
<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_RECEIVE' && state.orderInfo.shippingStatus=='WAIT_RECEIVING'" class="btn btn-primary" @click.stop="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
<view v-if="state.orderInfo.orderSource == 'WECHAT' && (state.orderInfo.orderStep=='WAITING_AUDIT' || state.orderInfo.orderStep=='WAITING_SEND') && state.orderInfo.shippingStatus=='WAIT_SHIPPING'"
class="btn btn-primary" @click.stop="gotoEditAddressNew(state.orderInfo)">修改地址</view>
<!--//评价暂不上线
<view v-if="state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>-->
<view v-if="state.orderInfo.orderSource == 'WECHAT' && (state.orderInfo.orderStep=='ORDER_INIT'||state.orderInfo.orderStep=='CUSTOMER_UPLOAD'||state.orderInfo.orderStep=='VEHICLE_UPLOAD'||state.orderInfo.orderStep=='ORDER_PAID'||state.orderInfo.orderStep=='ORDER_SIGNED'||state.orderInfo.orderStep=='WAITING_AUDIT'||state.orderInfo.orderStep=='AUDIT_FAIL'||state.orderInfo.orderStep=='WAITING_SEND')"
class="btn btn-primary" @click.stop="gotoCancelOrder(state.orderInfo)">取消订单</view>
<view v-if="state.orderInfo.orderStep=='VEHICLE_UPLOAD'" class="btn btn-primary" @click.stop="gotoOrderDetailsPay(state.orderInfo)">支付</view>
<view v-if="state.orderInfo.orderStep=='WAITING_ACTIVE'" class="btn btn-primary" @click.stop="gotoActiveOrder(state.orderInfo)">去激活</view>
<view v-if="state.orderInfo.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(state.orderInfo)">签约</view>

正在加载...
取消
保存