支付宝上传版本的代码

datas/vehiclePlateColor.js

@@ -41,7 +41,7 @@ export const vehiclePlateColor = [{
 ]
 
 //获取车牌颜色	
-export const getVehiclePlateColor = (id = 0) => {
+export const getVehiclePlateColor = (id) => {
 	let colors = vehiclePlateColor.filter(item => item.id == id);
 	if (colors) {
 		return colors[0] ? colors[0].color : ''
@@ -54,52 +54,52 @@ export const getVehiclePlateColor = (id = 0) => {
 export const vehiclePlateColorPai = [{
 		id: 0,
 		color: '蓝牌',
-		showColor:"rgb(56,139,252)",
+		showColor: "rgb(56,139,252)",
 	},
 	{
 		id: 1,
 		color: '黄牌',
-		showColor:"rgb(255,156,0)",
+		showColor: "rgb(255,156,0)",
 	},
 	{
 		id: 2,
 		color: '黑牌',
-		showColor:"rgb(0,0,0)",
+		showColor: "rgb(0,0,0)",
 	},
 	{
 		id: 3,
 		color: '白牌',
-		showColor:"white",
+		showColor: "white",
 	},
 	{
 		id: 4,
 		color: '渐变绿牌',
-		showColor:"rgb(56,139,252)",
+		showColor: "rgb(56,139,252)",
 	},
 	{
 		id: 5,
 		color: '黄绿双拼牌',
-		showColor:"rgb(252,204,1)",
+		showColor: "rgb(252,204,1)",
 	},
 	{
 		id: 6,
 		color: '蓝白渐变牌',
-		showColor:"rgb(56,139,252)",
+		showColor: "rgb(56,139,252)",
 	},
 	{
 		id: 9,
 		color: '未确定',
-		showColor:"",
+		showColor: "",
 	},
 	{
 		id: 11,
 		color: '绿牌',
-		showColor:"rgb(26,250,31)",
+		showColor: "rgb(26,250,31)",
 	},
 	{
 		id: 12,
 		color: '红牌',
-		showColor:"red",
+		showColor: "red",
 	}
 ]
 

pages.json

@@ -1956,38 +1956,34 @@
 					}
 				},
 				{
-					"path" : "zfbqy/zfbqy",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-						"enablePullDownRefresh" : false,
+					"path": "zfbqy/zfbqy",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
 						"usingComponents": {
 							"home": "plugin://myPlugin/home"
 						}
 					}
 				},
 				{
-					"path" : "equityList/equityList",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-						"enablePullDownRefresh" : false
+					"path": "equityList/equityList",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
 					}
 				},
 				{
-					"path" : "equityInfo/equityInfo",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-						"enablePullDownRefresh" : false
+					"path": "equityInfo/equityInfo",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
 					}
 				},
 				{
-					"path" : "equity/equity",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-						"enablePullDownRefresh" : false
+					"path": "equity/equity",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
 					}
 				}
 			]

pages/order/components/order-list-item-new.vue

@@ -3,7 +3,6 @@
 <template>
 	<view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'"
 		@click.stop="gotoOrderDetails(item,1)">
-		<!-- <view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'"> -->
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon" mode="aspectFill"></image>
@@ -53,7 +52,7 @@
 			<!-- 待支付 -->
 			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-				<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view>
+				<!-- <view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view> -->
 			</view>
 			<view class="btns" v-if="item.orderStep == OrderStatus['完成车辆信息上传/待支付']">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
@@ -90,24 +89,24 @@
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.待收货">
 				<view class="btn btn-normal" @click.stop="gotoCheckLogistics(item)">查看物流
 				</view>
-				<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货
-				</view>
+				<!-- <view class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货
+				</view> -->
 				<!-- <view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view> -->
 				<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
-				<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
+				<!-- <view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view> -->
 			</view>
 
 			<!-- 待激活 -->
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活 ">
-				<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货</view>
-				<view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
+				<!-- <view class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货</view> -->
+				<!-- <view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view> -->
 				<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
-				<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
+				<!-- <view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view> -->
 			</view>
 
 			<!-- 已完成  售后订单不允许评价产品，储值卡转记账卡除外-->
 			<!-- 发行产品 isProduct=0;  业务员 isStaff=0; 权益 isEquity=0  业务服务  isService=0; -->
-			<view class="btns"
+			<!-- <view class="btns"
 				v-else-if="item.orderStep == OrderStatus.已完成 && (item.orderType =='ISSUE' || item.orderType =='VALUE_TO_ACCOUNT') ">
 
 				<view class="btn btn-normal" v-if="( item.isProduct==1 && item.isService==1) ">
