Explorar el Código

微信订单顺序

yxb
skx hace 1 año
padre
commit
da8cfd42cf

+ 2
- 1
composables/order/useOrderSkip.ts Ver fichero

@@ -11,7 +11,8 @@ export default function useOrderSkip() {
console.log('输出内容=====', orderInfo)
if (orderInfo.orderType === 'ISSUE') {
// #ifdef MP-WEIXIN
navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
// navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
// #endif
// #ifdef MP-ALIPAY
navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);

+ 1
- 1
pages/recharge/recharge.vue Ver fichero

@@ -182,7 +182,7 @@ const selectConfirm = (item: any) => {
// #ifdef MP-WEIXIN
getOpenID();/*传参*/
// #endif
console.log("开始option",option)
state.cardId = option.cardId;
state.connectSuccess = option.connectSuccess;
state.orderNum = getItem("orderNum");

+ 10
- 1
subpackage/after-sale/pin-code-deblocking/pin-code-confirm.vue Ver fichero

@@ -207,7 +207,16 @@
} else if (cosResponse == "9303") {
tools.showModalAlert("此卡pin已永久锁定!请联系客服进行换卡处理!", function successFunc() {});
} else {
getCommandBack(result.command, res.cosResponse, result.pinType);
console.log("卡执行指令结果",res)
let cosResponse = ""
for(let i = 0; i < res.length; i++){
if(i < res.length - 1 ){
cosResponse += res[i] + ","
}else{
cosResponse += res[i]
}
}
getCommandBack(result.command, cosResponse, result.pinType);
}
})
}

+ 2
- 1
subpackage/orders/car-release.vue Ver fichero

@@ -271,7 +271,8 @@
// #endif
// #ifdef MP-WEIXIN
uni.redirectTo({
url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
});
// #endif

+ 1
- 1
subpackage/orders/interestsList.vue Ver fichero

@@ -1,4 +1,4 @@
<template>
s<template>
<view class="content">
<view class="item" v-for="(item,index) in state.list" :key='index'>
<view class="title">

+ 71
- 45
subpackage/orders/order_payment.vue Ver fichero

@@ -90,50 +90,7 @@
});
}
const savaHandle = (val) => {
// console.log("vAL", val)
// setItem("clientFee", val.clientFee);
// setItem("promoteId", val.promoteId);
// setItem("isValueCard", val.isValueCard);
// state.isSign = val.isSign;
// // 判断是几张卡
// console.log("val.cardTypeArr.split(", ")", val.cardTypeArr.split(","))
// // if (val.promoteName.indexOf('选装') != -1) {
// // if (val.cardTypeArr.split(",")[0] == "记账卡") {
// // state.isValueCard = 2
// // } else if (val.cardTypeArr.split(",")[0] == '储值卡') {
// // state.isValueCard = 1
// // } else {
// // state.isValueCard = 3
// // }
// // uni.redirectTo({
// // url: `/subpackage/orders/verify/verify-phone/verify-phone?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
// // });
// // return
// // }

// if (val.cardTypeArr.split(",").length == 1) {
// if (val.cardTypeArr.split(",")[0] == "记账卡") {
// state.isValueCard = 2
// } else if (val.cardTypeArr.split(",")[0] == '储值卡') {
// state.isValueCard = 1
// } else {
// state.isValueCard = 3
// }
// uni.redirectTo({
// url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
// });
// } else {
// state.radiolist1 = [];
// // 处理卡的数据
// for (var i = 0; i < val.cardTypeArr.split(",").length; i++) {
// const obj = {};
// obj["name"] = val.cardTypeArr.split(",")[i];
// obj["disabled"] = false;
// state.radiolist1.push(obj)
// }
// state.choiceCardShow = true;
// console.log("state.radiolist1", state.radiolist1)
// }

if (val.payStatus === 'UNPAY') {
// #ifdef MP-ALIPAY
@@ -188,12 +145,81 @@
});
// #endif
// #ifdef MP-WEIXIN
// if (!state.openid) {
// getOpenID();
// }
uni.login({
provider: "weixin",
success: function (e) {
uni.request({
url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
success: (res: any) => {
const options = {
type: 2,
data: {
orderId:state.orderId,
wxOpenid: res.data.openid,
payType:val.payType
},
method: "POST",
showLoading: true,
};
request(PAYMENTORDERAPPLY, options).then((res) => {
const data = stringToJson(res.bizContent);
uni.requestPayment({
provider: "wxpay",
orderInfo: "",
timeStamp: data.timestamp,
nonceStr: data.noncestr,
package: data.wxPackage ?data.wxPackage: "",
signType: data.signType,
paySign: data.sign,
success: function (e) {
console.log("支付成功", res);
refresh();
},
fail: function (err) {
confirm(err, () => {}, "支付失败", false);
},
});
});
},
});
},
});

// #endif
}
};
const getOpenID = () => {
uni.login({
provider: "weixin",
success: function (e) {
uni.request({
url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
success: (res: any) => {
state.openid = res.data.openid;
},
});
},
});
};
const refresh = () =>{
let source = ""
// #ifdef MP-ALIPAY
source ="ALI"
// #endif
// #ifdef MP-WEIXIN
source ="WECHAT"
// getOpenID();
// #endif
var data = {
orderId: state.orderId,
source: 'ALI' //请求方来源
source: source //请求方来源
};
const options = {
type: 2,

+ 2
- 1
subpackage/orders/sign-up.vue Ver fichero

@@ -143,7 +143,8 @@ const savaHandle = () => {
// url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
// });
uni.navigateTo({
url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
url: "/pages/order/order"
// url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
});
} else if (data.userState === "PAUSED") {
msg("已暂停车主服务");

Cargando…
Cancelar
Guardar