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

src/pages/login/login.vue

@@ -120,6 +120,10 @@ export default {
       }
     },
     wechatLogin() {
+<<<<<<< HEAD
+      if (this.$route.query.t) { return false }
+=======
+>>>>>>> 692bee4e3ffffd3425e9f36018cd8a7d9adaa976
       const appId = 'wx451c01d40d090d7a'
       // 回调地址
       const redirectURI = `https://passport.ezijing.com/rest/wechat/oauth-callback?needCheck=false&identity=transport&redirectUrl=${window.location.href}`
@@ -137,6 +141,13 @@ export default {
       )
     }
   },
+<<<<<<< HEAD
+  created() {
+    if (this.isWechat) {
+      this.redirectUrl = `${window.location.origin}/login?t=1`
+      this.wechatLogin()
+    }
+=======
   beforeMount() {
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
@@ -147,6 +158,7 @@ export default {
         }
       }
     })
+>>>>>>> 692bee4e3ffffd3425e9f36018cd8a7d9adaa976
   }
 }
 </script>

src/pages/my/buyCourses.vue

@@ -10,13 +10,37 @@
               程标题道路旅客运输企业
             </div>
           </div>
+          <div class="deti">
+            <div class="tit">课程状态：</div>
+            <div class="val">已付款/未付款</div>
+          </div>
+          <div class="deti">
+            <div class="tit">共计：</div>
+            <div class="val">$199.00</div>
+          </div>
+          <div class="deti">
+            <div class="val col">
+              继续购买
+            </div>
+          </div>
         </li>
       </ul>
     </div>
   </div>
 </template>
 <script>
+import * as api from '@/api/pay.js'
 export default {
+  mounted() {
+    this.getMyOrder()
+  },
+  methods: {
+    getMyOrder() {
+      api.getMyOrder().then(res => {
+        console.log(res)
+      })
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -30,6 +54,7 @@ export default {
     img{
       width: 2.4rem;
       height: 2.4rem;
+      display: block;
     }
     .txt{
       margin-left: .2rem;
@@ -38,5 +63,22 @@ export default {
       word-wrap: break-word;
     }
   }
+  .deti{
+    display: flex;
+    margin-bottom: .4rem;
+    .tit{
+      font-size: .26rem;
+      color: #222;
+    }
+    .val{
+      font-size: .26rem;
+      color: #222;
+      margin-left: auto;
+    }
+    .col{
+      color: #FF6767;
+      font-size: .3rem;
+    }
+  }
 }
 </style>