提交

pages.json

 			"style": {
 				"navigationBarHidden": true,
 				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#0E9AA9",
+				"navigationBarBackgroundColor": "#22dbc8",
 				"navigationStyle": "custom",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
 					// "transparentTitle": "always",
 					// "titlePenetrate": "YES",
-					"defaultTitle": "首页" // 将导航栏默认的 title 置空
+					"defaultTitle": "" // 将导航栏默认的 title 置空
 				}
 			}
 		},
 			"path": "pages/user/user",
 			"style": {
 				"navigationBarTitleText": "九州ETC",
-				"navigationBarBackgroundColor": "#0E9AA9",
+				"navigationBarBackgroundColor": "#22dbc8",
 				"navigationStyle": "custom",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
 					"transparentTitle": "always",
 	"subPackages": [{
 			"root": "subpackage/after-sale", //售后相关 
 			"pages": [{
+					"path": "add-equity/choice-order",
+					"style": {
+						"navigationBarTitleText": "选择订单",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
 					"path": "add-equity/add-equity",
 					"style": {
-						"navigationBarTitleText": "加购权益",
+						"navigationBarTitleText": "权益列表",
 						"enablePullDownRefresh": false
 					}
 				},

pages/bluetooth/bluetooth.vue

 	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
 	// 这部分代码将仅在支付宝小程序平台下执行
 	jlApi = require("../../static/etc/JLObuSDK/JLObuSDK.js");
 										console.log("device._name", device._name)
 										if (deviceList.value.length == 0) {
 											// #ifdef MP-ALIPAY
-											if (device._name == '聚利' || device._name == '万集' || device._name == '天地融') {
+											if (device._name == '聚利' || device._name == '万集' || device._name == '天地融' || device._name == '建投') {
 												foundDevices.push(device);
 												console.log("device._name", device._name)
 											}

subpackage/after-sale/add-equity/add-equity.vue

 <template>
 	<view class="content">
-		<!-- <view class="item" v-for="(item,index) in state.list" :key='index'> -->
-		<view class="item">
+		<view class="item" v-for="(item,index) in state.list" :key='index'>
+			<!-- <view class="item"> -->
 			<view class="title">
 				<view>
-					<!-- <text><text>{{item.productName}}</text>&nbsp;&nbsp;<text>¥{{item.discountPrice * 0.01}}</text></text> -->
-					<text><text>111</text>&nbsp;&nbsp;<text>¥11</text></text>
+					<text><text>{{item.productName}}</text>&nbsp;&nbsp;<text>¥{{item.discountPrice * 0.01}}</text></text>
 				</view>
-				<text class="add">加购</text>
+				<text class="add" @click="add()">加购</text>
 			</view>
-
 		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { onLoad, onShow } from "@dcloudio/uni-app";
+	import { onLoad } from "@dcloudio/uni-app";
 	import { reactive } from "vue";
-	import { equityProductsApi } from "@/utils/network/api.js";
+	import { equityProductsApi, addEquityListApi } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request } from "@/utils/network/request";
-	import { etcQYAction } from "@/utils/network/api.js";
-	import { fileURL } from "@/datas/fileURL.js";
-	import navBar from "@/components/nav-bar/nav-bar2.vue";
-	import navBgCar from "./components/nav-bg-car4";
-	// import { setItem } from "@/utils/storage";
-	import { msg } from "@/utils/utils";
-	import {
-		checkOrderStatus,
-		wechatAppID,
-		wechatPayConfigId,
-		wechatSecret,
-		addProduct,
-		queryDetails,
-		getOpenidApi
-	} from "@/utils/network/api";
+	import { msg, navTo } from "@/utils/utils";
+	import { getEquityListApi } from "@/utils/network/api";
 	import {
 		getItem,
 		StorageKeys,
 		setItem
 	} from "@/utils/storage";
-	const imgURL = `${fileURL}image/`;
 
 	const state = reactive({
 		list: [],  //权益数据
 	})
 
 	onLoad((option : any) => {
-		// getList();
+		// 获取全部权益列表
+		getList();
 
 		console.log("option", option)
 	})
 		const options = {
 			type: 2,
 			data: {
-				"promoteId": state.promoteId,
+				"pageNo": 10,
+				"pageSize": 1,
 			},
 			method: 'POST',
 			showLoading: true,
 		}
-		request(equityProductsApi, options).then((res) => {
+		request(getEquityListApi, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			state.list = data.data
 			console.log("222", data.data)
 		})
 	}
+	const add = () => {
+		navTo('/subpackage/after-sale/add-equity/choice-order', true)
+
+		// const options = {
+		// 	type: 2,
+		// 	data: {
+		// 		"type": 1,
+		// 		"openId": getItem(StorageKeys.OpenId),
+		// 		"orderId": ""
+		// 	},
+		// 	method: 'POST',
+		// 	showLoading: true,
+		// }
+		// request(addEquityListApi, options).then((res) => {
+		// 	const data = stringToJson(res.bizContent);
+		// 	state.list = data.data
+		// 	console.log("加购", data.data)
+		// })
+	}
 </script>
 
 <style scoped lang="scss">

subpackage/after-sale/add-equity/choice-order.vue

+<template>
+	<view class="selectCar-box">
+		<view v-if="state.list&&state.list.length>0" @click="choose(i,item)" class="item" v-for="(item,i) in state.list"
+			:key="i">
+			<view class="iten-left">
+				<view>新办单号：{{item.orderId}}</view>
+				<view>订单车牌号：{{item.vehiclePlate}}</view>
+				<view>订单车牌颜色：{{getVehiclePlateColor(item.vehiclePlateColor)}}</view>
+			</view>
+			<view class="choose-item">
+				<view class="active" v-if="flag==i">
+				</view>
+			</view>
+		</view>
+
+		<view v-else>
+			<empty title='暂无找到相关订单信息' />
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import empty from "@/components/empty/empty.vue";
+	import {
+		reactive,
+		ref
+	} from "vue"
+	import {
+		navTo
+	} from "@/utils/utils"
+	import {
+		onLoad,
+	} from "@dcloudio/uni-app";
+	import {
+		orderList
+	} from "@/utils/network/api.js";
+	import {
+		request
+	} from "@/utils/network/request.js";
+	import {
+		getItem,
+		StorageKeys,
+	} from "@/utils/storage";
+	import {
+		stringToJson
+	} from "@/utils/network/encryption";
+	import {
+		vehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
+
+	const state = reactive({
+		list: [],//车辆list,
+	});
+	const flag = ref('0') //默认选择0
+	//获取车牌颜色文字	
+	const getVehiclePlateColor = (id : number) => {
+
+		const colors = vehiclePlateColor.filter(item => item.id == id);
+		return colors[0].color
+	}
+	onLoad((option) => {
+		quanCheckActionTrue().then((item : any) => {
+			console.log("1", item.data)
+			state.list = item.data
+		})
+	});
+
+	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+		source = "ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+		source = "WECHAT"
+		// #endif
+		var data = {
+			"opId": getItem(StorageKeys.OpenId),
+			"source": source,
+			"vehiclePlate": "",
+			"tabIndex": "0",
+			"pageNo": 1,
+			"pageSize": 10,
+			"promotionModes": 1,
+			"isAfter": true
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+
+		return new Promise(async (resolve, reject) => {
+			const res = await request(orderList, options);
+			const data = stringToJson(res.bizContent);
+			resolve(data);
+		}).catch((error) => {
+			reject(error);
+		});
+	}
+
+	const choose = (i, item) => {
+		flag.value = i
+		navTo(`/pages/recharge/recharge?cardId=${item.cardId}`)
+	}
+</script>
+
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #EEF7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		justify-content: center;
+	}
+
+	.selectCar-box {
+		// width: 100%;
+		height: 100%;
+		padding: 30rpx;
+
+		.item {
+			padding: 20rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 130rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
+			border-radius: 20rpx;
+			margin-bottom: 30rpx;
+
+			.iten-left {
+				align-items: center;
+				font-size: 28rpx;
+
+				text {
+					margin-left: 20rpx;
+					font-size: 32rpx;
+					font-family: Noto Sans S Chinese;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+
+			.choose-item {
+				width: 44rpx;
+				height: 44rpx;
+				background: #FFFFFF;
+				border: 2rpx solid #00B38B;
+				border-radius: 50%;
+				margin-right: 20rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				box-sizing: content-box;
+			}
+
+			.active {
+				width: 34rpx;
+				height: 34rpx;
+				background: #00B38B;
+				border-radius: 50%;
+			}
+		}
+	}
+</style>

utils/network/api.js

 /* 接口中常量 */
 // export const URL = "192.168.100.63";
-// export const URL = "trial.etcjz.cn";
-export const URL = "qtzl.etcjz.cn";
+export const URL = "trial.etcjz.cn";
+// export const URL = "qtzl.etcjz.cn";
 // export const URL = "qtzl.etcjz.cn/test";
 /**
  * 配置信息,针对不同的平台进行配置
 export const envs = {
 	//开发环境配置
 	development: {
-		// baseUrl: "https://trial.etcjz.cn",
-		baseUrl: "https://qtzl.etcjz.cn",
+		baseUrl: "https://trial.etcjz.cn",
+		// baseUrl: "https://qtzl.etcjz.cn",
 		// baseUrl: "https://qtzl.etcjz.cn/test",
 		// baseUrl: "http://192.168.100.158:8085",
 		// baseUrl: "http://192.168.100.63:50001",
 	production: {
 		// baseUrl: "http://192.168.124.6:8087",
 		// baseUrl: "http://222.85.144.89:19002",
-		baseUrl: "https://qtzl.etcjz.cn",
-		// baseUrl: "https://trial.etcjz.cn",
+		// baseUrl: "https://qtzl.etcjz.cn",
+		baseUrl: "https://trial.etcjz.cn",
 		// baseUrl: "https://qtzl.etcjz.cn/test",
 		// baseUrl: "http://192.168.100.158:8085",
 		// baseUrl: "http://192.168.100.63:50001",
 export const DataSynchronizationApi = "1ed5f05a48d24ee8985a4fa104e8ef3e" //订单数据同步到老系统接口
 export const isSubmitOrderApi = "3cec5ab7db63439186bda5a054c5fab7" //老中台-检测能否提交订单
 export const activationRecordApi = "1be22d30f08a4f10958a4b76dcfae6cf" //查询重新激活记录限制
-export const submitVehicleApi = "e35daf84891549afabcbf86b4ed7e2e3" //重新激活提交车辆信息
+export const submitVehicleApi = "e35daf84891549afabcbf86b4ed7e2e3" //重新激活提交车辆信息
+export const getEquityListApi = "a2656146d9c24c86b8ea7aabbe3dbf97" //获取全部加购权益列表
+export const addEquityListApi = "783e1feed98740b691f6c49c6d76f7d5" //全部权益列表购买

utils/network/difference.js

 // 微信小程序渠道编号：52010106004   支付宝小程序52010106998 
 // 渠道编号
 // #ifdef MP-ALIPAY
-export const agentId = "52010106998"
-// export const agentId = "52010106004"
+// export const agentId = "52010106998"
+export const agentId = "52010106004"
 // #endif
 // #ifdef MP-WEIXIN
 export const agentId = "52010106004"