页面修改

layouts/app-hyt.vue

@@ -444,7 +444,7 @@ export default {
       min-height: calc(100vh - 80px);
       background-color: #f7f7f7;
       overflow: hidden;
-      margin-bottom: 80px;
+      // margin-bottom: 80px;
     }
 
     .footer {

pages/_template/app/approve/device/detail.vue

@@ -46,7 +46,7 @@
           <template v-for="item in productInfo.clubList">
             <div class="auth-info" :key="item.authId">
               <span>该设备由</span>
-              <span class="font-bold">ROS'S</span>
+              <span class="font-bold">{{ supplierInfo.shopName }}</span>
               <span>官方授权</span>
               <span>{{ item.authParty }}</span>
             </div>
@@ -90,21 +90,25 @@
 
 <script>
 import deviceDetailMixin from '@/mixins/deviceDetail'
+import { mapGetters } from 'vuex'
 export default {
   layout: 'app-normal',
   mixins: [deviceDetailMixin],
+  computed: {
+    ...mapGetters(['supplierInfo']),
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 ::v-deep {
   .swiper-pagination-bullet {
-    background: #BC1724 !important;
+    background: #bc1724 !important;
   }
 
   .simple-swiper {
     .swiper-pagination-bullet-active {
-      background: #BC1724;
+      background: #bc1724;
     }
   }
 }
@@ -327,7 +331,7 @@ export default {
         .auth {
           width: 100%;
           min-height: 114px;
-          background: #BC1724;
+          background: #bc1724;
           margin-top: 56px;
           box-sizing: border-box;
           padding: 24px;
@@ -371,7 +375,7 @@ export default {
             position: absolute;
             width: 73px;
             height: 2px;
-            background: #BC1724;
+            background: #bc1724;
             left: 0;
             bottom: 0;
           }
@@ -613,7 +617,7 @@ export default {
           // width: 100%;
           margin: 0 4vw;
           min-height: 20vw;
-          background: #BC1724;
+          background: #bc1724;
           margin-top: 4vw;
           box-sizing: border-box;
           padding: 5.2vw 4vw;

pages/_template/app/form/club-bind.vue

@@ -145,7 +145,7 @@ export default {
 
     // 确认
     onConfirm() {
-      this.$router.replace(this.routePrefix)
+      this.routePrefix + `/approve/club/detail?id=${this.formData.authId}`
     },
 
     onDialogClosed() {

pages/_template/hyt/approve/device/detail.vue

@@ -30,8 +30,8 @@
           </div>
           <div class="row">
             <!-- <span>产地：{{ productInfo.producePlace }}</span> -->
-            <span>品牌：{{ productInfo.brandName }}</span
-            ><i></i><span>产地：{{ productInfo.producePlace }}</span>
+            <span class="brand">品牌：{{ productInfo.brandName }}</span>
+            <span class="place">产地：{{ productInfo.producePlace }}</span>
             <!-- <span>品牌：RÖS'S</span><i></i><span>产地：西班牙巴塞罗那</span> -->
           </div>
           <div class="sncode pc">
@@ -46,7 +46,7 @@
           <template v-for="item in productInfo.clubList">
             <div class="auth-info" :key="item.authId">
               <span>该设备由</span>
-              <span class="font-bold">ROS'S</span>
+              <span class="font-bold">{{ supplierInfo.shopName }}</span>
               <span>官方授权</span>
               <span>{{ item.authParty }}</span>
             </div>
@@ -90,21 +90,25 @@
 
 <script>
 import deviceDetailMixin from '@/mixins/deviceDetail'
+import { mapGetters } from 'vuex'
 export default {
   layout: 'app-hyt',
   mixins: [deviceDetailMixin],
+  computed: {
+    ...mapGetters(['supplierInfo']),
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 ::v-deep {
   .swiper-pagination-bullet {
-    background: #4093B5 !important;
+    background: #4093b5 !important;
   }
 
   .simple-swiper {
     .swiper-pagination-bullet-active {
-      background: #4093B5;
+      background: #4093b5;
     }
   }
 }
@@ -287,8 +291,19 @@ export default {
         .maker {
           margin-bottom: 16px;
         }
+
+        .brand,
+        .place {
+          display: block;
+        }
+
+        .brand {
+          margin-bottom: 8px;
+        }
+
         .row {
           line-height: 24px;
+
           i {
             position: relative;
             margin: 0 16px;
@@ -327,7 +342,7 @@ export default {
         .auth {
           width: 100%;
           min-height: 114px;
-          background: #4093B5;
+          background: #4093b5;
           margin-top: 56px;
           box-sizing: border-box;
           padding: 24px;
@@ -371,7 +386,7 @@ export default {
             position: absolute;
             width: 73px;
             height: 2px;
-            background: #4093B5;
+            background: #4093b5;
             left: 0;
             bottom: 0;
           }
@@ -604,6 +619,15 @@ export default {
           margin-bottom: 1.2vw;
         }
 
+        .brand,
+        .place {
+          display: block;
+        }
+
+        .brand {
+          margin-bottom: 1.2vw;
+        }
+
         .supplier,
         .maker {
           font-size: 3.6vw;
@@ -614,7 +638,7 @@ export default {
           // width: 100%;
           margin: 0 4vw;
           min-height: 20vw;
-          background: #4093B5;
+          background: #4093b5;
           margin-top: 4vw;
           box-sizing: border-box;
           padding: 5.2vw 4vw;

pages/_template/hyt/form/club-bind.vue

@@ -145,12 +145,14 @@ export default {
 
     // 确认
     onConfirm() {
-      this.$router.replace(this.routePrefix)
+      this.$router.push(
+        this.routePrefix + `/approve/club/detail?id=${this.formData.authId}`
+      )
     },
 
     onDialogClosed() {
       if (this.resultStatus === 0) {
-        this.$router.replace(this.routePrefix)
+        this.$router.push(this.routePrefix)
       }
     },
 
@@ -169,7 +171,7 @@ export default {
           type: 'warning',
         })
       } finally {
-        this.$router.replace(this.routePrefix)
+        this.$router.push(this.routePrefix)
       }
     },
     // 提交

pages/_template/hyt/index.vue

@@ -20,13 +20,13 @@
             <span class="icon icon-device"></span>
             <span class="text">设备认证</span>
           </nuxt-link>
-          <nuxt-link
+          <!-- <nuxt-link
             :to="routePrefix + '/approve/personnel/operate'"
             class="link flex items-center flex-col md:mt-6 mt-4"
           >
             <span class="icon icon-doctor"></span>
             <span class="text">体疗师认证</span>
-          </nuxt-link>
+          </nuxt-link> -->
         </div>
 
         <div class="filter">
@@ -175,7 +175,7 @@ export default {
     & > {
       .el-input.is-active .el-input__inner,
       .el-input__inner:focus {
-        border-color: #4093B5;
+        border-color: #4093b5;
       }
     }
   }
@@ -185,7 +185,8 @@ export default {
 @media screen and (min-width: 768px) {
   .page {
     position: relative;
-    min-height: calc(100vh - 80px - 80px);
+    // min-height: calc(100vh - 80px);
+    min-height: 120vh;
     background-color: #fff;
   }
   .page-top {
@@ -204,7 +205,7 @@ export default {
       color: #404040;
 
       span {
-        color: #4093B5;
+        color: #4093b5;
       }
     }
 
@@ -249,18 +250,18 @@ export default {
             &.icon-device {
               background: url(~assets/theme-images/hyt/pc/nav-entry-device-active.png)
                   no-repeat center center,
-                linear-gradient(180deg, #4BB9E6 0%, #4093B5 100%);
+                linear-gradient(180deg, #4bb9e6 0%, #4093b5 100%);
               background-size: 48px, 100%;
             }
             &.icon-doctor {
               background: url(~assets/theme-images/hyt/pc/nav-entry-doctor-active.png)
                   no-repeat center center,
-                linear-gradient(180deg, #4BB9E6 0%, #4093B5 100%);
+                linear-gradient(180deg, #4bb9e6 0%, #4093b5 100%);
               background-size: 48px, 100%;
             }
           }
           .text {
-            color: #4093B5;
+            color: #4093b5;
           }
         }
 
@@ -415,7 +416,7 @@ export default {
       color: #404040;
 
       span {
-        color: #4093B5;
+        color: #4093b5;
       }
     }
 
@@ -444,7 +445,7 @@ export default {
         width: 7.2vw;
         height: 7.2vw;
         border-radius: 1.2vw;
-        background: linear-gradient(180deg, #4BB9E6 0%, #4093B5 100%);
+        background: linear-gradient(180deg, #4bb9e6 0%, #4093b5 100%);
 
         &.icon-device,
         &.icon-doctor {
@@ -478,7 +479,7 @@ export default {
 
       .text {
         font-size: 2.4vw;
-        color: #4093B5;
+        color: #4093b5;
         margin-top: 1.2vw;
       }
     }

pages/_template/ph/form/club-bind.vue

@@ -141,7 +141,7 @@ export default {
 
     // 确认
     onConfirm() {
-      this.$router.replace(this.routePrefix)
+      this.routePrefix + `/approve/club/detail?id=${this.formData.authId}`
     },
 
     onDialogClosed() {

pages/_template/ross/form/club-bind.vue

@@ -141,7 +141,7 @@ export default {
 
     // 确认
     onConfirm() {
-      this.$router.replace(this.routePrefix)
+      this.routePrefix + `/approve/club/detail?id=${this.formData.authId}`
     },
 
     onDialogClosed() {