Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/pages/course/tag/index.vue

@@ -105,12 +105,21 @@ export default {
     },
     searchTag(keywords) {
       api.getSearchTagList({ keywords }).then(response => {
-        this.messageList.push({
-          id: this.genId(),
-          type: 2,
-          from: 'system',
-          payload: response
-        })
+        if (response.length) {
+          this.messageList.push({
+            id: this.genId(),
+            type: 2,
+            from: 'system',
+            payload: response
+          })
+        } else {
+          this.messageList.push({
+            id: this.genId(),
+            type: 0,
+            from: 'system',
+            payload: { text: '找不到相关内容' }
+          })
+        }
       })
     },
     onChangeTag(data) {

src/pages/course/tag/item.vue

@@ -7,6 +7,11 @@
       <div class="course-tag-main">
         <div class="tag-content" v-html="html"></div>
       </div>
+      <div class="tools">
+        <ul>
+          <li @click="toExamPage">知识点考试</li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
@@ -50,6 +55,15 @@ export default {
         this.detail = response
         this.$toast.clear()
       })
+    },
+    // 去知识点考试页面
+    toExamPage() {
+      const query = {
+        type: 2,
+        tag_id: this.detail.id,
+        papersUrl: 'zy/v2/examination/course-papers'
+      }
+      this.$router.push({ path: '/exam/answer', query })
     }
   },
   beforeMount() {
@@ -90,4 +104,22 @@ export default {
   font-size: 13px;
   line-height: 24px;
 }
+.tools {
+  margin-top: 5px;
+  li {
+    display: inline-block;
+    height: 24px;
+    margin: 0 10px 10px 0;
+    padding: 0 15px;
+    font-size: 13px;
+    color: #fff;
+    line-height: 24px;
+    background: #67a8ff;
+    border-radius: 12px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    cursor: pointer;
+  }
+}
 </style>

src/pages/course/tag/tagMessage.vue

 <template>
-  <div class="tag-message" :class="classes">
-    <div class="tag-message-bd">
-      <div class="tag-message-content" ref="content" v-html="html"></div>
+  <div>
+    <div class="tag-message" :class="classes">
+      <div class="tag-message-bd">
+        <div class="tag-message-content" ref="content" v-html="html"></div>
+      </div>
+      <div class="more" @click="viewMore" v-if="hasMore">
+        <template v-if="!showMore">
+          <span>更多</span>
+          <van-icon name="arrow-down"></van-icon>
+        </template>
+        <template v-else>
+          <span>收起</span>
+          <van-icon name="arrow-up"></van-icon>
+        </template>
+      </div>
     </div>
-    <div class="more" @click="viewMore" v-if="hasMore">
-      <template v-if="!showMore">
-        <span>更多</span>
-        <van-icon name="arrow-down"></van-icon>
-      </template>
-      <template v-else>
-        <span>收起</span>
-        <van-icon name="arrow-up"></van-icon>
-      </template>
+    <div class="tools">
+      <ul>
+        <li @click="toExamPage">知识点考试</li>
+      </ul>
     </div>
   </div>
 </template>
@@ -50,6 +57,15 @@ export default {
     },
     viewMore() {
       this.$router.push({ name: 'courseTagItem', params: { id: this.data.id } })
+    },
+    // 去知识点考试页面
+    toExamPage() {
+      const query = {
+        type: 2,
+        tag_id: this.data.id,
+        papersUrl: 'zy/v2/examination/course-papers'
+      }
+      this.$router.push({ path: '/exam/answer', query })
     }
   },
   mounted() {
@@ -80,4 +96,22 @@ export default {
   text-align: center;
   cursor: pointer;
 }
+.tools {
+  margin-top: 5px;
+  li {
+    display: inline-block;
+    height: 24px;
+    margin: 0 10px 10px 0;
+    padding: 0 15px;
+    font-size: 13px;
+    color: #fff;
+    line-height: 24px;
+    background: #67a8ff;
+    border-radius: 12px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    cursor: pointer;
+  }
+}
 </style>

src/pages/login/login.vue

@@ -62,7 +62,7 @@ export default {
       return query.redirect_uri ? decodeURIComponent(query.redirect_uri) : ''
     },
     showPage() {
-      return this.isWechat ? this.checkWechatLogin() : true
+      return this.isWechat ? !!Cookies.get('wechat_login_no_phone_error') : true
     }
   },
   methods: {
@@ -134,6 +134,11 @@ export default {
       const wechatUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(
         redirectURI
       )}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+      // 移除cookie
+      Cookies.remove('wechat_login_error', { domain: '.ezijing.com' })
+      Cookies.remove('wechat_login_no_phone_error', {
+        domain: '.ezijing.com'
+      })
       // 打开地址
       window.location.href = wechatUrl
     },
@@ -144,14 +149,18 @@ export default {
       )
     }
   },
-  created() {
-    console.log(process.env, webConf)
+  beforeMount() {
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
         this.loginSuccess({ code: 0, data: { TGC: Cookies.get('TGC') } }, 1)
       } else {
-        if (this.isWechat && !this.checkWechatLogin()) {
-          this.wechatLogin()
+        if (this.isWechat) {
+          if (Cookies.get('wechat_login_error')) {
+            Cookies.remove('wechat_login_error', { domain: '.ezijing.com' })
+            wx.miniProgram.navigateBack({ delta: 2 })
+          } else {
+            this.wechatLogin()
+          }
         }
       }
     })

src/pages/search/videoList.vue

@@ -4,7 +4,7 @@
       <ul>
         <li v-for="item in list" :key="item.id" @click="onClick(item)">
           <div class="pic">
-            <img />
+            <img :src="item.url" />
             <div class="cover"></div>
           </div>
           <div class="text">{{item.chapter_name}}</div>
@@ -94,6 +94,11 @@ export default {
     width: 3rem;
     height: 1.7rem;
     border-radius: 6px;
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
   }
   .cover {
     position: absolute;