From d43fbd22fdf941bacc4a98203f77de4aa8c30545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 23 Mar 2023 14:43:22 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apis/index.js b/apis/index.js
index bc86f66..917ef93 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 

From 7508bb7ce2bfc9523e69b8166dfdb9c24b41f3d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 24 Mar 2023 10:06:59 +0800
Subject: [PATCH 02/11] =?UTF-8?q?im=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js           |  4 +--
 apis/interfaces/yxim.js | 20 ++++++++++++++
 im/INIT.js              | 58 +++++++++++++++++++++++++++++++++++++++++
 main.js                 | 28 +++++++++++---------
 package-lock.json       | 51 ++++++++++++++++++++++++++++++++++++
 package.json            |  1 +
 pages.json              |  5 ++++
 pages/im/chat.vue       | 17 ------------
 pages/im/msg.vue        |  5 ++++
 yarn.lock               | 24 +++++++++++++++++
 10 files changed, 182 insertions(+), 31 deletions(-)
 create mode 100644 apis/interfaces/yxim.js
 create mode 100644 im/INIT.js

diff --git a/apis/index.js b/apis/index.js
index 917ef93..bc86f66 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
diff --git a/apis/interfaces/yxim.js b/apis/interfaces/yxim.js
new file mode 100644
index 0000000..6807e61
--- /dev/null
+++ b/apis/interfaces/yxim.js
@@ -0,0 +1,20 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 网易云信IM
+ */
+
+import { request } from '../index'
+
+// 获取im登录
+const imToken = data => {
+	return request({
+		url		: 'im/token'
+	})
+}
+
+export {
+	imToken
+}
diff --git a/im/INIT.js b/im/INIT.js
new file mode 100644
index 0000000..30373af
--- /dev/null
+++ b/im/INIT.js
@@ -0,0 +1,58 @@
+
+import Vue from 'vue'
+import store from '@/store';
+import NIMSDK from 'nim-web-sdk-ng/dist/NIM_UNIAPP_SDK'
+import { imToken } from '@/apis/interfaces/yxim.js'
+
+export const INIT = async () => {
+	
+	let APPKEY = ''
+	let TOKEN  = ''
+	let UID	   = ''
+
+	if( store.getters.getToken == '' || uni.getStorageSync('token') == '' ){
+		return '用户未登录'
+	}
+	
+	await imToken().then(res => {
+		let { app_key, token, uid } = res;
+		APPKEY = app_key
+		TOKEN  = token
+		UID	   = uid
+	}).catch(err => {
+		uni.showToast({
+			title: 'IM INIT ERR' + err.code,
+			icon : 'none'
+		})
+	})
+	
+	const yxim = new NIMSDK({
+		appkey				: APPKEY,
+		account				: UID,
+		token				: TOKEN,
+		debugLevel			: 'debug',
+		needReconnect		: true,
+		reconnectionAttempts: 5
+	})
+	
+	// 注册监听事件
+	const eventList = [
+		'logined',
+		'kicked',
+		'willReconnect',
+		'disconnect',
+		'msg',
+		'syncdone',
+	]
+	
+	eventList.forEach(key => {
+		yxim.on(key, res => {
+			console.log(`{$key}:`, res ? JSON.parse(JSON.stringify(res)): res)
+		})
+	})
+	
+	await yxim.connect();
+	
+	// 挂载全局变量方法
+	Vue.prototype.$nim = yxim;
+}
diff --git a/main.js b/main.js
index 6d5f2d2..821bf6c 100644
--- a/main.js
+++ b/main.js
@@ -7,16 +7,20 @@ import store from './store'
 import { router, RouterMount } from 'router'
 import Mylink from './node_modules/uni-simple-router/dist/link.vue'
 
-Vue.component('my-link', Mylink)
+import { INIT } from './im/INIT'
 
-Vue.use(uView)
-Vue.use(router)
-
-Vue.config.productionTip = false
-App.mpType = 'app'
-const app = new Vue({
-	store,
-	...App
-})
-
-app.$mount()
+(async () => {
+	Vue.component('my-link', Mylink)
+	Vue.use(uView)
+	Vue.use(router)
+	
+	await INIT();
+	
+	Vue.config.productionTip = false
+	App.mpType = 'app'
+	const app = new Vue({
+		store,
+		...App
+	})
+	app.$mount()
+})()
diff --git a/package-lock.json b/package-lock.json
index 9dc54dc..84c6e27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "moment": "^2.29.4",
+        "nim-web-sdk-ng": "^0.12.3",
         "uni-read-pages": "^1.0.5",
         "uni-simple-router": "^2.0.7",
         "uview-ui": "^2.0.31",
@@ -164,6 +165,16 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "peer": true
     },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "node_modules/magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -192,11 +203,26 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/nim-web-sdk-ng": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/nim-web-sdk-ng/-/nim-web-sdk-ng-0.12.3.tgz",
+      "integrity": "sha512-S1RYQDz5n/tCqdHVv5fIBKBB60hdvySLTLo1xSgPVrk725GrGSXXyblWZeaWazUoFuLzfSKyrK0LRCJoAMcHYw==",
+      "dependencies": {
+        "eventemitter3": "^4.0.7",
+        "lodash-es": "^4.17.21",
+        "platform": "^1.3.6"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
+    "node_modules/platform": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+    },
     "node_modules/postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
@@ -457,6 +483,16 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "peer": true
     },
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -476,11 +512,26 @@
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
       "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
     },
+    "nim-web-sdk-ng": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/nim-web-sdk-ng/-/nim-web-sdk-ng-0.12.3.tgz",
+      "integrity": "sha512-S1RYQDz5n/tCqdHVv5fIBKBB60hdvySLTLo1xSgPVrk725GrGSXXyblWZeaWazUoFuLzfSKyrK0LRCJoAMcHYw==",
+      "requires": {
+        "eventemitter3": "^4.0.7",
+        "lodash-es": "^4.17.21",
+        "platform": "^1.3.6"
+      }
+    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
+    "platform": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+    },
     "postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
diff --git a/package.json b/package.json
index 30c9a9a..63dcf7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "moment": "^2.29.4",
+    "nim-web-sdk-ng": "^0.12.3",
     "uni-read-pages": "^1.0.5",
     "uni-simple-router": "^2.0.7",
     "uview-ui": "^2.0.31",
diff --git a/pages.json b/pages.json
index 4df438c..0c59f36 100644
--- a/pages.json
+++ b/pages.json
@@ -599,6 +599,11 @@
 			"selectedIconPath": "static/icons/tabs_show_02.png",
 			"pagePath": "pages/work/index",
 			"text": "工作台"
+		},{
+			"iconPath": "static/icons/tabs_icon_04.png",
+			"selectedIconPath": "static/icons/tabs_icon_04.png",
+			"pagePath": "pages/im/msg",
+			"text": "消息"
 		}, {
 			"iconPath": "static/icons/tabs_icon_03.png",
 			"selectedIconPath": "static/icons/tabs_show_03.png",
diff --git a/pages/im/chat.vue b/pages/im/chat.vue
index 5388f64..714fafd 100644
--- a/pages/im/chat.vue
+++ b/pages/im/chat.vue
@@ -3,23 +3,6 @@
 		<list>
 			<cell v-for="(item, index) in 99" :key="index">消息{{index}}</cell>
 		</list>
-		<!-- <view class="chat-soll">
-			<view v-for="(item, index) in 50" :key="index">{{item}}滚动的聊天记录</view>
-		</view>
-		<view class="chat-footer">
-			<view class="chat-inputs">
-				<view class="chat-icon">
-					<image src="@/static/im/icon_01.png" mode="widthFix"></image>
-				</view>
-				<input class="chat-input" type="text" placeholder="输入框" confirm-type="send">
-				<view class="chat-icon">
-					<image src="@/static/im/icon_02.png" mode="widthFix"></image>
-				</view>
-				<view class="chat-icon">
-					<image src="@/static/im/icon_00.png" mode="widthFix"></image>
-				</view>
-			</view>
-		</view> -->
 	</view>
 </template>
 
diff --git a/pages/im/msg.vue b/pages/im/msg.vue
index 3361986..0bdaa5d 100644
--- a/pages/im/msg.vue
+++ b/pages/im/msg.vue
@@ -58,6 +58,11 @@
 				}
 			}
 		},
