lrf 1 년 전
부모
커밋
c85600d6c0
4개의 변경된 파일23개의 추가작업 그리고 20개의 파일을 삭제
  1. 4 4
      common/api.js
  2. 7 7
      config.js
  3. 11 8
      manifest.json
  4. 1 1
      pages.json

+ 4 - 4
common/api.js

@@ -3,25 +3,25 @@ const getDomain = (uri, method, type) => {
 	let url = config.serverUrl;
 	if (type && type == 'file') return url + `/files` + uri;
 	if (type && type == 'integral') {
-		let integral = `/point/zr/v1/api` + uri;
+		let integral = `/point/two/zr/v1/api` + uri;
 		if (config.wx_dev) integral = url + `${config.wx_dev}` + integral;
 		else integral = url + integral;
 		return integral
 	}
 	if (type && type == 'group') {
-		let group = `/point/group/v1/api` + uri;
+		let group = `/point/two/group/v1/api` + uri;
 		if (config.wx_dev) group = url + `${config.wx_dev}` + group;
 		else group = url + group;
 		return group
 	}
 	if (type && type == 'chat') {
-		let chat = `/point/chat/v1/api` + uri;
+		let chat = `/point/two/chat/v1/api` + uri;
 		if (config.wx_dev) chat = url + `${config.wx_dev}` + chat;
 		else chat = url + chat;
 		return chat
 	}
 	if (uri.startsWith('/wechat/api')) return url + uri;
-	let general = `/point/v1/api` + uri;
+	let general = `/point/two/v1/api` + uri;
 	if (config.wx_dev) general = url + `${config.wx_dev}` + general;
 	else general = url + general;
 	return general;

+ 7 - 7
config.js

@@ -5,31 +5,31 @@ const system = uni.getSystemInfoSync();
 // '',/dev
 // wx8cdd28824dfcdf19,wx928648edf0df1882
 // 微信key
-let wx_projectkey = "tehqApp";
+let wx_projectkey = "shoppingTwo";
 // 请求地址
 let wx_dev = "";
 if (system.uniPlatform == "app") {
 	//app
 	let app_env = process.env.NODE_ENV;
 	if (app_env == "development") {
-		wx_projectkey = "pointApp";
+		wx_projectkey = 'shoppingTwo';
 		wx_dev = "/dev";
 	} else if (app_env == "production") {
-		wx_projectkey = "tehqApp";
+		wx_projectkey = 'shoppingTwo';
 		wx_dev = "";
 	}
 } else if (system.uniPlatform == "mp-weixin") {
 	//weixin
 	let wx_env = uni.getAccountInfoSync();
 	if (wx_env.miniProgram.envVersion == "release") {
-		wx_projectkey = "tehqApp";
+		wx_projectkey = 'shoppingTwo';
 		wx_dev = "";
 	} else if (
 		wx_env.miniProgram.envVersion == "develop" ||
 		wx_env.miniProgram.envVersion == "trial"
 	) {
-		wx_projectkey = "pointApp";
-		wx_dev = "/dev";
+		wx_projectkey = 'shoppingTwo';
+		wx_dev = "";
 	}
 }
 // 开发环境,生产环境新方法--end
@@ -37,7 +37,7 @@ export default {
 	serverUrl: "https://broadcast.waityou24.cn",
 	// serverUrl: 'http://192.168.1.144:12211',
 	stompUrl: "broadcast.waityou24.cn",
-	wsUrl: `wss://broadcast.waityou24.cn${wx_dev}/point/chat/v1/api/ws`,
+	wsUrl: `wss://broadcast.waityou24.cn${wx_dev}/point/two/chat/v1/api/ws`,
 	system: system,
 	wx_projectkey: wx_projectkey,
 	wx_dev: wx_dev,

+ 11 - 8
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "天恩活泉",
+    "name" : "商城第二分支",
     "appid" : "__UNI__B379F0E",
     "description" : "",
     "versionName" : "1.0.0",
@@ -67,7 +67,7 @@
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx928648edf0df1882",
+                        "appid" : "wx6ccb725321a4400d",
                         "UniversalLinks" : ""
                     }
                 },
@@ -78,13 +78,15 @@
                     }
                 },
                 "payment" : {
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx6ccb725321a4400d",
+                        "UniversalLinks" : ""
                     }
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx928648edf0df1882",
+                        "appid" : "wx6ccb725321a4400d",
                         "UniversalLinks" : ""
                     }
                 }
@@ -127,11 +129,12 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx928648edf0df1882",
+        "appid" : "wx6ccb725321a4400d",
         "setting" : {
             "urlCheck" : true,
-            "postcss" : false,
-            "minified" : true
+            "postcss" : true,
+            "minified" : true,
+            "es6" : false
         },
         "usingComponents" : true,
         "optimization" : {

+ 1 - 1
pages.json

@@ -411,7 +411,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "天恩活泉",
+		"navigationBarTitleText": "感恩爱购",
 		"navigationBarBackgroundColor": "#FB1438",
 		"backgroundColor": "#F8F8F8"
 	},