支付宝适配

App.vue

@@ -44,6 +44,7 @@
 			});
 			this.globalParam();
 			//获取微信小程序openid
+			// #ifdef MP-WEIXIN
 			uni.login({
 				provider: "weixin",
 				success: function(e) {
@@ -67,6 +68,8 @@
 					});
 				},
 			});
+			
+			// #endif
 			uni.setStorageSync("extraData", option.referrerInfo.extraData);
 			// #ifdef MP-WEIXIN
 			//获取小程序更新机制兼容
@@ -180,11 +183,14 @@
 					method: "POST",
 					showLoading: true,
 				};
+				// #ifdef MP-WEIXIN
 				request(getGlobalParam, options).then((res) => {
 					const result = stringToJson(res.bizContent);
 					setItem('globalParam', result.data)
 					console.log("配置", result);
 				});
+				// #endif
+				
 			},
 
 

composables/order/useOrderSkip.ts

@@ -14,10 +14,8 @@ export default function useOrderSkip() {
 			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
 			// #endif
 			// #ifdef MP-ALIPAY
-			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}`);
+			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
 			// #endif
-			
-
 		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
 			orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
 			navTo(`/subpackage/orders/order-details-card-sign?id=${orderInfo.id}&orType=${orderInfo.orderType}`);

login/forget-pwd-step1.vue

@@ -58,7 +58,13 @@ const nextStep = () => {
   request(sendCode, options)
     .then((res) => {
       msg("验证码发送成功！");
-      navTo(`/login/forget-pwd-step2?phone=${state.phone}`);
+	  // #ifdef MP-WEIXIN
+	 navTo(`/login/forget-pwd-step2?phone=${state.phone}`);
+	  // #endif
+	  // #ifdef MP-ALIPAY
+	  navTo(`/login/forget-pwd-step2-ali?phone=${state.phone}`);
+	  // #endif
+      
     })
     .catch((err) => {
       console.log(err);

login/register-step1.vue

@@ -72,7 +72,12 @@
 		request(sendCode, options)
 			.then((res) => {
 				msg("验证码发送成功！");
+				// #ifdef MP-WEIXIN
 				navTo(`/login/register-step2?phone=${state.phone}`);
+				// #endif
+				// #ifdef MP-ALIPAY
+				navTo(`/login/register-step2-ali?phone=${state.phone}`);
+				// #endif
 			})
 			.catch((err) => {
 				console.log(err);

pages/index/index.vue

@@ -7,13 +7,13 @@
 				<swiper class="swiper" circular :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
 					:interval="swiper.interval" :duration="swiper.duration"
 					indicator-active-color="rgba(0, 179, 139, 1)" :easing-function="swiper.easing">
-					<block v-if="state.swiperList.length >0" v-for="item in state.swiperList" :key="item.id">
+					<!-- <block v-if="state.swiperList.length >0" v-for="item in state.swiperList" :key="item.id">
 						<swiper-item class="swiper-item" @click="gotoLink(item)">
 							<image :src="item.imgUrl?strReplace(item.imgUrl):fileURL + 'image/index/banner-1.png'"
 								mode="widthFix"></image>
 						</swiper-item>
-					</block>
-					<block v-else>
+					</block> -->
+					<block >
 						<swiper-item class="swiper-item">
 							<image :src="fileURL + 'image/index/banner-1.png'" mode="widthFix"></image>
 						</swiper-item>
@@ -44,11 +44,17 @@
 					</view>
 					<view class="text">账单查询</view>
 				</view>
-				<view class="item-box" @click="$util.navTo('/subpackage/orders/Invoice-mannager',true)">
+				<!-- <view class="item-box" @click="$util.navTo('/subpackage/orders/Invoice-mannager',true)">
 					<view class="item item-3">
 						<image :src="fileURL + 'image/index/item-3.png'" mode="aspectFill" />
 					</view>
 					<view class="text">通行发票</view>
+				</view> -->
+				<view class="item-box" @click="$util.navTo('/subpackage/after-sale/activation-once-again/select-car',true)">
+					<view class="item item-3">
+						<image :src="fileURL + '20230511/24e179d44e2d4e5687339bff_obucxjh.png'" mode="aspectFill" />
+					</view>
+					<view class="text">重新激活</view>
 				</view>
 				<view class="item-box"
 					@click="$util.navTo('/subpackage/personal-center/install-activation-order',true)">
@@ -89,7 +95,7 @@
 			</view>
 
 			<!-- 消息滚动显示 -->
-			<view class="backlog-notice">
+			<view v-if="false" class="backlog-notice">
 				<notice-bar :noticeList="state.noticeList" @noticeClick="goOrder(3)"></notice-bar>
 			</view>
 
@@ -366,7 +372,8 @@
 		highMsg(); //高速快讯
 		processeCondition();//办理条件
 		commonQuestion();
-		doSomething();//代办事项
+		
+		// doSomething();//代办事项
 	})
 
 	onMounted(() => {
@@ -665,6 +672,7 @@
 			.catch((err) => {
 				console.log(err);
 			});
+		
 	}
 	const goOrder = (index) => {
 		uni.reLaunch({

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

@@ -1,7 +1,8 @@
 <!-- 新办订单item 
 	新办订单状态：待支付、审核中、审核不通过、待发货、待收货、待激活、已完成、已取消、已结束、退货、换货-->
 <template>
-	<view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'" @click.stop="gotoOrderDetails(item)">
+	<!-- <view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'" @click.stop="gotoOrderDetails(item)"> -->
+	<view :class="item.orderStatus == OrderStatus.已取消 ? 'item finished' : 'item'" >
 		<view class="head">
 			<view class="name">
 				<image :src="`${$imgUrl}order/icon-star-green.png`" class="icon" mode="aspectFill"></image>

pages/recharge/recharge.vue

@@ -20,11 +20,13 @@
 		</view>
 		<view class="tabs">
 			<view class="tab-tit as-gravity-center-start">充值方式
-				<radio-group @change="radioChange" style="flex: 1;display:flex;margin-right: 30rpx;">
+				<!-- <radio-group @change="radioChange" style="flex: 1;display:flex;margin-right: 30rpx;">
 					<radio class="as-weight as-gravity-center" value="blu" :checked="state.transWay === 'blu'">蓝牙
 					</radio>
 					<radio class="as-weight" value="nfc" :checked="state.transWay === 'nfc'">NFC</radio>
-				</radio-group>
+				</radio-group> -->
+				<u-input @click="state.transWayTypeShow = true" inputAlign="center"
+					v-model="state.transWayName" type="select" />
 			</view>
 
 			<view class="tab-tit">在线充值</view>
@@ -36,6 +38,7 @@
 		<view class="btn btn-primary" @click="rechargeAction">立即充值</view>
 
 	</view>
+	<u-select v-model="state.transWayTypeShow" :list="state.transWayTypeList" @confirm="selectConfirm"></u-select>
 	<!-- <bluetooth :routeType="2" :cardId="state.cardId"  v-if="state.isShowBlue" @submit="getParams"></bluetooth> -->
 </template>
 
@@ -86,6 +89,15 @@
 	const NFCAPI = require('../../static/nfc/NFCAPI.js');
 
 	const state = reactive({
+		transWayTypeShow: false,
+		transWayTypeList: [{
+				label: "蓝牙",
+				value: "blu",
+			}, {
+				label: "NFC",
+				value: "nfc",
+			}
+		],
 		isShowBlue: false,
 		moneryArray: [{
 			name: '50元',
@@ -112,6 +124,7 @@
 		fee: 5000,
 		money: 50,
 		orderNum: "",
+		transWayName:"蓝牙",
 		transWay: "blu", //“blu”为蓝牙充值方式、“nfc”为NFC充值方式
 		cardId: "", //卡号 需要传参
 		mockpreBalance: 2000, //fix:模拟余额 目前没有检测状态接口，第一次会模拟圈层检测来检测状态
@@ -129,7 +142,16 @@
 		current: 0
 	});
 
+const selectConfirm = (item: any) => {
+		// item.map((val, index) => {
+		// 	state.form.useUserType = val.value;
+		// 	state.form.useUserTypeName = val.label;
+		// });
 
+			state.transWayName=item[0].label
+			state.transWay= item[0].value
+
+	};
 	//读卡信息
 	const card : any = reactive({
 		cardId: "",

pages/recharge/select-car.vue

@@ -57,9 +57,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 			orderStatus: '1',

pages/user/user.vue

@@ -18,12 +18,12 @@
 							<view class="nickname">{{state.accountInfoVo.nickName}}</view>
 							<view class="user-id">
 								<view class="phone">{{state.accountInfoVo.mobile}}</view>
-								<view @click="$util.navTo('/subpackage/personal-center/setting/change-phone', true)"
+								<view v-if="false" @click="$util.navTo('/subpackage/personal-center/setting/change-phone', true)"
 									class="btn-change">已关联</view>
 							</view>
 						</view>
 					</view>
-					<view class="setting" @click="$util.navTo('/subpackage/personal-center/setting/setting', true)">
+					<view v-if="false" class="setting" @click="$util.navTo('/subpackage/personal-center/setting/setting', true)">
 						<!-- <image :src="`${$imgUrl}user/icon-setting.png`"></image> -->
 						<text>签到</text>
 					</view>
@@ -45,16 +45,16 @@
 							<text class="num">{{state.userVehicleInfoSumQueryVo.orderStatus0}}</text>
 							<text class="type">待办</text>
 						</view>
-						<view class="panel-item">
+						<view class="panel-item" v-if="false">
 							<view class="panel-text"><text class="num">2</text><text class="txt">张</text></view>
 							<text class="type">卡券</text>
 						</view>
-						<view class="panel-item">
+						<view class="panel-item" v-if="false">
 							<view class="panel-text"><text class="num">2555</text><text class="txt">分</text></view>
 							<text class="type">积分</text>
 						</view>
 					</view>
-					<view class="notice">
+					<view class="notice" v-if="false">
 						<image :src="`${$imgUrl}user/icon-tips.png`" class="icon-notice" mode="aspectFill"></image>
 						<view class="notice-content">您有一笔成功交易，点击查看详情</view>
 					</view>

subpackage/after-sale/ETC-log-off/select-car.vue

@@ -56,9 +56,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 			isValueCard: "",

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

@@ -35,9 +35,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: "WECHAT",
+			source: source,
 			tabIndex: "0",
 			orderStep: "11",
 			isValueCard: "",

subpackage/after-sale/card-loss-reporting/select-car.vue

@@ -56,9 +56,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 			isValueCard: "",

subpackage/after-sale/refund-order-balance/select-car.vue

@@ -55,9 +55,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 		};

subpackage/after-sale/refundPage-selectCar.vue

@@ -55,9 +55,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 		};

subpackage/after-sale/replace-equipment/select-car.vue

@@ -56,9 +56,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 			isValueCard: "",

subpackage/after-sale/to-bookkeeping-card/select-car.vue

@@ -56,9 +56,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 			isValueCard: '1',

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

@@ -56,9 +56,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 		};

subpackage/orders/choice-product.vue

@@ -6,7 +6,7 @@
 			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
 				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
 			<view class="item-value">
-				<image class="icon-tip" :src="`${$imgUrl}applyCard/wechat.png`"></image>
+				<image class="icon-tip" :src="state.sysType === 'WECHAT'?`${$imgUrl}applyCard/wechat.png` : `${$imgUrl}applyCard/alibaba.png`"></image>
 				<view class="content">
 					<view class="title">
 						{{ item.promoteName }}
@@ -127,6 +127,12 @@
 	};
 
 	onLoad((option : any) => {
+		// #ifdef MP-ALIPAY
+			state.sysType = 'ALI';
+		// #endif
+		// #ifdef MP-WEIXIN
+			state.sysType = 'WECHAT';
+		// #endif
 		// state.orderId = option.orderId;
 		// state.userType = option.userType;
 		// state.vehiclePlateColor = option.vehiclePlateColor;
@@ -134,7 +140,7 @@
 		state.type = option.type;
 		var data = {
 			type: state.type,
-			source: 'WECHAT'  //请求方来源
+			source: state.sysType  //请求方来源
 		};
 		const options = {
 			type: 2,
@@ -197,6 +203,7 @@
 		radiolist1: [], //选择卡的数据列表
 		choiceCardShow: false, //选择卡的弹出框
 		isSign: '',
+		sysType:"",
 		orderId: "",
 		userType: 1, //1 个人 2单位
 		type: 0, //0 客车 1货车

subpackage/orders/flowingWater-selectCar.vue

@@ -55,9 +55,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 		};

subpackage/orders/interestsList.vue

@@ -151,6 +151,7 @@
 
 	//获取微信小程序openid
 	const getOpenID = () => {
+		// #ifdef MP-WEIXIN
 		uni.login({
 			provider: "weixin",
 			success: function (e) {
@@ -173,6 +174,7 @@
 				});
 			},
 		});
+		//#endif
 	};
 
 	const savaHandle = () => {

subpackage/orders/order_payment.vue

@@ -6,7 +6,7 @@
 			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
 				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
 			<view class="item-value">
-				<image class="icon-tip" :src="`${$imgUrl}applyCard/wechat.png`"></image>
+				<image class="icon-tip" :src="`${$imgUrl}applyCard/alibaba.png`"></image>
 				<view class="content">
 					<view class="title">
 						{{ item.payName }}
@@ -208,9 +208,10 @@
 			console.log(data);
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
-				uni.redirectTo({
-					url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
-				});
+				gotoEditUserOrUnitInfo()
+				// uni.redirectTo({
+				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
+				// });
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -262,6 +263,7 @@
 
 	onLoad((option : any) => {
 		state.orderId = option.orderId;
+		state.isValueCard = option.isValueCard;
 		// state.userType = option.userType;
 		// state.vehiclePlateColor = option.vehiclePlateColor;
 		// state.userType = option.userType;
@@ -284,9 +286,10 @@
 			console.log(data);
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
-				uni.redirectTo({
-					url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
-				});
+				gotoEditUserOrUnitInfo(state)
+				// uni.redirectTo({
+				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
+				// });
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -361,7 +364,24 @@
 			reject(error);
 		});
 	};
+const gotoEditUserOrUnitInfo = () => {
+		let url = '';
+		if (state.isValueCard != 1) {
+			url = `/subpackage/orders/release-products`;
+		} else {
+			// #ifdef MP-ALIPAY
+				url = `/subpackage/orders/sign-up-ali`;
+			// #endif
+			// #ifdef MP-WEIXIN
+				url = `/subpackage/orders/essential-information`;
+			// #endif
 
+		}
+		console.log("url", url)
+		uni.redirectTo({
+			url: `${url}?orderId=${state.orderId}`,
+		});
+	}
 	const state = reactive({
 		isValueCard: 1, //卡的类型
 		radiolist1: [], //选择卡的数据列表

subpackage/orders/refund-deposit-card-selectCar.vue

@@ -54,9 +54,16 @@
 	});
     
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT', //渠道为小程序
+			source: source, //渠道为小程序
 			tabIndex: '0', //0全部
 			orderStep: '11', //11 为已完成”
 		};

subpackage/orders/release-products.vue

@@ -88,6 +88,21 @@ onLoad((option: any) => {
   request(etcQyList, options).then((res) => {
     const data = stringToJson(res.bizContent);
     // state.list = data.data
+	// #ifdef MP-ALIPAY
+	state.list = [
+	  {
+	    bg: imgURL + "applyCard/product-bg.png",
+	    icon: imgURL + "applyCard/alibaba.png",
+	    title: "支付宝代扣",
+	    // tip: "服务费是每笔交易金额的0.05%",
+	    tag1: "支付宝代付",
+	    tag2: "支付宝便捷支付",
+	    tag: "tag1",
+	    channelId: data.data[0].channelId,
+	  },
+	]
+	// #endif
+	// #ifdef MP-WEIXIN
     state.list = [
       {
         bg: imgURL + "applyCard/product-bg.png",
@@ -100,6 +115,7 @@ onLoad((option: any) => {
         channelId: data.data[0].channelId,
       },
     ];
+	// #endif
   });
 });
 
@@ -108,17 +124,7 @@ const state = reactive({
     show: false,
     src: imgURL + "applyCard/edit.png",
   },
-  list: [
-    {
-      bg: imgURL + "applyCard/product-bg.png",
-      icon: imgURL + "applyCard/wechat.png",
-      title: "微信支付",
-      tip: "服务费是每笔交易金额的0.05%",
-      tag1: "微信代付",
-      tag2: "微信便捷支付",
-      tag: "tag1",
-    },
-  ],
+  list: [],
   id: "",
   clientFee: "",
   orderId: "",

subpackage/orders/sign-up-ali.vue

@@ -98,24 +98,28 @@ const savaHandle = () => {
 						  });
 					}else if (data.signStatus === "SIGNED") {
 					//已签约
-					msg("已签约");
+					// msg("已签约");
 					confirm(
 					  "您已完成签约，等待业务员审核发货",
 					  () => {
-					    uni.$emit("refreshOrder");
-					    uni.navigateBack();
+						  uni.switchTab({
+						  	url: "/pages/order/order"
+						  })
+					    // uni.$emit("refreshOrder");
+					    // uni.navigateBack();
 					  },
 					  "已完成签约",
 					  false
 					);
 					}else if (data.signStatus === "UNSIGN") {
 					//已解约
-					 msg("已解约");
+					 // msg("已解约");
 					 confirm(
 					   "您已解约！",
 					   () => {
-					     uni.$emit("refreshOrder");
-					     uni.navigateBack();
+					     uni.switchTab({
+					     	url: "/pages/order/order"
+					     })
 					   },
 					   "您已解约",
 					   false

subpackage/orders/sign-up.vue

@@ -63,6 +63,7 @@ onLoad((option: any) => {
 
 //获取微信小程序openid
 const getOpenID = () => {
+	// #ifdef MP-WEIXIN
   uni.login({
     provider: "weixin",
     success: function (e) {
@@ -85,6 +86,7 @@ const getOpenID = () => {
       });
     },
   });
+  // #endif
 };
 
 const addInterestsList=()=>{

subpackage/personal-center/install-activation-order.vue

@@ -105,13 +105,19 @@
 			uni.stopPullDownRefresh();
 			return;
 		}
-
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		let res : any = null;
 		const options = {
 			type: 2,
 			data: {
 				"opId": getItem(StorageKeys.OpenId),
-				"source": "WECHAT",
+				"source": source,
 				"vehiclePlate": "",
 				"tabIndex": '0',
 				"pageNo": params.pageNum,

subpackage/personal-center/search/select-car.vue

@@ -57,9 +57,16 @@
 	});
 
 	const quanCheckActionTrue = () => {
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+		// #endif
 		var data = {
 			opId: getItem(StorageKeys.OpenId),
-			source: 'WECHAT',
+			source: source,
 			tabIndex: '0',
 			orderStep: '11',
 			isValueCard: '',

subpackage/personal-center/setting/car-information/car-create.vue

@@ -16,7 +16,7 @@
 
 				<image v-if="!state.form.vehPosImgUrl" class="icon" :src="`${$imgUrl}applyCard/car-zhu.png`">
 				</image>
-				<image v-else class="icon" :src="state.form.vehPosImgUrl"></image>
+				<image v-else class="icon" :src="strReplace(state.form.vehPosImgUrl)"></image>
 			</view>
 		</view>
 		<view class="picture-wrapper" @click="cardImageOcr('2')">
@@ -30,7 +30,7 @@
 				</view>
 				<image v-if="!state.form.vehNegImgUrl" class="icon" :src="`${$imgUrl}applyCard/car-fu.png`">
 				</image>
-				<image v-else class="icon" :src="state.form.vehNegImgUrl"></image>
+				<image v-else class="icon" :src="strReplace(state.form.vehNegImgUrl)"></image>
 			</view>
 		</view>
 		<view class="picture-wrapper" @click="cardFileImageUpdate()">
@@ -44,7 +44,7 @@
 				</view>
 				<image v-if="!state.form.vehBodyUrl" class="icon" :src="`${$imgUrl}applyCard/chetou.png`">
 				</image>
-				<image v-else class="icon" :src="state.form.vehBodyUrl"></image>
+				<image v-else class="icon" :src="strReplace(state.form.vehBodyUrl)"></image>
 			</view>
 		</view>
 		<view class="shibie-wrapper">
@@ -126,6 +126,7 @@
 		etcCarOcrCard,
 		fileUpload,
 		createCarInfo,
+		envs
 	} from "@/utils/network/api.js";
 	import {
 		request
@@ -218,6 +219,11 @@
 			},
 		});
 	};
+const strReplace = (str : string) => {
+		let imgUrl = str.replace("http://192.168.101.145:9000", envs[process.env.NODE_ENV].baseUrl);
+		imgUrl = imgUrl.replace("http://100.64.2.113:9000", envs[process.env.NODE_ENV].baseUrl);
+		return imgUrl;
+	};
 
 	const state = reactive({
 		actionSheetShow: false,

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

@@ -16,7 +16,7 @@
 					</view>
 					<image v-if="!state.form.userPosImgUrl" class="icon" :src="`${$imgUrl}applyCard/renxiang.png`">
 					</image>
-					<image v-else class="icon" :src="state.form.userPosImgUrl"></image>
+					<image v-else class="icon" :src="strReplace(state.form.userPosImgUrl)"></image>
 				</view>
 			</view>
 			<view class="picture-wrapper" @click="cardImageOcr('2')">
@@ -30,7 +30,7 @@
 					</view>
 					<image v-if="!state.form.userNegImgUrl" class="icon" :src="`${$imgUrl}applyCard/guohui.png`">
 					</image>
-					<image v-else class="icon" :src="state.form.userNegImgUrl"></image>
+					<image v-else class="icon" :src="strReplace(state.form.userNegImgUrl)"></image>
 				</view>
 			</view>
 			<view class="shibie-wrapper">
@@ -100,7 +100,8 @@
 	import {
 		etcOcrCard,
 		userInfoChange,
-		sendCode
+		sendCode,
+		envs,
 	} from "@/utils/network/api.js";
 
 	import {
@@ -161,7 +162,11 @@
 			// agentIdVld: '',
 		}
 	})
-
+const strReplace = (str : string) => {
+		let imgUrl = str.replace("http://192.168.101.145:9000", envs[process.env.NODE_ENV].baseUrl);
+		imgUrl = imgUrl.replace("http://100.64.2.113:9000", envs[process.env.NODE_ENV].baseUrl);
+		return imgUrl;
+	};
 
 	const getCode = () => {
 		console.log(123);