提交

datas/9901Jump.js

@@ -26,21 +26,22 @@ export function jump(type,item){
 	if(type=="7" || type=="8" || type=="9"){
 		redirectUrl="/pages/order/order"
 		handleType="aftersale"
+		if(type=="7"){
+			afterType=7
+		}else if(type=="8"){
+			afterType=8
+		}else if(type=="9"){
+			afterType=9
+		}
 		if(data['after']){
 			orderType=2
 			// plateNum 车牌号码和颜色编号  例：浙A0P73H_0
 			// orderNo 订单编号 
 			// afterType 售后办理类型 1.挂失 2.解挂 3.更换 4.续期 5.补办 6.注销 7.换货 8.退货 9.补货
 			// orderType 订单类型 1.新办 2.售后
-			if(type=="7"){
-				afterType=7
-			}else if(type=="8"){
-				afterType=8
-			}else if(type=="9"){
-				afterType=9
-			}
 		}else{
 			orderType=1
+			
 		}
 	}
 	// 售后业务

functional-pages/request-payment.js

@@ -0,0 +1,23 @@
+/*
+ * @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)
+}

manifest.json

@@ -73,7 +73,7 @@
 		"requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
 		"plugins": {
 		  "issuer-plugin": {
-		   "version": "dev-8bba8ec1b7471c53bb8895ca64dba8cf",
+		   "version": "dev-86239f0e47ce1f289fa33faad042e339",
 		   "provider": "wxa2d9acdd1054e69b"
 		  }
 		 }

static/etc/kcBle/kcBleAPI.js

@@ -338,6 +338,42 @@ function closBluetooth(callBack) {
 function disconnectDeviceBluetooth(callBack) {
   _kcService2.default.disconnectDeviceBluetooth(callBack);
 }
+var timeId
+var receive_data=""
+var timeOut=require("./timeOut")
+function getObuSN(e) {
+	receive_data = "", timeId = setTimeout(t => {
+		e.call(this, {
+			code: -1,
+			err_msg: "获取合同序列号超时",
+			data: null,
+			msg: ""
+		}), receive_data = ""
+	}, timeOut.sendTime()), service.getSystemInfo(e => {
+		fireFlag = e.fireFlag, receive_data = ""
+	}, t => {
+		clearTimeout(timeId), e.call(this, {
+			code: 0,
+			err_msg: "获取合同序列号成功",
+			data: t.data.substr(20, 16),
+			msg: ""
+		})
+	})
+}
+function getSystemInfo(e) {
+	receive_data = "", timeId = setTimeout(t => {
+		e.call(this, {
+			code: Code.timeOutCode(),
+			err_msg: "读系统信息超时",
+			data: null,
+			msg: ""
+		}), receive_data = ""
+	}, timeOut.sendTime()), service.getSystemInfo(e => {
+		fireFlag = e.fireFlag, receive_data = ""
+	}, t => {
+		clearTimeout(timeId), e.call(this, t)
+	})
+}
 module.exports = {
   reallyScanConnect: reallyScanConnect,
   connectDevice: connectDevice,
@@ -349,4 +385,6 @@ module.exports = {
   scanBle: scanBle,
   closBluetooth: closBluetooth,
   disconnectDeviceBluetooth: disconnectDeviceBluetooth,
+  getObuSN:getObuSN,
+  getSystemInfo:getSystemInfo
 };

static/etc/kcBle/timeOut.js

@@ -0,0 +1,6 @@
+export function connectTimeOut() {
+	return 2e4
+}
+export function sendTime() {
+	return 2e4
+}

subpackage/carPark/etc/etcDeviceInfo.vue

@@ -172,6 +172,7 @@
 	const tools = require("../../../static/etcUtil/tools.js");
 	const datas = require("../../../static/etcUtil/datas.js");
 	const bluetoothUtil = require("../../../static/etcUtil/index.js");
+	let kcApi = require("../../../static/etc/kcBle/kcBleAPI.js");
 	let jyApiEtc = require("../../../static/etc/JYAPI-ETC/jy-bluetooth-obu-wechatmp.js"); //前装-金溢
 	const card = reactive({
 		cardNo: "",
@@ -360,6 +361,14 @@
 	 */
 	const getObuId = () => {
 		tools.showLoadingAlert("执行指令");
+		
+		if(datas.getData("deviceName").includes("K")){
+			console.log("进来得")
+			kcApi.getDeviceInfo(function(res){
+				console.log("kc====",res)
+			})
+		}
+		return
 		// if (datas.getData("deviceName").includes("JY")) {
 		// 	jyApiEtc.getSystemInfo(function(res) {
 		// 		console.log("获取OBU===", res)