diff --git a/supervise-organizational-ui/src/views/organizational/userManageAdd.vue b/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
index a9fcc9c5..b053911c 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="main-content">
     <el-card class="box-card">
       <table class="e-table" cellspacing="0">
         <tr>
diff --git a/supervise-organizational-ui/src/views/organizational/userManageList.vue b/supervise-organizational-ui/src/views/organizational/userManageList.vue
index 2754484d..28921220 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageList.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="main-content">
     <div class="tab-header">
       <el-form ref="form" :inline="true" :model="search" label-width="80px">
         <el-row :gutter="20">
@@ -13,15 +13,11 @@
             <el-form-item label="电话">
               <el-input v-model="search.mobile" clearable></el-input>
             </el-form-item>
-           <el-form-item label="用户类型">
-            <el-select v-model="search.personTypeKey" style="width:300px">
-              <el-option
-                v-for="(item, i) in userTypeData"
-                :key="i"
-                :label="item.name"
-                :value="item.value">
-              </el-option>
-            </el-select>
+            <el-form-item label="用户类型">
+              <el-select v-model="search.personTypeKey" style="width:300px">
+                <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="部门">
               <el-input v-model="search.orgName" clearable></el-input>
@@ -46,10 +42,12 @@
           <el-button @click="initPwd(scope.row)" type="danger" size="mini">
             初始化密码
           </el-button>
-          <el-button @click="userinfoChange(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="primary" size="mini">
+          <el-button @click="userinfoChange(scope.row)"
+            :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="primary" size="mini">
             修改
           </el-button>
-          <el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="danger" size="mini">
+          <el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'"
+            type="danger" size="mini">
             删除
           </el-button>
         </template>
@@ -78,7 +76,8 @@
         </template>
       </el-table-column> -->
     </el-table>
-    <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" />
+    <pagination style="margin-bottom: 50px;" :total="page.total" :page.sync="page.current" :limit.sync="page.size"
+      @pagination="pagination" />
     <!-- 角色设置 -->
     <el-dialog title="设置角色" :visible.sync="roleDialog" width="30%">
       <el-form :model="roleForm" :rules="rules" ref="roleForm">
@@ -127,7 +126,7 @@
         <tr>
           <td>用户类型</td>
           <td>
-            <el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px">
+            <el-select v-model="form.userTypeKey" @change="selectChanged"  value-key="value" style="width:300px">
               <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
               </el-option>
             </el-select>
@@ -145,7 +144,7 @@
             </el-select>
           </td>
         </tr>
-      <!--  <tr>
+        <!--  <tr>
           <td>岗位</td>
           <td>
             <el-select v-model="form.sysStaffPost" @change="$forceUpdate()" style="width:300px">
@@ -257,6 +256,7 @@
         // 部门
         bm_Dialog: false,
         sysStaffPost: '',
+        sysStaffOrg: {},
         bm_Form: {
           departmentSid: ''
         },
@@ -400,6 +400,10 @@
 
         console.log("form>>>>", this.form)
 
