Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp into master

pages/order/components/order-list-item-new.vue

@@ -48,122 +48,14 @@
 			<view class="all">合计：<text class="cny">￥</text><text class="amount"
 					v-if="item.amount">{{item.amount / 100}}</text><text class="amount" v-else>0.00</text></view>
 		</view>
-		<!-- item.orderSource==1  app -->
-		<view v-if="item.orderStatus != OrderStatus.已取消 && !item.orderSource">
-			<!-- 微信小程序正常 -->
-			<view>
-				<!-- 信息填写未完成 -->
-				<view class="btns"
-					v-if="item.orderStep == OrderStatus['完成个人/单位信息上传'] || item.orderStep == OrderStatus.完成填写基本信息 || item.orderStep == OrderStatus.完成车辆信息上传 || item.orderStep == OrderStatus.待支付3">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-					<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">继续申请</view>
-
-				</view>
-				<!-- 待支付 -->
-				<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-					<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view>
-				</view>
-				<view class="btns" v-if="item.orderStep == OrderStatus['完成车辆信息上传/待支付']">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-					<view class="btn btn-primary" @click.stop="gotoOrderDetailsPay(item)">支付</view>
-				</view>
-				<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-					<view class="btn btn-primary" @click.stop="gotoOrderDetailsPay(item)">支付</view>
-				</view>
-				<view class="btns" v-if="item.orderStep == OrderStatus['已支付/待签约']">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-					<view class="btn btn-primary" @click.stop="gotoOrderSign(item)">去签约</view>
-				</view>
-
-				<!-- 审核中/审核不通过 -->
-				<view class="btns" v-if="item.orderStep == OrderStatus.待审核 || item.orderStep == OrderStatus.审核不通过">
-					<!-- <view class="btn btn-normal" v-if="item.orderStep == OrderStatus.审核不通过"
-						@click.stop="gotoEditUserOrUnitInfo(item)">修改资料</view> -->
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-				</view>
-
-				<!-- 待发货 -->
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.待发货">
-					<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-				</view>
-
-				<!-- 待收货 -->
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.待收货">
-					<!-- <view class="btn btn-normal" @click.stop="gotoOrderDetails(item)">查看物流</view> -->
-					<!-- 待收货异地 发货之后确认收货之前可以补货 -->
-					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">
-						申请补货</view>
-					<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)" v-else>申请退货</view>
-					<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
-					<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
-				</view>
-
-				<!-- 待激活 -->
-
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活">
-					<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)"
-						v-if="item.applyReturn || item.deviceType == deviceType">申请退货</view>
-					<view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
-					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType == deviceType">
-						申请补货</view>
-					<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
-					<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
-				</view>
-				<!-- ORDER_STEP_31(31, "异地-售前退货"),
-				ORDER_STEP_32(32, "异地-售前退货后确认收货"),
-				ORDER_STEP_33(33, "异地-售前换货"),  33包含换货和补货 如果item.orderType=='REPLENISHMENT'是补货  就不展示换货
-				ORDER_STEP_34(34, "异地-售前换货后确认收货"), 
-				ORDER_STEP_35(35, "异地-下单-->
-				<view class="btns" v-else-if="item.orderStep == 31">
-					<view class="btn btn-primary" @click.stop="gotoReturnOrder(item)">退货</view>
-				</view>
-				<view class="btns" v-else-if="item.orderStep==33">
-					<view class="btn btn-primary" @click.stop="gotoExchangeOrder(item)" v-if="item.orderType!='REPLENISHMENT'">换货
-					</view>
-				</view>
-				<view class="btns" v-else-if="item.orderStep == 35">
-					<view class="btn btn-primary" @click.stop="placeAnOrder(item)">下单</view>
-				</view>
-				<!-- 已完成  售后订单不允许评价产品，储值卡转记账卡除外-->
-				<!-- 发行产品 isProduct=0;  业务员 isStaff=0; 权益 isEquity=0  业务服务  isService=0; -->
-				<view class="btns"
-					v-else-if="item.orderStep == OrderStatus.已完成">
-
-					<view class="btn btn-normal" v-if="( item.isProduct==1 && item.isService==1) ">
-						已评价
-					</view>
-					<view class='evaluation' v-else>
-						<view class="btn btn-primary" v-if="item.isProduct==0 || item.isService==0"
-							@click.stop="gotoEvaluateProduct(item)">去评价产品</view>
-					</view>
-				</view>
-
-				<!-- 已结束 -->
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
-					<view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view>
-				</view>
-				<!-- 异地-邮寄地址填写 -->
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.deviceType==deviceType">
-					<view class="btn btn-primary" @click.stop="gotoAddressOrder(item)">邮寄地址填写</view>
-				</view>
-			</view>
-
-
-
-			<!-- 换货中 -->
-			<!-- '完成签约' = 5,
-			'已申请-退货' = 13,
-			'退款中' = 15,
-			'退款成功' = 16,
-			'退货成功' = 17,
-			'换货-设备已回收' = 18, -->
-		</view>
-		<view v-else>
-			<!-- 待激活 -->
-			<view class="btns" v-if="item.orderStep == OrderStatus.待激活">
-				<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
+		<view v-if="item.orderStatus == 'NORMAL'">
+			<view class="btns">
+				<view v-if="item.orderStep=='ORDER_INIT'||item.orderStep=='CUSTOMER_UPLOAD'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">继续申请</view>
+				<view v-if="item.orderStep=='VEHICLE_UPLOAD'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">支付</view>
+				<view v-if="item.orderStep=='WAITING_ACTIVE'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
+				<view v-if="item.orderStep=='WAITING_ACTIVE'&&item.shippingStatus=='WAIT_RECEIVING'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">确认收货</view>
+				<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">签约</view>
+				<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoActiveOrder(item)">取消订单</view>
 			</view>
 		</view>
 	</view>