Merge branch 'develop' of http://10.30.11.113/web/msr into develop

src/views/marketing/merchant/index.vue

@@ -110,21 +110,21 @@ export default {
           { prop: 'servicePhone', label: '服务商电话', width: 100, align: 'center' },
           { label: '门店认证状态', type: 'tag', render: ({ authStatus }) => authStatus
             ? {
-              type: 'success',
-              label: '已认证'
-            }
-            : {
               type: 'danger',
               label: '未认证'
+            }
+            : {
+              type: 'success',
+              label: '已认证'
             }, size: 'sm', width: 92 },
           { label: '中通有投门店', type: 'tag', render: ({ status }) => status
             ? {
-              type: 'success',
-              label: '是'
-            }
-            : {
               type: 'danger',
               label: '否'
+            }
+            : {
+              type: 'success',
+              label: '是'
             }, size: 'sm', width: 92 },
           { type: 'invoke', render: [
             { label: '编辑', on: this.onView },