diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue
index 7631e996..20f7924f 100644
--- a/supervise-uniapp/App.vue
+++ b/supervise-uniapp/App.vue
@@ -3,13 +3,13 @@
 	export default {
 		globalData: {
 			// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
-			wxSilentLoginURL: "http://192.168.1.193:8112/portal/v1/wxuser/wxSilentLogin",
-			wxAuthLoginURL: "http://192.168.1.193:8112/portal//v1/wxuser/wxAuthLogin",
+			wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",
+			wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin",
 			token: "",
 			isLogin: false,
-			sysUserSid: "",
+			sid: "",
 		}, //全局变量，
-		
+
 		onLaunch: function() {
 			console.log("》》》》", 11111111);
 			/*  #ifdef APP-PLUS */
@@ -18,30 +18,12 @@
 
 			console.log("》》》》", 22222222222);
 
-			/*  #ifdef  MP-WEIXIN */
-			this.WxSilentLogin()
-			/* #endif */
-			
-			// let sysUserSid = this.ReadPreference("sysUserSid")
-			// if (sysUserSid != null && sysUserSid.length != 0) {
-			// 	this.globalData.sysUserSid = sysUserSid
-			// }
-			// let isLogin = this.ReadPreference("isLogin")
-			// if (isLogin != null && isLogin == 1) {
-			// 	this.globalData.isLogin = isLogin
-			// }
-			// let token = this.ReadPreference("token")
-			// if (token != null && token.length != 0) {
-			// 	this.globalData.token = token
-			// } 
-			
-			// console.log('用户Sid', this.globalData.sysUserSid)
-			// console.log('是否登陆', this.globalData.isLogin)
-			// console.log('App', 'onLaunch')
 			// // 不要删除
 			// console.log('高德地图定位Web服务key', '59970402d1c3f7dc1efff17d4dfcff21')
 		},
-		onShow: function() {},
+		onShow: function() {
+		
+		},
 		onHide: function() {},
 
 		methods: {
diff --git a/supervise-uniapp/common/bus.js b/supervise-uniapp/common/bus.js
new file mode 100644
index 00000000..cb21a525
--- /dev/null
+++ b/supervise-uniapp/common/bus.js
@@ -0,0 +1,3 @@
+import Vue from 'vue'
+const bus = new Vue()
+export default bus
\ No newline at end of file
diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index 5b3780be..557825b9 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.193:8112',
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
 	loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js
index 1c365da2..70f2c5ac 100644
--- a/supervise-uniapp/common/request.api.js
+++ b/supervise-uniapp/common/request.api.js
@@ -1,17 +1,17 @@
 import request from '@/utils/requester.js'
 
 export default {
-	login: (params = {}) => request.post("/portal/v1/sysuser/login", params),
+	login: (params = {}) => request.post("/api/portal/v1/sysuser/login", params),
 	sayhello: (params = {}) => request.get("/sayb", params),
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
 	getThresholdAnalysis: (params = {}) => request.get("/system/risk/getThresholdAnalysis", params),
 	// 获取 验证码 
-	sendVerificationCode: (params = {}) => request.get("/portal/v1/wxuser/sendVerificationCode/" + params.phone + "/" +
+	sendVerificationCode: (params = {}) => request.get("/api/portal/v1/wxuser/sendVerificationCode/" + params.phone + "/" +
 		params.type, params),
 
 	// 绑定手机号 
-	wxBindMobile: (params = {}) => request.post("/portal/v1/wxuser/wxBindMobile",params),
+	wxBindMobile: (params = {}) => request.post("/api/portal/v1/wxuser/wxBindMobile",params),
 
 	// 查看预警信息
 	selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
@@ -52,25 +52,38 @@ export default {
 	getDayProduct: (params = {}) => request.get(
 		"/reportwxmpapi/reportstock/getDayProduct/" + params, params),
 	// "/report/reportstock/getDayProduct/" + params, params),
+	
+	// 监管数据总览
+	getProjectDaily: (params = {}) => request.get(
+		"/reportwxmpapi/projectdaily/getProjectDaily/" + params.projectSid + "/" + params.orderDate,  params),
+	// "/report/projectdaily/getProjectDaily/" + params.projectSid + "/" + params.orderDate, params),
+	
+	// 项目监管报表
+	getProjectDailyFiles: (params = {}) => request.get(
+		"/reportwxmpapi/projectdaily/getProjectDailyFiles/" + params.projectSid + "/" + params.orderDate,  params),
+	// "/report/projectdaily/getProjectDailyFiles/" + params.projectSid + "/" + params.orderDate, params),
+	
+	
+	
 
 	// 获取首页面数据
-	getWorkData: (params = {}) => request.get("/portal/v1/flow/task/" + params, params),
+	getWorkData: (params = {}) => request.get("/api/portal/v1/flow/task/" + params, params),
 
 	// 获取云仓列表
-	storeHouseListPage: (params = {}) => request.post("/portal/v1/flow/storeHouseListPage", params),
+	storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
 	// 获取云仓详情
-	storeHouseDetail: (params = {}) => request.get("/portal/v1/flow/fetchDetailsBySid/" + params, params),
+	storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params),
 
 	// 获取我的项目
-	getProjectByUserSid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectByUserSid/" + params,
+	getProjectByUserSid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectByUserSid/" + params,
 		params),
 
 	// 获取我的项目详情
-	getProjectBySid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectBySid/" + params,
+	getProjectBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectBySid/" + params,
 		params),
 
 	// 获取我的项目-仓库详情
-	getStorehouseBySid: (params = {}) => request.get("/crm/v1/projectinformation/getStorehouseBySid/" + params,
+	getStorehouseBySid: (params = {}) => request.get("/api/crm/v1/projectinformation/getStorehouseBySid/" + params,
 		params),
 
 }
\ No newline at end of file
diff --git a/supervise-uniapp/common/wxSilentLogin.js b/supervise-uniapp/common/wxSilentLogin.js
index 48dac231..5a395b49 100644
--- a/supervise-uniapp/common/wxSilentLogin.js
+++ b/supervise-uniapp/common/wxSilentLogin.js
@@ -2,16 +2,18 @@
 import {
 	isEmpty
 } from './TextUtils.js'
+
+//引入bus
+import bus from '@/common/bus';
+
 const wxSilentLogin = () => {
 	return new Promise((resolve, reject) => {
 		wx.login({
 			success: function(res) {
 				if (res.code) {
-					if (getApp().globalData.isDebug) {
-						console.log('Http网络请求信息', {
-							"wxCode": res.code
-						})
-					}
+					console.log('Http网络请求信息', {
+						"wxCode": res.code
+					})
 					uni.request({
 						// 组装请求地址
 						url: getApp().globalData.wxSilentLoginURL + "?wxCode=" + res
@@ -27,7 +29,7 @@ const wxSilentLogin = () => {
 							"wxCode": res.code
 						},
 						success: res => {
-							console.log(res)
+							console.log("请求openid", res)
 							// if (getApp().globalData.isDebug) {
 							// console.log('Http网络路径', getApp().globalData
 							// 	.wxSilentLoginURL)
@@ -35,37 +37,56 @@ const wxSilentLogin = () => {
 							if (res.statusCode == 200) {
 								if (!res.data.success) {
 
-									if (res.data.code == 500) {
-										// 未关注小程序 首次登录 也无账号
-										uni.showToast({
-											title: "您的平台应用未被授权，请联系工作人员。",
-											icon: 'none',
-											duration: 3000,
-										})
-										wx.exitMiniProgram({
-											success: function() {},
-											fail: function() {}
-										})
-										return
-									}
+									// if (res.data.code == 500) {
+									// 	uni.showModal({
+									// 		title: '温馨提示',
+									// 		content: '您的平台应用未被授权，请联系工作人员。',
+									// 		showCancel: false,
+									// 		success: function(res) {
+									// 			if (res.confirm) {
+									// 				wx.exitMiniProgram({
+									// 					success: function() {},
+									// 					fail: function() {}
+									// 				})
+									// 			} else {
+									// 				console.log('点击了取消')
+									// 			}
+									// 		}
+									// 	})
+
 
-									if (res.data.code == 100) {
-										// 有账号 未绑定用户
-										uni.redirectTo({
-											url: '../index/BindPhone?sysUserWxAuthSid=' +
-												res.data.data
-										})
-									}
+									// 	return
+									// }
+
+									// if (res.data.code == 100) {
+									//  未绑定用户
+									uni.navigateTo({
+										url: '../index/BindPhone?sysUserWxAuthSid=' +
+											res.data.data
+									})
+									// }
 
 								} else {
+
 									console.log("Http网络请求res", res)
-										console.log("Global-Auth-Token", res.data.data.token)
-									 uni.setStorageSync("Global-Auth-Token", res.data.data.token)
-									getApp().globalData.username = res.data.data.userName
+									console.log("Global-Auth-Token", res.data.data
+										.token)
+									
+									
+									getApp().globalData.username = res.data.data
+										.userName
 									getApp().globalData.token = res.data.data.token
 									getApp().globalData.sid = res.data.data.sid
-									getApp().globalData.mobile = res.data.data.mobile
-									getApp().globalData.isLogin= true
+									getApp().globalData.mobile = res.data.data
+										.mobile
+									getApp().globalData.isLogin = true
+									
+									uni.setStorageSync("Global-Auth-Token", res.data
+										.data.token)
+									uni.setStorageSync("sid", res.data.data.sid)
+									uni.setStorageSync("isLogin", true)
+
+									bus.$emit('wholeSpin', true);
 								}
 							} else {
 								getApp().globalData.isLogin = false
diff --git a/supervise-uniapp/main.js b/supervise-uniapp/main.js
index ce2c43ec..3aca1cf1 100644
--- a/supervise-uniapp/main.js
+++ b/supervise-uniapp/main.js
@@ -17,6 +17,16 @@ Vue.mixin(mpShare)
 // #endif
 Vue.mixin(mixin)
 
+ 
+import bus from './common/bus.js';
+ 
+//挂载到this上
+Vue.prototype.$bus = bus;
+
+// // 在main.js中引入并挂载到vue的对象原型上
+// const jweixin = require('weixin-js-sdk');
+// Vue.prototype.$wechat = jweixin;
+
 import api from '@/common/request.api.js'
 Vue.prototype.$api = api
 
diff --git a/supervise-uniapp/manifest.json b/supervise-uniapp/manifest.json
index c7e6e491..35b8263b 100644
--- a/supervise-uniapp/manifest.json
+++ b/supervise-uniapp/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "监管平台",
+    "name" : "汇融云仓贷后",
     "appid" : "__UNI__DD73AA7",
     "description" : "汇融银行监管平台",
     "versionName" : "1.0.0.8",
@@ -155,7 +155,7 @@
     "h5" : {
         "template" : "template.h5.html",
         "router" : {
-            "mode" : "history",
+            "mode" : "hash",
             "base" : ""
         },
         "optimization" : {
diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json
index 5ff64daa..84db42d1 100644
--- a/supervise-uniapp/pages.json
+++ b/supervise-uniapp/pages.json
@@ -10,13 +10,16 @@
 	"pages": [
 
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-{
-			"path": "pages/index/InventorySummary",
+		
+		{
+			"path": "pages/index/RegulatoryReporting",
 			"style": {
-				"navigationBarTitleText": "质物库存汇总"
+				"navigationBarTitleText": "监管数据总览"
 			}
-		}, 
-		/*  #ifdef APP-PLUS  */
+		},
+		
+		//  #ifdef APP-PLUS  
+	
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -26,7 +29,7 @@
 				}
 			}
 		},
-		/* #endif */
+		// #endif 
 		
 		{
 			"path": "pages/home/WorkFragment",
@@ -35,27 +38,92 @@
 			}
 		},
 		
+		{
+			"path": "pages/index/AlreadyProcessed",
+			"style": {
+				"navigationBarTitleText": "已办工作",
+				"enablePullDownRefresh": true
+			}
+				
+		},{
+				"path": "pages/index/WaitingProcessed",
+				"style": {
+					"navigationBarTitleText": "待办工作",
+					"enablePullDownRefresh": true
+				}
+		
+			}, 
+		{
+			"path": "pages/index/MyProject",
+			"style": {
+				"navigationBarTitleText": "我的项目"
+			}
+		
+		},
+		
+		
+		{
+			"path": "pages/index/UserPrompt",
+			"style": {
+				"navigationBarTitleText": "用户须知",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏,
+				}
+			}
+		
+		}, 
+		
 		{
 			"path": "pages/index/BindPhone",
 			"style": {
-				"navigationBarTitleText": "绑定手机号"
+				"navigationBarTitleText": "绑定手机号",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏,
+				}
+			}
+		
+		}, 
+		
+		{
+			"path": "pages/index/RegulatoryReportingDownload",
+			"style": {
+				"navigationBarTitleText": "项目监管报表"
 			}
-
-		}, {
-			"path": "pages/index/WaitingProcessed",
+		},
+		{
+			"path": "pages/index/AccountBalance",
 			"style": {
-				"navigationBarTitleText": "待办工作",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "账户余额"
 			}
-
-		}, {
-			"path": "pages/index/AlreadyProcessed",
+		},
+		{
+			"path": "pages/index/AdvanceCharge",
 			"style": {
-				"navigationBarTitleText": "已办工作",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "预付款"
 			}
-
 		},
+		{
+			"path": "pages/index/GoodsInTransit",
+			"style": {
+				"navigationBarTitleText": "在途货物"
+			}
+		},
+		{
+			"path": "pages/index/Accounts",
+			"style": {
+				"navigationBarTitleText": "应收账款"
+			}
+		},{
+			"path": "pages/index/InventorySummary",
+			"style": {
+				"navigationBarTitleText": "质物库存汇总"
+			}
+		},
+	
+
+	
 		{
 			"path": "pages/index/InventorySummaryDetail",
 			"style": {
@@ -78,13 +146,7 @@
 			}
 		},
 
-		{
-			"path": "pages/index/MyProject",
-			"style": {
-				"navigationBarTitleText": "我的项目"
-			}
-
-		}, {
+	 {
 			"path": "pages/index/ProjectDetail",
 			"style": {
 				"navigationBarTitleText": "项目详情"
@@ -141,7 +203,7 @@
 	"lazyCodeLoading": "requiredComponents",
 	"globalStyle": {
 		"pageOrientation": "portrait",
-		"navigationBarTitleText": "Hello uniapp",
+		"navigationBarTitleText": "云仓贷后",
 		"navigationBarTextStyle": "white",
 		"navigationBarBackgroundColor": "#007AFF",
 		"backgroundColor": "#F8F8F8",
diff --git a/supervise-uniapp/pages/home/MessageFragment.vue b/supervise-uniapp/pages/home/MessageFragment.vue
index 88ca6326..355891de 100644
--- a/supervise-uniapp/pages/home/MessageFragment.vue
+++ b/supervise-uniapp/pages/home/MessageFragment.vue
@@ -12,6 +12,48 @@
 
 			};
 		},
+		onShow() {
+			console.log('onShow', getApp().globalData.isLogin)
+			
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin =uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+			
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+			
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				// this.getData(userSid, true)
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+			
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+			
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
+		},
 		methods: {}
 	}
 </script>
diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue
index 785627fd..52e32e32 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="https://jianguan.yyundong.com/img/uni.png" mode="aspectFit"></image>
+			<image class="img" src="https://supervise.yxtsoft.com/img/uni.png" mode="aspectFit"></image>
 
 			<view class="top_right">
 
@@ -14,24 +14,24 @@
 		</view>
 
 		<view class="user-item-bg">
-			<UserItem src='https://jianguan.yyundong.com/img/user/wdxm.png' text="我的项目" @click="click" clickId="0"></UserItem>
+			<UserItem src='https://supervise.yxtsoft.com/img/user/wdxm.png' text="我的项目" @click="click" clickId="0"></UserItem>
 		</view>
 
 		<view class="user-item-bg">
-			<UserItem src='https://jianguan.yyundong.com/img/user/smxx.png' text="实名信息" notes="完善信息" @click="click" clickId="1"></UserItem>
+			<UserItem src='https://supervise.yxtsoft.com/img/user/smxx.png' text="实名信息" notes="完善信息" @click="click" clickId="1"></UserItem>
 
 		</view>
 
 		<view class="user-item-bg">
-			<UserItem src='https://jianguan.yyundong.com/img/user/sz.png' text="设置" @click="click" clickId="2"></UserItem>
+			<UserItem src='https://supervise.yxtsoft.com/img/user/sz.png' text="设置" @click="click" clickId="2"></UserItem>
 		</view>
 		<!-- #ifdef APP-PLUS -->
 		<view class="user-item-bg">
-			<!-- <UserItem src='https://jianguan.yyundong.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
-			<UserItem src='https://jianguan.yyundong.com/img/user/xmgl.png' text="项目管理" @click="click" clickId="4"></UserItem>
-			<UserItem src='https://jianguan.yyundong.com/img/user/ycgl.png' text="云仓管理" @click="click" clickId="5"></UserItem>
-			<UserItem src='https://jianguan.yyundong.com/img/user/xtgl.png' text="系统管理" @click="click" clickId="6"></UserItem> -->
-			<UserItem src='https://jianguan.yyundong.com/img/user/xtgl.png' text="检查更新" :notes="version" @click="click" clickId="7">
+			<!-- <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" clickId="7">
 			</UserItem>
 		</view>
 		<!-- #endif -->
@@ -46,7 +46,7 @@
 	export default {
 		data() {
 			return {
-				baseUrl:"https://jianguan.yyundong.com/img",
+				baseUrl:"https://supervise.yxtsoft.com/img",
 				info: {
 					name: "石家庄市宇信通电子有限公司",
 					mobile: "651651351651",
@@ -66,6 +66,50 @@
 
 			/* #endif */
 		},
+		onShow() {
+			
+			console.log('onShow', getApp().globalData.isLogin)
+			
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin =uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+			
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+			
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				// this.getData(userSid, true)
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+			
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+			
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
+			
+		},
 		methods: {
 			click(id) {
 				switch (id) {
diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue
index 279db8ac..aa4d90fb 100644
--- a/supervise-uniapp/pages/home/WorkFragment.vue
+++ b/supervise-uniapp/pages/home/WorkFragment.vue
@@ -1,139 +1,155 @@
 <template>
-	<view class="content">
+	<view style="width: 100%;height: 100%;">
+		<view v-show="!isShow" style="width: 100%;height: 100%;">
+			<image src="../../static/baseIcon/loading.gif" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+		</view>
 
-		<view class="whiteBg" style="display: flex;flex-direction: column;margin-top: 20px;">
+		<view class="content" v-show="isShow">
 
-			<!--circular用来设置循环轮播   indicator-dots设置下面小圆点用来点击 -->
-			<swiper circular indicator-dots class="swiper" :autoplay="true" :interval="2000" v-show="swipers.length>0">
-				<!-- v-for循环遍历数组 -->
-				<swiper-item v-for="(item,index) in swipers">
-					<image :src="item" @click="swiperClick(index)"></image>
-				</swiper-item>
-			</swiper>
+			<view class="whiteBg" style="display: flex;flex-direction: column;margin-top: 20px;">
 
-			<view style="display: flex;flex-direction: row;">
+				<!--circular用来设置循环轮播   indicator-dots设置下面小圆点用来点击 -->
+				<swiper circular indicator-dots class="swiper" :autoplay="true" :interval="2000"
+					v-show="swipers.length>0">
+					<!-- v-for循环遍历数组 -->
+					<swiper-item v-for="(item,index) in swipers">
+						<image :src="item" @click="swiperClick(index)"></image>
+					</swiper-item>
+				</swiper>
 
-				<view class="top_item" @click="topClick('1')">
-					<view class="top_item_icon">
-						<text class="top_item_icon_num" v-show="dbNum!=0">{{dbNum}}</text>
-						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dbgz.png">
-						</image>
-					</view>
-					<text class="top_item_text">待办工作</text>
-				</view>
-				<view class="top_item" @click="topClick('2')">
-					<view class="top_item_icon">
-						<text class="top_item_icon_num" v-show="ybNum!=0">{{ybNum}}</text>
+				<view style="display: flex;flex-direction: row;">
 
-						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/ybgz.png">
-						</image>
+					<view class="top_item" @click="topClick('1')">
+						<view class="top_item_icon">
+							<text class="top_item_icon_num" v-show="dbNum!=0">{{dbNum}}</text>
+							<image class="top_item_icon_img" src="https://supervise.yxtsoft.com/img/newApp/dbgz.png">
+							</image>
+						</view>
+						<text class="top_item_text">待办工作</text>
 					</view>
-					<text class="top_item_text">已办工作</text>
-				</view>
-				<view class="top_item" @click="topClick('3')">
-					<view class="top_item_icon">
-						<text class="top_item_icon_num" v-show="dyNum!=0">{{dyNum}}</text>
-
-						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/dygz.png">
-						</image>
+					<view class="top_item" @click="topClick('2')">
+						<view class="top_item_icon">
+							<text class="top_item_icon_num" v-show="ybNum!=0">{{ybNum}}</text>
+
+							<image class="top_item_icon_img" src="https://supervise.yxtsoft.com/img/newApp/ybgz.png">
+							</image>
+						</view>
+						<text class="top_item_text">已办工作</text>
 					</view>
-					<text class="top_item_text">待阅工作</text>
-				</view>
-				<view class="top_item" @click="topClick('4')">
-					<view class="top_item_icon">
-						<text class="top_item_icon_num" v-show="yyNum!=0">{{yyNum}}</text>
-
-						<image class="top_item_icon_img" src="https://jianguan.yyundong.com/img/newApp/yygz.png">
-						</image>
+					<view class="top_item" @click="topClick('3')">
+						<view class="top_item_icon">
+							<text class="top_item_icon_num" v-show="dyNum!=0">{{dyNum}}</text>
+
+							<image class="top_item_icon_img" src="https://supervise.yxtsoft.com/img/newApp/dygz.png">
+							</image>
+						</view>
+						<text class="top_item_text">待阅工作</text>
+					</view>
+					<view class="top_item" @click="topClick('4')">
+						<view class="top_item_icon">
+							<text class="top_item_icon_num" v-show="yyNum!=0">{{yyNum}}</text>
+
+							<image class="top_item_icon_img" src="https://supervise.yxtsoft.com/img/newApp/yygz.png">
+							</image>
+						</view>
+						<text class="top_item_text">已阅工作</text>
 					</view>
-					<text class="top_item_text">已阅工作</text>
 				</view>
-			</view>
 
-		</view>
+			</view>
 
 
-		<view style="display: flex;flex-direction: row; align-items: center;" v-show="textArr.length>0">
+			<view style="display: flex;flex-direction: row; align-items: center;" v-show="textArr.length>0">
 
-			<image style="width: 20px;height: 20px;margin-left: 10px;"
-				src="https://jianguan.yyundong.com/img/newApp/notices.png" mode="aspectFit"></image>
-			<div class="textBox">
+				<image style="width: 20px;height: 20px;margin-left: 10px;"
+					src="https://supervise.yxtsoft.com/img/newApp/notices.png" mode="aspectFit"></image>
+				<div class="textBox">
 
-				<!-- <transition name="slide">
+					<!-- <transition name="slide">
 					<text class="text" :key="text.id" @click="textClick(text)">{{text.val}} </text>
 				</transition>
 				 -->
-				<div class="marquee-wrap">
-					<div class="marquee-list" :class="{'animate-up': animateUp}">
-						<li v-for="(item, index) in textArr" @click="textClick(item)">{{item}}</li>
+					<div class="marquee-wrap">
+						<div class="marquee-list" :class="{'animate-up': animateUp}">
+							<li v-for="(item, index) in textArr" @click="textClick(item)">{{item}}</li>
+						</div>
 					</div>
+
 				</div>
 
-			</div>
+			</view>
 
-		</view>
+			<view class="whiteBg" style="display: flex;flex-direction: column;padding-top: 20px;">
 
-		<view class="whiteBg" style="display: flex;flex-direction: column;padding-top: 20px;">
+				<view style="display: flex;flex-direction: row;margin-left: 20px;align-items: center;">
 
-			<view style="display: flex;flex-direction: row;margin-left: 20px;align-items: center;">
+					<image style="width: 25px;height: 25px;" src="https://supervise.yxtsoft.com/img/newApp/icon.png"
+						mode="aspectFit"></image>
+					<text style="margin-left: 5px;">更多</text>
 
-				<image style="width: 25px;height: 25px;" src="https://jianguan.yyundong.com/img/newApp/icon.png"
-					mode="aspectFit"></image>
-				<text style="margin-left: 5px;">更多</text>
+				</view>
 
-			</view>
+				<view style=" height: 1px;background: #eee;margin-left: 25px;margin-right: 25px;margin-top: 15px;">
+				</view>
 
-			<view style=" height: 1px;background: #eee;margin-left: 25px;margin-right: 25px;margin-top: 15px;"></view>
+				<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
 
-			<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
+					<view class="centre" @click="businessClick('1')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/ywsp.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">业务审批</text>
+					</view>
+					<view class="centre" @click="businessClick('2')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/gzdd.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">工作调度</text>
+					</view>
+					<view class="centre" @click="businessClick('3')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/fkgl.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">风控管理</text>
+					</view>
+					<view class="centre" @click="businessClick('4')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/sjbb.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">数据报表</text>
+					</view>
 
-				<view class="centre" @click="businessClick('1')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ywsp.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">业务审批</text>
-				</view>
-				<view class="centre" @click="businessClick('2')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/gzdd.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">工作调度</text>
-				</view>
-				<view class="centre" @click="businessClick('3')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/fkgl.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">风控管理</text>
-				</view>
-				<view class="centre" @click="businessClick('4')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/sjbb.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">数据报表</text>
 				</view>
 
-			</view>
 
+				<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
 
-			<view style="margin-top: 20px;display: flex;flex-direction: row;width: 100%;margin-bottom: 20px;">
+					<view class="centre" @click="warehouseClick('1')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/ycgl.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">云仓管理</text>
+					</view>
+					<view class="centre" @click="warehouseClick('2')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/kcfx.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">库存分析</text>
+					</view>
+					<view class="centre" @click="warehouseClick('3')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/hjjk.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">环境监控</text>
+					</view>
+					<view class="centre" @click="warehouseClick('4')">
+						<image class="centre_img" src="https://supervise.yxtsoft.com/img/newApp/jqrxk.png"
+							mode="aspectFit">
+						</image>
+						<text class="centre_text">机器人巡库</text>
+					</view>
 
-				<view class="centre" @click="warehouseClick('1')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/ycgl.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">云仓管理</text>
-				</view>
-				<view class="centre" @click="warehouseClick('2')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/kcfx.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">库存分析</text>
 				</view>
-				<view class="centre" @click="warehouseClick('3')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/hjjk.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">环境监控</text>
-				</view>
-				<view class="centre" @click="warehouseClick('4')">
-					<image class="centre_img" src="https://jianguan.yyundong.com/img/newApp/jqrxk.png" mode="aspectFit">
-					</image>
-					<text class="centre_text">机器人巡库</text>
-				</view>
-
 			</view>
 		</view>
 
@@ -165,6 +181,7 @@
 					// 'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
 					// 'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg'
 				],
+				isShow: false,
 
 			};
 		},
@@ -176,6 +193,17 @@
 				}
 			}
 		},
+		created() {
+			this.$bus.$on('wholeSpin', msg => {
+				//这里获取到http工具js文件中传过来的wholeSpin值
+				console.log(">>>>>", this.isShow)
+
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.getData(userSid, msg)
+			});
+		},
+
 		mounted() {
 			this.startMove()
 			this.timer = setInterval(this.scrollAnimate, 1500);
@@ -184,17 +212,49 @@
 
 		// },
 		onShow() {
-			setTimeout(() => {
-				if (getApp().globalData.isLogin) {
-					var userSid = getApp().globalData.sid
-					console.log(">>>>>", userSid)
-					this.getData(userSid)
-					uni.setTabBarBadge({ //显示数字
-						index: 0, //tabbar下标
-						text: '100' //数字
-					})
-				}
-			}, 1000)
+
+			console.log('onShow', getApp().globalData.isLogin)
+			
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin =uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+			
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+			
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.getData(userSid, true)
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
+			// }, 1000)
+
 			// uni.removeTabBarBadge({ //隐藏数字标
 			//   index:2
 			// })  
@@ -219,7 +279,7 @@
 				}, 500)
 			},
 
-			getData(userSid) {
+			getData(userSid, msg) {
 
 				// let data = await axios.get('/api/portal/v1/flow/task/'+userSid)
 				// 	console.log('data', data)
@@ -228,6 +288,7 @@
 				this.$api.getWorkData(userSid).then((resp) => {
 					// if (resp.success) {
 					console.log('1111', resp)
+					this.isShow = msg;
 					this.dbNum = resp.todoNumber
 					this.dyNum = resp.pendingWork
 					this.textArr = resp.notice
@@ -443,7 +504,7 @@
 					// width: 50px;
 					// height: 50px;
 					// margin-bottom: 10px;
-					// background-image: url('https://jianguan.yyundong.com/img/newApp/round.png');
+					// background-image: url('https://supervise.yxtsoft.com/img/newApp/round.png');
 					// background-size: 50px 50px;
 
 					position: relative;
diff --git a/supervise-uniapp/pages/index/AccountBalance.vue b/supervise-uniapp/pages/index/AccountBalance.vue
new file mode 100644
index 00000000..4a7c5f0d
--- /dev/null
+++ b/supervise-uniapp/pages/index/AccountBalance.vue
@@ -0,0 +1,132 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image>
+			<text class="top-name">{{info.name}}</text>
+		</view>
+
+		<view class="content">
+			
+			<view class="item">
+			
+				<text class="item-text">账户数量</text>
+				<text class="item-text1">{{info.number}}</text>
+			
+			</view>
+			
+
+			<view class="item">
+
+				<text class="item-text">截止时间</text>
+				<text class="item-text1">{{info.date}}</text>
+
+			</view>
+
+			<view class="item" style="border-bottom: none;">
+
+				<text class="item-text">账户余额</text>
+				<text class="item-text1" >{{info.balance}}</text>
+
+			</view>
+
+		</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				info: {
+					sid: "",
+					name: "",
+					number: "",
+					date: "",
+					balance: "",
+				},
+
+
+			}
+		},
+		onLoad(option) {
+			this.info = {
+				sid: option.sid,
+				name: option.name,
+				number: option.number,
+				date: option.date,
+				balance: option.balance,
+			}
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		width: 100%;
+		height: 100%;
+
+		.top {
+			
+			padding: 20px 25px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.top-name {
+				margin-left: 5px;
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.content {
+			display: flex;
+			margin-left: 20px;
+			margin-right: 20px;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+
+			.item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 15px 20px;
+				border-bottom: 1px solid #eee;
+				
+				.item-text{
+					font-size: 14px;
+					color: #191919;
+				}
+				
+				.item-text1{
+					font-size: 14px;
+					color: #717171;
+				}
+
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/Accounts.vue b/supervise-uniapp/pages/index/Accounts.vue
new file mode 100644
index 00000000..e0b8da45
--- /dev/null
+++ b/supervise-uniapp/pages/index/Accounts.vue
@@ -0,0 +1,132 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image>
+			<text class="top-name">{{info.name}}</text>
+		</view>
+
+		<view class="content">
+			
+			<view class="item">
+			
+				<text class="item-text">客户数量</text>
+				<text class="item-text1">{{info.customNumber}}</text>
+			
+			</view>
+			
+
+			<view class="item">
+
+				<text class="item-text">截止时间</text>
+				<text class="item-text1">{{info.date}}</text>
+
+			</view>
+
+			<view class="item" style="border-bottom: none;">
+
+				<text class="item-text">应收账款</text>
+				<text class="item-text1" >{{info.accounts}}</text>
+
+			</view>
+
+		</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				info: {
+					sid: "",
+					name: "",
+					customNumber: "",
+					date: "",
+					accounts: "",
+				},
+
+
+			}
+		},
+		onLoad(option) {
+			this.info = {
+				sid: option.sid,
+				name: option.name,
+				customNumber: option.customNumber,
+				date: option.date,
+				accounts: option.accounts,
+			}
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		width: 100%;
+		height: 100%;
+
+		.top {
+			
+			padding: 20px 25px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.top-name {
+				margin-left: 5px;
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.content {
+			display: flex;
+			margin-left: 20px;
+			margin-right: 20px;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+
+			.item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 15px 20px;
+				border-bottom: 1px solid #eee;
+				
+				.item-text{
+					font-size: 14px;
+					color: #191919;
+				}
+				
+				.item-text1{
+					font-size: 14px;
+					color: #717171;
+				}
+
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/AdvanceCharge.vue b/supervise-uniapp/pages/index/AdvanceCharge.vue
new file mode 100644
index 00000000..8909352d
--- /dev/null
+++ b/supervise-uniapp/pages/index/AdvanceCharge.vue
@@ -0,0 +1,122 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image>
+			<text class="top-name">{{info.name}}</text>
+		</view>
+
+		<view class="content">
+
+			<view class="item">
+
+				<text class="item-text">截止时间</text>
+				<text class="item-text1">{{info.date}}</text>
+
+			</view>
+
+			<view class="item" style="border-bottom: none;">
+
+				<text class="item-text">预付金额</text>
+				<text class="item-text1" >{{info.advanceCharge}}</text>
+
+			</view>
+
+		</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				info: {
+					sid: "",
+					name: "",
+					date: "",
+					advanceCharge: "",
+				},
+
+
+			}
+		},
+		onLoad(option) {
+			this.info = {
+				sid: option.sid,
+				name: option.name,
+				date: option.date,
+				advanceCharge: option.advanceCharge,
+			}
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		width: 100%;
+		height: 100%;
+
+		.top {
+			
+			padding: 20px 25px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.top-name {
+				margin-left: 5px;
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.content {
+			display: flex;
+			margin-left: 20px;
+			margin-right: 20px;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+
+			.item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 15px 20px;
+				border-bottom: 1px solid #eee;
+				
+				.item-text{
+					font-size: 14px;
+					color: #191919;
+				}
+				
+				.item-text1{
+					font-size: 14px;
+					color: #717171;
+				}
+
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/AlreadyProcessed.vue b/supervise-uniapp/pages/index/AlreadyProcessed.vue
index 12fb9817..2e8d1c4d 100644
--- a/supervise-uniapp/pages/index/AlreadyProcessed.vue
+++ b/supervise-uniapp/pages/index/AlreadyProcessed.vue
@@ -391,6 +391,66 @@
 
 			};
 		},
+		
+		created() {
+			this.$bus.$on('wholeSpin', msg => {
+				//这里获取到http工具js文件中传过来的wholeSpin值
+				console.log(">>>>>", this.isShow)
+		
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.loadData();
+			});
+		},
+		
+		
+		onLoad() {
+		
+		},
+		
+		onShow() {
+			console.log('onShow', getApp().globalData.isLogin)
+			
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin =uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+			
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+			
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+					this.loadData();
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+			
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+			
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
+		},
+		
 		// onShow() {
 		// 	this.listQuery.current = 1
 		// 	this.dataList = [];
@@ -449,6 +509,8 @@
 			},
 			highLight(value) {
 				console.log("highLight》》》", value);
+				if (value == '' || value == undefined || value == null)
+					return
 				if (value.includes(this.searchText)) {
 					value = value.replace(
 						this.searchText,
diff --git a/supervise-uniapp/pages/index/BindPhone.vue b/supervise-uniapp/pages/index/BindPhone.vue
index 7e382623..a47b8c2d 100644
--- a/supervise-uniapp/pages/index/BindPhone.vue
+++ b/supervise-uniapp/pages/index/BindPhone.vue
@@ -1,6 +1,14 @@
 <template>
 	<view>
-
+		<!-- 自定义导航栏 -->
+		<view class="navBarBox">
+			<!-- 状态栏占位 -->
+			<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
+			<!-- 真正的导航栏内容 -->
+			<view class="navBar">
+				<view>绑定手机</view>
+			</view>
+		</view>
 		<view style="margin-top: 30rpx;">
 			<view class="inputRow">
 				<image src="../../static/baseIcon/username.png" mode="aspectFill" class="drawableLeft"></image>
@@ -29,6 +37,10 @@
 	export default {
 		data() {
 			return {
+				// 状态栏高度
+				statusBarHeight: 0,
+				// 导航栏高度
+				navBarHeight: 82 + 11,
 				page: {
 					mobile: '',
 					openid: '',
@@ -36,6 +48,11 @@
 				}
 			};
 		},
+		//第一次加载时调用
+		created() {
+			//获取手机状态栏高度
+			this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+		},
 		onShow() {
 			/*  #ifdef  MP-WEIXIN */
 			wx.hideHomeButton();
@@ -75,11 +92,28 @@
 					// getApp().globalData.isLogin = true
 					// getApp().globalData.sysUserSid = res.data
 
-					uni.switchTab({
-						url: '/pages/home/WorkFragment'
+					uni.navigateBack({
+						delta: 10,
 					});
+
+					// uni.switchTab({
+					// 	url: '/pages/home/WorkFragment'
+					// });
 				}).catch(e => {
 					console.log('eeeee', e)
+					// uni.showModal({
+					// 	title: '温馨提示',
+					// 	content: '您的平台应用未被授权，请联系工作人员。',
+					// 	showCancel: false,
+					// 	success: function(res) {
+					// 		if (res.confirm) {
+								
+					// 		} else {
+					// 			console.log('点击了取消')
+					// 		}
+					// 	}
+					// })
+
 				})
 
 
@@ -131,6 +165,23 @@
 </script>
 
 <style lang="scss">
+	.navBarBox {
+		background: #007AFF;
+	}
+
+	.navBarBox .statusBar {}
+
+	.navBarBox .navBar {
+		padding-top: 15px;
+		padding-bottom: 13px;
+		display: flex;
+		font-size: 13px;
+		flex-direction: row;
+		color: #ffffff;
+		justify-content: center;
+		align-items: center;
+	}
+
 	.inputRow {
 		display: flex;
 		margin-left: 30rpx;
diff --git a/supervise-uniapp/pages/index/GoodsInTransit.vue b/supervise-uniapp/pages/index/GoodsInTransit.vue
new file mode 100644
index 00000000..34559f9a
--- /dev/null
+++ b/supervise-uniapp/pages/index/GoodsInTransit.vue
@@ -0,0 +1,122 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image>
+			<text class="top-name">{{info.name}}</text>
+		</view>
+
+		<view class="content">
+
+			<view class="item">
+
+				<text class="item-text">截止时间</text>
+				<text class="item-text1">{{info.date}}</text>
+
+			</view>
+
+			<view class="item" style="border-bottom: none;">
+
+				<text class="item-text">在途货值</text>
+				<text class="item-text1" >{{info.goodsInTransit}}</text>
+
+			</view>
+
+		</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				info: {
+					sid: "",
+					name: "",
+					date: "",
+					goodsInTransit: "",
+				},
+
+
+			}
+		},
+		onLoad(option) {
+			this.info = {
+				sid: option.sid,
+				name: option.name,
+				date: option.date,
+				goodsInTransit: option.goodsInTransit,
+			}
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		width: 100%;
+		height: 100%;
+
+		.top {
+			
+			padding: 20px 25px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.top-name {
+				margin-left: 5px;
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.content {
+			display: flex;
+			margin-left: 20px;
+			margin-right: 20px;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+
+			.item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 15px 20px;
+				border-bottom: 1px solid #eee;
+				
+				.item-text{
+					font-size: 14px;
+					color: #191919;
+				}
+				
+				.item-text1{
+					font-size: 14px;
+					color: #717171;
+				}
+
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/InventorySummary.vue b/supervise-uniapp/pages/index/InventorySummary.vue
index 899cf273..aff405cb 100644
--- a/supervise-uniapp/pages/index/InventorySummary.vue
+++ b/supervise-uniapp/pages/index/InventorySummary.vue
@@ -267,13 +267,10 @@
 				orderDate: option.orderDate
 			}
 
-			this.getData()
-
-
-
 		},
 		onShow() {
 			wx.hideHomeButton()
+				this.getData()
 		},
 		methods: {
 			onClick(e) {
diff --git a/supervise-uniapp/pages/index/MyProject.vue b/supervise-uniapp/pages/index/MyProject.vue
index e55b3cef..c46bec1b 100644
--- a/supervise-uniapp/pages/index/MyProject.vue
+++ b/supervise-uniapp/pages/index/MyProject.vue
@@ -41,8 +41,63 @@
 				],
 			}
 		},
+		created() {
+			this.$bus.$on('wholeSpin', msg => {
+				//这里获取到http工具js文件中传过来的wholeSpin值
+				console.log(">>>>>", this.isShow)
+		
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.loadData();
+			});
+		},
+		
+		
 		onLoad() {
-			this.loadData();
+		
+		},
+		
+		onShow() {
+			console.log('onShow', getApp().globalData.isLogin)
+			
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin =uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+			
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+			
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+					this.loadData();
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+			
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+			
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
 		},
 		methods: {
 
diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue
new file mode 100644
index 00000000..ca43b397
--- /dev/null
+++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue
@@ -0,0 +1,514 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<text class="top-name">{{info.projectName}}</text>
+			<text class="top-date">{{info.orderDate}}</text>
+		</view>
+
+		<view class="centre">
+
+			<view class="centre-top">
+				<qiun-data-charts type="ring" :opts="info.opts" :chartData="chartData" />
+			</view>
+
+
+			<view class="centre-bom">
+				<text class="centre-lift-text">贷款总额：{{info.totalLoanWan==''?'--':info.totalLoanWan}}万元</text>
+				<view class="centre-lift-view" @click="jump">
+					<image src="../../static/baseIcon/download.png" style="width: 16px;height: 16px;" mode="aspectFill">
+					</image>
+					<text class="centre-lift-view-text">报表下载</text>
+				</view>
+			</view>
+
+		</view>
+
+		<!-- <view class="bom">
+			<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+				<text style="	font-size: 16px;
+				color: #6C6C6C;">分项数据</text>
+				<text style="	font-size: 16px;
+				color: #6C6C6C;">单位：万元</text>
+			</view>
+			<qiun-data-charts ref="myChart" type="bar" @tap=tap($event) :opts="opts2" :chartData="chartData2" />
+
+		</view> -->
+
+		<view style="margin-top: 30px;padding-bottom: 50px; display: flex;flex-direction: column;">
+
+			<view class="layout" @click="itemClick('1')">
+
+				<image src="https://supervise.yxtsoft.com/img/newApp/zhye.png" mode="aspectFill"
+					style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">账户余额</text>
+					<text class="content-text2">{{info.accountsBalanceWan }}万元</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+
+			<view class="layout" @click="itemClick('2')">
+
+				<image src="https://supervise.yxtsoft.com/img/newApp/yszk.png" mode="aspectFill"
+					style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">应收账款</text>
+					<text class="content-text2">{{info.accountsReceivableWan }}万元</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+
+			<view class="layout" @click="itemClick('3')">
+
+				<image src="https://supervise.yxtsoft.com/img/newApp/zwkcjz.png" mode="aspectFill"
+					style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">库存货值</text>
+					<text class="content-text2">{{info.stockAmountWan }}万元</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+
+			<view class="layout" @click="itemClick('4')">
+
+				<image src="https://supervise.yxtsoft.com/img/newApp/zthwjz.png" mode="aspectFill"
+					style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">在途货值</text>
+					<text class="content-text2">{{info.transitAmountWan }}万元</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+
+			<view class="layout" @click="itemClick('5')">
+
+				<image src="https://supervise.yxtsoft.com/img/newApp/yfk.png" mode="aspectFill"
+					style="width: 12px;height: 12px;">
+				</image>
+
+				<view class="content">
+					<text class="content-text1">预付款</text>
+					<text class="content-text2">{{info.advancePaymentWan }}万元</text>
+
+				</view>
+				<image src="../../static/baseIcon/zy.png" mode="aspectFill" style="width: 14px;height: 14px;"></image>
+			</view>
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				params: {
+					projectSid: "9a2c1e08-0e0a-4440-bc3d-3adbef082cdb",
+					orderDate: "2023-08-07",
+				},
+				info: {
+					projectName: "",
+					orderDate: "",
+					reportTime: "",
+					projectSid: "",
+					totalLoan: "",
+					totalLoanWan: "",
+					accountsBalance: "",
+					accountsBalanceWan: "",
+					accountsReceivable: "",
+					accountsReceivableWan: "",
+					stockAmount: "",
+					stockAmountWan: "",
+					transitAmount: "",
+					transitAmountWan: "",
+					advancePayment: "",
+					advancePaymentWan: "",
+					pledgeRate: "",
+					opts: {},
+				},
+				chartData: {},
+				//您可以通过修改 config-ucharts.js 文件中下标为 ['ring'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+				chartData2: {},
+				opts2: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: [5, 30, 10, 10],
+					enableScroll: false,
+					legend: {
+						"show": false,
+						"position": "right",
+						"lineHeight": 25,
+					},
+					xAxis: {
+						boundaryGap: "justify",
+						disableGrid: false,
+						min: 0,
+						axisLine: true,
+						max: 20000,
+						triggerEvent: true
+					},
+					yAxis: {
+						triggerEvent: true
+					},
+
+					extra: {
+						bar: {
+							type: "stack",
+							width: 30,
+							meterBorde: 2,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							categoryGap: 2
+						}
+					}
+				}
+			}
+		},
+		onLoad(option) {
+
+			// this.params = {
+			// 	projectSid: option.projectSid,
+			// 	orderDate: option.orderDate
+			// }
+
+
+		},
+		onShow() {
+			wx.hideHomeButton()
+			// setTimeout(() => {
+
+			// }, 1000)
+			this.getServerData();
+		},
+		methods: {
+			init() {
+				// var chart = this.$echarts.init(this.$refs["myChart"]);
+				// this.$refs["myChart"].getZr().on('click', params => {
+
+				// 	let pointInPixel = [params.offsetX, params.offsetY]
+
+				// 	if (chart.containPixel('grid', pointInPixel)) {
+
+				// 		let xIndex = chart.convertFromPixel({
+				// 			seriesIndex: 0
+				// 		}, [params.offsetX, params.offsetY])[0]
+
+				// 		console.log(xIndex)
+
+				// 		this.select_index = xIndex
+
+				// 	}
+
+				// })
+			},
+			getServerData() {
+
+				console.log("this.params", this.params)
+
+				this.$api.getProjectDaily(this.params).then((resp) => {
+					console.log('1111>>>>>>', resp)
+
+					this.info = resp
+
+					this.info.opts = {
+							rotate: false,
+							rotateLock: false,
+							color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452",
+								"#9A60B4",
+								"#ea7ccc"
+							],
+							dataLabel: false,
+							enableScroll: false,
+							legend: {
+								show: true,
+								position: "right",
+								lineHeight: 30
+							},
+							title: {
+								name: this.info.pledgeRatePercent+"%",
+								fontSize: 38,
+								color: "#F6A42F"
+							},
+							subtitle: {
+								name: "质押率",
+								fontSize: 20,
+								color: "#17B0DF"
+							},
+							extra: {
+								ring: {
+									ringWidth: 30,
+									activeOpacity: 0.1,
+									activeRadius: 1,
+									offsetAngle: 0,
+									labelWidth: 15,
+									border: true,
+									borderWidth: 3,
+									borderColor: "#FFFFFF"
+								}
+							}
+						},
+
+						//模拟从服务器获取数据时的延时
+						setTimeout(() => {
+							//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+							let res = {
+								series: [{
+									data: [{
+										"name": "帐户余额",
+										"value": this.info.accountsBalance,
+										"labelShow": true,
+										"labelText": "四班:18人"
+									}, {
+										"name": "应收账款",
+										"value": this.info.accountsReceivable,
+										"labelShow": true,
+										"labelText": "四班:18人"
+									}, {
+										"name": "库存货值",
+										"value": this.info.stockAmount,
+										"labelShow": true,
+										"labelText": "四班:18人"
+									}, {
+										"name": "在途货值",
+										"value": this.info.transitAmount,
+										"labelShow": true,
+										"labelText": "四班:18人"
+									}, {
+										"name": "预付款",
+										"value": this.info.advancePayment,
+										"labelShow": true,
+										"labelText": "四班:18人"
+									}]
+								}]
+							};
+							this.chartData = JSON.parse(JSON.stringify(res));
+						}, 500);
+
+					// //模拟从服务器获取数据时的延时
+					// setTimeout(() => {
+					// 	//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+					// 	let res = {
+					// 		categories: ["账户余额", "应收账款", "库存货值", "在途货值", "预付款"],
+					// 		series: [{
+					// 				name: "",
+					// 				data: [this.info.accountsBalanceWan, this.info
+					// 					.accountsReceivableWan,
+					// 					this.info.stockAmountWan, this.info.transitAmountWan,
+					// 					this
+					// 					.info.advancePaymentWan
+					// 				]
+					// 			},
+					// 			// {
+					// 			//   name: "完成量",
+					// 			//   data: [18,27,21,24,6,28]
+					// 			// }
+					// 		]
+					// 	};
+					// 	this.chartData2 = JSON.parse(JSON.stringify(res));
+					// }, 500);
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+
+			},
+			jump() {
+				// 下载
+				uni.navigateTo({
+					url: 'RegulatoryReportingDownload?sid=' + this.info.projectSid + "&name=" + this.info
+						.projectName +
+						"&date=" + this.info.orderDate
+				});
+
+			},
+
+			itemClick(index) {
+				switch (index) {
+					case "1":
+						// 账号余额
+						uni.navigateTo({
+							url: 'AccountBalance?sid=' + this.info.projectSid + "&name=" + this.info.projectName +
+								"&number=暂无" +
+								"&date=" + this.info.reportTime + "&balance=" + this.info.accountsBalanceWan
+						});
+						break;
+					case "2":
+
+						// 应收账款
+						uni.navigateTo({
+							url: 'Accounts?sid=' + this.info.projectSid + "&name=" + this.info.projectName +
+								"&customNumber=暂无" +
+								"&date=" + this.info.reportTime + "&accounts=" + this.info.accountsReceivableWan
+						});
+						break;
+					case "3":
+						// 库存汇总
+						uni.navigateTo({
+							url: 'InventorySummary?projectSid=' + this.info.projectSid + "&orderDate=" + this.info
+								.orderDate
+						});
+						break;
+					case "4":
+						// 在途货物
+						uni.navigateTo({
+							url: 'GoodsInTransit?sid=' + this.info.projectSid + "&name=" + this.info.projectName +
+								"&goodsInTransit=" + this.info
+								.transitAmountWan +
+								"&date=" + this.info.reportTime
+						});
+
+						break;
+					case "5":
+						// 预付款
+						uni.navigateTo({
+							url: 'AdvanceCharge?sid=' + this.info.projectSid + "&name=" + this.info.projectName +
+								"&advanceCharge=" + this.info
+								.advancePaymentWan + "&date=" + this.info.reportTime
+						});
+						break;
+					default:
+						break;
+				}
+			},
+			tap(params) {
+				console.log("params", params)
+			},
+			handleZrClick(params) {
+				console.log("params", params)
+				// 图标任意位置点击事件处理
+				if (params.topTarget && params.topTarget.parent.anid && params.target === undefined) {
+					console.log("点击x或y轴")
+				}
+
+			},
+			clickBarInBarChart(params) {
+				console.log("params", params)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+
+		width: 100%;
+		height: 100%;
+
+		.top {
+			background-color: #fff;
+			padding: 20px 25px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+
+			.top-name {
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.centre {
+			background-color: #fff;
+			display: flex;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+			padding: 25px;
+
+			.centre-top {}
+
+
+			.centre-bom {
+				margin-top: 10px;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+
+				.centre-lift-text {
+					font-size: 14px;
+					color: #191919;
+					font-weight: 550;
+					font-family: sans-serif;
+				}
+
+				.centre-lift-view {
+					display: flex;
+					align-items: center;
+					flex-direction: row;
+
+					.centre-lift-view-text {
+						margin-left: 10px;
+						font-size: 14px;
+						color: #018AD2;
+					}
+				}
+
+			}
+
+		}
+
+		.bom {
+			width: 90%;
+			margin: 20px;
+		}
+
+		.layout {
+			background: #fff;
+			border-radius: 10px;
+			padding: 15px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-bottom: 10px;
+
+			.content {
+				margin-left: 10px;
+				margin-right: 10px;
+				flex: 1;
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+
+				.content-text1 {
+					font-size: 14px;
+					color: #191919;
+				}
+
+				.content-text2 {
+					font-size: 14px;
+					color: #6c6c6c;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/RegulatoryReportingDownload.vue b/supervise-uniapp/pages/index/RegulatoryReportingDownload.vue
new file mode 100644
index 00000000..532214d8
--- /dev/null
+++ b/supervise-uniapp/pages/index/RegulatoryReportingDownload.vue
@@ -0,0 +1,194 @@
+<template>
+
+	<view class="pages">
+
+		<view class="top">
+			<text class="top-name">{{params.name}}</text>
+			<text class="top-date">{{params.orderDate}}</text>
+		</view>
+
+		<view class="content">
+			<view v-show="list.length==0">
+				<view style="display:flex;flex-direction: column;justify-content: center;align-items: center;">
+					<image src="../../static/baseIcon/notData.png" mode="aspectFill"
+						style="width: 150px;height: 150px;">
+					</image>
+					<text style="text-align: center;width: 100%; color: #717171;">暂无数据</text>
+
+				</view>
+
+			</view>
+
+			<view v-for="(item,index) in list" class="list">
+
+				<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 20px;">
+					<text class="item-text">{{item.fileSrcName}}</text>
+					<text class="item-text" @click="downloadClick(item.fullUrl)">点击下载</text>
+				</view>
+
+			</view>
+
+		</view>
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				params: {
+					projectSid: "",
+					name: "",
+					orderDate: "",
+
+				},
+				list: [
+					// {
+					// 	sid: "1",
+					// 	name: "质物库存汇总表",
+					// 	url: "111111111111111",
+					// },
+					// {
+					// 	sid: "2",
+					// 	name: "销售日报表",
+					// 	url: "222222222222",
+					// },
+					// {
+					// 	sid: "3",
+					// 	name: "在途商品表",
+					// 	url: "3333333333",
+					// }
+				]
+
+			}
+		},
+		onLoad(option) {
+			console.log('option', option)
+			this.params = {
+				projectSid: option.sid,
+				name: option.name,
+				orderDate: option.date
+			}
+
+			this.getServerData()
+		},
+		methods: {
+			getServerData() {
+
+				this.$api.getProjectDailyFiles(this.params).then((resp) => {
+					console.log('1111>>>>>>', resp)
+
+					this.list =resp
+				
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+
+			},
+			
+			downloadClick(url) {
+				if (url == '') {
+					uni.showToast({
+						icon: "none",
+						title: "下载地址错误，请重新进入页面。",
+						duration: 5000
+					})
+					return
+				}
+			
+			
+				uni.downloadFile({
+					url: url, // 网络文档地址
+					success: (data) => {
+						if (data.statusCode === 200) {
+							uni.saveFile({
+								tempFilePath: data.tempFilePath, //临时路径
+								success: function(res) {
+									// 保存路径
+									uni.showToast({
+										title: "文件已保存：" + res.savedFilePath,
+										duration: 5000
+									})
+									setTimeout(() => {
+										//打开文档查看
+										uni.openDocument({
+											filePath: res.savedFilePath,
+											showMenu: true, //右上角是否有可以转发分享的功能
+											success: function(res) {
+												console.log('打开文档成功')
+											}
+										})
+									}, 3000);
+								}
+							});
+						}
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '失败请重新下载'
+						});
+					},
+				});
+			
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		width: 100%;
+		height: 100%;
+
+		.top {
+			padding: 20px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+
+			.top-name {
+				font-size: 16px;
+				color: #000;
+				font-weight: 600;
+				font-family: sans-serif;
+			}
+
+			.top-date {
+				font-size: 13px;
+				color: #717171;
+			}
+		}
+
+		.content {
+			display: flex;
+			width: 100%;
+			flex-direction: column;
+			border-top: 2px solid #eee;
+
+			.list {
+				display: flex;
+				margin-left: 30px;
+				margin-right: 30px;
+				flex-direction: column;
+
+				.item-text {
+					font-size: 14px;
+					color: #018AD2;
+					border-bottom: 1px solid #018AD2;
+				}
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/index/UserPrompt.vue b/supervise-uniapp/pages/index/UserPrompt.vue
new file mode 100644
index 00000000..320aeaa1
--- /dev/null
+++ b/supervise-uniapp/pages/index/UserPrompt.vue
@@ -0,0 +1,327 @@
+<template>
+  <view>
+	  <!-- 自定义导航栏 -->
+	  <view class="navBarBox">
+	  	<!-- 状态栏占位 -->
+	  	<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
+	  	<!-- 真正的导航栏内容 -->
+	  	<view class="navBar">
+	  		<view>用户须知</view>
+	  	</view>
+	  </view>
+	  
+    <view class="subscribe">
+      <template type="text/wxtag-template">
+        <view class="subscribe-icon">
+          <image class="subscribe-icon-one" src="/static/static/img/finger_00.png"></image>
+          <image class="subscribe-icon-two" src="/static/static/img/finger_01.png"></image>
+        </view>
+        <view class="subscribe-cont">
+          <wx-open-subscribe :template="templateIds[0]" id="subscribe-btn" ref="subscribeBtn">
+            <script type="text/wxtag-template" slot="style">
+              <style>
+               .subscribe-txt{
+                 color: #89663f;
+                 font-weight: bold;
+                -webkit-animation: subscribeCont 1s linear infinite;
+                  animation: subscribeCont 1s linear infinite;
+                  display: inline-block;
+                  height: 40px;
+                  width: 160px;
+                  text-align: center;
+                  line-height: 40px;
+                }
+                @keyframes subscribeCont {
+                  25% {
+                    transform: scale(.98);
+                  }
+                
+                  50%,
+                  100% {
+                    transform: scale(1);
+                  }
+                
+                  75% {
+                    transform: scale(1.05);
+                  }
+                }
+              </style>
+            </script>
+            <script type="text/wxtag-template">
+              <view class="subscribe-txt">点击消息提醒</view>
+            </script>
+          </wx-open-subscribe>
+        </view>
+      </template>
+    </view>
+  </view>
+</template>
+
+<script>
+  // const jweixin = require('jweixin-module');
+  export default {
+    data() {
+      return {
+		  // 状态栏高度
+		  statusBarHeight: 0,
+        templateIds: ['R9LbtDjg9sC-o3xUS2kDcSQ9MS4I67LnacAS8Fsmxp0']
+      }
+    },
+	//第一次加载时调用
+	created() {
+		//获取手机状态栏高度
+		this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+	},
+    onReady() {
+      this.getInfo()
+    },
+    methods: {
+      getInfo() {
+      // 这里是后去config得基本信息（跟后端要接口 wx.$api.index.wpaySubscribeH5Info  别看不懂，这是封装的请求接口而已换成你自己的就行了）
+        wx.$api.index.wpaySubscribeH5Info(location.href.split('#')[0], ['chooseWXPay', ]).then(res1 => {
+          let w_pay = JSON.parse(res1.data)
+          this.$jweixin.config({
+            debug: false,
+            appId: w_pay.appId,
+            timestamp: w_pay.timestamp,
+            nonceStr: w_pay.nonceStr,
+            signature: w_pay.signature,
+            jsApiList: ['wx-open-subscribe', 'wx-open-launch-app', 'launchAppLication'],
+            openTagList: ['wx-open-subscribe', 'wx-open-launch-app', 'wx-open-subscribe-dialog']
+          })
+          // config 准备好了那么就开始操作了，
+          jweixin.ready(() => {
+          // wx-open-subscribe 原生绑定点击事件
+            this.$nextTick(() => {
+              const btn = this.$refs.subscribeBtn;
+              btn.addEventListener('success', ({
+                detail
+              }) => {
+                this.content2 = JSON.parse(detail.subscribeDetails)
+                for (var i in this.content2) {
+                  if (i === this.templateIds[0] || i ===
+                    'EZcWzqrLdU-2Ax6KILdv9uSf6ANbHka7CbYG2KGahPk') {
+                    let status = JSON.parse(this.content2[i]).status
+                    console.log(status)
+                    console.log(this.content2)
+                    if (status === 'accept') {
+                    // 这里跟后端要个接口，绑定；
+                      wx.$api.index.subscribeH5(1).then(res => {
+                        wx.showLoading({
+                          title: res.data,
+                          icon: 'none',
+                        })
+                        // 获取卡权益
+                        // this.indexInfo();
+                        setTimeout(function() {
+                          wx.hideLoading();
+                        }, 1000)
+                      })
+                    } else if (status === 'reject') {
+                      alert('拒绝授权')
+                    }
+                  }
+                }
+              });
+              btn.addEventListener('error', (e) => {
+                alert('授权失败了，请重试')
+              });
+            })
+          })
+        }).catch(err => {
+          wx.showToast({
+            title: err.message,
+            icon: 'none'
+          })
+        })
+      }
+
+    }
+  }
+</script>
+
+<style>
+	
+	.navBarBox {
+		background: #007AFF;
+	}
+	
+	.navBarBox .statusBar {}
+	
+	.navBarBox .navBar {
+		padding-top: 15px;
+		padding-bottom: 13px;
+		display: flex;
+		font-size: 13px;
+		flex-direction: row;
+		color: #ffffff;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	
+  /* 订阅消息 */
+  .subscribe {
+    color: #89663f;
+    width: 100%;
+    padding: 0 100rpx;
+    display: inline-block;
+    box-sizing: border-box;
+    margin-top: 50rpx;
+    display: flex;
+    /* -webkit-animation: Tada 3s both infinite;
+              -moz-animation: Tada 3s both infinite;
+              -ms-animation: Tada 3s both infinite;
+              animation: Tada 3s both infinite; */
+  }
+
+  .subscribe-icon,
+  .subscribe-cont {
+    height: 80rpx;
+    text-align: center;
+    line-height: 80rpx;
+    position: relative;
+  }
+
+  .subscribe-icon {
+    width: 150rpx;
+    padding-left: 30rpx;
+    box-sizing: border-box;
+    background: linear-gradient(to right, #f3c988, #f9e0b8);
+    border-radius: 40rpx 0 0 40rpx;
+  }
+
+  .subscribe-icon::after {
+    position: absolute;
+    content: '';
+    right: -50rpx;
+    top: 0;
+    width: 0;
+    height: 0;
+    border-bottom: 80rpx solid #f9e0b8;
+    border-right: 50rpx solid transparent;
+    z-index: 9;
+  }
+
+  .subscribe-cont {
+    width: calc(100% - 150rpx);
+    background: linear-gradient(to right, #f3c988, #f9e0b8);
+    border-radius: 0 40rpx 40rpx 0;
+    font-weight: 600;
+  }
+
+  .subscribe-cont text {
+    display: inline-block;
+    -webkit-animation: subscribeCont 1s linear infinite;
+    animation: subscribeCont 1s linear infinite;
+  }
+
+  @keyframes subscribeCont {
+    25% {
+      transform: scale(.98);
+    }
+
+    50%,
+    100% {
+      transform: scale(1);
+    }
+
+    75% {
+      transform: scale(1.05);
+    }
+  }
+
+  .subscribe-icon image {
+    width: 54rpx;
+    height: 54rpx;
+    margin-top: 14rpx;
+  }
+
+  @keyframes Tada {
+    0% {
+      transform: scale(1);
+      transform: scale(1)
+    }
+
+    70%,
+    73% {
+      transform: scale(1) rotate(-3deg);
+      transform: scale(1) rotate(-3deg)
+    }
+
+    77%,
+    83%,
+    90%,
+    97% {
+      transform: scale(1) rotate(3deg);
+      transform: scale(1) rotate(3deg)
+    }
+
+    80%,
+    87%,
+    93% {
+      transform: scale(1) rotate(-3deg);
+      transform: scale(1) rotate(-3deg)
+    }
+
+    100% {
+      transform: scale(1) rotate(0);
+      transform: scale(1) rotate(0)
+    }
+  }
+
+  .subscribe-icon-one {
+    -webkit-animation: bounce-right 1s linear infinite;
+    animation: bounce-right 1s linear infinite;
+  }
+
+  @keyframes bounce-right {
+    25% {
+      transform: translateX(-3px);
+    }
+
+    50%,
+    100% {
+      transform: translateX(0);
+    }
+
+    75% {
+      transform: translateX(3px);
+    }
+  }
+
+  .subscribe-icon-two {
+    -webkit-animation: bounce-two 1s linear infinite;
+    animation: bounce-two 1s linear infinite;
+  }
+
+  @keyframes bounce-two {
+    25% {
+      opacity: 0;
+      transform: translateX(-3px);
+    }
+
+    75% {
+      opacity: 1;
+      transform: translateX(3px);
+    }
+  }
+
+  subscribe-btn {
+    width: 100%;
+    height: 200rpx;
+    text-align: center;
+    line-height: 150rpx;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #ffffff;
+    background-color: green;
+    position: relative;
+    overflow: hidden;
+  }
+</style>
+
+
+
+
+
diff --git a/supervise-uniapp/pages/index/WaitingProcessed.vue b/supervise-uniapp/pages/index/WaitingProcessed.vue
index 59b44fc6..b15740a5 100644
--- a/supervise-uniapp/pages/index/WaitingProcessed.vue
+++ b/supervise-uniapp/pages/index/WaitingProcessed.vue
@@ -27,7 +27,7 @@
 					</view>
 
 					<view class="item-con">
-						<view >
+						<view>
 							<text class="item-con-text">发起人：</text>
 							<text class="item-con-text">{{item.name}}</text>
 						</view>
@@ -35,7 +35,7 @@
 							<text class="item-con-text">发起部门：</text>
 							<text class="item-con-text">{{item.department}}</text>
 						</view>
-						<view  style="margin-top: 8px;">
+						<view style="margin-top: 8px;">
 							<text class="item-con-text">发起日期：</text>
 							<text class="item-con-text">{{item.startDate}}</text>
 						</view>
@@ -256,7 +256,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -266,7 +266,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -276,7 +276,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -286,7 +286,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -296,7 +296,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -306,7 +306,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -316,7 +316,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -326,7 +326,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -336,7 +336,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -346,7 +346,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -356,7 +356,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -367,7 +367,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -377,7 +377,7 @@
 						name: "张磊",
 						department: "研发部",
 						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
+						currentProcessor: "张衡、吴",
 						submitDate: "2022.01.28  10:28"
 
 					},
@@ -386,6 +386,66 @@
 
 			};
 		},
+
+		created() {
+			this.$bus.$on('wholeSpin', msg => {
+				//这里获取到http工具js文件中传过来的wholeSpin值
+				console.log(">>>>>", this.isShow)
+
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.loadData();
+			});
+		},
+
+
+		onLoad() {
+
+		},
+
+		onShow() {
+			console.log('onShow', getApp().globalData.isLogin)
+
+			let token = uni.getStorageSync("Global-Auth-Token")
+			if (token != null && token.length != 0) {
+				getApp().globalData.token = token
+			}
+			let isLogin = uni.getStorageSync("isLogin")
+			if (isLogin != null && isLogin == 1) {
+				getApp().globalData.isLogin = isLogin
+			}
+			let sid = uni.getStorageSync("sid")
+			if (sid != null && sid.length != 0) {
+				getApp().globalData.sid = sid
+			}
+
+			console.log('用户Sid', getApp().globalData.sid)
+			console.log('token', getApp().globalData.token)
+			console.log('是否登陆', getApp().globalData.isLogin)
+
+			// setTimeout(() => {
+			if (getApp().globalData.isLogin) {
+				var userSid = getApp().globalData.sid
+				console.log(">>>>>", userSid)
+				this.loadData();
+				// uni.setTabBarBadge({ //显示数字
+				// 	index: 0, //tabbar下标
+				// 	text: '100' //数字
+				// })
+			} else {
+
+				/*  #ifdef  MP-WEIXIN */
+				this.WxSilentLogin()
+				/* #endif */
+
+				/*  #ifdef APP-PLUS */
+				uni.redirectTo({
+					url: '../login/login'
+				})
+				/* #endif */
+			}
+		},
+
 		// onShow() {
 		// 	this.listQuery.current = 1
 		// 	this.dataList = [];
@@ -444,6 +504,8 @@
 			},
 			highLight(value) {
 				console.log("highLight》》》", value);
+				if (value == '' || value == undefined || value == null)
+					return
 				if (value.includes(this.searchText)) {
 					value = value.replace(
 						this.searchText,
@@ -539,10 +601,10 @@
 				this.datetimeShow = false
 
 				this.$refs['drawer'].close()
-				
+
 				uni.showToast({
 					icon: "none",
-					title:  JSON.stringify( this.search),
+					title: JSON.stringify(this.search),
 					duration: 5000,
 				});
 			},
@@ -830,7 +892,7 @@
 						display: -webkit-box;
 						-webkit-line-clamp: 1;
 						-webkit-box-orient: vertical;
-					
+
 					}
 
 					.item-top-text2 {
diff --git a/supervise-uniapp/pages/index/WarehouseDetaile.vue b/supervise-uniapp/pages/index/WarehouseDetaile.vue
index c7b8a168..2081583d 100644
--- a/supervise-uniapp/pages/index/WarehouseDetaile.vue
+++ b/supervise-uniapp/pages/index/WarehouseDetaile.vue
@@ -20,12 +20,12 @@
 			</view>
 			<view class="view"></view>
 
-			<image class="top-img" src="https://jianguan.yyundong.com/img/newApp/phone.png" mode="aspectFit"></image>
+			<image class="top-img" src="https://supervise.yxtsoft.com/img/newApp/phone.png" mode="aspectFit"></image>
 
 		</view>
 
 		<view class="top" style="margin-top: 10px;">
-			<image style="width: 20px;height: 40px;" src="https://jianguan.yyundong.com/img/newApp/location.png" mode="aspectFit"></image>
+			<image style="width: 20px;height: 40px;" src="https://supervise.yxtsoft.com/img/newApp/location.png" mode="aspectFit"></image>
 			<view style="display: flex;
 				flex-direction: column;margin-left: 10px;">
 				<text class="top-name-text3">{{info.address}}</text>
diff --git a/supervise-uniapp/pages/index/WarehouseManagement.vue b/supervise-uniapp/pages/index/WarehouseManagement.vue
index 56ab4579..7444730e 100644
--- a/supervise-uniapp/pages/index/WarehouseManagement.vue
+++ b/supervise-uniapp/pages/index/WarehouseManagement.vue
@@ -5,13 +5,13 @@
 
 			<view class="item" style="margin-right: 10px;" @click="onClick('1')">
 
-				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/yclb.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://supervise.yxtsoft.com/img/newApp/yclb.png" mode="aspectFit"></image>
 				<text class="item_text">云仓列表</text>
 			</view>
 
 			<view class="item"  style="margin-left: 10px;"  @click="onClick('2')">
 
-				<image class="item_img" src="https://jianguan.yyundong.com/img/newApp/jczl.png" mode="aspectFit"></image>
+				<image class="item_img" src="https://supervise.yxtsoft.com/img/newApp/jczl.png" mode="aspectFit"></image>
 				<text class="item_text">基础资料</text>
 			</view>
 
@@ -22,13 +22,13 @@
 		
 			<view class="item" style="margin-right: 10px;"  @click="onClick('3')">
 		
-				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/rkgl.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://supervise.yxtsoft.com/img/newApp/rkgl.png" mode="aspectFit"></image>
 				<text class="item_text">入库管理</text>
 			</view>
 		
 			<view class="item"  style="margin-left: 10px;" @click="onClick('4')">
 		
-				<image class="item_img" src="https://jianguan.yyundong.com/img/newApp/ckgl.png" mode="aspectFit"></image>
+				<image class="item_img" src="https://supervise.yxtsoft.com/img/newApp/ckgl.png" mode="aspectFit"></image>
 				<text class="item_text">出库管理</text>
 			</view>
 		
@@ -39,7 +39,7 @@
 		
 			<view class="item" style="margin-right: 10px;"  @click="onClick('5')">
 		
-				<image class="item_img"  src="https://jianguan.yyundong.com/img/newApp/ckdj.png" mode="aspectFit"></image>
+				<image class="item_img"  src="https://supervise.yxtsoft.com/img/newApp/ckdj.png" mode="aspectFit"></image>
 				<text class="item_text">仓库登记</text>
 			</view>
 		
diff --git a/supervise-uniapp/pages/index/auditReport.vue b/supervise-uniapp/pages/index/auditReport.vue
index c72b018d..faab6574 100644
--- a/supervise-uniapp/pages/index/auditReport.vue
+++ b/supervise-uniapp/pages/index/auditReport.vue
@@ -172,12 +172,13 @@ background: #0498FD;" @click="download">
 				companyName: option.companyName
 			}
 
-			console.log('1111', this.queryParams)
-			this.getData()
 
 		},
 		onShow() {
 			wx.hideHomeButton()
+			
+			console.log('1111', this.queryParams)
+			this.getData()
 		},
 		methods: {
 
diff --git a/supervise-uniapp/pages/index/demoReportKc.vue b/supervise-uniapp/pages/index/demoReportKc.vue
index 630fbed4..6d23f1e7 100644
--- a/supervise-uniapp/pages/index/demoReportKc.vue
+++ b/supervise-uniapp/pages/index/demoReportKc.vue
@@ -229,13 +229,10 @@
 
 			this.date = option.orderDate
 
-			this.getData()
-
-
-
 		},
 		onShow() {
 			wx.hideHomeButton()
+				this.getData()
 		},
 		methods: {
 			onClick(e) {
diff --git a/supervise-uniapp/pages/index/enterpriseRisk.vue b/supervise-uniapp/pages/index/enterpriseRisk.vue
index 06df05b8..00013097 100644
--- a/supervise-uniapp/pages/index/enterpriseRisk.vue
+++ b/supervise-uniapp/pages/index/enterpriseRisk.vue
@@ -74,12 +74,11 @@
 					executionTime: ""
 				},
 				list: [],
-				fileUrl:"",
+				fileUrl: "",
 			};
 		},
 		onLoad(option) {
 
-			// var data = JSON.stringify(option)
 
 			this.queryParams = {
 				businessName: option.businessName,
@@ -88,58 +87,48 @@
 
 			console.log('1111', this.queryParams)
 
-			// this.setData({
-			// 	queryParams: JSON.stringify(option)
-			// })
-
-			// console.log('setData', this.queryParams)
-			this.getData()
-
-			// console.log('App onLoad', JSON.stringify(option))
-			// this.title = JSON.stringify(option)
-			// wx.showToast({
-			// 	title: 'onLoad成功>>>>>' + JSON.stringify(option),
-			// 	icon: 'none',
-			// 	duration: 5000 //持续的时间
-			// })
-
 		},
 		onShow() {
 			wx.hideHomeButton()
+
+			this.getData()
 		},
 		methods: {
 			download() {
-				 uni.downloadFile({
-				     url: this.fileUrl,// 网络文档地址
-				     success: (data) => {
-				     if (data.statusCode === 200) {
-				         uni.saveFile({
-				           tempFilePath: data.tempFilePath, //临时路径
-				           success: function(res) {
-				             // 保存路径
-				             uni.showToast({ title: "文件已保存："+res.savedFilePath,duration:5000 })
-				             setTimeout(()=>{
-				               //打开文档查看
-				               uni.openDocument({
-				                 filePath:res.savedFilePath,
-								  showMenu: true,//右上角是否有可以转发分享的功能
-				                 success:function(res){
-				                   console.log('打开文档成功')
-				                 }
-				               })
-				             }, 3000);
-				           }
-				         });
-				       }
-				     },
-				     fail: (err) => {
-				       uni.showToast({
-				         title: '失败请重新下载'
-				       });
-				     },
-				   });
-				 
-				
+				uni.downloadFile({
+					url: this.fileUrl, // 网络文档地址
+					success: (data) => {
+						if (data.statusCode === 200) {
+							uni.saveFile({
+								tempFilePath: data.tempFilePath, //临时路径
+								success: function(res) {
+									// 保存路径
+									uni.showToast({
+										title: "文件已保存：" + res.savedFilePath,
+										duration: 5000
+									})
+									setTimeout(() => {
+										//打开文档查看
+										uni.openDocument({
+											filePath: res.savedFilePath,
+											showMenu: true, //右上角是否有可以转发分享的功能
+											success: function(res) {
+												console.log('打开文档成功')
+											}
+										})
+									}, 3000);
+								}
+							});
+						}
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '失败请重新下载'
+						});
+					},
+				});
+
+
 			},
 			getData() {
 				console.log('getData', this.queryParams)
diff --git a/supervise-uniapp/pages/login/login.vue b/supervise-uniapp/pages/login/login.vue
index 26a94d61..7cedb8e8 100644
--- a/supervise-uniapp/pages/login/login.vue
+++ b/supervise-uniapp/pages/login/login.vue
@@ -211,16 +211,21 @@
 
 						console.log('MMMM:', resp)
 						// getApp().globalData = resp
-						 uni.setStorageSync("Global-Auth-Token",  uinfo.token)
 						getApp().globalData.username = uinfo.name
 						getApp().globalData.token = uinfo.token
-						getApp().globalData.sysUserSid = uinfo.sid
+						getApp().globalData.sid = uinfo.sid
 						getApp().globalData.mobile = uinfo.mobile
 						getApp().globalData.name = uinfo.name
 						getApp().globalData.isAdmin = uinfo.isAdmin
 						getApp().globalData.roleName = uinfo.roleName
 						getApp().globalData.staffSid = uinfo.staffSid
 						getApp().globalData.isLogin= true
+						
+						uni.setStorageSync("Global-Auth-Token", uinfo.token)
+						uni.setStorageSync("sid", uinfo.sid)
+						uni.setStorageSync("isLogin", true)
+						
+						
 						console.log('gd--:', getApp().globalData)
 						// uni.redirectTo({
 						// 	url: '/pages/index/index',
diff --git a/supervise-uniapp/static/baseIcon/download.png b/supervise-uniapp/static/baseIcon/download.png
new file mode 100644
index 00000000..d342e72c
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/download.png differ
diff --git a/supervise-uniapp/static/baseIcon/loading.gif b/supervise-uniapp/static/baseIcon/loading.gif
new file mode 100644
index 00000000..2a18b958
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/loading.gif differ
diff --git a/supervise-uniapp/static/baseIcon/notData.png b/supervise-uniapp/static/baseIcon/notData.png
new file mode 100644
index 00000000..aaddfc47
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/notData.png differ
diff --git a/supervise-uniapp/static/baseIcon/orders.png b/supervise-uniapp/static/baseIcon/orders.png
new file mode 100644
index 00000000..d029b88d
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/orders.png differ
diff --git a/yxt-portal-ui/.env.development b/yxt-portal-ui/.env.development
index a3eb3d3a..f2ef176f 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://8.130.39.13:8112"
+VUE_APP_URL = "http://192.168.1.193:8112"
+ #VUE_APP_URL = "http://8.130.39.13:8112"