9901

composables/order/useOrderSkip.ts

@@ -287,13 +287,20 @@ export default function useOrderSkip() {
 			jump("13", params)
 		}
 	}
+	// 异地-去下单
+	const placeAnOrder=(orderInfo:any)=>{
+		console.log("orderInfo",orderInfo)
+		if (orderInfo.deviceType == deviceType) {
+			const params = encodeURIComponent(JSON.stringify(orderInfo))
+			jump("18", params)
+		}
+	}
 	return {
 		gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
 		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder, gotoEvaluateProduct, gotoEvaluateSalesman,
 		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay,
 		gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo,
 		gotoEditCarApplyAgain, gotoCardSignPay, gotoAgainUseOrder, gotoOrderDetailsPay, gotoOrderSign, closeOrder,
-		gotoReplenishmentOrder,
-		gotoAddressOrder
+		gotoReplenishmentOrder,gotoAddressOrder,placeAnOrder
 	}
 }

datas/9901Jump.js

@@ -5,7 +5,7 @@ export function jump(type,item){
 	// type 1 obu重新激活  2 卡签注销  3更换设备  4卡签续期  5挂失解挂  6增补设备     售后业务
 	// 14 首次激活  15客车个人用户办理etc    
 	 // 7申请换货  8申请退货 9申请补货  没激活之前
-	// 10 上传身份信息   11待支付  12待签约  13异地-邮寄地址填写
+	// 10 上传身份信息   11待支付  12待签约  13异地-邮寄地址填写   18去下单
 	// 16签约  17卡签信息读取（没登录去异地登录）
 	
 	if(type=="17"){
@@ -37,7 +37,7 @@ export function jump(type,item){
 				console.log("accountType",accountType,carType)
 				redirectUrl=`/pages/order/order`
 			}
-			if(type=="10" || type=="11"  || type=="12"|| type=="13"){
+			if(type=="10" || type=="11"  || type=="12"|| type=="13" || type=="18"){
 				redirectUrl="/pages/order/order"
 				handleType="continuation"
 			}
@@ -100,8 +100,9 @@ export function jump(type,item){
 				handleType="reactivate"
 				redirectUrl="/pages/index/index"
 			}
+			console.log("data.promoteId",data.promoteId)
 			uni.navigateTo({
-				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${(handleType!='continuation' && data.orderId)?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId}`
+				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${(handleType!='continuation' && data.orderId)?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId?data.promoteId:data.productId}`
 			})
 	}
 }

pages.json

@@ -1907,7 +1907,7 @@
 			"plugins": {
 			  "issuer-plugin": {
 			   // "version": "1.0.0",
-			   "version": "dev-e58e532150b1582b2c547382a301d3bf",
+			   "version": "dev-3da805266820ceca7a39f12d30d6edd2",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

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

@@ -102,14 +102,17 @@
 				<!-- ORDER_STEP_31(31, "异地-售前退货"),
 				ORDER_STEP_32(32, "异地-售前退货后确认收货"),
 				ORDER_STEP_33(33, "异地-售前换货"),  33包含换货和补货 如果item.orderType=='REPLENISHMENT'是补货  就不展示换货
-				ORDER_STEP_34(34, "异地-售前换货后确认收货"), -->
+				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"
@@ -207,7 +210,8 @@
 		gotoOrderSign,
 		closeOrder,
 		gotoReplenishmentOrder,
-		gotoAddressOrder
+		gotoAddressOrder,
+		placeAnOrder
 	} = useOrderSkip();
 
 	//激活订单

subpackage/orders/order-details-new.vue

@@ -68,8 +68,8 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单状态：</text>
-							<text v-if="state.orderInfo.orderStep == 12 && state.reshipment=='1'"
-								class="d-value text-green">补货中</text>
+							<text v-if="state.orderInfo.orderStep == 12 && state.reshipment=='1'" class="d-value text-green">补货中</text>
+							<text v-else-if="state.orderInfo.orderStep == 35" class="d-value text-green">下单</text>
 								<text v-else
 									class="d-value text-green">{{state.orderInfo.orderStatus == OrderStatus.已取消 ? '已取消' : $util.getOrderStatusName(state.orderInfo.orderStep)}}</text>
 						</view>
@@ -465,6 +465,9 @@
 						<view v-if="state.orderInfo.orderStep == 33" class="btn-status">
 							<view class="btn btn-green" @click="gotoExchangeOrder(state.orderInfo)" v-if="state.orderInfo.orderType!='REPLENISHMENT'">换货</view>
 						</view>
+						<view v-if="state.orderInfo.orderStep == 35" class="btn-status">
+							<view class="btn btn-green" @click="placeAnOrder(state.orderInfo)">下单</view>
+						</view>
 						<!-- 异地结束-->
 						<!-- 订单完成 -->
 						<view v-if="state.isWeiXin==1">
@@ -538,7 +541,7 @@
 	//按钮跳转业务逻辑
 	const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
 		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct,
-		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder } = useOrderSkip();
+		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder,placeAnOrder } = useOrderSkip();
 
 
 	//获取订单详情