@@ -117,19 +116,12 @@
 					<view class="btn btn-primary" v-if="item.isProduct==0 || item.isService==0"
 						@click.stop="gotoEvaluateProduct(item)">去评价产品</view>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 已结束 -->
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
-				<view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view>
+				<!-- <view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view> -->
 			</view>
-
-			<!-- 换货中 -->
-			<!-- 查看物流: 原型没有UI有 -->
-			<!-- <view class="btns" v-else-if="item.orderStep == OrderStatus['已申请-换货']">
-				<view class="btn btn-normal" @click.stop="gotoCheckLogistics(item)">查看物流</view>
-				<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
-			</view> -->
 			<!-- '完成签约' = 5,
 			'已申请-退货' = 13,
 			'退款中' = 15,

pages/order/order.vue

@@ -79,7 +79,7 @@
 							<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
 						</view>
 						<!-- 已完成 -->
-						<view class="btns" v-else-if="item.orderStep == OrderStatus.已完成">
+						<!-- <view class="btns" v-else-if="item.orderStep == OrderStatus.已完成 && source=='WECHAT'">
 
 							<view class="btn btn-normal" v-if="item.isStaff==1 && item.isProduct==1">
 								已评价
@@ -87,7 +87,7 @@
 							<view class='evaluation' v-else>
 								<view class="btn btn-primary" @click.stop="gotoEvaluateSalesman(item)">去评价</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</block>
 				<uni-load-more :status="params.status" iconType="snow" :icon-size="16" :content-text="config.contentTxt"
