修改重新激活之后次数显示

components/form-builder/form-builder.vue

@@ -235,7 +235,12 @@
 				<view class="divider" v-if="item.divider"></view>
 			</view>
 		</view>
-
+		<view class="message" v-if="config.submitName=='申请退货'">
+			<view><text class="red">*</text>申请退货需将原设备寄回</view>
+			<view>寄回信息：</view>
+			<view>收件人：ETC售后 联系电话：18798751224（此电话仅用于ETC售后收取快递，如需咨询业务请致电4008008787）</view>
+			<view>寄回地址：贵州省贵阳市云岩区普天广场11楼</view>
+		</view>
 		<view class="subBtn">
 			<submit-button :title="config ? config.submitName : '提交'" form-type="submit"
 				@submit="formSubmit"></submit-button>

composables/order/useOrderListItem.ts

@@ -164,6 +164,14 @@ export default function useOrderListItem(props) {
 							ordersList.value[k]['isUseAgain'] = false  //不可以再次使用
 						}
 					}
+					// 收货日期超过7个自然日不允许申请退货
+					if (ordersList.value[k]['receivingTime']) {
+						if (timesDiff(ordersList.value[k]['receivingTime'].replace("T", " ")).days > 7) {
+							ordersList.value[k]['applyReturn'] = false  //不展示申请退货
+						} else {
+							ordersList.value[k]['applyReturn'] = true  //展示申请退货
+						}
+					}
 				}
 				uni.$emit("refreshOrder");
 				console.log('输出内容小程序', ordersList)

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

@@ -92,7 +92,7 @@
 
 				<!-- 待激活 -->
 				<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="gotoReturnOrder(item)" v-if="item.applyReturn">申请退货</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>

subpackage/after-sale/account-recharge/open-account.vue

