替换Ui

pages/user/user.vue

@@ -169,7 +169,7 @@
 								<view class="card-no" v-if="item.cardId">卡号：{{item.cardId}}</view>
 								<view class="card-no" v-if="item.obuId">签号：{{item.obuId}}</view>
 							</view>
-							<!-- <view class="btn-unbind" @click="del(item.vehicleId)">解除绑定</view> -->
+							<view class="btn-unbind" @click="del(item.vehicleId)">解除绑定</view>
 						</view>
 						<view @click="$util.navTo('/subpackage/personal-center/setting/car-information/car-create', true)"
 							class='add-related' :style="{'--bgimg':`url(${$imgUrl}myImage/guanlianbg.png)`}">
@@ -192,7 +192,7 @@
 	import navBar from "../../components/nav-bar/nav-bar2.vue";
 	import { onLoad, onShow, onPageScroll } from "@dcloudio/uni-app";
 	import {
-		userInfoIndex, vehicleInfoChangeEditablePage, delCarInfo, showEquityListApi
+		userInfoIndex, selectCarInfo, delCarInfo, showEquityListApi
 	} from "@/utils/network/api.js";
 	import {
 		request,requestNew
@@ -314,8 +314,8 @@
 			showLoading: true,
 		};
 		//调用方式
-		requestNew(vehicleInfoChangeEditablePage, options).then((res) => {
-			const data = res.vehicleInfoList
+		requestNew(selectCarInfo, options).then((res) => {
+			const data = res.vehicleManages
 			for (var i = 0; i < data.length; i++) {
 				for (var j = 0; j < vehiclePlateColorPai.length; j++) {
 					if (data[i].vehiclePlateColor == vehiclePlateColorPai[j]['id']) {
@@ -379,17 +379,14 @@
 						method: "POST",
 						showLoading: true,
 					};
-					request(delCarInfo, options).then((res) => {
-						const data = stringToJson(res.bizContent);
+					requestNew(delCarInfo, options).then((res) => {
+						const data = res;
 						console.log(data)
-						state.list = data.vehicleManages
-						if (data.info == '成功.') {
 							uni.showToast({
 								title: "删除成功",
 								icon: "none"
 							})
 							queryCarMsg();
-						}
 					});
 				} else if (res.cancel) {
 					console.log('用户点击取消');

subpackage/orders/choice-product.vue

@@ -13,7 +13,7 @@
 						{{ item['cardTypeArr'] }}
 					</view>
 				</view>
-				<view v-for="(str, index) in item.equityList" :key="index" class="ul-item"
+				<view v-for="(str, index) in item.equityList" :key="index" :class="str['isClick']==1?'ul-item-hui':'ul-item'"
 					style="padding: 0rpx;margin-top: 20rpx;" @click="savaHandle(item,index)">
 					<image style="width: 100%; height: 170rpx; border-radius: 20rpx" :src="`${$imgUrl}applyCard/product-bg.png`">
 					</image>
@@ -91,8 +91,9 @@
 	import { fileURL } from "@/datas/fileURL.js";
 	import navBgCar from "./components/nav-bg-car1";
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
-	import { getItem, setItem } from "@/utils/storage.ts";
+	import { setItem } from "@/utils/storage.ts";
 	import { agentId } from "@/utils/network/difference";
+	import { msg } from "@/utils/utils";
 	const imgURL = `${fileURL}image/`;
 
 	let bgc = ""
@@ -138,8 +139,9 @@
 	const savaHandle = (val, idx) => {
 		console.log("vAL", val)
 		// 1不能点击 0可以点击 权益置灰 弹出提示
-		if (val.equityList[0]['isClick'] == 1) {
-
+		if(val.equityList[0]['isClick']==1){
+			msg(val.equityList[0]['noClickCase'])
+			return;
 		}
 		setItem("clientFee", val.clientFee);
 		// setItem("promoteId", val.promoteId);
@@ -405,12 +407,49 @@
 		font-weight: 400;
 		color: #ffffff;
 	}
-
+     .ul-item-hui{
+		 padding: 5px 20rpx;
+		 display: flex;
+		 align-items: center;
+		 color: #c1c1cc;
+		 .item-value {
+		 	padding: 20rpx;
+		 	position: absolute;
+		 	display: flex;
+		 	align-items: center;
+		 	width: 80%;
+		 
+		 	.content {
+		 		width: 51%;
+		 
+		 		.title {
+		 			font-size: 32rpx;
+		 			font-family: Microsoft YaHei;
+		 			font-weight: 400;
+		 
+		 		}
+		 
+		 		.tip {
+		 			font-size: 24rpx;
+		 			font-family: Microsoft YaHei;
+		 			font-weight: 400;
+		 		}
+		 	}
+	    }
+		.icon-tip {
+			width: 100rpx;
+			height: 100rpx;
+		}
+		
+		.content {
+			margin-left: 40rpx;
+		}
+	 }
 	.ul-item {
 		padding: 5px 20rpx;
 		display: flex;
 		align-items: center;
-
+        color: white;
 		.item-value {
 			padding: 20rpx;
 			position: absolute;
@@ -425,7 +464,6 @@
 					font-size: 32rpx;
 					font-family: Microsoft YaHei;
 					font-weight: 400;
-					color: #ffffff;
 
 				}
 
@@ -433,7 +471,6 @@
 					font-size: 24rpx;
 					font-family: Microsoft YaHei;
 					font-weight: 400;
-					color: #ffffff;
 				}
 			}
 		}
@@ -448,10 +485,6 @@
 		}
 	}
 
-	.money {
-		color: white;
-	}
-
 	::v-deep .u-mode-center-box {
 		border-radius: 10rpx;
 	}

subpackage/personal-center/car-details.vue

@@ -22,9 +22,9 @@
 			<view><text>车头照：</text>
 				<image mode="widthFix" :src="state.tableData['vehBodyUrl']"></image>
 			</view>
-		<!-- 	<button v-if="state.tableData['status']=='已办理' && source=='WECHAT'" class="submit"
-				@click="carChange(state.tableData['vehicleId'])">车辆信息变更</button> -->
-				<button class="submit" @click="carChange(state.tableData['vehicleId'])">车辆信息变更</button>
+			<button v-if="state.tableData['status']=='已办理' && source=='WECHAT'" class="submit"
+				@click="carChange(state.tableData['vehicleId'])">车辆信息变更</button>
+				<!-- <button class="submit" @click="carChange(state.tableData['vehicleId'])">车辆信息变更</button> -->
 		</view>
 	</view>
 
@@ -34,6 +34,7 @@
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
 	import {navTo} from "@/utils/utils";
+	import { source } from "@/utils/network/difference";
 	const state = reactive({
 		tableData: {},  //上一个页面传递过来的参数
 	});

subpackage/personal-center/setting/car-information/car-change.vue

@@ -122,19 +122,11 @@
 		getItem
 	} from "@/utils/storage.ts"
 	import {
-		etcCarCardInfoSubmit,
-		etcCarOcrCard,
-		fileUpload,
+		vehicleLicenseOcr,
 		changeCarInfo,
-		envs
 	} from "@/utils/network/api.js";
-	import {
-		request
+	import {requestNew
 	} from "@/utils/network/request.js";
-
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
 	import {
 		onLoad,
 		onShow
@@ -155,14 +147,14 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(changeCarInfo, options).then((res) => {
-			const data = stringToJson(res.bizContent);
-			console.log(data)
-			if (data.info == '成功.') {
+		requestNew(changeCarInfo, options).then((res) => {
+			// const data = stringToJson(res.bizContent);
+			console.log(res)
+			// if (data.info == '成功.') {
 				uni.reLaunch({
 					url: "/subpackage/personal-center/setting/car-information/car-manage"
 				})
-			}
+			// }
 
 		});
 	};
@@ -369,7 +361,7 @@
 		state.changeColor = true;
 		state.phoneType = 0
 		state.isTakePhotoModeShow = false
-		uploadFile(val.tempImagePath, imageType, etcCarOcrCard).then((data) => {
+		uploadFile(val.tempImagePath, imageType, vehicleLicenseOcr).then((data) => {
 			if (state.choiceIndex === "3") {
 				// state.form.vehicleId = data.plate_a;
 				state.form.ownerName = data.man;

subpackage/personal-center/setting/car-information/car-create.vue

@@ -119,18 +119,16 @@
 	import {
 		reactive
 	} from "vue";
-	import navBgCar from "./components/nav-bg-car3";
-	import navBar from "../../components/nav-bar/nav-bar2.vue";
 	import viewfinder from "../../../../components/viewfinder.vue";
 	import {
 		getItem
 	} from "@/utils/storage.ts"
 	import {
-		etcCarOcrCard,
+		vehicleLicenseOcr,
 		createCarInfo
 	} from "@/utils/network/api.js";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -154,14 +152,14 @@
 				method: "POST",
 				showLoading: true,
 			};
-			request(createCarInfo, options).then((res) => {
-				const data = stringToJson(res.bizContent);
+			requestNew(createCarInfo, options).then((res) => {
+				const data =res;
 				console.log(data)
-				if (data.info == '成功.') {
+				// if (data.info == '成功.') {
 					uni.reLaunch({
 						url: "/subpackage/personal-center/setting/car-information/car-manage"
 					})
-				}
+				// }
 
 			}).catch(err => {
 				console.log(err, "在这里");
@@ -283,7 +281,7 @@
 			ownPosImgUrl: "", //车主证件正面图片
 			ownNegImgUrl: "", //车主证件反面图片
 			agreementId: "", //签约编号
-			channelId: "", //编号渠道
+			channelId: "5201018892300000001", //编号渠道
 			scenePayType: "", //
 			transportIdNum: "", //道路运输证编号
 			licenseIdNum: "", //经营许可证编号
@@ -346,7 +344,7 @@
 		} else {
 			var imageType = 2;
 		}
-		uploadFile(val.tempImagePath, imageType, etcCarOcrCard).then((data) => {
+		uploadFile(val.tempImagePath, imageType, vehicleLicenseOcr).then((data) => {
 			if (state.choiceIndex === "3") {
 				state.form.vehicleId = data.plate_a;
 				state.form.ownerName = data.man;
@@ -361,7 +359,7 @@
 			} else {
 				state.form.approvedCount = parseFloat(data.apc);
 				state.form.maintenaceMass = parseFloat(data.unladen);
-				state.form.vehicleDimensions = data.overall;
+				state.form.vehicleDimensions = data.overall?data.overall.substring(0,data.overall.length-2):'';
 				state.form.totalMass = parseFloat(data.gross);
 				state.form.vehNegImgUrl = data.imageUrl;
 			}

subpackage/personal-center/setting/car-information/car-manage.vue

@@ -51,7 +51,7 @@
 		delCarInfo
 	} from "@/utils/network/api.js";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -116,17 +116,17 @@
 						method: "POST",
 						showLoading: true,
 					};
-					request(delCarInfo, options).then((res) => {
-						const data = stringToJson(res.bizContent);
+					requestNew(delCarInfo, options).then((res) => {
+						const data = res;
 						console.log(data)
-						state.listArr = data.vehicleManages
-						if (data.info == '成功.') {
+						// state.listArr = data.vehicleManages
+						// if (data.info == '成功.') {
 							uni.showToast({
 								title: "删除成功",
 								icon: "none"
 							})
 							getDataList()
-						}
+						// }
 					});
 				} else if (res.cancel) {
 					console.log('用户点击取消');

subpackage/personal-center/vehicle-information.vue

@@ -19,7 +19,7 @@
 	import { request,requestNew } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption.js";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { vehicleInfoChangeEditablePage, delCarInfo } from "@/utils/network/api.js";
+	import { selectCarInfo, delCarInfo } from "@/utils/network/api.js";
 	import { getItem } from "@/utils/storage";
 	import { vehiclePlateColorPai } from "@/datas/vehiclePlateColor.js";
 	const state = reactive({
@@ -44,9 +44,9 @@
 			showLoading: true,
 		};
 		//调用方式
-		requestNew(vehicleInfoChangeEditablePage, options).then((res) => {
+		requestNew(selectCarInfo, options).then((res) => {
 			console.log("车辆信息：", res)
-			const data = res.vehicleInfoList
+			const data = res.vehicleManages
 			for (var i = 0; i < data.length; i++) {
 				for (var j = 0; j < vehiclePlateColorPai.length; j++) {
 					if (data[i].vehiclePlateColor == vehiclePlateColorPai[j]['id']) {
@@ -79,17 +79,14 @@
 						method: "POST",
 						showLoading: true,
 					};
-					request(delCarInfo, options).then((res) => {
-						const data = stringToJson(res.bizContent);
+					requestNew(delCarInfo, options).then((res) => {
+						const data = res;
 						console.log(data)
-						state.list = data.vehicleManages
-						if (data.info == '成功.') {
 							uni.showToast({
 								title: "删除成功",
 								icon: "none"
 							})
 							queryCarMsg();
-						}
 					});
 				} else if (res.cancel) {
 					console.log('用户点击取消');

subpackage/service/equityList/equityList.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view v-for="(item, index) in listData" :key="index" @click="onClick(item)" :data-code="item" class="item">
 			<view style="display: flex;justify-content: space-between;">
-			   <text>{{ item.name }}</text><text>></text>
+			   <text>{{ item.productName }}</text><text>></text>
 			</view>
 			<view style="display: flex;justify-content: flex-end;margin-top: 6rpx;">
 				<!-- 是否支付 1-已支付，2-未支付支付，3-已取消,4-已下单，未支付 -->
@@ -16,7 +16,7 @@
 <script setup lang='ts'>
 	import { reactive } from "vue";
 	import {
-		getItem,StorageKeys
+		getItem
 	} from "@/utils/storage";
 	import {
 		ref
@@ -24,9 +24,7 @@
 	import {
 		requestNew
 	} from "@/utils/network/request.js";
-	import {
-		equitypurchasepage,equitypurchase,getOpenId,paymentequityapplyapp,payequitydetection
-	} from "@/utils/network/api.js";
+	import {getOpenId,paymentequityapplyapp,payequitydetection,queryuserallequity} from "@/utils/network/api.js";
 	import {
 		stringToJson
 	} from "@/utils/network/encryption";
@@ -41,7 +39,7 @@
 	})
 	function query(){
 		//卡券渠道类型获取单项权益列表
-		requestNew(equitypurchasepage, {
+		requestNew(queryuserallequity, {
 			type: 2,
 			data: {
 				couponAgencyType: ['TUHU', 'ZFB'],
@@ -52,7 +50,7 @@
 		}).then((item) => {
 			let res = item
 			console.log(res, '=========');
-			listData.value = res.result
+			listData.value = res.data
 		})
 	}
   
@@ -62,25 +60,6 @@
 				'&couponAgencyType=' + singId.couponAgencyType + '&couponId=' + singId.couponId + '&equityId=' + singId.equityId+ '&purchasedEquityId=' + singId.eporderId,
 		})
 	}
-	// const chooseBuy = (equityId) => {
-	// 	const options = {
-	// 		type: 2,
-	// 		data: {
-	// 			"openId": getItem(StorageKeys.OpenId),
-	// 			"equityId": equityId
-	// 		},
-	// 		method: 'POST',
-	// 		showLoading: true,
-	// 	}
-	// 	// 权益购买入参有个属性是type:1，代表查询是否已经买过了权益，返回的数据中hasData:true表示买过了，如果hasData:false表示没买过。type:2,表示购买
-	// 	requestNew(equitypurchase, options).then((res) => {
-	// 		const data = res;
-	// 		console.log("购买2", data)
-	// 		state.id = data.id
-	// 		// 权益支付下单
-	// 		equityPaymentOrderRequest()
-	// 	})
-	// }
 	// 权益支付下单
 	const equityPaymentOrderRequest = (id) => {
 		state.id =id

utils/network/api.js

@@ -104,10 +104,6 @@ export const salesmanMsg = '9f19be89a03e475b903b88d4bc91cbb4' //订单查询业
 
 //个人中心
 export const changePassword = "94"; //重置密码
-export const changeCarInfo = "1029"; //车辆管理信息修改
-export const createCarInfo = "1028"; //车辆管理信息添加
-export const selectCarInfo = "1030"; //车辆管理信息查询
-export const delCarInfo = "1031"; //车辆管理信息删除
 export const userInfoQuery = "510"; //BDS-用户信息变更查询接口
 export const userInfoChange = "520"; //ASS-变更个人用户信息
 
@@ -401,7 +397,7 @@ export const newMobileSmsCodeValid = "/iaw/aftersale/etcMobileChange/newMobileSm
 export const mobileChangeProfile = "/iaw/aftersale/etcMobileChange/mobileChangeProfile" //ETC预留手机号修改-ocr识别记录上传
 //车辆信息变更
 export const vehicleInfoChangeChangeApply = "/iaw/aftersale/vehicleInfoChange/changeApply" //车辆信息变更申请
-export const vehicleInfoChangeEditablePage = "/iaw/aftersale/vehicleInfoChange/editablePage" //可修改信息列表查询
+// export const vehicleInfoChangeEditablePage = "/iaw/aftersale/vehicleInfoChange/editablePage" //可修改信息列表查询
 export const vehicleInfoChangeQuery = "/iaw/aftersale/vehicleInfoChange/query" //车辆详情信息查询
 export const preDeviceCheck = "/iaw/aftersale/deviceUpgrade/preDeviceCheck" //设备预检
 export const preDeviceCheckRes = "/iaw/aftersale/deviceUpgrade/preDeviceCheckRes" //设备预检结果回传
@@ -451,4 +447,9 @@ export const queryMenuConfig = '/iaw/rbac/menuListBySystemTypeAndOpenId'
 export const getGlobalParam = "/iaw/rbac/portalConfigLoginSource" //全局配置
 export const updateTokenNew = "/iaw/portal/phoneLogin"; //统一会员平台登录确认接口（用于换取openId和token）
 // 设置
-export const changePhone = "/iaw/portal/changeMobileByCode"; //修改手机号
+export const changePhone = "/iaw/portal/changeMobileByCode"; //修改手机号
+// 车辆管理
+export const delCarInfo = "/iaw/api/vehicleManage/delete"; //车辆管理信息删除
+export const createCarInfo = "/iaw/api/vehicleManage/add"; //车辆管理信息添加
+export const selectCarInfo = "/iaw/api/vehicleManage/query"; //车辆管理信息查询
+export const changeCarInfo = "/iaw/api/vehicleManage/update"; //车辆管理信息修改