diff --git a/App.vue b/App.vue index 0f71789..70832a0 100644 --- a/App.vue +++ b/App.vue @@ -8,7 +8,7 @@ export default { const updateManager = uni.getUpdateManager() updateManager.onCheckForUpdate(function (res) { // 请求完新版本信息的回调 - console.log(res.hasUpdate) + // console.log(res.hasUpdate) }) // 下载新版本 updateManager.onUpdateReady(function () { diff --git a/manifest.json b/manifest.json index e848873..52aa20c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,301 +1,306 @@ { - "name" : "ZSW", - "appid" : "__UNI__7085CB1", - "description" : "", - "versionName" : "1.0.2", - "versionCode" : 2, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : false, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "OAuth" : {}, - "Payment" : {}, - "Share" : {}, - "Geolocation" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : { - "oauth" : { - "weixin" : { - "appid" : "wx7c84ede33062d1e4", - "appsecret" : "c47ef66d3311194da44e60387d5c1abd", - "UniversalLinks" : "https://yixiang.co/app/" - } - }, - "payment" : { - "weixin" : { - "appid" : "wx7c84ede33062d1e4", - "UniversalLinks" : "https://yixiang.co/app/" - } - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : { - "oauth" : { - "weixin" : { - "appid" : "wx7c84ede33062d1e4", - "appsecret" : "c47ef66d3311194da44e60387d5c1abd", - "UniversalLinks" : "https://yixiang.co/app/" - } - }, - "payment" : { - "weixin" : { - "appid" : "wx7c84ede33062d1e4", - "UniversalLinks" : "https://yixiang.co/app/" - } - }, - "share" : { - "weixin" : { - "appid" : "wx7c84ede33062d1e4", - "UniversalLinks" : "https://yixiang.co/app/" - } - }, - "ad" : {}, - "geolocation" : {} - }, - "splashscreen" : { - "ios" : { - "iphone" : { - "portrait-896h@3x" : "splash/1242+2688.png", - "portrait-896h@2x" : "splash/828+1792.png", - "iphonex" : "splash/1125+2436.png", - "retina55" : "splash/1142+2208.png", - "retina47" : "splash/750+1334.png", - "retina40" : "splash/640+1136.png", - "retina35" : "splash/640+960.png" - } - }, - "android" : { - "hdpi" : "splash/480+762.png", - "xhdpi" : "splash/720+1242.png", - "xxhdpi" : "splash/1080+1882.png" - }, - "iosStyle" : "common" - }, - "icons" : { - "android" : { - "hdpi" : "icons/72x72.png", - "xhdpi" : "icons/96x96.png", - "xxhdpi" : "icons/144x144.png", - "xxxhdpi" : "icons/192x192.png" - }, - "ios" : { - "appstore" : "icons/1024x1024.png", - "ipad" : { - "app" : "icons/76x76.png", - "app@2x" : "icons/152x152.png", - "notification" : "icons/20x20.png", - "notification@2x" : "icons/40x40.png", - "proapp@2x" : "icons/167x167.png", - "settings" : "icons/29x29.png", - "settings@2x" : "icons/58x58.png", - "spotlight" : "icons/40x40.png", - "spotlight@2x" : "icons/80x80.png" - }, - "iphone" : { - "app@2x" : "icons/120x120.png", - "app@3x" : "icons/180x180.png", - "notification@2x" : "icons/40x40.png", - "notification@3x" : "icons/60x60.png", - "settings@2x" : "icons/58x58.png", - "settings@3x" : "icons/87x87.png", - "spotlight@2x" : "icons/80x80.png", - "spotlight@3x" : "icons/120x120.png" - } - } - } - }, - "ad" : {} - }, - "quickapp" : {}, - "mp-weixin" : { - "appid" : "wx604d2ea4702620d2", - "setting" : { - "urlCheck" : true, - "postcss" : true, - "minified" : true - }, - "usingComponents" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "定位最近的门店" - } - }, - "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ] - }, - "splashscreen" : { - "ios" : { - "iphone" : { - "portrait-896h@3x" : "splash/1242+2688.png", - "portrait-896h@2x" : "splash/828+1792.png", - "iphonex" : "splash/1125+2436.png", - "retina55" : "splash/1142+2208.png", - "retina47" : "splash/750+1334.png", - "retina40" : "splash/640+1136.png", - "retina35" : "splash/640+960.png" - } - }, - "android" : { - "hdpi" : "splash/480+762.png", - "xhdpi" : "splash/720+1242.png", - "xxhdpi" : "splash/1080+1882.png" - }, - "iosStyle" : "common" - }, - "icons" : { - "android" : { - "hdpi" : "icons/72x72.png", - "xhdpi" : "icons/96x96.png", - "xxhdpi" : "icons/144x144.png", - "xxxhdpi" : "icons/192x192.png" - }, - "ios" : { - "appstore" : "icons/1024x1024.png", - "ipad" : { - "app" : "icons/76x76.png", - "app@2x" : "icons/152x152.png", - "notification" : "icons/20x20.png", - "notification@2x" : "icons/40x40.png", - "proapp@2x" : "icons/167x167.png", - "settings" : "icons/29x29.png", - "settings@2x" : "icons/58x58.png", - "spotlight" : "icons/40x40.png", - "spotlight@2x" : "icons/80x80.png" - }, - "iphone" : { - "app@2x" : "icons/120x120.png", - "app@3x" : "icons/180x180.png", - "notification@2x" : "icons/40x40.png", - "notification@3x" : "icons/60x60.png", - "settings@2x" : "icons/58x58.png", - "settings@3x" : "icons/87x87.png", - "spotlight@2x" : "icons/80x80.png", - "spotlight@3x" : "icons/120x120.png" - } - } - } - } - }, - "quickapp" : {}, - "mp-weixin" : { - "appid" : "wx2914c96abb4b0be9", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "定位最近的门店" - } - }, - "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ], - "plugins" : {} - }, - // #ifdef MP-WEIXIN - // "live-player-plugin" : { - // "version" : "1.2.8", - // "provider" : "wx2b03c6e691cd7370" - // } - // #endif - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "h5" : { - "title" : "mall", - "devServer" : { - "disableHostCheck" : true, - "proxy" : { - "^/api" : { - "target" : "https://wxapi.yixiang.co", - "changeOrigin" : true, - "secure" : true, - "pathRewrite" : { - "^/api" : "/api" - } - } - } - }, - "router" : { - "mode" : "history" - }, - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "" - } - } - }, - "domain" : "h5.yixiang.co" - } -} + "name": "ZSW", + "appid": "__UNI__7085CB1", + "description": "", + "versionName": "1.0.2", + "versionCode": 2, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": false, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "OAuth": {}, + "Payment": {}, + "Share": {}, + "Geolocation": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": { + "oauth": { + "weixin": { + "appid": "wx7c84ede33062d1e4", + "appsecret": "c47ef66d3311194da44e60387d5c1abd", + "UniversalLinks": "https://yixiang.co/app/" + } + }, + "payment": { + "weixin": { + "appid": "wx7c84ede33062d1e4", + "UniversalLinks": "https://yixiang.co/app/" + } + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": { + "oauth": { + "weixin": { + "appid": "wx7c84ede33062d1e4", + "appsecret": "c47ef66d3311194da44e60387d5c1abd", + "UniversalLinks": "https://yixiang.co/app/" + } + }, + "payment": { + "weixin": { + "appid": "wx7c84ede33062d1e4", + "UniversalLinks": "https://yixiang.co/app/" + } + }, + "share": { + "weixin": { + "appid": "wx7c84ede33062d1e4", + "UniversalLinks": "https://yixiang.co/app/" + } + }, + "ad": {}, + "geolocation": {} + }, + "splashscreen": { + "ios": { + "iphone": { + "portrait-896h@3x": "splash/1242+2688.png", + "portrait-896h@2x": "splash/828+1792.png", + "iphonex": "splash/1125+2436.png", + "retina55": "splash/1142+2208.png", + "retina47": "splash/750+1334.png", + "retina40": "splash/640+1136.png", + "retina35": "splash/640+960.png" + } + }, + "android": { + "hdpi": "splash/480+762.png", + "xhdpi": "splash/720+1242.png", + "xxhdpi": "splash/1080+1882.png" + }, + "iosStyle": "common" + }, + "icons": { + "android": { + "hdpi": "icons/72x72.png", + "xhdpi": "icons/96x96.png", + "xxhdpi": "icons/144x144.png", + "xxxhdpi": "icons/192x192.png" + }, + "ios": { + "appstore": "icons/1024x1024.png", + "ipad": { + "app": "icons/76x76.png", + "app@2x": "icons/152x152.png", + "notification": "icons/20x20.png", + "notification@2x": "icons/40x40.png", + "proapp@2x": "icons/167x167.png", + "settings": "icons/29x29.png", + "settings@2x": "icons/58x58.png", + "spotlight": "icons/40x40.png", + "spotlight@2x": "icons/80x80.png" + }, + "iphone": { + "app@2x": "icons/120x120.png", + "app@3x": "icons/180x180.png", + "notification@2x": "icons/40x40.png", + "notification@3x": "icons/60x60.png", + "settings@2x": "icons/58x58.png", + "settings@3x": "icons/87x87.png", + "spotlight@2x": "icons/80x80.png", + "spotlight@3x": "icons/120x120.png" + } + } + } + }, + "ad": {} + }, + "quickapp": {}, + "mp-weixin": { + "appid": "wx604d2ea4702620d2", + "setting": { + "urlCheck": true, + "postcss": true, + "minified": true + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "定位最近的门店" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"] + }, + "splashscreen": { + "ios": { + "iphone": { + "portrait-896h@3x": "splash/1242+2688.png", + "portrait-896h@2x": "splash/828+1792.png", + "iphonex": "splash/1125+2436.png", + "retina55": "splash/1142+2208.png", + "retina47": "splash/750+1334.png", + "retina40": "splash/640+1136.png", + "retina35": "splash/640+960.png" + } + }, + "android": { + "hdpi": "splash/480+762.png", + "xhdpi": "splash/720+1242.png", + "xxhdpi": "splash/1080+1882.png" + }, + "iosStyle": "common" + }, + "icons": { + "android": { + "hdpi": "icons/72x72.png", + "xhdpi": "icons/96x96.png", + "xxhdpi": "icons/144x144.png", + "xxxhdpi": "icons/192x192.png" + }, + "ios": { + "appstore": "icons/1024x1024.png", + "ipad": { + "app": "icons/76x76.png", + "app@2x": "icons/152x152.png", + "notification": "icons/20x20.png", + "notification@2x": "icons/40x40.png", + "proapp@2x": "icons/167x167.png", + "settings": "icons/29x29.png", + "settings@2x": "icons/58x58.png", + "spotlight": "icons/40x40.png", + "spotlight@2x": "icons/80x80.png" + }, + "iphone": { + "app@2x": "icons/120x120.png", + "app@3x": "icons/180x180.png", + "notification@2x": "icons/40x40.png", + "notification@3x": "icons/60x60.png", + "settings@2x": "icons/58x58.png", + "settings@3x": "icons/87x87.png", + "spotlight@2x": "icons/80x80.png", + "spotlight@3x": "icons/120x120.png" + } + } + } + } + }, + "quickapp": {}, + "mp-weixin": { + "appid": "wx2914c96abb4b0be9", + "setting": { + "urlCheck": false + }, + "usingComponents": {}, + "permission": { + "scope.userLocation": { + "desc": "定位最近的门店" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "plugins": { + "contactPlugin": { + "version": "1.4.7", + "provider": "wx104a1a20c3f81ec2" + } + } + }, + // #ifdef MP-WEIXIN + // "live-player-plugin" : { + // "version" : "1.2.8", + // "provider" : "wx2b03c6e691cd7370" + // } + // #endif + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "h5": { + "title": "mall", + "devServer": { + "disableHostCheck": true, + "proxy": { + "^/api": { + "target": "https://wxapi.yixiang.co", + "changeOrigin": true, + "secure": true, + "pathRewrite": { + "^/api": "/api" + } + } + } + }, + "router": { + "mode": "history" + }, + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "" + } + } + }, + "domain": "h5.yixiang.co" + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 81daf44..b2bd08e 100644 --- a/pages.json +++ b/pages.json @@ -84,7 +84,10 @@ { "path": "pages/user/User/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "我的", + "usingComponents": { + "cell": "plugin://contactPlugin/cell" + } } }, { diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index 2ac4936..77066fa 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -32,8 +32,7 @@ export default { if (!url) { url = handleUrlParam(getCurrentPageUrlWithArgs()) } - console.log(url) - console.log('判断是否是分销') + console.log(url,'判断是否是分销') // 判断是否是分销 if (url) { let urlSpread = parseInt(url.spread) diff --git a/pages/map/index.vue b/pages/map/index.vue index e928ebf..229b8ff 100644 --- a/pages/map/index.vue +++ b/pages/map/index.vue @@ -37,10 +37,8 @@ }, methods: { test(res) { - console.log("res",res) let that = this; if (res.type == "end") { - console.log(this._mapContext) this._mapContext.getCenterLocation({ success(res){ that.refresh(res) @@ -51,7 +49,7 @@ refresh(location){ let that = this; getFishIndex(location).then(res => { - console.log(res.data) + // console.log(res.data) if (res.data) { res.data.forEach(e => { // 需要判断不存在对应标点才继续新增,另外太近标点需要做marker聚合 diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue index ec75844..8728a9c 100644 --- a/pages/user/PersonalData/index.vue +++ b/pages/user/PersonalData/index.vue @@ -26,7 +26,7 @@ 昵称 - + diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index e31b962..59e25cb 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -1,564 +1,515 @@ + .by-text { + text-align: center; + font-size: 24rpx; + } + \ No newline at end of file diff --git a/utils/index.js b/utils/index.js index f831bbd..05ec2fa 100644 --- a/utils/index.js +++ b/utils/index.js @@ -546,7 +546,7 @@ export const handleLoginStatus = (location, complete, fail, success) => { } else { isAuth = true } - console.log(isAuth) + // console.log(isAuth) return new Promise((resolve, reject) => { resolve({ url: parseUrl(location), diff --git a/utils/request.js b/utils/request.js index b03ce50..ea4652b 100644 --- a/utils/request.js +++ b/utils/request.js @@ -71,7 +71,6 @@ function baseRequest(options) { // 合并传参过来的 headers // 如果接口需要登录,携带 token 去请求 -console.log(options) options.headers = { ...options.headers, @@ -109,7 +108,7 @@ console.log(options) if (res.status !== 200) { return Promise.reject({ msg: '请求失败', res, data }) } - console.log(data) + // console.log(data) if ([401, 403].indexOf(data.status) !== -1) { handleLoginFailure() return Promise.reject({ msg: res.data.msg, res, data, toLogin: true })