Ana Sayfa Keşfet Yardım
Giriş Yap
zhengjinyi
/
caimei-authentic-manager
2
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

管理员审核状态样式调整

yuwenjun1997 2 yıl önce
ebeveyn
af789f0b5f
işleme
e33b04b38e
19 değiştirilmiş dosya ile 165 ekleme ve 122 silme
Birleşik Görünüm Farklılık Durumunu Göster
  1. 5 6
      public/index.html
  2. 6 8
      src/views/admin/audit/club/device/index.vue
  3. 2 2
      src/views/admin/audit/club/index.vue
  4. 7 9
      src/views/admin/audit/club/list.vue
  5. 20 4
      src/views/admin/audit/club/review.vue
  6. 2 2
      src/views/admin/audit/device/index.vue
  7. 6 8
      src/views/admin/audit/device/list.vue
  8. 6 8
      src/views/admin/audit/material/article/index.vue
  9. 7 15
      src/views/admin/audit/material/file/index.vue
  10. 6 8
      src/views/admin/audit/material/image/index.vue
  11. 2 2
      src/views/admin/audit/material/index.vue
  12. 7 15
      src/views/admin/audit/material/package/index.vue
  13. 5 7
      src/views/admin/audit/material/video/index.vue
  14. 2 2
      src/views/admin/audit/personnel/index.vue
  15. 6 8
      src/views/admin/audit/personnel/operate/index.vue
  16. 6 8
      src/views/admin/audit/personnel/training/index.vue
  17. 27 4
      src/views/admin/logistics-licensed/club/detail.vue
  18. 20 4
      src/views/normal/audit/club/review.vue
  19. 23 2
      src/views/normal/club/edit.vue

+ 5 - 6
public/index.html
Dosyayı Görüntüle 

@@ -7,16 +7,15 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
 
     <title><%= webpackConfig.name %></title>
 
     <title><%= webpackConfig.name %></title>
 
-    <script
 
-      type="text/javascript"
 
-      src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=vsIfSztpPmCtmBRfRiIAM57hbxBQbmgQ"
 
-    ></script>
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
       window._AMapSecurityConfig = {
 
       window._AMapSecurityConfig = {
 
-        securityJsCode: '0eff43c06afaa04ad39df64276c2e375'
 
+        securityJsCode: 'ff3114e0be935539f0ca5c9a80406752'
 
       }
 
       }
 
     </script>
 
     </script>
 
-    <script src="https://webapi.amap.com/loader.js"></script>
 
+    <script
 
+      type="text/javascript"
 
+      src="https://webapi.amap.com/maps?v=2.0&key=eae3be059db26dc1f9cae1d1bee9d4cb"
 
+    ></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 6 - 8
src/views/admin/audit/club/device/index.vue
Dosyayı Görüntüle 

@@ -40,18 +40,16 @@
 
       <el-table-column prop="snCode" label="设备SN码" align="center" />

       <el-table-column prop="snCode" label="设备SN码" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 2 - 2
src/views/admin/audit/club/index.vue
Dosyayı Görüntüle 

@@ -58,8 +58,8 @@
 
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.lowerAuditStatus === 0" size="small" type="danger">未完成审核</el-tag>

-          <el-tag v-if="row.lowerAuditStatus === 1" size="small" type="success">已完成审核</el-tag>

+          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>

+          <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

       <el-table-column label="操作" width="240px" align="center">

       <el-table-column label="操作" width="240px" align="center">

+ 7 - 9
src/views/admin/audit/club/list.vue
Dosyayı Görüntüle 

@@ -43,25 +43,23 @@
 
       <el-table-column prop="authParty" label="机构名称" align="center" />

       <el-table-column prop="authParty" label="机构名称" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

                 <span class="el-icon-question status danger" />

                 <span class="el-icon-question status danger" />

