diff --git a/pages.json b/pages.json
index 34ff110..a1489d4 100644
--- a/pages.json
+++ b/pages.json
@@ -32,7 +32,7 @@
 			"path": "pages/technician",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "",
+				"navigationStyle": "custom",
 				// "navigationBarBackgroundColor":"#fff",
 				"enablePullDownRefresh": true
 			}
@@ -126,6 +126,7 @@
 					"path": "pages/gonggao/list",
 					"style": {
 						"navigationBarTitleText": "官方公告",
+						 "navigationBarTextStyle":"black",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -133,6 +134,7 @@
 					"path": "pages/gonggao/item",
 					"style": {
 						"navigationBarTitleText": "公告详情",
+						 "navigationBarTextStyle":"black",
 						"enablePullDownRefresh": false
 					}
 				},
diff --git a/pages/login.vue b/pages/login.vue
index ba75b58..aa57f63 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -222,6 +222,7 @@
 				}
 			},
 			async toLogin(userInfo) {
+				console.log(userInfo,"mmnn")
 				let user_info = await this.$api.base.appLogin({
 					data: userInfo
 				})
diff --git a/pages/mine.vue b/pages/mine.vue
index 1cf2dc1..b086ef9 100644
--- a/pages/mine.vue
+++ b/pages/mine.vue
@@ -242,7 +242,6 @@
 						:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toAtv" v-if="item.text=='邀请好友'">
 						<view class="list-item pt-lg pb-lg ml-lg mr-lg flex-center"
 							:class="[{ 'b-1px-t': index != 0 }]">
-							<!-- <i class="iconfont" :class="item.icon" :style="{color:primaryColor}"></i> -->
 							<image style="width:44rpx;height:44rpx;" :src="item.icon" mode=""></image>
 							<view class="flex-1 flex-between ml-md">
 								<view class="f-paragraph c-title">{{ item.text }}</view>
@@ -546,7 +545,7 @@
 			},
 			async mygroup(){
 				this.$util.goUrl({
-					url:'/user/pages/myGroup/myGroup'
+					url:'/user/pages/myGroup/myGroup?isGroup=true'
 				})
 			},
 			async initIndex(refresh = false) {
diff --git a/pages/order.vue b/pages/order.vue
index 4b75aea..c2f00ff 100644
--- a/pages/order.vue
+++ b/pages/order.vue
@@ -58,11 +58,17 @@
 						v-if="item.can_refund > 0">申请退款</button>
 					<!-- 已完成 -->
 					<block v-if="item.pay_type == 7">
-						<button @tap.stop="goDetail(index,'evaluate')" class="clear-btn order"
-							v-if="!item.is_comment">去评价</button>
+						<!-- <button @tap.stop="goDetail(index,'evaluate')" class="clear-btn order"
+							v-if="!item.is_comment">去评价</button> -->
 						<button @tap.stop="toAgain(index)" class="clear-btn order"
 							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">再来一单</button>
 					</block>
+					<block v-if="item.pay_type == 8">
+						<button @tap.stop="goDetail(index,'evaluate')" class="clear-btn order"
+							v-if="!item.is_comment">去评价</button>
+						<!-- <button @tap.stop="toAgain(index)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">再来一单</button> -->
+					</block>
 				</view>
 			</view>
 		</view>
diff --git a/pages/service.vue b/pages/service.vue
index 25e8e67..a0f0048 100644
--- a/pages/service.vue
+++ b/pages/service.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="pages-home" v-if="isLoad">
 		<view class="map-info">
-			<view class="position" @tap.stop="toChooseLocation" >
+			<!-- <view class="position" @tap.stop="toChooseLocation" >
 				<i class="iconfont iconjuli mr-sm"></i>
 				<view class="map-text max-400 ellipsis">
 					{{location&&location.province ?location.province : isLoad ? '定位失败' : '定位中...'}}
 				</view>
-			</view>
+			</view> -->
 			<view class="input" @click="goSearch">
 				<u--input
 					placeholder="查找技师或服务"
@@ -26,8 +26,19 @@
 			</banner>
 			<view class="tab">
 				<view class="tabItem"  v-for="(item,index) in gridList" :key="index" @click="getItemHandle(item)">
-					<image :src="item.img" mode=""></image>
-					<view class="text">{{item.name}}</view>
+					
+					
+					<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+						:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toAtv" v-if="item.name=='邀请有礼'">
+						<view>
+							<image :src="item.img" mode=""></image>
+							<view class="text">{{item.name}}</view>
+						</view>
+					</auth>
+					
+					
+					<image :src="item.img" mode="" v-if="item.name!='邀请有礼'"></image>
+					<view class="text" v-if="item.name!='邀请有礼'">{{item.name}}</view>
 				</view>
 			</view>
 			<view class="gridContainer">
@@ -35,7 +46,23 @@
 					<image src="../static/titleicon.png" mode=""></image>
 					<text>推荐技师</text>
 				</view>
-				 <u-scroll-list :indicator="false">
+				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true" :interval="2000"
+					:duration="1000" previous-margin="112px" next-margin="112px">
+					
+					<swiper-item class="recommendItem" v-for="(item, index) in picList" :key="index">
+						<image :src="item.work_img"></image>
+						<view class="flag new" v-if="item.coach_type_status==3">新人</view>
+						<view class="flag people" v-if="item.coach_type_status==2">推荐</view>
+						<view class="flag people" v-if="item.coach_type_status==1">销冠</view>
+					</swiper-item>
+					<!-- <swiper-item>
+						<view class="swiper-item uni-bg-green">B</view>
+					</swiper-item>
+					<swiper-item>
+						<view class="swiper-item uni-bg-blue">C</view>
+					</swiper-item> -->
+				</swiper>
+				<!-- <u-scroll-list :indicator="false">
 					<view class="recommendItem" v-for="(item, index) in picList" :key="index">
 						<image :src="item.work_img"></image>
 						<view class="flag new" v-if="item.coach_type_status==3">新人</view>
@@ -43,7 +70,7 @@
 						<view class="flag people" v-if="item.coach_type_status==1">销冠</view>
 					</view>
 					
-				</u-scroll-list>
+				</u-scroll-list> -->
 			</view>
 			<!-- <view class="search-box flex-center fill-base ml-md mr-md radius"
 				:class="[{'mt-md':banner.length ==0}]">
@@ -182,7 +209,7 @@
 			}
 		},
 		computed: mapState({
-			location: state => state.user.location,
+			// location: state => state.user.location,
 			pageActive: state => state.service.pageActive,
 			activeIndex: state => state.service.activeIndex,
 			tabList: state => state.service.tabList,
@@ -194,6 +221,7 @@
 			configInfo: state => state.config.configInfo,
 			autograph: state => state.user.autograph,
 			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
 		}),
 		async onLoad(options) {
 			this.getRecommend()
@@ -214,6 +242,8 @@
 				key: 'pageActive',
 				val: true
 			})
