From fbcd367cc69ca4c80cd56080e31410f84bdfbaaa Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Fri, 13 Oct 2023 18:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/settled/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index fbc3aa0..4c09a5b 100644
--- a/pages/store/settled/index.vue
+++ b/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">
 							拒绝
@@ -604,7 +609,7 @@
 				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('sys_intention_agree')
+					this.shoplist('mer_services_agree')
 				}else{
 					this.shoplist('mer_supply_agree')