7.22

config/baseUrl.js

@@ -4,12 +4,12 @@ let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "http://192.168.0.106:8080"; //屈晨
-	baseUrl = "http://192.168.0.59:8001"; //徐强
+	// baseUrl = "http://192.168.5.150:8001"; //徐强
 	// baseUrl = "http://192.168.0.52:8080"; //贺礼霄
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/partner2H5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
-	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	baseUrl = "https://tennat.baoxianzhanggui.com/test_api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/partner2";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {
@@ -18,7 +18,7 @@ if (process.env.NODE_ENV === 'development') {
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/partner2H5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxian8zhanggui.com/partner2H5";
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	baseUrl = "https://tennat.baoxianzhanggui.com/test_api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/partner2";
 	socketUrl = "";
 }

config/login.js

@@ -19,10 +19,10 @@ async function login(options = {}) {
 	if (res.code != '200') {
 		return Promise.resolve(res);
 	} else {
-		if (options.data.account) {
-			uni.setStorageSync('username', options.data.account);
-			uni.setStorageSync('password', options.data.password);
-			uni.setStorageSync('type', res.data.type);
+		if (options.data.mobile) {
+			uni.setStorageSync('username', options.data.mobile);
+			uni.setStorageSync('password', options.data.passWord);
+			uni.setStorageSync('type', '1');
 			let loginStatus = await getLoginUserInfo(res.data, options.data.account);
 			if (loginStatus) {
 				// 跳转到首页
@@ -197,7 +197,7 @@ function judgeLogin(callback, type = "judge") {
 
 //获取登录用户信息
 async function getLoginUserInfo(data, userId) {
-	let Author = "Bearer" + " " + data.token;
+	let Author = data.token;
 	let userInfoRes = await $http.get('/newAppPartner/getUserInfo', {
 		type: uni.getStorageSync('type')
 	}, {

manifest.json

@@ -1,192 +1,195 @@
 {
-	"name": "晋掌柜合伙人",
-	"appid": "__UNI__2041321",
-	"description": "保险类app",
-	"transformPx": false,
-	"icons": [{
-		"sizes": "分辨率，192x192",
-		"src": "图片路径"
-	}],
-	"versionName": "1.1.0",
-	"versionCode": 110,
-	"app-plus": {
-		"error": {
-			"url": "hybrid/html/error.html"
-		},
-		"compatible": {
-			"ignoreVersion": true
-		},
-		"privacy": {
-			"prompt": "template",
-			"template": {
-				"title": "平台协议和隐私协议",
-				"message": "欢迎使用晋掌柜app，我们非常重视您的个人信息和隐私保护。我们将通过《隐私权保护政策》帮助您了解我们收集、使用、存储、共享和保护个人信息的情况,以及您所享有的相关权利。<br/> 为了更好的向您提供注册认证、线上投保、以及周边服务等相关服务功能,我们会收集、使用必要的信息。包括但不限于：<br/>1、为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。2、在使用道路救援功能时，基于您的授权我们可能会获取您的位置信息，以便为您提供服务。您有权拒绝或取消授权。在使用线上投保以及注册等功能时， 基于您的授权我们会获取您的相册存储的权限， 以便在使用时能够正确的上传个人资料。获取通知权限， 用于向您发送重要通知， 如服务更新或安全提醒。<br/> 　　请仔细阅读<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/xieyi'>《平台协议》</a>和<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/mimi'>《隐私协议》</a>了解详细信息。我们将按照您同意的条款使用您的个人信息，以便为您提供服务。",
-				"buttonAccept": "同意",
-				"buttonRefuse": "暂不同意"
-			}
-		},
-		"modules": {
-			"Messaging": {},
-			"OAuth": {},
-			"Share": {},
-			"Payment": {},
-			"SQLite": {}
-		},
-		"distribute": {
-			"android": {
-				"permissionPhoneState": {
-					"request": "none",
-					"prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
-				},
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"minSdkVersion": 21,
-				"schemes": "hhrapp",
-				"targetSdkVersion": 30
-			},
-			"sdkConfigs": {
-				"ad": {},
-				"oauth": {
-					"weixin": {
-						"appid": "wxc1fd4b8455fa7019",
-						"appsecret": "69d6024eb2f2a96a71f1f859a21cc9bf",
-						"UniversalLinks": ""
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wxc1fd4b8455fa7019",
-						"UniversalLinks": ""
-					}
-				},
-				"push": {},
-				"payment": {
-					"weixin": {
-						"__platform__": ["android"],
-						"appid": "wxc1fd4b8455fa7019",
-						"UniversalLinks": ""
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"androidStyle": "common",
-				"useOriginalMsgbox": true
-			},
-			"ios": {
-				"dSYMs": false,
-				"urltypes": "zgcxapp"
-			}
-		},
-		"compilerVersion": 3,
-		"nvueLaunchMode": "fast",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true
-		},
-		"nativePlugins": {}
-	},
-	// 5+App特有相关
-	"quickapp": {},
-	// 快应用特有相关
-	"mp-weixin": {
-		"setting": {
-			"urlCheck": false,
-			"es6": false,
-			"postcss": false,
-			"minified": false
-		},
-		"usingComponents": true,
-		"appid": "wx8e8efe710bd99de2",
-		"permission": {}
-	},
-	"h5": {
-		"template": "template.h5.html",
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		},
-		"optimization": {
-			"treeShaking": {
-				"enable": true
-			}
-		},
-		"devServer": {
-			"https": false,
-			"port": 81
-		},
-		"sdkConfigs": {
-			"maps": {}
-		},
-		"uniStatistics": {
-			"enable": false
-		}
-	},
-	"mp-jd": {
-		"unipush": {
-			"enable": false
-		}
-	}
+    "name" : "晋掌柜合伙人",
+    "appid" : "__UNI__2041321",
+    "description" : "保险类app",
+    "transformPx" : false,
+    "icons" : [
+        {
+            "sizes" : "分辨率，192x192",
+            "src" : "图片路径"
+        }
+    ],
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
+    "app-plus" : {
+        "error" : {
+            "url" : "hybrid/html/error.html"
+        },
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "privacy" : {
+            "prompt" : "template",
+            "template" : {
+                "title" : "平台协议和隐私协议",
+                "message" : "欢迎使用晋掌柜app，我们非常重视您的个人信息和隐私保护。我们将通过《隐私权保护政策》帮助您了解我们收集、使用、存储、共享和保护个人信息的情况,以及您所享有的相关权利。<br/> 为了更好的向您提供注册认证、线上投保、以及周边服务等相关服务功能,我们会收集、使用必要的信息。包括但不限于：<br/>1、为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。2、在使用道路救援功能时，基于您的授权我们可能会获取您的位置信息，以便为您提供服务。您有权拒绝或取消授权。在使用线上投保以及注册等功能时， 基于您的授权我们会获取您的相册存储的权限， 以便在使用时能够正确的上传个人资料。获取通知权限， 用于向您发送重要通知， 如服务更新或安全提醒。<br/> 　　请仔细阅读<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/xieyi'>《平台协议》</a>和<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/mimi'>《隐私协议》</a>了解详细信息。我们将按照您同意的条款使用您的个人信息，以便为您提供服务。",
+                "buttonAccept" : "同意",
+                "buttonRefuse" : "暂不同意"
+            }
+        },
+        "modules" : {
+            "Messaging" : {},
+            "OAuth" : {},
+            "Share" : {},
+            "Payment" : {},
+            "SQLite" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+                },
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "minSdkVersion" : 21,
+                "schemes" : "hhrapp",
+                "targetSdkVersion" : 30
+            },
+            "sdkConfigs" : {
+                "ad" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxc1fd4b8455fa7019",
+                        "appsecret" : "69d6024eb2f2a96a71f1f859a21cc9bf",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxc1fd4b8455fa7019",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "push" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wxc1fd4b8455fa7019",
+                        "UniversalLinks" : ""
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "common",
+                "useOriginalMsgbox" : true
+            },
+            "ios" : {
+                "dSYMs" : false,
+                "urltypes" : "zgcxapp"
+            }
+        },
+        "compilerVersion" : 3,
+        "nvueLaunchMode" : "fast",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true
+        },
+        "nativePlugins" : {}
+    },
+    // 5+App特有相关
+    "quickapp" : {},
+    // 快应用特有相关
+    "mp-weixin" : {
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : false,
+            "postcss" : false,
+            "minified" : false
+        },
+        "usingComponents" : true,
+        "appid" : "wx8e8efe710bd99de2",
+        "permission" : {}
+    },
+    "h5" : {
+        "template" : "template.h5.html",
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "devServer" : {
+            "https" : false,
+            "port" : 81
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-jd" : {
+        "unipush" : {
+            "enable" : false
+        }
+    }
 }
-// 小程序特有相关
+// 小程序特有相关
+

pages/index/applypartner.vue

@@ -17,14 +17,14 @@
 					</uni-forms-item>
 					<uni-forms-item label="证件号" required name="identity">
 						<input class="uni-input-input textColor" placeholder="输入证件号" v-model="personData.identity"
-							placeholder-style="font-size:28upx" />
+							placeholder-style="font-·size:28upx" />
 					</uni-forms-item>
 					<uni-forms-item label="密码" required name="password">
 						<input class="uni-input-input textColor" placeholder="输入密码" v-model="personData.password"
 							placeholder-style="font-size:28upx" />
 					</uni-forms-item>
-					<uni-forms-item label="地址" required name="address">
-						<input class="uni-input-input textColor" placeholder="输入地址" v-model="personData.address"
+					<uni-forms-item label="地址" required name="liveAddress">
+						<input class="uni-input-input textColor" placeholder="输入地址" v-model="personData.liveAddress"
 							placeholder-style="font-size:28upx" />
 					</uni-forms-item>
 				</uni-forms>
@@ -68,8 +68,9 @@
 					mobile: '',
 					identity: '',
 					password: '',
-					address: '',
-					esmUserImageVo: []
+					liveAddress: '',
+					sfz1: '',
+					sfz2: '',
 				},
 				rules: {
 					name: {
@@ -106,7 +107,7 @@
 							errorMessage: '请输入密码'
 						}]
 					},
-					address: {
+					liveAddress: {
 						rules: [{
 							required: true,
 							errorMessage: '请输入地址',
@@ -130,17 +131,13 @@
 			//提交注册
 			submit() {
 				this.$refs.personData.submit().then(res => {
-					this.$http.post('/user/newSaveUserInfoByPartner', {
-						sysUser: {
-							...this.personData,
-							roleId: this.grade == 4 ? "21" : "108",
-							referrerId: this.id,
-							grade: this.grade,
-							...(this.deptSource != null && {
-								deptSource: this.deptSource
-							}),
-						},
-						esmUserImageVo: this.personData.esmUserImageVo
+					this.$http.post('/userInfo/newSaveUserInfoByPartner', {
+						...this.personData,
+						referrerId: this.id,
+						grade: this.grade,
+						...(this.deptSource != null && {
+							deptSource: this.deptSource
+						}),
 					}).then(res => {
 						if (res.code == 200) {
 							let obj = JSON.stringify({
@@ -162,6 +159,7 @@
 					console.log('err', err);
 				})
 			},
+			// 正面
 			async userfrontChange() {
 				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
 					count: 1,
@@ -179,9 +177,9 @@
 				if (chooseImageRes) {
 					this.userfrontImg = chooseImageRes.tempFilePaths[0];
 					uni.uploadFile({
-						url: this.$base.baseUrl + '/ins/taskImage/uploadFileByPartner',
+						url: this.$base.baseUrl + '/file/upload',
 						filePath: chooseImageRes.tempFilePaths[0],
-						name: "multipartFile",
+						name: "file",
 						formData: {
 							'type': 'image',
 						},
@@ -191,25 +189,13 @@
 						success: (imgRes) => {
 							let data = JSON.parse(imgRes.data);
 							if (data.code == '200') {
-								if (this.personData.esmUserImageVo.some(v => v.type == 'SFZ_01')) {
-									this.personData.esmUserImageVo.map(val => {
-										if (val.imageType == 'SFZ_01') {
-											val.imageId = data.data.id;
-										}
-									})
-								} else {
-									this.personData.esmUserImageVo.push({
-										imageId: data.data.id,
-										type: "SFZ_01",
-									})
-								}
-
+								this.personData.sfz1 = data.data.id
 							}
-
 						}
 					});
 				}
 			},
+			//反面
 			async userbackChange() {
 				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
 					count: 1,
@@ -226,9 +212,9 @@
 				if (chooseImageRes) {
 					this.userbackImg = chooseImageRes.tempFilePaths[0];
 					uni.uploadFile({
-						url: this.$base.baseUrl + '/ins/taskImage/uploadFileByPartner',
+						url: this.$base.baseUrl + '/file/upload',
 						filePath: chooseImageRes.tempFilePaths[0],
-						name: "multipartFile",
+						name: "file",
 						formData: {
 							'type': 'image',
 						},
@@ -238,18 +224,7 @@
 						success: (imgRes) => {
 							let data = JSON.parse(imgRes.data);
 							if (data.code == '200') {
-								if (this.personData.esmUserImageVo.some(v => v.type == 'SFZ_02')) {
-									this.personData.esmUserImageVo.map(val => {
-										if (val.imageType == 'SFZ_02') {
-											val.imageId = data.data.id;
-										}
-									})
-								} else {
-									this.personData.esmUserImageVo.push({
-										imageId: data.data.id,
-										type: "SFZ_02",
-									})
-								}
+								this.personData.sfz2 = data.data.id
 							}
 
 						}

pages/institutional/invitationCode.vue

@@ -3,7 +3,7 @@
 		<public-module></public-module>
 		<view class="headers dis a-c j-start">
 			<u-icon name="arrow-left" color="#333" size="38" @tap="back"></u-icon>
-			<text style="margin: auto;">邀请码</text>
+			<text style="margin: auto;">{{gradeText1}}邀请码</text>
 
 		</view>
 		<view class="homeBackground"></view>
@@ -21,10 +21,10 @@
 					<view class="panelcanvas " id="panelcanvas">
 						<!-- 权限锁定组件 -->
 						<uni-permission-view position="fixed" :backimage="true"
-							v-if="this.teamOverviewInfo.lockingState=='2'" :genericText="`完成仕务，解锁“合伙人，扩展我的业务团队`"
-							background="rgba(255, 255, 255, 0.7)" :imageStyle="{width:'109rpx',height:'107rpx'}"
-							:contentStyle="{marginBottom:'20rpx'}" :genericTextStyle="{fontSize:'28rpx'}"
-							@requestUnlock="requestUnlock">
+							v-if="this.teamOverviewInfo.lockingState=='2'"
+							:genericText="`完成任务，解锁“${gradeText}，扩展我的业务团队`" background="rgba(255, 255, 255, 0.7)"
+							:imageStyle="{width:'109rpx',height:'107rpx'}" :contentStyle="{marginBottom:'20rpx'}"
+							:genericTextStyle="{fontSize:'28rpx'}" @requestUnlock="requestUnlock">
 						</uni-permission-view>
 						<!-- 权限锁定组件 -->
 						<image :src="recommendImg" mode="widthFix" lazy-load></image>
@@ -48,11 +48,8 @@
 					<view class="entryPoint" v-show="supportUpgrade" @click="upgrade">去升级</view>
 				</view>
 			</view>
-			<view class="tag mt-2 dis f-c a-start">
-				<text>我的佣金比例：{{commissionRate || 0 }}%</text>
-			</view>
 		</view>
-
+		<text @click="attr">注册</text>
 	</view>
 </template>
 
@@ -76,6 +73,7 @@
 				supportUpgrade: false, //是否支持升级
 				deptSource: "",
 				commissionRate: "", //角色佣金比例
+				grade1: 0,
 			}
 		},
 		onShow() {
@@ -83,7 +81,7 @@
 		},
 		computed: {
 			...mapState(['userInfo', "userCheckInfo"]),
-			gradeText() {
+			gradeText(index) {
 				const gradeMap = {
 					1: '创始人',
 					2: '管理人',
@@ -91,6 +89,16 @@
 					4: '工作室'
 				}
 				return gradeMap[this.grade] || ''
+			},
+			gradeText1(index) {
+				const gradeMap = {
+					1: '创始人',
+					2: '管理人',
+					3: '合伙人',
+					4: '工作室',
+					5: '团队长'
+				}
+				return gradeMap[this.grade1] || ''
 			}
 		},
 		onLoad(options) {
@@ -101,6 +109,7 @@
 				if (options.deptSource) this.deptSource = options.deptSource;
 				this.teamOverviewInfo = info;
 				console.log(this.teamOverviewInfo);
+				this.grade1 = Number(options.grade) + 1;
 			}
 			this.recommendCode();
 			this.entryPoint();
@@ -110,6 +119,22 @@
 			this.getCommissionRate();
 		},
 		methods: {
+			attr() {
+				if (this.grade == 4) {
+					uni.navigateTo({
+						url: "/pages/index/applypartner?grade=" +
+							this
+							.grade + '&userId=' + this.userInfo.sysUser.userId + '&deptSource=' + this.deptSource,
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/index/applypartner?grade=" +
+							this
+							.grade + '&userId=' + this.userInfo.sysUser.userId
+					})
+				}
+
+			},
 			//获取佣金比例
 			async getCommissionRate() {
 				let res = await this.$http.get(`/partner/commissionRate?grade=${this.grade}`);
@@ -254,7 +279,6 @@
 			//页面截图转路径
 			receiveRenderData(val) {
 				this.posterUrl = val.replace(/[\r\n]/g, ''); // 去除base64位中的空格
-				console.log(this.posterUrl);
 				// 将base64转化为临时地址
 				// base64ToPath(imageStr).then(path => {
 				// 	this.payImg = path;

pages/institutional/partner.vue

@@ -64,7 +64,7 @@
 				</view>
 			</view>
 		</view>
-		<u-loadmore v-if="personlist.data.records.length!=0" :status="status" />
+		<u-loadmore v-if=" personlist.data.records && personlist.data.records.length!=0" :status="status" />
 		<my-date-picker ref="datePicker" @confirmPickDate="confirmPickDate" />
 	</view>
 </template>
@@ -126,6 +126,7 @@
 			const index = this.tablist.findIndex(item => item.grade == params.grade);
 			this.current = index; //获取对应身份的数据下标
 			this.personlist = this.tablist[index]; //获取对应身份的数据列表
+			console.log(this.personlist);
 			this.totalInfo = this.tablist[index].total; //获取对应身份的数据统计
 		},
 		methods: {

pages/institutional/wallet.vue

@@ -1,18 +1,18 @@
 <template>
-	<view >
+	<view>
 		<!-- view class="headers ">
 			<view class="dis a-c j-start ">
 				<u-icon name="arrow-left" style="color: #fff;" size="40" @tap="back"></u-icon>
 				<text style="margin: auto;">钱包</text>
 			</view>
 		</view> -->
-		
+
 		<view class="amount-money">
 			<view class="team dis" style="height: 11vh;">
 				<image src="/static/img/touxiang.png"></image>
 				<view style="color:#fff">
-					<view >{{totalList.userName}}</view>
-					<view >{{totalList.userId}}</view>
+					<view>{{totalList.userName}}</view>
+					<view>{{totalList.userId}}</view>
 				</view>
 			</view>
 			<view class="amount-total" style="margin:12px 15px">
@@ -23,7 +23,7 @@
 						<text>{{totalList.cashFee}}</text>
 					</view>
 					<view>
-						<u-button class="view-now"  @click="toWithdraw">提现</u-button>
+						<u-button class="view-now" @click="toWithdraw">提现</u-button>
 					</view>
 				</view>
 				<view class="dis total">
@@ -35,8 +35,8 @@
 					<view text style="font-size: 20px">{{totalList.proportional}}%</view>
 				</view>
 			</view>
-			<view class="withdrawal" >
-				<view class="withdrawal-background " >
+			<view class="withdrawal">
+				<view class="withdrawal-background ">
 					<view class="dis j-s" style="margin:5px 0 10px 0;font-weight: 700;font-size: 14px;">
 						<text>提现记录</text>
 						<!-- <view class="statisticsDate dis a-c ">
@@ -57,23 +57,27 @@
 						</view> -->
 					</view>
 					<view class="withdrawal-con">
-						<view style="border-bottom: 1px solid #ccc;padding: 10px 0;"  v-for="val in withdrawalList" :key="val.number">
+						<view style="border-bottom: 1px solid #ccc;padding: 10px 0;" v-for="val in withdrawalList"
+							:key="val.number">
 							<view class="dis j-s ">
 								<view class="dis " style="line-height: normal;">
-									<image v-if="val.status=='1'" class="Withdrawal-icon" src="/static/icon/chenggong.png"></image>
-									<image v-if="val.status=='0'" class="Withdrawal-icon" src="/static/icon/tixianzhong.png"></image>
-									<image v-if="val.status=='2'" class="Withdrawal-icon" src="/static/icon/bohui.png"></image>
-									<text >提现-{{ val.status=='0'?'提现中':val.status=='1'?'成功':val.status=='2'?'驳回':'无' }}</text>
+									<image v-if="val.status=='1'" class="Withdrawal-icon"
+										src="/static/icon/chenggong.png"></image>
+									<image v-if="val.status=='0'" class="Withdrawal-icon"
+										src="/static/icon/tixianzhong.png"></image>
+									<image v-if="val.status=='2'" class="Withdrawal-icon" src="/static/icon/bohui.png">
+									</image>
+									<text>提现-{{ val.status=='0'?'提现中':val.status=='1'?'成功':val.status=='2'?'驳回':'无' }}</text>
 								</view>
 								<text style="font-weight: 700;">-{{val.cashFee}}</text>
 							</view>
 							<view>交易号：{{val.number}}</view>
 							<view class="dis j-s">
 								<text style="color: rgba(51,51,51,0.8);">{{val.createTime}}</text>
-								<text   class="view" @click="detail(val.id)">查看详情</text>
+								<text class="view" @click="detail(val.id)">查看详情</text>
 							</view>
 						</view>
-				<o-empty v-if="withdrawalList.length==0" height="20vh" />
+						<o-empty v-if="withdrawalList.length==0" height="20vh" />
 
 					</view>
 				</view>
@@ -88,11 +92,11 @@
 	import MxDatePicker from "@/components/modules/tools/team/mx-datepicker/mx-datepicker.vue";
 	import {
 		mapState,
-		} from "vuex"
-	export default{
-		data(){
-			return{
-				totalList:{},
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				totalList: {},
 				queryTimeTypeArray: ['本月查询', '本年查询', '自定义查询'],
 				queryTimeTypeIndex: 0,
 				dateRange: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-01', new Date()
@@ -100,7 +104,7 @@
 				],
 				showDatePicker: false,
 				teamTabIndex: 0,
-				withdrawalList:[]
+				withdrawalList: []
 			}
 		},
 		computed: {
@@ -113,7 +117,7 @@
 			this.queryData()
 			this.WithdrawalqueryData()
 		},
-		methods:{
+		methods: {
 			//页面返回按钮
 			back() {
 				uni.navigateBack({
@@ -123,17 +127,17 @@
 				// uni.navigateTo({
 				// 	url: "/pages/index/index"
 				// })
-				
+
 			},
-			detail(id){
+			detail(id) {
 				uni.navigateTo({
-					url: "/pages/institutional/walletDetail?id="+id
+					url: "/pages/institutional/walletDetail?id=" + id
 				})
 			},
 			async queryData() {
 				let res = await this.$http.get('/agency/queryExtractFee');
 				if (res.code == '200') {
-					this.totalList=res.data
+					this.totalList = res.data
 				}
 			},
 			async WithdrawalqueryData() {
@@ -141,10 +145,10 @@
 					// "endTime": this.dateRange[1],
 					// "beginTime": this.dateRange[0],
 				}
-				let res = await this.$http.post('/sysAgencyFeeApproval/queryOperateInfo', params);
-				if (res.code == '200') {
-					this.withdrawalList=res.data
-				}
+				// let res = await this.$http.post('/sysAgencyFeeApproval/queryOperateInfo', params);
+				// if (res.code == '200') {
+				// 	this.withdrawalList=res.data
+				// }
 			},
 			onShowDatePicker() { //显示
 				this.showDatePicker = true;
@@ -188,35 +192,38 @@
 						duration: 3000,
 						icon: "none"
 					});
-			
+
 				}
 			},
-			}
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
-	.amount-money{
+	.amount-money {
 		background-color: #343EEF;
-		background-image: url(/static/img/group.png) ;
+		background-image: url(/static/img/group.png);
 		background-repeat: no-repeat;
 		background-size: 50%;
 		background-position: right top;
 	}
-	.team{
+
+	.team {
 		padding: 15px 20px;
-		image{
+
+		image {
 			width: 50px;
 			height: 50px;
 			margin-right: 20px;
 		}
 	}
-	.amount-total{
-		background: linear-gradient( 90deg, #E6E9FE 0%, #F6F7FF 50%, #E4E7FE 100%);
+
+	.amount-total {
+		background: linear-gradient(90deg, #E6E9FE 0%, #F6F7FF 50%, #E4E7FE 100%);
 		border-radius: 12px 12px 12px 12px;
-		padding:13px
+		padding: 13px
 	}
+
 	.headers {
 		position: fixed;
 		top: 0;
@@ -227,63 +234,74 @@
 		height: auto;
 		color: #fff;
 		background: #343EEF;
+
 		text {
 			font-size: 18px;
 			font-weight: bold;
 		}
 	}
-	.amount-tixian{
+
+	.amount-tixian {
 		color: #343EEF;
 	}
-	.amount-tixian>text:last-child{
+
+	.amount-tixian>text:last-child {
 		font-weight: bold;
 		font-size: 34px;
-		background:  linear-gradient(0deg, #3447EF 0%, #3492EF 100%);
+		background: linear-gradient(0deg, #3447EF 0%, #3492EF 100%);
 		-webkit-background-clip: text;
 		-webkit-text-fill-color: transparent;
 	}
-	.view-now{
-		background: linear-gradient( 90deg, #6D75F3 0%, #343EEF 100%);
+
+	.view-now {
+		background: linear-gradient(90deg, #6D75F3 0%, #343EEF 100%);
 		color: #fff;
 		font-size: 13px;
 	}
-	.total>view{
+
+	.total>view {
 		width: 50%;
 	}
+
 	.statisticsDate {
-		color: rgba(51,51,51,0.8);
+		color: rgba(51, 51, 51, 0.8);
 		height: 34px;
-		background: rgba(255,255,255,0.4);
+		background: rgba(255, 255, 255, 0.4);
 		border-radius: 6px;
 	}
-	.withdrawal{
+
+	.withdrawal {
 		height: 50vh;
 		border-radius: 40px 40px 0px 0px;
 		border-bottom-left-radius: 0;
 		border-bottom-right-radius: 0;
 		background-color: #fff;
-		    padding: 20px;
+		padding: 20px;
 	}
-	.withdrawal-background{
+
+	.withdrawal-background {
 		padding: 5px;
 		background: #E7E8FD;
 		border-radius: 12px 12px 12px 12px;
 	}
-	.withdrawal-con{
+
+	.withdrawal-con {
 		background: #fff;
 		border-radius: 12px 12px 12px 12px;
 		padding: 0 10px;
 		height: 40vh;
 		overflow-y: auto;
 	}
-	.view{
-		background: linear-gradient( 90deg, #7E99D1 0%, #4F78B1 100%);
+
+	.view {
+		background: linear-gradient(90deg, #7E99D1 0%, #4F78B1 100%);
 		border-radius: 20px 20px 20px 20px;
 		padding: 3px 10px;
 		font-size: 11px;
 		color: #fff;
 	}
-	.Withdrawal-icon{
+
+	.Withdrawal-icon {
 		width: 20px;
 		height: 20px;
 		margin-right: 5px;

pages/login/login.vue

@@ -177,12 +177,12 @@
 			this.isLoading = true;
 		},
 		beforeCreate() {
-			setTimeout(() => {
-				this.$refs.app_update.update(); //调用子组件检查更新方法
-				setTimeout(() => {
-					if (this.$refs.app_update.popup_show == true && this.$refs.app_update.force == true) {}
-				}, 100)
-			}, 500)
+			// setTimeout(() => {
+			// 	this.$refs.app_update.update(); //调用子组件检查更新方法
+			// 	setTimeout(() => {
+			// 		if (this.$refs.app_update.popup_show == true && this.$refs.app_update.force == true) {}
+			// 	}, 100)
+			// }, 500)
 		},
 		//第一次加载
 		async onLoad(e) {
@@ -381,7 +381,7 @@
 			quxiao() {
 				this.show = false;
 				this.$login({
-					url: "/aapLogin",
+					url: "/appAuth/partnerAppLogin",
 					data: {
 						account: this.username,
 						password: this.password,
@@ -403,7 +403,7 @@
 			queren() {
 				this.show = false;
 				this.$login({
-					url: "/aapLogin",
+					url: "/appAuth/partnerAppLogin",
 					data: {
 						account: this.username,
 						password: this.password,
@@ -490,10 +490,11 @@
 						})
 					} else {
 						this.$login({
-							url: "/aapLogin",
+							url: "/appAuth/partnerAppLogin",
 							data: {
-								account: this.username,
-								password: this.password,
+								system: this.system,
+								mobile: this.username,
+								passWord: this.password,
 								captcha: this.imgcode.toLowerCase(),
 								captchaId: this.captchaId,
 							}

pages/my/my.vue

@@ -477,6 +477,7 @@
 			...mapMutations(['emptyUserInfo']),
 			//角色tab切换
 			customTabChange(item, index) {
+
 				this.superiorIdentityData = item;
 				this.backImage = this.superiorIdentityData.backImageurl; //切换背景
 				this.customTabIndex = index;
@@ -819,11 +820,11 @@
 				})
 			},
 			async toWithdraw() {
-				let res = await this.$http.post('/userBank/getUserBankList', {
+				let res = await this.$http.post('/userBankCard/queryUserBankCardList', {
 					auditStatus: "1",
-					delFlag: '0'
+					userId: this.userInfo.sysUser.userInfoId,
 				});
-				if (res.data.length) {
+				if (res.data.records.length) {
 					this.navigate({
 						url: `/pages/wallet/withdraw?amount=${this.getApplication.cashFee}`,
 					}, "navigateTo", true)
@@ -837,13 +838,12 @@
 				}
 			},
 			async accountTool(path) {
-
 				if (path) {
 					if (path == '/pages/wallet/bankCard') {
-						let res = await this.$http.post('/userBank/getUserBankList', {
-							auditStatus: '',
+						let res = await this.$http.post('/userBankCard/queryUserBankCardList', {
+							userId: this.userInfo.sysUser.userInfoId,
 						});
-						if (!res.data.length) {
+						if (!res.data.records.length) {
 							this.navigate({
 								url: '/pages/wallet/bindBank',
 								complete: () => {
@@ -879,10 +879,10 @@
 					"endTime": endTime || '',
 					"beginTime": beginTime || '',
 				}
-				let res = await this.$http.post('/sysAgencyFeeApproval/queryOperateInfo', params);
-				if (res.code == '200') {
-					this.withdrawalData = res.data
-				}
+				// let res = await this.$http.post('/sysAgencyFeeApproval/queryOperateInfo', params);
+				// if (res.code == '200') {
+				// 	this.withdrawalData = res.data
+				// }
 			},
 			handleScroll(e) {
 				const scrollTop = e.scrollTop;
@@ -945,9 +945,9 @@
 			},
 			//获取企业微信客服地址，是否展示
 			getWechatData() {
-				this.$http.get('/sys/qy/wechat/find/picture').then(res => {
-					this.supportStaffUrl = res.data.supportStaffUrl
-				})
+				// this.$http.get('/sys/qy/wechat/find/picture').then(res => {
+				// 	this.supportStaffUrl = res.data.supportStaffUrl
+				// })
 			},
 			//点击跳转企业微信客服
 			weChatService() {

pages/my/upgradeTask.vue

@@ -26,7 +26,7 @@
 						<text class="text">{{info.lockingState==1?'保级':'升级'}}任务</text>
 						<image class="line" src="/static/image/my/upgradeTask/decoration2.png" mode=""></image>
 					</view>
-					<text class="upgradeOperation" @click="upgradeOperation">申请升级</text>
+					<text class="upgradeOperation" v-if="info.lockingState!=1" @click="upgradeOperation">申请升级</text>
 				</view>
 				<view v-if="info.lockingState==1" class="message dis a-c j-c">{{upgradeTaskdata.assessmentEndDate}}前
 					满足下列{{upgradeTaskdata.relSatisfy=='1'?'全部条件':'任意一条'}}即可升级

pages/statistics/statistics.vue

@@ -206,9 +206,6 @@
 		},
 		onLoad() {
 			this.level = this.userInfo.sysUser.level
-			this.$http.get('/sys/qy/wechat/find/picture').then(res => {
-				this.supportStaffUrl = res.data.supportStaffUrl
-			})
 		},
 		onShow() {
 			this.type = uni.getStorageSync('type')

pages/wallet/bankCard.vue

@@ -11,7 +11,7 @@
 							<image :src="item.stylelist.logo" mode=""></image>
 						</view>
 						<view class="banktitle dis f-c j-s">
-							<text>{{item.bankAccount}}</text>
+							<text>{{item.bankName}}</text>
 							<text>储蓄卡</text>
 						</view>
 					</view>
@@ -20,8 +20,8 @@
 					<view v-for="(item,index) in item.bankArray" :key="index">{{item}}</view>
 				</view>
 			</view>
-			<view v-if="current==1 && item.delFlag==0" class="bankClass dis a-start f-c j-s"
-				v-for="(item,index) in cardPackList2" :key="index" :style="{background:item.stylelist.background}">
+			<view v-if="current==1 " class="bankClass dis a-start f-c j-s" v-for="(item,index) in cardPackList2"
+				:key="index" :style="{background:item.stylelist.background}">
 				<image class="Backgroundimage" src="/static/image/bindBank/img1.png" mode="" style=""></image>
 				<view class="dis j-s">
 					<view class="dis">
@@ -114,6 +114,10 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
 	export default {
 		data() {
 			return {
@@ -318,6 +322,9 @@
 				},
 			},
 		},
+		computed: {
+			...mapState(['userInfo'])
+		},
 		onLoad() {},
 		methods: {
 			async updateSubmit() {
@@ -372,15 +379,16 @@
 				this.current = index;
 			},
 			async getcardPack() {
-				let res = await this.$http.post('/userBank/getUserBankList', {
-					auditStatus: "",
+				let res = await this.$http.post('/userBankCard/queryUserBankCardList', {
+					userId: this.userInfo.sysUser.userInfoId,
 				});
 				let list1 = [];
 				let list2 = [];
 				let list3 = [];
-				if (res.code == '200' && res.data) {
-					res.data.map(val => {
-						let name = this.bankList.find(ele => ele.bankName === val.bankAccount)
+				console.log(res);
+				if (res.code == '200' && res.data.records) {
+					res.data.records.map(val => {
+						let name = this.bankList.find(ele => ele.bankName === val.bankName)
 						if (name) {
 							val.stylelist = {
 								...name
@@ -392,8 +400,8 @@
 							}
 						}
 						const resultArray = [];
-						for (let i = 0; i < val.bankNumber.length; i += 4) {
-							resultArray.push(val.bankNumber.substring(i, i + 4));
+						for (let i = 0; i < val.bankCardNumber.length; i += 4) {
+							resultArray.push(val.bankCardNumber.substring(i, i + 4));
 						}
 						val.bankArray = resultArray;
 						switch (val.auditStatus) {
@@ -411,6 +419,7 @@
 					this.cardPackList1 = list1;
 					this.cardPackList2 = list2;
 					this.cardPackList3 = list3;
+					console.log(this.cardPackList1);
 				}
 			},
 			getbankCard() {
@@ -577,8 +586,9 @@
 		right: 0;
 		z-index: -1;
 	}
-	.withdrawal-fun{
-		background: linear-gradient( 132deg, #2DD9FF 0%, #2D6DFF 100%);
+
+	.withdrawal-fun {
+		background: linear-gradient(132deg, #2DD9FF 0%, #2D6DFF 100%);
 		border-radius: 5px 5px 5px 5px;
 		color: #fff;
 		font-size: 16px;

pages/wallet/bindBank.vue

@@ -7,14 +7,16 @@
 				<text>请填写本人的银行卡信息</text>
 			</view>
 			<view class="formInfo">
-				<u-field v-if='userInfo.sysUser.managementSource=="2"' @blur="phoneNoCard"  v-model="phoneNo" :field-style="{textAlign:'right'}" label="手机号" placeholder="输入手机号">
+				<u-field @blur="phoneNoCard" v-model="cardHoldMobile" :field-style="{textAlign:'right'}" label="手机号"
+					placeholder="输入手机号">
 				</u-field>
-				<u-field v-else v-model="realUserName" :field-style="{textAlign:'right'}" label="本人姓名" placeholder="输入真实姓名">
+				<u-field v-model="cardHolderName" :field-style="{textAlign:'right'}" label="本人姓名" placeholder="输入真实姓名">
 				</u-field>
-				<u-field v-model="accountno" @blur="validateBankCard" :field-style="{textAlign:'right'}" label="银行卡"
-					placeholder="请输入银行卡卡号">
+
+				<u-field v-model="bankCardNumber" @blur="validateBankCard" :field-style="{textAlign:'right'}"
+					label="银行卡" placeholder="请输入银行卡卡号">
 				</u-field>
-				<u-field @click="showAction" v-model="bankname" :field-style="{textAlign:'right'}" label="选择银行"
+				<u-field @click="showAction" v-model="bankName" :field-style="{textAlign:'right'}" label="选择银行"
 					placeholder="点击选择银行">
 				</u-field>
 				<u-field v-model="bankAddress" :field-style="{textAlign:'right'}" label="开户行" placeholder="输入开户行">
@@ -45,16 +47,18 @@
 		mapMutations
 	} from "vuex"
 	import bankBin from "@/common/bankcardinfo.js"
-import { log } from "util";
+	import {
+		log
+	} from "util";
 	export default {
 		data() {
 			return {
 				promptShow: false,
-				bankname: "", //银行名称
-				accountno: "", //银行卡账号
+				bankName: "", //银行名称
+				bankCardNumber: "", //银行卡账号
 				bankAddress: "", //开户行
-				realUserName: "", //真实姓名
-				phoneNo:"",//手机号
+				cardHolderName: "", //真实姓名
+				cardHoldMobile: "", //手机号
 				disabled: true,
 				show: false,
 				list: [{
@@ -157,20 +161,20 @@ import { log } from "util";
 			...mapState(['userInfo'])
 		},
 		watch: {
-			"accountno": {
+			"bankCardNumber": {
 				handler(val) {
 					if (val) {
-						this.accountno = val.replace(/\s/g, "");
+						this.bankCardNumber = val.replace(/\s/g, "");
 					}
 				},
 			},
 		},
-		
+
 		methods: {
 			...mapMutations(['setUserModules']),
 			// 改变按钮状态
 			confirm(e) {
-				this.bankname = e[0].label;
+				this.bankName = e[0].label;
 			},
 			showAction() {
 				this.show = true;
@@ -178,10 +182,10 @@ import { log } from "util";
 			// 验证银行卡
 			async validateBankCard() {
 				var that = this;
-				that.bankname = "";
-				await bankBin.getBankBin(this.accountno)
+				that.bankName = "";
+				await bankBin.getBankBin(this.bankCardNumber)
 					.then((data) => {
-						that.bankname = data.bankName;
+						that.bankName = data.bankName;
 						that.validateBankCardStatus = true;
 						return true;
 					})
@@ -202,9 +206,8 @@ import { log } from "util";
 				}
 			},
 			async submit() {
-				if ((this.userInfo.sysUser.managementSource=="2" && !this.phoneNo|| !this.bankname || !this.accountno  || !this.bankAddress) ||
-				(this.userInfo.sysUser.managementSource!=="2" && !this.realUserName|| !this.bankname || !this.accountno  || !this.bankAddress)
-				) {
+				if (!this.cardHoldMobile && !this.cardHolderName || !this.bankName || !this.bankCardNumber || !this
+					.bankAddress) {
 					return uni.showToast({
 						title: '信息不完整',
 						duration: 2000,
@@ -212,17 +215,14 @@ import { log } from "util";
 					});
 				}
 				var params = {
-					"bankNumber": this.accountno,
-					"realUserName": this.realUserName,
-					"phoneNo":this.phoneNo,
-					"bankAccount": this.bankname,
+					"bankCardNumber": this.bankCardNumber,
+					"cardHolderName": this.cardHolderName,
+					"cardHoldMobile": this.cardHoldMobile,
+					"bankName": this.bankName,
 					"bankAddress": this.bankAddress,
-					"isDefault": 0,
-					"userId": this.userInfo.sysUser.userId,
-					"userName": this.userInfo.sysUser.userName,
-				
+					"userJzgInfoId": this.userInfo.sysUser.userInfoId,
 				}
-				let res = await this.$http.post('/userBank/insertByBankNumber', params);
+				let res = await this.$http.post('/userInfo/addBankCard', params);
 				if (res.code == '200') {
 					this.promptShow = true;
 				} else {

pages/wallet/withdraw.vue

@@ -7,8 +7,8 @@
 			<view class="dis a-start j-s">
 				<view class="dis j-s a-start">
 					<image class="bankLogo" :src="bankCardInfo.logo" mode=""></image>
-					<view class="dis a-start f-c bankName" v-if="bankCardInfo.bankAccount && bankCardInfo.bankNumber">
-						<text>{{bankCardInfo.bankAccount}}（****{{bankCardInfo.bankNumber.slice(-4)}}）</text>
+					<view class="dis a-start f-c bankName" v-if="bankCardInfo.bankName && bankCardInfo.bankCardNumber">
+						<text>{{bankCardInfo.bankName}}（****{{bankCardInfo.bankCardNumber.slice(-4)}}）</text>
 						<text>注：仅支持整数，72小时内到账</text>
 					</view>
 				</view>
@@ -71,8 +71,8 @@
 							</view>
 							<view class="setRight dis j-s a-c">
 								<view class="dis f-c">
-									<text v-if="bankitem.bankAccount && bankitem.bankNumber">
-										{{bankitem.bankAccount.slice(-4)}} 储蓄卡（{{bankitem.bankNumber.slice(-4)}}）</text>
+									<text v-if="bankitem.bankName && bankitem.bankCardNumber">
+										{{bankitem.bankName.slice(-4)}}储蓄卡（{{bankitem.bankCardNumber.slice(-4)}}）</text>
 									<text>72小时到账</text>
 								</view>
 								<u-icon v-if="bankCardInfo.id==bankitem.id" name="checkbox-mark" color="#0052FF"
@@ -226,25 +226,25 @@
 				this.bankCardListShow = true;
 			},
 			async getbankCard() {
-				let res = await this.$http.post('/userBank/getUserBankList', {
+				let res = await this.$http.post('/userBankCard/queryUserBankCardList', {
 					auditStatus: "1",
-					delFlag: '0'
+					userId: this.userInfo.sysUser.userInfoId,
 				});
 				this.bankList.map(val => {
-					res.data.map(ele => {
-						if (val.bankName == ele.bankAccount) {
+					res.data.records.map(ele => {
+						if (val.bankName == ele.bankName) {
 							ele.logo = val.logo;
 							return ele;
 						}
 					})
 				})
-				let bankinfo = res.data.find(val => val.isDefault == 1)
+				let bankinfo = res.data.records.find(val => val.isDefault == 1)
 				if (bankinfo) {
 					this.bankCardInfo = bankinfo;
 				} else {
 					this.bankCardInfo = res.data[0]
 				}
-				this.bankCardList = res.data;
+				this.bankCardList = res.data.records;
 			},
 			loadData() {
 				this.lowest = 20;