-
+
@@ -112,9 +113,9 @@
-
+
-
+
@@ -167,37 +168,38 @@
-
-
-
- 其他方式登录
- 微信快捷登录
-
-
+
+
+
+ 其他方式登录
+ 微信快捷登录
+
+
\ No newline at end of file
diff --git a/pages/index/component/swiperBg.vue b/pages/index/component/swiperBg.vue
index cb048de..74abbea 100644
--- a/pages/index/component/swiperBg.vue
+++ b/pages/index/component/swiperBg.vue
@@ -29,11 +29,6 @@
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cfd2f40..3f99db3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -654,8 +654,9 @@
},
},
onPullDownRefresh() {
- this.overflow = true;
- this.reconnect();
+ // this.overflow = true;
+ // this.reconnect();
+ // that.overflow = true;
// #ifdef APP-PLUS
setTimeout(() => {
this.hotPage = 1;
@@ -1046,21 +1047,19 @@
if (that.loading || that.loadend) return;
that.loading = true;
that.loadTitle = '';
- getProductslist(that.where)
- .then(res => {
- let list = res.data.list;
- let productList = that.$util.SplitArray(list, that.sortProduct);
- let loadend = list.length < that.where.limit;
- that.loadend = loadend;
- that.loading = false;
- that.loadTitle = loadend ? '已全部加载' : '加载更多';
- that.$set(that, 'sortProduct', productList);
- that.$set(that.where, 'page', that.where.page + 1);
- })
- .catch(err => {
- that.loading = false;
- that.loadTitle = '加载更多';
- });
+ getProductslist(that.where).then(res => {
+ let list = res.data.list;
+ let productList = that.$util.SplitArray(list, that.sortProduct);
+ let loadend = list.length < that.where.limit;
+ that.loadend = loadend;
+ that.loading = false;
+ that.loadTitle = loadend ? '已全部加载' : '加载更多';
+ that.$set(that, 'sortProduct', productList);
+ that.$set(that.where, 'page', that.where.page + 1);
+ }).catch(err => {
+ that.loading = false;
+ that.loadTitle = '加载更多';
+ });
},
/**
* 点击组件选项卡
@@ -1094,11 +1093,11 @@
let num = that.hotLimit;
if (!that.hotScroll) return;
if (that.hotLoading[e]) return;
-
+
that.hotLoading[e] = true;
that.hotTitle = '加载中';
getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
- console.log(res)
+ uni.stopPullDownRefresh();
res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list;
let productList = that.hostProduct;
@@ -1133,6 +1132,7 @@
getProductslist({
...query
}).then(res => {
+ uni.stopPullDownRefresh();
res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list;
let productList = that.hostProduct;
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 389fdc6..a5f39ed 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -286,7 +286,6 @@
-
-
From 0f6fdff8fe6a50e68ad34bd1824a6c41ac32cb5e Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Mon, 29 Apr 2024 17:17:57 +0800
Subject: [PATCH 04/36] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9=20?=
=?UTF-8?q?=20=E9=80=80=E6=AC=BE=E8=8A=82=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 --
manifest.json | 4 ++--
pages/goods_details/index.vue | 16 ++--------------
pages/users/order_list/index.vue | 9 ++++-----
pages/users/refund/confirm.vue | 2 +-
5 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/App.vue b/App.vue
index 3705ce8..eb29ee3 100644
--- a/App.vue
+++ b/App.vue
@@ -537,7 +537,6 @@
/*#endif*/
// 圆形指示点
.circular {
-
/deep/.uni-swiper-dot,
/deep/.wx-swiper-dot {
width: 10rpx;
@@ -553,7 +552,6 @@
// 方形指示点
.square {
-
/deep/.uni-swiper-dot,
/deep/.wx-swiper-dot {
width: 20rpx;
diff --git a/manifest.json b/manifest.json
index 8f5f632..c059140 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "2.0.39",
- "versionCode" : 2039,
+ "versionName" : "2.0.41",
+ "versionCode" : 2041,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 0d553ff..d5b93c1 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -87,7 +87,6 @@
-
积分最高可抵扣{{storeInfo.max_integral}}元
@@ -158,12 +157,7 @@
{{storeInfo.store_info}}
-
+
@@ -269,17 +263,11 @@
:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
hover-class="none" class="info">
- {{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
+ {{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
-
-
-
- {{item.orderList[0].merchant.mer_name}}
-
+ {{item.orderList[0].merchant.mer_name}}
@@ -215,8 +213,8 @@
-
- {{item.merchant.mer_name}}
+
+ {{item.merchant.mer_name}}
@@ -1106,6 +1104,7 @@
}
.store-name {
+ max-width: 400rpx;
margin: 0 10rpx;
}
diff --git a/pages/users/refund/confirm.vue b/pages/users/refund/confirm.vue
index 49080c8..71772cf 100644
--- a/pages/users/refund/confirm.vue
+++ b/pages/users/refund/confirm.vue
@@ -61,7 +61,7 @@
- 申请退款
+ 申请退款
From 448be8de75741f2acf73ceddb965733deba0eeae Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Tue, 30 Apr 2024 17:56:02 +0800
Subject: [PATCH 05/36] =?UTF-8?q?=E6=96=87=E5=AD=97=E9=95=BF=E5=BA=A6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 702 ++---
pages/chat/customer_list/chat.vue | 4180 +++++++++++++++--------------
2 files changed, 2505 insertions(+), 2377 deletions(-)
diff --git a/manifest.json b/manifest.json
index c059140..4c7d746 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,352 +1,352 @@
{
- "name" : "惠农生活",
- "appid" : "__UNI__3A527D1",
- "description" : "",
- "versionName" : "2.0.41",
- "versionCode" : 2041,
- "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
- }
- }
- }
-}
+ "name": "惠农生活",
+ "appid": "__UNI__3A527D1",
+ "description": "",
+ "versionName": "2.0.44",
+ "versionCode": 2044,
+ "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
diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index 8358e16..257fe40 100644
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@@ -1,2037 +1,2165 @@
-
-
-
-
-
- {{storeInfo.mer_name}}
-
-
- 进店
-
-
-
-
-
-
-
-
-
- {{items.time}}
-
-
-
-
-
-
-
对方撤回了一条消息
+
+
+
+
+
+ {{storeInfo.mer_name}}
+
+
+ 进店
+
+
+
+
+
+
+
+
+
+
+ {{items.time}}
+
+
+
+
+
+
+
+
对方撤回了一条消息
-
-
-
-
-
- 退款单号：{{ item.refundOrder.refund_order_sn }}
-
-
-
-
-
-
-
- {{item.refundOrder.refund_num}}件商品
-
-
-
-
{{val.product.cart_info.product.store_name}}
-
- ￥{{ item.refundOrder.refund_price }}
-
-
-
-
-
-
-
-
- 订单号：{{ item.orderInfo.order_sn }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.orderInfo.total_num}}件商品
-
-
-
-
{{val.cart_info.product.store_name}}
-
- ￥{{ item.orderInfo.pay_price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.product.price }}
-
-
{{item.product.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.presell.price }}
-
-
{{item.presell.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.productGroup.product.price }}
-
-
{{item.productGroup.product.store_name}}
-
-
-
-
-
-
-
-
-
-
- {{item.msn}}
-
+
+
+
+
+
+ 退款单号：{{ item.refundOrder.refund_order_sn }}
+
+
+
+
+
+
+
+ {{item.refundOrder.refund_num}}件商品
+
+
+
+
+ {{val.product.cart_info.product.store_name}}
+
+
+ ￥{{ item.refundOrder.refund_price }}
+
+
+
+
+
+
+
+
+ 订单号：{{ item.orderInfo.order_sn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.orderInfo.total_num}}件商品
+
+
+
+
+ {{val.cart_info.product.store_name}}
+
+
+ ￥{{ item.orderInfo.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.product.price }}
+
+
+ {{item.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.presell.price }}
+
+
+ {{item.presell.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.productGroup.product.price }}
+
+
+ {{item.productGroup.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+ {{item.msn}}
+
-
-
-
-
-
-
-
-
-
-
-
- 订单号：{{ item.refundOrder.refund_order_sn }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.refundOrder.refund_num}}件商品
-
-
-
-
{{val.product.cart_info.product.store_name}}
-
- ￥{{ item.refundOrder.refund_price }}
-
-
-
-
-
-
-
-
- 订单号：{{ item.orderInfo.order_sn }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.orderInfo.total_num}}件商品
-
-
-
-
{{val.cart_info.product.store_name}}
-
- ￥{{ item.orderInfo.pay_price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.product.price }}
-
-
{{item.product.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.presell.price }}
-
-
{{item.presell.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.productGroup.product.price }}
-
-
{{item.productGroup.product.store_name}}
-
-
-
-
-
-
-
-
-
-
- {{item.msn}}
-
-
-
-
-
-
- 复制
-
-
-
-
-
- 复制
-
-
-
-
- 撤回
-
-
-
-
-
-
-
-
你撤回了一条消息
-
-
-
-
-
- {{items.time}}
-
-
-
-
-
-
-
对方撤回了一条消息
-
-
-
-
-
-
- 退款单号：{{ item.refundOrder.refund_order_sn }}
-
-
-
-
-
-
-
-
- {{item.refundOrder.refund_num}}件商品
-
-
-
-
{{val.product.cart_info.product.store_name}}
-
- ￥{{ val.product.cart_info.productAttr.price }}
-
-
-
-
-
-
-
-
- 订单号：{{ item.orderInfo.order_sn }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.orderInfo.total_num}}件商品
-
-
-
-
{{val.cart_info.product.store_name}}
-
- ￥{{ item.orderInfo.pay_price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.product.price }}
-
-
{{item.product.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.presell.price }}
-
-
{{item.presell.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.productGroup.product.price }}
-
-
{{item.productGroup.product.store_name}}
-
-
-
-
-
-
-
-
-
-
- {{item.msn}}
-
+
+
+
+
+
+
+
+
+
+ 订单号：{{ item.refundOrder.refund_order_sn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.refundOrder.refund_num}}件商品
+
+
+
+
+ {{val.product.cart_info.product.store_name}}
+
+
+ ￥{{ item.refundOrder.refund_price }}
+
+
+
+
+
+
+
+
+ 订单号：{{ item.orderInfo.order_sn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.orderInfo.total_num}}件商品
+
+
+
+
+ {{val.cart_info.product.store_name}}
+
+
+ ￥{{ item.orderInfo.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.product.price }}
+
+
+ {{item.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.presell.price }}
+
+
+ {{item.presell.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.productGroup.product.price }}
+
+
+ {{item.productGroup.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+ {{item.msn}}
+
+
+
+
+
+
+ 复制
+
+
+
+
+
+ 复制
+
+
+
+
+ 撤回
+
+
+
+
+
+
+
+
你撤回了一条消息
+
+
+
+ {{items.time}}
+
+
+
+
+
+
+
对方撤回了一条消息
+
+
+
+
+
+
+ 退款单号：{{ item.refundOrder.refund_order_sn }}
+
+
+
+
+
+
+
+
+ {{item.refundOrder.refund_num}}件商品
+
+
+
+
+ {{val.product.cart_info.product.store_name}}
+
+
+ ￥{{ val.product.cart_info.productAttr.price }}
+
+
+
+
+
+
+
+
+ 订单号：{{ item.orderInfo.order_sn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.orderInfo.total_num}}件商品
+
+
+
+
+ {{val.cart_info.product.store_name}}
+
+
+ ￥{{ item.orderInfo.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.product.price }}
+
+
+ {{item.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.presell.price }}
+
+
+ {{item.presell.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.productGroup.product.price }}
+
+
+ {{item.productGroup.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+ {{item.msn}}
+
-
-
-
-
-
-
-
-
-
- 退款单号：{{ item.refundOrder.refund_order_sn }}
-
-
-
-
-
-
-
-
- {{item.refundOrder.refund_num}}件商品
-
-
-
-
{{val.product.cart_info.product.store_name}}
-
- 共{{item.refundOrder.refund_num}}件商品，
- 合计 ￥{{ item.refundOrder.refund_price }}
-
-
-
-
-
-
-
-
- 订单号：{{ item.orderInfo.order_sn }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.orderInfo.total_num}}件商品
-
-
-
-
{{val.cart_info.product.store_name}}
-
- ￥{{ item.orderInfo.pay_price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.product.price }}
-
-
{{item.product.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.presell.price }}
-
-
{{item.presell.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{ item.productGroup.product.price }}
-
-
{{item.productGroup.product.store_name}}
-
-
-
-
-
-
-
-
-
-
- {{ item.msn }}
-
-
-
-
-
-
- 复制
-
-
-
-
-
- 复制
-
-
-
-
- 撤回
-
-
-
-
-
-
-
-
你撤回了一条消息
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 退款单号：{{ item.refundOrder.refund_order_sn }}
+
+
+
+
+
+
+
+
+ {{item.refundOrder.refund_num}}件商品
+
+
+
+
+ {{val.product.cart_info.product.store_name}}
+
+
+ 共{{item.refundOrder.refund_num}}件商品，
+ 合计 ￥{{ item.refundOrder.refund_price }}
+
+
+
+
+
+
+
+
+ 订单号：{{ item.orderInfo.order_sn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.orderInfo.total_num}}件商品
+
+
+
+
+ {{val.cart_info.product.store_name}}
+
+
+ ￥{{ item.orderInfo.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.product.price }}
+
+
+ {{item.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.presell.price }}
+
+
+ {{item.presell.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{ item.productGroup.product.price }}
+
+
+ {{item.productGroup.product.store_name}}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.msn }}
+
+
+
+
+
+
+ 复制
+
+
+
+
+
+ 复制
+
+
+
+
+ 撤回
+
+
+
+
+
+
+
+
你撤回了一条消息
+
+
+
+
+
+
+
+
+
+
@@ -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
From a250b604f3650b7c25679b71a39ba5952b213df0 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Sat, 11 May 2024 14:48:40 +0800
Subject: [PATCH 22/36] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/users/order_list/index.vue | 42 ++++++++++++++++----------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 37e377a..991901c 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -665,26 +665,7 @@
uni.navigateBack();
},
- changeSaleType(type = 1) {
- if (type != this.sale_type) {
- this.loadend = false;
- this.loading = false;
- this.$set(this, 'orderList', []);
- if (this.orderStatus == 4) {
- this.refundParam.identity = type;
- this.refundParam.page = 1;
- this.getRefundList();
- } else {
- this.sale_type = type;
- this.page = 1;
- this.getOrderData();
- this.getOrderList();
- this.getUserInfo();
- this.getpreSellOrderList();
- }
- }
- },
// 去商铺
goMall(item) {
if (this.hide_mer_status == 0) {
@@ -901,11 +882,30 @@
}
},
+ changeSaleType(type = 1) {
+ if (this.sale_type == type) return;
+
+ this.loadend = false;
+ this.loading = false;
+ this.$set(this, 'orderList', []);
+
+ if (this.orderStatus == 4) {
+ this.refundParam.identity = type;
+ this.refundParam.page = 1;
+ this.getRefundList();
+ } else {
+ this.page = 1;
+ this.getOrderData();
+ this.getOrderList();
+ this.getUserInfo();
+ this.getpreSellOrderList();
+ }
+ this.sale_type = type;
+ },
+
// 获取退款列表
getRefundList() {
let that = this;
- console.log(that.loadend);
- console.log(that.loading);
if (that.loadend) return;
if (that.loading) return;
that.loading = true;
From 1f1392cc1d29b3f4d98a6906e2aaf85d2d0ce36b Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Sat, 11 May 2024 16:55:28 +0800
Subject: [PATCH 23/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 2 +-
pages/cloud_warehouse/home/home.vue | 136 ++++++++++++------------
pages/cloud_warehouse/market/market.vue | 126 +++++++++++-----------
utils/mixin.js | 28 ++---
4 files changed, 140 insertions(+), 152 deletions(-)
diff --git a/pages.json b/pages.json
index 0b107fb..7d7e74b 100644
--- a/pages.json
+++ b/pages.json
@@ -334,7 +334,7 @@
"style": {
"navigationBarTitleText": "里海云仓",
"navigationStyle": "custom",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": false
}
},
{
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 9ffda1d..e683262 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -6,59 +6,27 @@
.wholeSale {
background-color: #f8fafb !important;
-
-
-
.wholeSale-header {
position: sticky;
top: 0;
z-index: 100;
margin-bottom: 20rpx;
background-color: #40AE36;
-
- .scrollview {
- display: flex;
- align-items: center;
- height: 98rpx;
- padding-left: 32rpx;
-
- .scrollview-item {
- margin-right: 30rpx;
- font-size: 28rpx;
- color: #FFFFFF;
- }
-
- .scrollview-active {
- position: relative;
- font-weight: bold;
- font-size: 36rpx;
- color: #FFFFFF;
-
- &::after {
- content: "";
- display: inline-block;
- position: absolute;
- bottom: -6rpx;
- left: 50%;
- transform: translateX(-50%);
- width: 100%;
- height: 6rpx;
- background-color: #FFFFFF;
- }
- }
- }
}
.wholeSale-section {
+ position: sticky;
+ top: calc(82rpx + var(--status-bar-height));
padding: 0rpx 20rpx;
background-color: #fff;
- transition: height .5s;
+ transition: height .7s;
overflow: hidden;
+ margin-bottom: 20rpx;
.wholeSale-nav {
display: flex;
align-items: center;
- margin-bottom: 20rpx;
+ padding-bottom: 20rpx;
.icon {
margin-right: 20rpx;
@@ -101,13 +69,15 @@
}
.category {
+ position: relative;
width: 100%;
overflow: auto;
margin-bottom: 20rpx;
+ // padding-right: 70rpx;
.category-wrap {
display: flex;
- padding-bottom: 20rpx;
+ padding-bottom: 10rpx;
.category-item {
display: flex;
@@ -148,6 +118,24 @@
}
}
}
+
+ .category-all {
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ height: 100%;
+ background-color: #f3f3f3;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ font-size: 24rpx;
+ border-radius: 4rpx;
+ width: 70rpx;
+ color: #919191;
+ }
}
.cate {
@@ -228,7 +216,7 @@
-
+
@@ -258,8 +246,19 @@
+
+
+
+
+
+
@@ -276,12 +275,15 @@
-
+
-
-
-
+ @scrolltoupper="scrolltoupper" :refresher-threshold="0">
+
+
+
+
+
@@ -317,8 +319,8 @@
deduction_rate: '', //抵扣比例
rand: 1
},
- wrapHeight: 'auto',
- maxHeight: '',
+ wrapHeight: 300,
+ isShowSmall: false,
scrollTop: 0,
}
},
@@ -326,20 +328,26 @@
this.getStoreCategory();
this.getProductslist(true);
},
- onReachBottom() {
- this.getProductslist();
- },
+
onPageScroll(e) {
uni.$emit('scroll');
},
- onPullDownRefresh() {
- this.getProductslist(true);
+
+ watch: {
+ 'where.cate_pid'(newVal, oldVal) {
+ if (newVal && !oldVal) {
+ this.wrapHeight = 300 + 48;
+ this.isShowSmall = true;
+ }
+ if (!newVal && oldVal) {
+ this.wrapHeight = 300;
+ this.isShowSmall = false;
+ }
+ }
},
-
methods: {
-
- refresh(e) {
- console.log(e);
+ scrolltoupper() {
+ this.getProductslist(true);
},
onScrollBottom(e) {
@@ -347,8 +355,9 @@
},
onScroll(e) {
- if (this.scrollTop > e.target.scrollTop) { //上拉
- this.wrapHeight = '352rpx';
+ if (this.scrollTop >= e.target.scrollTop) { //上拉
+ this.wrapHeight = 300;
+ if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
} else {
this.wrapHeight = 0;
}
@@ -394,11 +403,6 @@
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 => {
@@ -412,13 +416,6 @@
cate_name: '全部',
store_category_id: ''
})
-
- setTimeout(() => {
- this.$util.getDom(this, '.wholeSale-section', (res) => {
- this.wrapHeight = res.height + 'px';
- this.maxHeight = res.height;
- })
- }, 300)
})
},
getProductslist(reLoad = false) {
@@ -429,6 +426,7 @@
}
if (this.isLoading == -1) return;
this.isLoading = 1;
+
getProductslist(this.where).then(res => {
this.where.limit = res.data.limit
this.where.page = res.data.page
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 2539195..231b5e5 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -6,10 +6,6 @@
.wholeSale {
background-color: #f8fafb !important;
- .wholeSale-header-wrap {
- background-color: #40AE36;
- }
-
.wholeSale-header-search-wrap {
padding: 30rpx 20rpx 0;
background-color: #fff;
@@ -20,6 +16,7 @@
top: 0;
z-index: 100;
margin-bottom: 20rpx;
+ background-color: #40AE36;
.scrollview {
display: flex;
@@ -339,32 +336,31 @@
{
- console.log(res.top);
- if (86 >= res.top) {
- this.$refs.recommendRef.parentPageScroll(true);
- } else {
- this.$refs.recommendRef.parentPageScroll(false);
- }
- })
},
/**
@@ -691,15 +679,12 @@
// that.overflow = true;
// #ifdef APP-PLUS
setTimeout(() => {
- this.hotPageArr[this.hostIndex] = 1;
- this.hotScrollArr[this.hostIndex] = true;
-
- // this.hotPage = 1;
- // this.hotScroll = true;
- // let hostList = this.hostProduct;
- // hostList[this.hostIndex] = [];
- // this.$set(this, 'hostProduct', hostList);
- this.loadGoods(this.hostIndex);
+ this.hotPage = 1;
+ this.hotScroll = true;
+ let hostList = this.hostProduct;
+ hostList[this.hostIndex] = [];
+ this.$set(this, 'hostProduct', hostList);
+ this.loadGoods(this.hostIndex + 1);
}, 50)
// #endif
},
@@ -1097,30 +1082,30 @@
});
},
/**
- * 点击组件选项卡 e
+ * 点击组件选项卡
*/
changeRecommedTab(e) {
- // this.hotPage = 1;
- // this.hotScroll = true;
- // this.hostIndex = e - 1;
- this.hotPageArr[e] = 1;
- this.hotScrollArr[e] = true;
- this.hostIndex = e;
- // let hostList = this.hostProduct;
- // hostList[e - 1] = [];
- // this.$set(this, 'hostProduct', hostList);
+ this.hotPage = 1;
+ this.hotScroll = true;
+ this.hostIndex = e - 1;
+ let hostList = this.hostProduct;
+ hostList[e - 1] = [];
+ this.$set(this, 'hostProduct', hostList);
this.loadGoods(e);
},
- loadGoods(e = 0) {
+ loadGoods(e = 1) {
+
+ console.log(e);
+
this.$nextTick(() => {
- if (e == 0) return this.get_host_product(0);
- if (e == 1) return this.get_host_home({
+ if (e == 1) return this.get_host_product(0);
+ if (e == 2) return this.get_host_home({
mer_type: 1
}, 1);
- if (e == 2) return this.get_host_home({
+ if (e == 3) return this.get_host_home({
mer_type: 2
}, 2);
- if (e == 3) return this.get_host_home({
+ if (e == 4) return this.get_host_home({
mer_type: 3
}, 3);
})
@@ -1130,6 +1115,7 @@
*/
get_host_product: function(e = 0) {
let that = this;
+ let num = that.hotLimit;
if (!that.hotScroll) return;
if (that.hotLoading[e]) return;
@@ -1159,6 +1145,7 @@
*/
get_host_home: function(query = {}, e = 1) {
let that = this;
+ let num = that.hotLimit;
if (!that.hotScroll) return;
if (that.hotLoading[e]) return;
that.hotLoading[e] = true;
@@ -1289,22 +1276,9 @@
},
// 滚动到底部
onReachBottom() {
-
- // this.$util.getDom(this, '.tabs', (res) => {
-
- // if () == res.top) {
- // this.$refs.recommendRef.parentPageScroll(true);
- // } else {
- // this.$refs.recommendRef.parentPageScroll(false);
- // }
- // this.scrollTop = res.top;
- // })
-
- return;
- console.log(12312);
if (this.recommend_switch == 1 && this.navIndex == 0) {
// 首页加载更多
- this.loadGoods(this.$refs.recommendRef.currTabs || 0);
+ this.loadGoods(this.$refs.recommendRef.currTabs || 1);
} else if (this.navIndex == 1) {
// 分类栏目加载更多
if (this.sortProduct.length > 0) {