diff --git a/pages/my/channelMerchants/myMerchants.vue b/pages/my/channelMerchants/myMerchants.vue
index 5714b6a..5ca0049 100644
--- a/pages/my/channelMerchants/myMerchants.vue
+++ b/pages/my/channelMerchants/myMerchants.vue
@@ -60,58 +60,38 @@
 				<view class="view-top">
 					<view class="view-top-left">
 					</view>
-					<view class="view-top-right" @click="showModal">
+					<view class="view-top-right">
 						<image src="../../../static/map2.png" mode=""></image>
 						<span>渠道码</span>
 					</view>
 				</view>
 				<view class="liebiao">
-					<view v-if="codeList.length" class="flex text-center flex-wrap list-view">
+					<view v-if="listData.codeList.length" class="flex text-center flex-wrap list-view-code">
 						<view class="margin-bottom-sm radius touxiang-left">
-							<view class="flex align-center touxiang-left-view" v-for="(item, index) in codeList" :key='index' @click="goOrder(item)">
-								<view class="touxiang-left-content">
-									<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img"  :src="item.artificerImg ? item.artificerImg : '../../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
-									<image  class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
-									<image class="touxiang-frame" :src="item.technicianType=='3'?'../../../static/vip/grade1-1.gif':item.technicianType=='4'?'../../../static/vip/grade2-1.gif':'../../../static/vip/grade3-1.gif'"></image>
-								</view>
+							<view class="touxiang-left-view" v-for="(item, index) in listData.codeList" :key='index'>
 								<view class="list-right">
 									<view class="flex align-center" style="justify-content: start;">
 										<view class="flex align-center list-right-top">
 											<view class="list-right-top-view">
 												<view class="flex">
-													<span class="list-right-top-name">{{ item.artificerName }}</span>
-													<!-- <span class="label-word">{{ item.artificerClassifyList[0].classifyName }}</span> -->
+													<span class="list-right-top-name">名称：{{ item.name }}</span>
 												</view>
-												<view class="keyuyue keyuyue-lan" v-if="item.status == 1">
+												<view class="keyuyue keyuyue-lan">
 														<view class="flex">
-															<view class="timea-fu">可服务</view>
-															<view class="timea-time">{{item.time}}</view>
+															<view class="timea-fu">地址：{{ item.address }}</view>
 														</view>
 												</view>
-												<view class="keyuyue keyuyue-hui" v-else>
-													<view class="flex">
-														<view class="timea-hui">休息中</view>
-													</view>
-												</view>
-				
 											</view>
 										</view>
 									</view>
 								</view>
+								<view class="touxiang-left-content">
+									<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img"  :src="item.codeImage ? item.codeImage : '../../../static/logo.png'" mode="aspectFill"></image>
+								</view>
 							</view>
 						</view>
 					</view>
-<!-- 					<empty v-if="codeList.length == 0"></empty> -->
-				</view>
-			</view>
-			<tki-qrcode ref="qrcode" :val="url" :size="200" background="#fff" foreground="#000" pdground="#000"
-				:onval="true" :loadMake="true" @result="qrR" :show="false"></tki-qrcode>
-			<view class="cu-modal" :class="modalName == 'Image' ? 'show' : ''" @tap="hideModal">
-				<view class="cu-dialog" v-if="backgroundImage && erweimapath && haibaoShow" @tap="hideModal">
-					<view class="bg-img">
-						<wm-poster @success="posterSuccess" :imgSrc="backgroundImage" :Referrer="'我的邀请码:'+invitationCode"
-							:QrSrc="erweimapath" :Title="tuiguang" :LineType="false"></wm-poster>
-					</view>
+					<empty v-if="listData.codeList.length == 0"></empty>
 				</view>
 			</view>
 		</view>
@@ -139,16 +119,14 @@
 				erweimapath: '',
 				invitationCode: '',
 				tuiguang: '',
-				codeList: [],
 			}
 		},
 		onLoad() {			
 			this.avatar = uni.getStorageSync('avatar')
 			this.getData();
-			this.getBackImageList();
 			this.getUserInfo();
-			this.getlist();
-			this.tabNavSon();
+			// this.getlist();
+			// this.tabNavSon();
 			this.$Request.getT('/app/common/type/116').then(res => {
 				if (res.code === 0) {
 					if (res.data && res.data.value) {
@@ -251,15 +229,6 @@
 					}
 				})
 			},
-			changeClickSon(item){
-				var index = []
-				for(var i=0;i<item.detail.data.length;i++){
-					index.push(item.detail.data[i].value)
-				}
-			   this.classifyId = index.join(",")
-			   this.artificerName='';
-			   this.page=1;
-			},
 			changeClick(index,item){
 				this.artificerName='';
 				this.technicianType=item.id;
@@ -290,8 +259,7 @@
 										}
 									});
 								} else {
-									this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this
-										.invitationCode+"&flag=3";
+									this.url = this.$queue.publicYuMingApp() + '/?blQdsCode=' + this.invitationCode;
 								}
 							}
 						});
@@ -300,57 +268,13 @@
 					}
 				});
 			},
