提交

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

@@ -200,7 +200,7 @@
 		const options = {
 			type: 2,
 			data: {
-				id: "cebc78a8aa024a0c96c0d1b0da3752e5",
+				id: id,
 			},
 			method: "POST",
 			showLoading: true,

subpackage/after-sale/activation/activate.vue

@@ -382,6 +382,7 @@
 			.then((res) => {
 				tools.hideLoadingAlert();
 				let result = JSON.parse(res.bizContent);
+				console.log("写卡指令============",result)
 				if (result.orderStatus == 1 || result.orderStatus == "1") {
 					tools.showLoadingAlert("执行指令中");
 					bluetoothUtil.transCmd(result.command.split(","), "10", function(res) {
@@ -415,7 +416,8 @@
 				expireTime: formatTime(new Date()),
 				accountOrganization: "",
 				accountCardNo: "",
-				cosRecordId: ""
+				cosRecordId: "",
+				openId: getItem('openId')
 			}, //请求参数
 			method: "POST", //提交方式(默认POST)
 			showLoading: true, //是否显示加载中(默认显示)
@@ -697,7 +699,8 @@
 				installType: "1",
 				installChannelId: "5201010200601130001",
 				obuId: obu.obuId,
-				orderId: fileDataStrings.orderId
+				orderId: fileDataStrings.orderId,
+				openId: getItem('openId')
 			}, //请求参数
 			method: "POST", //提交方式(默认POST)
 			showLoading: true, //是否显示加载中(默认显示)

subpackage/orders/flowingWater.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="wrapper">
+	<view class="wrapper" v-if="state.haveData">
 		<!-- 背景颜色充满屏 -->
 		<view class="bg-color"></view>
 		<!-- 补卡额订单列表-->
@@ -63,6 +63,7 @@
 			
 		</view>
 	</view>
+	<view class="no">暂无补卡额圈存数据</view>
 </template>
 
 <script lang="ts" setup>
@@ -104,6 +105,7 @@
 		id:"",
 		list:"",
 		cardBalance:"",
+		haveData:false,  //是否有数据
 	})
 	const listData = reactive(null)
 	// const listData = reactive([
@@ -124,8 +126,11 @@
 		state.vehicleId=options.vehicleId
 		//根据车牌查询信息.data
 		queryRefundAction().then(val => {
-			console.log("val",val.data)
-			state.list = val.data
+			console.log("val",val)
+			if(val.hasData){
+				state.list = val.data
+				state.haveData=true
+			}
 		})
 		/*监听蓝牙回调*/
 		uni.$on('bluetoothLink', function(status) {
@@ -475,6 +480,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.no{
+		text-align: center;
+		font-size: 32rpx;
+		margin: 20rpx auto;
+	}
 	.bg-color {
 		position: fixed;
 		top: 0;

subpackage/orders/order-details-new.vue

@@ -70,7 +70,7 @@
 					<view v-if="state.orderInfo.orderStatus == OrderStatus.已取消">
 						<view class="d-row" v-if="state.orderInfo.orderStep > OrderStatus.已支付">
 							<text class="d-label">付款时间：</text>
-							<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.payTime)}}</text>
+							<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.payTime:"")}}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">取消时间：</text>
@@ -91,7 +91,7 @@
 						<view v-if="state.orderInfo.orderStep == OrderStatus.审核不通过 || state.orderInfo.orderStep == OrderStatus.待审核">
 							<view class="d-row">
 								<text class="d-label">付款时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.payTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.payTime:"")}}</text>
 							</view>
 							<view class="d-row" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过">
 								<text class="d-label">不通过原因：</text>
@@ -103,7 +103,7 @@
 						<view v-if="state.orderInfo.orderStep == OrderStatus.待发货">
 							<view class="d-row">
 								<text class="d-label">付款时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.payTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.payTime:"")}}</text>
 							</view>
 							<view class="d-row" v-if="state.orderInfo.staffName">
 								<text class="d-label">业 务 员：</text>
@@ -119,15 +119,15 @@
 							   || state.orderInfo.orderStep == OrderStatus['已申请-退货']">
 							<view class="d-row">
 								<text class="d-label">付款时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.payTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.payTime:'')}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">发货时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.deliveryTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.deliveryTime:"")}}</text>
 							</view>
 							<view class="d-row" v-if="state.orderInfo.orderStep != OrderStatus.待收货">
 								<text class="d-label">收货时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.receivingTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.receivingTime:"")}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">卡 号：</text>
@@ -166,15 +166,15 @@
 						<view v-if="state.orderInfo.orderStep == OrderStatus.已完成">
 							<view class="d-row">
 								<text class="d-label">付款时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.payTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.payTime:"")}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">发货时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.deliveryTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.deliveryTime:"")}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">收货时间：</text>
-								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt.receivingTime)}}</text>
+								<text class="d-value">{{getOrderTime(state.orderInfo.orderInfoExt?state.orderInfo.orderInfoExt.receivingTime:"")}}</text>
 							</view>
 							<view class="d-row">
 								<text class="d-label">激活时间：</text>
@@ -385,7 +385,7 @@
 					</view>
 					<!-- 订单完成 -->
 					<view v-if="state.orderInfo.orderStep == OrderStatus.已完成" class="btn-status">
-						<view class="btn space" @click="gotoEvaluateOrder(state.orderInfo)" v-if="!state.orderInfo.appraise">去评价</view>
+						<view class="btn space" @click="gotoEvaluateOrder(state.orderInfo)" v-if="!state.orderInfo.appraise || state.orderInfo.appraise=='false'">去评价</view>
 						<view class="btn space" v-else>已评价</view>
 					</view>
 					<!-- 换货中 -->
@@ -501,6 +501,7 @@
 	onUnload(()=>{
 		uni.$off('refreshOrder');
 		uni.$off('selectAddressSuccess');
+		console.log("已评价")
 	})
 </script>
 <style>

subpackage/personal-center/setting/personal-information/user-card.vue

@@ -293,6 +293,9 @@
 	}
 </style>
 <style lang="scss" scoped>
+	::v-deep .u-size-mini{
+		white-space: nowrap;
+	}
 	.main {
 		// overflow: hidden;