bug fixes

src/components/beforeEnter/Before.js

@@ -17,7 +17,9 @@ export default class Before {
     isLogin && wx.miniProgram.postMessage({ data: { token: store.state.token } })
 
     if (to.meta.requiredLogin && !isLogin) {
-      store.state.isWeapp ? wx.miniProgram.redirectTo({ url: '/pages/login/index' }) : next('/login')
+      store.state.isWeapp
+        ? wx.miniProgram.redirectTo({ url: '/pages/login/index' })
+        : next(`/login?redirect_uri=${encodeURIComponent(window.location.href)}`)
       return
     }
     next()

src/pages/my/alarm/index.vue

@@ -25,8 +25,9 @@
     <van-popup v-model="followPopupVisible" style="border-radius:6px;">
       <div class="qrcode">
         <p>开启学习提醒功能，需先关注紫荆职教公众号。</p>
-        <img src="../../../assets/images/wechat_mp_qrcode.png" />
-        <h5>保存二维码图片，扫码关注</h5>
+        <div class="ui-button" style="margin:40px 0 10px;">
+          <a href="https://mp.weixin.qq.com/s/xcWMbYk5NgzUF3qxLzGTMg">关注公众号</a>
+        </div>
       </div>
     </van-popup>
   </div>

src/pages/my/service.vue

 <template>
   <div class="serv-box">
-    <img class="top-bar" src="../../assets/images/top-bar.png" alt="">
+    <img class="top-bar" src="../../assets/images/top-bar.png" />
     <ul class="contact-info">
       <li>
-        <img src="../../assets/images/ser-icon1.png" alt="">
-        <div class="txt"><span>客服微信:</span> 18610017891</div>
+        <img src="../../assets/images/ser-icon1.png" />
+        <div class="txt">
+          <span>客服微信:</span>
+          <a href="tel:18610017891">18610017891</a>
+        </div>
       </li>
       <li>
-        <img src="../../assets/images/ser-icon2.png" alt="">
-        <div class="txt"><span>客服电话:</span> 18610017891</div>
+        <img src="../../assets/images/ser-icon2.png" />
+        <div class="txt">
+          <span>客服电话:</span>
+          <a href="tel:18610017891">18610017891</a>
+        </div>
       </li>
       <li>
-        <img src="../../assets/images/ser-icon3.png" alt="">
-        <div class="txt"><span>工作时间:</span> 工作日9:00-12:00,13:00-18:00</div>
+        <img src="../../assets/images/ser-icon3.png" />
+        <div class="txt">
+          <span>工作时间:</span> 工作日9:00-12:00,13:00-18:00
+        </div>
       </li>
     </ul>
-    <div class="code">
-      <div class="txt">想了解更多，保存二维码图片，扫码关注我们</div>
-      <img @click="imagePreview" src="https://zws-imgs-pub.ezijing.com/static/public/d720ec7c4eed91788de652fb7962a911.png" alt="">
+    <div class="contact-button" style="margin-bottom:1.66rem;">
+      <a href="https://mp.weixin.qq.com/s/fwDqI1SFrk_bAyUrbLOvhg">客服二维码添加微信</a>
+    </div>
+    <ul class="contact-info">
+      <li>
+        <img src="../../assets/images/ser-icon1.png" />
+        <div class="txt">
+          <span>想了解更多，请关注官方公众号</span>
+        </div>
+      </li>
+    </ul>
+    <div class="contact-button">
+      <a href="https://mp.weixin.qq.com/s/xcWMbYk5NgzUF3qxLzGTMg">关注公众号</a>
     </div>
   </div>
 </template>
 <script>
-import { ImagePreview } from 'vant'
 export default {
-  components: {
-    [ImagePreview.name]: ImagePreview
-  },
   metaInfo: {
     title: '联系客服'
   },
-  methods: {
-    imagePreview() {
-      ImagePreview(['https://zws-imgs-pub.ezijing.com/static/public/d720ec7c4eed91788de652fb7962a911.png'])
-    }
-  }
+  methods: {}
 }
 </script>
 
 <style lang="scss" scoped>
-.top-bar{
+.top-bar {
   width: 100%;
   display: block;
 }
-.contact-info{
-  padding-left: .7rem;
-  padding-top: .2rem;
-  li{
+.contact-info {
+  padding-left: 0.7rem;
+  padding-top: 0.2rem;
+  li {
     display: flex;
-    margin-bottom: .48rem;
-    img{
-      width: .5rem;
-      height: .5rem;
+    margin-bottom: 0.48rem;
+    img {
+      width: 0.5rem;
+      height: 0.5rem;
       display: block;
     }
-    .txt{
-      margin-left: .3rem;
-      line-height: .5rem;
-      font-size:.3rem;
-      color:rgba(34,34,34,1);
-      span{
-        font-weight:bold;
+    .txt {
+      margin-left: 0.3rem;
+      line-height: 0.5rem;
+      font-size: 0.3rem;
+      color: rgba(34, 34, 34, 1);
+      span {
+        font-weight: bold;
       }
     }
   }
 }
-.code{
-  margin-top: .84rem;
-  .txt{
-    text-align: center;
-    font-weight:bold;
-    color:rgba(34,34,34,1);
-    line-height:100%;
-    font-size: .3rem;
-  }
-  img{
-    width: 4.3rem;
+.contact-button {
+  margin: 0.88rem 0.4rem;
+  height: 40px;
+  color: #fff;
+  line-height: 40px;
+  text-align: center;
+  background-color: #af1b40;
+  border-radius: 6px;
+  a {
     display: block;
-    margin: .25rem auto;
   }
 }
 </style>

src/style.scss

@@ -170,3 +170,14 @@ body {
 .van-empty__description {
   padding: 0 20px !important;
 }
+.ui-button {
+  height: 40px;
+  color: #fff;
+  line-height: 40px;
+  text-align: center;
+  background-color: #af1b40;
+  border-radius: 6px;
+  a {
+    display: block;
+  }
+}