Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

2 years ago · 1aaa3cb2b7
parent 4088729dbc d5ce0019d1
commit 1aaa3cb2b7
2 changed files with 3 additions and 3 deletions
--- a/app.js
+++ b/app.js
@ -1,8 +1,8 @@
 App({
 	globalData: {
 		userInfo: null,
-    ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
+    // ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
-		// ip: "https://daotian.matripe.com.cn",
+		ip: "https://daotian.matripe.com.cn",
 		// ip: 'http://localhost:8001',
 		sessionId: "",
 		header: {
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@ -353,7 +353,7 @@ height: 746rpx;
 	margin-bottom: 5px;
 }
 .storeName{
-  max-width: 300rpx;
+  max-width: 350rpx;
 }
 .logoClass {
 	width: 52px;