+   //      var type = this.userTypeData.find(item => item.value === this.form.userTypeKey)
+   // console.log("type>>>>", type.name)
+
+        // this.form.userType = this.form.userTypeKey;
         this.form.userType = this.form.userTypeKey;
         userUpdata(this.form).then(res => {
           if (res.code === '200') {
@@ -436,24 +440,26 @@
         var sysStaffPost = row.sysStaffPost
         this.editDialog = true
         this.form = Object.assign({}, row)
+
+        this.form.sysStaffOrg = this.sysStaffOrg
+
         this.sysStaffPost = sysStaffPost
         this.$nextTick(() => {
-          this.$refs.Tree.setChecked(this.form.departmentSid, true, true)
+          this.$refs['Tree'].setChecked(this.form.departmentSid, true, true)
         })
         // this.$emit('status',true)
         // this.$emit('item',row)
       },
       // 删除
       del(row) {
-          console.log("row.sid",row.sid)
+        console.log("row.sid", row.sid)
 
         this.$confirm('此操作将删除该用户, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          delUser(row.sid
-          ).then(res => {
+          delUser(row.sid).then(res => {
             this.$message({
               type: 'success',
               message: res.msg
@@ -473,16 +479,16 @@
         this.loading = true
         let params = {}
         orgList(params).then(res => {
-          console.log("res.data",res.data)
+          console.log("res.data", res.data)
           this.treedata = res.data
         })
 
       },
       checkchange(data, checked, indeterminate) {
 
-           console.log("data",data)
-           console.log("checked",checked)
-           console.log("indeterminate",indeterminate)
+        console.log("data", data)
+        console.log("checked", checked)
+        console.log("indeterminate", indeterminate)
         if (checked) {
           this.form.departmentSid = data.sid
           this.form.departmentName = data.name
@@ -492,19 +498,29 @@
           this.$refs.Tree.setCheckedKeys(arr)
           // this.form.sysStaffPost = ''
           // this.getPost(data.sid)
-           this.form.sysStaffOrg ={
-             orgSid: data.sid,
-             orgName:data.name,
-             orgSidPath:data.orgSidPath,
-             orgNamePath:"",
-             orgCode:data.orgCode,
-             manageType:"",
-           }
-
+          this.form.sysStaffOrg = {
+            orgSid: data.sid,
+            orgName: data.name,
+            orgSidPath: data.orgSidPath,
+            orgNamePath: "",
+            orgCode: data.orgCode,
+            manageType: "",
+          }
+          this.sysStaffOrg = {
+            orgSid: data.sid,
+            orgName: data.name,
+            orgSidPath: data.orgSidPath,
+            orgNamePath: "",
+            orgCode: data.orgCode,
+            manageType: "",
+          }
 
           return
         }
       },
+      selectChanged(value){
+        console.log(value)
+      },
       getPost(orgSid) {
         let params = {
           sid: orgSid
diff --git a/supervise-organizational-ui/src/views/organizational/yhgl.vue b/supervise-organizational-ui/src/views/organizational/yhgl.vue
index ab0c51a3..bf94c7b0 100644
--- a/supervise-organizational-ui/src/views/organizational/yhgl.vue
+++ b/supervise-organizational-ui/src/views/organizational/yhgl.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="用户列表" name="roleList">
+      <el-tab-pane label="用户列表" name="roleList" >
         <user-manage-list :dataObj='dataObj' @status='isShow' @item='listObj'></user-manage-list>
       </el-tab-pane>
      <el-tab-pane label="新增用户" name="addrole">
diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue
index 32242828..c58db223 100644
--- a/supervise-uniapp/App.vue
+++ b/supervise-uniapp/App.vue
@@ -3,7 +3,7 @@
 	export default {
 		globalData: {
 			// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
-			wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",
+			wxSilentLoginURL: "http://192.168.1.107:8112/portal/v1/wxuser/wxSilentLogin",
 			// wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
 			wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin",
 			SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册
diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index bb2594a4..b4193eb1 100644
--- a/supervise-uniapp/common/config.js
+++ b/supervise-uniapp/common/config.js
@@ -7,8 +7,8 @@
  */
 module.exports = {
 	// baseUrl: 'https://jianguan.yyundong.com/api',
-	baseUrl: 'https://supervise.yxtsoft.com',
-	// baseUrl: 'http://192.168.1.193:8112',  
+	// baseUrl: 'https://supervise.yxtsoft.com',
+	baseUrl: 'http://192.168.1.107:8112',  
 	// baseUrl: 'http://192.168.1.110:8112',  
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js
index ea62fbeb..f62ba701 100644
--- a/supervise-uniapp/common/request.api.js
+++ b/supervise-uniapp/common/request.api.js
@@ -11,12 +11,12 @@ export default {
 	useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params),
 
 	// 获取 验证码 
-	sendVerificationCode: (params = {}) => request.get("/api/portal/v1/wxuser/sendVerificationCode/" + params.phone +
+	sendVerificationCode: (params = {}) => request.get("/portal/v1/wxuser/sendVerificationCode/" + params.phone +
 		"/" +
 		params.type, params),
 
 	// 绑定手机号 
-	wxBindMobile: (params = {}) => request.post("/api/portal/v1/wxuser/wxBindMobile", params),
+	wxBindMobile: (params = {}) => request.post("/portal/v1/wxuser/wxBindMobile", params),
 
 	// 查看预警信息
 	selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
@@ -83,7 +83,7 @@ export default {
 
 
 	// 获取首页面数据
-	getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params),
+	getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params),
 
 	// 获取消息类型列表
 	messageTypeList: (params = {}) => request.post("/reportwxmpapi/MessageType/list ", params),
@@ -130,7 +130,7 @@ export default {
 	storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params),
 
 	// 获取我的项目
-	getProjectByUserSid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectByUserSid/" + params,
+	getProjectByUserSid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectByUserSid/" + params,
 		params),
 
 	// 获取我的项目详情
diff --git a/supervise-uniapp/manifest.json b/supervise-uniapp/manifest.json
index d0fcbf9d..3a7f7ee9 100644
--- a/supervise-uniapp/manifest.json
+++ b/supervise-uniapp/manifest.json
@@ -176,5 +176,6 @@
             }
         },
         "domain" : ""
-    }
+    },
+    "vueVersion" : "2"
 }
diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json
index 761ce2b3..1de4e39e 100644
--- a/supervise-uniapp/pages.json
+++ b/supervise-uniapp/pages.json
@@ -372,7 +372,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/index/interestAccount",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"lazyCodeLoading": "requiredComponents",
 	"globalStyle": {
diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue
index 9bc94fc0..1edc02b0 100644
--- a/supervise-uniapp/pages/home/UserFragment.vue
+++ b/supervise-uniapp/pages/home/UserFragment.vue
@@ -3,7 +3,7 @@
 
 		<view class="top">
 
-			<image class="img" :src="baseUrl" @click="chooseImage" ></image>
+			<image class="img" :src="baseUrl" @click="chooseImage"></image>
 
 			<view class="top_right">
 
@@ -27,13 +27,19 @@
 			<UserItem src='https://supervise.yxtsoft.com/img/user/sz.png' text="设置" @click="click" clickId="2">
 			</UserItem>
 		</view>
+
+		<view class="user-item-bg">
+			<UserItem src='https://supervise.yxtsoft.com/img/user/wdxm.png' text="关注公众号" @click="click" clickId="8">
+			</UserItem>
+		</view>
+
 		<!-- #ifdef APP-PLUS -->
 		<!-- <view class="user-item-bg"> -->
-			<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
+		<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
 			<UserItem src='https://supervise.yxtsoft.com/img/user/xmgl.png' text="项目管理" @click="click" clickId="4"></UserItem>
 			<UserItem src='https://supervise.yxtsoft.com/img/user/ycgl.png' text="云仓管理" @click="click" clickId="5"></UserItem>
 			<UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="系统管理" @click="click" clickId="6"></UserItem> -->
-			<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
+		<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click"
 				clickId="7">
 			</UserItem> -->
 		<!-- </view> -->
@@ -51,7 +57,7 @@
 			return {
 				baseUrl: "",
 				name: "",
-				orgName:"",
+				orgName: "",
 				version: ""
 			};
 		},
@@ -94,15 +100,15 @@
 				var username = getApp().globalData.username
 				var orgNamePath = getApp().globalData.orgNamePath
 				console.log(">>>>>", userSid)
-				console.log(">>>>>",  headImage)
+				console.log(">>>>>", headImage)
 				console.log(">>>>>", username)
 				console.log(">>>>>", orgNamePath)
-				
-				this.name = username==""?"用户名称":username
-				this.orgName = orgNamePath==""?"暂无部门信息":orgNamePath
-				this.baseUrl = headImage==""?"https://supervise.yxtsoft.com/img/user/userImage.png":headImage
-				
-				
+
+				this.name = username == "" ? "用户名称" : username
+				this.orgName = orgNamePath == "" ? "暂无部门信息" : orgNamePath
+				this.baseUrl = headImage == "" ? "https://supervise.yxtsoft.com/img/user/userImage.png" : headImage
+
+
 				// this.getData(userSid, true)
 				// uni.setTabBarBadge({ //显示数字
 				// 	index: 0, //tabbar下标
@@ -123,13 +129,13 @@
 
 		},
 		methods: {
-			chooseImage(){
+			chooseImage() {
 				uni.navigateTo({
 					url: '../index/SetUp2'
 				});
 			},
 			click(id) {
-				
+
 				switch (id) {
 					case "0":
 						uni.navigateTo({
@@ -142,7 +148,7 @@
 						uni.navigateTo({
 							url: '../index/SetUp'
 						});
-						
+
 						// uni.navigateTo({
 						// 	url: '../index/DeviceException?sid=994d75b6-eb29-4733-bd48-dcfdf9f7dd47'
 						// });
@@ -158,6 +164,13 @@
 					case "7":
 						APPUpdate(true);
 						break;
+					case "8":
+						uni.navigateTo({
+							url: '../index/interestAccount'
+						})
+						break;
+
+
 				}
 			},
 
@@ -174,7 +187,7 @@
 			display: flex;
 			flex-direction: row;
 			align-items: center;
-			padding:15px 25px;
+			padding: 15px 25px;
 
 			.img {
 				margin-top: 10px;
diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue
index 5fc0d1b4..81216c19 100644
--- a/supervise-uniapp/pages/home/WorkFragment.vue
+++ b/supervise-uniapp/pages/home/WorkFragment.vue
@@ -327,6 +327,7 @@
 						uni.navigateTo({
 							url: '../index/WaitingProcessed'
 						});
+						
 						break;
 					case "2":
 						// 已办
diff --git a/supervise-uniapp/pages/index/ChangePassword.vue b/supervise-uniapp/pages/index/ChangePassword.vue
index 2d893a65..88a8fb74 100644
--- a/supervise-uniapp/pages/index/ChangePassword.vue
+++ b/supervise-uniapp/pages/index/ChangePassword.vue
@@ -23,7 +23,7 @@
 				<image src="../../static/baseIcon/code.png" mode="aspectFill" class="drawableLeft"></image>
 				<input type="number" maxlength="6" @input="paswordInput3" :password="showPassword3" placeholder="确认新密码"
 					class="input" />
-				<image :src="img3"   class="showImage"mode="aspectFill" @click="showPas('3')"></image>
+				<image :src="img3"   class="showImage" mode="aspectFill" @click="showPas('3')"></image>
 
 			</view>
 
diff --git a/supervise-uniapp/pages/login/fwxy.vue b/supervise-uniapp/pages/login/fwxy.vue
index c2b23f34..73647499 100644
--- a/supervise-uniapp/pages/login/fwxy.vue
+++ b/supervise-uniapp/pages/login/fwxy.vue
@@ -3,8 +3,8 @@
 		<!-- <rich-text :nodes="ysfw" space="emsp"></rich-text> -->
 		<!-- <div v-html='ysfw'></div> -->
 		<p style="text-align:center">
-<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px">汇融云仓贷后服务协议</span></strong>
-<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px"></span></strong>
+<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px">汇融云仓贷后服务协议</span>
+<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px"></span>
 		</p>
 		<p style="text-indent:28px; margin-top: 20rpx"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;</span></p>
 		<p style="text-indent:28px">
diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development
index f2ef176f..e3c81ca6 100644
--- a/yxt-portal-ui/.env.development
+++ b/yxt-portal-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.193:8112"
+VUE_APP_URL = "http://192.168.1.107:8112"
  #VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 4596d7c4..43eae002 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -443,8 +443,8 @@
           // window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
           window.open('/customer/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 1) {
-          // window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
-          window.open('/report/#/' + '?token=' + getStorage(), '_blank')
+          window.open('http://192.168.1.119:9531#/' + '?token=' + getStorage(), '_blank')
+          // window.open('/report/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 2) {
           window.open('/business/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 3) {
@@ -457,13 +457,13 @@
         } else if (index === 6) {
           window.open('/message/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 7) {
-            // window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
-          window.open('/organizational/#/' + '?token=' + getStorage(), '_blank')
+              window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('/organizational/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 8) {
-            // window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
-          window.open('/crm/#/' + '?token=' + getStorage(), '_blank')
+            window.open('http://192.168.1.101:9531/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('/crm/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 9) {
-            // window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
+            // window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')
           window.open('/warehouse/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 10) {
           // 机器人巡检