yangteng 11 mesi fa
parent
commit
d825272141

+ 9
- 2
composables/order/useOrderSkip.ts Vedi File

jump("13", params) 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 { return {
gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo, gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder, gotoEvaluateProduct, gotoEvaluateSalesman, gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateOrder, gotoEvaluateProduct, gotoEvaluateSalesman,
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay,
gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo, gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo,
gotoEditCarApplyAgain, gotoCardSignPay, gotoAgainUseOrder, gotoOrderDetailsPay, gotoOrderSign, closeOrder, gotoEditCarApplyAgain, gotoCardSignPay, gotoAgainUseOrder, gotoOrderDetailsPay, gotoOrderSign, closeOrder,
gotoReplenishmentOrder,
gotoAddressOrder
gotoReplenishmentOrder,gotoAddressOrder,placeAnOrder
} }
} }

+ 4
- 3
datas/9901Jump.js Vedi File

// type 1 obu重新激活 2 卡签注销 3更换设备 4卡签续期 5挂失解挂 6增补设备 售后业务 // type 1 obu重新激活 2 卡签注销 3更换设备 4卡签续期 5挂失解挂 6增补设备 售后业务
// 14 首次激活 15客车个人用户办理etc // 14 首次激活 15客车个人用户办理etc
// 7申请换货 8申请退货 9申请补货 没激活之前 // 7申请换货 8申请退货 9申请补货 没激活之前
// 10 上传身份信息 11待支付 12待签约 13异地-邮寄地址填写
// 10 上传身份信息 11待支付 12待签约 13异地-邮寄地址填写 18去下单
// 16签约 17卡签信息读取(没登录去异地登录) // 16签约 17卡签信息读取(没登录去异地登录)
if(type=="17"){ if(type=="17"){
console.log("accountType",accountType,carType) console.log("accountType",accountType,carType)
redirectUrl=`/pages/order/order` 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" redirectUrl="/pages/order/order"
handleType="continuation" handleType="continuation"
} }
handleType="reactivate" handleType="reactivate"
redirectUrl="/pages/index/index" redirectUrl="/pages/index/index"
} }
console.log("data.promoteId",data.promoteId)
uni.navigateTo({ 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}`
}) })
} }
} }

+ 1
- 1
pages.json Vedi File

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

+ 7
- 3
pages/order/components/order-list-item-new.vue Vedi File

<!-- ORDER_STEP_31(31, "异地-售前退货"), <!-- ORDER_STEP_31(31, "异地-售前退货"),
ORDER_STEP_32(32, "异地-售前退货后确认收货"), ORDER_STEP_32(32, "异地-售前退货后确认收货"),
ORDER_STEP_33(33, "异地-售前换货"), 33包含换货和补货 如果item.orderType=='REPLENISHMENT'是补货 就不展示换货 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="btns" v-else-if="item.orderStep == 31">
<view class="btn btn-primary" @click.stop="gotoReturnOrder(item)" >退货</view> <view class="btn btn-primary" @click.stop="gotoReturnOrder(item)" >退货</view>
</view> </view>
<view class="btns" v-else-if="item.orderStep==33"> <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 class="btn btn-primary" @click.stop="gotoExchangeOrder(item)" v-if="item.orderType!='REPLENISHMENT'">换货</view>
</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; --> <!-- 发行产品 isProduct=0; 业务员 isStaff=0; 权益 isEquity=0 业务服务 isService=0; -->
<view class="btns" <view class="btns"
gotoOrderSign, gotoOrderSign,
closeOrder, closeOrder,
gotoReplenishmentOrder, gotoReplenishmentOrder,
gotoAddressOrder
gotoAddressOrder,
placeAnOrder
} = useOrderSkip(); } = useOrderSkip();


//激活订单 //激活订单

+ 6
- 3
subpackage/orders/order-details-new.vue Vedi File

</view> </view>
<view class="d-row"> <view class="d-row">
<text class="d-label">订单状态:</text> <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 <text v-else
class="d-value text-green">{{state.orderInfo.orderStatus == OrderStatus.已取消 ? '已取消' : $util.getOrderStatusName(state.orderInfo.orderStep)}}</text> class="d-value text-green">{{state.orderInfo.orderStatus == OrderStatus.已取消 ? '已取消' : $util.getOrderStatusName(state.orderInfo.orderStep)}}</text>
</view> </view>
<view v-if="state.orderInfo.orderStep == 33" class="btn-status"> <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 class="btn btn-green" @click="gotoExchangeOrder(state.orderInfo)" v-if="state.orderInfo.orderType!='REPLENISHMENT'">换货</view>
</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"> <view v-if="state.isWeiXin==1">
//按钮跳转业务逻辑 //按钮跳转业务逻辑
const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo, const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct, 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();




//获取订单详情 //获取订单详情

Loading…
Annulla
Salva