@@ -106,6 +106,7 @@
 	import { onLoad, onReachBottom, onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	import useOrderListItem from "@/composables/order/useOrderListItem";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
+	import { source } from "@/utils/network/difference";
 	import {
 		getOrderStatusName,
 		msg,

subpackage/after-sale/activation/activate.vue

@@ -74,6 +74,12 @@
 	const tools = require("../../../static/etcUtil/tools.js");
 	const bluetoothUtil = require("../../../static/etcUtil/index.js");
 	import activeSuccess from "./components/popup-device-active-success";
+	import {
+		getVehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
+	import {
+		searchVehicleInfoQuery
+	} from "@/utils/publicRequest";
 	import {
 		channelId
 	} from "@/utils/network/difference";
@@ -227,27 +233,34 @@
 			console.log("orderInfores", res);
 			if (orderInfo) {
 				fileDataStrings.userType = orderInfo.userType; //用户类型
-				fileDataStrings.approvedCount = parseInt(orderInfo.vehicleApprovedCount); //核载人数
 				fileDataStrings.cardId = orderInfo.cardId;
 				fileDataStrings.packageNum = orderInfo.packageNum;
 				fileDataStrings.obuId = orderInfo.obuId;
-				fileDataStrings.vehicleVin = orderInfo.vehicleVin;
-				fileDataStrings.vehicleEngineNum = orderInfo.vehicleEngineNum;
-				fileDataStrings.axleCount = parseInt(orderInfo.vehicleAxleCount); //轴数
-				fileDataStrings.engineNum = orderInfo.vehicleVin; //发动机
-				fileDataStrings.type = parseInt(orderInfo.vehicleClass); //类型
-				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
-				fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
-				fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
-				let arr = orderInfo.vehicleDimensions.split("X");
-				fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
-				fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
-				fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-				fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
-				fileDataStrings.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 				fileDataStrings.customerTel = orderInfo.customerTel;
 				fileDataStrings.customerId = orderInfo.customerId;
 				fileDataStrings.orderId = orderInfo.orderId;
+				let vehicleId = orderInfo.vehiclePlate + "_" + orderInfo.vehiclePlateColor
+				searchVehicleInfoQuery(vehicleId).then((orderInfo) => {
+					fileDataStrings.approvedCount = parseInt(orderInfo.approvedCount); //核载人数
+					fileDataStrings.vehicleVin = orderInfo.vin;
+					fileDataStrings.vehicleEngineNum = orderInfo.engineNum;
+					fileDataStrings.axleCount = parseInt(orderInfo.axleCount); //轴数
+					fileDataStrings.engineNum = orderInfo.engineNum; //发动机
+					fileDataStrings.type = parseInt(orderInfo.type); //类型
+					fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
+					fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
+					console.log("车辆信息", orderInfo)
+					fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
+					let arr = orderInfo.vehicleDimensions.split("X");
+					console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
+					fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
+					fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
+					fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+					fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
+					fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
+						.vehiclePlateColor);
+					console.log("fileDataStrings", fileDataStrings);
+				})
 				getObuId();
 				cancelOrderRequest(orderInfo.orderId)
 			}

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

@@ -49,6 +49,7 @@
 			data: {
 				"pageNo": state.pageNo,
 				"pageSize": state.pageSize,
+				'status': "ENABLE"  //可使用
 			},
 			method: 'POST',
 			showLoading: true,

subpackage/after-sale/card-Renewal/renewal-confirm.vue

@@ -116,6 +116,12 @@
 		obuActivation,
 		renewalTimeApi
 	} from "@/utils/network/api.js";
+	import {
+		getVehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
+	import {
+		searchVehicleInfoQuery
+	} from "@/utils/publicRequest";
 	const cmd = require("../../../static/etcUtil/cmdConfig.js");
 	import {
 		IntegerToHexString,
@@ -583,27 +589,34 @@
 			console.log("orderInfores", res);
 			if (orderInfo) {
 				fileDataStrings.userType = orderInfo.userType; //用户类型
-				fileDataStrings.approvedCount = parseInt(orderInfo.vehicleApprovedCount); //核载人数
 				fileDataStrings.cardId = orderInfo.cardId;
 				fileDataStrings.packageNum = orderInfo.packageNum;
 				fileDataStrings.obuId = orderInfo.obuId;
-				fileDataStrings.vehicleVin = orderInfo.vehicleVin;
-				fileDataStrings.vehicleEngineNum = orderInfo.vehicleEngineNum;
-				fileDataStrings.axleCount = parseInt(orderInfo.vehicleAxleCount); //轴数
-				fileDataStrings.engineNum = orderInfo.vehicleVin; //发动机
-				fileDataStrings.type = parseInt(orderInfo.vehicleClass); //类型
-				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
-				fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
-				fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
-				let arr = orderInfo.vehicleDimensions.split("X");
-				fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
-				fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
-				fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-				fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
-				fileDataStrings.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 				fileDataStrings.customerTel = orderInfo.customerTel;
 				fileDataStrings.customerId = orderInfo.customerId;
 				fileDataStrings.orderId = orderInfo.orderId;
+				let vehicleId = orderInfo.vehiclePlate + "_" + orderInfo.vehiclePlateColor
+				searchVehicleInfoQuery(vehicleId).then((orderInfo) => {
+					fileDataStrings.approvedCount = parseInt(orderInfo.approvedCount); //核载人数
+					fileDataStrings.vehicleVin = orderInfo.vin;
+					fileDataStrings.vehicleEngineNum = orderInfo.engineNum;
+					fileDataStrings.axleCount = parseInt(orderInfo.axleCount); //轴数
+					fileDataStrings.engineNum = orderInfo.engineNum; //发动机
+					fileDataStrings.type = parseInt(orderInfo.type); //类型
+					fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
+					fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
+					console.log("车辆信息", orderInfo)
+					fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
+					let arr = orderInfo.vehicleDimensions.split("X");
+					console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
+					fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
+					fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
+					fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+					fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
+					fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
+						.vehiclePlateColor);
+					console.log("fileDataStrings", fileDataStrings);
+				})
 			}
 		});
 	};

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -50,11 +50,11 @@
 				<view class="cell-left">版本号</view>
 				<view class="cell-right">{{ card.version }}</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="state.cardStatus">
 				<view class="cell-left">卡状态</view>
 				<view class="cell-right">{{getCodeName('CARD_STATE_TYPE',state.cardStatus)}}</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="state.cardTypeName">
 				<view class="cell-left">卡类型</view>
 				<view class="cell-right">{{state.cardTypeName}}</view>
 			</view>

subpackage/after-sale/equipment-upgrade/upgrade-confirm.vue

@@ -104,7 +104,12 @@
 		obuWriteAgain,
 		changeWorkOrderStatus
 	} from "@/utils/network/api.js";
