Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

applyCard/car-release.vue

@@ -158,6 +158,7 @@
 			.catch((res) => {
 				console.log(res);
 			});
+			
 	};
 
 	const selectConfirm = (index: any) => {

pages/recharge/recharge.vue

@@ -4,8 +4,8 @@
 			<image :src="`${$imgUrl}common/bg-recharge.png`" class="head-bg"></image>
 			<view class="account-text">
 				<view class="balance">
-					<text class="balance-tit">账户余额</text>
-					<text class="balance-val">20.00元</text>
+					<!-- <text class="balance-tit">账户余额</text> -->
+					<!-- <text class="balance-val">20.00元</text> -->
 				</view>
 				<view class="right-box">
 					<view class="no">账户编号：000100</view>
@@ -104,7 +104,7 @@
 		/*获取openId 用途:（用户支付）*/
 		getOpenID();
 		/*传参*/
-		state.cardId = '52011328220201979745'
+		state.cardId = option.cardId
 		state.connectSuccess = option.connectSuccess
 		state.orderNum = getItem("orderNum")
 		if (state.connectSuccess === '1') {

pages/recharge/select-car.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="selectCar-box">
-		<view class="item" v-for="(item,i) in state.list" :key="i">
+		<view v-if="state.list.length>0" class="item" v-for="(item,i) in state.list" :key="i">
 			<view class="iten-left">
 				<image :src="`${$imgUrl}che.png`" mode=""></image>
 				<text>{{item.vehiclePlate}}</text>
@@ -9,7 +9,9 @@
 				<view class="active" v-if="flag==i">
 				</view>
 			</view>
-
+		</view>
+		<view  v-else class="flex">
+			暂无车辆订单信息
 		</view>
 	</view>
 </template>
@@ -42,18 +44,18 @@
 	} from "@/utils/storage";
 	import {
 		stringToJson
-	} from "@/utils/network/encryption";
-	
-	const state = reactive({
-		list:[]
+	} from "@/utils/network/encryption";
+
+	const state = reactive({
+		list: []
 	});
 	onLoad(() => {
-		quanCheckActionTrue().then((item :any) => {
+		quanCheckActionTrue().then((item: any) => {
 			state.list = item.data
 			console.log(item)
 		})
-	});
-
+	});
+	
 	const quanCheckActionTrue = () => {
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
@@ -88,10 +90,9 @@
 	])
 	const flag = ref('0')
 
-	const choose = (i, item) => {
-		flag.value = i
-		console.log("选择得数据", item);
-		navTo('/after-sale/card-loss-reporting/cardloss-confirm')
+	const choose = (i, item) => {
+		console.log(item.cardId)
+		navTo(`/pages/recharge/recharge?cardId=${item.cardId}`)
 	}
 </script>
 
@@ -102,7 +103,11 @@
 		background-color: #EEF7F7;
 	}
 </style>
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	.flex{
+		display: flex;
+		justify-content: center;
+	}
 	.selectCar-box {
 		// width: 100%;
 		height: 100%;

utils/common/tools.js

@@ -7,6 +7,7 @@ import config from '../../config/config.js';
 import urlConfig from '../../config/urlConfig.js';
 import http from './http.js'; //身份类型
 
+
 const identityData = [
     {
         id: 101,
@@ -44,6 +45,7 @@ const identityData = [
         id: 203,
         name: '营业执照'
     },
+	
     {
         id: 204,
         name: '事业单位法人证书'