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

pages/bluetooth/bluetooth.vue

@@ -43,11 +43,14 @@
 	const tools = require("../../static/etcUtil/tools.js");
 	const datas = require("../../static/etcUtil/datas.js");
 	const bluetoothUtil = require("../../static/etcUtil/index.js");
+	// #ifdef MP-WEIXIN
 	let jlApi = require("../../static/etc/JLAPI/JLObuSDK.js"); //聚力SDK
 	let wjApi = require("../../static/etc/WJAPI/wjBleAPI");
 	let tdApi = require("../../static/etc/TDAPI/TDRObuSDK.js");
 	let zzApi = require("../../static/etc/WJAPI/wjBleAPI.js");
-	// #ifdef MP-ALIPAY
+	// #endif
+	
+// #ifdef MP-ALIPAY
 	// 这部分代码将仅在支付宝小程序平台下执行
 	jlApi = require("../../static/etc/JLObuSDK/JLObuSDK.js");
 	wjApi = require("../../static/etc/wjBle/WJBleAPI");

pages/index/index.vue

@@ -620,6 +620,7 @@
 		// #ifdef MP-WEIXIN
 		if (val == 1) {
 			navTo('/pages/recharge/recharge-pay', true)
+			// navTo('/pages/recharge/recharge', true)
 		} else if (val == 2) {
 			navTo('/subpackage/after-sale/rescind-carId/rescind-carId-select', true)
 		}

pages/recharge/recharge-weixin.vue