-			getBackImageList() {
-				this.$Request.get("/app/commission/jjr/poster").then(res => {
-					uni.hideLoading();
-					if (res.code == 0) {
-							this.backgroundImage = res.data.artificerImage;
-					}
-					console.log("res.data--->", this.backgroundImage);
-				});
-				// this.make();
-			},
-			make() {
-				uQRCode.make({
-					canvasId: 'default_PosterCanvasId',
-					componentInstance: this,
-					text: this.url,
-					size: 68,
-					margin: 4,
-					backgroundColor: '#ffffff',
-					foregroundColor: '#000000',
-					fileType: 'jpg',
-					correctLevel: uQRCode.errorCorrectLevel.H,
-					success: res => {
-						console.log(res)
-					}
-				})
-			},
-			hideModal() {
-				this.modalName = null;
-			},
-			qrR(path) {
-				this.erweimapath = path;
-			},
-			posterSuccess(haibaoImg) {
-				this.haibaoImg = haibaoImg;
-				this.modalName = 'Image';
-			},
-			showModal() {
-				if (!this.haibaoImg) {
-					this.haibaoShow = true;
-					this.$queue.showLoading('海报生成中...');
-				} else {
-					this.modalName = 'Image';
-				}
-			},
 			goNav(link){
 				uni.navigateTo({
-					url:link+'?navName='+'经纪人'
+					url:link+'?navName='+'渠道商'
 				})
 			},
 			getData(){
-				this.$Request.get("/app/commission/jjr/myJjr").then(res => {
+				this.$Request.get("/app/commission/qds/myQds").then(res => {
 					console.log("res.data--->", res.data);
 					if (res.code == 0) {
 							this.listData=res.data
@@ -468,6 +392,12 @@
 		flex-direction: column;
 		align-items: center;
 	}
+	.list-view-code{
+		width:100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 	.mian-list{
 		width:100%;
 		display: flex;
@@ -624,8 +554,20 @@
 	}
 	.liebiao{
 		//height: 100vh;
-		margin-top: 85px;
+		margin-top: 25px;
 		display: flex;
 		flex-direction: column;
 	}
+	.touxiang-left-content{
+		margin-bottom: 15px;
+	}
+	.touxiang-left-content-img{
+		width : 320px;
+		height: 320px;
+	}
+	.list-right-top-name{
+		font-size: 16px;
+		font-weight: 600;
+		color: #333;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 00baba9..69da7d5 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -163,38 +163,38 @@
 					<image style="padding: 3rpx;" src="../../static/my-gong-4.png" mode=""></image>
 					<span class="my-use-list-text">城市合伙人</span>
 				</view>
-<!-- 				<view class="my-use-list" v-if="blIsJjr=='0'" @click="useToUrl('/pages/my/applyBroker/index')">
+				<view class="my-use-list" v-if="blIsJjr=='0'" @click="useToUrl('/pages/my/applyBroker/index')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
 					<span class="my-use-list-text">申请经纪人</span>
 				</view>
 				<view class="my-use-list" v-if="blIsJjr=='1'" @click="useToUrl('/pages/my/applyBroker/myBroker')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
 					<span class="my-use-list-text">我是经纪人</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsYwy=='0'" @click="useToUrl('/pages/my/applySalesperson/index')">
+				</view>
+ 				<view class="my-use-list" v-if="blIsYwy=='0'" @click="useToUrl('/pages/my/applySalesperson/index')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-14.png" mode=""></image>
 					<span class="my-use-list-text">申请业务员</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsYwy=='1'" @click="useToUrl('/pages/my/applySalesperson/mySalesperson')">
+				</view>
+ 				<view class="my-use-list" v-if="blIsYwy=='1'" @click="useToUrl('/pages/my/applySalesperson/mySalesperson')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-13.png" mode=""></image>
 					<span class="my-use-list-text">我是业务员</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsFxy=='0'" @click="useToUrl('/pages/my/applyDistributor/index')">
+				</view>
+ 				<view class="my-use-list" v-if="blIsFxy=='0'" @click="useToUrl('/pages/my/applyDistributor/index')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-15.png" mode=""></image>
 					<span class="my-use-list-text">申请分销员</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsFxy=='1'" @click="useToUrl('/pages/my/applyDistributor/myDistributor')">
+				</view>
+ 				<view class="my-use-list" v-if="blIsFxy=='1'" @click="useToUrl('/pages/my/applyDistributor/myDistributor')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-16.png" mode=""></image>
 					<span class="my-use-list-text">我是分销员</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsQds=='0'" @click="useToUrl('/pages/my/channelMerchants/index')">
+				</view>
+				<view class="my-use-list" v-if="blIsQds=='0'" @click="useToUrl('/pages/my/channelMerchants/index')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
 					<span class="my-use-list-text">申请渠道商</span>
-				</view> -->
-<!-- 				<view class="my-use-list" v-if="blIsQds=='1'" @click="useToUrl('/pages/my/channelMerchants/myMerchants')">
+				</view>
+				<view class="my-use-list" v-if="blIsQds=='1'" @click="useToUrl('/pages/my/channelMerchants/myMerchants')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-12.png" mode=""></image>
 					<span class="my-use-list-text">我是渠道商</span>
-				</view> -->
+				</view>
 				<!-- <view class="my-use-list" @click="useToUrl('/pages/my/joinUs/index')">
 					<image style="padding: 3rpx;" src="../../static/my-gong-11.png" mode=""></image>
 					<span class="my-use-list-text">招商加盟</span>
diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index 884d3ee..de383ae 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -52,6 +52,15 @@
 					<view class="userInfo">
 						<!-- 1.头像 -->
 						<image @click="tozuozhe(list)" class="userAvatar" :src="list.artificerImg" mode="aspectFill"></image>
+						<!-- 2.上线或者下单 -->
+						<view v-if="list.onLine == 1" class="comment list-view" @click="tozuozhe(list)" 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="list.onLine == 2" class="comment list-view" @click="shangxian(list)" 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>
 						<!-- 2.点赞 -->
 						<view class="list-view" @click="cLike(list.sfdz);" style="opacity: 0.9; margin-top: 17px;">
 							<image v-if="list.sfdz==1" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
@@ -324,6 +333,24 @@
 				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,