+		
+			
 		},
 		onPullDownRefresh() {
 			// #ifndef APP-PLUS
@@ -241,7 +271,21 @@
 		},
 		methods: {
 			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions', 'getServiceIndex', 'getServiceList']),
-			...mapMutations(['updateServiceItem']),
+			...mapMutations(['updateServiceItem','updateUserItem']),
+			async toAtv() {
+				if (!this.mineInfo.is_atv) {
+					this.$util.showToast({
+						title: `暂无活动`
+					})
+					return
+				}
+				let options = this.commonOptions
+				options.coupon_atv_id = 0
+				await this.updateCommonOptions(options)
+				this.$util.goUrl({
+					url: `/user/pages/coupon/share`
+				})
+			},
 			async initIndex(refresh = false) {
 				// #ifdef H5
 				if (!refresh && this.$jweixin.isWechat()) {
@@ -264,19 +308,46 @@
 				let res = await this.$api.service.serviceCoachList({
 					sort_field:'distance',
 					sort_order:'asc',
-					limit:5
+					limit:10
 				})
 				console.log(res,"ooo")
 				this.picList = res.data
+				let arr = res.data
+				if(this.picList.length<3){
+					this.picList.push(...arr)
+				}else{
+					this.picList = res.data
+				}
+				
 				
 			},
 			getItemHandle(item){
-				console.log(item,)
+				console.log(item,this.configInfo)
 				if(item.name=="领券中心"){
 					this.$util.goUrl({
 						url: '/user/pages/coupon/list'
 					})
 				}
+				if(item.name=="联系客服"){
+					let {
+						mobile: url,
+						im_type
+					} = this.configInfo
+					// #ifdef MP-WEIXIN
+					if (im_type == 2) return
+					// #endif
+					this.$util.goUrl({
+						url:'18688888888',
+						openType: 'call'
+					})
+				}
+				if(item.name=="技师招募"){
+					uni.navigateTo({
+						url:"/user/pages/gonggao/item?id=2"
+					})
+				}
+				
+				
 			},
 			initRefresh() {
 				this.isLoadBanner = false
@@ -387,34 +458,34 @@
 					url
 				})
 			},
