Merge branch 'main' of https://git.gpxscs.cn/front/merchapp

java-mall-app-shop-admin/pages.json

@@ -23,8 +23,10 @@
       "path": "pages/audit/shop1",
       "style": {
         "navigationStyle": "custom",
+        "disableSwipeBack ": true,
         "app-plus": {
-          "titleNView": false
+          "titleNView": false,
+          "popGesture": "none"
         }
       }
     },
@@ -49,7 +51,11 @@
     {
       "path": "pages/audit/checkAudit",
       "style": {
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "disableSwipeBack ": true,
+        "app-plus": {
+          "popGesture": "none"
+        }
       }
     },
     {

java-mall-app-shop-admin/pages/audit/checkAudit.vue

@@ -1621,7 +1621,7 @@ export default {
   }
 
   .btn-login-out {
-    font-size: 28rpx;
+    font-size: 24rpx;
     color: $base-color;
   }
 

java-mall-app-shop-admin/pages/audit/shop1.vue

@@ -478,7 +478,7 @@ export default {
   }
 
   .btn-login-out {
-    font-size: 28rpx;
+   font-size: 24rpx;
     color: $base-color;
   }
 

java-mall-app-shop-admin/pages/audit/shop3.vue

@@ -57,7 +57,7 @@
         </u-form-item>
 
         <template
-          v-if="entity_type == 1 || (bankCardFiles.length && bankCardOcrLoaded)"
+          v-if="(bankCardFiles.length && bankCardOcrLoaded)"
         >
           <u-form-item label="开户名称" required prop="account_holder_name">
             <u-input
@@ -629,7 +629,7 @@ export default {
   }
 
   .btn-login-out {
-    font-size: 28rpx;
+   font-size: 24rpx;
     color: $base-color;
   }