-              </el-tag>

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

       <el-table-column label="商品信息审核状态" width="160px" align="center">

       <el-table-column label="商品信息审核状态" width="160px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.lowerAuditStatus === 0" size="small" type="danger">未完成审核</el-tag>

-          <el-tag v-if="row.lowerAuditStatus === 1" size="small" type="success">已完成审核</el-tag>

+          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>

+          <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 20 - 4
src/views/admin/audit/club/review.vue
Dosyayı Görüntüle 

@@ -21,7 +21,7 @@
 
         <div class="row">

         <div class="row">

           <div class="col">所在位置：</div>

           <div class="col">所在位置：</div>

           <div class="col">

           <div class="col">

-            <div class="map" @click="dialogMapVisible = true">

+            <div class="map" @click="initMap">

               <i class="el-icon-map-location" />

               <i class="el-icon-map-location" />

               <span>点击查看</span>

               <span>点击查看</span>

             </div>

             </div>

@@ -137,18 +137,21 @@
 
     <!-- 地图坐标拾取 -->

     <!-- 地图坐标拾取 -->

     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">

     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">

       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->

       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->

-      <map-ui :init-point="clubInfo.lngAndLat" />

+      <!-- <map-ui :init-point="clubInfo.lngAndLat" /> -->

+      <a-map ref="aMap" :lnglat="lnglat" />

     </el-dialog>

     </el-dialog>

   </div>

   </div>

 </template>

 </template>

 

 

 <script>

 <script>

 import AMapUI from '@/components/AMapUI'

 import AMapUI from '@/components/AMapUI'