-			async toChooseLocation(e) {
-				await this.$util.checkAuth({
-					type: 'userLocation'
-				})
-				let [, {
-					address = '',
-					longitude: lng,
-					latitude: lat,
-					province = '',
-					city = '',
-					district = '',
-				}] = await uni.chooseLocation();
-				if (!lng) return
-				let location = {
-					lng,
-					lat,
-					address,
-					province,
-					city,
-					district
-				}
-				this.updateUserItem({
-					key: 'location',
-					val: location
-				})
-				this.param.page = 1
-				this.getList()
-			},
+			
+			// async toChooseLocation(e) {
+			// 	await this.$util.checkAuth({
+			// 		type: 'userLocation'
+			// 	})
+			// 	let [, {
+			// 		address = '',
+			// 		longitude: lng,
+			// 		latitude: lat,
+			// 		province = '',
+			// 		city = '',
+			// 		district = '',
+			// 	}] = await uni.chooseLocation();
+			// 	if (!lng) return
+			// 	let location = {
+			// 		lng,
+			// 		lat,
+			// 		address,
+			// 		province,
+			// 		city,
+			// 		district
+			// 	}
+			// 	this.updateUserItem({
+			// 		key: 'location',
+			// 		val: location
+			// 	})
+				
+			// },
 			goSearch(){
 				
 				this.$util.goUrl({
@@ -464,7 +535,7 @@
 			border-radius: 30rpx 30rpx 0rpx 0rpx;
 			margin-top: -58rpx;
 			position: relative;
-			z-index: 999;
+			z-index: 99;
 			display:flex;
 			align-items: center;
 			justify-content: space-between;
@@ -506,7 +577,7 @@
 			.recommendItem{
 				// width:240rpx;
 				// height:300rpx;
-				background: #aaaaaa;
+				// background: #aaaaaa;
 				border-radius: 27rpx;
 				// overflow: hidden;
 				margin-right:24rpx;
diff --git a/pages/technician.vue b/pages/technician.vue
index 9c5936a..1f1b892 100644
--- a/pages/technician.vue
+++ b/pages/technician.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pages-technician">
 		<fixed>
-			<!-- <uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" :onlyLeft="true" :color="`#fff`"
+			<uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" :onlyLeft="true" :color="`#fff`"
 				:backgroundColor="primaryColor">
 				<view @tap.stop="toChooseLocation" class="map-info flex-y-center" slot="left">
 					<view class="flex-y-center pl-md c-base">
@@ -12,7 +12,7 @@
 						<i class="iconfont icon-down"></i>
 					</view>
 				</view>
-			</uni-nav-bar> -->
+			</uni-nav-bar>
 			<view class="fix-info fill-body rel">
 				<view class="space-top abs" :style="{background:primaryColor}"></view>
 				<view class="search-info fill-base pt-lg pl-lg pr-lg pb-md abs">
@@ -92,9 +92,9 @@
 						</view>
 					</view>
 					<view class="flex-between mendianInfo">
-						<view class="mendian">
+						<view class="mendian" @click="goShop(item)">
 							<image src="../static/mendian.png" mode=""></image>
-							<text>养生所</text>
+							<text>{{item.company_name}}</text>
 						</view>
 						<view class="flex-y-center f-icontext">
 							<!-- <view class="flex-y-center"><i class="iconfont iconyduixingxingshixin icon-font-color"></i>
@@ -349,10 +349,10 @@
 			...mapMutations(['updateUserItem', 'updateTechnicianItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.toAppShare()
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.toAppShare()
+				}
 				// #endif
 				if (!this.configInfo.id || refresh) {
 					await this.getConfigInfo()
@@ -470,52 +470,52 @@
 				} = this
 				if (!location.lat) {
 					// #ifdef H5
-					// if (this.$jweixin.isWechat()) {
-					// 	this.$util.showLoading()
-					// 	// await this.$jweixin.initJssdk();
-					// 	await this.$jweixin.wxReady2();
-					// 	let {
-					// 		latitude: lat = 0,
-					// 		longitude: lng = 0
-					// 	} = await this.$jweixin.getWxLocation()
-					// 	location = {
-					// 		lng,
-					// 		lat,
-					// 		address: '定位失败',
-					// 		province: '',
-					// 		city: '',
-					// 		district: ''
-					// 	}
-					// 	if (lat && lng) {
-					// 		let key = `${lat},${lng}`
-					// 		let data = await this.$api.base.getMapInfo({
-					// 			location: key
-					// 		})
-					// 		let {
-					// 			status,
-					// 			result
-					// 		} = JSON.parse(data)
-					// 		if (status == 0) {
-					// 			let {
-					// 				address,
-					// 				address_component
-					// 			} = result
-					// 			let {
-					// 				province,
-					// 				city,
-					// 				district
-					// 			} = address_component
-					// 			location = {
-					// 				lng,
-					// 				lat,
-					// 				address,
-					// 				province,
-					// 				city,
-					// 				district
-					// 			}
-					// 		}
-					// 	}
-					// }
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
 					// #endif
 					// #ifndef H5
 					location = await this.$util.getBmapLocation()
@@ -580,6 +580,7 @@
 				this.$util.hideAll()
 			},
 			async handerTabChange(index) {
+				this.sort_order=='desc'?this.tabList1[index].sign=1:this.tabList1[index].sign=0
 				this.sort_order=='desc'?this.sort_order='asc':this.sort_order='desc'
 				this.updateTechnicianItem({
 					key: 'activeIndex',
@@ -599,6 +600,11 @@
 				this.$util.hideAll()
 				// this.getList(1)
 			},
+			goShop(item){
+				this.$util.goUrl({
+					url:'/user/pages/myGroup/myGroup?isGroup=false'
+				})
+			},
 			toPreviewImage(index, key = 0) {
 				let {
 					self_img: urls,
diff --git a/store/modules/order.js b/store/modules/order.js
index fb48266..40168a0 100644
--- a/store/modules/order.js
+++ b/store/modules/order.js
@@ -24,6 +24,12 @@ export default {
 		}, {
 			title: '已完成',
 			id: 7
+		},{
+			title: '待反馈',
+			id: 8
+		},{
+			title: '已取消',
+			id: 9
 		}],
 		param: {
 			page: 1,
diff --git a/technician/pages/apply.vue b/technician/pages/apply.vue
index 4c8731f..a163ed6 100644
--- a/technician/pages/apply.vue
+++ b/technician/pages/apply.vue
@@ -133,6 +133,19 @@
 						</upload>
 					</view>
 				</view>
+				
+				<view class="fill-base mt-md radius-16">
+					<view class="flex-between pl-lg pr-lg">
+						<view class="item-text">健康证</view>
+						<input :disabled="true" type="text" class="item-input flex-1" />
+					</view>
+					<view class="flex-between pl-lg pr-lg pb-md">
+						<upload @upload="imgUpload" :imagelist="form.healthy_img" imgtype="healthy_img" text="上传图片"
+							:imgsize="1">
+						</upload>
+					</view>
+				</view>
+				
 				<view class="fill-base mt-md radius-16">
 					<view class="flex-between pl-lg pr-lg">
 						<view class="item-text">个人生活照</view>
@@ -251,7 +264,8 @@
 					work_img: [], // 工作照
 					self_img: [], // 生活照
 					city_id: '', // 城市 id
-					video: []
+					video: [],
+					healthy_img:[]
 				},
 				rule: [{
 						name: "coach_name",
@@ -315,6 +329,11 @@
 						checkType: "isNotNull",
 						errorMsg: "请上传工作形象照"
 					},
+					{
+						name: "healthy_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传健康证"
+					},
 					{
 						name: "self_img",
 						checkType: "isNotNull",
@@ -363,12 +382,13 @@
 			
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				await this.getCityList()
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getCityList()
 				let data = await this.$api.technician.coachInfo()
@@ -395,6 +415,9 @@
 				data.work_img = [{
 					path: data.work_img
 				}]
+				data.healthy_img = [{
+					path: data.healthy_img
+				}]
 				data.self_img = data.self_img.map(item => {
 					return {
 						path: item
@@ -560,7 +583,7 @@
 			},
 			async submit() {
 				let param = this.$util.deepCopy(this.form)
-				let arr = ['id_card', 'id_card_fan', 'id_card_people', 'work_img', 'video']
+				let arr = ['id_card', 'id_card_fan', 'id_card_people', 'work_img','healthy_img', 'video']
 				arr.map(item => {
 					param[item] = param[item].length > 0 ? param[item][0].path : ''
 				})
diff --git a/technician/pages/income/car-fee-record.vue b/technician/pages/income/car-fee-record.vue
index 0f70668..b77e193 100644
--- a/technician/pages/income/car-fee-record.vue
+++ b/technician/pages/income/car-fee-record.vue
@@ -106,12 +106,12 @@
 			...mapMutations([]),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/technician/pages/income/index.vue b/technician/pages/income/index.vue
index 4458e72..1ee1b59 100644
--- a/technician/pages/income/index.vue
+++ b/technician/pages/income/index.vue
@@ -77,12 +77,12 @@
 			...mapMutations([]),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				this.$util.showLoading()
 				this.detail = await this.$api.technician.capCashInfo()
diff --git a/technician/pages/order/list.vue b/technician/pages/order/list.vue
index ad27720..3280b35 100644
--- a/technician/pages/order/list.vue
+++ b/technician/pages/order/list.vue
@@ -175,12 +175,12 @@
 			...mapMutations(['']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				if (!this.configInfo.id || refresh) {
 					await this.getConfigInfo()
diff --git a/user/pages/address/edit.vue b/user/pages/address/edit.vue
index 24ef94a..c6feb13 100644
--- a/user/pages/address/edit.vue
+++ b/user/pages/address/edit.vue
@@ -114,12 +114,12 @@
 			...mapMutations(['updateUserItem', 'updateOrderItem']),
 			async initIndex() {
 				// #ifdef H5
-				// if (this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				let {
 					id = 0
diff --git a/user/pages/address/list.vue b/user/pages/address/list.vue
index dd6e0ad..ac08b74 100644
--- a/user/pages/address/list.vue
+++ b/user/pages/address/list.vue
@@ -130,12 +130,12 @@
 			...mapMutations(['updateUserItem', 'updateOrderItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/apply-result.vue b/user/pages/apply-result.vue
index 36cc6f7..e03c69c 100644
--- a/user/pages/apply-result.vue
+++ b/user/pages/apply-result.vue
@@ -90,12 +90,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getMineInfo()
 				let {
diff --git a/user/pages/cash-out.vue b/user/pages/cash-out.vue
index ecec297..4955f3a 100644
--- a/user/pages/cash-out.vue
+++ b/user/pages/cash-out.vue
@@ -74,12 +74,12 @@
 			...mapActions(['getConfigInfo']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				if (!this.configInfo.id) {
 					await this.getConfigInfo()
diff --git a/user/pages/collect.vue b/user/pages/collect.vue
index 63bd3b6..c035296 100644
--- a/user/pages/collect.vue
+++ b/user/pages/collect.vue
@@ -31,7 +31,7 @@
 						<view class="f-desc c-title" style="font-size: 24rpx;color: #71787E;">{{item.distance}}</view>
 					</view>
 				</view>
-				<view class="middleInfo">
+				<view class="middleInfo" v-if="item.near_time">
 					<view class="zuizao">
 						最早可约
 					</view>
@@ -42,7 +42,7 @@
 				<view class="mendian">
 					<view class="mdInfo">
 						<image src="../../static/mendian.png" mode=""></image>
-						<text>XXX养生所</text>
+						<text>{{item.company_name}}</text>
 					</view>
 					<view class="order-num">
 						已服务 {{item.order_num > 9999 ? '9999+' : item.order_num}}单
@@ -281,12 +281,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
@@ -308,52 +308,52 @@
 				} = this
 				if (!location.lat) {
 					// #ifdef H5
-					// if (this.$jweixin.isWechat()) {
-					// 	this.$util.showLoading()
-					// 	// await this.$jweixin.initJssdk();
-					// 	await this.$jweixin.wxReady2();
-					// 	let {
-					// 		latitude: lat = 0,
-					// 		longitude: lng = 0
-					// 	} = await this.$jweixin.getWxLocation()
-					// 	location = {
-					// 		lng,
-					// 		lat,
-					// 		address: '定位失败',
-					// 		province: '',
-					// 		city: '',
-					// 		district: ''
-					// 	}
-					// 	if (lat && lng) {
-					// 		let key = `${lat},${lng}`
-					// 		let data = await this.$api.base.getMapInfo({
-					// 			location: key
-					// 		})
-					// 		let {
-					// 			status,
-					// 			result
-					// 		} = JSON.parse(data)
-					// 		if (status == 0) {
-					// 			let {
-					// 				address,
-					// 				address_component
-					// 			} = result
-					// 			let {
-					// 				province,
-					// 				city,
-					// 				district
-					// 			} = address_component
-					// 			location = {
-					// 				lng,
-					// 				lat,
-					// 				address,
-					// 				province,
-					// 				city,
-					// 				district
-					// 			}
-					// 		}
-					// 	}
-					// }
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
 					// #endif
 					// #ifndef H5
 					location = await this.$util.getBmapLocation()
diff --git a/user/pages/coupon/list.vue b/user/pages/coupon/list.vue
index 5c34436..6d9c702 100644
--- a/user/pages/coupon/list.vue
+++ b/user/pages/coupon/list.vue
@@ -130,12 +130,12 @@
 			...mapMutations(['']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/distribution/apply.vue b/user/pages/distribution/apply.vue
index 7f62746..da8cf55 100644
--- a/user/pages/distribution/apply.vue
+++ b/user/pages/distribution/apply.vue
@@ -87,12 +87,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				let data = await this.$api.mine.resellerInfo()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/distribution/income.vue b/user/pages/distribution/income.vue
index 83919cd..f2b6886 100644
--- a/user/pages/distribution/income.vue
+++ b/user/pages/distribution/income.vue
@@ -84,12 +84,12 @@
 			...mapMutations([]),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				this.$util.showLoading()
 				this.detail = await this.$api.mine.capCashInfo()
diff --git a/user/pages/distribution/record.vue b/user/pages/distribution/record.vue
index 813df5c..1f63ba4 100644
--- a/user/pages/distribution/record.vue
+++ b/user/pages/distribution/record.vue
@@ -118,12 +118,12 @@
 			...mapMutations([]),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/distribution/team.vue b/user/pages/distribution/team.vue
index f296f83..560fc64 100644
--- a/user/pages/distribution/team.vue
+++ b/user/pages/distribution/team.vue
@@ -64,12 +64,12 @@
 			...mapMutations(['']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/myGroup/myGroup.vue b/user/pages/myGroup/myGroup.vue
index 6611fd3..dcfb19e 100644
--- a/user/pages/myGroup/myGroup.vue
+++ b/user/pages/myGroup/myGroup.vue
@@ -2,7 +2,7 @@
 <view class="groupContent">
 	<view class="group">
 		<text class="guishu">归属商家</text>
-		<text class="order" @click="goGroupList">查看团队排行</text>
+		<text class="order" v-if="isGroup" @click="goGroupList">查看团队排行</text>
 	</view>
 	<view class="shop">
 		浦口区哈哈哈养生服务中心
@@ -17,7 +17,7 @@
 export default{
 	data(){
 		return{
-			
+			isGroup:false
 		}
 	},
 	methods:{
@@ -31,7 +31,8 @@ export default{
 			})
 		}
 	},
-	onLoad() {
+	onLoad(option) {
+		this.isGroup = option.isGroup
 		this.getCompanyMonth()
 	}
 }
diff --git a/user/pages/order.vue b/user/pages/order.vue
index c27bf33..00f677b 100644
--- a/user/pages/order.vue
+++ b/user/pages/order.vue
@@ -78,6 +78,40 @@
 					</view>
 				</view>
 			</view>
+			<view class="mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+				<view class="flex-between pb-lg">
+					<view class="flex-y-baseline">
+						<view class="f-title c-title text-bold">技师简介</view>
+					</view>
+				</view>
+				<view class="f-caption c-caption  radius-16">
+					<view class="subtitle">
+						基本信息
+					</view>
+					<text class="c-paragraph" decode="emsp" style="word-break:break-all;">
+					{{orderInfo.coach_info.coach_name}}:{{orderInfo.coach_info.text}}</text>
+					<view class="subtitle">
+						爽约包退
+					</view>
+					<view class="subtitle">
+						资质证书
+					</view>
+					<view class="imageContent">
+						<image @tap.stop="toPreviewImage(index,'license')" mode="aspectFill" class="img-item-mini radius-16"
+							:src="item" v-for="(item,index) in orderInfo.coach_info.license" :key="index">
+						</image>
+					</view>
+					<view class="subtitle">
+						实名认证
+					</view>
+					<view class="imageContent">
+						<image @tap.stop="toPreviewImage(index,'license')" mode="aspectFill" class="img-item-mini radius-16"
+							:src="item" v-for="(item,index) in orderInfo.coach_info.id_card" :key="index">
+						</image>
+					</view>
+					
+				</view>
+			</view>
 			<view class="mt-md ml-lg mr-lg fill-base radius-16">
 				<view @tap.stop="$util.goUrl({url:`/user/pages/coupon/use`})"
 					class="flex-between pt-lg pb-lg pl-lg pr-md"
@@ -303,6 +337,16 @@
 				this.payList[1].is_disabled = balance * 1 < this.orderInfo.pay_price * 1
 				this.balance = balance
 			},
+			toPreviewImage(index, key = 0) {
+				let urls = this.orderInfo.coach_info[key]
+				if (key == 'work_img'||key == 'healthy_img') {
+					urls = [urls]
+				}
+				this.$util.previewImage({
+					current: urls[index],
+					urls
+				})
+			},
 			initRefresh() {
 				this.initIndex(true)
 			},
@@ -560,4 +604,17 @@
 			}
 		}
 	}
+	.subtitle{
+		font-size:32upx;
+		color: #232A24;
+		margin:20upx 0;
+	}
+	.imageContent{
+		display:flex;
+		.img-item-mini{
+			margin:0 10upx;
+			width: 200upx;
+			height: 200upx;
+		}
+	}
 </style>
diff --git a/user/pages/order/detail.vue b/user/pages/order/detail.vue
index 435852d..43de0ee 100644
--- a/user/pages/order/detail.vue
+++ b/user/pages/order/detail.vue
@@ -303,12 +303,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				if (!this.configInfo.id || refresh) {
 					await this.getConfigInfo()
diff --git a/user/pages/order/evaluate.vue b/user/pages/order/evaluate.vue
index e8db398..6b8607c 100644
--- a/user/pages/order/evaluate.vue
+++ b/user/pages/order/evaluate.vue
@@ -82,12 +82,12 @@
 			...mapMutations([]),
 			async initIndex() {
 				// #ifdef H5
-				// if (this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				let {
 					id
diff --git a/user/pages/stored/consume.vue b/user/pages/stored/consume.vue
index f2879cb..f6a25a7 100644
--- a/user/pages/stored/consume.vue
+++ b/user/pages/stored/consume.vue
@@ -118,12 +118,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				let cur_time = new Date(Math.ceil(new Date().getTime()))
 				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
diff --git a/user/pages/stored/list.vue b/user/pages/stored/list.vue
index 042defb..7f5f582 100644
--- a/user/pages/stored/list.vue
+++ b/user/pages/stored/list.vue
@@ -126,12 +126,12 @@
 			...mapMutations([]),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getList()
 				this.$util.setNavigationBarColor({
diff --git a/user/pages/stored/record.vue b/user/pages/stored/record.vue
index d1003f7..ef31fa0 100644
--- a/user/pages/stored/record.vue
+++ b/user/pages/stored/record.vue
@@ -154,12 +154,12 @@
 			...mapMutations(['updateUserItem']),
 			async initIndex(refresh = false) {
 				// #ifdef H5
-				// if (!refresh && this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				let cur_time = new Date(Math.ceil(new Date().getTime()))
 				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
diff --git a/user/pages/technician-info.vue b/user/pages/technician-info.vue
index 712dad7..18faf87 100644
--- a/user/pages/technician-info.vue
+++ b/user/pages/technician-info.vue
@@ -47,6 +47,22 @@
 					</image>
 				</view>
 			</view>
+			<view class="fill-base mt-md pd-lg f-paragraph c-paragraph radius-16">
+				<view class="f-title c-title text-bold">健康证</view>
+				<view class="flex-warp img-list">
+					<image @tap.stop="toPreviewImage(0,'healthy_img')" mode="aspectFill"
+						class="img-item-mini radius-16" :src="detail.healthy_img" >
+					</image>
+				</view>
+			</view>
+			<view class="fill-base mt-md pd-lg f-paragraph c-paragraph radius-16">
+				<view class="f-title c-title text-bold">工作照</view>
+				<view class="flex-warp img-list">
+					<image @tap.stop="toPreviewImage(0,'work_img')" mode="aspectFill"
+						class="img-item-mini radius-16" :src="detail.work_img" >
+					</image>
+				</view>
+			</view>
 			<view class="fill-base mt-md pd-lg f-paragraph c-paragraph radius-16" v-if="detail.video">
 				<view class="f-title c-title text-bold">视频介绍</view>
 				<video class="item-video mt-md radius-16" style="overflow: hidden;" :loop="false" enable-play-gesture
@@ -85,12 +101,12 @@
 			...mapMutations(['getUserIndex']),
 			async initIndex() {
 				// #ifdef H5
-				// if (this.$jweixin.isWechat()) {
-				// 	await this.$jweixin.initJssdk();
-				// 	this.$jweixin.wxReady(() => {
-				// 		this.$jweixin.hideOptionMenu()
-				// 	})
-				// }
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
 				// #endif
 				await this.getDetail()
 				this.$util.setNavigationBarColor({
@@ -114,7 +130,7 @@
 			onLoadedMetaData(e) {},
 			toPreviewImage(index, key = 0) {
 				let urls = this.detail[key]
-				if (key == 'work_img') {
+				if (key == 'work_img'||key == 'healthy_img') {
 					urls = [urls]
 				}
 				this.$util.previewImage({
@@ -122,6 +138,7 @@
 					urls
 				})
 			},
+			
 		}
 	}
 </script>