From bed3f521d0dd9f5a14072d46c487962e9620f3c5 Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Thu, 26 Jun 2025 17:56:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5BU?=
 =?UTF-8?q?G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sameCityTransport/sameCityTransport.js | 12 +++++-------
 src/views/product/goodsTool/index.vue          |  2 +-
 src/views/store/shopAudit/shopAuditDetails.vue | 10 ++++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/sameCityTransport/sameCityTransport.js b/src/api/sameCityTransport/sameCityTransport.js
index 22363a7..8855fc0 100644
--- a/src/api/sameCityTransport/sameCityTransport.js
+++ b/src/api/sameCityTransport/sameCityTransport.js
@@ -1,8 +1,7 @@
 import request from '@/utils/request'
 import { URL } from '@/config'
 
-
-export function getSameCityTransport(params){
+export function getSameCityTransport(params) {
   return request({
     url: URL.shop.store.sameCityTransport.getSameCityTransport,
     method: 'get',
@@ -10,7 +9,7 @@ export function getSameCityTransport(params){
   })
 }
 
-export function delectArea(params){
+export function delectArea(params) {
   return request({
     url: URL.shop.store.sameCityTransport.delectArea,
     method: 'post',
@@ -18,8 +17,7 @@ export function delectArea(params){
   })
 }
 
-
-export function saveSameCityTransport(params){
+export function saveSameCityTransport(params) {
   params = JSON.stringify(params)
   return request({
     url: URL.shop.store.sameCityTransport.saveSameCityTransport,
@@ -27,11 +25,11 @@ export function saveSameCityTransport(params){
     headers: {
       'Content-Type': 'application/json',
     },
-    data:params,
+    data: params,
   })
 }
 
-export function getSFTypeList(params){
+export function getSFTypeList(params) {
   return request({
     url: URL.shop.store.sameCityTransport.getSFTypeList,
     method: 'get',
diff --git a/src/views/product/goodsTool/index.vue b/src/views/product/goodsTool/index.vue
index 2f626a4..b7a4dd3 100644
--- a/src/views/product/goodsTool/index.vue
+++ b/src/views/product/goodsTool/index.vue
@@ -173,7 +173,7 @@ export default {
   },
   methods: {
     handleSearch(){
-      this.pagination.pageNum = 0;
+      this.pagination.pageNum = 1;
       this.pagination.pageSize = 10;
       this.getGoodsList()
     },
diff --git a/src/views/store/shopAudit/shopAuditDetails.vue b/src/views/store/shopAudit/shopAuditDetails.vue
index 4f392f6..c91fdce 100644
--- a/src/views/store/shopAudit/shopAuditDetails.vue
+++ b/src/views/store/shopAudit/shopAuditDetails.vue
@@ -651,6 +651,7 @@
         提交拉卡拉审核
       </el-button>
       <el-button
+      v-if="form.approval_status != 1"
         class="btn"
         type="danger"
         
@@ -665,7 +666,7 @@
         class="btn btn-hetong"
         type="success"
         @click="createShop()"
-        v-if="form.store_status!=1 && form.approval_status == 1"
+        v-if="form.has_apply_mer == 1 &&  form.approval_status == 5 && form.has_apply_split == 2 && form.store_status == 2"
       >
         创建店铺
       </el-button>
@@ -673,9 +674,9 @@
         class="btn btn-hetong"
         type="success"
         @click="createSubAccount()"
-        v-if=" form.has_apply_mer ==1 && form.has_apply_split != 1"
+        v-if=" form.approval_status == 5 && form.has_apply_mer ==1 && form.has_apply_split != 1"
       >
-        创建分账
+        分账业务申请
       </el-button>
       <el-button class="btn" @click="close()">取消</el-button>
     </div>
@@ -871,6 +872,7 @@ export default {
   },
   methods: {
     async getMerchDetail() {
+
       this.showLoading = true
       let res = await getMerchDetail({ id: this.id })
       if (res && res.status == 200) {
@@ -979,7 +981,7 @@ export default {
       }
 
       let msg =
-        status == 1
+        status == 5
           ? '此操作将通过审核，是否继续？'
           : '此操作将驳回审核，是否继续？'