提交

composables/order/useOrderSkip.ts

@@ -15,7 +15,8 @@ export default function useOrderSkip() {
 			jump("11", params)
 		} else {
 			// #ifdef MP-WEIXIN
-			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
+			// navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
+			navTo(`/subpackage/orders/product-detail?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&&vehicleId=${orderInfo.vehicleId}`);
 			// #endif
 			// #ifdef MP-ALIPAY
 			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);

pages.json

@@ -1845,8 +1845,8 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 			  "issuer-plugin": {
-			   "version": "dev-5d954bb916bb210d6c17397439d90f07",
-			   // "version": "1.0.2",
+			   // "version": "dev-5d954bb916bb210d6c17397439d90f07",
+			   "version": "1.0.2",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

subpackage/orders/product-detail.vue

@@ -98,14 +98,20 @@
 	const downAuthD = (item) => {
 		console.log('=======123',item)
 		console.log("uni.env.USER_DATA_PATH '", uni.env.USER_DATA_PATH + '/' + '产品协议.docx')
+		// 文件后缀截取
+		var index = item.url .lastIndexOf("\.");  
+		let fileType  = item.url .substring(index + 1, item.url .length);
+		
+console.log("fileType",fileType)
 		uni.downloadFile({
 			url: item.url,
-			filePath: uni.env.USER_DATA_PATH + '/' +item.name+ '.docx',
+			filePath: uni.env.USER_DATA_PATH + '/' +item.name+ '.'+fileType,
 			success(res) {
 				const filePath = res.filePath
+				console.log("filePath",filePath)
 				uni.openDocument({
 					filePath: filePath,
-					fileType: 'docx',
+					fileType: fileType,
 					showMenu: true, //关键点
 					success: function (res) {
 					},

subpackage/orders/sign-up.vue

@@ -18,12 +18,12 @@
 		</view>
 	</view>
 
-	<view class="as-layout-horizontal agreement">
+	<!-- <view class="as-layout-horizontal agreement">
 		<checkbox-group @change="checkboxChange">
 			<checkbox :checked="state.checked" style="transform: scale(0.8)" />我已阅读并同意
 		</checkbox-group>
 		<text style="color:#007AFF;text-decoration: underline;" @click="downAuthD()">《代扣协议》</text>
-	</view>
+	</view> -->
 	<view class="action">
 		<button type="default" class="button" @click="savaHandle()">
 			{{state.channelSing=="0"?'开通服务':'恢复签约'}}
@@ -155,10 +155,10 @@
 		// #endif
 	}
 	const savaHandle = () => {
-		if (!state.checked) {
-			msg("请勾选协议！")
-			return;
-		}
+		// if (!state.checked) {
+		// 	msg("请勾选协议！")
+		// 	return;
+		// }
 		console.log("openid*******", state.openid);
 		//如果获取openId成功
 		if (state.openid) {

utils/network/request.js

@@ -73,8 +73,8 @@ export function request(code, options = {}, start = false) {
 		opId: getItem(StorageKeys.OpenId),
 	}
 
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
+	// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'