+import SimpleAMap from '@/components/SimpleAMap'

 import { getAuthFormData, auditAuth } from '@/api/auth'

 import { getAuthFormData, auditAuth } from '@/api/auth'

 import { mapGetters } from 'vuex'

 import { mapGetters } from 'vuex'

 export default {

 export default {

   components: {

   components: {

-    [AMapUI.name]: AMapUI

+    [AMapUI.name]: AMapUI,

+    [SimpleAMap.name]: SimpleAMap

   },

   },

   data() {

   data() {

     return {

     return {

@@ -204,13 +207,26 @@ export default {
 
     }

     }

   },

   },

   computed: {

   computed: {

-    ...mapGetters(['authUserId'])

+    ...mapGetters(['authUserId']),

+    // 位置坐标

+    lnglat() {

+      return this.clubInfo.lngAndLat ? this.clubInfo.lngAndLat.split(',') : null

+    }

   },

   },

   created() {

   created() {

     this.auditForm.authId = this.$route.query.authId

     this.auditForm.authId = this.$route.query.authId

     this.getDetail()

     this.getDetail()

   },

   },

   methods: {

   methods: {

+    // 地图定位

+    initMap() {

+      this.dialogMapVisible = true

+      if (this.lnglat) {

+        this.$nextTick(() => {

+          this.$refs.aMap.init()

+        })

+      }

+    },

     // 数据回显

     // 数据回显

     getDetail() {

     getDetail() {

       getAuthFormData({ authId: this.auditForm.authId }).then((res) => {

       getAuthFormData({ authId: this.auditForm.authId }).then((res) => {

+ 2 - 2
src/views/admin/audit/device/index.vue
Dosyayı Görüntüle 

@@ -58,8 +58,8 @@
 
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column label="审核状态" width="220px" align="center">

       <el-table-column label="审核状态" width="220px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.lowerAuditStatus === 0" size="small" type="danger">未完成审核</el-tag>

-          <el-tag v-if="row.lowerAuditStatus === 1" size="small" type="success">已完成审核</el-tag>

+          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>

+          <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

       <el-table-column label="操作" width="240px" align="center">

       <el-table-column label="操作" width="240px" align="center">

+ 6 - 8
src/views/admin/audit/device/list.vue
Dosyayı Görüntüle 

@@ -32,18 +32,16 @@
 
       <el-table-column prop="name" label="设备名称" align="center" />

       <el-table-column prop="name" label="设备名称" align="center" />

       <el-table-column label="审核状态" width="220px" align="center">

       <el-table-column label="审核状态" width="220px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 6 - 8
src/views/admin/audit/material/article/index.vue
Dosyayı Görüntüle 

@@ -38,18 +38,16 @@
 
       </el-table-column>

       </el-table-column>

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 7 - 15
src/views/admin/audit/material/file/index.vue
Dosyayı Görüntüle 

@@ -44,24 +44,16 @@
 
       <el-table-column label="文件名称" prop="fileTitle" align="center" />

       <el-table-column label="文件名称" prop="fileTitle" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

-            <el-popover

-              placement="top-start"

-              title="审核说明"

-              width="400"

-              trigger="hover"

-              :content="row.invalidReason"

-            >

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 6 - 8
src/views/admin/audit/material/image/index.vue
Dosyayı Görüntüle 

@@ -35,18 +35,16 @@
 
       <el-table-column label="图片标题" prop="imageTitle" align="center" />

       <el-table-column label="图片标题" prop="imageTitle" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 2 - 2
src/views/admin/audit/material/index.vue
Dosyayı Görüntüle 

@@ -58,8 +58,8 @@
 
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column label="审核状态" width="150px" align="center">

       <el-table-column label="审核状态" width="150px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.lowerAuditStatus === 0" size="small" type="danger">未完成审核</el-tag>

-          <el-tag v-if="row.lowerAuditStatus === 1" size="small" type="success">已完成审核</el-tag>

+          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>

+          <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

       <el-table-column label="待审核" width="460px" align="center">

       <el-table-column label="待审核" width="460px" align="center">

+ 7 - 15
src/views/admin/audit/material/package/index.vue
Dosyayı Görüntüle 

@@ -44,24 +44,16 @@
 
       <el-table-column label="文件名称" prop="fileTitle" align="center" />

       <el-table-column label="文件名称" prop="fileTitle" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

-            <el-popover

-              placement="top-start"

-              title="审核说明"

-              width="400"

-              trigger="hover"

-              :content="row.invalidReason"

-            >

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+            <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 5 - 7
src/views/admin/audit/material/video/index.vue
Dosyayı Görüntüle 

@@ -35,18 +35,16 @@
 
       <el-table-column label="视频名称" prop="videoTitle" align="center" />

       <el-table-column label="视频名称" prop="videoTitle" align="center" />

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

                 <span class="el-icon-question status danger" />

                 <span class="el-icon-question status danger" />

-              </el-tag>

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 2 - 2
src/views/admin/audit/personnel/index.vue
Dosyayı Görüntüle 

@@ -58,8 +58,8 @@
 
       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column prop="linkMan" label="联系人" width="200px" align="center" />

       <el-table-column label="审核状态" width="220px" align="center">

       <el-table-column label="审核状态" width="220px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.lowerAuditStatus === 0" size="small" type="danger">未完成审核</el-tag>

-          <el-tag v-if="row.lowerAuditStatus === 1" size="small" type="success">已完成审核</el-tag>

+          <span v-if="row.lowerAuditStatus === 0" class="status danger">未完成审核</span>

+          <span v-if="row.lowerAuditStatus === 1" class="status success">已完成审核</span>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

       <el-table-column label="操作" width="320px" align="center">

       <el-table-column label="操作" width="320px" align="center">

+ 6 - 8
src/views/admin/audit/personnel/operate/index.vue
Dosyayı Görüntüle 

@@ -39,18 +39,16 @@
 
 

 

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 6 - 8
src/views/admin/audit/personnel/training/index.vue
Dosyayı Görüntüle 

@@ -39,18 +39,16 @@
 
 

 

       <el-table-column label="审核状态" width="120px" align="center">

       <el-table-column label="审核状态" width="120px" align="center">

         <template slot-scope="{ row }">

         <template slot-scope="{ row }">

-          <el-tag v-if="row.auditStatus === 2" size="small" type="warning">待审核</el-tag>

-          <el-tag v-if="row.auditStatus === 1" size="small" type="success">审核通过</el-tag>

+          <span v-if="row.auditStatus === 2" class="status warning">待审核</span>

+          <span v-if="row.auditStatus === 1" class="status success">审核通过</span>

           <!-- 未通过原因展示 -->

           <!-- 未通过原因展示 -->

           <template v-if="row.auditStatus === 0">

           <template v-if="row.auditStatus === 0">

-            <!-- <span class="status danger">审核未通过&nbsp;</span> -->

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

             <el-popover placement="top-start" title="审核说明" width="400" trigger="hover" :content="row.invalidReason">

-              <el-tag slot="reference" size="small" type="danger" class="reason">

-                <span>审核未通过</span>

-                <span class="el-icon-question status danger " />

-              </el-tag>

+              <template slot="reference">

+                <span class="status danger">审核未通过</span>

+                <span class="el-icon-question status danger" />

+              </template>

             </el-popover>

             </el-popover>

-            <!-- 未通过原因展示END -->

           </template>

           </template>

         </template>

         </template>

       </el-table-column>

       </el-table-column>

+ 27 - 4
src/views/admin/logistics-licensed/club/detail.vue
Dosyayı Görüntüle 

@@ -21,7 +21,7 @@
 
         <div class="row">
 
         <div class="row">
 
           <div class="col">所在位置：</div>
 
           <div class="col">所在位置：</div>
 
           <div class="col">
 
           <div class="col">
 
-            <div class="map" @click="dialogMapVisible = true">
 
+            <div class="map" @click="initMap">
 
               <i class="el-icon-map-location" />
 
               <i class="el-icon-map-location" />
 
               <span>点击查看</span>
 
               <span>点击查看</span>
 
             </div>
 
             </div>
 
@@ -31,7 +31,12 @@
 
       <div class="row">
 
       <div class="row">
 
         <div class="col">logo：</div>
 
         <div class="col">logo：</div>
 
         <div class="col">
 
         <div class="col">
 
-          <el-image v-if="clubInfo.logo" style="width: 120px; height: 120px" :src="clubInfo.logo" :preview-src-list="[clubInfo.logo]" />
 
+          <el-image
 
+            v-if="clubInfo.logo"
 
+            style="width: 120px; height: 120px"
 
+            :src="clubInfo.logo"
 
+            :preview-src-list="[clubInfo.logo]"
 
+          />
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div class="row">
 
       <div class="row">
 
@@ -132,17 +137,20 @@
 
     <!-- 地图坐标拾取 -->
 
     <!-- 地图坐标拾取 -->
 
     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">
 
     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">
 
       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->
 
       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->
 
-      <map-ui :init-point="clubInfo.lngAndLat" />
 
+      <!-- <map-ui :init-point="clubInfo.lngAndLat" /> -->
 
+      <a-map ref="aMap" :lnglat="lnglat" />
 
     </el-dialog>
 
     </el-dialog>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
 import AMapUI from '@/components/AMapUI'
 
 import AMapUI from '@/components/AMapUI'
 
+import SimpleAMap from '@/components/SimpleAMap'
 
 import { getAuthFormData } from '@/api/auth'
 
 import { getAuthFormData } from '@/api/auth'
 
 export default {
 
 export default {
 
   components: {
 
   components: {
 
-    [AMapUI.name]: AMapUI
 
+    [AMapUI.name]: AMapUI,
 
+    [SimpleAMap.name]: SimpleAMap
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -187,11 +195,26 @@ export default {
 
       }
 
       }
 
     }
 
     }
 
   },
 
   },
 
+  computed: {
 
+    // 位置坐标
 
+    lnglat() {
 
+      return this.clubInfo.lngAndLat ? this.clubInfo.lngAndLat.split(',') : null
 
+    }
 
+  },
 
   created() {
 
   created() {
 
     this.authId = this.$route.query.id
 
     this.authId = this.$route.query.id
 
     this.getDetail()
 
     this.getDetail()
 
   },
 
   },
 
   methods: {
 
   methods: {
 
+    // 地图定位
 
+    initMap() {
 
+      this.dialogMapVisible = true
 
+      if (this.lnglat) {
 
+        this.$nextTick(() => {
 
+          this.$refs.aMap.init()
 
+        })
 
+      }
 
+    },
 
     // 数据回显
 
     // 数据回显
 
     getDetail() {
 
     getDetail() {
 
       getAuthFormData({ authId: this.authId }).then((res) => {
 
       getAuthFormData({ authId: this.authId }).then((res) => {

+ 20 - 4
src/views/normal/audit/club/review.vue
Dosyayı Görüntüle 

@@ -21,7 +21,7 @@
 
         <div class="row">
 
         <div class="row">
 
           <div class="col">所在位置：</div>
 
           <div class="col">所在位置：</div>
 
           <div class="col">
 
           <div class="col">
 
-            <div class="map" @click="dialogMapVisible = true">
 
+            <div class="map" @click="initMap">
 
               <i class="el-icon-map-location" />
 
               <i class="el-icon-map-location" />
 
               <span>点击查看</span>
 
               <span>点击查看</span>
 
             </div>
 
             </div>
 
@@ -138,18 +138,21 @@
 
     <!-- 地图坐标拾取 -->
 
     <!-- 地图坐标拾取 -->
 
     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">
 
     <el-dialog class="map-dialog" title="地图信息" :visible.sync="dialogMapVisible" width="80%">
 
       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->
 
       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->
 
-      <map-ui :init-point="clubInfo.lngAndLat" />
 
+      <!-- <map-ui :init-point="clubInfo.lngAndLat" /> -->
 
+      <a-map ref="aMap" :lnglat="lnglat" />
 
     </el-dialog>
 
     </el-dialog>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
 import AMapUI from '@/components/AMapUI'
 
 import AMapUI from '@/components/AMapUI'
 
+import SimpleAMap from '@/components/SimpleAMap'
 
 import { getAuthFormData, auditAuth } from '@/api/auth'
 
 import { getAuthFormData, auditAuth } from '@/api/auth'
 
 import { mapGetters } from 'vuex'
 
 import { mapGetters } from 'vuex'
 
 export default {
 
 export default {
 
   components: {
 
   components: {
 
-    [AMapUI.name]: AMapUI
 
+    [AMapUI.name]: AMapUI,
 
+    [SimpleAMap.name]: SimpleAMap
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -206,13 +209,26 @@ export default {
 
     }
 
     }
 
   },
 
   },
 
   computed: {
 
   computed: {
 
-    ...mapGetters(['authUserId'])
 
+    ...mapGetters(['authUserId']),
 
+    // 位置坐标
 
+    lnglat() {
 
+      return this.clubInfo.lngAndLat ? this.clubInfo.lngAndLat.split(',') : null
 
+    }
 
   },
 
   },
 
   created() {
 
   created() {
 
     this.auditForm.authId = this.$route.query.authId
 
     this.auditForm.authId = this.$route.query.authId
 
     this.getDetail()
 
     this.getDetail()
 
   },
 
   },
 
   methods: {
 
   methods: {
 
+    // 地图定位
 
+    initMap() {
 
+      this.dialogMapVisible = true
 
+      if (this.lnglat) {
 
+        this.$nextTick(() => {
 
+          this.$refs.aMap.init()
 
+        })
 
+      }
 
+    },
 
     // 数据回显
 
     // 数据回显
 
     getDetail() {
 
     getDetail() {
 
       getAuthFormData({ authId: this.auditForm.authId }).then((res) => {
 
       getAuthFormData({ authId: this.auditForm.authId }).then((res) => {

+ 23 - 2
src/views/normal/club/edit.vue
Dosyayı Görüntüle 

@@ -26,7 +26,7 @@
 
           placeholder="请输入经纬度 （格式：纬度,经度，可通过右侧地图小按钮获取）"

           placeholder="请输入经纬度 （格式：纬度,经度，可通过右侧地图小按钮获取）"

           clearable

           clearable

         >

         >

-          <el-button slot="append" icon="el-icon-map-location" @click="dialogMapVisible = true" />

+          <el-button slot="append" icon="el-icon-map-location" @click="initMap" />

         </el-input>

         </el-input>

       </el-form-item>

       </el-form-item>

       <el-form-item label="联系电话:" prop="mobile">

       <el-form-item label="联系电话:" prop="mobile">

@@ -128,7 +128,8 @@
 
       width="80%"

       width="80%"

     >

     >

       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->

       <!-- <location v-if="dialogMapVisible" :init-point="formData.point" @point="handlePointChange" /> -->

-      <map-ui v-if="dialogMapVisible" :init-point="formData.point" :address="locationAddress" @change="markerChange" />

+      <!-- <map-ui v-if="dialogMapVisible" :init-point="formData.point" :address="locationAddress" @change="markerChange" /> -->

+      <a-map ref="aMap" :lnglat="lnglat" :address="locationAddress" @position="onPosition" />

       <div slot="footer" class="dialog-footer">

       <div slot="footer" class="dialog-footer">

         <el-button type="primary" size="mini" @click="dialogMapVisible = false">确 定</el-button>

         <el-button type="primary" size="mini" @click="dialogMapVisible = false">确 定</el-button>

       </div>

       </div>

@@ -139,6 +140,7 @@
 
 <script>

 <script>

 // import Location from '@/components/location'

 // import Location from '@/components/location'

 import AMapUI from '@/components/AMapUI'

 import AMapUI from '@/components/AMapUI'

+import SimpleAMap from '@/components/SimpleAMap'

 import UploadImage from '@/components/UploadImage'

 import UploadImage from '@/components/UploadImage'

 import { mapGetters } from 'vuex'

 import { mapGetters } from 'vuex'

 import { saveBrandAuth, getAuthFormData } from '@/api/auth'

 import { saveBrandAuth, getAuthFormData } from '@/api/auth'

@@ -149,6 +151,7 @@ export default {
 
   components: {

   components: {

     // Location

     // Location

     [AMapUI.name]: AMapUI,

     [AMapUI.name]: AMapUI,

+    [SimpleAMap.name]: SimpleAMap,

     UploadImage

     UploadImage

   },

   },

   data() {

   data() {

@@ -256,7 +259,12 @@ export default {
 
     },

     },

     // 定位使用的地址

     // 定位使用的地址

     locationAddress() {

     locationAddress() {

+      // 广东省/深圳市/福田区景峰大厦

       return this.address + this.formData.fullAddress

       return this.address + this.formData.fullAddress

+    },

+    // 位置坐标

+    lnglat() {

+      return this.formData.point ? this.formData.point.split(',') : null

     }

     }

   },

   },

   created() {

   created() {

@@ -265,6 +273,19 @@ export default {
 
     this.initFormData()

     this.initFormData()

   },

   },

   methods: {

   methods: {

+    // 地图定位

+    initMap() {

+      this.dialogMapVisible = true

+      this.$nextTick(() => {

+        this.$refs.aMap.init()

+      })

+    },

+

+    // 获取位置坐标

+    onPosition(lnglat) {

+      this.formData.point = `${lnglat.lng},${lnglat.lat}`

+    },

+

     // 自定义属性修改

     // 自定义属性修改

     custromizeFormChange(data) {

     custromizeFormChange(data) {

       this.customValue = data.name

       this.customValue = data.name