From 94bff228ef854f64d1e4e7409f74bfb798fe7df2 Mon Sep 17 00:00:00 2001
From: "yangsai@163.com" <2624183217@qq.com>
Date: Fri, 10 May 2024 15:39:31 +0800
Subject: [PATCH] =?UTF-8?q?YS:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue         | 14 +++++++---
 pages/index/index.vue        |  2 +-
 pages/news/consult/about.vue |  2 +-
 pages/news1/jinqun.vue       | 52 +++++++-----------------------------
 4 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 4da93a7..a45c3a9 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container" :style="appThemeStyle">
-		<mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }"
+		<mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true,auto: false}"
 			@down="downCallback" :up="upOption" @up="upCallback">
 			<!-- 页面头部 -->
 			<view class="header">
@@ -216,7 +216,7 @@
 						</template>
 					</u-waterfall>
 				</view>
-				<view style="margin-top: 250rpx;" v-if="list.data.length==0 && total == 0">
+				<view style="margin-top: 250rpx;" v-if=" total == 0">
 					<u-empty text="暂无数据显示哦～" mode="list"></u-empty>
 				</view>
 			</view>
@@ -262,7 +262,7 @@
 				// 上拉加载配置
 				upOption: {
 					// 首次自动执行
-					auto: true,
+					auto: false,
 					// 每页数据的数量; 默认10
 					page: {
 						size: pageSize
@@ -340,6 +340,8 @@
 								// 	})
 								// });
 								// console.log(that.goodsType, that.tabbar)
+							}else{
+								that.upCallback(1)
 							}
 						})
 						.catch(reject)
@@ -429,15 +431,18 @@
 					keyword: app.options.search || '',
 					goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
 				}
+				console.log(param)
 				return new Promise((resolve, reject) => {
 					GoodsApi.list(param)
 						.then(result => {
 							// 合并新数据
+							console.log(app.list)
 							const newList = result.data.list
+							console.log(newList)
 							let arr = getMoreListData(newList, app.list, pageNo);
 							app.list.data = app.arrayUnique(arr, 'goods_id')
 							app.total = result.data.list.total;
-							console.log(app.list)
+							console.log(newList)
 							resolve(newList)
 						})
 						.catch(reject)
@@ -859,6 +864,7 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			margin-top: 4rpx;
 	
 			.left_1 {
 				height: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 16e2724..8fe8422 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2531,7 +2531,7 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-
+			margin-top:4rpx;
 			.left_1 {
 				height: 100%;
 				width: 48rpx;
diff --git a/pages/news/consult/about.vue b/pages/news/consult/about.vue
index 753a802..7a3b739 100644
--- a/pages/news/consult/about.vue
+++ b/pages/news/consult/about.vue
@@ -13,7 +13,7 @@
 			<view class="b">{{cityInfo.phone}}<image :src="$picUrl+'/static/news/tel.png'" @click="callPhone()"></image></view>
 		</view>
 		<view class="park-fd">
-			<image :src="cityInfo.wechat"></image>
+			<image :src="cityInfo.wechat" show-menu-by-longpress='1'></image>
 			<view class="txt">长按识别二维码</view>
 			<view class="txt">添加我的微信</view>
 		</view>
diff --git a/pages/news1/jinqun.vue b/pages/news1/jinqun.vue
index 518a664..12746ac 100644
--- a/pages/news1/jinqun.vue
+++ b/pages/news1/jinqun.vue
@@ -1,43 +1,6 @@
 <template>
-<view class="jinqun">
-	<view class="flag">
-		<view class="flagContent">
-			<image :src="$picUrl+'/static/news1/j1.png'" mode="widthFix"></image>
-			<text>京选电器</text>
-		</view>
-	</view>
-	<view class="topicText">
-		进群立领120元
-	</view>
-	<view class="subTopicText">
-		京东电器官方福利群
-	</view>
-	<view class="qcode">
-		<image :src="cityInfo.group_share_img"></image>
-	</view>
-	<view class="submitBtn">
-		立即进群>
-		<button open-type="share"></button>
-	</view>
-	<view class="fuli">
-		<view class="fuliTitle">
-			福利攻略
-		</view>
-		<view class="fuliContent">
-			<view class="fuliItem">
-				<image :src="$picUrl+'/static/news1/j2.png'"  mode="heightFix"></image>
-				<text>天天抢红包</text>
-			</view>
-			<view class="fuliItem">
-				<image :src="$picUrl+'/static/news1/j3.png'" mode="heightFix"></image>
-				<text>周二特价</text>
-			</view>
-			<view class="fuliItem">
-				<image :src="$picUrl+'/static/news1/j4.png'" mode="heightFix"></image>
-				<text>品质抢团</text>
-			</view>
-		</view>
-	</view>
+<view class="jinqun"  :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}" style="background-size: 100% 100%;text-align: center;">
+		<image :src="cityInfo.group_share_img" style="padding-top: 70%; width: 350rpx;height: 380rpx;" show-menu-by-longpress='1' bindtap="clickImg"></image>
 </view>
 </template>
 
@@ -63,6 +26,9 @@
 					this.cityInfo = data
 				}
 			},
+			clickImg(){
+				this.onShareAppMessage()
+			}
 		},
 		/**
 		 * 分享当前页面
@@ -93,7 +59,7 @@
 .jinqun{
 	height:100%;
 	position: relative;
-	background: url(https://www.royaum.com.cn/static/jinqun-bg.png);
+	
 	background-repeat: no-repeat;
 	background-size: cover;
 	min-height: 100vh;
@@ -142,12 +108,12 @@
 	}
 	.qcode{
 		width: 400upx;
-		height:400upx;
-		margin:40upx auto;
+		height:300upx;
+		margin:160upx auto;
 		border:1px solid red; 
 		image{
 			width: 100%;
-			height: 100%;
+			height: 140%;
 		}
 	}
 	.submitBtn{