Parcourir la source

修改激活

master
yangteng il y a 11 mois
Parent
révision
0c59fe3fdf

+ 23
- 0
functional-pages/request-payment.js Voir le fichier

/*
* @Author: gaorf30153 gaorf30153@hundsun.com
* @Date: 2024-06-26 08:41:43
* @LastEditors: gaorf30153 gaorf30153@hundsun.com
* @LastEditTime: 2024-06-26 08:59:33
* @FilePath: \wxminipro\miniprogram\functional-pages\request-payment.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
exports.beforeRequestPayment = function (paymentArgs, callback) {
// 自定义的参数,此处应为从插件传递过来的 paymentArgs
console.log(paymentArgs)
var error = null
var requestPaymentArgs = {
//该对象为下单所需参数,以后端接口返回的为准!!
timeStamp: paymentArgs.timeStamp,
nonceStr: paymentArgs.nonceStr,
package: paymentArgs.package,
signType: paymentArgs.signType,
paySign: paymentArgs.paySign,
}
callback(error, requestPaymentArgs) //重点:返回requestPaymentArgs
console.log(requestPaymentArgs)
}

+ 25
- 20
subpackage/after-sale/activation/activate.vue Voir le fichier

console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X")) console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长 fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽 fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
if(arr[2].indexOf('mm')){
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
}else{
fileDataStrings.outlineH = arr[2] //外廓 高
}
fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号 fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
.vehiclePlateColor); .vehiclePlateColor);
type: 2, //type: 2,JSON格式提交数据(默认表单形式提交) type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
data: { data: {
fileData: fileDataStrings.vehiclePlate, fileData: fileDataStrings.vehiclePlate,
nLen: 24
nLen: 24,
random: cmdRandNum
}, //请求参数 }, //请求参数
method: "POST", //提交方式(默认POST) method: "POST", //提交方式(默认POST)
showLoading: true, //是否显示加载中(默认显示) showLoading: true, //是否显示加载中(默认显示)
}).then((les) => { }).then((les) => {
let result = stringToJson(les.bizContent); let result = stringToJson(les.bizContent);
let res1 = result.gbkFileData; //车牌号
let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色
// let res1 = result.gbkFileData; //车牌号
// let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色


let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
console.log("userTypeNumber", userTypeNumber)
let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽
let res7 = IntegerToHexString(fileDataStrings.outlineH, 2); //车辆尺寸 高
let res8 = IntegerToHexString(4, 2); //获取轮数
let res9 = IntegerToHexString(fileDataStrings.axleCount, 2); //轴数
// let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
// let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
// console.log("userTypeNumber", userTypeNumber)
// let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
// let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
// let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽
// let res7 = IntegerToHexString(fileDataStrings.outlineH, 2); //车辆尺寸 高
// let res8 = IntegerToHexString(4, 2); //获取轮数
// let res9 = IntegerToHexString(fileDataStrings.axleCount, 2); //轴数


let res10 = IntegerToHexString(null, 4); //轴距32
let res11 = IntegerToHexString(fileDataStrings.approvedCount, 6); //核载人数
// let res10 = IntegerToHexString(null, 4); //轴距32
// let res11 = IntegerToHexString(fileDataStrings.approvedCount, 6); //核载人数


let res12 = AsciToHexString(fileDataStrings.vehicleVin, 32); //车编号
// let res12 = AsciToHexString(fileDataStrings.vehicleVin, 32); //车编号


// let res12 = JSON.parse(res.bizContent).gbkFileData; //车编号
let res13 = AsciToHexString(fileDataStrings.vehicleEngineNum, 32); //发动机
console.log(les, '=========123', )
fun(res1 + res2 + res3 + res4 + res5 + res6 + res7 + res8 + res9 + res10 + res11 + res12 + res13);
// // let res12 = JSON.parse(res.bizContent).gbkFileData; //车编号
// let res13 = AsciToHexString(fileDataStrings.vehicleEngineNum, 32); //发动机
console.log(result, '=========123', )
fun(result.fileData);
}) })
}; };



+ 5
- 1
subpackage/after-sale/card-Renewal/renewal-confirm.vue Voir le fichier

console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X")) console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长 fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽 fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
if(arr[2].indexOf('mm')){
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
}else{
fileDataStrings.outlineH = arr[2] //外廓 高
}
fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号 fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
.vehiclePlateColor); .vehiclePlateColor);

+ 5
- 1
subpackage/after-sale/equipment-upgrade/upgrade-confirm.vue Voir le fichier

console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X")) console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长 fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽 fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
if(arr[2].indexOf('mm')){
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
}else{
fileDataStrings.outlineH = arr[2] //外廓 高
}
fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号 fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
.vehiclePlateColor); .vehiclePlateColor);

+ 2
- 2
subpackage/after-sale/transfer-page.vue Voir le fichier

state.userIdNum = params.userIdNum state.userIdNum = params.userIdNum
state.mobile = params.mobile state.mobile = params.mobile
judge() judge()
}else{
}else{
// 不需要登录 // 不需要登录
state.type = options.type state.type = options.type
state.name = options.name state.name = options.name
state.mobile = options.mobile state.mobile = options.mobile
console.log("options", options) console.log("options", options)
if((options.userType && state.userIdNum) || (options.userType && state.mobile)){ if((options.userType && state.userIdNum) || (options.userType && state.mobile)){
// 登录情况
// 登录
silentLogin().then(() => { silentLogin().then(() => {
judge() judge()
}) })

+ 5
- 1
subpackage/after-sale/unsuspend/unsuspend-confirm.vue Voir le fichier

console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X")) console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长 fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽 fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
if(arr[2].indexOf('mm')){
fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
}else{
fileDataStrings.outlineH = arr[2] //外廓 高
}
fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号 fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
.vehiclePlateColor); .vehiclePlateColor);

+ 3
- 3
utils/network/request.js Voir le fichier



} }


// 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'


success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.navigateTo({
url: `/login/login?back=1`,
url: `/login/login`,
}) })
} }
} }

Chargement…
Annuler
Enregistrer