维沙修改

components/cm-module/listTemplate/productList.vue

@@ -83,10 +83,10 @@
 		<view class="empty-container" v-else>
 			<image
 				class="empty-container-image"
-				src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AWdWzAAGlgAP0das422.png"
+				src="/static/ws/empty_product.png"
 				mode="aspectFit"
 			></image>
-			<text class="error-text">暂时没有商品哦，尽请期待！~</text>
+			<text class="error-text">商品列表空空如也~</text>
 		</view>
 		<!-- 可拖动悬浮按钮 -->
 		<cm-drag

components/cm-module/productDetails/cm-price.vue

@@ -9,7 +9,7 @@
 			>
 				<text class="txt sm">￥</text>
 				<text class="txt big">{{
-					(promotionFormat(product.promotion) ? product.price1 : product.retailPrice)
+					(promotionFormat(product.promotion) ? product.price : product.retailPrice)
 						| NumFormat
 				}}</text>
 			</view>

pages/index/index.vue

@@ -13,7 +13,7 @@
 						@click="navigator('/pages/login/login')"
 						v-if="!hasLogin && isRequest"
 					>
-						请登录
+						邀请码登录
 					</view>
 					<view class="user-text" v-else> {{ organizeName }} </view>
 				</view>

pages/login/login.vue

@@ -20,7 +20,7 @@
 			></vcode-input>
 		</view>
 		<!-- 提示信息 -->
-		<view class="logo-message" v-if="loginMessage !== ''"
+		<view class="logo-message" v-if="hasError"
 			><text>{{ loginMessage }}</text>
 		</view>
 		<button class="login-btn" @click="goLogin" :disabled="isCodeEmpty">登录</button>
@@ -38,7 +38,7 @@ export default {
 	data() {
 		return {
 			invitationCode: '', //获取用户登录的邀请码
-			loginMessage: '' //登录信息反馈
+			loginMessage: '' ,//登录信息反馈
 		}
 	},
 	onLoad(option) {},
@@ -47,6 +47,9 @@ export default {
 		// 邀请码长度是否符合要求
 		isCodeEmpty() {
 			return this.invitationCode.trim().length < 6
+		},
+		hasError(){
+			return this.loginMessage.length>0
 		}
 	},
 	methods: {
@@ -78,7 +81,9 @@ export default {
 					.catch(error => {
 						this.loginMessage = error.msg
 						this.isUserInfo = false
-						// this.$util.msg(error.msg, 2000)
+						setTimeout(()=>{
+							this.loginMessage = ''
+						},2000)
 					})
 				}
 			})

pages/user/club/club-list.vue

@@ -29,17 +29,19 @@
 			<view v-if="isEmpty" class="empty-container">
 				<image
 					class="club-empty-image"
-					src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+					src="/static/ws/empty_club.png"
 					mode="aspectFit"
 					lazy-load
 				></image>
-				<view class="txt">暂无机构数据</view>
+				<view class="txt">机构列表空空如也~</view>
 			</view>
+			<!-- :style="{ height: scrollHeight }" -->
 			<view v-else class="club-list">
 				<scroll-view
+					class="club-scroll"
 					scroll-y="true"
-					:style="{ height: scrollHeight }"
 					@scrolltolower="getOnReachBottomData"
+					:style="{height: scrollHeight}"
 				>
 					<!-- 机构数据 -->
 					<view class="list" v-for="item in clubList" :key="item.userId">
@@ -123,20 +125,21 @@ export default {
 		this.organizeId = data.id
 		// 初始化列表
 		this.init()
+		console.log(this.clubList)
 	},
 	methods: {
 		// 初始化机构列表
 		async init() {
 			this.pageNum = 1
 			this.clubList = await this.getClubList()
-			if(this.clubList.length>0){
+			if (this.clubList.length > 0) {
 				this.isEmpty = false
 			}
-			console.log(this.clubList)
 		},
 		// 设置scroll高度
 		setScrollHeight() {
-			this.scrollHeight = this.$store.state.windowHeight - 61 + 'px'
+			console.log(this.$store.state.windowHeight)
+			this.scrollHeight = this.$store.state.windowHeight - 100 - 40 + 'px'
 		},
 		async searchClubList() {
 			// 如果搜索框为空
@@ -149,6 +152,9 @@ export default {
 		async searchKeyWords() {
 			this.pageNum = 1
 			this.clubList = await this.getClubList()
+			if (this.clubList.length <= 0) {
+				this.isEmpty = true
+			}
 		},
 		// 初始化机构列表
 		async getClubList() {
@@ -170,7 +176,7 @@ export default {
 			)
 			this.pageNum = res.pageNum
 			this.hasNextPage = res.hasNextPage
-			
+
 			return res.list
 		},
 		// 加载下一页数据
@@ -312,7 +318,13 @@ page,
 }
 .club-main {
 	position: relative;
-	padding-top: 122rpx;
+	padding-top: 57px;
+	.club-scroll {
+		// height: 100vh;
+		// box-sizing: border-box;
+		// padding-top: 122rpx;
+	}
+
 	.list {
 		align-items: flex-start;
 		width: 702rpx;
@@ -333,6 +345,7 @@ page,
 				image {
 					width: 180rpx;
 					height: 180rpx;
+					border-radius: 8rpx;
 				}
 			}
 		}