@@ -202,6 +202,10 @@
 		navTo(`/subpackage/personal-center/setting/bank-card/bank-card`);
 	}
 	const open = () => {
+		if (state.form.name == state.form.passWord) {
+			msg('对公用户登录名和对公用户密码不能相同')
+			return;
+		}
 		for (var i in state.form) {
 			if (!state.form[i]) {
 				msg('请把信息填写完整！')

subpackage/after-sale/activation-once-again/activation-once-again.vue

@@ -225,24 +225,9 @@
 
 	});
 
-	onShow((option) => {
-		// uni.$on('bluetoothLink', res => {
-		// 	console.log(res);
-		// 	if (res.status) {
-		// 		getObuId()
-		// 	}
-		// 	//移除监听
-		// 	console.log('======移除监听1111======', res)
-
-		// })
-
-	})
 
 	const cancel = () => {
 		state.showPopup = false;
-		uni.navigateBack({
-			delta: 2
-		})
 	};
 
 	const toPage = () => {
@@ -549,6 +534,10 @@
 		console.log("提交车辆信息成功", options)
 		request(IFCODE.submitVehicleApi, options).then(() => {
 			console.log("提交车辆信息成功")
+			activationRecordQuery().then((val) => {
+				console.log("jihuo", val)
+				state.activationNum = val.num
+			});
 		});
 	}
 	const goActivationRecord = () => {

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

@@ -38,8 +38,16 @@
 				:image-styles="state.imageStyles" />
 		</view>
 
+		<view class="attention">
+			<view>注意事项：</view>
+			<view>1.设备人为损坏时需要支付设备费用;</view>
+			<view>2.设备自然损坏时：</view>
+			<view>&nbsp;(1)更换的设备中有设备不在质保期内，需要支付对应的设备费用;</view>
+			<view>&nbsp;(2)选择自然损坏需要将损坏的设备寄回，不寄回则视为人为损坏，需要支付设备费用;</view>
+			<view>&nbsp;(3)寄回的设备由专业人员进行检测，检测结果为自然损坏且在质保期内，则免费更换，检测结果为人为损坏则需要支付设备费用;</view>
+			<view>3.设备费用，卡20元，obu130元。</view>
+		</view>
 		<view class="btn-wrapper">
-
 			<button class="submit button" v-if="apply.data.status === 'APPLY'||!apply.data.status" @click="toPage()"
 				type="default">下一步填写资料</button>
 		</view>
@@ -489,4 +497,9 @@
 		font-size: 28rpx;
 		margin-bottom: 20rpx;
 	}
+
+	.attention {
+		padding: 20rpx;
+		font-size: 28rpx;
+	}
 </style>

subpackage/after-sale/to-bookkeeping-card/confirm.vue

@@ -114,11 +114,21 @@
 	});
 	/*下一步*/
 	const nextACtion = () => {
-		queryCckChangejzCardAction().then(val => {
-			navTo(
-				`/subpackage/after-sale/to-bookkeeping-card/choice-product-new?orderId=${state.data.orderId}&&applyId=${val.applyId}&&type=${state.data.type}&&userType=${state.data.userType}`
-			)
-		})
+		uni.showModal({
+			title: '提示',
+			content: '转记账卡后无法转回储值卡，请知悉',
+			success: function (res) {
+				if (res.confirm) {
+					queryCckChangejzCardAction().then(val => {
+						navTo(
+							`/subpackage/after-sale/to-bookkeeping-card/choice-product-new?orderId=${state.data.orderId}&&applyId=${val.applyId}&&type=${state.data.type}&&userType=${state.data.userType}`
+						)
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
 	}
 
 	//申请

subpackage/after-sale/transferRecord.vue

@@ -6,7 +6,7 @@
 				<view class="uni-input">{{state.array[state.index]}}</view>
 			</picker>
 		</view>
-		<view class="time-btn" @click="query">查询</view>
+		<view class="time-btn" @click="query(1)">查询</view>
 	</view>
 	<view class="list" v-for="(item,index) in state.tableData" :key="index">
 		<view><text class="title">卡号：</text><text>{{item.cardId}}</text></view>
@@ -68,7 +68,13 @@
 			console.log("state.carData", state.carData)
 		})
 	}
-	const query = () => {
+	const query = (val) => {
+		if (val == 1) {
+			state.pageNo = 1
+		}
+		if (state.pageNo == 1 && state.tableData.length > 0) {
+			state.tableData = []
+		}
 		for (var i = 0; i < state.carData.length; i++) {
 			if (state.carData[i]["vehiclePlate"] == state.array[state.index]) {
 				state.vehicleId = state.carData[i]["vehicleId"]
@@ -79,7 +85,7 @@
 			type: 2,
 			data: {
 				"openId": getItem('openId'),
-				"uniqueId": state.vehicleId,
+				"vehicleId": state.vehicleId,
 				"pageNo": state.pageNo,
 				"pageSize": state.pageSize,
 			},
@@ -94,16 +100,15 @@
 				for (var k = 0; k < state.tableData.length; k++) {
 					// WAITING("等待使用", 0) USE("已使用", 1) CANCEL("弃置", -1)
 					if (state.tableData[k]["status"] == "WAITING") {
-						state.tableData[k]["statusChinese"] = "等待使用"
+						state.tableData[k]["statusChinese"] = "待完成过户"
 					} else if (state.tableData[k]["status"] == "USE") {
-						state.tableData[k]["statusChinese"] = "已使用"
+						state.tableData[k]["statusChinese"] = "已过户"
 					} else {
 						state.tableData[k]["statusChinese"] = "弃置"
 					}
-					state.tableData[k]["vehiclePlate"] = state.tableData[k]["uniquneId"].substring(0, state.tableData[k]["uniquneId"].length - 2)
+					state.tableData[k]["vehiclePlate"] = state.tableData[k]["vehicleId"].substring(0, state.tableData[k]["vehicleId"].length - 2)
 				}
 				state.noRecord = false
-				// state.tableData = state.tableData
 			} else {
 				state.noRecord = true
 				state.tableData = []
@@ -116,7 +121,7 @@
 		if (state.tableData.length < state.pageNo * 10) return state.flags = true
 		console.log("触底了")
 		state.pageNo++
-		query()
+		query(2)
 	})
 </script>
 

subpackage/orders/apply-return-goods.vue

@@ -3,6 +3,7 @@
 	<view class="box">
 		<form-builder :config="config" :formData="state.formData" @submit="submit" @radioChange="radioChange" />
 	</view>
+
 </template>
 
 <script setup lang="ts">

subpackage/orders/car-release.vue

@@ -335,13 +335,27 @@
 		state.form.opId = getItem(StorageKeys.OpenId);
 		state.form.approvedCount = parseFloat(state.form.approvedCount);
 		state.form.maintenaceMass = parseFloat(state.form.maintenaceMass);
-		state.form.totalMass = parseFloat(state.form.totalMass);
+		// state.form.totalMass = parseFloat(state.form.totalMass);
 		state.form.permittedWeight = parseFloat(state.form.permittedWeight);
 		state.form.permittedTowWeight = parseFloat(state.form.permittedTowWeight);
-
-		state.form.approvedCount = state.form.approvedCountShow.replace("人", "");
-		state.form.maintenaceMass = state.form.maintenaceMassShow.replace("kg", "");
-		state.form.totalMass = state.form.totalMassShow.replace("kg", "");
+		console.log("state.form.approvedCountShow", state.form.approvedCountShow, state.form.approvedCountShow.toString().indexOf('人'))
+		// return;
+		if (state.form.approvedCountShow.toString().indexOf('人') > 0) {
+			state.form.approvedCount = state.form.approvedCountShow.replace("人", "");
+		} else {
+			state.form.approvedCount = state.form.approvedCountShow;
+		}
+		if (state.form.maintenaceMassShow.toString().indexOf('kg') > 0) {
+			state.form.maintenaceMass = state.form.maintenaceMassShow.replace("kg", "");
+		} else {
+			state.form.maintenaceMass = state.form.maintenaceMassShow;
+		}
+		console.log("state.form.totalMassShow", state.form.totalMassShow)
+		if (state.form.totalMassShow.toString().indexOf('kg') > 0) {
+			state.form.totalMass = state.form.totalMassShow.replace("kg", "");
+		} else {
+			state.form.totalMass = state.form.totalMassShow;
+		}
 		const options = {
 			type: 2,
 			data: state.form,
@@ -634,7 +648,7 @@
 			type: 2,
 			data: {
 				vehicleId: state.form.vehicleId,
-				// vehicleId: "贵ZAAA47_0",
+				// vehicleId: "贵ZAAA49_1",
 			},
 			method: "POST",
 			showLoading: true,
@@ -663,7 +677,13 @@
 		state.form.vehicleIdNum = allData['vehiclePlate']
 		state.form.ownerName = allData['ownerName']
 		state.form.vehicleType = allData['vehicleType']
-		// state.form.character = allData['vehicleType']  //使用性质
+		if (allData['useCharacter'] == 1) {
+			state.form.character = "营运"  //使用性质
+		} else if (allData['useCharacter'] == 2) {
+			state.form.character = "非营运"  //使用性质
+		} else {
+			state.form.character = "未知"  //使用性质
+		}
 		state.form.vin = allData['vin']
 		state.form.engineNum = allData['engineNum']
 		state.form.register = allData['registerDate']
@@ -673,6 +693,7 @@
 		state.form.approvedCount = allData['approvedCount']
 		state.form.maintenaceMass = allData['maintenaceMass']
 		allData['vehicleDimensions']
+		state.form.vehicleDimensions = allData['vehicleDimensions']
 		let arr = allData['vehicleDimensions'].split("X");
 		state.outlineL = parseInt(arr[0]); //外廓 长
 		state.outlineW = parseInt(arr[1]); //外廓 宽
@@ -692,6 +713,17 @@
 
 		state.vehiclePlateColor = allData['vehiclePlateColor']
 		state.form.customerId = allData['customerId']
+		state.form.vehicleModel = allData['vehicleModel']
+		state.form.permittedWeight = allData['permittedWeight'] ? allData['permittedWeight'] : 0;
+		state.form.permittedTowWeight = allData['permittedTowWeight']
+		state.changeColor = true
+		if (allData['tractorSign'] == "1") {
+			qian()
+			state.form.roadTransportPermitPicUrl = allData['roadTransportPermitPicUrl']
+		} else {
+			notQian()
+		}
+
 	}
 	const bindDateChange1 = (e) => {
 		state.form.register = e.detail.value
@@ -793,8 +825,9 @@
 				state.outlineL = arr[0]; //外廓 长
 				state.outlineW = arr[1]; //外廓 宽
 				state.outlineH = arr[2].substring(0, arr[2].length - 2); //外廓 高
-				state.form.totalMass = data.gross;
-				state.form.totalMassShow = data.gross;
+				state.form.totalMass = data.gross ? data.gross : 0;
+				state.form.totalMassShow = data.gross ? data.gross : 0;
+				console.log("state.form.totalMassShow", state.form.totalMassShow)
 				state.form.vehNegImgUrl = data.imageUrl;
 				state.form.permittedWeight = data.alc ? data.alc : 0;
 				state.form.permittedTowWeight = data.towing ? data.towing : 0;

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

@@ -17,7 +17,7 @@
 			<view class="content">{{item.suggestion}}</view>
 			<view class="images">
 				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrlArr" :src="itemChild"
-					:key="index" />
+					:key="index" @click="see(index,item.pictureUrlArr)" />
 				<!-- <image class="img" mode="aspectFill"  :src="`${$imgUrl}${item.pictureUrl}`" /> -->
 			</view>
 		</view>
@@ -41,6 +41,12 @@
 			}
 		}
 	})
+	const see = (index, pictureUrlArr) => {
+		uni.previewImage({
+			current: index,
+			urls: pictureUrlArr,
+		});
+	}
 </script>
 
 <style lang="scss" scoped>

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

@@ -142,7 +142,6 @@
 						data[i].pictureUrlArr = data[i].pictureUrl.split(';')
 					}
 				}
-				// state.dataList = data;
 				state.dataList = [...data, ...state.dataList]
 
 			} else {