Merge remote-tracking branch 'origin/master'

src/views/adv/conversionLog/index.vue

@@ -61,14 +61,14 @@
       <el-table-column label="系统回传事件" align="center" prop="sysConversionEvent" min-width="150" show-overflow-tooltip />
       <el-table-column label="广告商回传类型" align="center" prop="advConversionEvent" min-width="150" show-overflow-tooltip />
       <el-table-column label="站点ID" align="center" prop="siteId" width="100" />
-      <el-table-column label="着陆页" align="center" prop="landingUrl" min-width="200" show-overflow-tooltip>
+      <!-- <el-table-column label="着陆页" align="center" prop="landingUrl" min-width="200" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link v-if="scope.row.landingUrl" :href="scope.row.landingUrl" target="_blank" type="primary">
             {{ scope.row.landingUrl }}
           </el-link>
           <span v-else>-</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="回传时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>

src/views/adv/promotionAccount/index.vue

@@ -217,7 +217,7 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item v-if="form.advertiserId !== 10002" label="应用授权链接" prop="authUrl" class="slide-fade">
+            <el-form-item v-if="form.advertiserId !== 10002 && form.advertiserId !== 10004" label="应用授权链接" prop="authUrl" class="slide-fade">
               <el-input 
                 v-model="form.authUrl" 
                 placeholder="请输入应用授权链接"

src/views/qw/externalContact/index.vue

@@ -454,6 +454,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="广告业务ID" align="center" prop="traceId" />
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">