Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

pages/index/index.vue

@@ -1083,13 +1083,21 @@
 		width: 60px;
 		max-width: 60px;
 	}
+	/deep/.uni-select__input-text{
+		width: 100%;
+		    color: #019c88;
+		    white-space: nowrap;
+		    text-overflow: ellipsis;
+		    -o-text-overflow: ellipsis;
+		    overflow: hidden;
+	}
 	/deep/.uni-select{
 			width: 60px;
 			font-size: 14px;
-		    border: 1px solid #e5e5e5;
+		    border: 1px solid #a1e0d4;
 		    box-sizing: border-box;
-		    border-radius: 4px;
-		    padding: 0 5px;
+		    border-radius: 30px;
+		    padding: 0 4px;
 		    padding-left: 10px;
 		    position: relative;
 		    display: flex;
@@ -1099,8 +1107,9 @@
 		    align-items: center;
 		    width: 100%;
 		    flex: 1;
-		    height: 35px;
-			background-color: #fff;
+		    height: 30px;
+			background: linear-gradient(90deg, #a4e1d5, #e6f7f3);
+			color: #019c88;
 	}
 	/deep/.uni-searchbar__cancel{
 		display: none;

pages/my/index.vue

@@ -104,9 +104,9 @@
 					<image src="../../static/my-liaocheng1.png" mode=""></image>
 					<span class="my-serve-list-text">企业预约</span>
 				</view>
-				<view class="my-serve-list" @click="meServe('约到店')">
+				<view class="my-serve-list" @click="meServe('新人拼团')">
 					<image src="../../static/my-liaocheng2.png" mode=""></image>
-					<span class="my-serve-list-text">约到店</span>
+					<span class="my-serve-list-text">新人拼团</span>
 				</view>
 			</view>
 		</view>

pages/shop/index.vue

@@ -38,9 +38,9 @@
 								<view class="item-view-xiangmu">
 									<span>已售</span><span>{{item.sales}}w+</span>
 								</view>
-								<view class="item-view-bottom-btn">
+								<!--<view class="item-view-bottom-btn">
 									预约
-								</view>
+								</view>-->
 							</view>
 							<!-- <view class="flex shop_category">
 								<view class="shop_category_a">中医理疗</view>
@@ -79,9 +79,9 @@
 							</view>
 							<view class="item-view-bottom">
 								
-								<view class="item-view-bottom-btn">
+								<!--<view class="item-view-bottom-btn">
 									预约
-								</view>
+								</view>-->
 							</view>
 							
 						</view>

pages/therapist/therapist.vue

@@ -1244,8 +1244,8 @@ import permision from "@/components/permission.js";
 	}
 	.touxiang-frame{
 		position: absolute;
-		width: 98%;
-		height: 270rpx;
+		width: 230.08rpx;
+		height: 150px;
 		left: 8rpx;
 		
 	}

pages/therapist/therapistDingdan.vue

@@ -1282,8 +1282,8 @@
 	}
 	.touxiang-frame{
 		position: absolute;
-		width: 30%;
-		height: 262rpx;
+		width: 230.08rpx;
+		height: 146px;
 	}
 	.dituList{
 		width: 85%;