收缩

my/order/payModifyDzhifu.vue

@@ -429,7 +429,7 @@
 							// that.showpay = true;
 							that.paySel = 1;
 							uni.navigateTo({
-								url:'/my/order/paydingXiuGai?ordersId='+ res.data.ordersId
+								url:'/my/order/payding?ordersId='+ res.data.ordersId
 							})
 						} else {
 							that.$queue.showToast(res.msg)

pages.json

@@ -550,6 +550,14 @@
 			}
 		}, 
 		// #endif
+		{
+			"path": "pages/therapist/therapistShou",
+			"style": {
+				"navigationBarTitleText": "选择技师",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, 
 		{
 			"path": "pages/therapist/therapistList",
 			"style": {

pages/cooperate/hehuo.vue

@@ -93,7 +93,7 @@
 				],
 				currentJ: 0,
 				mianji: [{
-						value: '平米一下',
+						value: '50平米一下',
 						name: '50平米一下',
 						checked: 'true'
 					},
@@ -177,11 +177,13 @@
 					userId: userId,
 					name: this.userName,
 					phone: this.phone,
-					age: this.age,
+					remark:this.beizhu,
-					city: this.city,
+					queone:this.mendianData,
-					img: this.headImg,
+					quetwo:this.mianjiData,
+					quethree:this.tuanduiData,
+					queforu:this.xiangmuData,
 				}
-				this.$Request.postJson('/app/artificer/insertAgency', data).then(res => {
+				this.$Request.postJson('/app/dlssqjl/insertDlssqjl', data).then(res => {
 					if (res.code == 0) {
 						uni.hideLoading();
 						this.$queue.showToast('提交成功！');

pages/index/index.vue

@@ -29,9 +29,17 @@
 					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
 					<view class="localName">{{ city }}</view>
 				</view>
-				<u-search class="" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName"
+				<uni-data-select
-					:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
+					v-model="valueSelect"
-					></u-search>
+					:localdata="rangeSelect"
+					@change="changeSelect"
+				></uni-data-select>
+					<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
+					 @clear="clear">
+					</uni-search-bar>
+					<view class="search-btn" @click="searchBtn">
+						搜索
+					</view>
 			</view>
 			
 			<view class="index-nav-bottom width">
@@ -248,7 +256,7 @@
 								<image src="../../static/index-fenglei12.png" mode="widthFix"></image>
 								<span class="feng_word">美容师</span>
 							</view>
-							<view class="index-project-content1" @click="yuedao()">
+							<view class="index-project-content1" @click="yuedao('商家')">
 								<image src="../../static/index-fenglei9.png" mode="widthFix"></image>
 								<span class="feng_word">约到店</span>
 							</view>
@@ -282,6 +290,13 @@
 	export default {
 		data() {
 			return {
+				serviceTrue:true,
+				valueSelect: '技师',
+				changeSelectData:'',
+				rangeSelect: [
+				  { value: '技师', text: "技师" },
+				  { value: '项目', text: "项目" },
+				],
 				cityList: [],
 				Cityshow: false,
 				artificerName: '',
@@ -351,7 +366,7 @@
 				
 				],
 				typeList:[],
-				searchValue: '123123',
+				searchValue: '',
 				starTechnician:[],//明星技师
 				nearbyTechnician:[],//附近技师
 				classifyId: '',
@@ -525,6 +540,24 @@
 			// }
 		},
 		methods: {
+			searchBtn(){//搜索按钮
+				if(this.changeSelectData=='项目'){
+					uni.navigateTo({
+						url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/therapist/therapistShou?searchValue='+this.searchValue
+					})
+				}
+			},
+			input(res) {//搜索 输入框
+				this.searchValue=res;
+				
+			},
+			changeSelect(e) {
+				this.changeSelectData=e
+			  },
 			shangcheng(){
 				uni.navigateTo({
 					url:'/package/pages/zysc/index/index'
@@ -1038,6 +1071,70 @@
 </script>
 
 <style scoped>
+	.index-mian /deep/.uni-scroll-view-content{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	/deep/.uni-select__selector-scroll{
+		height: 100px;
+	}
+	/deep/.uni-stat__select{
+		width: 60px;
+		max-width: 60px;
+	}
+	/deep/.uni-select{
+			width: 60px;
+			font-size: 14px;
+		    border: 1px solid #e5e5e5;
+		    box-sizing: border-box;
+		    border-radius: 4px;
+		    padding: 0 5px;
+		    padding-left: 10px;
+		    position: relative;
+		    display: flex;
+		    -webkit-user-select: none;
+		    user-select: none;
+		    flex-direction: row;
+		    align-items: center;
+		    width: 100%;
+		    flex: 1;
+		    height: 35px;
+			background-color: #fff;
+	}
+	/deep/.uni-searchbar__cancel{
+		display: none;
+	}
+	.search-btn{
+		text-align: center;
+		line-height: 31px;
+		color: #fff;
+		
+		height: 32px !important;
+	}
+	/deep/.uni-searchbar__box-icon-search,.search-btn{
+		width: 150rpx;
+		height: 60rpx;
+		background: #18A689;
+		border-radius: 31rpx;
+		
+	}
+	/deep/.uni-searchbar__box{
+		height: 31px;
+		border-radius: 15px !important;
+		background-color: #fff !important;
+		border: 1px solid #E5E5E5;
+		padding: 0px;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+	/deep/.uni-searchbar{
+		width: 130px;
+		border-radius: 31rpx;
+	}
+	
 	.popup-mian-view{
 		width: 100%;
 		display: flex;
@@ -1253,7 +1350,7 @@
 	/deep/.uni-scroll-view-content{
 		display: flex;
 		flex-direction: row;
-		justify-content: space-between;
+		justify-content: space-around;
 	}
 	.top-menu-view {
 		display: flex;
@@ -1753,9 +1850,7 @@
 		justify-content: space-between;
 		margin: 0px auto 8px auto;
 	}
-	/deep/.uni-select__selector{
+	
-		width: 200px;
-	}
 	.index-mian-select image{
 		width: 16px;
 		height: 8px;
@@ -1776,28 +1871,7 @@
 		padding: 0px 10px;
 	}
 	
-	/deep/.uni-select__input-box .uni-icons {
+
-	  display: none;
-	}
-	/deep/.uni-select__input-text{
-		font-weight: bold;
-		font-size: 29rpx;
-	}
-	/deep/.uni-select{
-		border: 0px;
-		padding: 0px;
-	}
-	/deep/.uni-searchbar .uni-searchbar__cancel{
-		display: none;
-	}
-	/deep/.uni-searchbar{
-		padding: 0px;
-	}
-	/deep/.uni-searchbar__box{
-		border-radius: 30px !important;
-		width: 300px;
-		height: 63.89rpx;
-	}
 	.index-top-mian{
 		display: flex;
 		flex-direction: row;

pages/my/fuwuGengduo.vue

@@ -82,8 +82,12 @@
 				classifyId:''
 			}
 		},
-		onLoad(){
+		onLoad(e){
+			
 			this.myId = uni.getStorageSync('userId')
+			if(e){
+				this.searchValue=e.searchValue
+			}
 			this.getData()
 		},
 		onPullDownRefresh: function() {

pages/therapist/therapist.vue

@@ -31,8 +31,7 @@
 							<!-- <view class="zpmore_view_left" v-if="item.technicianType==1" @click.stop="saveImgss(item.technicianType, 0)">
 								<image src="../../static/dituzhaoren1.png" mode=""></image>
 							</view> -->
-							<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>
+							<image class="touxiang-frame"  :src="item.technicianType=='3'?'../../static/vip/grade4.png':item.technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image>
-							<image class="touxiang-frame"  src="../../static/vip/grade4.png"></image>
 						</view>
 						<view class="list-right">
 							<view class="flex align-center" style="justify-content: start;">
@@ -342,7 +341,9 @@ import permision from "@/components/permission.js";
 			that.massageTypeId = e.massageTypeId
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
-			
+			if(e){
+				this.artificerName=e.searchValue
+			}
 			that.getTypeList();
 			uni.getLocation({
 				type: 'gcj02',

pages/therapist/therapistDingdan.vue

@@ -34,7 +34,7 @@
 								<image src="../../static/dituzhaoren1.png" mode=""></image>
 							</view> -->
 							<!--<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>-->
-							<image class="touxiang-frame"  src="../../static/vip/grade5.png"></image>
+							<image class="touxiang-frame"  :src="item.technicianType=='3'?'../../static/vip/grade4.png':item.technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image>
 							
 						</view>
 						<view class="list-right">