lyuis преди 7 месеца
родител
ревизия
74162d7181
променени са 2 файла, в които са добавени 3 реда и са изтрити 8 реда
  1. 3 3
      common/config.js
  2. 0 5
      manifest.json

+ 3 - 3
common/config.js

@@ -1,4 +1,4 @@
-const h5Url='https://bossweb.edccc.cn'
+const h5Url='https://h5.bosszan.com'
 const ossUrl='https://yi-zhipin.oss-cn-hangzhou.aliyuncs.com/emoji/'
 let mobile=0;
 // #ifdef APP-PLUS
@@ -25,8 +25,8 @@ if (process.env.NODE_ENV !== 'development'||mobile) {
 	//测试环境
 	const ROOTPATH = "/sqx_fast";
 	const ROOTPATH1 = "/sqx_fast";
-	const ROOTPATH2 = "wss://yizhizan.edccc.cn/wss/websocket/"; //联系客服
-	const ROOTPATH3 = "wss://yizhizan.edccc.cn/wss/chatSocket/"; //聊天
+	const ROOTPATH2 = "wss://www.bosszan.com/wss/websocket/"; //联系客服
+	const ROOTPATH3 = "wss://www.bosszan.com/wss/chatSocket/"; //聊天
 	const ROOTPATH4 = "";
 	module.exports = {
 		APIHOST: ROOTPATH,

+ 0 - 5
manifest.json

@@ -55,14 +55,9 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ],
                 "autoSdkPermissions" : true,
-<<<<<<< HEAD
-                "minSdkVersion" : 21,
-                "targetSdkVersion" : 33
-=======
                 "targetSdkVersion" : 33,
                 "minSdkVersion" : 21,
                 "abiFilters" : [ "arm64-v8a" ]
->>>>>>> e94ad6588e8751b05722903cedbb8b768aa63524
             },
             /* ios打包配置 */
             "ios" : {