Merge remote-tracking branch 'origin/master'

src/views/course/courseWatchLog/index.vue

@@ -1127,14 +1127,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      // 如果用户没有手动选择是否为会员，则根据 qwUserId 自动判断
-      if (this.queryParams.isVip === null || this.queryParams.isVip === undefined || this.queryParams.isVip === '') {
-        if (this.queryParams.qwUserId) {
-          this.queryParams.isVip = 1; // 有 qwUserId 则为会员
-        } else if (this.queryParams.qwUserId === null || this.queryParams.qwUserId === '') {
-          this.queryParams.isVip = 0; // 没有 qwUserId 则不是会员
-        }
-      }
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/course/courseWatchLog/watchLog.vue

@@ -1064,15 +1064,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      // 如果用户没有手动选择是否为会员，则根据 qwUserId 自动判断
-      if (this.queryParams.isVip === null || this.queryParams.isVip === undefined || this.queryParams.isVip === '') {
-        if (this.queryParams.qwUserId) {
-          this.queryParams.isVip = 1; // 有 qwUserId 则为会员
-        } else if (this.queryParams.qwUserId === null || this.queryParams.qwUserId === '') {
-          this.queryParams.isVip = 0; // 没有 qwUserId 则不是会员
-        }
-      }
-
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/qw/sopLogs/sopLogsList.vue

@@ -175,6 +175,7 @@
                 <span v-if="item.contentType == 5">文件</span>
                 <span v-if="item.contentType == 6">视频</span>
                 <span v-if="item.contentType == 7">语音</span>
+                <span v-if="item.contentType == 8">视频号</span>
                 <span v-if="item.contentType == 9">APP</span>
                 <span v-if="item.contentType == 10">自定义小程序</span>
                 <span v-if="item.contentType == 4"><el-button size="mini" type="primary" @click="generateShortLink(item)" style="margin-left: 330px;">生成短链</el-button></span>