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 0000000..edd4fad Binary files /dev/null and b/static/images/diverPointer.png differ diff --git a/static/images/greenLine.png b/static/images/greenLine.png new file mode 100644 index 0000000..f7d7d09 Binary files /dev/null and b/static/images/greenLine.png differ diff --git a/static/images/greenLineDown.png b/static/images/greenLineDown.png new file mode 100644 index 0000000..46cc650 Binary files /dev/null and b/static/images/greenLineDown.png differ diff --git a/static/images/pointer.png b/static/images/pointer.png new file mode 100644 index 0000000..9570f99 Binary files /dev/null and b/static/images/pointer.png differ diff --git a/static/images/tabSc.png b/static/images/tabSc.png new file mode 100644 index 0000000..5a4ff90 Binary files /dev/null and b/static/images/tabSc.png differ 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