维沙bug修复

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

@@ -67,8 +67,7 @@
 							<text>促销时间：</text>
 							<text class="txt" v-if="product.promotion.status == 1">不限时</text>
 							<text class="txt" v-else
-								>{{ product.promotion.beginTime }} ～
-								{{ product.promotion.endTime }}</text
+								>{{ product.promotion.beginTime }}～{{ product.promotion.endTime }}</text
 							>
 						</view>
 						<view class="box-title" v-show="product.promotion.mode == 2">

pages/goods/list.vue

@@ -2,9 +2,9 @@
 	<view class="container all-type-list-wrapper">
 		<product-list ref="productList" @operationConfim="hanldOperationConfim"></product-list>
 		<!--底部选择模态层弹窗组件 -->
-		<view class="popup spec" :class="specClass" @tap="hideSpec">
+		<view class="popup spec" :class="specClass">
 			<!-- 遮罩层 -->
-			<view class="mask"></view>
+			<view class="mask"  @tap="hideSpec"></view>
 			<view class="layer">
 				<view class="content">
 					<view class="layer-smimg">

pages/goods/product.vue

@@ -160,7 +160,7 @@
 									product.productRemarks != '' && product.productRemarks != null
 								"
 							>
-								备注:{{ product.productRemarks }}
+								备注:{{ product.productRemark }}
 							</view>
 						</view>
 					</view>
@@ -1306,7 +1306,7 @@ page {
 		padding: 0 24rpx;
 	}
 	.title {
-		width: 100%;
+		// width: 100%;
 		box-sizing: border-box;
 		padding: 0 24rpx;
 		.title-tab {

pages/user/club/club-list.vue

@@ -138,8 +138,14 @@ export default {
 		},
 		// 设置scroll高度
 		setScrollHeight() {
-			console.log(this.$store.state.windowHeight)
-			this.scrollHeight = this.$store.state.windowHeight - 100 - 40 + 'px'
+			console.log(this.$store.state.isIphoneX);
+			// 如果是苹果手机
+			if(this.$store.state.isIphoneX){
+				this.scrollHeight = this.$store.state.windowHeight - 100 - 44 + 'px'
+			}else{
+				this.scrollHeight = this.$store.state.windowHeight - 100 + 'px'
+			}
+			console.log(this.scrollHeight)
 		},
 		async searchClubList() {
 			// 如果搜索框为空
@@ -150,10 +156,13 @@ export default {
 			this.searchKeyWords()
 		},
 		async searchKeyWords() {
+			console.log(this.searchInputVal);
 			this.pageNum = 1
 			this.clubList = await this.getClubList()
 			if (this.clubList.length <= 0) {
 				this.isEmpty = true
+			}else{
+				this.isEmpty = false
 			}
 		},
 		// 初始化机构列表
@@ -316,6 +325,14 @@ page,
 		background: #ffffff;
 	}
 }
+.empty-container{
+	background: #f7f7f7;
+	justify-content: flex-start;
+	.club-empty-image{
+		margin-top: 400rpx;
+		margin-bottom: 36rpx;
+	}
+}
 .club-main {
 	position: relative;
 	padding-top: 57px;
@@ -362,7 +379,7 @@ page,
 				justify-content: flex-start;
 				.list-name {
 					font-size: $font-size-30;
-					width: 400rpx;
+					width: 100%;
 					display: block;
 					float: left;
 					text-align: left;
@@ -414,6 +431,10 @@ page,
 					&.border-btn {
 						color: #333;
 					}
+					&:last-child{
+						background: rgb(25,25,25);
+						color: #fff;
+					}
 				}
 			}
 		}

pages/user/order/orderShareLogin.vue

@@ -7,7 +7,7 @@
 			<input
 				type="number"
 				v-model="shareCode"
-				maxlength="6"
+				maxlength="4"
 				class="input"
 				placeholder="请输入分享码"
 			/>

services/config.env.js

@@ -1,7 +1,7 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.68:8010'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8010'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     URL_CONFIG = 'https://mall2b-b.caimei365.com'//采美测试地址