2024年2月2日17:01:30

components/bluetooth/bluetooth.vue

@@ -37,7 +37,6 @@
 	const jyApi = require("../../static/etc/JYAPI/GenvictBleUtil.js");
 	const jlQZApi = require("../../static/etc/JLQZAPI/JLObuSDK.js");
 	const atApi = require("../../static/etc/ATAPI/ArtcBleUtil.js");
-	const jtApi = require("../../static/etc/JTAPI/BleUtil.js");
 	const wqApi = require("../../static/etc/WQAPI/WCDObuSdk.js");
 	const cgApi = require("../../static/etc/CGAPI/cguBle.js");
 
@@ -49,12 +48,14 @@
 	let wjApi = require("../../static/etc/WJAPI/wjBleAPI");
 	let tdApi = require("../../static/etc/TDAPI/TDRObuSDK.js");
 	let zzApi = require("../../static/etc/WJAPI/wjBleAPI.js");
+	let jtApi = require("../../static/etc/JTAPI/BleUtil.js");
 	// #ifdef MP-ALIPAY
 	// 这部分代码将仅在支付宝小程序平台下执行
 	jlApi = require("../../static/etc/JLObuSDK/JLObuSDK.js");
 	wjApi = require("../../static/etc/wjBle/WJBleAPI");
 	zzApi = require("../../static/etc/wjBle/WJBleAPI.js");
 	tdApi = require("../../static/etc/TDRAPI/TDRObuSDK.js");
+	jtApi = require("../../static/etc/JTAPIS/BleUtil.js");
 	// 执行支付宝小程序的特定功能
 	// #endif
 

pages.json

@@ -3,14 +3,14 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				// "navigationBarHidden": true,
+				"navigationBarHidden": true,
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#22dbc8",
+				"navigationBarBackgroundColor": "#0E9AA9",
 				"navigationStyle": "custom",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
-					"transparentTitle": "always",
-					"titlePenetrate": "YES",
-					"defaultTitle": "" // 将导航栏默认的 title 置空
+					// "transparentTitle": "always",
+					// "titlePenetrate": "YES",
+					"defaultTitle": "首页" // 将导航栏默认的 title 置空
 				}
 			}
 		},
