瀏覽代碼

待支付,签约跳转9901

yxb
yangteng 11 月之前
父節點
當前提交
fd35455740

+ 41
- 17
composables/order/useOrderSkip.ts 查看文件

console.log("********555555555555**********", orderInfo.orderStep, OrderStatus["已支付/待签约"]); console.log("********555555555555**********", orderInfo.orderStep, OrderStatus["已支付/待签约"]);
let url = ''; let url = '';
if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3) { if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3) {
url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/orders/opening-account-people' : '/subpackage/orders/opening-account-unit';
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("10", params)
} else {
url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/orders/opening-account-people' : '/subpackage/orders/opening-account-unit';
}
} else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) { } else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) {
url = '/subpackage/orders/car-release'; url = '/subpackage/orders/car-release';
} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) { } else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
} else if (orderInfo.orderStep === OrderStatus.待加购权益) { } else if (orderInfo.orderStep === OrderStatus.待加购权益) {
navTo(`/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`); navTo(`/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`);
} else if (orderInfo.orderStep === OrderStatus["完成车辆信息上传/待支付"]) { } else if (orderInfo.orderStep === OrderStatus["完成车辆信息上传/待支付"]) {
url = '/subpackage/orders/order-payment';
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("11", params)
} else {
url = '/subpackage/orders/order-payment';
}
} else if (orderInfo.orderStep === OrderStatus["审核不通过"]) { //修改资料 } else if (orderInfo.orderStep === OrderStatus["审核不通过"]) { //修改资料
url = '/subpackage/orders/changeInformation'; url = '/subpackage/orders/changeInformation';
} else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) { //修改资料 } else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) { //修改资料
url = '/subpackage/orders/release-products';
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("12", params)
} else {
url = '/subpackage/orders/release-products';
}

} }
console.log("url", url) console.log("url", url)
navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`); navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);


//申请退货 //申请退货
const gotoReturnOrder = (orderInfo : any) => { const gotoReturnOrder = (orderInfo : any) => {
if(orderInfo.agencyId=="52010106004"){
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo)) const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("8",params)
}else{
jump("8", params)
} else {
const data = { const data = {
id: orderInfo.id, id: orderInfo.id,
orderId: orderInfo.orderId, orderId: orderInfo.orderId,
} }
navTo(`/subpackage/orders/apply-return-goods?data=${JSON.stringify(data)}`); navTo(`/subpackage/orders/apply-return-goods?data=${JSON.stringify(data)}`);
} }
} }


//申请换货 //申请换货
const gotoExchangeOrder = (orderInfo : any) => { const gotoExchangeOrder = (orderInfo : any) => {
if(orderInfo.agencyId=="52010106004"){
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo)) const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("3",params)
}else{
navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
jump("3", params)
} else {
navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
} }
} }
//申请补货 //申请补货
const gotoReplenishmentOrder = (orderInfo : any) => { const gotoReplenishmentOrder = (orderInfo : any) => {
if(orderInfo.agencyId=="52010106004"){
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo)) const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("9",params)
jump("9", params)
} }
} }


//去激活订单 //去激活订单
const gotoActiveOrder = (orderInfo : any) => { const gotoActiveOrder = (orderInfo : any) => {
if(orderInfo.agencyId=="52010106004"){
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo)) const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("3",params)
}else{
jump("3", params)
} else {
navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}&transfer=${orderInfo.transfer}`); navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}&transfer=${orderInfo.transfer}`);
} }
} }
}); });




}
//异地-邮寄地址填写
const gotoAddressOrder=(orderInfo:any)=>{
if (orderInfo.agencyId == "52010106004") {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("13", params)
}
} }
return { return {
gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo, gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
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
gotoReplenishmentOrder,
gotoAddressOrder
} }
} }

+ 11
- 0
datas/9901Jump.js 查看文件

} }
let path="" let path=""
let jumpType=type //1 obu重新激活 2 卡签注销 3 首次激活 4客车个人用户办理etc 5更换设备 6卡签续期 7申请换货 8申请退货 9申请补货 let jumpType=type //1 obu重新激活 2 卡签注销 3 首次激活 4客车个人用户办理etc 5更换设备 6卡签续期 7申请换货 8申请退货 9申请补货
// 10 上传身份信息 11待支付 12待签约 13异地-邮寄地址填写
if(jumpType=="1"){ if(jumpType=="1"){
path="pages/route/index" path="pages/route/index"
}else if(jumpType=="2"){ }else if(jumpType=="2"){
path="pages/route/index" path="pages/route/index"
}else if(jumpType=="8"){ }else if(jumpType=="8"){
path="pages/route/index" path="pages/route/index"
}else if(jumpType=="9"){
path="pages/route/index"
}else if(jumpType=="10"){
path="pages/route/index"
}else if(jumpType=="11"){
path="pages/route/index"
}else if(jumpType=="12"){
path="pages/route/index"
}else if(jumpType=="13"){
path="pages/route/index"
} }
console.log("===",getItem("QYorder").openid,data.vehicleId,data.cardId,jumpType) console.log("===",getItem("QYorder").openid,data.vehicleId,data.cardId,jumpType)
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({

+ 1
- 0
datas/enum.ts 查看文件

'退款成功' = 16, '退款成功' = 16,
'退货成功' = 17, '退货成功' = 17,
'换货-设备已回收' = 18, '换货-设备已回收' = 18,
'邮寄地址填写' = 30, //异地-邮寄地址填写
} }


//订单类型 //订单类型

+ 6
- 1
pages/order/components/order-list-item-new.vue 查看文件

<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain"> <view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
<view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view> <view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view>
</view> </view>
<!-- 异地-邮寄地址填写 -->
<view class="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.agencyId=='52010106004'">
<view class="btn btn-primary" @click.stop="gotoAddressOrder(item)">邮寄地址填写</view>
</view>
</view> </view>




gotoAgainUseOrder, gotoAgainUseOrder,
gotoOrderSign, gotoOrderSign,
closeOrder, closeOrder,
gotoReplenishmentOrder
gotoReplenishmentOrder,
gotoAddressOrder
} = useOrderSkip(); } = useOrderSkip();


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

+ 4
- 4
subpackage/orders/interestsList.vue 查看文件

state.signAgencyId = option.signAgencyId; state.signAgencyId = option.signAgencyId;
}) })
const addInterestsList = () => { const addInterestsList = () => {
if(state.signAgencyId=="52010102041"){
jump("4","")
}else{
// if(state.signAgencyId=="52010102041"){
// jump("4","")
// }else{
if (state.changeCardType == "1") { if (state.changeCardType == "1") {
navTo( navTo(
`/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.promoteId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}` `/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.promoteId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}`
url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}`, url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}`,
}); });
} }
}
// }
} }



+ 6
- 1
subpackage/orders/order-details-new.vue 查看文件

class="btn-status"> class="btn-status">
<view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view> <view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view>
</view> </view>
<!-- 异地-邮寄地址填写 -->
<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.agencyId=='52010106004'"
class="btn-status">
<view class="btn-green" @click.stop="gotoAddressOrder(state.orderInfo)">邮寄地址填写</view>
</view>
<!-- 订单完成 --> <!-- 订单完成 -->
<view v-if="state.isWeiXin==1"> <view v-if="state.isWeiXin==1">
<view <view
//按钮跳转业务逻辑 //按钮跳转业务逻辑
const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo, const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct, gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct,
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder } = useOrderSkip();
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder } = useOrderSkip();




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

+ 2
- 2
utils/network/request.js 查看文件



} }


options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
//默认json数据格式提交` //默认json数据格式提交`
let contentType = 'application/x-www-form-urlencoded' let contentType = 'application/x-www-form-urlencoded'



Loading…
取消
儲存