-
+	import {
+		getVehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
+	import {
+		searchVehicleInfoQuery
+	} from "@/utils/publicRequest";
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
@@ -530,27 +535,34 @@
 			console.log("orderInfores", res);
 			if (orderInfo) {
 				fileDataStrings.userType = orderInfo.userType; //用户类型
-				fileDataStrings.approvedCount = parseInt(orderInfo.vehicleApprovedCount); //核载人数
 				fileDataStrings.cardId = orderInfo.cardId;
 				fileDataStrings.packageNum = orderInfo.packageNum;
 				fileDataStrings.obuId = orderInfo.obuId;
-				fileDataStrings.vehicleVin = orderInfo.vehicleVin;
-				fileDataStrings.vehicleEngineNum = orderInfo.vehicleEngineNum;
-				fileDataStrings.axleCount = parseInt(orderInfo.vehicleAxleCount); //轴数
-				fileDataStrings.engineNum = orderInfo.vehicleVin; //发动机
-				fileDataStrings.type = parseInt(orderInfo.vehicleClass); //类型
-				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
-				fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
-				fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
-				let arr = orderInfo.vehicleDimensions.split("X");
-				fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
-				fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
-				fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-				fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
-				fileDataStrings.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 				fileDataStrings.customerTel = orderInfo.customerTel;
 				fileDataStrings.customerId = orderInfo.customerId;
 				fileDataStrings.orderId = orderInfo.orderId;
+				let vehicleId = orderInfo.vehiclePlate + "_" + orderInfo.vehiclePlateColor
+				searchVehicleInfoQuery(vehicleId).then((orderInfo) => {
+					fileDataStrings.approvedCount = parseInt(orderInfo.approvedCount); //核载人数
+					fileDataStrings.vehicleVin = orderInfo.vin;
+					fileDataStrings.vehicleEngineNum = orderInfo.engineNum;
+					fileDataStrings.axleCount = parseInt(orderInfo.axleCount); //轴数
+					fileDataStrings.engineNum = orderInfo.engineNum; //发动机
+					fileDataStrings.type = parseInt(orderInfo.type); //类型
+					fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
+					fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
+					console.log("车辆信息", orderInfo)
+					fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
+					let arr = orderInfo.vehicleDimensions.split("X");
+					console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
+					fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
+					fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
+					fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+					fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
+					fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
+						.vehiclePlateColor);
+					console.log("fileDataStrings", fileDataStrings);
+				})
 			}
 		});
 	};

subpackage/orders/order-details-new.vue

@@ -405,9 +405,9 @@
 						v-if="state.orderInfo.orderStep == OrderStatus.审核不通过 || state.orderInfo.orderStep == OrderStatus.待审核"
 						class="btn-status">
 						<view class="btn space" @click="gotoCancelOrder(state.orderInfo)">取消订单</view>
-						<view class="btn space" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过"
-							@click="gotoEditUserOrUnitInfo(state.orderInfo)">修改资料</view>
-						<view class="btn-green" @click="gotoEditAddress(state.orderInfo)">修改地址</view>
+						<!-- 	<view class="btn space" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过"
+							@click="gotoEditUserOrUnitInfo(state.orderInfo)">修改资料</view> -->
+						<!-- <view class="btn-green" @click="gotoEditAddress(state.orderInfo)">修改地址</view> -->
 					</view>
 					<!-- 待支付 -->
 					<view
@@ -424,31 +424,30 @@
 					<!-- 待发货 -->
 					<view v-if="state.orderInfo.orderStep == OrderStatus.待发货" class="btn-status">
 						<view class="btn space" @click="gotoCancelOrder(state.orderInfo)">取消订单</view>
-						<view class="btn-green" @click="gotoEditAddress(state.orderInfo)">修改地址</view>
+						<!-- <view class="btn-green" @click="gotoEditAddress(state.orderInfo)">修改地址</view> -->
 					</view>
 					<!-- 待收货 -->
 					<view v-if="state.orderInfo.orderStep == OrderStatus.待收货" class="btn-status">
 						<view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view>
-						<view class="btn space" @click="gotoReturnOrder(state.orderInfo)">申请退货</view>
+						<!-- <view class="btn space" @click="gotoReturnOrder(state.orderInfo)">申请退货</view> -->
 						<view class="btn-green space" @click="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
-						<view class="btn-green" @click.stop="closeOrder(state.orderInfo)"
-							v-if="state.orderInfo.finishOrder">结束订单</view>
+						<!-- <view class="btn-green" @click.stop="closeOrder(state.orderInfo)" v-if="state.orderInfo.finishOrder">结束订单</view> -->
 					</view>
 					<!-- 待激活 -->
 					<view v-if="state.orderInfo.orderStep == OrderStatus.待激活" class="btn-status">
