视频圈

pages/index/index.vue

@@ -269,13 +269,22 @@
 				<view class="userInfo">
 					<!-- 1.头像 -->
 					<image @click="tozuozhe(artificerItem)" class="userAvatar" :src="artificerItem.artificerImg" mode="aspectFill"></image>
-					<!-- 2.点赞 -->
+					<!-- 2.上线或者下单 -->
+					<view v-if="artificerItem.onLine == 1" class="comment list-view" @click="tozuozhe(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/lijiyuyue.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">预约</text>
+					</view>
+					<view v-if="artificerItem.onLine == 2" class="comment list-view" @click="shangxian(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/qingtashangxian.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">上线</text>
+					</view>
+					<!-- 3.点赞 -->
 					<view class="list-view" @click="cLike(artificerItem);" style="opacity: 0.9; margin-top: 17px;">
 						<image v-if="artificerItem.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<image v-if="artificerItem.sfdz==0" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':artificerItem.sfdz}">{{artificerItem.dzs}}</text>
 					</view>
-					<!-- 3.评论 -->
+					<!-- 4.评论 -->
 					<view class="comment list-view" @click="toComment(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
 						<image src="@/static/img/index/liaotian-2.png" style="width:38px; height:36px; position: absolute; right: 7px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{artificerItem.pls}}</text>
@@ -661,6 +670,7 @@
 			  videoContext.play(); // 播放视频
 			},
 			towxh5Video(item,index){
+				console.log(item);
 				this.playShow=true;
 				this.filePath=item.filePath;
 				this.contentVideo=item.content;
@@ -1352,7 +1362,7 @@
 				})
 				this.currents = 1//点击头像以后就会切换
 			},
-cLike(item){
+			cLike(item){
 				var data={
 					createBy:uni.getStorageSync('userId'),
 					shipinquanId:item.id,
@@ -1412,6 +1422,24 @@ cLike(item){
 				this.$refs.pinglun.open('bottom');
 				this.getPingL(this.videoID);
 			},
+			shangxian(item){//请TA上线
+				var data={
+					userId: item.createBy,
+					byUserId: uni.getStorageSync('userId'),
+				}
+				this.$Request.post("/app/message/insertUpMessage", data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提醒成功！'
+						})
+					}else{
+						uni.showToast({
+							icon:'error',
+							title: '提醒失败！'
+						})
+					}
+				});
+			},
 			getPingL(shipinquanId){//获取评论列表
 				var data={
 					page: this.page,

pages/my/cooperation.vue

@@ -44,12 +44,19 @@
 						</uni-forms-item>
 					</uni-forms>
 				</view>
+				<view class="info-box-item" v-if="status!=null && status!='' &&status != 1">
+					<view class="line"></view>
+					<view class="info-box-item">
+						<view class="info-box-item-name">状态</view>
+						<view v-if="status ==2">通过</view>
+						<view v-if="status ==3">拒绝</view>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="sub">
 			<view class="sub-box">
-				<view class="sub-box-l" @click="submit()" v-if="!applyId">确认提交</view>
+				<view class="sub-box-l" @click="submit()" v-if="status=='' || status==1">确认提交</view>
-				<view class="sub-box-r" @click="goChat()" v-if="!applyId">直接联系 </view>
 				<view class="sub-box-rs" @click="goChat()" v-else>直接联系 </view>
 			</view>
 		</view>
@@ -71,7 +78,8 @@
 				applyId: '',
 				latitude:'',
 				longitude:'',
-				cityData:''
+				cityData:'',
+				status:'',
 			};
 		},
 		onLoad() {
@@ -166,7 +174,7 @@
 						this.applyName = res.data.applyName
 						this.applyPhone = res.data.applyPhone
 						this.applyContent = res.data.applyContent
-						this.applyId = res.data.status
+						this.status = res.data.status
 					}
 				})
 			},

pages/therapist/orderDetail.vue

@@ -256,13 +256,22 @@
 				<view class="userInfo">
 					<!-- 1.头像 -->
 					<image @click="tozuozhe(artificerItem)" class="userAvatar" :src="artificerItem.artificerImg" mode="aspectFill"></image>
-					<!-- 2.点赞 -->
+					<!-- 2.上线或者下单 -->
+					<view v-if="artificerItem.onLine == 1" class="comment list-view" @click="tozuozhe(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/lijiyuyue.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">预约</text>
+					</view>
+					<view v-if="artificerItem.onLine == 2" class="comment list-view" @click="shangxian" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/qingtashangxian.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">上线</text>
+					</view>
+					<!-- 3.点赞 -->
 					<view class="list-view" @click="cLike(artificerItem);" style="opacity: 0.9; margin-top: 17px;">
 						<image v-if="artificerItem.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<image v-if="artificerItem.sfdz==0" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':artificerItem.sfdz}">{{artificerItem.dzs}}</text>
 					</view>
-					<!-- 3.评论 -->
+					<!-- 4.评论 -->
 					<view class="comment list-view" @click="toComment(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
 						<image src="@/static/img/index/liaotian-2.png" style="width:38px; height:36px; position: absolute; right: 7px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{artificerItem.pls}}</text>

pages/videoCircle/gDvideo.vue

@@ -132,13 +132,22 @@
 				<view class="userInfo">
 					<!-- 1.头像 -->
 					<image @click="tozuozhe(artificerItem)" class="userAvatar" :src="artificerItem.artificerImg" mode="aspectFill"></image>
-					<!-- 2.点赞 -->
+					<!-- 2.上线或者下单 -->
+					<view v-if="artificerItem.onLine == 1" class="comment list-view" @click="tozuozhe(artificerItem)" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/lijiyuyue.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">预约</text>
+					</view>
+					<view v-if="artificerItem.onLine == 2" class="comment list-view" @click="shangxian" style="opacity: 0.9; margin-top: 17px;">
+						<image src="@/static/img/index/qingtashangxian.png" style="width:40px; height:40px; position: absolute; right: 7px;"></image>
+						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">上线</text>
+					</view>
+					<!-- 3.点赞 -->
 					<view class="list-view" @click="cLike(artificerItem,k);" style="opacity: 0.9; margin-top: 17px;">
 						<image v-if="artificerItem.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<image v-if="artificerItem.sfdz==0" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':artificerItem.sfdz}">{{artificerItem.dzs}}</text>
 					</view>
-					<!-- 3.评论 -->
+					<!-- 4.评论 -->
 					<view class="comment list-view" @click="toComment(k)" style="opacity: 0.9; margin-top: 17px;">
 						<image src="@/static/img/index/liaotian-2.png" style="width:38px; height:36px; position: absolute; right: 7px;"></image>
 						<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{artificerItem.pls}}</text>
@@ -431,6 +440,24 @@
 				this.$refs.pinglun.open('bottom');
 				this.getPingL(this.videoID);
 			},
+			shangxian(){//请TA上线
+				var data={
+					  userId: this.artificerId,
+					  byUserId: this.myId
+				}
+				this.$Request.post("/app/message/insertUpMessage", data).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提醒成功！'
+						})
+					}else{
+						uni.showToast({
+							icon:'error',
+							title: '提醒失败！'
+						})
+					}
+				});
+			},
 			getPingL(shipinquanId){//获取评论列表
 				var data={
 					page: this.page,