Merge branch 'new' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into new

pages/store/settled/index.vue

@@ -39,7 +39,8 @@
 								<view class="uni-list-cell">
 									<view class="uni-list-cell-db acea-row row-middle">
 										<text class="item-name">商户分类</text>
-                    <picker @change="bindPickerChange" @columnchange="columnchange" mode="selector" :value="index" :range="array" range-key="category_name">
+										<picker @change="bindPickerChange" @columnchange="columnchange" mode="selector"
+											:value="index" :range="array" range-key="category_name">
 											<input placeholder="请选择商户分类" type="text" readonly disabled
 												v-model="mer_classification">
 											<view class='iconfont icon-jiantou'></view>
@@ -103,13 +104,13 @@
 								<view class="uni-list-cell">
 									<view class="uni-list-cell-db acea-row row-middle">
 										<text class="item-name">公司性质</text>
-                    <picker @change="natureBusinessChange" mode="selector" :value="index" :range="companyTypeList">
+										<picker @change="natureBusinessChange" mode="selector" :value="index"
-                    	<input v-if="nature_business==1" placeholder="请选择公司性质" type="text" readonly disabled
+											:range="companyTypeList">
-                    		value="对公户">
+											<input v-if="nature_business==1" placeholder="请选择公司性质" type="text" readonly
-                      <input v-else-if="nature_business==2" placeholder="请选择公司性质" type="text" readonly disabled
+												disabled value="对公户">
-                      	value="个体户">
+											<input v-else-if="nature_business==2" placeholder="请选择公司性质" type="text"
-                      <input v-else placeholder="请选择公司性质" type="text" readonly disabled
+												readonly disabled value="个体户">
-                      	value="">
+											<input v-else placeholder="请选择公司性质" type="text" readonly disabled value="">
 											<view class='iconfont icon-jiantou'></view>
 										</picker>
 									</view>
@@ -124,7 +125,8 @@
 									<view v-if="business_license" class='pictrue' @click='uploadpicText'>
 										<image :src='business_license'></image>
 									</view>
-            			<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicText'>
+									<view v-else class='pictrue acea-row row-center-wrapper row-column'
+										@click='uploadpicText'>
 										<text class='iconfont icon-icon25201'></text>
 										<view>上传图片</view>
 									</view>
@@ -298,11 +300,12 @@
 			</form>
 			<view class="settlementAgreement" v-if="showProtocol">
 				<view class="setAgCount" style="width: 656rpx;height: 458px;">
-					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+					<view class="close" @click="showProtocol = false">
+						<u-icon name="close-circle-fill" color="#B4B1B4" size="24"></u-icon>
+					</view>
 					<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
 					<view class="content">
 						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
-						<!-- <view v-html="protocol"></view> -->
 					</view>
 				</view>
 			</view>
@@ -333,7 +336,8 @@
 						<!-- <button class="setAgCountbtna" @click="refuse">
 							拒绝
 						</button> -->
-						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0" @click="agree">
+						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
+							@click="agree">
 							<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
 							<text v-else>同意本协议</text>
 						</button>
@@ -407,7 +411,9 @@
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
-import { Toast } from '../../../libs/uniApi';
+	import {
+		Toast
+	} from '../../../libs/uniApi';
 	const app = getApp();
 	export default {
 		components: {
@@ -521,8 +527,7 @@ import { Toast } from '../../../libs/uniApi';
 				this.$nextTick(function() {
 					this.getGoodsDetails(options.mer_i_id)
 				})
-			}
+			} else this.getArea()
-			else this.getArea()
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
@@ -1022,7 +1027,8 @@ import { Toast } from '../../../libs/uniApi';
 						bank_code: this.merchantData.bank_code,
 						bank: this.merchantData.bank_username,
 						bank_branch: this.merchantData.bank_opening,
-            name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData.bank_card_username,
+						name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData
+							.bank_card_username,
 						bank_front: [this.bank_front]
 					}
 				}
@@ -1633,6 +1639,12 @@ import { Toast } from '../../../libs/uniApi';
 		}
 	}
 
+	.settlementAgreement .setAgCount .close {
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
 	.settlementAgreement .setAgCount .icon {
 		font-size: 42rpx;
 		color: #b4b1b4;
@@ -1649,19 +1661,16 @@ import { Toast } from '../../../libs/uniApi';
 	}
 
 	.settlementAgreement .setAgCount .content {
-
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-
 		overflow-y: scroll;
+		padding-bottom: 20rpx;
 	}
 
-
 	.settlementAgreement .setAgCount .contenta {
-
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
@@ -1669,8 +1678,6 @@ import { Toast } from '../../../libs/uniApi';
 		text-justify: distribute-all-lines;
 		height: 75%;
 		overflow-y: scroll;
-
-
 	}
 
 	.setAgCountbtn {
@@ -1735,7 +1742,8 @@ import { Toast } from '../../../libs/uniApi';
 			width: 100vw;
 			height: 100%;
 			border-radius: 40rpx 40rpx 0 0;
-      box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
+			box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
+			/* 在上边框添加阴影 */
 		}
 
 		.btn {