-						<view class="btn space" @click="gotoReturnOrder(state.orderInfo)">申请退货</view>
-						<view class="btn space" @click="gotoExchangeOrder(state.orderInfo)">申请换货</view>
+						<!-- <view class="btn space" @click="gotoReturnOrder(state.orderInfo)">申请退货</view> -->
+						<!-- <view class="btn space" @click="gotoExchangeOrder(state.orderInfo)">申请换货</view> -->
 						<view class="btn-green space" @click="gotoActiveOrder(state.orderInfo)">去激活</view>
-						<view class="btn-green" @click.stop="closeOrder(state.orderInfo)"
-							v-if="state.orderInfo.finishOrder">结束订单</view>
+						<!-- <view class="btn-green" @click.stop="closeOrder(state.orderInfo)"
+							v-if="state.orderInfo.finishOrder">结束订单</view> -->
 					</view>
 					<!-- 订单已结束 -->
 					<view v-if="state.orderInfo.orderStep == OrderStatus.已结束 && state.orderInfo.isUseAgain"
 						class="btn-status">
-						<view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view>
+						<!-- <view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view> -->
 					</view>
 					<!-- 订单完成 -->
-					<view v-if="state.isWeiXin==1">
+					<!-- <view v-if="state.isWeiXin==1">
 						<view
 							v-if="state.orderInfo.orderStep == OrderStatus.已完成 && (state.orderInfo.orderType =='ISSUE' || state.orderInfo.orderType =='VALUE_TO_ACCOUNT')"
 							class="btn-status">
@@ -470,7 +469,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 					<!-- 换货中 -->
 					<!-- <view v-if="state.orderInfo.orderStep == OrderStatus['已申请-换货']" class="btn-status">
 						<view class="btn space" @click="gotoCheckLogistics(state.orderInfo)">查看物流</view>
@@ -548,7 +547,7 @@
 					}
 				}
 			}
-			state.orderInfo.appraise = appraise;
+			// state.orderInfo.appraise = appraise;
 			console.log("获取订单详情", state.orderInfo)
 		})
 	}

subpackage/service/equity/equity.vue

@@ -10,7 +10,7 @@
 					我的权益</view>
 				<!-- <view v-if="exchangeCodes.length > 0" style="text-align: center;">暂无权益内容</view> @scrolltolower="loadMore" -->
 				<scroll-view scroll-y="true">
-					<view v-for="(item, index) in exchangeCodes" :key="index" class="item" @click="click">
+					<view v-for="(item, index) in exchangeCodes" :key="index" class="item" @click.stop="click(item)">
 						<view style="display: flex;flex-direction: row;flex: 1;">
 							<view style="display: flex;flex-direction: column;margin: 10px;">
 								<text>权益名称：{{item.equityInfoItems[0].productName}}</text>
@@ -25,12 +25,14 @@
 							</view>
 							<view
 								style="margin: 10px;border-radius: 0 8px 8px 0 ;justify-content: center;text-align: center; display: flex;flex-direction: column;background: white;flex: 1;">
-								<text class="text-w"
+								<text v-if="item.equityInfoItems[0] && item.equityInfoItems[0].equityType !='ZFB'"
+									class="text-w"
 									:style="item.status == 'WAIT_ACTIVATED' ? 'color: #023F8F;' : item.status == 'WAIT_USE' ? 'color: orange;' : item.status == 'USED' ? 'color: green;' : 'color: gray;'">{{item.status == 'WAIT_ACTIVATED' ? '待激活' : item.status == 'WAIT_USE' ? '待领取' : 
 							          item.status == 'USED' ? '已领取' : '已失效'}}</text>
-								<button v-if="item.status != 'EXPIRED'"
+								<button
+									v-if="item.status != 'EXPIRED' && item.equityInfoItems[0] && item.equityInfoItems[0].equityType !='ZFB'"
 									:style="item.status == 'WAIT_ACTIVATED' ? 'background-color: #023F8F;' : item.status == 'WAIT_USE' ? 'background-color: orange;' : item.status == 'USED' ? 'background-color: green;' : 'background-color: gray;'"
-									class="copy-btn" data-code="{{item}}" @click="copyCode">
+									class="copy-btn" data-code="{{item}}" @click.stop="copyCode(item)">
 									{{item.status == 'WAIT_ACTIVATED' ? '去激活' : item.status == 'WAIT_USE' ? '立即领取' : 
 							          item.status == 'USED' ? '复制' : ''}}</button>
 							</view>
