2023年9月21日15:00:18

composables/order/useOrderSkip.ts

@@ -10,8 +10,13 @@ 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}`);
+			// #ifdef MP-WEIXIN
+			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			// #endif
+			// #ifdef MP-ALIPAY
 			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}`);
+			// #endif
+			
 
 		} else if (orderInfo.orderType == OrderTypes.同时换卡换签 ||
 			orderInfo.orderType == 'REPLACEMENT_CARD' || orderInfo.orderType == 'REPLACEMENT_SIGNATURE') {
@@ -80,7 +85,7 @@ export default function useOrderSkip() {
 			// });
 		} else {
 			// #ifdef MP-ALIPAY
-			url = `/subpackage/orders/sign-up`;
+			url = `/subpackage/orders/sign-up-ali`;
 			// #endif
 			// #ifdef MP-WEIXIN
 			url = `/subpackage/orders/essential-information`;

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

@@ -66,13 +66,13 @@
 				<view class="btn btn-normal" v-if="item.orderStep == OrderStatus.审核不通过"
 					@click.stop="gotoEditUserOrUnitInfo(item)">修改资料</view>
 				<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="gotoEditAddress(item)">修改地址</view> -->
 			</view>
 
 			<!-- 待发货 -->
 			<view class="btns" v-else-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="gotoEditAddress(item)">修改地址</view> -->
 			</view>
 
 			<!-- 待收货 -->

utils/network/api.js

@@ -1,6 +1,6 @@
 /* 接口中常量 */
 // export const URL = "192.168.100.63";
-export const URL = "192.168.124.6";
+export const URL = "trial.etcjz.cn";
 /**
  * 配置信息,针对不同的平台进行配置
  */
@@ -14,7 +14,6 @@ export const envs = {
 	},
 	//生产环境配置
 	production: {
-		// baseUrl: "http://192.168.124.6:8087",
 		// baseUrl: "http://222.85.144.89:19002",
 		// baseUrl: "http://192.168.100.158:8085/html/",
 		// baseUrl: "https://qtzl.etcjz.cn",

utils/network/request.js

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