Merge branch 'kelley-h5' of…

components/base/h5/ApplyForm.vue

@@ -36,7 +36,7 @@ import * as api from '@/api'
 export default {
   data() {
     return {
-      ruleForm: { name: '', phone: '', project_id: '1001', channel: 19960 },
+      ruleForm: { name: '', phone: '', project_id: '1001', channel: localStorage.getItem('channel_num') || 19960 },
       projectList: [
         { label: '金融工商管理硕士', value: '1000' },
         { label: '酒店及旅游业工商管理硕士', value: '1008' },

components/rightAside.vue

@@ -2,9 +2,7 @@
   <div class="right_bar">
     <ul class="tab_btns">
       <a href="/my/account">
-        <li
-          class="service"
-        >
+        <li class="service">
           <p>{{ $t('aside.apply') }}</p>
         </li>
       </a>
@@ -56,11 +54,13 @@
           </p>
           <p class="sendcode">
             <el-input v-model="sendCode" :placeholder="$t('aside.code')" size="small"></el-input
-            ><el-button class="btn" :disabled="isBtnDisabled" id="checkedCode" @click="getSendCode"
-              >{{ $t('aside.codeBtn') }}</el-button
-            >
+            ><el-button class="btn" :disabled="isBtnDisabled" id="checkedCode" @click="getSendCode">{{
+              $t('aside.codeBtn')
+            }}</el-button>
+          </p>
+          <p>
+            <el-button style="width: 100%" @click="submitEnroll">{{ $t('aside.formBtn') }}</el-button>
           </p>
-          <p><el-button style="width: 100%" @click="submitEnroll">{{ $t('aside.formBtn') }}</el-button></p>
         </div>
         <div class="wx_cont" v-show="tabBtnTarget === 'wx'">
           <h5>{{ $t('aside.follow') }}</h5>
@@ -137,7 +137,7 @@ export default {
     },
     enrollQuery() {
       const params = {
-        channel: 19960,
+        channel: localStorage.getItem('channel_num') || 19960,
         project_id: this.formInfo.newProjectId,
         name: this.formInfo.name,
         phone: this.formInfo.phone
@@ -264,21 +264,21 @@ export default {
     li.enroll.active {
       background-image: url(https://webapp-pub.ezijing.com/project/kelley/kefu11.png);
     }
-    li.service{
+    li.service {
       background-image: url(https://zws-imgs-pub.ezijing.com/static/public/d434fa0ffd77892273e63e6d694cff0a.png);
     }
-    li.service{
+    li.service {
       border-bottom: 1px solid #b8bcbf;
       cursor: pointer;
-      &:hover{
+      &:hover {
         background-color: #af1b40;
-        p{
+        p {
           color: #fff;
         }
         background-image: url(https://zws-imgs-pub.ezijing.com/static/public/4cbef518113d24b392be80148e921abd.png);
       }
     }
-    li.service.acitve{
+    li.service.acitve {
       background-image: url(https://zws-imgs-pub.ezijing.com/static/public/4cbef518113d24b392be80148e921abd.png);
     }
     li.wx {

layouts/normal.vue

@@ -4,6 +4,11 @@
 <script>
 import AppLayout from '@/components/layout'
 export default {
-  components: { AppLayout }
+  components: { AppLayout },
+  mounted() {
+    if (this.$route.query.channel_num) {
+      localStorage.setItem('channel_num', this.$route.query.channel_num)
+    }
+  }
 }
 </script>