提交

pages.json

@@ -33,6 +33,7 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
+				// "navigationBarBackgroundColor":"#fff",
 				"enablePullDownRefresh": true
 			}
 		},

pages/mine.vue

@@ -783,7 +783,7 @@
 				font-family: Alibaba PuHuiTi;
 				font-weight: 400;
 				color: #FFFFFF;
-				margin-top:62upx;
+				margin-top:82upx;
 				margin-bottom:30rpx;
 				width:100%;
 				text-align: center;

user/pages/collect.vue

@@ -1,11 +1,12 @@
 <template>
 	<view class="pages-technician">
-		<view class="list-item flex-center pd-lg mt-md ml-md mr-md fill-base radius-16 rel"
+		<view class="list-item flex-center  rel"
 			v-for="(item,index) in list.data" :key="index">
-			<view class="top-tag flex-center f-icontext abs" v-if="item.coach_type_status==1">优</view>
+			<!-- <view class="top-tag flex-center f-icontext abs" 
+			v-if="item.coach_type_status==1">优</view> -->
 			<view class="flex-center flex-column">
 				<view class="item-img rel">
-					<image @tap.stop="toPreviewImage(index,1)" mode="aspectFill" lazy-load class="item-img radius"
+					<image @tap.stop="toPreviewImage(index,1)" mode="aspectFill" lazy-load class="item-img"
 						:src="item.work_img">
 					</image>
 					<image @tap.stop="item.coach_type_status==1?toPreviewImage(index,1):''" lazy-load class="abs"
@@ -14,15 +15,42 @@
 						v-if="item.coach_type_status">
 					</image>
 				</view>
-				<view class="item-tag flex-center f-icontext c-base radius-20"
+			<!-- 	<view class="item-tag flex-center f-icontext c-base radius-20"
 					:class="[{'can-service':item.text_type==1}]">
 					{{item.text_type == 1 ?'可服务': '服务中'}}
+				</view> -->
 			</view>
+			<view class="flex-1 max-510" style="margin-left:20rpx;display:flex;flex-direction: column;justify-content: space-between;height:262rpx">
+				<view class="nameInfo">
+					<view class="">
+						<text class="name">{{item.coach_name}}</text>
+						<text class="score">{{item.star}}</text>
 					</view>
-			<view class="flex-1 ml-md max-510">
+					<view class="flex-center">
-				<view class="flex-between">
+						<i class="iconfont iconjuli" style="color:#9CA5AC"></i>
+						<view class="f-desc c-title" style="font-size: 24rpx;color: #71787E;">{{item.distance}}</view>
+					</view>
+				</view>
+				<view class="middleInfo">
+					<view class="zuizao">
+						最早可约
+					</view>
+					<view class="keyue">
+						{{item.near_time}}
+					</view>
+				</view>
+				<view class="mendian">
+					<view class="mdInfo">
+						<image src="../../static/mendian.png" mode=""></image>
+						<text>XXX养生所</text>
+					</view>
+					<view class="order-num">
+						已服务 {{item.order_num > 9999 ? '9999+' : item.order_num}}单
+					</view>
+				</view>
+				<!-- <view class="flex-between">
 					<view class="flex-y-center f-title c-title">
-						<view class="text-bold max-200 ellipsis">{{item.coach_name}}</view>
+						<view class="text-bold max-200 ellipsis"></view>
 						<view @tap.stop="toPreviewImage(index)" class="more-img flex-center ml-sm f-icontext"
 							:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">更多照片</view>
 					</view>
@@ -33,8 +61,8 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
-				<view class="flex-between mt-sm mb-md pb-md b-1px-b">
+				<!-- <view class="flex-between mt-sm mb-md pb-md b-1px-b">
 					<view class="flex-y-center f-icontext">
 						<view class="flex-y-center"><i class="iconfont iconyduixingxingshixin icon-font-color"></i>
 							<view class="star-text">{{item.star}}</view>
@@ -47,7 +75,7 @@
 						<i class="iconfont iconjuli" :style="{color:primaryColor}"></i>
 						<view class="f-desc c-title">{{item.distance}}</view>
 					</view>
-				</view>
+				</view> -->
 				<view class="flex-between">
 					<view class="flex-y-center f-desc c-caption">
 						<view @tap.stop="toShowPopup(index,'message')" class="flex-y-center"><i