@@ -88,10 +90,11 @@
 		}).then((item) => {
 			let res = JSON.parse(item.bizContent)
 			let newCodes = res.data.orderItems;
-			console.log(res, '=========', newCodes);
 			if (newCodes) {
+				console.log(res, '111=========', newCodes);
 				newCodes.forEach(item => {
 					//1 不能领取  0 可以领取 1(不能领取原因 notUseCase)
+					// item.equityInfoItems[0].equityType
 					// WAIT_GET
 					item.status =
 						item.equityInfoItems[0].isUse == '0' && item.equityInfoItems[0].couponStatus ==
@@ -123,18 +126,27 @@
 		})
 	}
 
-	function click() {
-		uni.navigateTo({
-			url: '/subpackage/service/equityInfo/equityInfo?singleEquityId=' + singleEquityId.value +
-				"&couponAgencyType=" + couponAgencyType.value + "&couponId=" + couponId.value,
-		})
+	function click(item) {
+		console.log("item.equityInfoItems[0].equityType", item.equityInfoItems[0].equityType)
+		if (item.equityInfoItems[0].equityType == 'ZFB') {
+			console.log("1")
+			uni.navigateTo({
+				url: `/subpackage/service/zfbqy/zfbqy`
+			})
+		} else {
+			console.log("2")
+			uni.navigateTo({
+				url: '/subpackage/service/equityInfo/equityInfo?singleEquityId=' + singleEquityId.value +
+					"&couponAgencyType=" + couponAgencyType.value + "&couponId=" + couponId.value,
+			})
+		}
 	}
 
 	function copyCode(e) {
-		console.log(e.currentTarget);
-		let item = e.currentTarget.dataset.code;
-		// 复制兑换码到剪贴板 
-		let code = e.currentTarget.dataset.code.redeemCode;
+		let item = e;
+		// // 复制兑换码到剪贴板 
+		let code = e.redeemCode;
+		console.log("e", e);
 		if (item.status == 'WAIT_ACTIVATED') { //待激活
 			uni.showModal({
 				title: '温馨提示',
@@ -143,7 +155,7 @@
 				success: function(res) {
 					if (res.confirm) {
 						uni.navigateTo({
-							url: '/pages/etc/explain/index',
+							url: '/subpackage/personal-center/install-activation-order',
 						})
 					} else if (res.cancel) {
 						console.log('用户点击取消');
@@ -225,7 +237,6 @@
 	}
 </script>
 <style lang='scss' scoped>
-	/* index.wxss */
 	.container {
 		width: 100%;
 		height: 96vh;
@@ -237,7 +248,6 @@
 		width: 100%;
 		align-items: center;
 		justify-content: space-around;
-		/* background-color: rgba(204, 204, 204, 0.2); 淡灰色，透明度为 50% */
 		background-color: white;
 		/* 淡灰色，透明度为 50% */
 		border-bottom: 1rpx solid #e0e0e0;
@@ -259,7 +269,6 @@
 		margin-top: 20px;
 		border-radius: 10rpx;
 		font-size: 24rpx;
-		/* 调整字体大小 */
 		box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2);
 	}
 

subpackage/service/equityInfo/equityInfo.vue

@@ -54,7 +54,6 @@
 		padding: 10rpx 0;
 		border-radius: 10rpx;
 		font-size: 24rpx;
-		/* 调整字体大小 */
 		box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2);
 	}
 </style>

subpackage/service/equityList/equityList.vue

@@ -4,7 +4,6 @@
 			style="justify-content: flex-start; display: flex; font-size: 28rpx; min-height: 20px; background-color: #22dbc8; color: white; border-radius: 20rpx; padding: 20px; margin: 20px;">
 			<view style="display: flex; flex-direction: column; flex: 1;">
 				<text>{{ item.productName }}</text>
-				<!-- <text>记账卡</text> -->
 			</view>
 			<view>></view>
 		</view>

utils/publicRequest.ts

@@ -0,0 +1,21 @@
+import { stringToJson } from "@/utils/network/encryption";
+import { request } from "@/utils/network/request";
+import { searchVehicleInfo } from "@/utils/network/api.js";
+// 154接口获取车辆信息
+export const searchVehicleInfoQuery = (vehicleId) => {
+	const options = {
+		type: 2,
+		data: {
+			vehicleId: vehicleId
+		},
+		method: "POST",
+		showLoading: true,
+	};
+	return new Promise(async (resolve, reject) => {
+		const res = await request(searchVehicleInfo, options);
+		const data = stringToJson(res.bizContent).vehicles[0];
+		resolve(data);
+	}).catch((error) => {
+		reject(error);
+	});
+}