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

pages/store/settled/index.vue

@@ -218,10 +218,15 @@
 					<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
 					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
 
-					<view class="contenta">
+					<view class="contenta" v-if="detail.mer_services_agree">
 						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
 
 					</view>
+					<view class="contenta" v-else>
+						<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+					
+					</view>
+					
 					<view class="setAgCountbtn">
 						<button class="setAgCountbtna" @click="refuse">
 							拒绝
@@ -409,7 +414,7 @@
 				})
 			}
 			this.getArea()
-			this.shoplist()
+			
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
@@ -471,9 +476,10 @@
 			},
 
 			//获取商户入驻申请协议
-			shoplist() {
+			shoplist(val) {
+				
 				agreeiness({
-					type: 'mer_services_agree'
+					type: val
 				}).then(res => {
 					this.detail = res.data
 				})
@@ -601,6 +607,13 @@
 				let idx = e.target.value
 				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
 				this.mer_storeType = this.storeTypeArr[idx]['type_name']
+				console.log(this.storeTypeArr[idx]['type_code'] == "TypeStore")
+				if(this.storeTypeArr[idx]['type_code']== 'TypeStore'&&this.merchantData.mer_type){
+					this.shoplist('mer_services_agree')
+				}else{
+					this.shoplist('mer_supply_agree')
+					
+				}
 				this.validateBtn()
 			},