chore:登录优化;我的页面增加菜单;

src/pages/login/login.vue

@@ -10,10 +10,10 @@
       </div>
       <div class="login-bd">
         <div class="login-form">
-          <!-- 账号登录 -->
-          <!-- <account-login ref="form" @submit="onSubmit" v-if="!this.isWechat"></account-login> -->
           <!-- 验证码登录 -->
-          <code-login ref="form" @submit="onSubmit"></code-login>
+          <code-login ref="form" @submit="onSubmit" v-if="isWechat"></code-login>
+          <!-- 账号登录 -->
+          <account-login ref="form" @submit="onSubmit" v-else></account-login>
           <div class="login-button" @click="handleSubmit">立即绑定</div>
         </div>
       </div>
@@ -75,7 +75,7 @@ export default {
     },
     // 登录
     loginRequest(data) {
-      const params = Object.assign({}, this.ruleForm, data)
+      const params = Object.assign({}, this.ruleForm, data, { type: 1 })
       api
         .login(params)
         .then(response => {
@@ -88,6 +88,7 @@ export default {
     // 绑定微信并登录
     bindWechat(data) {
       const params = Object.assign({}, this.ruleForm, data, {
+        type: 2,
         identity: 'transport',
         unionid: this.unionid,
         code: data.password
@@ -153,10 +154,7 @@ export default {
       window.location.href = wechatUrl
     },
     checkWechatLogin() {
-      return !!(
-        Cookies.get('wechat_login_error') ||
-        Cookies.get('wechat_login_no_phone_error')
-      )
+      return !!(Cookies.get('wechat_login_error') || Cookies.get('wechat_login_no_phone_error'))
     },
     // 显示登录提示框
     showLoginDialog() {
@@ -244,11 +242,7 @@ export default {
   font-size: 12px;
   color: #fff;
   line-height: 40px;
-  background: linear-gradient(
-    270deg,
-    rgba(43, 124, 233, 1) 0%,
-    rgba(103, 168, 255, 1) 100%
-  );
+  background: linear-gradient(270deg, rgba(43, 124, 233, 1) 0%, rgba(103, 168, 255, 1) 100%);
   text-align: center;
   border-radius: 3px;
   cursor: pointer;

src/pages/my/index.vue

@@ -29,6 +29,14 @@ export default {
           title: '已购课程',
           url: '/my/buyCourses'
         },
+        {
+          title: '已学课程',
+          url: '/my/learned'
+        },
+        {
+          title: '学习提醒',
+          url: '/my/alarm'
+        },
         {
           title: '已做试题',
           url: '/my/questionsList'
@@ -38,10 +46,6 @@ export default {
           url: '/my/collectQuestions'
         },
         // {
-        //   title: '已学课程',
-        //   url: '/my/buyCourses'
-        // }
-        // {
         //   title: '消息/通知',
         //   url: '/my/buyCourses'
         // },