diff --git a/.env b/.env index 8e9652d5..44d84884 100644 --- a/.env +++ b/.env @@ -5,8 +5,9 @@ SHOPRO_VERSION=v2.4.1 SHOPRO_API_PATH=/app-api # 后端接口 - 测试环境(通过 process.env.NODE_ENV == development) -SHOPRO_DEV_BASE_URL=http://127.0.0.1:48083 +# SHOPRO_DEV_BASE_URL=http://127.0.0.1:48083 # SHOPRO_DEV_BASE_URL = http://chatapi.zianxin.com +SHOPRO_DEV_BASE_URL=https://rj4jv5rwqs.by.takin.cc # 后端接口 - 正式环境(通过 process.env.NODE_ENV != development) SHOPRO_BASE_URL=http://chatapi.zianxin.com diff --git a/src/App.vue b/src/App.vue index 2df9951e..6f89a265 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,632 +1,631 @@ diff --git a/src/manifest.json b/src/manifest.json index b8c90f08..31cc73b0 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,9 +1,9 @@ { "name" : "荷塘月色", - "appid" : "__UNI__5B53E65", + "appid" : "__UNI__0A84F60", "description" : "聊天交友app", "versionName" : "0.0.0", - "versionCode" : 0, + "versionCode" : 1, "transformPx" : false, "app-plus" : { "usingComponents" : true, @@ -122,9 +122,9 @@ "iosStyle" : "common", "useOriginalMsgbox" : true, "android" : { - "hdpi" : "C:/Users/20513/Pictures/login-bg.png", - "xhdpi" : "C:/Users/20513/Pictures/login-bg.png", - "xxhdpi" : "C:/Users/20513/Pictures/login-bg.png" + "hdpi" : "unpackage/res/icons/20x20.png", + "xhdpi" : "unpackage/res/icons/20x20.png", + "xxhdpi" : "unpackage/res/icons/20x20.png" } }, "icons" : { diff --git a/src/pages.json b/src/pages.json index 23e56f15..d4c86ae0 100644 --- a/src/pages.json +++ b/src/pages.json @@ -288,8 +288,19 @@ } } ] + }, + { + "root": "pages/wechat", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "邀请福利", + "navigationStyle": "custom" + } + } + ] } - // { // "root": "pages/goods", // "pages": [ @@ -934,4 +945,4 @@ } ] } -} +} \ No newline at end of file diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue index 3c5e2bc8..267c2792 100644 --- a/src/pages/profile/profile.vue +++ b/src/pages/profile/profile.vue @@ -4,10 +4,8 @@ diff --git a/src/pages/user/info.vue b/src/pages/user/info.vue index 00e20a45..31baea27 100644 --- a/src/pages/user/info.vue +++ b/src/pages/user/info.vue @@ -1,33 +1,16 @@