diff --git a/common/config.js b/common/config.js
index a4f3d4e..5a64acf 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,16 +1,12 @@
 
-const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/";
+// const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/";
 const ROOTPATH = "http://192.168.2.22:8187/sqx_fast";
-const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast";
-
-// const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/";
-// const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast";
-// const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast";
+// const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast";
 
 //生产环境
 // const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换
-// const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换
-// const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换
+const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换
+const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换
 
 //上传地址
 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';
@@ -22,7 +18,6 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
 //ws基础连接地址
 
 // const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/';
-// const WS_BASE_PATH = 'ws://sausers.blxinchuang.com/sqx_fast/';
 const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换
 
 //地图ws接口
diff --git a/common/queue.js b/common/queue.js
index 2be8057..fb01bbd 100644
--- a/common/queue.js
+++ b/common/queue.js
@@ -19,13 +19,11 @@ module.exports = {
 	//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
 	publicYuMing() {
 		return 'https://admin.sjajk.com'//生产需替换
-		// return 'https://sausers.blxinchuang.com'
 		// return 'http://192.168.2.222:8187'
 	},
 	//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
 	publicYuMingApp() {
-		return 'https://admin.sjajk.com'//生产需替换
-		// return 'https://sausers.blxinchuang.com'
+		return 'https://wx.sjajk.com'//生产需替换
 		// return 'http://192.168.2.222:8187'
 	},
 	logout() {
diff --git a/components/tki-qrcode/tki-qrcode.vue b/components/tki-qrcode/tki-qrcode.vue
index e3a6cc6..12baf03 100644
--- a/components/tki-qrcode/tki-qrcode.vue
+++ b/components/tki-qrcode/tki-qrcode.vue
@@ -83,6 +83,7 @@ export default {
 	},
 	methods: {
 		_makeCode() {
+			console.log(8989898,this)
 			let that = this
 			if (!this._empty(this.val)) {
 				qrcode = new QRCode({
@@ -99,6 +100,7 @@ export default {
 					image: that.icon, // 二维码图标
 					imageSize: that.iconSize,// 二维码图标大小
 					cbResult: function (res) { // 生成二维码的回调
+					console.log(987,res)
 						that._result(res)
 					},
 				});
diff --git a/components/wm-poster/wm-posterorders.vue b/components/wm-poster/wm-posterorders.vue
index 198bad1..b8eae9a 100644
--- a/components/wm-poster/wm-posterorders.vue
+++ b/components/wm-poster/wm-posterorders.vue
@@ -227,7 +227,8 @@
 						canvasId: _this.CanvasID,
 						quality: 1,
 						complete: res => {
-							_this.tempFilePath = res.tempFilePath;
+							console.log(321321,_this.tempFilePath)
+							// _this.tempFilePath = res.tempFilePath;
 							_this.$emit('success', res);
 							_this.loading = false;
 							_this.$queue.showToast('长按图片保存海报');
diff --git a/index.html b/index.html
index 762dcc9..223e938 100644
--- a/index.html
+++ b/index.html
@@ -20,8 +20,8 @@
     <script type="text/javascript">
       window._AMapSecurityConfig = {
         //securityJsCode: "js秘钥",
-        // serviceHost: 'https://wx.sjajk.com/_AMapService',
-        serviceHost: 'http://sauser.blxinchuang.com/_AMapService',
+        serviceHost: 'https://wx.sjajk.com/_AMapService',
+        // serviceHost: 'http://sauser.blxinchuang.com/_AMapService',
 		//serviceHost: 'http://120.46.52.165/_AMapService',
 		// serviceHost: 'http://192.168.2.222:8187/_AMapService',
       };
diff --git a/manifest.json b/manifest.json
index 3aa15a0..1f25fa6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -174,7 +174,8 @@
             "proxy" : {
                 // 可代理多个
                 "/TencentGet" : {
-                    "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析
+                    // "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析
+					"target" : "http://admin.sjajk.com/", // 腾讯地图逆地址解析
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
@@ -188,7 +189,8 @@
                 "amap" : {
                     "key" : "32c22db939160ba44394eb187f7897ae",
                     "securityJsCode" : "260614bdf77a5961d4379530363dc5c0",
-                    "serviceHost" : "http://sauser.blxinchuang.com/_AMapService"
+                    // "serviceHost" : "http://sauser.blxinchuang.com/_AMapService"
+					"serviceHost" : "http://admin.sjajk.com/_AMapService"
                 }
             }
         },
diff --git a/pages/msg/im.vue b/pages/msg/im.vue
index fd0f7e2..d0c17cc 100644
--- a/pages/msg/im.vue
+++ b/pages/msg/im.vue
@@ -784,7 +784,6 @@
 				uni.showLoading({
 					title: '连接中...'
 				})
-				// wss://sausers.blxinchuang.com/wss/chatSocket/
 				// websocketUtils.getWsBaseUrl()
 				uni.connectSocket({
 					url: websocketUtils.getWsBaseUrl() + userId,
diff --git a/pages/my/applyBroker/myBroker.vue b/pages/my/applyBroker/myBroker.vue
index 12444a1..696b3ff 100644
--- a/pages/my/applyBroker/myBroker.vue
+++ b/pages/my/applyBroker/myBroker.vue
@@ -8,7 +8,7 @@
 					</view>
 					<view class="bgimg-top-view">
 						<view class="bgimg-top-money">
-							<span>{{listData.name}}</span>
+							<span>{{listData.name}}</span><span>(等级：{{jsLevel}};提成比例：{{jsRate}})</span>
 							<!-- <span>平台</span>
 							<span style="color: #fff;">当前身份：一级分销员</span> -->
 						</view>
@@ -18,7 +18,7 @@
 					<view class="mian-title" style="position: relative;">
 						<view class="mian-title-top">
 							<span class="money">{{listData.withdrawableAmount}}</span>
-							<span class="list-title">可提现(元)</span>
+							<span class="list-title">可提现(元</span>
 						</view>
 						<view class="mian-title-top">
 							<view class="detail-btn" @click="goNav('/pages/my/applyBroker/withdrawal')">
@@ -40,7 +40,7 @@
 							<view class="list-title">未入账(元)</view>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
 			<view class="mian-bottom">
@@ -80,15 +80,16 @@
 				</view>
 			</view>
 			<view class="foot-img-list" @click="showModal">
-				<image  class="foot-img" src="../../../static/suggest-banner.png" mode=""></image>
+				<image class="foot-img" src="../../../static/suggest-banner.png" mode=""></image>
 			</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>
+						<wm-poster @success="posterSuccess" :imgSrc="backgroundImage"
+							:Referrer="'我的邀请码:'+invitationCode" :QrSrc="erweimapath" :Title="tuiguang"
+							:LineType="false"></wm-poster>
 					</view>
 				</view>
 			</view>
@@ -107,18 +108,22 @@
 			return {
 				url: '',
 				avatar: '',
-				listData:[],
+				listData: [],
 				haibaoImg: null,
 				haibaoShow: false,
 				modalName: '',
-				backgroundImage:'',
+				backgroundImage: '',
 				invitationCode: '',
 				erweimapath: '',
 				tuiguang: '',
+				jsdj:[], //技师等级配置信息
+				jsLevel:'', //技师等级
+				jsRate:'', //技师提成比例
 			}
 		},
-		onLoad() {			
+		async onLoad() {
 			this.avatar = uni.getStorageSync('avatar')
+			this.jsdj =await this.getJsdj()
 			this.getData();
 			this.getBackImageList();
 			this.getUserInfo();
@@ -155,7 +160,7 @@
 				imageUrl: this.bgImg
 			}
 		},
-		methods:{
+		methods: {
 			getUserInfo() {
 				this.$Request.get("/app/user/selectUserById").then(res => {
 					if (res.code == 0) {
@@ -176,11 +181,12 @@
 								} else {
 									// this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this
 									// 	.invitationCode+"&flag=3";
-									this.url = this.$queue.publicYuMingApp() + '/pages/public/login?blJjrCode=' + this.invitationCode;
+									this.url = this.$queue.publicYuMingApp() +
+										'/pages/public/login?blJjrCode=' + this.invitationCode;
 								}
 							}
 						});
-			
+
 						//#endif
 					}
 				});
@@ -189,7 +195,7 @@
 				this.$Request.get("/app/commission/jjr/poster").then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
-							this.backgroundImage = res.data.artificerImage;
+						this.backgroundImage = res.data.artificerImage;
 					}
 					console.log("res.data--->", this.backgroundImage);
 				});
@@ -225,22 +231,41 @@
 				if (!this.haibaoImg) {
 					this.haibaoShow = true;
 					this.$queue.showLoading('海报生成中...');
+					console.log('没有！！！')
 					console.log(this.backgroundImage);
 					console.log(this.erweimapath);
 				} else {
 					this.modalName = 'Image';
 				}
 			},
-			goNav(link){
+			goNav(link) {
 				uni.navigateTo({
-					url:link+'?navName='+'经纪人'
+					url: link + '?navName=' + '经纪人'
 				})
 			},
-			getData(){
+			getJsdj() {
+				return new Promise((resolve, reject) => {
+					this.$Request.get("/app/commission/jjr/findList", {}).then(res => {
+						resolve(res.data);
+					}).catch(err => {
+						reject([]);
+					});
+				});
+			},
+			async getData() {
+				let that = this
 				this.$Request.get("/app/commission/jjr/myJjr").then(res => {
 					console.log("res.data--->", res.data);
 					if (res.code == 0) {
-							this.listData=res.data
+						that.listData = res.data
+						let result = []
+						if(res.data.artificerCount == 0){
+							 result = that.jsdj.filter(item => item.minNumber == 0 )
+						}else{
+							result = that.jsdj.filter(item => res.data.artificerCount > item.minNumber && res.data.artificerCount <= item.maxNumber)
+						}
+						that.jsLevel = result[0] ? result[0].level : ''
+						that.jsRate = result[0] ? result[0].rate + '%' : ''
 					}
 				});
 			}
@@ -249,21 +274,24 @@
 </script>
 
 <style scoped>
-	.mian-foot-top-list span:nth-child(1){
+	.mian-foot-top-list span:nth-child(1) {
 		margin-bottom: 5px;
 	}
-	.mian-foot-top-list{
+
+	.mian-foot-top-list {
 		display: flex;
 		flex-direction: column;
 	}
-	.mian-foot-top{
+
+	.mian-foot-top {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
 	}
-	.mian-foot{
+
+	.mian-foot {
 		width: 93%;
 		margin: 0 auto;
 		background-color: #fff;
@@ -274,7 +302,8 @@
 		align-items: center;
 		margin-top: 20px;
 	}
-	.bangzhu{
+
+	.bangzhu {
 		width: 15px;
 		height: 15px;
 		position: absolute;
@@ -283,45 +312,53 @@
 		top: 0;
 		margin-top: -10px;
 	}
-	.mian-title-top{
+
+	.mian-title-top {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	.foot-img-list{
+
+	.foot-img-list {
 		width: 92%;
 		margin: 0 auto;
 	}
-	.foot-img image{
-		width:100%;
+
+	.foot-img image {
+		width: 100%;
 		height: 100%;
 	}
-	.foot-img{
+
+	.foot-img {
 		width: 100%;
-		height:180rpx;
+		height: 180rpx;
 		margin: 0 auto;
-		margin-top:20rpx;
+		margin-top: 20rpx;
 	}
-	.mian-bottom-list span{
+
+	.mian-bottom-list span {
 		color: #333;
 		font-size: 14px;
 		font-weight: bold;
 		margin-top: 5px;
 	}
-	.mian-bottom-list{
-		width:30%;
+
+	.mian-bottom-list {
+		width: 30%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	.mian-bottom-img{
+
+	.mian-bottom-img {
 		height: 40px;
 		width: 40px;
 		flex: 0 0 40px;
 		background-color: transparent;
 		border-radius: 500px;
 	}
-	.mian-bottom{
+
+	.mian-bottom {
 		width: 93%;
 		margin: 0 auto;
 		background-color: #fff;
@@ -333,37 +370,43 @@
 		align-items: center;
 		margin-top: 155px;
 	}
-	.mian-top-title{
+
+	.mian-top-title {
 		color: #333;
 		font-size: 16px;
 		font-weight: bold;
 	}
-	.money{
+
+	.money {
 		color: #333;
 		font-size: 15px;
 		font-weight: bold;
 	}
-	.list-title{
+
+	.list-title {
 		margin-top: 5px;
 		font-size: 12px;
 		color: #B8B8B8;
 		font-weight: 400;
 	}
-	.list-view{
-		width:30%;
+
+	.list-view {
+		width: 30%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
-	.mian-list{
-		width:100%;
+
+	.mian-list {
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		margin-bottom: 20px;
 	}
-	.mian-title{
-		width:100%;
+
+	.mian-title {
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
@@ -372,7 +415,8 @@
 		border-bottom: 1px solid #ccc;
 		margin-bottom: 15px;
 	}
-	.mian{
+
+	.mian {
 		width: 100%;
 		margin: 0 auto;
 		background-color: #fff;
@@ -382,7 +426,8 @@
 		flex-direction: column;
 		margin-top: 15px;
 	}
-	.detail-btn{
+
+	.detail-btn {
 		display: inline-block;
 		width: 100px;
 		text-align: center;
@@ -394,12 +439,14 @@
 		margin: 0 auto;
 		margin-top: 4px;
 		font-size: 34rpx;
-		}
-	.content-top{
+	}
+
+	.content-top {
 		width: 100%;
 		height: 100%;
 	}
-	.content{
+
+	.content {
 		width: 100%;
 		height: 100vh;
 		padding-bottom: 10rpx;
@@ -408,32 +455,38 @@
 		background-repeat: no-repeat;
 		background-size: cover;
 	}
+
 	page {
 		background-color: #F7F7F7;
 	}
-	.bgimg-top-money span:nth-child(1){
+
+	.bgimg-top-money span:nth-child(1) {
 		font-weight: bold;
 		font-size: 43rpx;
 		color: #FFFFFF;
 	}
-	.bgimg-top-money span:nth-child(2){
+
+	.bgimg-top-money span:nth-child(2) {
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #FFFFFF;
-		margin-top:4px;
+		margin-top: 4px;
 	}
-	.bgimg-top-money{
+
+	.bgimg-top-money {
 		display: flex;
 		flex-direction: column;
 		margin-left: 10px;
 	}
-	.bgimg-top-view{
+
+	.bgimg-top-view {
 		width: 80%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 	}
-	.bgimg-top{
+
+	.bgimg-top {
 		width: 100%;
 		display: flex;
 		flex-direction: row;
@@ -441,6 +494,7 @@
 		align-items: center;
 		margin-top: 15rpx;
 	}
+
 	.bgimg {
 		background: url(../../../static/wallet/reduce.png);
 		background-size: cover;
@@ -453,7 +507,8 @@
 		justify-content: space-between;
 		padding: 15px;
 	}
-	.mingxi{
+
+	.mingxi {
 		width: 140rpx;
 		height: 42rpx;
 		line-height: 42rpx;
diff --git a/pages/my/applySalesperson/channelMerchants.vue b/pages/my/applySalesperson/channelMerchants.vue
index 576b984..2871d59 100644
--- a/pages/my/applySalesperson/channelMerchants.vue
+++ b/pages/my/applySalesperson/channelMerchants.vue
@@ -39,6 +39,28 @@
 								</view>
 							</view>
 						</view>
+						<!-- <view class="therapist-mian" v-for="(qdsCodeItem, qdsCodeIndex) in item.qdsCodeList">
+							<view class="therapist-mian-top">
+								<view class="therap-pin" >
+									<span>{{ qdsCodeItem.name}}:</span>
+									<span class="therapist-mian-view-text">
+										{{ qdsCodeItem.rate}}%
+									</span>
+								</view>
+							</view>
+						</view> -->
+						<view style="position: absolute;bottom: 0px;left: 0px;">
+							<view class="" v-for="(qdsCodeItem, qdsCodeIndex) in item.qdsCodeList">
+								<view class="">
+									<view class="therap-pin" >
+										<span>{{ qdsCodeItem.name}}:</span>
+										<span class="therapist-mian-view-text">
+											{{ qdsCodeItem.rate}}%
+										</span>
+									</view>
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -92,8 +114,11 @@
 				let data = {
 					page: this.page,
 					limit: this.limit,
+					// userId:this.$queue.getData('userId')
+					userId:673
 				}
-				this.$Request.get("/app/commission/jjr/artificerDetail", data).then(res => {
+				this.$Request.get("/app/commission/ywy/queryQds", data).then(res => {
+					console.log(res)
 					if (res.code == 0) {
 						if (this.page == 1) {
 							this.orderList = res.data.list
@@ -404,6 +429,7 @@
 		justify-content: space-between;
 		padding: 10rpx;
 		align-items: center;
+		position: relative;
 	}
 
 	.touxiang-left{
diff --git a/pages/my/applySalesperson/index.vue b/pages/my/applySalesperson/index.vue
index 8d3be4b..767f761 100644
--- a/pages/my/applySalesperson/index.vue
+++ b/pages/my/applySalesperson/index.vue
@@ -56,7 +56,7 @@
 				});
 			},
 			save() {
-				if (this.name === '') {
+				if (this.userName === '') {
 					this.$queue.showToast('请输入姓名')
 					return;
 				}
@@ -68,10 +68,11 @@
 				let userId = this.$queue.getData('userId');
 				let data = {
 					remarks: this.remarks,
-					name: this.name,
+					name: this.userName,
 					phone: this.phone,
+					userId
 				}
-				this.$Request.get('/app/commission/jjr/apply', data).then(res => {
+				this.$Request.get('/app/commission/ywy/apply', data).then(res => {
 					if (res.code == 0) {
 						uni.hideLoading();
 						this.$queue.showToast(res.msg);
diff --git a/pages/my/applySalesperson/mySalesperson.vue b/pages/my/applySalesperson/mySalesperson.vue
index dcd8dcd..72ee094 100644
--- a/pages/my/applySalesperson/mySalesperson.vue
+++ b/pages/my/applySalesperson/mySalesperson.vue
@@ -39,7 +39,7 @@
 			<view class="mian-bottom">
 				<view class="mian-bottom-list" @click="goNav('/pages/my/applySalesperson/channelDetails')">
 					<image class="mian-bottom-img" src="../../../static/my-gong-21.png" mode=""></image>
-					<span>渠道明细</span>
+					<span>收入明细</span>
 				</view>
 				<view class="mian-bottom-list" @click="goNav('/pages/my/applySalesperson/channelMerchants')">
 					<image class="mian-bottom-img" src="../../../static/my-gong-18.png" mode=""></image>
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index f3116e1..82c038d 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -102,7 +102,6 @@ class Request {
 	constructor() {
 		this.config = {
 			baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
-			// baseUrl: 'https://sausers.blxinchuang.com/', // 请求的根域名
 			// baseUrl: 'http://192.168.2.222:8187/',
 			// 默认的请求头
 			header: {},