Merge remote-tracking branch 'origin/master'

pages.json

@@ -89,7 +89,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/zaweb/zaweb",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "在线签约",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subPackages": [{
 			"root": "subpackage/after-sale", //售后相关
 			"pages": [{

pages/zaweb/zaweb.vue

@@ -0,0 +1,21 @@
+<template>
+	<div>
+		<web-view :src="url"></web-view>
+	</div>
+</template>
+<script setup lang='ts'>
+	import {
+		ref
+	} from 'vue'
+	let url = ref('https://qtzl.etcjz.cn/aliOrder')
+	//获取微信小程序openid
+	// #ifdef MP-WEIXIN
+	url.value = 'https://qtzl.etcjz.cn/wxOrder'
+	// #endif
+	// #ifdef MP-WEIXIN
+	url.value = 'https://qtzl.etcjz.cn/aliOrder'
+	// #endif
+</script>
+<style lang='scss' scoped>
+
+</style>

utils/network/api.js

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