支付宝适配

.idea/.gitignore

@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

composables/order/useOrderSkip.ts

@@ -10,7 +10,8 @@ export default function useOrderSkip() {
 	const gotoOrderDetails = (orderInfo) => {
 		console.log('输出内容=====', orderInfo)
 		if (orderInfo.orderType === 'ISSUE') {
-			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			// navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}`);
 
 		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
 			orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
@@ -72,13 +73,19 @@ export default function useOrderSkip() {
 			url = '/subpackage/orders/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
 			url = `/subpackage/orders/release-products`;
-		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard == 1) {
+		} else if (orderInfo.orderStep === OrderStatus.待加购权益 && orderInfo.isValueCard == 1) {
 			url = `/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`;
 			// uni.redirectTo({
 			//   url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
 			// });
 		} else {
+			// #ifdef MP-ALIPAY
+			url = `/subpackage/orders/sign-up`;
+			// #endif
+			// #ifdef MP-WEIXIN
 			url = `/subpackage/orders/essential-information`;
+			// #endif
+			
 		}
 		console.log("url", url)
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
@@ -140,10 +147,13 @@ export default function useOrderSkip() {
 		navTo(`/subpackage/orders/order-evaluate-product?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
 
+
 	//新办订单-去评价  业务办理满意度，业务员满意度
 	const gotoEvaluateSalesman = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
+	
+	
 
 	//查看物流
 	const gotoCheckLogistics = (orderInfo : any) => {

datas/enum.ts

@@ -11,7 +11,7 @@ export enum OrderStatus {
 	'完成填写基本信息' = 1,
 	'完成个人/单位信息上传' = 2,
 	'完成车辆信息上传' = 3,
-	'待支付1' = 4,
+	'待加购权益' = 4,
 	'待支付2' = 26,
 	'待支付3' = 27,
 	'已支付' = 5,

pages.json

@@ -861,6 +861,26 @@
 						}
 					}
 				},
+				
+				{
+					"path": "order_payment",
+					"style": {
+						"navigationBarTitleText": "订单支付",
+						"navigationStyle": "custom",
+						"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
+							"transparentTitle": "always",
+							"titlePenetrate": "YES",
+							"defaultTitle": "" // 将导航栏默认的 title 置空
+						}
+					}
+				},
+				
+				{
+					"path": "mpng-payment",
+					"style": {
+						"navigationBarTitleText": "交通银行支付"
+					}
+				},
 				{
 					"path": "addAddress",
 					"style": {
@@ -915,6 +935,12 @@
 						"navigationBarTitleText": "微信车主服务"
 					}
 				},
+				{
+					"path": "sign-up-ali",
+					"style": {
+						"navigationBarTitleText": "支付宝签约代扣"
+					}
+				},
 				{
 					"path": "interestsList",
 					"style": {

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

@@ -48,9 +48,9 @@
 
 			</view>
 			<!-- 待支付 -->
-			<view class="btns" v-if="item.orderStep == OrderStatus.待支付1">
+			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
-				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
+				<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view>
 			</view>
 			<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>

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

@@ -45,7 +45,11 @@
 				<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货
 				</view>
 			</view>
-			
+			<!-- 加购权益 -->
+			<view v-if="item.orderStep == OrderStatus.待加购权益" class="btns">
+				<view class="btn btn-normal" @click="gotoCancelOrder(item)">取消订单</view>
+				<view class="btn btn-primary" @click="gotoPay(item)">加购权益</view>
+			</view>
 			<!-- 待支付 -->
 			<view v-if="item.orderStep == OrderStatus.待支付" class="btns">
 				<view class="btn btn-normal" @click="gotoCancelOrder(item)">取消订单</view>

subpackage/orders/interestsList.vue

@@ -39,7 +39,7 @@
 	import { fileURL } from "@/datas/fileURL.js";
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
 	import navBgCar from "./components/nav-bg-car4";
-	import { setItem } from "@/utils/storage";
+	// import { setItem } from "@/utils/storage";
 	import { msg } from "@/utils/utils";
 	import {
 		checkOrderStatus,
@@ -47,7 +47,14 @@
 		wechatAppID,
 		wechatPayConfigId,
 		wechatSecret,
+		addProduct,
+		queryDetails
 	} from "@/utils/network/api";
+	import {
+		getItem,
+		StorageKeys,
+		setItem
+	} from "@/utils/storage";
 	const imgURL = `${fileURL}image/`;
 
 	const state = reactive({
@@ -74,10 +81,54 @@
 			state.choiceValueComplete.push(state.list[state.choiceValue[i]])
 		}
 		let items = encodeURIComponent(JSON.stringify(state.choiceValueComplete));
-		uni.navigateTo({
-			url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}`,
+		
+		console.log("state.openid", state);
+		const data = JSON.parse(decodeURIComponent(items));
+		let productId = [];
+		state.productMoney = 0;
+		for (var i = 0; i < data.length; i++) {
+			data['isOpened'] = 'node';
+			state.productMoney += data[i]['discountPrice'] / 100;
+			productId.push(data[i]['equityId'])
+		}
+		const options = {
+			type: 2,
+			data: {
+				orderId: state.orderId, //订单编号	
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		console.log("options", options);
+		request(queryDetails, options).then((res) => {
+			state.detailsObj = stringToJson(res.bizContent);
+			console.log("state.detailsObj",state.detailsObj)
+			let allMoney = (parseFloat(state.detailsObj.product.oncePrice * 0.01) + parseFloat(state.productMoney)).toFixed(2)
+			
+			const optionss = {
+				type: 2,
+				data: {
+					orderId: state.orderId, //订单编号	
+					openId: getItem(StorageKeys.OpenId), //操作人 id
+					equityId: productId.toString(), //权益Id
+					totalAmount: allMoney * 100, //总金额
+					isRepeatPurchase: 0
+				},
+				method: "POST",
+				showLoading: true,
+			};
+			console.log("optionss", optionss);
+			request(addProduct, optionss).then((res) => {
+				uni.navigateTo({
+					url: `/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}`,
+				});
+			});
+			
 		});
+		
 	}
+	
+	
 	const getList = (id) => {
 		const options = {
 			type: 2,

subpackage/orders/opening-account-people.vue

@@ -575,15 +575,10 @@
 	};
 	//替换图片地址
 	const strReplace = (str : string) => {
-		return str.replace('http://192.168.101.145:9000', envs[process.env.NODE_ENV].baseUrl)
-		// if (envs[process.env.NODE_ENV].baseUrl == "https://trial.etcjz.cn") {
-		// 	return str.replace('http://192.168.101.145:9000', envs[process.env.NODE_ENV].baseUrl)
-		// } else {
-		// 	return str.replace('http://100.64.2.113:9000', envs[process.env.NODE_ENV].baseUrl)
-		// }
-		// let imgUrl = str.replace("http://192.168.101.145:9000", envs[process.env.NODE_ENV].baseUrl);
-		// imgUrl = str.replace("http://100.64.2.113:9000", envs[process.env.NODE_ENV].baseUrl);
-		// return imgUrl;
+		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);
+		console.log(imgUrl)
+		return imgUrl;
 	}
 	const getGlobalParam = () => {
 		const data = getItem('globalParam')
@@ -624,7 +619,7 @@
 		} else {
 			state.isEnableOCRData = true;
 		}
-
+		
 	}
 	// 通过opneId查询用户信息
 	const queryUserMsg = () => {

utils/network/api.js

@@ -1,24 +1,25 @@
 /* 接口中常量 */
 // export const URL = "192.168.100.63";
-export const URL = "testmedusa.etcjz.cn";
+export const URL = "192.168.124.6";
 /**
  * 配置信息,针对不同的平台进行配置
  */
 export const envs = {
 	//开发环境配置
 	development: {
-		baseUrl: "https://trial.etcjz.cn",
-		// baseUrl: "http://192.168.100.63:8087",
-		// baseUrl: "https://testmedusa.etcjz.cn",
+		// baseUrl: "https://qtzl.etcjz.cn",
+		baseUrl: "http://192.168.124.6:8087",
+		// baseUrl: "https://trial.etcjz.cn",
 		// baseUrl: "http://192.168.100.158:8085",
 	},
 	//生产环境配置
 	production: {
-		// baseUrl: "http://192.168.100.63:8087",
+		baseUrl: "http://192.168.124.6:8087",
 		// baseUrl: "http://222.85.144.89:19002",
 		// baseUrl: "http://192.168.100.158:8085/html/",
-		baseUrl: "https://trial.etcjz.cn",
-		// baseUrl: "https://testmedusa.etcjz.cn",
+		// baseUrl: "https://qtzl.etcjz.cn",
+		// baseUrl: "https://trial.etcjz.cn",
+		// baseUrl: "http://192.168.100.158:8085",
 	},
 }
 
@@ -236,4 +237,6 @@ export const refundQuan = "52d32062470345a1915b0adeb458609e" //储值卡圈存-
 export const queryRefoundResult = "a11d756827f848f79de027a2ec1943c3" //储值卡圈存-半条流水-微信退费结果查询
 export const queryStoredQuan = "cc907ba2683e481d92398bf6c4d74c57" //储值卡圈存详情-多条件分页查询
 export const queryTrajectory = "d6414e83a2a34c4cb0f3da33a0e901bd" //我的上个月轨迹查询
-export const queryCardRecord = "2124c3086aa04faf84d70c01930cc90c" //用户储值卡充值记录-分页查询
+export const queryCardRecord = "2124c3086aa04faf84d70c01930cc90c" //用户储值卡充值记录-分页查询
+export const PAYDETECTION = "7d240e2034f94da399fb0e3775f87a62" //CSMSN-订单支付检测
+export const PAYMENTORDERAPPLY = "377421d6ed4f48a29575aa126838a4d2" //CSMSN-订单支付检测