save

src/views/shop/shop-list.vue

@@ -109,12 +109,16 @@
             <span>{{ scope.row.tradeStore.storeType | storeTypeFormat}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="storeType" label="审核状态" min-width="100" align="center">
+        <el-table-column prop="storeType" label="店铺状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span :class="scope.row.tradeStore.certifyStatus == 4 ? 'red' : 'green'">
+            <span v-if="scope.row.tradeStore.storeType != 2" :class="scope.row.tradeStore.certifyStatus == 4 ? 'red' : 'green'">
               {{ scope.row.tradeStore.certifyStatus | storeStatusFormat}}
             </span>
+            <span v-else>
+            上线
+            </span>
             <el-popover
+              v-if="scope.row.tradeStore.storeType != 2"
               placement="top-start"
               width="200"
               trigger="hover"
@@ -124,11 +128,6 @@
 
           </template>
         </el-table-column>
-        <el-table-column prop="storeStatus" label="店铺状态" min-width="100" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.tradeStore.storeStatus | statusFormat }}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="count" label="已上架商品数" min-width="120" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.tradeStore.count }}</span>