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

pages.json

@@ -511,6 +511,15 @@
 						"titleNView": false
 					}
 				}
+			},{
+				"path": "order/payModifyJsDetail",
+				"style": {
+					"navigationBarTitleText": "技师订单详情",
+					"enablePullDownRefresh": false,
+					"app-plus": {
+						"titleNView": false
+					}
+				}
 			},{
 				"path": "order/payCLDetail",
 				"style": {

pages/therapist/orderDetail.vue

@@ -31,14 +31,7 @@
 						
 					</view>
 				</view>
-				<view class="jieshao">
+				
-					<view>
-						自我介绍
-					</view>
-					<view>
-						{{order.content}}
-					</view>
-				</view>
 				<view class="oder-mian">
 					<view class="oder-mian-left">
 						<span>ID:{{order.artificerId}}</span>
@@ -78,6 +71,7 @@
 					</view>
 				</view> -->
 			</view>
+			
 			<view class="oder-foot">
 				<view class="oder-foot-left">
 					<view class="oder-foot-left-view">
@@ -115,6 +109,14 @@
 				</view>
 			</view>
 		</view> -->
+		<view class="jianjie">
+			<view class="jianjie-title">
+				自我介绍
+			</view>
+			<view class="jieshao">
+				{{order.content}}
+			</view>
+		</view>
 		<view class="oder-footer">
 			<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
 				gutter="60">
@@ -554,7 +556,7 @@
 					this.$queue.setData('getJishi',data)
 					this.$queue.setData('xiangmu',massageTypeId)
 					uni.navigateTo({
-						url: "/my/order/payModify"
+						url: "/my/order/payModifyJsDetail"
 					})
 				}
 
@@ -604,6 +606,41 @@
 </script>
 
 <style scoped>
+	.jianjie-title{
+		padding: 0px !important;
+		text-align: left;
+		transition-property: background-color, color;
+		height: 40px;
+		line-height: 40px;
+		font-size: 13px;
+		color: #000000;
+		transition-duration: 0.5s;
+		width: 100%;
+		font-weight: bold;
+	}
+	.jianjie{
+		width: 95%;
+		height: 126px;
+		background: #FFFFFF;
+		border-radius: 10px;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 10px;
+	}
+	.jieshao{
+		width: 100%;
+		margin-top: 15px;
+		font-size: 26rpx;
+		line-height: 40rpx;
+		color: #888;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		}
 	/deep/.padding-tb-sm{
 		background: #fff;
 		padding: 10px;
@@ -1077,18 +1114,7 @@
 		align-items: center;
 		margin-left: 10px;
 	}
-	.jieshao{
+	
-		margin-top: 15px;
-		margin-bottom: 15px;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		color: #888;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		}
 	.view-head{
 		padding-bottom: 15px;
 		margin: 15px 24px 0px 24px;