更换ETC设备修改

datas/vehiclePlateColor.js

@@ -45,3 +45,53 @@ export const getVehiclePlateColor = (id=0) => {
 	let colors = vehiclePlateColor.filter(item => item.id == id);
 	return colors[0].color
 }
+
+
+export const vehiclePlateColorPai = [{
+		id: 0,
+		color: '蓝牌'
+	},
+	{
+		id: 1,
+		color: '黄牌'
+	},
+	{
+		id: 2,
+		color: '黑牌'
+	},
+	{
+		id: 3,
+		color: '白牌'
+	},
+	{
+		id: 4,
+		color: '渐变绿牌'
+	},
+	{
+		id: 5,
+		color: '黄绿双拼牌'
+	},
+	{
+		id: 6,
+		color: '蓝白渐变牌'
+	},
+	{
+		id: 9,
+		color: '未确定'
+	},
+	{
+		id: 11,
+		color: '绿牌'
+	},
+	{
+		id: 12,
+		color: '红牌'
+	}
+]
+
+//获取车牌颜色	
+export const getVehiclePlateColorPai = (id=0) => {
+	let colors = vehiclePlateColorPai.filter(item => item.id == id);
+	return colors[0].color
+}
+

pages/user/user.vue

@@ -166,10 +166,9 @@
 						</view>
 					</view>
 					<view class="car-item" v-for="(item,index) in state.list">
-						<image :src="`${$imgUrl}user/icon-car.png`" class="car-pic"></image>
+						<image :src="`${$imgUrl}che.png`" class="car-pic"></image>
 						<view class="car-info">
-							<view class="car-no"><text class="no">{{item.vehiclePlate}}</text><text
-									class="color">{{item.color}}</text></view>
+							<view class="car-no"><text class="no">{{item.vehiclePlate}}</text><text class="color">{{item.color}}</text></view>
 							<view class="card-no">卡号：{{item.cardId}}</view>
 							<view class="card-no">签号：{{item.obuId}}</view>
 						</view>
@@ -222,7 +221,7 @@
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import filter from '@/components/filter/filter.vue';
-	import { vehiclePlateColor } from "@/datas/vehiclePlateColor.js";
+	import { vehiclePlateColor, vehiclePlateColorPai} from "@/datas/vehiclePlateColor.js";
 	const height = ref(null);
 	const top = ref(null);
 	const margin = ref(null);
