From 1ec92593ced2bb4a398d28698ebd1c04823380c4 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Sat, 23 Sep 2023 20:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=95=86=E5=9F=8E=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E4=BB=A5=E5=8F=8A=E7=94=9F=E4=BA=A7=E5=8D=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                           |  1 +
 api/store.js                      | 13 +----
 api/user.js                       |  9 ++++
 pages/moreProject/moreProject.vue | 32 +++++-------
 pages/store/settled/index.vue     | 82 +++++++++++++++++--------------
 pages/user/index.vue              |  4 ++
 6 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/App.vue b/App.vue
index e273265..d56d2d7 100644
--- a/App.vue
+++ b/App.vue
@@ -164,6 +164,7 @@
 				// console.log("jpush连接", connectEnable)
 			})
 
+
 			// 设置别名
 			// jpushModule.setAlias({
 			// 	'alias': uni.getStorageSync('userId'),
diff --git a/api/store.js b/api/store.js
index 1e3af0d..3659801 100644
--- a/api/store.js
+++ b/api/store.js
@@ -577,20 +577,9 @@ export function vicinityStoreApi(data) {
 /*
 	商家入驻 -- 获取商户入驻申请协议内容
 */
-export function agreeiness() {
+export function agreeiness(data) {
   return request.get(`business/agree`, data, { noAuth: true });
 }
 
-//测试
-export function dotest() {
-  return request.get(`dotest`,{}, { noAuth: true });
-}
-
-/*
-	生产 -- 商户保证金信息接口
-*/
-export function merchant() {
-  return request.get(`store/merchant/margin`, data, { noAuth: true });
-}
 
 
diff --git a/api/user.js b/api/user.js
index 0009c40..4594d26 100644
--- a/api/user.js
+++ b/api/user.js
@@ -8,6 +8,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
+
+import request1 from "@/utils/requestb.js";
 import Cache from '@/utils/cache'
 /**
  * 获取版本信息
@@ -721,3 +723,10 @@ export function getBillDetil() {
   return request.get(`mer/financial_record`)
 }
 
+
+
+//获取商户入驻所签署公司
+
+export function merstreet(data) {
+  return request1.get(`company/street_company`, data);
+}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index c75b9c2..810b95d 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -383,8 +383,6 @@
 					</view>
 				</view>
 
-
-
 			</view>
 
 			<view class="" v-else>
@@ -416,7 +414,7 @@
 			<emptyPage title="暂无信息"></emptyPage>
 		</view>
 		<view class="settlementAgreement" v-if="isFshow">
-			<view class="setAgCount">
+			<view class="setAgCount" style="width: 100%;height: 100%;">
 				<i class="icon iconfont icon-cha" @click="recuo"></i>
 				<div class="title">{{detail.title}}</div>
 
@@ -651,9 +649,9 @@
 			},
 			//缴纳保证金
 			paydecimal() {
-				if (this.merchant_Data.is_margin == 2) {
-					that.$util.Tips({
-						title: '用户已提交'
+				if (this.merchant_Data.is_margin != 1) {
+					this.$util.Tips({
+						title: '暂时无需缴纳保证金'
 					});
 				} else {
 
@@ -669,7 +667,7 @@
 									uni.requestPayment({
 										provider: 'wxpay',
 										orderInfo: res.data
-										.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
 										success: function(res) {
 											console.log('success:' + JSON.stringify(res));
 										},
@@ -903,8 +901,6 @@
 			},
 
 			navigator(url, t) {
-
-
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
 					this.isFshow = true
 					this.countDown()
@@ -1196,7 +1192,7 @@
 		position: absolute;
 		top: 50%;
 		left: 50%;
-		border-radius: 12rpx;
+
 		-webkit-border-radius: 12rpx;
 		padding: 52rpx;
 		-webkit-transform: translate(-50%, -50%);
@@ -1241,7 +1237,7 @@
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-		height: 756rpx;
+		height: 1050rpx;
 		overflow-y: scroll;
 	}
 
@@ -1254,12 +1250,7 @@
 		text-align: justify;
 		text-justify: distribute-all-lines;
 
-		/*#ifdef H5*/
-		height: 600rpx;
-		/*#endif*/
-		/*#ifdef APP-PLUS*/
-		height: 530rpx;
-		/*#endif*/
+		height: 1050rpx;
 
 		overflow-y: scroll;
 
@@ -1272,7 +1263,7 @@
 
 		.setAgCountbtna {
 			margin-top: 40rpx;
-			width: 150rpx;
+			width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
@@ -1290,13 +1281,12 @@
 			margin-top: 40rpx;
 			padding-left: 20rpx;
 			padding-right: 20rpx;
-			height: 74rpx;
+
 			text-align: center;
 			line-height: 74rpx;
 			background: #cecece;
 			border-radius: 46rpx 46rpx;
 			opacity: 1;
-
 			font-size: 25rpx;
 			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
@@ -1306,7 +1296,7 @@
 
 		.setAgCountbtnc {
 			margin-top: 40rpx;
-			width: 150rpx;
+			width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 150d84a..38fa10e 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -126,8 +126,8 @@
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">法人名称</text>
-							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name" @input="validateBtn"
-								placeholder-class='placeholder' />
+							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
+								@input="validateBtn" placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
@@ -192,10 +192,11 @@
 			</view>
 		</view>
 		<view class="settlementAgreement" v-if="isshow">
-			<view class="setAgCount">
+			<view class="setAgCount" style="width: 100%;height: 100%;">
+				<view style="margin-bottom: 30rpx;">所属公司:{{company?company:"暂无公司信息"}}</view>
 				<i class="icon iconfont icon-cha" @click="recuo"></i>
 				<div class="title">{{detail.title}}</div>
-				
+
 				<view class="contenta">
 					<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
 
@@ -205,8 +206,7 @@
 						拒绝
 					</button>
 
-
-					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="isshow=false">
+					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="formSubmit">
 						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
 						<text v-else>同意</text>
 
@@ -254,7 +254,8 @@
 	} from '@/api/store.js';
 	import {
 		getCaptcha,
-		getAgreementApi
+		getAgreementApi,
+		merstreet
 	} from "@/api/user";
 	import {
 		getStreet,
@@ -282,6 +283,7 @@
 		},
 		data() {
 			return {
+				company: '',
 				domain: HTTP_REQUEST_URL,
 				cartId: '', //购物车id
 				pinkId: 0, //拼团id
@@ -344,7 +346,7 @@
 				},
 				mer_i_id: null, // 商户申请id
 				isType: false,
-				num: 15,
+				num: 10,
 				detail: {}
 			};
 		},
@@ -375,16 +377,18 @@
 			this.getArea()
 			this.shoplist()
 		},
-		onShow() {},
+		onShow() {
+			
+		},
 		onReady() {},
 		methods: {
 			//关闭弹窗
 			recuo() {
 				if (this.num > 0) {
-					this.num = 15
+					this.num = 10
 					this.isshow = false
 				} else {
-					this.num = 15
+					this.num = 10
 					this.isshow = false
 				}
 			},
@@ -410,7 +414,7 @@
 						return
 					}
 					if (this.isshow == false && this.num > 0) {
-						this.num = 15
+						this.num = 10
 						return
 					}
 					this.countDown();
@@ -421,8 +425,9 @@
 
 			//获取商户入驻申请协议
 			shoplist() {
-				agreeiness({type:'mer_services_agree'}).then(res => {
-					// console.log(res)
+				agreeiness({
+					type: 'mer_services_agree'
+				}).then(res => {
 					this.detail = res.data
 				})
 			},
@@ -489,8 +494,8 @@
 				that.isType = true
 				getAgreementApi('sys_merchant_type').then(res => {
 					that.protocol = res.data.sys_merchant_type
-					
-				
+
+
 				})
 			},
 			// 获取历史提交数据详情
@@ -553,12 +558,19 @@
 			},
 
 			bindPickerChange2: function(e) {
+				// console.log(e.detail)
 				this.index2 = e.detail.value
 				this.business_name =
 					`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}`
 				this.area_id = this.business[0][this.index2[0]].code
 				this.street_id = this.business[1][this.index2[1]].code
-				this.village_id = this.business[2][this.index2[2]].id
+
+				merstreet({
+					street_code: this.street_id
+				}).then((res) => {
+					this.company=res.data.title
+				
+				})
 			},
 			// 获取商户分类
 			getClassfication: function() {
@@ -639,7 +651,7 @@
 			 */
 			DelPic: function(index) {
 				let that = this,
-				pic = this.pics[index];
+					pic = this.pics[index];
 				that.pics.splice(index, 1);
 				that.$set(that, 'pics', that.pics);
 			},
@@ -719,15 +731,18 @@
 				this.isAgree = !this.isAgree;
 				this.validateBtn();
 			},
+			//所属公司
+
+
 			//协议弹窗
 			showxy() {
 				this.isshow = true
 			},
 
 			formSubmit: function(e) {
-				console.log(this.mer_storeType)
 
-				if (this.num == 0||this.mer_storeType=='镇级供应链') {
+
+				if (this.num == 0) {
 
 					let that = this;
 					if (that.validateForm() && that.validate) {
@@ -760,6 +775,7 @@
 									}, 1000)
 								}
 							}).catch(res => {
+								this.isshow = false
 								that.validate = true;
 								that.$util.Tips({
 									title: res
@@ -842,7 +858,7 @@
 				if (!value.classification) return that.$util.Tips({
 					title: '请选择商户分类'
 				});
-			
+
 				if (!this.mer_storeType) return that.$util.Tips({
 					title: '请选择商户类型'
 				})
@@ -855,11 +871,11 @@
 				if (that.isShowCode && !that.codeVal) return that.$util.Tips({
 					title: '请填写图片验证码'
 				});
-				if (that.pics.length==0 ) return that.$util.Tips({
+				if (that.pics.length == 0) return that.$util.Tips({
 					title: '请上传一张或者多张图片'
 				});
-				
-				
+
+
 				that.validate = true;
 				return true;
 			},
@@ -1239,8 +1255,7 @@
 		position: absolute;
 		top: 50%;
 		left: 50%;
-		border-radius: 12rpx;
-		-webkit-border-radius: 12rpx;
+
 		padding: 52rpx;
 		-webkit-transform: translate(-50%, -50%);
 		-moz-transform: translate(-50%, -50%);
@@ -1296,14 +1311,7 @@
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-
-		/*#ifdef H5*/
-		height: 600rpx;
-		/*#endif*/
-		/*#ifdef APP-PLUS*/
-		height: 530rpx;
-		/*#endif*/
-
+		height: 1000rpx;
 		overflow-y: scroll;
 
 
@@ -1315,7 +1323,7 @@
 
 		.setAgCountbtna {
 			margin-top: 40rpx;
-			width: 150rpx;
+			width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
@@ -1336,7 +1344,7 @@
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
-			background:#cecece;
+			background: #cecece;
 			border-radius: 46rpx 46rpx;
 			opacity: 1;
 
@@ -1349,7 +1357,7 @@
 
 		.setAgCountbtnc {
 			margin-top: 40rpx;
-			width: 150rpx;
+			width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 0f97ec5..4c4120c 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -196,10 +196,14 @@
 			<view v-if="copyright.status !== -1" class="copy-right">
 				<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
 				<view class="text">{{copyright.Copyright}}</view>
+				<view class="">备案号:蜀ICP备2022030133号-2A</view>
+				<view class="">增值电信营业许可证号:川B2-20221250</view>
+				
 			</view>
 			<view v-else class="copy-right">
 				<view class="iconfont icon-crmeb"></view>
 				<view class="text">众邦科技提供技术支持</view>
+				
 			</view>
 			<view style="height: 50rpx;"></view>
 			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"