@@ -62,7 +90,7 @@
 					</view>
 
 					<view @tap.stop="toShowPopup(index,'technician')" class="item-btn flex-center f-desc c-base"
-						:style="{background:item.user_id?primaryColor:'#888'}">立即预约
+						:style="{background:item.user_id?primaryColor:'#888'}">预约
 					</view>
 				</view>
 			</view>
@@ -73,9 +101,9 @@
 		</load-more>
 		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.lng"></abnor>
 
-		<abnor @confirm="$util.checkAuth({ type: 'userLocation' })"
+		<!-- <abnor @confirm="$util.checkAuth({ type: 'userLocation' })"
 			:tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]" :button="[{ text: '开启定位' , type: 'confirm' }]"
-			btnSize="" v-if="!loading && !location.lng"> </abnor>
+			btnSize="" v-if="!loading && !location.lng"> </abnor> -->
 
 
 		<view class="space-footer"></view>
@@ -544,6 +572,12 @@
 <style lang="scss">
 	.pages-technician {
 		.list-item {
+			
+			background: #FFFFFF;
+			box-shadow: 0px 4rpx 10rpx 0px rgba(53,107,194,0.06);
+			border-radius: 30rpx;
+			padding:30rpx;
+			margin:0 24rpx 24rpx 24rpx;
 			.top-tag {
 				width: 40rpx;
 				height: 30rpx;
@@ -555,10 +589,83 @@
 			}
 
 			.item-img {
-				width: 124rpx;
+				width: 210rpx;
-				height: 124rpx;
+				height: 262rpx;
+				background: #C9D7E4;
+				border-radius: 20rpx;
+			}
+			.nameInfo{
+				display:flex;
+				justify-content: space-between;
+				.name{
+					font-size: 34rpx;
+					font-family: Alibaba PuHuiTi;
+					font-weight: 400;
+					color: #333333;
+				}
+				.score{
+					font-size: 30rpx;
+					font-family: Alibaba PuHuiTi;
+					font-weight: 400;
+					color: #F4563C;
+					margin-left:20rpx;
+				}
+			}
+			.middleInfo{
+				width: 240rpx;
+				
+				background: rgba(8,191,119,0);
+				border: 1px solid #08BF77;
+				border-radius: 10rpx;
+				display:flex;
+				align-items: center;
+				.zuizao{
+					font-size: 24rpx;
+					color: #FFFFFF;
+					flex:1;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
+					background: #08BF77;
+					border: 1px solid #08BF77;
+					border-radius: 10rpx 0rpx 0rpx 10rpx;
+				}
+				.keyue{
+					flex:1;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
+					font-size: 24rpx;
+					font-family: Alibaba PuHuiTi;
+					font-weight: 400;
+					color: #71787E;
+					// border: 1px solid #08BF77;
+				}
+			}
+			.mendian{
+				display:flex;
+				justify-content: space-between;
+				align-items: center;
+				.mdInfo{
+					display: flex;
+					align-items: center;
+					image{
+						width:30rpx;
+						height:30rpx;
+					}
+					text{
+						margin-left:12rpx;
+						font-size: 24rpx;
+						font-family: Alibaba PuHuiTi;
+						font-weight: 400;
+						color: #71787E;
+					}
+				}
+				.order-num{
+					font-size: 24rpx;
+					color: #71787E;
+				}
 			}
-
 			.top-img {
 				width: 146rpx;
 				height: 140rpx;
@@ -641,9 +748,11 @@
 			}
 
 			.item-btn {
-				width: 130rpx;
+				width: 120rpx;
-				height: 52rpx;
+				height: 54rpx;
-				border-radius: 8rpx;
+				background: #08BF77;
+				border: 1px solid #EAEAEA;
+				border-radius: 27rpx;
 			}
 		}
 

user/pages/stored/consume.vue

@@ -118,12 +118,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				if (!refresh && this.$jweixin.isWechat()) {
+				// if (!refresh && this.$jweixin.isWechat()) {
-					await this.$jweixin.initJssdk();
+				// 	await this.$jweixin.initJssdk();
-					this.$jweixin.wxReady(() => {
+				// 	this.$jweixin.wxReady(() => {
-						this.$jweixin.hideOptionMenu()
+				// 		this.$jweixin.hideOptionMenu()
-					})
+				// 	})
-				}
+				// }
 				// #endif
 				let cur_time = new Date(Math.ceil(new Date().getTime()))
 				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')