Merge branch 'dev' of git.gicdev.com:dm4/welfare into dev

# Conflicts:
#	dist/css/chunk-e4115e52.a5f9b5b8.css
#	dist/css/gic-card.56f7c349.css
#	dist/index.html
#	dist/js/app.69fd8bcb.js
#	dist/js/chunk-e2c4e4f8.fa28121e.js
#	dist/js/chunk-e4115e52.ff7d36a7.js
#	dist/js/chunk-e4115e52.ffe2c90f.js

src/views/card/gic-card/member-get.vue

@@ -45,8 +45,8 @@
       </el-table-column>
       <el-table-column label="卡券信息" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
-          <p p-key="couponId" :title="scope.row.couponId">{{ scope.row.couponCode }}</p>
-          <p class="fz12 gray03">卡券代码</p>
+          <p p-key="couponId" :title="scope.row.couponId">{{ scope.row.cardName }}</p>
+          <p class="fz12">{{ scope.row.couponCode }}</p>
         </template>
       </el-table-column>
       <el-table-column label="使用状态" min-width="120" show-overflow-tooltip>
@@ -73,7 +73,9 @@
       </el-table-column>
       <el-table-column label="来源明细" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
-          <div v-html="formatChannel(scope.row)"></div>
+          <p class="fz14">{{ scope.row.appName }}</p>
+          <p class="fz10">{{scope.row.activityName}}</p>
+          <!-- <div v-html="formatChannel(scope.row)"></div> -->
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" width="130px" fixed="right">