From ed54b943544ea5bc27a5aa212eaccaf96df778e5 Mon Sep 17 00:00:00 2001 From: 1154079537 <1154079537@qq.com> Date: Sat, 11 May 2024 14:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 702 ++++++++++++++-------------- pages/chat/customer_list/index.vue | 191 ++++---- pages/cloud_warehouse/home/home.vue | 181 ++++--- pages/index/index.vue | 3 - pages/whole_sale/index.vue | 6 +- utils/mixin.js | 39 +- 6 files changed, 607 insertions(+), 515 deletions(-) diff --git a/manifest.json b/manifest.json index 49ba7da..838486c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,352 +1,352 @@ { - "name": "惠农生活", - "appid": "__UNI__3A527D1", - "description": "", - "versionName": "2.0.52", - "versionCode": 2052, - "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/" - } - }, - "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 + "name" : "惠农生活", + "appid" : "__UNI__3A527D1", + "description" : "", + "versionName" : "2.0.52", + "versionCode" : 2052, + "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/" + } + }, + "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/index.vue b/pages/chat/customer_list/index.vue index cbecb88..0b6ae8e 100644 --- a/pages/chat/customer_list/index.vue +++ b/pages/chat/customer_list/index.vue @@ -12,10 +12,11 @@ [表情] [图片] [商品] - [订单] + [订单] - {{item.last && item.last.create_time.split(' ')[1] || ''}} + {{item.display_time}} {{item.num}} @@ -23,18 +24,21 @@
{{item.user && item.user.nickname}} {{item.last.msn}} [表情] [图片] - [商品] - [订单] + [商品] + [订单] - {{item.last && item.last.create_time.split(' ')[1]}} + {{item.display_time}} {{item.num}}
@@ -57,12 +61,19 @@ // +---------------------------------------------------------------------- import emptyPage from '@/components/emptyPage.vue' - import { serviceList, serviceUserList } from "@/api/user"; - import { toLogin } from '@/libs/login.js'; - import { mapGetters } from "vuex"; + import { + serviceList, + serviceUserList + } from "@/api/user"; + import { + toLogin + } from '@/libs/login.js'; + import { + mapGetters + } from "vuex"; export default { name: "CustomerList", - components:{ + components: { emptyPage, }, data() { @@ -70,125 +81,125 @@ list: [], productId: 0, orderId: "", - type: 0 ,// 0 用户 1客服 + type: 0, // 0 用户 1客服 timer: null, - page:1, - limit:9999, + page: 1, + limit: 9999, mer_id: '', loading: false, clear: false, }; }, - computed: mapGetters(['isLogin','viewColor']), + computed: mapGetters(['isLogin', 'viewColor']), onLoad(optios) { this.type = optios.type; this.mer_id = optios.mer_id; - if(this.isLogin){ + if (this.isLogin) { this.getList(this.mer_id) } else { toLogin() } }, onShow(option) { - if(this.isLogin){ + if (this.isLogin) { this.liveUpdate(); } else { toLogin() } }, - onHide(){ - if(this.timer) { - clearInterval(this.timer); - this.timer = null; - } + onHide() { + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } this.clear = true; }, onUnload() { - if(this.timer) { - clearInterval(this.timer); - this.timer = null; - } + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } this.clear = true; }, methods: { - getList(mer_id) { + getList(mer_id) { this.loading = true; - if(this.type == 0){ + if (this.type == 0) { serviceList({ - page:this.page, - limit:this.limit + page: this.page, + limit: this.limit }).then(res => { this.list = res.data.list; - if(res.status == 400){ + if (res.status == 400) { clearInterval(this.timer); - this.timer = null; - return this.$util.Tips({ - title: res.message - }) - } - }).finally(v=>{ - this.loading = false; - return this.$util.Tips({ - title: v - }) - }).catch(err => { - return this.$util.Tips({ - title: err - }) - }); - }else{ - serviceUserList(mer_id,{ - page:this.page, - limit:this.limit - }).then(res =>{ - this.list = res.data.list; - if(res.status == 400){ - clearInterval(this.timer); - this.timer = null; + this.timer = null; return this.$util.Tips({ title: res.message }) } - }).finally(v=>{ + }).finally(v => { + this.loading = false; + return this.$util.Tips({ + title: v + }) + }).catch(err => { + return this.$util.Tips({ + title: err + }) + }); + } else { + serviceUserList(mer_id, { + page: this.page, + limit: this.limit + }).then(res => { + this.list = res.data.list; + if (res.status == 400) { + clearInterval(this.timer); + this.timer = null; + return this.$util.Tips({ + title: res.message + }) + } + }).finally(v => { this.loading = false; clearInterval(this.timer); - this.timer = null; + this.timer = null; return this.$util.Tips({ title: v }) }).catch(err => { clearInterval(this.timer); - this.timer = null; + this.timer = null; return this.$util.Tips({ title: err }) }); - } + } }, //实时刷新列表 - liveUpdate(){ + liveUpdate() { let that = this; this.clear = false; - if(that.timer) { + if (that.timer) { clearInterval(that.timer); - that.timer = null; - } - that.timer = setInterval(function(){ - if(that.clear){ + that.timer = null; + } + that.timer = setInterval(function() { + if (that.clear) { clearInterval(that.timer); - return ; + return; } // 用户 (!that.loading) && that.getList(that.mer_id); - },5000); + }, 5000); }, goPage(item) { item.num = 0; - if(this.type == 0){ + if (this.type == 0) { uni.navigateTo({ url: `/pages/chat/customer_list/chat?mer_id=${item.mer_id}` }) - }else{ + } else { uni.navigateTo({ url: `/pages/chat/customer_list/chat?userId=${item.user.uid}&mer_id=${item.mer_id}` }) @@ -207,7 +218,8 @@ transform: rotate(180deg); font-size: 36rpx; } - .popupn{ + + .popupn { position: fixed; width: 100%; text-align: center; @@ -217,65 +229,78 @@ height: 90rpx; line-height: 90rpx; z-index: 100; - .title{ + + .title { max-width: 560rpx; margin: 0 auto; position: relative; } - .iconfont{ + + .iconfont { display: inline-block; position: relative; top: 4rpx; right: 0; } - .mer_logo{ + + .mer_logo { width: 34rpx; height: 34rpx; position: relative; top: 6rpx; - right: 10px; + right: 10px; } - .mer_name{ + + .mer_name { display: inline-block; max-width: 650rpx; } - .invoice-content{ + + .invoice-content { background-color: #ffffff; } } - .list_count{ + + .list_count { margin-top: 104rpx; } + .item { align-items: center; border-bottom: 1px solid #eee; padding: 20rpx 30rpx; background-color: #fff; - .logo image{ + + .logo image { width: 88rpx; height: 88rpx; border-radius: 50%; } - .info{ + + .info { width: 334rpx; margin-left: 20rpx; - .con{ + + .con { margin-top: 10rpx; color: #999999; font-size: 24rpx; } } - .right-box{ + + .right-box { flex: 1; display: flex; flex-direction: column; align-items: flex-end; font-size: 20rpx; color: #BBBBBB; - .time{ + + .time { margin-bottom: 10rpx; } - .num{ + + .num { min-width: 6px; background-color: var(--view-theme); border-radius: 15px; @@ -287,4 +312,4 @@ } } } - + \ No newline at end of file diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue index 620f484..9ffda1d 100644 --- a/pages/cloud_warehouse/home/home.vue +++ b/pages/cloud_warehouse/home/home.vue @@ -6,18 +6,15 @@ .wholeSale { background-color: #f8fafb !important; - .wholeSale-header-search-wrap { - padding: 30rpx 20rpx 0; - background-color: #fff; - } + + .wholeSale-header { - position: fixed; - width: 100%; + position: sticky; top: 0; - left: 0; - background-color: #40AE36; z-index: 100; + margin-bottom: 20rpx; + background-color: #40AE36; .scrollview { display: flex; @@ -52,62 +49,61 @@ } } - .wholeSale-category { - margin: 0 20rpx 20rpx; + .wholeSale-section { + padding: 0rpx 20rpx; background-color: #fff; - border-radius: 10rpx; - padding: 20rpx 20rpx 1rpx 20rpx; + transition: height .5s; + overflow: hidden; - .wholeSale-search { + .wholeSale-nav { display: flex; align-items: center; - margin-bottom: 40rpx; + margin-bottom: 20rpx; .icon { margin-right: 20rpx; } - } - .search_content { - flex: 1; - height: 70rpx; - padding: 2px 2px 2px 21.05rpx; - border-radius: 80rpx; - background: #EDEFF2; - position: relative; - box-sizing: border-box; + .search_content { + flex: 1; + height: 70rpx; + padding: 2px 2px 2px 21.05rpx; + border-radius: 80rpx; + background: #EDEFF2; + position: relative; + box-sizing: border-box; - .search_content_wrap { - width: 100%; + .search_content_wrap { + width: 100%; - .icon-sousuo { - font-size: 26.32rpx; - font-weight: bold; - color: #c8c7c6; - margin-right: 17.54rpx; + .icon-sousuo { + font-size: 26.32rpx; + font-weight: bold; + color: #c8c7c6; + margin-right: 17.54rpx; + } + + input { + width: 80%; + } } - input { - width: 80%; + .search_btn { + width: 106rpx; + height: 60rpx; + line-height: 60rpx; + background: #40AE36; + border-radius: 100px; + font-size: 28rpx; + color: #fff; } } - - .search_btn { - width: 106rpx; - height: 60rpx; - line-height: 60rpx; - background: #40AE36; - border-radius: 100px; - font-size: 28rpx; - color: #fff; - } } .category { width: 100%; - overflow: hidden; + overflow: auto; margin-bottom: 20rpx; - transition: height .8s; .category-wrap { display: flex; @@ -181,18 +177,49 @@ } } } + } .wholeSale-con { + height: 100vh; margin: 0 20rpx; padding-bottom: 30rpx; } + + .comprehensive { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 50rpx; + + [class^=comprehensive-] { + display: flex; + align-items: center; + + text { + margin-right: 12rpx; + font-size: 26rpx; + color: #666666; + } + + image { + width: 28rpx; + height: 28rpx; + } + + .loudou { + width: 24rpx; + height: 24rpx; + } + } + } } @@ -288,8 +317,9 @@ deduction_rate: '', //抵扣比例 rand: 1 }, - distance: 20, - scrollTop: 0 + wrapHeight: 'auto', + maxHeight: '', + scrollTop: 0, } }, onLoad(option) { @@ -301,16 +331,30 @@ }, onPageScroll(e) { uni.$emit('scroll'); - - this.scrollTop = e.scrollTop; - - - }, onPullDownRefresh() { this.getProductslist(true); }, + methods: { + + refresh(e) { + console.log(e); + }, + + onScrollBottom(e) { + this.getProductslist(); + }, + + onScroll(e) { + if (this.scrollTop > e.target.scrollTop) { //上拉 + this.wrapHeight = '352rpx'; + } else { + this.wrapHeight = 0; + } + this.scrollTop = e.target.scrollTop; + }, + navTo(url) { uni.navigateTo({ url: url, @@ -324,9 +368,11 @@ } }) }, + navBack() { uni.navigateBack(); }, + tabsChange(e) { this.tabsCurr = e; }, @@ -348,6 +394,11 @@ if (e == 0) this.where.cate_pid = this.store_category[this.cate_change] .store_category_id; // 如若选中全部, 则取父级id this.getProductslist(true); + + this.$util.getDom(this, '.wholeSale-section', (res) => { + this.maxHeight = res.height + 'px'; + }) + }, getStoreCategory() { getStoreCategory(259).then(res => { @@ -361,13 +412,13 @@ cate_name: '全部', store_category_id: '' }) - }) - // 分类 - this.$nextTick(() => { - this.$util.getDom(this, '.wholeSale-category', (res) => { - this.categoryHeight = res.height; - }) + setTimeout(() => { + this.$util.getDom(this, '.wholeSale-section', (res) => { + this.wrapHeight = res.height + 'px'; + this.maxHeight = res.height; + }) + }, 300) }) }, getProductslist(reLoad = false) { diff --git a/pages/index/index.vue b/pages/index/index.vue index b49b590..09b9bf6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1094,9 +1094,6 @@ this.loadGoods(e); }, loadGoods(e = 1) { - - console.log(e); - this.$nextTick(() => { if (e == 1) return this.get_host_product(0); if (e == 2) return this.get_host_home({ diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue index c27fd89..313095b 100644 --- a/pages/whole_sale/index.vue +++ b/pages/whole_sale/index.vue @@ -265,7 +265,7 @@ limit: 20, sale_type: 2, //1为零售, 2为批发 mer_type: 1, - mer_cate_pid: '', // + cate_pid: '', // cate_id: '', keyword: '', deduction_rate: '', //抵扣比例 @@ -422,7 +422,7 @@ store_category_id: '' }) this.cate_change_children = 0; - if (this.tabsCurr == 1) this.where.mer_cate_pid = this.store_category[e].store_category_id; + if (this.tabsCurr == 1) this.where.cate_pid = this.store_category[e].store_category_id; else { this.where.cate_pid = this.store_category[e].store_category_id; this.where.cate_id = ""; @@ -436,7 +436,7 @@ }, changeChildrenCate(e) { this.cate_change_children = e; - let key = 'mer_cate_pid'; + let key = 'cate_pid'; if (this.tabsCurr != 1) key = 'cate_id'; this.where[key] = this.store_category_children[e].store_category_id; if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id diff --git a/utils/mixin.js b/utils/mixin.js index f4015f6..55948cb 100644 --- a/utils/mixin.js +++ b/utils/mixin.js @@ -1,20 +1,39 @@ const mixins = { data() { return { - totalHeight: 0, - scrollInfo: undefined, - userMoney: undefined + wrapHeight: 'auto', + clientY: 0, + maxHeight: 0, } }, - // 顶部导航栏透明滚动 - onPageScroll(e) { - this.scrollInfo = e; - }, - methods: { - getPageScroll() { - this.$utils.getDom(); + watch: { + 'where.cate_pid'(newVal, oldVal) { + // if (newVal && !oldVal) { + // this.wrapHeight = this.wrapHeight + 24; + // this.maxHeight = this.wrapHeight; + // } + // if (!newVal && oldVal) { + // this.wrapHeight = this.wrapHeight - 24; + // this.maxHeight = this.wrapHeight; + // } } + }, + methods: { + // 移动 + onTouchMove(e) { + // const moveDistance = e.changedTouches[0].clientY - this.clientY; + // if (moveDistance > 5) { + // this.wrapHeight = this.maxHeight; + // } else { + // this.wrapHeight = 0; + // } + }, + + // 开始触摸屏幕 + onTouchStart(e) { + // this.clientY = e.changedTouches[0].clientY; + }, } } export default mixins; \ No newline at end of file