From 9f8402f14ee05067d5d397e1f71501fd670dcfa0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 19 Sep 2023 16:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/merchantAudit/merchantAudit.vue |  7 ++++---
 pages/oaExamine/oaExamine.vue              |  1 +
 subpkg/merchantDetails/merchantDetails.vue | 10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/components/merchantAudit/merchantAudit.vue b/components/merchantAudit/merchantAudit.vue
index 6bbe981..e313176 100644
--- a/components/merchantAudit/merchantAudit.vue
+++ b/components/merchantAudit/merchantAudit.vue
@@ -24,15 +24,15 @@
       </view>
       <view class="b_item">
         <view>商户分类:</view>
-        <view>{{datas.category_name}}</view>
+        <view>{{extend.category_name}}</view>
       </view>
       <view class="b_item">
         <view>店铺类型:</view>
-        <view>{{datas.type_name}}</view>
+        <view>{{extend.type_name}}</view>
       </view>
       <view class="b_item">
         <view>店铺名称:</view>
-        <view>{{datas.mer_name}}</view>
+        <view>{{extend.mer_name}}</view>
       </view>
       <view class="b_item">
         <view>联系方式:</view>
@@ -70,6 +70,7 @@
       try{
         this.extend = this.$props.datas?.extend;
         this.extend.qualification?this.extend.qualification=JSON.parse(this.extend.qualification):this.extend.qualification=[];
+        this.extend.qualification = this.extend.qualification.slice(0,3);
       }catch(e){
         //TODO handle the exception
       }
diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue
index a273b6a..d2724f3 100644
--- a/pages/oaExamine/oaExamine.vue
+++ b/pages/oaExamine/oaExamine.vue
@@ -76,6 +76,7 @@
             name: item.title
           })
         })
+        this.check_status = this.typeTabLists[0].id;
         this.$nextTick(()=>{
           this.initList();
         })
diff --git a/subpkg/merchantDetails/merchantDetails.vue b/subpkg/merchantDetails/merchantDetails.vue
index 93ab4e6..fa353e6 100644
--- a/subpkg/merchantDetails/merchantDetails.vue
+++ b/subpkg/merchantDetails/merchantDetails.vue
@@ -22,15 +22,15 @@
           </view>
           <view class="b_item">
             <view>商户分类:</view>
-            <view>{{formData.category_name}}</view>
+            <view>{{extend.category_name}}</view>
           </view>
           <view class="b_item">
             <view>店铺类型:</view>
-            <view>{{formData.type_name}}</view>
+            <view>{{extend.type_name}}</view>
           </view>
           <view class="b_item">
             <view>店铺名称:</view>
-            <view>{{formData.mer_name}}</view>
+            <view>{{extend.mer_name}}</view>
           </view>
           <view class="b_item">
             <view>申请时间:</view>
@@ -78,7 +78,7 @@
         </view>
       </view>
     </view>
-    <block v-if="formData.check_status!=2&&formData.check_status!=3&&true">
+    <block v-if="formData.check_status!=2&&formData.check_status!=3&&formData.check_status">
       <button class="btn" @click="tipShow = true">通过</button>
       <button class="btn" @click="modalShow = true" style="background-color: #fff;color: #0122c7;">拒绝</button>
     </block>
@@ -169,6 +169,7 @@
         this.tipShow = false;
         this.$nextTick(() => {
           Toast('已通过');
+          this.initData();
         })
       },
       async noPass() {
@@ -181,6 +182,7 @@
         this.modalShow = false;
         this.$nextTick(() => {
           Toast('已拒绝');
+          this.initData();
         })
       },
       priview(url) {