From 50409cd8c4da8ecd636b2e9798122f5e16dd56da Mon Sep 17 00:00:00 2001 From: 1154079537 <1154079537@qq.com> Date: Fri, 24 May 2024 18:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 5 +- manifest.json | 702 ++++++++++++++--------------- pages/chat/customer_list/chat.vue | 22 +- pages/goods_details/index.vue | 2 +- pages/index/component/homeComb.vue | 46 +- pages/index/index.vue | 14 +- pages/store/settled/index.vue | 13 +- pages/users/user_address/index.vue | 91 +++- store/modules/permission.js | 478 ++++++++++---------- utils/permission.js | 417 ++++++++--------- utils/util.js | 25 +- 11 files changed, 990 insertions(+), 825 deletions(-) diff --git a/config/app.js b/config/app.js index 5a95d14..39f0493 100644 --- a/config/app.js +++ b/config/app.js @@ -16,8 +16,8 @@ let openPlantGrass = '-openPlantGrass-' let httpSix, httpApi; // const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 -const env = 'prew'; // 预上线 +const env = 'prod'; // 生产 +// const env = 'prew'; // 预上线 switch (env) { case 'prod': @@ -77,4 +77,5 @@ module.exports = { TOKENNAME: 'X-Token', // 缓存时间 0 永久 EXPIRE: 0, + AUTH_EXPIRE_TIME: 20 * 1000 //秒 }; \ No newline at end of file diff --git a/manifest.json b/manifest.json index aec1b5c..a587c49 100644 --- a/manifest.json +++ b/manifest.json @@ -1,353 +1,353 @@ { - "name": "惠农生活", - "appid": "__UNI__3A527D1", - "description": "", - "versionName": "2.0.53", - "versionCode": 2053, - "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.26", + "versionCode" : 2026, + "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 + } + } + } } diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue index 136a613..22f16a5 100644 --- a/pages/chat/customer_list/chat.vue +++ b/pages/chat/customer_list/chat.vue @@ -113,7 +113,7 @@
- ￥{{ item.product.price }} + ￥{{ saleType == 1? item.product.price :item.product.wholesale_price}}
{{item.product.store_name}} @@ -271,7 +271,7 @@
- ￥{{ item.product.price }} + ￥{{ saleType == 1? item.product.price :item.product.wholesale_price}}
{{item.product.store_name}} @@ -459,7 +459,7 @@
- ￥{{ item.product.price }} + ￥{{ saleType == 1? item.product.price :item.product.wholesale_price}}
{{item.product.store_name}} @@ -612,7 +612,7 @@
- ￥{{ item.product.price }} + ￥{{ saleType == 1? item.product.price :item.product.wholesale_price}}
{{item.product.store_name}} @@ -718,7 +718,7 @@
{{productInfo.store_name}}
- ￥{{ productInfo.price}} + ￥{{ saleType == 1? productInfo.price :productInfo.wholesale_price}}
发送商品
@@ -957,7 +957,8 @@ httpUrl: '', press: false, index: 0, - j: 0 + j: 0, + saleType: '' }; }, watch: { @@ -983,8 +984,9 @@ this.combinationId = parseInt(option.combinationId) || 0; this.orderId = option.order_id || "" this.mer_id = option.mer_id || 0 - this.refund_order_id = option.refund_order_id || 0 - this.userId = option.userId || 0 + this.refund_order_id = option.refund_order_id || 0; + this.userId = option.userId || 0; + this.saleType = option.sale_type || ''; uni.getSystemInfo({ success: function(res) { self.windowH = res.windowHeight @@ -1006,6 +1008,10 @@ }); }); // #endif + + var isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale + console.log(isWholeSale); + }, onReady() { this.httpUrl = `${HTTP_REQUEST_URL}/static/look.png`; diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index e99fd71..3e245f8 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -1502,7 +1502,7 @@ toLogin() } else { uni.navigateTo({ - url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}` + url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}$sale_type=${that.sale_type}` }); } }, diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue index 10535b7..36d1281 100644 --- a/pages/index/component/homeComb.vue +++ b/pages/index/component/homeComb.vue @@ -69,7 +69,11 @@ } from '@/utils'; import { getGeocoder - } from "@/api/store.js" + } from "@/api/store.js"; + import { + AUTH_EXPIRE_TIME + } from "@/config/app.js"; + import permission from '@/utils/permission'; export default { name: 'homeComb', props: { @@ -135,7 +139,7 @@ isCategory: false, swiperTop: 0, isFixed: true, - street: '' + street: '', }; }, watch: { @@ -230,9 +234,43 @@ methods: { async scanQRcode() { // #ifdef APP-PLUS - let result = await this.$store.dispatch("permission/requestPermissions", - 'CAMERA') + let result = await this.$store.dispatch("permission/requestPermissions", 'CAMERA'); + console.log('权限状态：' + result); + if (result != -1) { + console.log('允许设置...'); + uni.removeStorageSync('expireTimeCamera'); + } else { + const expireTime = uni.getStorageSync('expireTimeCamera'); + console.log('过期时间：' + expireTime); + if (expireTime) { + if ((expireTime + AUTH_EXPIRE_TIME) < +new Date()) { + console.log('时间过期了....') + uni.removeStorageSync('expireTimeCamera'); + uni.showModal({ + title: '提示', + content: '操作权限已被拒绝，请手动前往设置', + confirmText: "立即设置", + success: (res) => { + if (res.confirm) { + permission.gotoAppSetting(); + } else { + // 设置过期时间 + console.log('重置过期时间'); + uni.setStorageSync('expireTimeCamera', +new Date()); + } + } + }) + } else { + console.log('时间还没过期....'); + } + } else { + // 设置一个过期时间 + uni.setStorageSync('expireTimeCamera', +new Date()); + } + } if (result !== 1) return; + // 授权成功移除 + uni.removeStorageSync('expireTimeCamera'); // #endif uni.scanCode({ success: (res) => { diff --git a/pages/index/index.vue b/pages/index/index.vue index 0e55736..b775c67 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,6 +4,7 @@ id="home"> + @@ -399,6 +400,7 @@ import { showTab } from "@/utils/showTab.js"; + import permission from '../../utils/permission'; export default { computed: configMap({ hide_mer_status: 0, @@ -625,7 +627,7 @@ let curRoute = routes[routes.length - 1].route //获取当前页面路由 this.activeRouter = '/' + curRoute }, - onLoad(options) { + async onLoad(options) { let that = this this._options = options; this.diyId = options.diyId || 0; @@ -642,6 +644,16 @@ }) that.pageLoad(options); this.$store.dispatch('INIT_CONFIG'); + + // let result = await this.$store.dispatch("permission/requestPermissions", + // 'ACCESS_FINE_LOCATION') + + + // console.log(result) + + + // permission.gotoAppSetting(); + }, onShow() { diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 277055f..d3dfdcf 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -197,18 +197,21 @@ 电话认证 - - 联系电话 {{formData.phone}} + + 联系电话 + {{formData.phone}} - 验证码 + 验证码 + + :text="text" style="height: 60rpx;"> @@ -258,7 +261,7 @@ 《入驻协议》 - diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue index 6c889d7..de78e89 100644 --- a/pages/users/user_address/index.vue +++ b/pages/users/user_address/index.vue @@ -66,12 +66,11 @@ }