修改订单详情页

subpackage/orders/order-details-new.vue

@@ -106,7 +106,28 @@
 					</view>
 				</view>
 			</view>
-			<view class="btn-view">
+			<view v-if="state.orderInfo.orderStatus == 'NORMAL'">
+				<view v-if="state.orderInfo.orderSource !== 'APP'">
+					<view class="btns">
+						<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.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.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_ACTIVE' && state.orderInfo.shippingStatus == 'RECEIVED'" class="btn btn-normal" @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-normal" @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.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>
+						<view v-if="state.orderInfo.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(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>
+				</view>
+			</view>
+			<view v-if="false" class="btn-view">
 				<view class="btn-view"
 					v-if="state.orderInfo.orderStatus == OrderStatus.正常 && state.orderInfo['orderSource'] !='SERVICE_HALL'">
 					<!-- 信息填写未完成 -->
@@ -548,4 +569,53 @@
 	.cardStatus {
 		color: #3CCA7C;
 	}
+	
+	.btns {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		border-top: 1px solid #dcdcdc;
+		margin: 0 30rpx;
+		padding: 20rpx 0;
+	}
+	
+	.btn {
+		height: 60rpx;
+		line-height: 58rpx;
+		border-radius: 30rpx;
+		padding: 0 24rpx;
+		font-size: 23rpx;
+		box-sizing: border-box;
+		margin-right: 12rpx;
+	}
+	
+	
+	
+	.btns .btn:last-child {
+		margin: 0;
+	}
+	
+	.btns .state {
+		position: absolute;
+		left: 0;
+		font-size: 26rpx;
+		font-family: Noto Sans S Chinese;
+		font-weight: 400;
+		color: #999999;
+		line-height: 58rpx;
+	
+		text {
+			font-size: 26rpx;
+			font-family: Noto Sans S Chinese;
+			font-weight: 400;
+			color: #00B38B;
+			line-height: 58rpx;
+		}
+	}
+	
+	.btn-primary {
+		color: white;
+		background-color: #133850;
+	}
 </style>

utils/network/request.js

@@ -313,13 +313,8 @@ export function requestNew(code, options = {}, start = false, clie = () => {}) {
   //公参
   const Common = {
     loginSource: getItem("loginSource"),
-    // <<<<<<< HEAD
-    // 		customerId: getItem("customerObj").customerId,
-    // 		accessToken: getItem(StorageKeys.Token)
-    // =======
     accessToken: getItem(StorageKeys.Token),
     customerId: getItem('userInfo') ? (getItem('userInfo')['customerId'] || '' ) : "",
-    // >>>>>>> 2bd4fd2288160c9b41c882d376c6debd9051e296
   };
   console.log("Common", Common, getItem("customerObj"));
   // options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code

utils/utils.ts

@@ -230,74 +230,74 @@ export const getOrderStatusName = (status) => {
 }
 //根据订单状态获取订单状态文字
 export const getOrderStatusNameNew = (status) => {
-	switch (Number(status)) {
-		case Number(OrderStatus.完成填写基本信息):
+	switch (status) {
+		case OrderStatus.完成填写基本信息:
 			return 'shenqingzhong';
 			break;
-		case Number(OrderStatus["完成个人/单位信息上传"]):
+		case OrderStatus["完成个人/单位信息上传"]:
 			return 'shenqingzhong';
 			break;
-		case Number(OrderStatus.完成车辆信息上传):
+		case OrderStatus.完成车辆信息上传:
 			return 'shenqingzhong';
 			break;
-		case Number(OrderStatus.待支付):
+		case OrderStatus.待支付:
 			return 'daizhifu';
 			break;
-		case Number(OrderStatus.待支付3):
+		case OrderStatus.待支付3:
 			return 'shenqingzhong';
 			break;
-		case Number(OrderStatus.待支付2):
+		case OrderStatus.待支付2:
 			return 'daizhifu';
 			break;
-		case Number(OrderStatus.完成签约):
+		case OrderStatus.完成签约:
 			return 'finishqianyue';
 			break;
-		case Number(OrderStatus.待审核):
+		case OrderStatus.待审核:
 			return 'daishenhe';
 			break;
-		case Number(OrderStatus.审核不通过):
+		case OrderStatus.审核不通过:
 			return 'nopass';
 			break;
-		case Number(OrderStatus.待发货):
+		case OrderStatus.待发货:
 			return 'daifanhuo';
 			break;
-		case Number(OrderStatus.待收货):
+		case OrderStatus.待收货:
 			return 'daishouhuo';
 			break;
-		case Number(OrderStatus.待激活):
+		case OrderStatus.待激活:
 			return 'dajihuo';
 			break;
-		case Number(OrderStatus.已完成):
+		case OrderStatus.已完成:
 			return 'yiwancheng';
 			break;
-		case Number(OrderStatus["已申请-换货"]):
+		case OrderStatus["已申请-换货"]:
 			return 'huanhuozhong';
 			break;
-		case Number(OrderStatus["已申请-退货"]):
+		case OrderStatus["已申请-退货"]:
 			return 'tuihuozhong';
 			break;
-		case Number(OrderStatus.已结束):
+		case OrderStatus.已结束:
 			return 'yijieshu';
 			break;
-		case Number(OrderStatus.退款中):
+		case OrderStatus.退款中:
 			return 'tuikuanzhong';
 			break;
-		case Number(OrderStatus.退款成功):
+		case OrderStatus.退款成功:
 			return 'tuikuanchenggong';
 			break;
-		case Number(OrderStatus.退货成功):
+		case OrderStatus.退货成功:
 			return 'tuihuosuccess';
 			break;
-		case Number(OrderStatus["换货-设备已回收"]):
+		case OrderStatus["换货-设备已回收"]:
 			return 'huanhuochenggong';
 			break;
-		case Number(OrderStatus["完成车辆信息上传/待支付"]):
+		case OrderStatus["完成车辆信息上传/待支付"]:
 			return 'daizhifu';
 			break;
-		case Number(OrderStatus["已支付/待签约"]):
+		case OrderStatus["已支付/待签约"]:
 			return 'daiqianyue';
 			break;
-		default:
+		default:	
 			break;
 	}
 }