@@ -25,7 +25,7 @@
 			"path": "pages/user/user",
 			"style": {
 				"navigationBarTitleText": "九州ETC",
-				"navigationBarBackgroundColor": "#22dbc8",
+				"navigationBarBackgroundColor": "#0E9AA9",
 				"navigationStyle": "custom",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
 					"transparentTitle": "always",

pages/bluetooth/bluetooth.vue

@@ -36,26 +36,27 @@
 	const jyApi = require("../../static/etc/JYAPI/GenvictBleUtil.js");
 	const jlQZApi = require("../../static/etc/JLQZAPI/JLObuSDK.js");
 	const atApi = require("../../static/etc/ATAPI/ArtcBleUtil.js");
-	const jtApi = require("../../static/etc/JTAPI/BleUtil.js");
 	const wqApi = require("../../static/etc/WQAPI/WCDObuSdk.js");
 	const cgApi = require("../../static/etc/CGAPI/cguBle.js");
-
 	const tools = require("../../static/etcUtil/tools.js");
 	const datas = require("../../static/etcUtil/datas.js");
+	
 	const bluetoothUtil = require("../../static/etcUtil/index.js");
 	// #ifdef MP-WEIXIN
 	let jlApi = require("../../static/etc/JLAPI/JLObuSDK.js"); //聚力SDK
 	let wjApi = require("../../static/etc/WJAPI/wjBleAPI");
 	let tdApi = require("../../static/etc/TDAPI/TDRObuSDK.js");
 	let zzApi = require("../../static/etc/WJAPI/wjBleAPI.js");
+	let jtApi = require("../../static/etc/JTAPI/BleUtil.js");
 	// #endif
 	
-// #ifdef MP-ALIPAY
+	// #ifdef MP-ALIPAY
 	// 这部分代码将仅在支付宝小程序平台下执行
 	jlApi = require("../../static/etc/JLObuSDK/JLObuSDK.js");
 	wjApi = require("../../static/etc/wjBle/WJBleAPI");
 	zzApi = require("../../static/etc/wjBle/WJBleAPI");
 	tdApi = require("../../static/etc/TDRAPI/TDRObuSDK.js");
+	jtApi = require("../../static/etc/JTAPIS/BleUtil.js");
 	// 执行支付宝小程序的特定功能
 	// #endif
 

pages/index/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<navBar title="首页" :scrollTop="scrollTop" :isBack="isBack"></navBar>
+	<!-- <navBar title="首页" :scrollTop="scrollTop" :isBack="isBack"></navBar> -->
 	<!-- <web-view src="https://qtzl.etcjz.cn/h5/#/pages/productSelection/productSelection?qdOrderNo=20231129210008520101000026149316"></web-view> -->
 	<filter>
 		<!-- <view class="statusBar" :style="{height:statusBarHeight+'px'}" v-show="isShowBar"></view> -->
@@ -283,8 +283,8 @@
 	const swiper = reactive({
 		indicatorDots: true,
 		autoplay: true,
-		interval: 2000,
-		duration: 1000,
+		interval: 3000,
+		duration: 3000,
 		easing: "easeInOutCubic"
 	})
 	const state = reactive({

static/etcUtil/index.js

@@ -7,7 +7,7 @@ const jyApi = require("../etc/JYAPI/GenvictBleUtil.js");
 // import * as jlQZApi from '../../lib/etc/JLQZAPI/JLObuSDK.js'
 const atApi = require("../etc/ATAPI/ArtcBleUtil.js");
 // import * as atApi from '../../lib/etc/ATAPI/ArtcBleUtil.js'
-const jtApi = require("../etc/JTAPI/BleUtil.js");
+
 // import * as jtApi from '../../lib/etc/JTAPI/BleUtil.js'
 const wqApi = require("../etc/WQAPI/WCDObuSdk.js");
 // import * as wqApi from '../../lib/etc/WQAPI/WCDObuSdk.js'
@@ -24,6 +24,7 @@ let jlApi = require("../../static/etc/JLAPI/JLObuSDK.js"); //聚力SDK
 let wjApi = require("../etc/WJAPI/wjBleAPI");
 let tdApi = require("../etc/TDAPI/TDRObuSDK.js");
 let zzApi = require("../etc/WJAPI/wjBleAPI.js");
+let jtApi = require("../etc/JTAPI/BleUtil.js");
 const jlQZApi = require("../etc/JLQZAPI/JLObuSDK.js");
 import {
 	getItem
@@ -35,6 +36,7 @@ if (getItem('environment') == 'ZFB') {
 	jlApi = require("../etc/JLObuSDK/JLObuSDK.js");
 	wjApi = require("../etc/wjBle/WJBleAPI");
 	zzApi = require("../etc/wjBle/WJBleAPI.js");
+	jtApi = require("../etc/JTAPIS/BleUtil.js");
 }
 
 /**

subpackage/orders/choice-product.vue

@@ -160,7 +160,7 @@
 			// console.log(res.bizContent);
 			const data = stringToJson(res.bizContent);
 			console.log("产品列表", data.list);
-			if (data.list.length > 0) {
+			if (data.list && data.list.length > 0) {
 				state.dataArray = data.list ? data.list : [];
 				console.log("state.dataArray", state.dataArray);
 				for (var i = 0; i < state.dataArray.length; i++) {

uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue

@@ -91,7 +91,7 @@
 			speed: {
 				// 默认1s滚动100px
 				type: Number,
-				default: 100
+				default: 50
 			},
 			color: {
 				type: String,

utils/network/difference.js

@@ -10,6 +10,7 @@ export const source = "WECHAT"
 // 渠道编号
 // #ifdef MP-ALIPAY
 export const agentId = "52010106998"
+// export const agentId = "52010106004"
 // #endif
 // #ifdef MP-WEIXIN
 export const agentId = "52010106004"
@@ -17,7 +18,8 @@ export const agentId = "52010106004"
 
 // 网点编号
 // #ifdef MP-ALIPAY
-export const channelId = "5201010699800000001"
+// export const channelId = "5201010699800000001"
+export const channelId = "5201010600401140003"
 // #endif
 // #ifdef MP-WEIXIN
 export const channelId = "5201010200601130001"