Loki/fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

👍 bug处理

Browse Source
This commit is contained in:
Boom
2023-11-27 16:46:45 +08:00
parent 3a33d65d6b
commit 9c0105f141
9 changed files with 801 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App.vue
+1 -1
View File
@@ -8,7 +8,7 @@ export default {
const updateManager = uni.getUpdateManager() const updateManager = uni.getUpdateManager()
updateManager.onCheckForUpdate(function (res) { updateManager.onCheckForUpdate(function (res) {
// 请求完新版本信息的回调 // 请求完新版本信息的回调
console.log(res.hasUpdate) // console.log(res.hasUpdate)
}) })
// 下载新版本 // 下载新版本
updateManager.onUpdateReady(function () { updateManager.onUpdateReady(function () {
manifest.json
+305 -300
View File
@@ -1,301 +1,306 @@
{ {
"name" : "ZSW", "name": "ZSW",
"appid" : "__UNI__7085CB1", "appid": "__UNI__7085CB1",
"description" : "", "description": "",
"versionName" : "1.0.2", "versionName": "1.0.2",
"versionCode" : 2, "versionCode": 2,
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueCompiler" : "uni-app", "nvueCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : false, "waiting": false,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"OAuth" : {}, "OAuth": {},
"Payment" : {}, "Payment": {},
"Share" : {}, "Share": {},
"Geolocation" : {} "Geolocation": {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>", "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>", "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : {}, "ios": {},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"oauth" : { "oauth": {
"weixin" : { "weixin": {
"appid" : "wx7c84ede33062d1e4", "appid": "wx7c84ede33062d1e4",
"appsecret" : "c47ef66d3311194da44e60387d5c1abd", "appsecret": "c47ef66d3311194da44e60387d5c1abd",
"UniversalLinks" : "https://yixiang.co/app/" "UniversalLinks": "https://yixiang.co/app/"
} }
}, },
"payment" : { "payment": {
"weixin" : { "weixin": {
"appid" : "wx7c84ede33062d1e4", "appid": "wx7c84ede33062d1e4",
"UniversalLinks" : "https://yixiang.co/app/" "UniversalLinks": "https://yixiang.co/app/"
} }
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>" "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : {}, "ios": {},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"oauth" : { "oauth": {
"weixin" : { "weixin": {
"appid" : "wx7c84ede33062d1e4", "appid": "wx7c84ede33062d1e4",
"appsecret" : "c47ef66d3311194da44e60387d5c1abd", "appsecret": "c47ef66d3311194da44e60387d5c1abd",
"UniversalLinks" : "https://yixiang.co/app/" "UniversalLinks": "https://yixiang.co/app/"
} }
}, },
"payment" : { "payment": {
"weixin" : { "weixin": {
"appid" : "wx7c84ede33062d1e4", "appid": "wx7c84ede33062d1e4",
"UniversalLinks" : "https://yixiang.co/app/" "UniversalLinks": "https://yixiang.co/app/"
} }
}, },
"share" : { "share": {
"weixin" : { "weixin": {
"appid" : "wx7c84ede33062d1e4", "appid": "wx7c84ede33062d1e4",
"UniversalLinks" : "https://yixiang.co/app/" "UniversalLinks": "https://yixiang.co/app/"
} }
}, },
"ad" : {}, "ad": {},
"geolocation" : {} "geolocation": {}
}, },
"splashscreen" : { "splashscreen": {
"ios" : { "ios": {
"iphone" : { "iphone": {
"portrait-896h@3x" : "splash/1242+2688.png", "portrait-896h@3x": "splash/1242+2688.png",
"portrait-896h@2x" : "splash/828+1792.png", "portrait-896h@2x": "splash/828+1792.png",
"iphonex" : "splash/1125+2436.png", "iphonex": "splash/1125+2436.png",
"retina55" : "splash/1142+2208.png", "retina55": "splash/1142+2208.png",
"retina47" : "splash/750+1334.png", "retina47": "splash/750+1334.png",
"retina40" : "splash/640+1136.png", "retina40": "splash/640+1136.png",
"retina35" : "splash/640+960.png" "retina35": "splash/640+960.png"
} }
}, },
"android" : { "android": {
"hdpi" : "splash/480+762.png", "hdpi": "splash/480+762.png",
"xhdpi" : "splash/720+1242.png", "xhdpi": "splash/720+1242.png",
"xxhdpi" : "splash/1080+1882.png" "xxhdpi": "splash/1080+1882.png"
}, },
"iosStyle" : "common" "iosStyle": "common"
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "icons/72x72.png", "hdpi": "icons/72x72.png",
"xhdpi" : "icons/96x96.png", "xhdpi": "icons/96x96.png",
"xxhdpi" : "icons/144x144.png", "xxhdpi": "icons/144x144.png",
"xxxhdpi" : "icons/192x192.png" "xxxhdpi": "icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "icons/1024x1024.png", "appstore": "icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "icons/76x76.png", "app": "icons/76x76.png",
"app@2x" : "icons/152x152.png", "app@2x": "icons/152x152.png",
"notification" : "icons/20x20.png", "notification": "icons/20x20.png",
"notification@2x" : "icons/40x40.png", "notification@2x": "icons/40x40.png",
"proapp@2x" : "icons/167x167.png", "proapp@2x": "icons/167x167.png",
"settings" : "icons/29x29.png", "settings": "icons/29x29.png",
"settings@2x" : "icons/58x58.png", "settings@2x": "icons/58x58.png",
"spotlight" : "icons/40x40.png", "spotlight": "icons/40x40.png",
"spotlight@2x" : "icons/80x80.png" "spotlight@2x": "icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "icons/120x120.png", "app@2x": "icons/120x120.png",
"app@3x" : "icons/180x180.png", "app@3x": "icons/180x180.png",
"notification@2x" : "icons/40x40.png", "notification@2x": "icons/40x40.png",
"notification@3x" : "icons/60x60.png", "notification@3x": "icons/60x60.png",
"settings@2x" : "icons/58x58.png", "settings@2x": "icons/58x58.png",
"settings@3x" : "icons/87x87.png", "settings@3x": "icons/87x87.png",
"spotlight@2x" : "icons/80x80.png", "spotlight@2x": "icons/80x80.png",
"spotlight@3x" : "icons/120x120.png" "spotlight@3x": "icons/120x120.png"
} }
} }
} }
}, },
"ad" : {} "ad": {}
}, },
"quickapp" : {}, "quickapp": {},
"mp-weixin" : { "mp-weixin": {
"appid" : "wx604d2ea4702620d2", "appid": "wx604d2ea4702620d2",
"setting" : { "setting": {
"urlCheck" : true, "urlCheck": true,
"postcss" : true, "postcss": true,
"minified" : true "minified": true
}, },
"usingComponents" : true, "usingComponents": true,
"permission" : { "permission": {
"scope.userLocation" : { "scope.userLocation": {
"desc" : "定位最近的门店" "desc": "定位最近的门店"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ] "requiredPrivateInfos": ["getLocation", "chooseLocation"]
}, },
"splashscreen" : { "splashscreen": {
"ios" : { "ios": {
"iphone" : { "iphone": {
"portrait-896h@3x" : "splash/1242+2688.png", "portrait-896h@3x": "splash/1242+2688.png",
"portrait-896h@2x" : "splash/828+1792.png", "portrait-896h@2x": "splash/828+1792.png",
"iphonex" : "splash/1125+2436.png", "iphonex": "splash/1125+2436.png",
"retina55" : "splash/1142+2208.png", "retina55": "splash/1142+2208.png",
"retina47" : "splash/750+1334.png", "retina47": "splash/750+1334.png",
"retina40" : "splash/640+1136.png", "retina40": "splash/640+1136.png",
"retina35" : "splash/640+960.png" "retina35": "splash/640+960.png"
} }
}, },
"android" : { "android": {
"hdpi" : "splash/480+762.png", "hdpi": "splash/480+762.png",
"xhdpi" : "splash/720+1242.png", "xhdpi": "splash/720+1242.png",
"xxhdpi" : "splash/1080+1882.png" "xxhdpi": "splash/1080+1882.png"
}, },
"iosStyle" : "common" "iosStyle": "common"
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "icons/72x72.png", "hdpi": "icons/72x72.png",
"xhdpi" : "icons/96x96.png", "xhdpi": "icons/96x96.png",
"xxhdpi" : "icons/144x144.png", "xxhdpi": "icons/144x144.png",
"xxxhdpi" : "icons/192x192.png" "xxxhdpi": "icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "icons/1024x1024.png", "appstore": "icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "icons/76x76.png", "app": "icons/76x76.png",
"app@2x" : "icons/152x152.png", "app@2x": "icons/152x152.png",
"notification" : "icons/20x20.png", "notification": "icons/20x20.png",
"notification@2x" : "icons/40x40.png", "notification@2x": "icons/40x40.png",
"proapp@2x" : "icons/167x167.png", "proapp@2x": "icons/167x167.png",
"settings" : "icons/29x29.png", "settings": "icons/29x29.png",
"settings@2x" : "icons/58x58.png", "settings@2x": "icons/58x58.png",
"spotlight" : "icons/40x40.png", "spotlight": "icons/40x40.png",
"spotlight@2x" : "icons/80x80.png" "spotlight@2x": "icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "icons/120x120.png", "app@2x": "icons/120x120.png",
"app@3x" : "icons/180x180.png", "app@3x": "icons/180x180.png",
"notification@2x" : "icons/40x40.png", "notification@2x": "icons/40x40.png",
"notification@3x" : "icons/60x60.png", "notification@3x": "icons/60x60.png",
"settings@2x" : "icons/58x58.png", "settings@2x": "icons/58x58.png",
"settings@3x" : "icons/87x87.png", "settings@3x": "icons/87x87.png",
"spotlight@2x" : "icons/80x80.png", "spotlight@2x": "icons/80x80.png",
"spotlight@3x" : "icons/120x120.png" "spotlight@3x": "icons/120x120.png"
} }
} }
} }
} }
}, },
"quickapp" : {}, "quickapp": {},
"mp-weixin" : { "mp-weixin": {
"appid" : "wx2914c96abb4b0be9", "appid": "wx2914c96abb4b0be9",
"setting" : { "setting": {
"urlCheck" : false "urlCheck": false
}, },
"usingComponents" : true, "usingComponents": {},
"permission" : { "permission": {
"scope.userLocation" : { "scope.userLocation": {
"desc" : "定位最近的门店" "desc": "定位最近的门店"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ], "requiredPrivateInfos": ["getLocation", "chooseLocation"],
"plugins" : {} "plugins": {
}, "contactPlugin": {
// #ifdef MP-WEIXIN "version": "1.4.7",
// "live-player-plugin" : { "provider": "wx104a1a20c3f81ec2"
// "version" : "1.2.8", }
// "provider" : "wx2b03c6e691cd7370" }
// } },
// #endif // #ifdef MP-WEIXIN
"mp-alipay" : { // "live-player-plugin" : {
"usingComponents" : true // "version" : "1.2.8",
}, // "provider" : "wx2b03c6e691cd7370"
"mp-baidu" : { // }
"usingComponents" : true // #endif
}, "mp-alipay": {
"mp-toutiao" : { "usingComponents": true
"usingComponents" : true },
}, "mp-baidu": {
"h5" : { "usingComponents": true
"title" : "mall", },
"devServer" : { "mp-toutiao": {
"disableHostCheck" : true, "usingComponents": true
"proxy" : { },
"^/api" : { "h5": {
"target" : "https://wxapi.yixiang.co", "title": "mall",
"changeOrigin" : true, "devServer": {
"secure" : true, "disableHostCheck": true,
"pathRewrite" : { "proxy": {
"^/api" : "/api" "^/api": {
} "target": "https://wxapi.yixiang.co",
} "changeOrigin": true,
} "secure": true,
}, "pathRewrite": {
"router" : { "^/api": "/api"
"mode" : "history" }
}, }
"sdkConfigs" : { }
"maps" : { },
"qqmap" : { "router": {
"key" : "" "mode": "history"
} },
} "sdkConfigs": {
}, "maps": {
"domain" : "h5.yixiang.co" "qqmap": {
} "key": ""
} }
}
},
"domain": "h5.yixiang.co"
}
}
pages.json
+4 -1
View File
@@ -84,7 +84,10 @@
{ {
"path": "pages/user/User/index", "path": "pages/user/User/index",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的",
"usingComponents": {
"cell": "plugin://contactPlugin/cell"
}
} }
}, },
{ {
pages/Loading/index.vue
+1 -2
View File
@@ -32,8 +32,7 @@ export default {
if (!url) { if (!url) {
url = handleUrlParam(getCurrentPageUrlWithArgs()) url = handleUrlParam(getCurrentPageUrlWithArgs())
} }
console.log(url) console.log(url,'判断是否是分销')
console.log('判断是否是分销')
// 判断是否是分销 // 判断是否是分销
if (url) { if (url) {
let urlSpread = parseInt(url.spread) let urlSpread = parseInt(url.spread)
pages/map/index.vue
+1 -3
View File
@@ -37,10 +37,8 @@
}, },
methods: { methods: {
test(res) { test(res) {
console.log("res",res)
let that = this; let that = this;
if (res.type == "end") { if (res.type == "end") {
console.log(this._mapContext)
this._mapContext.getCenterLocation({ this._mapContext.getCenterLocation({
success(res){ success(res){
that.refresh(res) that.refresh(res)
@@ -51,7 +49,7 @@
refresh(location){ refresh(location){
let that = this; let that = this;
getFishIndex(location).then(res => { getFishIndex(location).then(res => {
console.log(res.data) // console.log(res.data)
if (res.data) { if (res.data) {
res.data.forEach(e => { res.data.forEach(e => {
// 需要判断不存在对应标点才继续新增,另外太近标点需要做marker聚合 // 需要判断不存在对应标点才继续新增,另外太近标点需要做marker聚合
pages/user/PersonalData/index.vue
+1 -1
View File
@@ -26,7 +26,7 @@
<view class="item acea-row row-between-wrapper"> <view class="item acea-row row-between-wrapper">
<view>昵称</view> <view>昵称</view>
<view class="input"> <view class="input">
<input type="text" v-model="userInfo.nickname" /> <input type="nickname" v-model="userInfo.nickname" />
</view> </view>
</view> </view>
<view class="item acea-row row-between-wrapper"> <view class="item acea-row row-between-wrapper">
pages/user/User/index.vue
+486 -535
View File
File diff suppressed because it is too large Load Diff
utils/index.js
+1 -1
View File
@@ -546,7 +546,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
} else { } else {
isAuth = true isAuth = true
} }
console.log(isAuth) // console.log(isAuth)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
resolve({ resolve({
url: parseUrl(location), url: parseUrl(location),
utils/request.js
+1 -2
View File
@@ -71,7 +71,6 @@ function baseRequest(options) {
// 合并传参过来的 headers // 合并传参过来的 headers
// 如果接口需要登录，携带 token 去请求 // 如果接口需要登录，携带 token 去请求
console.log(options)
options.headers = { options.headers = {
...options.headers, ...options.headers,
@@ -109,7 +108,7 @@ console.log(options)
if (res.status !== 200) { if (res.status !== 200) {
return Promise.reject({ msg: '请求失败', res, data }) return Promise.reject({ msg: '请求失败', res, data })
} }
console.log(data) // console.log(data)
if ([401, 403].indexOf(data.status) !== -1) { if ([401, 403].indexOf(data.status) !== -1) {
handleLoginFailure() handleLoginFailure()
return Promise.reject({ msg: res.data.msg, res, data, toLogin: true }) return Promise.reject({ msg: res.data.msg, res, data, toLogin: true })