From faa9e290b185678b40bb8898ff79352135e61982 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sun, 28 Apr 2024 18:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=BC=95=E5=AF=BC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/customTab.vue | 23 +- manifest.json | 704 ++++++++++++++++---------------- pages.json | 31 +- static/images/diverPointer.png | Bin 0 -> 1624 bytes static/images/greenLine.png | Bin 0 -> 2227 bytes static/images/greenLineDown.png | Bin 0 -> 2247 bytes static/images/pointer.png | Bin 0 -> 14276 bytes static/images/tabSc.png | Bin 0 -> 1389 bytes store/modules/app.js | 185 ++++----- 9 files changed, 488 insertions(+), 455 deletions(-) create mode 100644 static/images/diverPointer.png create mode 100644 static/images/greenLine.png create mode 100644 static/images/greenLineDown.png create mode 100644 static/images/pointer.png create mode 100644 static/images/tabSc.png diff --git a/components/customTab.vue b/components/customTab.vue index ef96390..3ce94ae 100644 --- a/components/customTab.vue +++ b/components/customTab.vue @@ -3,8 +3,7 @@ - + {{item.name}} @@ -30,7 +29,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- - export default{ + export default { props: { newData: { type: Object, @@ -41,15 +40,15 @@ default: '', } }, - data(){ + data() { return { - + } }, mounted() { - + }, - methods:{ + methods: { goRouter(item) { var pages = getCurrentPages(); var page = (pages[pages.length - 1]).$page.fullPath; @@ -65,7 +64,6 @@ }, } } - + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 858ea67..609b1c0 100644 --- a/manifest.json +++ b/manifest.json @@ -1,353 +1,353 @@ { - "name" : "惠农生活", - "appid" : "__UNI__3A527D1", - "description" : "", - "versionName" : "2.0.37", - "versionCode" : 2037, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "titleNView" : true, - "usingComponents" : true, - "nvueCompiler" : "uni-app", - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "compatible" : { - "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 - }, - "splashscreen" : { - "alwaysShowBeforeRender" : false, - "waiting" : false, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "VideoPlayer" : {}, - "OAuth" : {}, - "Payment" : {}, - "Share" : {}, - "iBeacon" : {}, - "Maps" : {}, - "Geolocation" : {}, - "UniMP" : { - "description" : "uni小程序" - }, - "Push" : {}, - "Barcode" : {}, - "Camera" : {} - }, - "safearea" : { - "bottom" : { - "offset" : "none" - } - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], - "permissionExternalStorage" : { - "request" : "none", - "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" - }, - "permissionPhoneState" : { - "request" : "none" //拨打电话权限关闭 - }, - "minSdkVersion" : 23, - "targetSdkVersion" : 30 - }, - /* ios打包配置 */ - "ios" : { - "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报", - "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", - "NSCameraUsageDescription" : "上传用户头像保存分享海报", - "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", - "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" - }, - "idfa" : false, - "dSYMs" : false - }, - /* SDK配置 */ - "sdkConfigs" : { - "maps" : { - "amap" : { - "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d", - "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945", - "name" : "amapIvoVHpJR" - } - }, - "payment" : { - "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "wx2e8f79ff281284f5", - "UniversalLinks" : "https://shop.lihaink.cn/" - } - }, - "share" : { - "weixin" : { - "appid" : "wx2e8f79ff281284f5", - "UniversalLinks" : "https://shop.lihaink.cn/" - } - }, - "geolocation" : { - "amap" : { - "name" : "amapIvoVHpJR", - "__platform__" : [ "ios", "android" ], - "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d", - "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945" - } - }, - "push" : {}, - "oauth" : { - "weixin" : { - "appid" : "wx2e8f79ff281284f5", - "UniversalLinks" : "https://shop.lihaink.cn/" - }, - "univerify" : {} - }, - "ad" : {} - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - }, - "splashscreen" : { - "useOriginalMsgbox" : true, - "androidStyle" : "common" - } - }, - "nativePlugins" : { - "JG-JCore" : { - "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", - "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3", - "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", - "JPUSH_CHANNEL_ANDROID" : "", - "__plugin_info__" : { - "name" : "JG-JCore", - "description" : "极光推送JCore插件", - "platforms" : "Android,iOS", - "url" : "", - "android_package_name" : "uni.UNI3A527D1", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : { - "JPUSH_APPKEY_IOS" : { - "des" : "[iOS]极光portal配置应用信息时分配的AppKey", - "key" : "JCore:APP_KEY", - "value" : "daebe19b547c43128796a078" - }, - "JPUSH_CHANNEL_IOS" : { - "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", - "key" : "JCore:CHANNEL", - "value" : "" - }, - "JPUSH_APPKEY_ANDROID" : { - "des" : "[Android]极光portal配置应用信息时分配的AppKey", - "key" : "JPUSH_APPKEY", - "value" : "" - }, - "JPUSH_CHANNEL_ANDROID" : { - "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", - "key" : "JPUSH_CHANNEL", - "value" : "" - } - } - } - }, - "JG-JPush" : { - "JPUSH_ISPRODUCTION_IOS" : "true", - "JPUSH_ADVERTISINGID_IOS" : "", - "JPUSH_DEFAULTINITJPUSH_IOS" : "true", - "JPUSH_OPPO_APPKEY" : "", - "JPUSH_OPPO_APPID" : "", - "JPUSH_OPPO_APPSECRET" : "", - "JPUSH_VIVO_APPKEY" : "", - "JPUSH_VIVO_APPID" : "", - "JPUSH_MEIZU_APPKEY" : "", - "JPUSH_MEIZU_APPID" : "", - "JPUSH_XIAOMI_APPKEY" : "", - "JPUSH_XIAOMI_APPID" : "", - "__plugin_info__" : { - "name" : "JG-JPush", - "description" : "极光推送Hbuilder插件", - "platforms" : "Android,iOS", - "url" : "", - "android_package_name" : "uni.UNI3A527D1", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : { - "JPUSH_ISPRODUCTION_IOS" : { - "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", - "key" : "JPush:ISPRODUCTION", - "value" : "" - }, - "JPUSH_ADVERTISINGID_IOS" : { - "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", - "key" : "JPush:ADVERTISINGID", - "value" : "" - }, - "JPUSH_DEFAULTINITJPUSH_IOS" : { - "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", - "key" : "JPush:DEFAULTINITJPUSH", - "value" : "" - }, - "JPUSH_OPPO_APPKEY" : { - "des" : "厂商OPPO-appkey,示例：OP-12345678", - "key" : "OPPO_APPKEY", - "value" : "" - }, - "JPUSH_OPPO_APPID" : { - "des" : "厂商OPPO-appId,示例：OP-12345678", - "key" : "OPPO_APPID", - "value" : "" - }, - "JPUSH_OPPO_APPSECRET" : { - "des" : "厂商OPPO-appSecret,示例：OP-12345678", - "key" : "OPPO_APPSECRET", - "value" : "" - }, - "JPUSH_VIVO_APPKEY" : { - "des" : "厂商VIVO-appkey,示例：12345678", - "key" : "com.vivo.push.api_key", - "value" : "" - }, - "JPUSH_VIVO_APPID" : { - "des" : "厂商VIVO-appId,示例：12345678", - "key" : "com.vivo.push.app_id", - "value" : "" - }, - "JPUSH_MEIZU_APPKEY" : { - "des" : "厂商MEIZU-appKey,示例：MZ-12345678", - "key" : "MEIZU_APPKEY", - "value" : "" - }, - "JPUSH_MEIZU_APPID" : { - "des" : "厂商MEIZU-appId,示例：MZ-12345678", - "key" : "MEIZU_APPID", - "value" : "" - }, - "JPUSH_XIAOMI_APPKEY" : { - "des" : "厂商XIAOMI-appKey,示例：MI-12345678", - "key" : "XIAOMI_APPKEY", - "value" : "" - }, - "JPUSH_XIAOMI_APPID" : { - "des" : "厂商XIAOMI-appId,示例：MI-12345678", - "key" : "XIAOMI_APPID", - "value" : "" - } - } - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wx5fb1cc8edb3f8baa", - "setting" : { - "urlCheck" : false, - "minified" : true, - "postcss" : true, - "es6" : true - }, - "permission" : { - "scope.userLocation" : { - "desc" : "获取您的位置" - } - }, - "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], - "usingComponents" : true, - "__usePrivacyCheck__" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "h5" : { - "devServer" : { - "https" : false - }, - "router" : { - "mode" : "history", - "base" : "" - }, - "domain" : "", - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7" - } - } - }, - "title" : "加载中...", - "template" : "template.h5.html", - "optimization" : { - "treeShaking" : { - "enable" : true - } - } - } -} + "name": "惠农生活", + "appid": "__UNI__3A527D1", + "description": "", + "versionName": "2.0.60", + "versionCode": 2037, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "titleNView": true, + "usingComponents": true, + "nvueCompiler": "uni-app", + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "compatible": { + "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 + }, + "splashscreen": { + "alwaysShowBeforeRender": false, + "waiting": false, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "VideoPlayer": {}, + "OAuth": {}, + "Payment": {}, + "Share": {}, + "iBeacon": {}, + "Maps": {}, + "Geolocation": {}, + "UniMP": { + "description": "uni小程序" + }, + "Push": {}, + "Barcode": {}, + "Camera": {} + }, + "safearea": { + "bottom": { + "offset": "none" + } + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], + "permissionExternalStorage": { + "request": "none", + "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" + }, + "permissionPhoneState": { + "request": "none" //拨打电话权限关闭 + }, + "minSdkVersion": 23, + "targetSdkVersion": 30 + }, + /* ios打包配置 */ + "ios": { + "privacyDescription": { + "NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报", + "NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报", + "NSCameraUsageDescription": "上传用户头像保存分享海报", + "NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店", + "NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店" + }, + "idfa": false, + "dSYMs": false + }, + /* SDK配置 */ + "sdkConfigs": { + "maps": { + "amap": { + "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d", + "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945", + "name": "amapIvoVHpJR" + } + }, + "payment": { + "weixin": { + "__platform__": ["ios", "android"], + "appid": "wx2e8f79ff281284f5", + "UniversalLinks": "https://shop.lihaink.cn/" + } + }, + "share": { + "weixin": { + "appid": "wx2e8f79ff281284f5", + "UniversalLinks": "https://shop.lihaink.cn/" + } + }, + "geolocation": { + "amap": { + "name": "amapIvoVHpJR", + "__platform__": ["ios", "android"], + "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d", + "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945" + } + }, + "push": {}, + "oauth": { + "weixin": { + "appid": "wx2e8f79ff281284f5", + "UniversalLinks": "https://shop.lihaink.cn/" + }, + "univerify": {} + }, + "ad": {} + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen": { + "useOriginalMsgbox": true, + "androidStyle": "common" + } + }, + "nativePlugins": { + "JG-JCore": { + "JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3", + "JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3", + "JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e", + "JPUSH_CHANNEL_ANDROID": "", + "__plugin_info__": { + "name": "JG-JCore", + "description": "极光推送JCore插件", + "platforms": "Android,iOS", + "url": "", + "android_package_name": "uni.UNI3A527D1", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": { + "JPUSH_APPKEY_IOS": { + "des": "[iOS]极光portal配置应用信息时分配的AppKey", + "key": "JCore:APP_KEY", + "value": "daebe19b547c43128796a078" + }, + "JPUSH_CHANNEL_IOS": { + "des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default", + "key": "JCore:CHANNEL", + "value": "" + }, + "JPUSH_APPKEY_ANDROID": { + "des": "[Android]极光portal配置应用信息时分配的AppKey", + "key": "JPUSH_APPKEY", + "value": "" + }, + "JPUSH_CHANNEL_ANDROID": { + "des": "[Android]用于统计分发渠道，不需要可填默认值developer-default", + "key": "JPUSH_CHANNEL", + "value": "" + } + } + } + }, + "JG-JPush": { + "JPUSH_ISPRODUCTION_IOS": "true", + "JPUSH_ADVERTISINGID_IOS": "", + "JPUSH_DEFAULTINITJPUSH_IOS": "true", + "JPUSH_OPPO_APPKEY": "", + "JPUSH_OPPO_APPID": "", + "JPUSH_OPPO_APPSECRET": "", + "JPUSH_VIVO_APPKEY": "", + "JPUSH_VIVO_APPID": "", + "JPUSH_MEIZU_APPKEY": "", + "JPUSH_MEIZU_APPID": "", + "JPUSH_XIAOMI_APPKEY": "", + "JPUSH_XIAOMI_APPID": "", + "__plugin_info__": { + "name": "JG-JPush", + "description": "极光推送Hbuilder插件", + "platforms": "Android,iOS", + "url": "", + "android_package_name": "uni.UNI3A527D1", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": { + "JPUSH_ISPRODUCTION_IOS": { + "des": "[iOS]是否是生产环境，是填true，不是填false或者不填", + "key": "JPush:ISPRODUCTION", + "value": "" + }, + "JPUSH_ADVERTISINGID_IOS": { + "des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", + "key": "JPush:ADVERTISINGID", + "value": "" + }, + "JPUSH_DEFAULTINITJPUSH_IOS": { + "des": "[iOS]是否默认初始化，是填true，不是填false或者不填", + "key": "JPush:DEFAULTINITJPUSH", + "value": "" + }, + "JPUSH_OPPO_APPKEY": { + "des": "厂商OPPO-appkey,示例：OP-12345678", + "key": "OPPO_APPKEY", + "value": "" + }, + "JPUSH_OPPO_APPID": { + "des": "厂商OPPO-appId,示例：OP-12345678", + "key": "OPPO_APPID", + "value": "" + }, + "JPUSH_OPPO_APPSECRET": { + "des": "厂商OPPO-appSecret,示例：OP-12345678", + "key": "OPPO_APPSECRET", + "value": "" + }, + "JPUSH_VIVO_APPKEY": { + "des": "厂商VIVO-appkey,示例：12345678", + "key": "com.vivo.push.api_key", + "value": "" + }, + "JPUSH_VIVO_APPID": { + "des": "厂商VIVO-appId,示例：12345678", + "key": "com.vivo.push.app_id", + "value": "" + }, + "JPUSH_MEIZU_APPKEY": { + "des": "厂商MEIZU-appKey,示例：MZ-12345678", + "key": "MEIZU_APPKEY", + "value": "" + }, + "JPUSH_MEIZU_APPID": { + "des": "厂商MEIZU-appId,示例：MZ-12345678", + "key": "MEIZU_APPID", + "value": "" + }, + "JPUSH_XIAOMI_APPKEY": { + "des": "厂商XIAOMI-appKey,示例：MI-12345678", + "key": "XIAOMI_APPKEY", + "value": "" + }, + "JPUSH_XIAOMI_APPID": { + "des": "厂商XIAOMI-appId,示例：MI-12345678", + "key": "XIAOMI_APPID", + "value": "" + } + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wx5fb1cc8edb3f8baa", + "setting": { + "urlCheck": false, + "minified": true, + "postcss": true, + "es6": true + }, + "permission": { + "scope.userLocation": { + "desc": "获取您的位置" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseAddress"], + "usingComponents": true, + "__usePrivacyCheck__": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "h5": { + "devServer": { + "https": false + }, + "router": { + "mode": "history", + "base": "" + }, + "domain": "", + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7" + } + } + }, + "title": "加载中...", + "template": "template.h5.html", + "optimization": { + "treeShaking": { + "enable": true + } + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index a4cd27f..9420c40 100644 --- a/pages.json +++ b/pages.json @@ -19,7 +19,19 @@ "enablePullDownRefresh": true, // #endif "app-plus": { - "scrollIndicator": false //禁用原生导航栏 + "scrollIndicator": false, //禁用原生导航栏 + "subNVues": [{ + "id": "concatIndex", // 唯一标识 + "path": "pages/index/subnvue/concat", // 页面路径 + "type": "popup", + "style": { + "position": "absolute", + "dock": "right", + "width": "750rpx", + "height": "1000px", + "background": "rgba(0,0,0,0.2)" + } + }] } } }, { @@ -34,7 +46,22 @@ "style": { "enablePullDownRefresh": true, "navigationBarTitleText": "工作台", - "navigationStyle": "custom" + "navigationStyle": "custom", + "app-plus": { + "scrollIndicator": false, //禁用原生导航栏 + "subNVues": [{ + "id": "concat", // 唯一标识 + "path": "pages/gather/subnvue/concat", // 页面路径 + "type": "popup", + "style": { + "position": "absolute", + "dock": "right", + "width": "750rpx", + "height": "1500rpx", + "background": "rgba(0,0,0,0.2)" + } + }] + } } }, { "path": "pages/order_addcart/order_addcart", diff --git a/static/images/diverPointer.png b/static/images/diverPointer.png new file mode 100644 index 0000000000000000000000000000000000000000..edd4fadaff553ae7e1b93400b6ccaf9ce81eeaa6 GIT binary patch literal 1624 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 VP_qTAGK~NL002ovPDHLkV1kJ&G;RO@ literal 0 HcmV?d00001 diff --git a/static/images/pointer.png b/static/images/pointer.png new file mode 100644 index 0000000000000000000000000000000000000000..9570f99f8d6299dd5721ad021b28b9d2c0f48d94 GIT binary patch literal 14276 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 JOwT3qe*qds0{Z{} literal 0 HcmV?d00001 diff --git a/static/images/tabSc.png b/static/images/tabSc.png new file mode 100644 index 0000000000000000000000000000000000000000..5a4ff90032134957aaab28a111d1e6affdd13677 GIT binary patch literal 1389 zcmV-z1(N!SP)Px)CrLy>RA@u(Sy56OIS`e`nBR~StU1Aw6U3Y#aDp{eNX6fp6OcVY;E$51iaEiW z69i5W=LBI-5d1rKjaF}}H6bG*FinPypb9s+iHdOGBsUvSQcE$6^7AC*$KDZruuft7y0 z|AljY5PAXFGR7R=+}zwZtrbFyIOm^3=ivV~0w!APlbE$w6AefR@wEm9o|_g$@q~jA ze()$`>4hqF#DD;AWtZ_%yxPN1fz&a#+mStbakUQ%D zoWZ1&-x*^FDVFE?+sR~7hHKYjL-f(++aDCx`=MeJ1IQ1zW2MwIWCR%xW8a`aXszFZ z>D}Gk9|ZD2Yu#4eo*nOpdra8H07AI@g}1~U=&TV!+`Gh9O7R+Nt+`WoR;`Hqqm+V! zTb~#}6+`O+WQ$qQFlVvPkgbSSKDHr>0aPU>W9(chbr}LTbv4*8Dq}7F1l3!+47DegxoDlJY(!zp6A1u$cO?&Wf*q}Dqac7g& znY8hkgNiOg1XZpUK2Yb4s=Pt0wkngRD2WC{p$EN&BrPwx$fr^S{v{c+*BJA#SS*fW zm~rPN0dkvgH&|wl$eR^obt7$6x?3z3BWDm;VvIrlRKl}i55($yQ52IH?N;CaB0w?T z-PD?u08u3>MQFn_ZxgXXh*pMP+Nr)c+B>%Ak2BB+=`P|X%x?(f4 zz1P$V*sGNM!R91}D0e=E4D!*@e4v#5LWm!UdmEd?u5gY9)YLYk3ZZOs&VOnHY*|Lv zSysaaar%J7Z!ipuqi{S6;}i`U1;|&*WW;Tr=i{z$Smk1+iyUo=YZ9X+R}>(d#2Aj0 z{YzKd?0b9_K;HFG=|RR=u)~eYA^(QQK*P4vp+ZpFvkpL1fS@R58UaP+0|82EFq0UHX@Omg+mW%MB2wj@_uEWs{VtRb zl#A8qE5@NQfT}T;e@S*3Q@gVo)pnL;!I2a(lr;JZ0wOO}v#}6MRGH8=m(|esYAqjv zgF`>uq1@ekZ)K&>FpnPFS=&|pU}_Jb)yjcBl!QNj^UE;pgPFLts*f#Q=Nuhrp68b#*-znz86VjA2^eyw*XxZ# zv+TNkNeua$At0B_o_jKrwg7Ce~~L vZNlp*@7yw!;;l`r-7>TZucy58)iLxxQdnGKxQFVo00000NkvXXu0mjfF?EmE literal 0 HcmV?d00001 diff --git a/store/modules/app.js b/store/modules/app.js index 6d58ea6..294527c 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -9,17 +9,19 @@ // +---------------------------------------------------------------------- import { getUserInfo, - Appversion + Appversion } from "../../api/user.js"; import { LOGIN_STATUS, UID, - USER_INFO + USER_INFO } from '../../config/cache'; import Cache from '../../utils/cache'; // #ifdef APP-PLUS import Updater from '@/uni_modules/guyue-updater/index'; -import { Toast } from "../../libs/uniApi.js"; +import { + Toast +} from "../../libs/uniApi.js"; // #endif @@ -28,42 +30,44 @@ const state = { token: Cache.get(LOGIN_STATUS) || null, uuid: uni.getStorageSync('uuid') || "", backgroundColor: "#fff", - userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get('USER_INFO'))||{}, + userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get( + 'USER_INFO')) || {}, uid: Cache.get(UID) || null, globalData: uni.getStorageSync('GLOBAL_DATA') || {}, homeActive: false, copyPwd: null, - pageFooter:uni.getStorageSync('pageFoot') || {}, + pageFooter: uni.getStorageSync('pageFoot') || {}, keyColor: Cache.get('KEY_COLOR') || '_default', - viewColor: Cache.get('VIEW_COLOR') || '--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;', + viewColor: Cache.get('VIEW_COLOR') || + '--view-theme: #E93323;--view-assist:#FF7612;--view-priceColor:#E93323;--view-bgColor:rgba(255, 118, 18,.1);--view-minorColor:rgba(233, 51, 35,.1);--view-bntColor11:#FDA923;--view-bntColor12:#FD6523;--view-bntColor21:#F11B09;--view-bntColor22:#F67A38;', }; const mutations = { - setLocation(state, data) { - state.location = data - Cache.set('LOCATION_DATA', data); - }, + setLocation(state, data) { + state.location = data + Cache.set('LOCATION_DATA', data); + }, LOGIN(state, opt) { state.token = opt.token; Cache.set(LOGIN_STATUS, opt.token, opt.time); uni.removeStorageSync('auth_token'); }, - SET_USERINFO(state, opt){ - state.userInfo = opt; - Cache.set(USER_INFO, opt); - }, - SETUID(state,val){ + SET_USERINFO(state, opt) { + state.userInfo = opt; + Cache.set(USER_INFO, opt); + }, + SETUID(state, val) { state.uid = val; Cache.set(UID, val); }, - SETUUID(state,val){ + SETUUID(state, val) { state.uuid = val; uni.setStorageSync('uuid', val) }, UPDATE_LOGIN(state, token) { state.token = token; }, - + LOGOUT(state) { state.token = null; state.uid = null @@ -99,7 +103,7 @@ const mutations = { uni.setStorageSync('GLOBAL_DATA', key); state.globalData = key; }, - FOOT_UPLOAD(state,data){ + FOOT_UPLOAD(state, data) { state.pageFooter = data } }; @@ -122,78 +126,77 @@ const actions = { }); }, - async INIT_CONFIG({ - state, - commit - }, data = false) { - if(data) { - uni.showLoading({ - title: '加载中' - }) - await uni.$u.sleep(500) - } - - // #ifdef APP-PLUS - let os = uni.getSystemInfoSync(); - let apptype; - if (os.osName == 'ios') { - apptype = 2 - } else { - apptype = 1 - } - console.log({ - version: os.appWgtVersion, - type: apptype, - phone_brand:os.brand - }); - Appversion({ - version: os.appWgtVersion, - type: apptype, - phone_brand:os.brand - }).then((res) => { - console.log(res); - if(data) uni.hideLoading() - if (Object.keys(res.data.appInfo).length > 0) { - // if(res.data.appInfo.version) uni.showLoading({ - // title: '检查更新中' - // }) - // 版本更新 - if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) { - try { - let info = res.data.appInfo || {}; - let version = { - title: info.title || '发现新版本', - content: info.content || '修复了部分BUG', - versionName: info.version || '1.0.1', - brand:res.data.appInfo.phone_brand, - downUrl: info.dow_url || '', - force: info.force == 1 ? true : false, // 是否强制更新 - quiet: info.quiet == 1 ? true : false // 是否静默更新 - } - Updater.update(version,res.data.appInfo); - } catch (e) { - console.log(e); - Toast(e) - } - // uni.hideLoading(); - } - else { - if(data) Toast('已经是最新版本了') - } - - } else { - if(data) Toast('已经是最新版本了') - } - }).catch((err) => { - console.log(err); - if(data) uni.hideLoading() - Toast(err.msg||err.message||err) - // console.log(err) - }) - - - // #endif - } + async INIT_CONFIG({ + state, + commit + }, data = false) { + if (data) { + uni.showLoading({ + title: '加载中' + }) + await uni.$u.sleep(500) + } + + // #ifdef APP-PLUS + let os = uni.getSystemInfoSync(); + let apptype; + if (os.osName == 'ios') { + apptype = 2 + } else { + apptype = 1 + } + // console.log({ + // version: os.appWgtVersion, + // type: apptype, + // phone_brand:os.brand + // }); + Appversion({ + version: os.appWgtVersion, + type: apptype, + phone_brand: os.brand + }).then((res) => { + // console.log(res); + if (data) uni.hideLoading() + if (Object.keys(res.data.appInfo).length > 0) { + // if(res.data.appInfo.version) uni.showLoading({ + // title: '检查更新中' + // }) + // 版本更新 + if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) { + try { + let info = res.data.appInfo || {}; + let version = { + title: info.title || '发现新版本', + content: info.content || '修复了部分BUG', + versionName: info.version || '1.0.1', + brand: res.data.appInfo.phone_brand, + downUrl: info.dow_url || '', + force: info.force == 1 ? true : false, // 是否强制更新 + quiet: info.quiet == 1 ? true : false // 是否静默更新 + } + Updater.update(version, res.data.appInfo); + } catch (e) { + console.log(e); + Toast(e) + } + // uni.hideLoading(); + } else { + if (data) Toast('已经是最新版本了') + } + + } else { + if (data) Toast('已经是最新版本了') + } + }).catch((err) => { + console.log(err); + if (data) uni.hideLoading() + Toast(err.msg || err.message || err) + // console.log(err) + }) + + + // #endif + } }; function compareVersions(version1, version2) { @@ -216,4 +219,4 @@ export default { state, mutations, actions -}; +}; \ No newline at end of file