+		onShow() {
+			console.log()
+			
+			// this.$nim.msg()
+		},
 		methods: {
 			onMsg(id){
 				let cartId = id || null
diff --git a/yarn.lock b/yarn.lock
index acaff64..5feaa1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -131,6 +131,16 @@
   "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
   "version" "2.0.2"
 
+"eventemitter3@^4.0.7":
+  "integrity" "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+  "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  "version" "4.0.7"
+
+"lodash-es@^4.17.21":
+  "integrity" "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+  "resolved" "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
+  "version" "4.17.21"
+
 "magic-string@^0.25.7":
   "integrity" "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
   "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
@@ -148,11 +158,25 @@
   "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
   "version" "3.3.4"
 
+"nim-web-sdk-ng@^0.12.3":
+  "integrity" "sha512-S1RYQDz5n/tCqdHVv5fIBKBB60hdvySLTLo1xSgPVrk725GrGSXXyblWZeaWazUoFuLzfSKyrK0LRCJoAMcHYw=="
+  "resolved" "https://registry.npmjs.org/nim-web-sdk-ng/-/nim-web-sdk-ng-0.12.3.tgz"
+  "version" "0.12.3"
+  dependencies:
+    "eventemitter3" "^4.0.7"
+    "lodash-es" "^4.17.21"
+    "platform" "^1.3.6"
+
 "picocolors@^1.0.0":
   "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
   "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   "version" "1.0.0"
 
+"platform@^1.3.6":
+  "integrity" "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+  "resolved" "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz"
+  "version" "1.3.6"
+
 "postcss@^8.1.10", "postcss@^8.4.14":
   "integrity" "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g=="
   "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz"

From 7a253612492b19586e009ed4dcf9bac16054f7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 27 Mar 2023 17:54:12 +0800
Subject: [PATCH 03/11] merge

---
 main.js                                       |  6 +-
 pages/account/withdraws.vue                   |  3 -
 pages/im/msg.vue                              |  2 -
 pages/index/index.vue                         | 22 +++++
 pages/work/perfectBasis.vue                   |  6 +-
 uni_modules/oct-mechanism-picker/changelog.md |  0
 .../oct-mechanism-picker.vue                  | 68 ++++++++++++++++
 uni_modules/oct-mechanism-picker/package.json | 81 +++++++++++++++++++
 uni_modules/oct-mechanism-picker/readme.md    |  1 +
 9 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 uni_modules/oct-mechanism-picker/changelog.md
 create mode 100644 uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
 create mode 100644 uni_modules/oct-mechanism-picker/package.json
 create mode 100644 uni_modules/oct-mechanism-picker/readme.md

diff --git a/main.js b/main.js
index 821bf6c..f37200f 100644
--- a/main.js
+++ b/main.js
@@ -9,12 +9,12 @@ import Mylink from './node_modules/uni-simple-router/dist/link.vue'
 
 import { INIT } from './im/INIT'
 
-(async () => {
+// (async () => {
 	Vue.component('my-link', Mylink)
 	Vue.use(uView)
 	Vue.use(router)
 	
-	await INIT();
+	// await INIT();
 	
 	Vue.config.productionTip = false
 	App.mpType = 'app'
@@ -23,4 +23,4 @@ import { INIT } from './im/INIT'
 		...App
 	})
 	app.$mount()
-})()
+// })()
diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue
index 8a3a630..9fe6f4a 100644
--- a/pages/account/withdraws.vue
+++ b/pages/account/withdraws.vue
@@ -106,9 +106,6 @@
 		
 				uni.hideLoading()
 			}).catch(err => {
-				
-				console.log(err)
-					
 				uni.showModal({
 					content		: err.message,
 					showCancel	: false,
diff --git a/pages/im/msg.vue b/pages/im/msg.vue
index 0bdaa5d..cf7c383 100644
--- a/pages/im/msg.vue
+++ b/pages/im/msg.vue
@@ -59,8 +59,6 @@
 			}
 		},
 		onShow() {
-			console.log()
-			
 			// this.$nim.msg()
 		},
 		methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ee95bd2..763a428 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -110,6 +110,13 @@
 				</view>
 			</view>
 		</u-popup>
+		<!-- 机构选择 -->
+		<button @click="onOpen">弹出层</button>
+		<oct-mechanism-picker
+			ref="MecanisPicker"
+			title="选择办理机构"
+			:columns="jgArr"
+		/>
 	</view>
 </template>
 
@@ -119,6 +126,18 @@
 	export default {
 		data() {
 			return {
+				jgArr		: [
+					{ name: '中信' },
+					{ name: '哈尔滨' },
+					{ name: '广州' },
+					{ name: '发展银行' },
+					{ name: '其他机构' },
+					{ name: '中信' },
+					{ name: '哈尔滨' },
+					{ name: '广州' },
+					{ name: '发展银行' },
+					{ name: '其他机构' }
+				],
 				theTabs		: [
 					{ category_id: '', title: '全部' }
 				],
@@ -146,6 +165,9 @@
             this.getZf()
         },
 		methods: {
+			onOpen(){
+				this.$refs.MecanisPicker.open()
+			},
             // 获取金法列表
             getJf(){
                 let params = {
diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue
index 0417aa1..ef00543 100644
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -106,21 +106,21 @@
 						<text>*</text>现居住地址
 						<uni-icons v-if="baseInfo.check_params.now_domicile" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_domicile.description)"></uni-icons>
 					</label>
-					<input class="from-input" type="number" v-model="baseInfo.now_domicile" placeholder="输入现居住地址">
+					<input class="from-input" v-model="baseInfo.now_domicile" placeholder="输入现居住地址">
 				</view>
 				<view class="from-item from-item-100">
 					<label>
 						<text>*</text>现单位地址
 						<uni-icons v-if="baseInfo.check_params.now_company_address" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_address.description)"></uni-icons>
 					</label>
-					<input class="from-input" type="number" v-model="baseInfo.now_company_address" placeholder="输入现单位地址">
+					<input class="from-input" v-model="baseInfo.now_company_address" placeholder="输入现单位地址">
 				</view>
 				<view class="from-item from-item-100">
 					<label>
 						<text>*</text>现单位名称
 						<uni-icons v-if="baseInfo.check_params.now_company_name" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
 					</label>
-					<input class="from-input" type="number" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
+					<input class="from-input" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
 				</view>
 			</view>
 			<view class="btn">
diff --git a/uni_modules/oct-mechanism-picker/changelog.md b/uni_modules/oct-mechanism-picker/changelog.md
new file mode 100644
index 0000000..e69de29
diff --git a/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
new file mode 100644
index 0000000..2785aea
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<uni-popup ref="octMechanismPicker">
+			<view class="mechanism--content">
+				<view class="mechanism--title" v-if="title != null">{{title}}</view>
+				<scroll-view class="mechanism--scroll" scroll-y show-scrollbar>
+					<view class="mechanism--item" v-for="(item, index) in columns" :key="index">{{item.name}}</view>
+				</scroll-view>
+				<button class="mechanism--button">确认</button>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	export default{
+		props	: {
+			// 弹出层标题
+			title	: {
+				type	: String,
+				default	: null
+			},
+			// 默认值
+			value	: {
+				type	: Number,
+				default	: 0
+			},
+			// 选项
+			columns	: {
+				type	: Array,
+				default	: () => {
+					return []
+				}
+			}
+		},
+		methods	: {
+			open(type){
+				this.$refs.octMechanismPicker.open(type || 'bottom')
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.mechanism--content{
+		background: white;
+		border-radius: 20rpx 20rpx 0 0;
+		.mechanism--title{
+			text-align: center;
+			position: relative;
+			padding: 30rpx 50rpx;
+			font-size: 34rpx;
+			font-weight: bold;
+			&::after {
+				content: "";
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				width: 100%;
+				height: 1rpx;
+				background-image: linear-gradient(0deg, $border-color 50%, transparent 50%);
+			}
+		}
+		.mechanism--scroll{
+			padding: 30rpx 50rpx;
+			height: 50vh;
+			.mechanism--item{ line-height: 90rpx; }
+		}
+	}
+</style>
diff --git a/uni_modules/oct-mechanism-picker/package.json b/uni_modules/oct-mechanism-picker/package.json
new file mode 100644
index 0000000..610cb64
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "oct-mechanism-picker",
+  "displayName": "oct-mechanism-picker",
+  "version": "1.0.0",
+  "description": "oct-mechanism-picker",
+  "keywords": [
+    "oct-mechanism-picker"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/oct-mechanism-picker/readme.md b/uni_modules/oct-mechanism-picker/readme.md
new file mode 100644
index 0000000..cfa15d6
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/readme.md
@@ -0,0 +1 @@
+# oct-mechanism-picker
\ No newline at end of file

From 59dc853cdfa2f90e0e67c18754e59d1ad764cf9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 28 Mar 2023 15:56:36 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   5 -
 pages/index/index.vue                         |  22 ----
 pages/work/generate.vue                       |  33 ++++-
 .../oct-mechanism-picker.vue                  | 117 +++++++++++++++++-
 4 files changed, 141 insertions(+), 36 deletions(-)

diff --git a/pages.json b/pages.json
index 0c59f36..4df438c 100644
--- a/pages.json
+++ b/pages.json
@@ -599,11 +599,6 @@
 			"selectedIconPath": "static/icons/tabs_show_02.png",
 			"pagePath": "pages/work/index",
 			"text": "工作台"
-		},{
-			"iconPath": "static/icons/tabs_icon_04.png",
-			"selectedIconPath": "static/icons/tabs_icon_04.png",
-			"pagePath": "pages/im/msg",
-			"text": "消息"
 		}, {
 			"iconPath": "static/icons/tabs_icon_03.png",
 			"selectedIconPath": "static/icons/tabs_show_03.png",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 763a428..ee95bd2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -110,13 +110,6 @@
 				</view>
 			</view>
 		</u-popup>
-		<!-- 机构选择 -->
-		<button @click="onOpen">弹出层</button>
-		<oct-mechanism-picker
-			ref="MecanisPicker"
-			title="选择办理机构"
-			:columns="jgArr"
-		/>
 	</view>
 </template>
 
@@ -126,18 +119,6 @@
 	export default {
 		data() {
 			return {
-				jgArr		: [
-					{ name: '中信' },
-					{ name: '哈尔滨' },
-					{ name: '广州' },
-					{ name: '发展银行' },
-					{ name: '其他机构' },
-					{ name: '中信' },
-					{ name: '哈尔滨' },
-					{ name: '广州' },
-					{ name: '发展银行' },
-					{ name: '其他机构' }
-				],
 				theTabs		: [
 					{ category_id: '', title: '全部' }
 				],
@@ -165,9 +146,6 @@
             this.getZf()
         },
 		methods: {
-			onOpen(){
-				this.$refs.MecanisPicker.open()
-			},
             // 获取金法列表
             getJf(){
                 let params = {
diff --git a/pages/work/generate.vue b/pages/work/generate.vue
index 17b5e06..f8a0864 100644
--- a/pages/work/generate.vue
+++ b/pages/work/generate.vue
@@ -11,12 +11,16 @@
 				<!-- 机构 -->
 				<view class="block-item">
 					<label class="block-item-label"><text>*</text>机构</label>
-					<picker :range="item.institution" range-key="title" :value="item.institutionIndex" @change="institutionChange($event, item, index)">
+					<!-- <picker :range="item.institution" range-key="title" :value="item.institutionIndex" @change="institutionChange($event, item, index)">
 						<view class="institution-picker">
 							<view class="institution-picker-text nowrap">{{item.institution[item.institutionIndex].title}}</view>
 							<u-icon size="12" color="#999" name="arrow-down-fill"></u-icon>
 						</view>
-					</picker>
+					</picker> -->
+					<view class="institution-picker" @click="onShowInstitution(item.institution, item, index)">
+						<view class="institution-picker-text nowrap">{{item.institution[item.institutionIndex].title}}</view>
+						<u-icon size="12" color="#999" name="arrow-down-fill"></u-icon>
+					</view>
 				</view>
 				<!-- 业务类型 -->
 				<view class="block-item">
@@ -103,6 +107,13 @@
 				<button @click="onSubmit">提交</button>
 			</view>
 		</view>
+		<!-- 机构弹出层 -->
+		<oct-mechanism-picker
+			ref="institutionPicker"
+			title="选择办理机构"
+			:columns="columns"
+			@choose="institutionChange"
+		/>
 	</view>
 </template>
 
@@ -113,9 +124,12 @@
 		components: { octpicker },
 		data() {
 			return {
+				columns	   : [],
 				businessArr: [],
 				serviceUser: '',
 				serviceArr : [],
+				old		   : {},
+				cIndex	   : 0
 			};
 		},
 		created() {
@@ -125,6 +139,13 @@
 			this.serviceUser = serviceUser
 		},
 		methods: {
+			// 显示选择机构
+			onShowInstitution(e, item, index){
+				this.columns = e
+				this.old	 = item
+				this.cIndex	 = index
+				this.$refs.institutionPicker.open()
+			},
 			// 移出选项
 			onRemove(index){
 				this.serviceArr.splice(index, 1)
@@ -202,10 +223,12 @@
 				})
 			},
 			// 机构变更更新业务
-			institutionChange(e, old, index){
-				let { value } 	= e.detail;
+			institutionChange(e){
+				let index		= this.cIndex
+				let old			= this.old
+				let value 		= old.institution.findIndex(val => val.institution_id === e.val.institution_id);
 				let businessId  = old.subVal.business_id
-				
+
 				// 获取机构的子业务类型
 				let forms = this.getForms(old.institution[value].institution_id)
 				forms.then(institutionVal => {
diff --git a/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
index 2785aea..7c78794 100644
--- a/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
+++ b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
@@ -3,16 +3,42 @@
 		<uni-popup ref="octMechanismPicker">
 			<view class="mechanism--content">
 				<view class="mechanism--title" v-if="title != null">{{title}}</view>
+				<view class="mechanism--input">
+					<input type="text" placeholder="输入关键字筛选" v-model="searchValue" @input="onSearch($event)">
+					<view class="mechanism--clear" @click="onClear" v-if="searchValue.length > 0">
+						<uni-icons type="clear" size="20" color="#c3c3c3"></uni-icons>
+					</view>
+				</view>
 				<scroll-view class="mechanism--scroll" scroll-y show-scrollbar>
-					<view class="mechanism--item" v-for="(item, index) in columns" :key="index">{{item.name}}</view>
+					<block v-if="searchValue.length > 0">
+						<view class="mechanism--item" v-for="(item, index) in searchArr" :key="index" v-if="searchArr.length > 0" @click="onChoose(item, index)">
+							<view class="mechanism--text">{{item.title}}</view>
+							<uni-icons type="right" size="20" color="#c3c3c3"></uni-icons>
+						</view>
+						<view class="mechanism--null" v-if="searchArr.length <= 0">
+							<view>暂无与<text>[{{searchValue}}]</text>相关的搜索结果</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="mechanism--item" v-for="(item, index) in columns" :key="index" @click="onChoose(item, index)">
+							<view class="mechanism--text">{{item.title}}</view>
+							<uni-icons type="right" size="20" color="#c3c3c3"></uni-icons>
+						</view>
+					</block>
 				</scroll-view>
-				<button class="mechanism--button">确认</button>
+				<button class="mechanism--button" @click="clear">取消</button>
 			</view>
 		</uni-popup>
 	</view>
 </template>
 <script>
 	export default{
+		data(){
+			return{
+				searchValue: '',
+				searchArr  : []
+			}
+		},
 		props	: {
 			// 弹出层标题
 			title	: {
@@ -33,8 +59,36 @@
 			}
 		},
 		methods	: {
+			// 弹出层
 			open(type){
 				this.$refs.octMechanismPicker.open(type || 'bottom')
+			},
+			// 关闭弹出层
+			clear(){
+				this.$refs.octMechanismPicker.close()
+				this.onClear()
+			},
+			// 选择选项
+			onChoose(val, index){
+				this.$emit('choose', {val, index})
+				this.clear()
+			},
+			// 筛选输入框
+			onSearch(e){
+				let { value }	= e.target
+				let columns		= this.columns
+				let searchArr	= []
+				for(let obj of columns){
+					if(obj.title.includes(value)){
+						searchArr.push(obj)
+					}
+				}
+				this.searchArr = searchArr
+			},
+			// 清理搜索内容
+			onClear(){
+				this.searchValue = ''
+				this.searchArr	 = []
 			}
 		}
 	}
@@ -43,6 +97,7 @@
 	.mechanism--content{
 		background: white;
 		border-radius: 20rpx 20rpx 0 0;
+		overflow: hidden;
 		.mechanism--title{
 			text-align: center;
 			position: relative;
@@ -59,10 +114,64 @@
 				background-image: linear-gradient(0deg, $border-color 50%, transparent 50%);
 			}
 		}
-		.mechanism--scroll{
+		.mechanism--input{
 			padding: 30rpx 50rpx;
+			position: relative;
+			& > input{
+				background: #f8f8f8;
+				padding: 0 30rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				font-size: 30rpx;
+			}
+			.mechanism--clear{
+				position: absolute;
+				top: 30rpx;
+				right: 50rpx;
+				height: 80rpx;
+				width: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		.mechanism--scroll{
+			padding: 0 50rpx;
+			box-sizing: border-box;
 			height: 50vh;
-			.mechanism--item{ line-height: 90rpx; }
+			.mechanism--item{
+				line-height: 90rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.mechanism--text{
+					width: 80%;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+			.mechanism--null{
+				height: 40vh;
+				line-height: 40vh;
+				font-size: 30rpx;
+				color: gray;
+				text-align: center;
+				text{
+					color: #446EFE;
+				}
+			}
+		}
+		.mechanism--button{
+			margin: 30rpx 50rpx;
+			background: #446EFE;
+			color: white;
+			font-size: 34rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 10rpx;
+			&::after{ display: none; }
 		}
 	}
 </style>

From 172206581d23d49597beaa6377e6889373e3bdae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 31 Mar 2023 22:18:54 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js                                                 | 4 ++--
 manifest.json                                                 | 2 +-
 .../components/oct-calendar-picker/oct-calendar-picker.vue    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apis/index.js b/apis/index.js
index bc86f66..917ef93 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
diff --git a/manifest.json b/manifest.json
index 5fe86fe..5e2a603 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.3.7",
+    "versionName" : "1.3.9",
     "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
index c604c13..d6e227d 100644
--- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
+++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
@@ -248,7 +248,8 @@
 				let year   = moment().get('year')
 				let month  = moment().get('month') + 1
 				let today  = moment().get('date')
-				let start  = moment([year, month, today]).month(-(num - 2)).format('YYYY-MM-DD')
+				
+				let start  = moment().subtract(num, 'month').format('YYYY-MM-DD')
 				let ymdArr = start.split('-')
 				
 				let { months, days } = this.getNewYM(ymdArr[0], ymdArr[1])

From bf030e4cee91c8ca5cc99b7780ba9e297a043c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 13 Apr 2023 14:05:50 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                        |  4 ++--
 pages.json                                           |  2 +-
 pages/im/chat.vue                                    | 12 ++++++++++++
 pages/im/msg.vue                                     |  2 +-
 .../oct-calendar-picker/oct-calendar-picker.vue      |  1 -
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5e2a603..bc12b82 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.3.9",
-    "versionCode" : 103,
+    "versionName" : "1.4.0",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 4df438c..c68c6ac 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
 		"path": "pages/index/index",
 		"name": "Index",
 		"style": {
-			"navigationBarTitleText": "抖火法务咨询服务",
+			"navigationBarTitleText": "抖火法律咨询服务",
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
 	}, {
diff --git a/pages/im/chat.vue b/pages/im/chat.vue
index 714fafd..04c88c5 100644
--- a/pages/im/chat.vue
+++ b/pages/im/chat.vue
@@ -3,6 +3,18 @@
 		<list>
 			<cell v-for="(item, index) in 99" :key="index">消息{{index}}</cell>
 		</list>
+		<view class="footer">
+			<input type="text" placeholder="输入聊天消息">
+			<view class="">
+				表情包组件
+			</view>
+			<view class="">
+				<view>图片</view>
+				<view>视频</view>
+				<view>音频通话</view>
+				<view>视频通话</view>
+			</view>
+		</view>
 	</view>
 </template>
 
diff --git a/pages/im/msg.vue b/pages/im/msg.vue
index cf7c383..626e481 100644
--- a/pages/im/msg.vue
+++ b/pages/im/msg.vue
@@ -15,7 +15,7 @@
 					shape="square"
 					randomBgColor
 				></u-avatar>
-				<view class="item-content">
+				<view class="item-content"> 
 					<view class="nickname nowrap">
 						<view class="nowrap">{{item.nickname}}</view>
 						<view class="time">{{item.time}}</view>
diff --git a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
index d6e227d..7beec5b 100644
--- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
+++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue
@@ -248,7 +248,6 @@
 				let year   = moment().get('year')
 				let month  = moment().get('month') + 1
 				let today  = moment().get('date')
-				
 				let start  = moment().subtract(num, 'month').format('YYYY-MM-DD')
 				let ymdArr = start.split('-')
 				

From 28c4899676e2b357c019250be4096c792ec42e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Thu, 13 Apr 2023 16:15:44 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js               |  4 +-
 manifest.json               |  2 +-
 pages.json                  | 24 +---------
 pages/work/perfectBasis.vue | 90 ++++++++++++++++++++++++++++++++-----
 4 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/apis/index.js b/apis/index.js
index 917ef93..bc86f66 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
diff --git a/manifest.json b/manifest.json
index bc12b82..e857f83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.0",
+    "versionName" : "1.4.1",
     "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index c68c6ac..76495de 100644
--- a/pages.json
+++ b/pages.json
@@ -343,17 +343,7 @@
 			"navigationBarTitleText": "机构信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white",
-			"app-plus": {
-				"titleNView": {
-					"buttons": [{
-						"text": "使用账户信息",
-						"color": "#ffffff",
-						"fontSize": "30rpx",
-						"width": "180rpx"
-					}]
-				}
-			}
+			"navigationBarTextStyle": "white"
 		}
 	}, {
 		"path": "pages/work/perfectBasis",
@@ -363,17 +353,7 @@
 			"navigationBarTitleText": "基础信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white",
-			"app-plus": {
-				"titleNView": {
-					"buttons": [{
-						"text": "使用账户信息",
-						"color": "#ffffff",
-						"fontSize": "30rpx",
-						"width": "180rpx"
-					}]
-				}
-			}
+			"navigationBarTextStyle": "white"
 		}
 	}, {
 		"path": "pages/transfers/lists",
diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue
index ef00543..1c33343 100644
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -122,6 +122,63 @@
 					</label>
 					<input class="from-input" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
 				</view>
+				<!-- 新增 -->
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人1姓名
+						<uni-icons v-if="baseInfo.check_params.one_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.one_contact" placeholder="姓名">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人1关系
+						<uni-icons v-if="baseInfo.check_params.one_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.one_contact_relation" placeholder="关系">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人2姓名
+						<uni-icons v-if="baseInfo.check_params.two_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.two_contact" placeholder="姓名">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人2关系
+						<uni-icons v-if="baseInfo.check_params.two_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.two_contact_relation" placeholder="关系">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人3姓名
+						<uni-icons v-if="baseInfo.check_params.three_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.three_contact" placeholder="姓名">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人3关系
+						<uni-icons v-if="baseInfo.check_params.three_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.three_contact_relation" placeholder="关系">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人4姓名
+						<uni-icons v-if="baseInfo.check_params.four_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.four_contact" placeholder="姓名">
+				</view>
+				<view class="from-item from-item-50">
+					<label>
+						<text>*</text>预留联系人4关系
+						<uni-icons v-if="baseInfo.check_params.four_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+					</label>
+					<input class="from-input" v-model="baseInfo.four_contact_relation" placeholder="关系">
+				</view>
 			</view>
 			<view class="btn">
 				<button size="default" @click="onSubmit">提交基础资料</button>
@@ -183,18 +240,27 @@
 			// 提交基础资料
 			onSubmit(){
 				let data = {
-					mobile				: this.baseInfo.mobile,
-					marriage			: this.baseInfo.marriage,
-					mate				: this.baseInfo.mate,
-					education			: this.baseInfo.education,
-					school				: this.baseInfo.school,
-					tmp_address			: this.baseInfo.tmp_address,
-					province_id			: this.baseInfo.district_id,
-					city_id				: this.baseInfo.city_id,
-					district_id			: this.baseInfo.province_id,
-					now_domicile		: this.baseInfo.now_domicile,
-					now_company_address	: this.baseInfo.now_company_address,
-					now_company_name	: this.baseInfo.now_company_name
+					mobile					: this.baseInfo.mobile,
+					marriage				: this.baseInfo.marriage,
+					mate					: this.baseInfo.mate,
+					education				: this.baseInfo.education,
+					school					: this.baseInfo.school,
+					tmp_address				: this.baseInfo.tmp_address,
+					province_id				: this.baseInfo.district_id,
+					city_id					: this.baseInfo.city_id,
+					district_id				: this.baseInfo.province_id,
+					now_domicile			: this.baseInfo.now_domicile,
+					now_company_address		: this.baseInfo.now_company_address,
+					now_company_name		: this.baseInfo.now_company_name,
+					
+					one_contact				: this.baseInfo.one_contact,
+					one_contact_relation	: this.baseInfo.one_contact_relation,
+					two_contact				: this.baseInfo.two_contact,
+					two_contact_relation	: this.baseInfo.two_contact_relation,
+					three_contact			: this.baseInfo.three_contact,
+					three_contact_relation	: this.baseInfo.three_contact_relation,
+					four_contact			: this.baseInfo.four_contact,
+					four_contact_relation	: this.baseInfo.four_contact_relation
 				}
 				uni.showModal({
 					title		: '提示',

From ef27f7d400e0a7f5f6e6ebc4b6ba97d640dd75e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 18 Apr 2023 10:08:19 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js               |  4 ++--
 pages/pay/pay.vue           |  2 +-
 pages/work/perfectBasis.vue | 30 ++++++++++++++----------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/apis/index.js b/apis/index.js
index bc86f66..917ef93 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 4494f1f..3425605 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -30,7 +30,7 @@
 					</view>
 					<radio class="choose-radio" value="wx" :checked="payMethod == 'wx'"></radio>
 				</label>
-				<label class="choose-item nowrap">
+				<label class="choose-item nowrap" v-if="Number(total) <= 5000">
 					<view class="choose-text">
 						<image src="@/static/icons/pay_ali.png" mode="aspectFill"></image>
 						支付宝支付
diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue
index 1c33343..16bfa13 100644
--- a/pages/work/perfectBasis.vue
+++ b/pages/work/perfectBasis.vue
@@ -122,60 +122,59 @@
 					</label>
 					<input class="from-input" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
 				</view>
-				<!-- 新增 -->
 				<view class="from-item from-item-50">
 					<label>
 						<text>*</text>预留联系人1姓名
-						<uni-icons v-if="baseInfo.check_params.one_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						<uni-icons v-if="baseInfo.check_params.one_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.one_contact" placeholder="姓名">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
 						<text>*</text>预留联系人1关系
-						<uni-icons v-if="baseInfo.check_params.one_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						<uni-icons v-if="baseInfo.check_params.one_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact_relation.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.one_contact_relation" placeholder="关系">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人2姓名
-						<uni-icons v-if="baseInfo.check_params.two_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人2姓名
+						<uni-icons v-if="baseInfo.check_params.two_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.two_contact" placeholder="姓名">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人2关系
-						<uni-icons v-if="baseInfo.check_params.two_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人2关系
+						<uni-icons v-if="baseInfo.check_params.two_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact_relation.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.two_contact_relation" placeholder="关系">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人3姓名
-						<uni-icons v-if="baseInfo.check_params.three_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人3姓名
+						<uni-icons v-if="baseInfo.check_params.three_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.three_contact" placeholder="姓名">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人3关系
-						<uni-icons v-if="baseInfo.check_params.three_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人3关系
+						<uni-icons v-if="baseInfo.check_params.three_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact_relation.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.three_contact_relation" placeholder="关系">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人4姓名
-						<uni-icons v-if="baseInfo.check_params.four_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人4姓名
+						<uni-icons v-if="baseInfo.check_params.four_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.four_contact" placeholder="姓名">
 				</view>
 				<view class="from-item from-item-50">
 					<label>
-						<text>*</text>预留联系人4关系
-						<uni-icons v-if="baseInfo.check_params.four_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.now_company_name.description)"></uni-icons>
+						预留联系人4关系
+						<uni-icons v-if="baseInfo.check_params.four_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact_relation.description)"></uni-icons>
 					</label>
 					<input class="from-input" v-model="baseInfo.four_contact_relation" placeholder="关系">
 				</view>
@@ -252,7 +251,6 @@
 					now_domicile			: this.baseInfo.now_domicile,
 					now_company_address		: this.baseInfo.now_company_address,
 					now_company_name		: this.baseInfo.now_company_name,
-					
 					one_contact				: this.baseInfo.one_contact,
 					one_contact_relation	: this.baseInfo.one_contact_relation,
 					two_contact				: this.baseInfo.two_contact,

From 598450e1a3436c25b9dd857e76cf602e39e18efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 24 Apr 2023 15:48:36 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=90=88=E5=90=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E7=BB=A9=E8=B4=A6=E6=88=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/index.js                                 |   4 +-
 apis/interfaces/user.js                       |  17 ++
 manifest.json                                 |  21 ++-
 pages.json                                    |  26 +++-
 pages/user/contract.vue                       | 146 ++++++++++++++++++
 pages/user/index.vue                          | 144 +++++++++++++----
 pages/user/set.vue                            |   8 +
 pages/user/signLog.vue                        |  80 ++++++++++
 pages/user/team.vue                           |   3 +
 static/icons/user_nav_08.png                  | Bin 0 -> 5246 bytes
 .../uni-usercapturescreen/changelog.md        |  10 ++
 uni_modules/uni-usercapturescreen/index.d.ts  |  18 +++
 .../uni-usercapturescreen/package.json        |  92 +++++++++++
 uni_modules/uni-usercapturescreen/readme.md   |  21 +++
 .../utssdk/app-android/config.json            |   3 +
 .../utssdk/app-android/index.uts              | 139 +++++++++++++++++
 .../utssdk/app-ios/config.json                |   3 +
 .../utssdk/app-ios/index.uts                  | 146 ++++++++++++++++++
 .../utssdk/interface.uts                      | 122 +++++++++++++++
 .../utssdk/mp-weixin/index.js                 |   7 +
 20 files changed, 969 insertions(+), 41 deletions(-)
 create mode 100644 pages/user/contract.vue
 create mode 100644 pages/user/signLog.vue
 create mode 100644 static/icons/user_nav_08.png
 create mode 100644 uni_modules/uni-usercapturescreen/changelog.md
 create mode 100644 uni_modules/uni-usercapturescreen/index.d.ts
 create mode 100644 uni_modules/uni-usercapturescreen/package.json
 create mode 100644 uni_modules/uni-usercapturescreen/readme.md
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/app-android/config.json
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/app-android/index.uts
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/app-ios/config.json
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/interface.uts
 create mode 100644 uni_modules/uni-usercapturescreen/utssdk/mp-weixin/index.js

diff --git a/apis/index.js b/apis/index.js
index 917ef93..bc86f66 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
index d44b187..68b244d 100644
--- a/apis/interfaces/user.js
+++ b/apis/interfaces/user.js
@@ -157,6 +157,21 @@ const getTeamLogs = data => {
 	})
 }
 
+// 签约记录
+const getSignLogs = data => {
+	return request({
+		url: 'business/flows',
+		data
+	})
+}
+
+// 获取签约合同
+const getFlows = id => {
+	return request({
+		url: 'e-signs/flows/' + id
+	})
+}
+
 export {
 	relations,
 	code,
@@ -176,4 +191,6 @@ export {
     submitTeamName,
     getTeam,
     getTeamLogs,
+	getSignLogs,
+	getFlows
 }
diff --git a/manifest.json b/manifest.json
index e857f83..52e1489 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.1",
+    "versionName" : "1.4.2",
     "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -43,7 +43,8 @@
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
-                "schemes" : "doufire"
+                "schemes" : "doufire",
+                "minSdkVersion" : 21
             },
             /* ios打包配置 */
             "ios" : {
@@ -92,6 +93,22 @@
                     }
                 }
             }
+        },
+        "nativePlugins" : {
+            "Pdf-Plugin" : {
+                "__plugin_info__" : {
+                    "name" : "Pdf-Plugin",
+                    "description" : "此插件为uni小程序Android原生插件,用于加载网络pdf,支持水印和缩放",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=11384",
+                    "android_package_name" : "io.douhuofalv.com",
+                    "ios_bundle_id" : "io.douhuofalv.com",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "11384",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */
diff --git a/pages.json b/pages.json
index 76495de..9eca141 100644
--- a/pages.json
+++ b/pages.json
@@ -343,7 +343,7 @@
 			"navigationBarTitleText": "机构信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white"
+			"navigationBarTextStyle": "white"
 		}
 	}, {
 		"path": "pages/work/perfectBasis",
@@ -353,7 +353,7 @@
 			"navigationBarTitleText": "基础信息",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
-			"navigationBarTextStyle": "white"
+			"navigationBarTextStyle": "white"
 		}
 	}, {
 		"path": "pages/transfers/lists",
@@ -545,10 +545,26 @@
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
 	}, {
-		"path": "pages/im/msg",
+		"path": "pages/im/msg",
 		"name": "ImMsg",
-		"style": {
+		"style": {
 			"navigationBarTitleText": "消息",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#FFFFFF"
+		}
+	}, {
+		"path": "pages/user/signLog",
+		"name": "SignLog",
+		"style": {
+			"navigationBarTitleText": "合同记录",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#FFFFFF"
+		}
+	}, {
+		"path": "pages/user/contract",
+		"name": "SignContract",
+		"style": {
+			"navigationBarTitleText": "合同",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
@@ -590,4 +606,4 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/pages/user/contract.vue b/pages/user/contract.vue
new file mode 100644
index 0000000..6e6c72e
--- /dev/null
+++ b/pages/user/contract.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="content">
+		<!-- 合同信息 -->
+		<view class="block">
+			<view class="block-flex">
+				<label>合同ID</label>
+				<view class="block-val">{{id}}</view>
+			</view>
+			<view class="block-flex">
+				<label>合同数量</label>
+				<view class="nowrap block-val">{{files.length}}</view>
+			</view>
+			<view class="block-flex">
+				<label>附件数量</label>
+				<view class="nowrap block-val">{{attachments.length}}</view>
+			</view>
+			<view class="block-flex">
+				<label>创建时间</label>
+				<view class="nowrap block-val">{{created_at || '-'}}</view>
+			</view>
+			<view class="block-flex">
+				<label>更新时间</label>
+				<view class="nowrap block-val">{{updated_at || '-'}}</view>
+			</view>
+		</view>
+		<!-- 合同文件 -->
+		<view class="files-title">合同文件列表</view>
+		<view class="files">
+			<view class="files-flex" v-for="(item, index) in files" :key="index" @click="onPdf(item.fileName, item.downloadUrl)">
+				<view class="files-flex-title">{{item.fileName}}</view>
+				<view class="files-flex-id">{{item.fileId}}</view>
+				<u-icon class="files-flex-icon" name="arrow-right" size="28rpx"></u-icon>
+			</view>
+		</view>
+		<!-- 附件文件 -->
+		<view class="files-title">附件文件列表</view>
+		<view class="files">
+			<view class="files-flex" v-for="(item, index) in attachments" :key="index" @click="onPdf(item.fileName, item.downloadUrl)">
+				<view class="files-flex-title">{{item.fileName}}</view>
+				<view class="files-flex-id">{{item.fileId}}</view>
+				<u-icon class="files-flex-icon" name="arrow-right" size="28rpx"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const plugin = uni.requireNativePlugin('Pdf-Plugin')
+	import { getFlows } from '@/apis/interfaces/user.js'
+	export default {
+		data() {
+			return {
+				user		: { name: '', mobile: '' },
+				id			: '',
+				created_at	: '',
+				updated_at	: '',
+				files		: [],
+				attachments	: []
+			};
+		},
+		onLoad() {
+			// #ifdef APP-PLUS
+				uni.setUserCaptureScreen({
+					enable: false,
+				})
+			// #endif
+		},
+		created() {
+			// 获取合同数据
+			uni.showLoading({
+				title: '加载中...',
+				mask : true
+			})
+			getFlows(this.$Route.query.id).then(res => {
+				const { sign_flow_id, files, attachments, created_at, updated_at, user } = res
+				this.user		 = user
+				this.id			 = sign_flow_id
+				this.created_at	 = created_at
+				this.updated_at	 = updated_at
+				this.files		 = files
+				this.attachments = attachments
+				uni.hideLoading()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			onPdf(name, url){
+				plugin.showPdf({
+					title		: name,
+					url  		: url,
+					maxScale	: '20',
+					waterMark	: '河北抖火法律咨询服务有限公司',
+					// this.user.name + ' ' + this.user.mobile,
+				})
+			}
+		},
+		onUnload() {
+			// #ifdef APP-PLUS
+				uni.setUserCaptureScreen({
+					enable: true
+				})
+			// #endif
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{ padding: 10rpx 30rpx; }
+	
+	// 合同信息统计
+	.block {
+		background: white;
+		margin-bottom: 30rpx;
+		margin-top: 20rpx;
+		padding: 30rpx;
+		border-radius: $radius;
+		&-flex{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			line-height: 60rpx;
+			label{ color: gray; }
+			.block-val{ width: calc(100% - 200rpx); text-align: right; word-break:break-all; word-wrap: break-word; }
+		}
+	}
+	
+	// 合同列表
+	.files{
+		background: white;
+		margin-bottom: 30rpx;
+		padding: 30rpx;
+		border-radius: $radius;
+		&-flex{
+			position: relative;
+			padding-right: 40rpx;
+			.files-flex-title{ font-weight: bold; font-size: 32rpx; }
+			.files-flex-id{ font-size: 28rpx; color: gray; }
+			.files-flex-icon{ position: absolute; right: 0; top: 50%; margin-top: -14rpx;}
+		}
+	}
+	.files-title{ padding-bottom: 20rpx; color: gray; font-size: 28rpx; }
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 6e57c1e..0631be2 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -99,7 +99,16 @@
             </view>
             <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
         </view>
-        <view class="border-solid-empty"></view>
+        <view class="border-solid-empty"></view>
+		<view class="nav-flex" @click="updateApp">
+		    <view class="nav-icon">
+		        <image class="nav-icon-src" src="@/static/icons/user_nav_08.png"></image>版本检测
+		    </view>
+			<view class="nav-text">
+				<text>V{{version}}</text>
+				<u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
+			</view>
+		</view>
         <view class="nav-flex" @click="onNav('UserSet')">
             <view class="nav-icon">
                 <image class="nav-icon-src" src="@/static/icons/user_nav_05.png"></image>设置
@@ -160,23 +169,20 @@
 </template>
 
 <script>
-    import {
-        info,
-        relationsVerify,
-        relationsBind,
-        submitTeamName,
-    } from '@/apis/interfaces/user.js'
+    import { info, relationsVerify, relationsBind, submitTeamName } from '@/apis/interfaces/user.js'
+	import { getVersions } from '@/apis/interfaces/versions'
     export default {
         data() {
-            return {
-                isAuth: false,
-                nickname: '',
-                identity: '',
-                team_name:'',
-                avatar: '',
-                certification: '',
+            return {
+				version			: plus.runtime.version,
+                isAuth			: false,
+                nickname		: '',
+                identity		: '',
+                team_name		:'',
+                avatar			: '',
+                certification	: '',
                 // 绑定关系
-                bindTypeArr: [{
+                bindTypeArr		: [{
                         name: '手机号',
                         value: 'mobile'
                     },
@@ -185,22 +191,22 @@
                         value: 'verify'
                     },
                 ],
-                bindTypeVal: 'mobile',
-                showBind: false,
-                isInvitation: true,
-                parent: '',
-                invitationUser: {
-                    avatar: '',
-                    nickname: '',
-                    username: ''
+                bindTypeVal		: 'mobile',
+                showBind		: false,
+                isInvitation	: true,
+                parent			: '',
+                invitationUser	: {
+                    avatar		: '',
+                    nickname	: '',
+                    username	: ''
                 },
-                invitation: '',
-                yunyingShow:false, //  运营中心是否展示
-                yunying_name:'', // 运营名称
-                team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
-                team_id:'',
-                region_status:'', // 状态 0 不展示 大区中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
-                region_id:'',
+                invitation		: '',
+                yunyingShow		:false, //  运营中心是否展示
+                yunying_name	:'', // 运营名称
+                team_status		:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
+                team_id			:'',
+                region_status	:'', // 状态 0 不展示 大区中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
+                region_id		:'',
             };
         },
         onShow() {
@@ -421,7 +427,73 @@
                          icon: 'none'
                      })
                  })
-            },
+            },
+			// 检查版本更新
+			updateApp() {
+			    uni.showLoading({
+			        title: '检查更新'
+			    })
+			    //#ifdef APP-PLUS
+			    // 获取系统版本号
+			    getVersions({
+			        platform: plus.os.name,
+			        version : plus.runtime.version
+			    }).then(res => {
+			        uni.hideLoading()
+			        if (res.update) {
+			            uni.showModal({
+			                title: "更新提示",
+			                content: res.note || '版本更新信息',
+			                confirmText: "更新",
+			                success: modalRes => {
+			                    if (modalRes.confirm) {
+			                        if (plus.os.name == "Android") {
+			                            uni.showToast({
+			                                title: '新版本下载中，将在下载完成后自动为您安装更新包',
+			                                icon: 'none'
+			                            })
+			                            uni.downloadFile({
+			                                url: res.info.download,
+			                                success: apkPick => {
+			                                    plus.runtime.install(apkPick
+			                                        .tempFilePath, '',
+			                                        installRES => {
+			                                            // 安装完成用于提示新版本引导，暂时无用
+			                                        }, installERR => {
+			                                            // 安装失败
+			                                        })
+			                                },
+			                                fail(err) {
+			                                    uni.showToast({
+			                                        title: '安装包下载失败，请检查您的网络或稍后重试',
+			                                        icon: 'none'
+			                                    })
+			                                }
+			                            })
+			                        } else {
+			                            uni.showToast({
+			                                title: '暂无ios版本这块留着后续用',
+			                                icon: 'none'
+			                            })
+			                        }
+			                    }
+			                }
+			            })
+			            return
+			        }
+			        uni.showModal({
+			            title: "提示",
+			            content: "当前已是最新版本",
+			            showCancel: false,
+			        })
+			    }).catch(err => {
+			        uni.showToast({
+			            title: err.message,
+			            icon: 'none'
+			        })
+			    })
+			    //#endif
+			}
         }
     }
 </script>
@@ -446,7 +518,15 @@
                 margin-right: $margin;
                 margin-top: 5rpx;
             }
-        }
+        }
+		.nav-text{ 
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			color: #999;
+			font-size: 30rpx;
+			text{ padding-right: 10rpx; }
+		}
     }
 
     // 用户信息
diff --git a/pages/user/set.vue b/pages/user/set.vue
index 3aaf955..36247c5 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -30,6 +30,14 @@
 				</view>
 			</view>
 		</view>
+		<view class="set-nav-block">
+			<view class="set-nav" @click="onNav('SignLog')">
+				<label>合同记录</label>
+				<view class="value nowrap">
+					<uni-icons type="right" color="gray"></uni-icons>
+				</view>
+			</view>
+		</view>
 		<view class="set-nav-block">
 			<view class="set-nav" @click="onLogout">
 				<label>退出登录</label>
diff --git a/pages/user/signLog.vue b/pages/user/signLog.vue
new file mode 100644
index 0000000..1213dd3
--- /dev/null
+++ b/pages/user/signLog.vue
@@ -0,0 +1,80 @@
+<template>
+	<view class="content">
+		<view class="log-blcok" v-for="(item, index) in logs" :key="index" @click="onInfo(item.business_order_id)">
+			<view class="flex">
+				<label>订单编号：</label>
+				<view class="val">{{item.order_no}}</view>
+			</view>
+			<view class="flex">
+				<label>业务类型：</label>
+				<view class="val">
+					<text v-for="(titem, tindex) in item.item_type" :key="tindex">{{titem.title}}</text>
+				</view>
+			</view>
+			<view class="flex">
+				<label>签约时间：</label>
+				<view class="val">{{item.created_at}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getSignLogs, getFlows } from '@/apis/interfaces/user.js'
+	export default {
+		data() {
+			return {
+				logs: [],
+			};
+		},
+		created() {
+			this.getLog()
+		},
+		methods: {
+			getLog(){
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				getSignLogs({
+					page: 1
+				}).then(res => {
+					this.logs = res.data
+					this.page = res.page
+					uni.hideLoading()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			onInfo(id){
+				this.$Router.push({
+					name	: 'SignContract',
+					params	: { id }
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{ padding: 30rpx 30rpx 10rpx; box-sizing: border-box; }
+	
+	// 订单列表
+	.log-blcok{ 
+		background: white;
+		border-radius: $radius;
+		padding: $padding;
+		position: relative;
+		// .log-icon{ position: absolute; right: $margin; top: 50%; margin-top: -14rpx; }
+		.flex{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			line-height: 60rpx;
+			label{ color: gray; }
+		}
+	}
+</style>
diff --git a/pages/user/team.vue b/pages/user/team.vue
index 52a0724..0f802b6 100644
--- a/pages/user/team.vue
+++ b/pages/user/team.vue
@@ -19,6 +19,7 @@
 						<text class="identity identity-1" v-if="item.identity.order == 1">普通用户</text>
 						<text class="identity identity-3" v-if="item.identity.order == 3">顾问</text>
 					</view>
+					<view class="nowrap submit">团队业绩：{{ item.show_perf ? item.perf: '身份不符暂无业绩' }}</view>
 					<view class="nowrap submit">联系电话：{{item.username}}</view>
 					<view class="nowrap submit">注册时间：{{item.created_at}}</view>
 				</view>
@@ -74,6 +75,8 @@
 					page  : this.page.current
 				}).then(res => {
 					let { users, count } = res;
+					
+					console.log(users)
 					let atList   	= users.page.current == 1 ? [] : this.users
 					this.count 		= count
 					this.users 		= atList.concat(users.data)
diff --git a/static/icons/user_nav_08.png b/static/icons/user_nav_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d77edb9490277b0ddded68802360146d43101a9
GIT binary patch
literal 5246
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
Z<+Zp#KY85k%l1Enww4Z<2M4^O{tKDK^Z5V(

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-usercapturescreen/changelog.md b/uni_modules/uni-usercapturescreen/changelog.md
new file mode 100644
index 0000000..51378b5
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/changelog.md
@@ -0,0 +1,10 @@
+## 1.0.4（2023-03-24）
+新增开启/关闭防截屏功能
+## 1.0.3（2023-03-17）
+修复android平台 部分场景下js可能报错的问题
+## 1.0.2（2023-03-16）
+修复Android平台在小米设备无法监听的问题 修复Android平台调用uni.onUserCaptureScreen必然会触发回调的问题
+## 1.0.1（2022-10-27）
+修改插件描述
+## 1.0.0（2022-10-26）
+支持安卓、iOS、微信小程序平台
diff --git a/uni_modules/uni-usercapturescreen/index.d.ts b/uni_modules/uni-usercapturescreen/index.d.ts
new file mode 100644
index 0000000..debf1a1
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/index.d.ts
@@ -0,0 +1,18 @@
+declare namespace UniNamespace {
+  type OnUserCaptureScreenCallback = (res?: { errMsg: string }) => void
+}
+
+declare interface Uni {
+  /**
+   * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件。
+   *
+   * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen)
+   */
+  onUserCaptureScreen(callback: UniNamespace.OnUserCaptureScreenCallback): void;
+  /**
+   * 用户主动截屏事件。取消事件监听。
+   *
+   * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen)
+   */
+  offUserCaptureScreen(callback: UniNamespace.OnUserCaptureScreenCallback): void;
+}
diff --git a/uni_modules/uni-usercapturescreen/package.json b/uni_modules/uni-usercapturescreen/package.json
new file mode 100644
index 0000000..3285c78
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/package.json
@@ -0,0 +1,92 @@
+{
+	"id": "uni-usercapturescreen",
+	"displayName": "uni-usercapturescreen",
+	"version": "1.0.4",
+	"description": "用户主动截屏事件监听",
+	"keywords": [
+        "截屏"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.7.7"
+	},
+	"dcloudext": {
+		"type": "uts",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"uni-ext-api":{
+			"uni": {
+				"onUserCaptureScreen": "onUserCaptureScreen",
+				"offUserCaptureScreen": "offUserCaptureScreen",
+				"setUserCaptureScreen": "setUserCaptureScreen"
+			}
+		},
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "n",
+					"vue3": "y"
+				},
+				"App": {
+					"app-android": {
+                        "minVersion": "19"
+                    },
+					"app-ios": {
+                        "minVersion": "9"
+                    }
+				},
+				"H5-mobile": {
+					"Safari": "n",
+					"Android Browser": "n",
+					"微信浏览器(Android)": "n",
+					"QQ浏览器(Android)": "n"
+				},
+				"H5-pc": {
+					"Chrome": "n",
+					"IE": "n",
+					"Edge": "n",
+					"Firefox": "n",
+					"Safari": "n"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "n",
+					"百度": "n",
+					"字节跳动": "n",
+					"QQ": "n",
+					"钉钉": "n",
+					"快手": "n",
+					"飞书": "n",
+					"京东": "n"
+				},
+				"快应用": {
+					"华为": "n",
+					"联盟": "n"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-usercapturescreen/readme.md b/uni_modules/uni-usercapturescreen/readme.md
new file mode 100644
index 0000000..eda987a
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/readme.md
@@ -0,0 +1,21 @@
+# uni-usercapturescreen
+
+用户主动截屏事件监听
+
+### uni.onUserCaptureScreen
+
+监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件。
+
+> 使用文档：[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen)
+
+### uni.offUserCaptureScreen
+
+用户主动截屏事件。取消事件监听。
+
+> 使用文档：[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen)
+
+### uni.setUserCaptureScreen
+
+开启/关闭防截屏。
+
+> 使用文档：[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen)
diff --git a/uni_modules/uni-usercapturescreen/utssdk/app-android/config.json b/uni_modules/uni-usercapturescreen/utssdk/app-android/config.json
new file mode 100644
index 0000000..7ed4299
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/app-android/config.json
@@ -0,0 +1,3 @@
+{
+  "minSdkVersion": "19"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-usercapturescreen/utssdk/app-android/index.uts b/uni_modules/uni-usercapturescreen/utssdk/app-android/index.uts
new file mode 100644
index 0000000..99cf531
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/app-android/index.uts
@@ -0,0 +1,139 @@
+import { UTSAndroid } from "io.dcloud.uts";
+import ActivityCompat from "androidx.core.app.ActivityCompat";
+import Manifest from "android.Manifest";
+import PackageManager from "android.content.pm.PackageManager";
+import Build from "android.os.Build";
+import FileObserver from "android.os.FileObserver";
+import File from "java.io.File";
+import Environment from "android.os.Environment";
+import System from 'java.lang.System';
+import WindowManager from 'android.view.WindowManager';
+import { OnUserCaptureScreenCallbackResult, UserCaptureScreenCallback, OnUserCaptureScreen, OffUserCaptureScreen, SetUserCaptureScreenSuccess, SetUserCaptureScreenOptions, SetUserCaptureScreen } from "../interface.uts";
+
+
+/**
+	* 文件监听器
+	*/
+let observer : ScreenFileObserver | null = null;
+/**
+	* 记录文件监听器上次监听的时间戳，避免重复监听
+	*/
+let lastObserverTime : number = 0;
+/**
+	* 截屏回调
+	*/
+let listener : UserCaptureScreenCallback | null = null;
+
+/**
+	* android 文件监听实现
+	*/
+class ScreenFileObserver extends FileObserver {
+
+	/**
+		* 截屏文件目录
+		*/
+	private screenFile : File;
+
+	constructor(screenFile : File) {
+		super(screenFile);
+		this.screenFile = screenFile;
+	}
+
+	override onEvent(event : Int, path : string | null) : void {
+		// 只监听文件新增事件
+		if (event == FileObserver.CREATE) {
+			if (path != null) {
+				const currentTime = System.currentTimeMillis();
+				if ((currentTime - lastObserverTime) < 1000) {
+					// 本地截屏行为比上一次超过1000ms, 才认为是一个有效的时间
+					return;
+				}
+				lastObserverTime = currentTime;
+
+				const screenShotPath = new File(this.screenFile, path).getPath();
+				const res : OnUserCaptureScreenCallbackResult = {
+					path: screenShotPath
+				}
+				listener?.(res);
+			}
+		}
+	}
+}
+
+/**
+	* 开启截图监听
+	*/
+export const onUserCaptureScreen : OnUserCaptureScreen = function (callback : UserCaptureScreenCallback | null) {
+	// 检查相关权限是否已授予
+	if (ActivityCompat.checkSelfPermission(UTSAndroid.getAppContext()!, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+		// 无权限，申请权限
+		ActivityCompat.requestPermissions(UTSAndroid.getUniActivity()!, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1001);
+		return;
+	}
+	// 更新监听
+	listener = callback;
+
+	let directory_screenshot : File;
+	if (Build.MANUFACTURER.toLowerCase() == "xiaomi") {
+		// @Suppress("DEPRECATION")
+		directory_screenshot = new File(new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DCIM), "Screenshots");
+	} else {
+		// @Suppress("DEPRECATION")
+		directory_screenshot = new File(new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_PICTURES), "Screenshots");
+	}
+	// 先结束监听 再开启监听
+	observer?.stopWatching();
+	observer = new ScreenFileObserver(directory_screenshot);
+	observer?.startWatching();
+	
+	
+	UTSAndroid.onAppActivityDestroy(function(){
+		observer?.stopWatching()
+		observer = null
+	})
+	
+	
+}
+
+/**
+	* 关闭截屏监听
+	*/
+export const offUserCaptureScreen : OffUserCaptureScreen = function (_ : UserCaptureScreenCallback | null) {
+	// android10以上，关闭监听通过移除文件监听器实现
+	observer?.stopWatching();
+	observer = null;
+	lastObserverTime = 0;
+}
+
+/**
+	* 设置是否禁止截屏
+	*/
+export const setUserCaptureScreen : SetUserCaptureScreen = function (option : SetUserCaptureScreenOptions) {
+	// 切换到UI线程
+	UTSAndroid.getUniActivity()?.runOnUiThread(new SetUserCaptureScreenRunnable(option.enable));
+	const res : SetUserCaptureScreenSuccess = {}
+	option.success?.(res);
+	option.complete?.(res);
+}
+
+class SetUserCaptureScreenRunnable extends Runnable {
+
+	/**
+		* ture: 允许用户截屏
+		* false: 不允许用户截屏，防止用户截屏到应用页面内容
+		*/
+	private enable : boolean;
+
+	constructor(enable : boolean) {
+		super();
+		this.enable = enable;
+	}
+
+	override run() : void {
+		if (this.enable) {
+			UTSAndroid.getUniActivity()?.getWindow()?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+		} else {
+			UTSAndroid.getUniActivity()?.getWindow()?.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+		}
+	}
+}
diff --git a/uni_modules/uni-usercapturescreen/utssdk/app-ios/config.json b/uni_modules/uni-usercapturescreen/utssdk/app-ios/config.json
new file mode 100644
index 0000000..721b81e
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/app-ios/config.json
@@ -0,0 +1,3 @@
+{
+  "deploymentTarget": "9"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts b/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts
new file mode 100644
index 0000000..544fb21
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts
@@ -0,0 +1,146 @@
+import { NotificationCenter } from 'Foundation';
+import { CGRect } from "CoreFoundation";
+import { UIApplication, UIView, UITextField, UIScreen, UIDevice } from "UIKit"
+import { UTSiOS } from "DCloudUTSFoundation"
+import { DispatchQueue } from 'Dispatch';
+import { SetUserCaptureScreenOptions, OnUserCaptureScreenCallbackResult, OnUserCaptureScreen, OffUserCaptureScreen, SetUserCaptureScreen, UserCaptureScreenCallback, SetUserCaptureScreenSuccess, SetUserCaptureScreenFail  } from "../interface.uts"
+
+/**
+	* 定义监听截屏事件工具类
+	*/
+class CaptureScreenTool {
+	static listener : UserCaptureScreenCallback | null;
+	static secureView : UIView | null;
+
+	// 监听截屏
+	static listenCaptureScreen(callback : UserCaptureScreenCallback | null) {
+		this.listener = callback
+ 
+		// 注册监听截屏事件及回调方法
+		// target-action 回调方法需要通过 Selector("方法名") 构建
+		const method = Selector("userDidTakeScreenshot")
+		NotificationCenter.default.addObserver(this, selector = method, name = UIApplication.userDidTakeScreenshotNotification, object = null)
+	}
+
+	// 捕获截屏回调的方法
+	// target-action 的方法前需要添加 @objc 前缀
+	@objc static userDidTakeScreenshot() {
+		// 回调
+		const res: OnUserCaptureScreenCallbackResult = {
+		}
+		this.listener?.(res)
+	}
+
+	// 移除监听事件
+	static removeListen(callback : UserCaptureScreenCallback | null) {
+		this.listener = null
+		NotificationCenter.default.removeObserver(this)
+	}
+
+	static createSecureView() : UIView | null {
+		let field = new UITextField(frame = CGRect.zero)
+		field.isSecureTextEntry = true
+		if (field.subviews.length > 0 && UIDevice.current.systemVersion != '15.1') {
+			let view = field.subviews[0]
+			view.subviews.forEach((item) => {
+				item.removeFromSuperview()
+			})
+			view.isUserInteractionEnabled = true
+			return view
+		}
+		return null
+	}
+
+	// 开启防截屏
+	static onAntiScreenshot(option : SetUserCaptureScreenOptions) {
+		// uts方法默认会在子线程中执行，涉及 UI 操作必须在主线程中运行，通过 DispatchQueue.main.async 方法可将代码在主线程中运行
+		DispatchQueue.main.async(execute = () : void => {
+			let secureView = this.createSecureView()
+			let window = UTSiOS.getKeyWindow()
+			let rootView = window.rootViewController == null ? null : window.rootViewController!.view
+			if (secureView != null && rootView != null) {
+				let rootSuperview = rootView!.superview
+				if (rootSuperview != null) {
+					this.secureView = secureView
+					rootSuperview!.addSubview(secureView!)
+					rootView!.removeFromSuperview()
+					secureView!.addSubview(rootView!)
+					let rect = rootView!.frame
+					secureView!.frame = UIScreen.main.bounds
+					rootView!.frame = rect
+				}
+			}
+			let res: SetUserCaptureScreenSuccess = {
+			}
+			option.success?.(res)
+			option.complete?.(res)
+		})
+	}
+
+	// 关闭防截屏
+	static offAntiScreenshot(option : SetUserCaptureScreenOptions) {
+		DispatchQueue.main.async(execute = () : void => {
+			if (this.secureView != null) {
+				let window = UTSiOS.getKeyWindow()
+				let rootView = window.rootViewController == null ? null : window.rootViewController!.view
+				if (rootView != null && this.secureView!.superview != null) {
+					let rootSuperview = this.secureView!.superview
+					if (rootSuperview != null) {
+						rootSuperview!.addSubview(rootView!)
+						this.secureView!.removeFromSuperview()
+					}
+				}
+				this.secureView = null
+			}
+			let res: SetUserCaptureScreenSuccess = {
+			}
+			option.success?.(res)
+			option.complete?.(res)
+		})
+	}
+}
+
+/**
+	* 开启截图监听
+	*/
+export const onUserCaptureScreen : OnUserCaptureScreen = function (callback : UserCaptureScreenCallback | null) {
+	CaptureScreenTool.listenCaptureScreen(callback)
+}
+
+/**
+	* 关闭截屏监听
+	*/
+export const offUserCaptureScreen : OffUserCaptureScreen = function (callback : UserCaptureScreenCallback | null) {
+	CaptureScreenTool.removeListen(callback)
+}
+
+/**
+	* 开启/关闭防截屏
+	*/
+export const setUserCaptureScreen : SetUserCaptureScreen = function (options : SetUserCaptureScreenOptions) {
+	if (UIDevice.current.systemVersion < "13.0") {
+		let res: SetUserCaptureScreenFail = {
+			errCode: 12001,
+			errSubject: "uni-usercapturescreen",
+			errMsg: "setUserCaptureScreen:system not support"
+		}
+		options.fail?.(res);
+		options.complete?.(res);
+
+	} else if (UIDevice.current.systemVersion == "15.1") {
+		let res: SetUserCaptureScreenFail = {
+			errCode: 12010,
+			errSubject: "uni-usercapturescreen",
+			errMsg: "setUserCaptureScreen:system internal error"
+		}
+		options.fail?.(res);
+		options.complete?.(res);
+	} else {
+		if (options.enable == true) {
+			CaptureScreenTool.offAntiScreenshot(options)
+		} else {
+			CaptureScreenTool.onAntiScreenshot(options)
+		}
+	}
+}
+
diff --git a/uni_modules/uni-usercapturescreen/utssdk/interface.uts b/uni_modules/uni-usercapturescreen/utssdk/interface.uts
new file mode 100644
index 0000000..235b782
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/interface.uts
@@ -0,0 +1,122 @@
+/**
+	* uni.onUserCaptureScreen/uni.offUserCaptureScreen回调参数
+	*/
+export type OnUserCaptureScreenCallbackResult = {
+	/**
+		* 截屏文件路径（仅Android返回）
+		*/
+	path ?: string
+}
+
+/**
+	* uni.onUserCaptureScreen/uni.offUserCaptureScreen回调函数定义
+	*/
+export type UserCaptureScreenCallback = (res : OnUserCaptureScreenCallbackResult) => void
+
+/**
+	* uni.onUserCaptureScreen函数定义
+	* 开启截屏监听 
+	* 
+	* @param {UserCaptureScreenCallback} callback 
+	* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen
+	* @platforms APP-IOS = ^9.0,APP-ANDROID = ^4.4
+	* @since 3.7.7
+	*/
+export type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void
+
+/**
+	* uni.offUserCaptureScreen函数定义
+	* 关闭截屏监听  
+	* 
+	* @param {UserCaptureScreenCallback} callback 
+	* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen
+	* @platforms APP-IOS = ^9.0,APP-ANDROID = ^4.4
+	* @since 3.7.7
+	*/
+export type OffUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void
+
+/**
+	* uni.setUserCaptureScreen成功回调参数
+	*/
+export type SetUserCaptureScreenSuccess = {
+}
+
+/**
+	* uni.setUserCaptureScreen失败回调参数
+	*/
+export type SetUserCaptureScreenFail = {
+	/**
+		* 错误码
+		* 12001:system not support
+		* 12010:system internal error
+		*/
+	errCode : number,
+	/**
+		* 调用API的名称
+		*/
+	errSubject : string,
+	/**
+		* 错误的详细信息
+		*/
+	errMsg : string,
+}
+
+/**
+	* uni.setUserCaptureScreen成功回调函数定义
+	*/
+export type SetUserCaptureScreenSuccessCallback = (res : SetUserCaptureScreenSuccess) => void
+
+/**
+	* uni.setUserCaptureScreen失败回调函数定义
+	*/
+export type SetUserCaptureScreenFailCallback = (res : SetUserCaptureScreenFail) => void
+
+/**
+	* uni.setUserCaptureScreen完成回调函数定义
+	*/
+export type SetUserCaptureScreenCompleteCallback = (res : any) => void
+
+/**
+	* uni.setUserCaptureScreen参数
+	*/
+
+export type SetUserCaptureScreenOptions = {
+	/**
+	* true: 允许用户截屏 false: 不允许用户截屏，防止用户截屏到应用页面内容
+	*/
+	enable : boolean;
+	/**
+	* 接口调用成功的回调函数
+	*/
+	// success : SetUserCaptureScreenSuccessCallback | null,
+	success ?: SetUserCaptureScreenSuccessCallback,
+	/**
+	* 接口调用失败的回调函数
+	*/
+	// fail : SetUserCaptureScreenFailCallback | null,
+	fail ?: SetUserCaptureScreenFailCallback,
+	/**
+	* 接口调用结束的回调函数（调用成功、失败都会执行）
+	*/
+	// complete : SetUserCaptureScreenSuccessCallback | SetUserCaptureScreenFailCallback | null
+	complete ?: SetUserCaptureScreenCompleteCallback
+}
+
+
+/**
+ * * uni.setUserCaptureScreen函数定义
+
+	* 设置防截屏  
+	* 
+	* @param {SetUserCaptureScreenOptions} options 
+	* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen
+	* @platforms APP-IOS = ^13.0,APP-ANDROID = ^4.4
+	* @since 3.7.7
+	*/
+export type SetUserCaptureScreen = (options : SetUserCaptureScreenOptions) => void
+
+export interface Uni {
+	onUserCaptureScreen : OnUserCaptureScreen,
+	offUserCaptureScreen : OffUserCaptureScreen,
+	setUserCaptureScreen : SetUserCaptureScreen
+}
\ No newline at end of file
diff --git a/uni_modules/uni-usercapturescreen/utssdk/mp-weixin/index.js b/uni_modules/uni-usercapturescreen/utssdk/mp-weixin/index.js
new file mode 100644
index 0000000..6aa57b3
--- /dev/null
+++ b/uni_modules/uni-usercapturescreen/utssdk/mp-weixin/index.js
@@ -0,0 +1,7 @@
+export function onUserCaptureScreen (callback) {
+  return wx.onUserCaptureScreen(callback)
+}
+
+export function offUserCaptureScreen (callback) {
+  return wx.offUserCaptureScreen(callback)
+}

From c33712665ad4ee5d8d48625ebdc316581bb7948e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 25 Apr 2023 15:32:13 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json          |  2 +-
 pages/user/signLog.vue | 68 ++++++++++++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/manifest.json b/manifest.json
index 52e1489..1140d8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.2",
+    "versionName" : "1.4.3",
     "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages/user/signLog.vue b/pages/user/signLog.vue
index 1213dd3..a192594 100644
--- a/pages/user/signLog.vue
+++ b/pages/user/signLog.vue
@@ -1,21 +1,36 @@
 <template>
 	<view class="content">
-		<view class="log-blcok" v-for="(item, index) in logs" :key="index" @click="onInfo(item.business_order_id)">
-			<view class="flex">
-				<label>订单编号：</label>
-				<view class="val">{{item.order_no}}</view>
+		<block v-if="logs.length <= 0">
+			<view class="null-pages">
+				<u-empty
+					mode="history"
+					icon="http://cdn.uviewui.com/uview/empty/history.png"
+					text="暂无合同签约记录"
+				>
+				</u-empty>
 			</view>
-			<view class="flex">
-				<label>业务类型：</label>
-				<view class="val">
-					<text v-for="(titem, tindex) in item.item_type" :key="tindex">{{titem.title}}</text>
+		</block>
+		<block v-else>
+			<view class="log-blcok" v-for="(item, index) in logs" :key="index" @click="onInfo(item.business_order_id)">
+				<view class="flex">
+					<label>订单编号：</label>
+					<view class="val">{{item.order_no}}</view>
+				</view>
+				<view class="flex">
+					<label>业务类型：</label>
+					<view class="val">
+						<text v-for="(titem, tindex) in item.item_type" :key="tindex">{{titem.title}}</text>
+					</view>
+				</view>
+				<view class="flex">
+					<label>签约时间：</label>
+					<view class="val">{{item.created_at}}</view>
 				</view>
 			</view>
-			<view class="flex">
-				<label>签约时间：</label>
-				<view class="val">{{item.created_at}}</view>
+			<view class="pages-loding" v-if="isLoding">
+				<u-loadmore :status="status" loadingIcon="semicircle" />
 			</view>
-		</view>
+		</block>
 	</view>
 </template>
 
@@ -24,7 +39,10 @@
 	export default {
 		data() {
 			return {
-				logs: [],
+				status	: 'loading',
+				isLoding: false,
+				logs	: [],
+				page	: { current	: 0 }
 			};
 		},
 		created() {
@@ -37,10 +55,14 @@
 					mask : true
 				})
 				getSignLogs({
-					page: 1
+					page: this.page.current
 				}).then(res => {
-					this.logs = res.data
-					this.page = res.page
+					let { data, page }  = res;
+					let atArr		    = page.current == 1 ? [] : this.getLog
+					this.logs 			= atArr.concat(data)
+					this.page 			= page
+					this.status 		= !page.has_more ? 'nomore': 'loading'
+					this.isLoding		= !page.has_more
 					uni.hideLoading()
 				}).catch(err => {
 					uni.showToast({
@@ -55,6 +77,13 @@
 					params	: { id }
 				})
 			}
+		},
+		onReachBottom(){
+			this.isLoding = true
+			if(this.page.has_more){
+				this.page.current++
+				this.getLog()
+			}
 		}
 	}
 </script>
@@ -68,6 +97,7 @@
 		border-radius: $radius;
 		padding: $padding;
 		position: relative;
+		margin-bottom: 20rpx;
 		// .log-icon{ position: absolute; right: $margin; top: 50%; margin-top: -14rpx; }
 		.flex{
 			display: flex;
@@ -77,4 +107,10 @@
 			label{ color: gray; }
 		}
 	}
+	
+	// 分页加载
+	.pages-loding{ padding: 10rpx; }
+	
+	// 记录为空
+	.null-pages{ display: flex; align-items: center;  justify-content: space-around; height: 80vh;}
 </style>

From 048b9987a7aad084d23c320766d9f7b89b628447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 25 Apr 2023 15:32:58 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/signLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/user/signLog.vue b/pages/user/signLog.vue
index a192594..7093c20 100644
--- a/pages/user/signLog.vue
+++ b/pages/user/signLog.vue
@@ -58,7 +58,7 @@
 					page: this.page.current
 				}).then(res => {
 					let { data, page }  = res;
-					let atArr		    = page.current == 1 ? [] : this.getLog
+					let atArr		    = page.current == 1 ? [] : this.logs
 					this.logs 			= atArr.concat(data)
 					this.page 			= page
 					this.status 		= !page.has_more ? 'nomore': 'loading'