From 8593b1a2dcdda26d1b67c5f963b796211b1a78f4 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 21 May 2024 13:35:02 +0800
Subject: [PATCH] add

---
 config/app.js                      |  6 +++++-
 pages/bindSupplier/index.vue       | 16 +++++++++++-----
 pages/index/index.vue              |  2 --
 pages/quote/bindAccout.vue         | 16 ++++++++++++++--
 pages/quote/supplierFinancialy.vue | 14 ++++++--------
 utils/requestSupplier.js           |  7 +++----
 6 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/config/app.js b/config/app.js
index 6afed7c..411a39a 100644
--- a/config/app.js
+++ b/config/app.js
@@ -35,7 +35,11 @@ switch (env) {
 	default:
 		httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
 		httpSix = 'https://ceshi-new-wokr.lihaink.cn'
-		httpTwo = 'https://erp.lihaink.cn'
+		// httpTwo = 'http://192.168.1.22:8546'
+		httpTwo = 'http://192.168.1.13:8546'
+
+
+		// httpTwo = 'https://erp.lihaink.cn'
 		wsApi = 'wss://crmeb-test.shop.lihaink.cn'
 }
 
diff --git a/pages/bindSupplier/index.vue b/pages/bindSupplier/index.vue
index 2fa55f2..9242a98 100644
--- a/pages/bindSupplier/index.vue
+++ b/pages/bindSupplier/index.vue
@@ -98,7 +98,7 @@
 				<view class="step2" v-if='step==2'>
 					<view class="card">
 						<view class="card-tit" style='margin-bottom: 0;'>
-							上传和拍摄自动识别
+							上传和拍摄照片，系统自动识别
 						</view>
 						<view class="tips">
 							请上传真实的营业执照
@@ -154,7 +154,6 @@
 					</view>
 				</view>
 			</u-transition>
-
 			<u-transition :show="step==3" mode="slide-right">
 				<view class="step3" v-if='step==3'>
 					<view style="font-size: 36rpx;margin: 50rpx 0 34rpx 0;text-align:center">
@@ -305,6 +304,7 @@
 				detail: {},
 				num: 10,
 				formData: {
+					id: '',
 					lat: "",
 					long: "",
 					"phone": "",
@@ -325,6 +325,9 @@
 					storeAddress: "",
 					"images": [],
 					is_merchant_type: 2,
+					// #ifdef APP
+					jg_register_id: uni.getStorageSync('jg_id')
+					// #endif
 				}
 			}
 		},
@@ -392,10 +395,10 @@
 					uni.hideLoading();
 					if (res.status == 200) {
 						that.formData.address = res.data.address;
-						this.formData.company_nickname = res.data.legal_person;
+						that.formData.company_nickname = res.data.legal_person;
 						that.formData.social_credit_code = res.data.register_number;
 						that.formData.company_name = res.data.name;
-						console.log(this.formData.company_nickname)
+						console.log(this.formData)
 					} else {
 						that.$util.Tips({
 							title: "识别失败!"
@@ -415,7 +418,9 @@
 				reSubmitApi({
 					id: this.successData.id
 				}).then(res => {
-					this.formData = res.data
+					for (let key in this.formData) {
+						this.formData[key] = res.data[key]
+					}
 					this.formData.phone = res.data.service_phone
 					console.log(JSON.parse(res.data.data_json))
 					let obj = JSON.parse(res.data.data_json)
@@ -482,6 +487,7 @@
 						delete this.formData.data_json
 					}
 					this.formData.is_merchant_type = 2
+					console.log(this.formData)
 					applysApi({
 						...this.formData
 					}).then(ress => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 59c54f8..671ea6b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -705,7 +705,6 @@
 				}).then(res => {
 					if (res.data?.token) {
 						uni.setStorageSync('LOGIN_STATUS_STOKEN', (res.data?.token || ''))
-						console.log("获取了token")
 					}
 				}).catch(err => {
 					console.log("获取报错", err)
@@ -727,7 +726,6 @@
 					}
 				});
 				// #endif
-
 			},
 			/* 新商户发布商品引导页 */
 			openListGoodsDiver() {
diff --git a/pages/quote/bindAccout.vue b/pages/quote/bindAccout.vue
index 3b4251d..cde04df 100644
--- a/pages/quote/bindAccout.vue
+++ b/pages/quote/bindAccout.vue
@@ -92,9 +92,20 @@
 					"id_card": "",
 					// "mer_id": userStore?.userInfo?.merchant?.mer_id,
 					// supplier_id: userStore?.userInfo?.supplier?.id,
-					// user_type: userStore?.userInfo?.merchant?.mer_id ? '1' : '2'
+					user_type: '2'
 
 				},
+				// form: {
+				// 	"is_own": 0,
+				// 	"bank_name": "中国银行",
+				// 	"bank_id": 1,
+				// 	"name": "赵明军",
+				// 	"bank_code": "6213362109985515778",
+				// 	"bank_branch": "牛马谈支行",
+				// 	"id_card": "513701200012105613",
+				// 	"phone": "19130550023",
+				// 	user_type: '2'
+				// },
 				showPop: false,
 				bankList: [],
 				hasBindAccount: [],
@@ -143,11 +154,12 @@
 
 			},
 			submit() {
+				this.form.is_own = 1
 				bindCradApi({
 					...this.form
 				}).then(res => {
 					// return
-					uni.navigateBack()
+					// uni.navigateBack()
 				})
 			}
 
diff --git a/pages/quote/supplierFinancialy.vue b/pages/quote/supplierFinancialy.vue
index 5585eb5..f8b7c8f 100644
--- a/pages/quote/supplierFinancialy.vue
+++ b/pages/quote/supplierFinancialy.vue
@@ -72,7 +72,8 @@
 <script>
 	import {
 		hasBindAccount,
-		amountAccountApi
+		amountAccountApi,
+		UserWithdrawApi
 	} from "@/api/supplier.js"
 	export default {
 		data() {
@@ -103,19 +104,16 @@
 				// return
 				let res = await amountAccountApi({})
 				this.balance = res.data.balance
-				// this.hasBindAccount = res.data.hasBindAccount
-				// this.target_bank = res.data.hasBindAccount[0] || {}
+				this.hasBindAccount = res.data.bank_list
+				this.target_bank = res.data.bank_list[0] || {}
+
 			},
 			async submit() {
-				console.log({
-					"merchant_bank_id": this.target_bank.id,
-					"amount": this.form.money
-				})
-				return
 				await UserWithdrawApi({
 					"merchant_bank_id": this.target_bank.id,
 					"amount": this.form.money
 				})
+				return
 				uni.showToast({
 					title: '提交成功',
 					duration: 1500,
diff --git a/utils/requestSupplier.js b/utils/requestSupplier.js
index 287ccc2..508d64a 100644
--- a/utils/requestSupplier.js
+++ b/utils/requestSupplier.js
@@ -118,11 +118,10 @@ function baseRequest(url, method, data, {
 					})
 					reject(res.data);
 				} else if (res.data.code == 1) {
+					reject(res.data, res);
+
+				} else if (res.data.code == 0) {} else {
 					reslove(res.data, res);
-				} else {
-					reslove(res.data, res);
-					// console.error("请求失败", res)
-					// reject(res.data.message || '系统错误');
 				}
 			},
 			fail: (message) => {