@@ -226,30 +226,31 @@
 			success: (res) => {
 				if (res.confirm) {
 					//走蓝牙进行修复
-					// quanCheckActionTrue().then((val : any) => {
-					// 	console.log("圈层检测val", val)
-					// 	//如果 圈层检测正常
-					// 	if (val.chargeStatus === 1) {
-					console.log(`进行充值检测`);
-					czCheckAction().then((checkResult : any) => {
-						//判断订单逻辑如果有订单充值 则直接拿到订单去链接蓝牙
-						if (checkResult.orders && checkResult.orders.length > 0) {
-							//拿到订单,存起来
-							state.orderNum = checkResult.orders[0].orderNum;
-							setItem("orderNum", state.orderNum);
+					quanCheckActionTrue().then((val : any) => {
+						console.log("圈层检测val", val)
+						//如果 圈层检测正常
+						if (val.chargeStatus === 1) {
+							console.log(`进行充值检测`);
+							czCheckAction().then((checkResult : any) => {
+								//判断订单逻辑如果有订单充值 则直接拿到订单去链接蓝牙
+								if (checkResult.orders && checkResult.orders.length > 0) {
+									//拿到订单,存起来
+									state.orderNum = checkResult.orders[0].orderNum;
+									setItem("orderNum", state.orderNum);
+									// 检测用户是否存在有半条流水
+									getCardId()
+								} else {
+									console.log('没有可修复的流水')
+								}
+							});
+						} else {
 							// 检测用户是否存在有半条流水
+							// let fixFee = val.fixFee / 100
+							// console.log("fixFee", fixFee)
+							// go(fixFee)
 							getCardId()
-						} else {
-							console.log('没有可修复的流水')
 						}
 					});
-					// } else {
-					// 	// 检测用户是否存在有半条流水
-					// 	let fixFee = val.fixFee / 100
-					// 	console.log("fixFee", fixFee)
-					// 	go(fixFee)
-					// }
-					// });
 				} else if (res.cancel) {
 					console.log('用户点击取消');
 				}

static/etcUtil/index.js

@@ -238,7 +238,7 @@ function transCmd(cmdArr, type, func, callBack = null) {
 		case "TD":
 			console.log('TD执行内容====', cmdArr, type)
 			tdApi.transCmd(cmdArr, type, function(res) {
-				console.log('TD执行内容====', cmdArr, type)
+				console.log('TD执行内容====123', cmdArr, type)
 				if (res.code == 0) {
 					func(res.data);
 				} else {

subpackage/after-sale/transfer-ownership/select-car-transfer.vue

@@ -50,18 +50,24 @@
 	const flag = ref('0') //默认选择0
 
 	onLoad(() => {
-		quanCheckActionTrue().then((item: any) => {
-			state.list = item.data
+		quanCheckActionTrue().then((item : any) => {
+			console.log("过户", item)
+			let data = item.data
+			for (var k = 0; k < data.length; k++) {
+				if (data[k]['orderStatus'] != "99999") {
+					state.list.push(data[k])
+				}
+			}
 		})
 	});
 
 	const quanCheckActionTrue = () => {
 		let source = ""
 		// #ifdef MP-ALIPAY
-			source ="ALI"
+		source = "ALI"
 		// #endif
 		// #ifdef MP-WEIXIN
-			source ="WECHAT"
+		source = "WECHAT"
 		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
@@ -163,4 +169,4 @@
 
 
 	}
-</style>
+</style>

subpackage/after-sale/transfer-ownership/transfer-verification.vue

@@ -87,11 +87,11 @@
 	// 单选数据列表 保留卡签，卡签指向人，不保留卡签，卡签指向车
 	const radiolist1 = reactive([{
 		name: "保留卡签",
-		val: 'WITHVEHICLE',
+		val: 'WITHCUSTOMER',
 	},
 	{
 		name: "不保留卡签",
-		val: "WITHCUSTOMER",
+		val: "WITHVEHICLE",
 	}
 	]);
 

subpackage/orders/choice-product.vue

@@ -159,22 +159,41 @@
 		request(etcQueryProduct, options).then((res) => {
 			// console.log(res.bizContent);
 			const data = stringToJson(res.bizContent);
-			console.log(data);
-			state.dataArray = data.list ? data.list : [];
-			console.log("state.dataArray", state.dataArray);
-			for (var i = 0; i < state.dataArray.length; i++) {
-				const cardTypeArr = []
-				for (var j = 0; j < state.dataArray[i]['releaseProductStandards']['productStandards'].cardType.length; j++) {
-					if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
-						cardTypeArr.push('储值卡')
-					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
-						cardTypeArr.push('记账卡')
-					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '3') {
-						cardTypeArr.push('预存卡')
+			console.log("产品列表", data.list);
+			if (data.list.length > 0) {
+				state.dataArray = data.list ? data.list : [];
+				console.log("state.dataArray", state.dataArray);
+				for (var i = 0; i < state.dataArray.length; i++) {
+					const cardTypeArr = []
+					for (var j = 0; j < state.dataArray[i]['releaseProductStandards']['productStandards'].cardType.length; j++) {
+						if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
+							cardTypeArr.push('储值卡')
+						} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
+							cardTypeArr.push('记账卡')
+						} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '3') {
+							cardTypeArr.push('预存卡')
+						}
 					}
+					state.dataArray[i]['releaseProductStandards']['productStandards']['cardTypeArr'] = cardTypeArr.toString()
 				}
-				state.dataArray[i]['releaseProductStandards']['productStandards']['cardTypeArr'] = cardTypeArr.toString()
+			} else {
+				uni.showModal({
+					title: '提示',
+					content: '尊敬的用户：感谢您的关注！我们正紧锣密鼓地为您准备一款全新的产品。虽然目前尚未上线，但请您耐心等待，我们将以更好的姿态与更丰富的功能，为您呈现一份超出期待的产品。',
+					showCancel: false,
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			}
+
 			console.log("state.dataArray", state.dataArray)
 		});
 	}

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

@@ -3,12 +3,12 @@
 	<view class="item-box" v-for="(item,index) in dataList" :key="index">
 		<view class="top as-layout-horizontal as-gravity-center-start">
 			<view class="as-layout-horizontal as-gravity-center-start">
-				<image  :src="`${$imgUrl}order/icon-star-green.png`"></image>
+				<image :src="`${$imgUrl}order/icon-star-green.png`"></image>
 				<text>{{item.equityName}}</text>
 			</view>
 			<view class="time">{{item.insertTime}}</view>
 		</view>
-		
+
 		<view class="center">
 			<!-- <view class="as-layout-horizontal as-gravity-center-start">
 				<image :src="`${$imgUrl}user/icon-avatar.png`" class="avatar"></image>
@@ -16,11 +16,12 @@
 			</view> -->
 			<view class="content">{{item.suggestion}}</view>
 			<view class="images">
-				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrlArr" :src="`${$imgUrl}${itemChild}`" />
+				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrlArr" :src="itemChild"
+					:key="index" />
 				<!-- <image class="img" mode="aspectFill"  :src="`${$imgUrl}${item.pictureUrl}`" /> -->
 			</view>
 		</view>
-		
+
 		<view class="bottom">
 			<view class="text good" v-if="item.evaluate === '好评'">好评</view>
 			<view class="text middle" v-if="item.evaluate === '中评'">中评</view>
@@ -33,9 +34,9 @@
 <script setup lang="ts">
 	defineProps({
 		//数据列表
-		dataList:{
-			type:Array,
-			default:()=>{
+		dataList: {
+			type: Array,
+			default: () => {
 				return [];
 			}
 		}
@@ -43,47 +44,51 @@
 </script>
 
 <style lang="scss" scoped>
-	.item-box{
+	.item-box {
 		background: #ffffff;
-		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223,223,223,0.8);
+		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
 		border-radius: 20rpx;
 		margin-bottom: 30rpx;
-		
-		.top{
+
+		.top {
 			min-height: 88rpx;
 			padding: 0rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
 			display: flex;
 			justify-content: flex-end;
-			image{
+
+			image {
 				width: 48rpx;
 				height: 53rpx;
 			}
-			
-			text{
+
+			text {
 				margin-left: 12rpx;
 				font-size: 30rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
 				color: #333333;
 			}
-			.time{
+
+			.time {
 				font-size: 26rpx;
 				color: #999999;
 				text-align: right;
 			}
 		}
-		
-		.center{
+
+		.center {
 			padding: 28rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
-			.avatar{
+
+			.avatar {
 				width: 50rpx;
 				height: 50rpx;
 				background: #B2EEE1;
 				border-radius: 50%;
 			}
-			text{
+
+			text {
 				font-size: 26rpx;
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
@@ -91,7 +96,8 @@
 				color: #333333;
 				margin-left: 22rpx;
 			}
-			.content{
+
+			.content {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
@@ -99,15 +105,16 @@
 				line-height: 46rpx;
 				margin-top: 30rpx;
 			}
-			
-			.images{
+
+			.images {
 				margin-top: 40rpx;
 				display: flex;
 				flex-direction: row;
 				flex-wrap: wrap;
 				margin-right: -30rpx;
 				margin-bottom: -30rpx;
-				.img{
+
+				.img {
 					width: 130rpx;
 					height: 130rpx;
 					margin-right: 30rpx;
@@ -117,14 +124,15 @@
 				}
 			}
 		}
-		
-		.bottom{
+
+		.bottom {
 			padding: 15rpx 30rpx;
 			text-align: right;
 			display: flex;
 			justify-content: flex-end;
 			align-items: center;
-			.text{
+
+			.text {
 				width: 97rpx;
 				height: 36rpx;
 				line-height: 36rpx;
@@ -132,19 +140,23 @@
 				font-size: 26rpx;
 				text-align: center;
 			}
-			.good{
+
+			.good {
 				background: #FBD9D0;
 				color: #DD523E;
 			}
-			.middle{
+
+			.middle {
 				background: #FBECD0;
 				color: #FF9600;
 			}
-			.bad{
+
+			.bad {
 				background: #E1E1E1;
 				color: #999999;
 			}
-			.score{
+
+			.score {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;

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

@@ -8,15 +8,19 @@
 			</view>
 			<view class="time">{{item.insertTime}}</view>
 		</view>
-		
+
 		<view class="center">
 			<!-- <view class="as-layout-horizontal as-gravity-center-start">
 				<image :src="`${$imgUrl}user/icon-avatar.png`"></image>
 				<text>{{item.customerName}}</text>
 			</view> -->
 			<view class="content">{{item.suggestion}}</view>
+			<view class="images" v-if="item.pictureUrlArr && item.pictureUrlArr.length>0">
+				<image class="img" mode="aspectFill" v-for="(itemChild,index) in item.pictureUrlArr" :src="itemChild"
+					:key="index" />
+			</view>
 		</view>
-		
+
 		<view class="bottom">
 			<view class="text good" v-if="item.evaluate === '好评'">好评</view>
 			<view class="text middle" v-if="item.evaluate === '中评'">中评</view>
@@ -31,9 +35,9 @@
 	// const tabClick = defineEmits(['tabClick'])
 	defineProps({
 		//数据列表
-		dataList:{
-			type:Array,
-			default:()=>{
+		dataList: {
+			type: Array,
+			default: () => {
 				return [];
 			}
 		}
@@ -44,45 +48,49 @@
 </script>
 
 <style lang="scss" scoped>
-	.item-box{
+	.item-box {
 		background: #ffffff;
-		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223,223,223,0.8);
+		box-shadow: 0rpx 2rpx 6rpx 0rpx rgba(223, 223, 223, 0.8);
 		border-radius: 20rpx;
 		margin-bottom: 30rpx;
-		
-		.top{
+
+		.top {
 			min-height: 88rpx;
 			padding: 0rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
-			image{
+
+			image {
 				width: 48rpx;
 				height: 53rpx;
 			}
-			
-			text{
+
+			text {
 				margin-left: 12rpx;
 				font-size: 30rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
 				color: #333333;
 			}
-			.time{
+
+			.time {
 				font-size: 26rpx;
 				color: #999999;
 				text-align: right;
 			}
 		}
-		
-		.center{
+
+		.center {
 			padding: 28rpx 30rpx;
 			border-bottom: 1rpx solid #DCDCDC;
-			image{
+
+			image {
 				width: 50rpx;
 				height: 50rpx;
 				background: #B2EEE1;
 				border-radius: 50%;
 			}
-			text{
+
+			text {
 				font-size: 26rpx;
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
@@ -90,7 +98,8 @@
 				color: #333333;
 				margin-left: 22rpx;
 			}
-			.content{
+
+			.content {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
@@ -99,14 +108,15 @@
 				margin-top: 30rpx;
 			}
 		}
-		
-		.bottom{
+
+		.bottom {
 			padding: 15rpx 30rpx;
 			text-align: right;
 			display: flex;
 			justify-content: flex-end;
 			align-items: center;
-			.text{
+
+			.text {
 				width: 97rpx;
 				height: 36rpx;
 				line-height: 36rpx;
@@ -114,19 +124,23 @@
 				font-size: 26rpx;
 				text-align: center;
 			}
-			.good{
+
+			.good {
 				background: #FBD9D0;
 				color: #DD523E;
 			}
-			.middle{
+
+			.middle {
 				background: #FBECD0;
 				color: #FF9600;
 			}
-			.bad{
+
+			.bad {
 				background: #E1E1E1;
 				color: #999999;
 			}
-			.score{
+
+			.score {
 				font-size: 26rpx;
 				font-family: Noto Sans S Chinese;
 				font-weight: 400;
@@ -135,4 +149,22 @@
 			}
 		}
 	}
+
+	.images {
+		margin-top: 40rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: -30rpx;
+		margin-bottom: -30rpx;
+
+		.img {
+			width: 130rpx;
+			height: 130rpx;
+			margin-right: 30rpx;
+			background: #F3F3F3;
+			border-radius: 10rpx;
+			margin-bottom: 30rpx;
+		}
+	}
 </style>