Merge branch 'v3' of git.code.tencent.com:cust-developers/custForeEnd into v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherry",
-  "version": "0.1.0",
+  "version": "3.3.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/views/Login/Login.vue

@@ -13,6 +13,7 @@
       <div class="title">登录</div>
       <div class="label">教务账号*</div>
       <input type="text" name="cid" v-model.trim="cid" />
+      <div class="tips">由于教务问题20级同学还无法使用，请在此直接输入2020，点击登录即可体验</div>
       <div class="label">教务密码*</div>
       <input type="password" name="pwd" v-model.trim="pwd" />
       <div class="label">手机号码(非必填，仅在登录失败时更新教务)</div>
@@ -22,8 +23,7 @@
       <div class="submit" @click="submit()">登录</div>
     </div>
     <div class="copyRight">
-      <p>版本更新内容：新增20级测试账户，账号2020无密码</p>
-      <p>Version&nbsp;3.1</p>
+      <p>Version&nbsp;3.3</p>
       <p>Inspire Studio</p>
       <p>&copy;2020 All Rights Reserved.</p>
     </div>
@@ -88,7 +88,7 @@ export default {
           background: "rgba(236,245,255,.7)",
           target: document.querySelector(".login")
         });
-        this.manageRes(test_info, load);
+        this.manageRes(JSON.parse(JSON.stringify(test_info)), load);
       }
       else if (this.cid && this.pwd) {
         // 两者信息都填写了
@@ -295,7 +295,7 @@ export default {
   }
   .login-box {
     width: 85%;
-    height: 9rem;
+    height: 9.5rem;
     background: #fff;
     margin: 0 auto;
     margin-top: -1rem;
@@ -317,6 +317,11 @@ export default {
       margin: 0.5rem 0 0.3rem 0rem;
       color: #909399;
     }
+    .tips {
+      font-size: 0.3rem;
+      margin: .2rem 0;
+      color: #f86b55;
+    }
     input {
       font-size: 0.4rem;
       padding: 0.1rem;

src/views/MyAccount/MyAccount.vue

@@ -4,7 +4,7 @@
       <img src="../../assets/logo_nobg.png" alt="logo" />
       <p>
         Cherry
-        <span>v3.1</span>
+        <span>v3.3</span>
       </p>
       <div class="auth">By:Inspire Studio</div>
       <!-- <img src="../assets/wave.gif" mode="scaleToFill" class="gif-wave"/> -->