Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!236

src/views/business/marketing/add.vue

@@ -1,5 +1,9 @@
 <template>
-  <div>1111</div>
+  <div>1111
+
+  222
+  </div>
+
 </template>
 
 <script>

src/views/business/marketing/index.vue

@@ -60,6 +60,7 @@
       <el-table-column label="状态" prop="status">
         <template slot-scope="{row}">
           <el-tag :type="JSON.parse(row.status).value === 'on' ? 'success' : 'info'">{{ JSON.parse(row.status).desc }}</el-tag>
+
         </template>
       </el-table-column>
       <el-table-column fixed="right" align="right" label="操作" width="240">

src/views/order/userTicket/detail.vue

@@ -79,7 +79,8 @@
           </div>
           <div class="info-item-content-one">
             <div class="title">经销商：</div>
-            <div class="txt">{{ info.channelName }}</div>
+            <div class="txt" v-if="info.channelName">{{ info.channelName }}</div>
+            <div class="txt" v-else>--</div>
           </div>
         </div>
       </div>

src/views/order/userTicket/index.vue

@@ -157,7 +157,12 @@
           <div>{{ row.nickName }}/{{ row.phone }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="经销商" prop="channelName" min-width="95" />
+      <el-table-column label="经销商" prop="channelName" min-width="95" >
+        <template slot-scope="{ row }">
+          <div v-if="row.channelName">{{ row.channelName }}</div>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>>
       <el-table-column label="操作" fixed="right" align="center" width="80">
         <template slot-scope="{ row }">
           <div>