@@ -297,16 +296,16 @@
 		//调用方式
 		request(selectCarInfo, options).then((res) => {
 			const data = (stringToJson(res.bizContent).vehicleManages)
-			for (var i = 0; i < 1; i++) {
-				for (var j = 0; j < vehiclePlateColor.length; j++) {
-					if (data[i].vehiclePlateColor == vehiclePlateColor[j]['id']) {
-						data[i].color = vehiclePlateColor[j]['color']
+			for (var i = 0; i < data.length; i++) {
+				for (var j = 0; j < vehiclePlateColorPai.length; j++) {
+					if (data[i].vehiclePlateColor == vehiclePlateColorPai[j]['id']) {
+						data[i].color = vehiclePlateColorPai[j]['color']
 					}
 				}
 			}
 			state.list = data;
 			state.carNumber = data.length
-			console.log("state.list", state.list, data.length)
+			console.log("state.list", state.list)
 		})
 			.catch((err) => {
 				console.log('输出内容', err)
@@ -816,4 +815,13 @@
 	.menu .sub-tit {
 		padding-right: 20rpx;
 	}
+	.color{
+		padding: 4rpx 8rpx;
+		border-radius: 10rpx;
+		color: white;
+		background-color: rgb(6, 112, 255);
+		display: inline-block;
+		margin-left: 20rpx;
+		font-size: 24rpx;
+	}
 </style>

subpackage/after-sale/replace-equipment/form.vue

@@ -172,6 +172,9 @@
 		wechatPayConfigId,
 
 	} from "@/utils/network/api";
+	import {
+		msg
+	} from "@/utils/utils";
 	const list = reactive([]); //物流数据
 
 
@@ -243,12 +246,12 @@
 	
 	const goToAddAddress = () => {
 		uni.navigateTo({
-			url: "/subpackage/applyCard/addAddress",
+			url: "/subpackage/orders/addAddress",
 		});
 	};
 	const editAddress = (val) => {
 		uni.navigateTo({
-			url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
+			url: `/subpackage/orders/editAddress?content=` + JSON.stringify(val),
 		});
 	};
 	
@@ -266,6 +269,7 @@
 		form.postCode = val.postalCode
 		form.defaultAddress = val.defaultAddress
 		address.show = false
+		console.log("form.address",form.region,form.address)
 	};
 	// 寄回单选
 	const sendChange = (e : any) => {
@@ -308,7 +312,10 @@
 		getAddressList();
 
 	});
-
+   onShow(() => {
+		getexpresslist();
+		getAddressList();
+	});
 	const getexpresslist = () => {
 		//参数说明
 		let options = {
@@ -359,6 +366,7 @@
 				form.postCode = defaultAddress.postalCode
 				form.defaultAddress = defaultAddress.defaultAddress
 			}
+			console.log("form.address",form.address)
 		});
 	};
 	const submit = () => {
@@ -380,6 +388,10 @@
 		})
 	};
 	const queryCckChangejzCardInfo = () => {
+		if(!form.address){
+			msg("请编辑收货详细地址");
+			return;
+		}
 		var data = {
 			id: params.id,
 			sendStatus: form.sendStatus,

subpackage/after-sale/replace-equipment/verification.vue

@@ -5,13 +5,6 @@
 				<u-form-item prop="cardState">
 					<view class="from_item">
 						<text><text style="color: red">*</text>需要更换的设备：</text>
-						<!-- <u-radio-group v-model="form.applyTypeName">
-							<u-radio :customStyle="{ marginBottom: '8px' }" activeColor="#2CE242"
-								v-for="(item, index) in radiolist1" :key="index" :label="item.disabled"
-								:name="item.name">
-								{{ item.name }}
-							</u-radio>
-						</u-radio-group> -->
 						<radio-group @change="radioChange" class="radios">
 							<block v-for="(item, index) in radiolist1" :key="item.val">
 								<view class="radio-box">
@@ -26,13 +19,6 @@
 				<u-form-item prop="cardState">
 					<view class="from_item">
 						<text><text style="color: red">*</text>设备损坏类型：</text>
-						<!-- <u-radio-group v-model="form.damageModeName">
-							<u-radio :customStyle="{ marginBottom: '8px' }" activeColor="#2CE242"
-								v-for="(item, index) in radiolist2" :key="index" :label="item.disabled"
-								:name="item.name">
-								{{ item.name }}
-							</u-radio>
-						</u-radio-group> -->
 						<radio-group @change="typeChange" class="radios">
 							<block v-for="(item, index) in radiolist2" :key="item.val">
 								<view class="radio-box">
@@ -345,9 +331,11 @@
 
 	//申请
 	const queryCckChangejzCardAction = () => {
-		if(state.imageList.length==0){
-			msg('请上传图片');
-			return;
+		if(form.damageMode=="1"){
+			if(state.imageList.length==0){
+				msg('请上传图片');
+				return;
+			}
 		}
 		var data = {
 			orderId: params.orderId,
@@ -363,7 +351,11 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await request(changeCardApply, options);
-			const data = stringToJson(res.bizContent);
+			if(res.bizContent.indexOf("/") !== -1){
+				const data = stringToJson(res.bizContent);
+			}else{
+				const data=res.bizContent
+			}
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -404,9 +396,15 @@
 			// }
 
 			queryCckChangejzCardAction().then(val => {
-				navTo(
-					`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
-				)
+				console.log("val",val)
+				// if(!val.id){
+				// 	msg("已存在对应的申请单");
+				// }else{
+					navTo(
+						`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
+					)
+				// }
+				
 			})
 		}
 

subpackage/personal-center/remind/components/evaluate-equity-item.vue

@@ -16,7 +16,8 @@
 			</view> -->
 			<view class="content">{{item.suggestion}}</view>
 			<view class="images">
-				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrl" :src="`${$imgUrl}${itemChild}`" />
+				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrlArr" :src="`${$imgUrl}${itemChild}`" />
+				<!-- <image class="img" mode="aspectFill"  :src="`${$imgUrl}${item.pictureUrl}`" /> -->
 			</view>
 		</view>
 		

subpackage/personal-center/remind/evaluate-list.vue

@@ -124,7 +124,6 @@ const requestData = (code, data) => {
 	  //差评展示：默认差评 2.5分及以下
 	  //中评展示：默认中评 2.5以上4.0以下 
 	  //好评展示：默认好评 4.0及4.0以上
-	  console.log("stringToJson(res.bizContent)",stringToJson(res.bizContent).data)
 	  const data=stringToJson(res.bizContent).data;
 	  if(data){
 		  for(var i=0;i<data.length;i++){
@@ -136,13 +135,14 @@ const requestData = (code, data) => {
 		  		  data[i].evaluate='好评';
 		  	  }
 			  data[i].insertTime = data[i].insertTime.split('T').join(' ');
-			  // data[i].pictureUrl=data[i].pictureUrl.split(',')
+			  data[i].pictureUrlArr=data[i].pictureUrl.split(',')
 		    }
 		  state.dataList = data;
 		  
 	  }else{
 		  state.dataList=[]
 	  }
+	  console.log("stringToJson(res.bizContent)",data)
 	  
   })