diff --git a/config/api.js b/config/api.js index e66b463..22ca38d 100644 --- a/config/api.js +++ b/config/api.js @@ -4,10 +4,10 @@ */ // 开发环境 const dev = { - // common: 'http://192.168.0.109:8890', - // buyer: 'http://192.168.0.109:8888', - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + // common: "https://common-api.pickmall.cn", + // buyer: "https://buyer-api.pickmall.cn", }; // 生产环境 const prod = { diff --git a/config/config.js b/config/config.js index 0e26422..e1cf681 100644 --- a/config/config.js +++ b/config/config.js @@ -7,4 +7,6 @@ export default { appid: "wx6f10f29075dc1b0b", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态) appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看 aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key -}; + scanAuthNavigation:['https://m-b2b2c.pickmall.cn'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 + iosAppId:"id1564638363" //AppStore的应用地址id 具体在分享->拷贝链接中查看 +}; diff --git a/manifest.json b/manifest.json index bf13897..58cb276 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.0.16", - "versionCode" : 4000016, + "versionName" : "4.0.18", + "versionCode" : 4000018, "transformPx" : false, "app-plus" : { "compatible" : { @@ -82,7 +82,7 @@ "weixin" : { "__platform__" : [ "ios", "android" ], "appid" : "wx32788b91bdb614c0", - "UniversalLinks" : "gapp/" + "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/" }, "alipay" : { "__platform__" : [ "ios", "android" ] diff --git a/pages.json b/pages.json index 0920b5b..91a1c48 100644 --- a/pages.json +++ b/pages.json @@ -180,12 +180,7 @@ } }, - { - "path": "aboutUs", - "style": { - "navigationBarTitleText": "关于我们" - } - }, { + { "path": "address/address", "style": { "enablePullDownRefresh": true, @@ -243,7 +238,7 @@ { "path": "set/editionIntro", "style": { - "navigationBarTitleText": "版本说明" + "navigationBarTitleText": "关于我们" } }, { diff --git a/pages/mine/aboutUs.vue b/pages/mine/aboutUs.vue deleted file mode 100644 index 67daa12..0000000 --- a/pages/mine/aboutUs.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue index ebc7579..c158c6a 100644 --- a/pages/mine/set/editionIntro.vue +++ b/pages/mine/set/editionIntro.vue @@ -1,27 +1,47 @@ // TODO 第一版本暂无此功能 后续优化以及更新 diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue index 77db428..dda62d9 100644 --- a/pages/mine/set/setUp.vue +++ b/pages/mine/set/setUp.vue @@ -3,7 +3,7 @@ - + {{ userInfo.id ? userInfo.nickName || '' : '暂未登录' }} @@ -18,10 +18,8 @@ - - - + {{userInfo.id ?'退出登录':'返回登录'}} @@ -30,9 +28,11 @@