64

eef3a21d · chenyishuai@singsingenglish.com · 9d718de8 · eef3a21d · eef3a21d · 9d718de8
Commit eef3a21d authored Jun 06, 2019 by chenyishuai@singsingenglish.com
7 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -6,4 +6,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script type=text/javascript src=static/js/manifest.4bcd2cf31014b7e0393a.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.1d859a82281714b4a5e3.js></script></body></html>
+        }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script type=text/javascript src=static/js/manifest.06181ac77dddcbe7c9a4.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.1d859a82281714b4a5e3.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/20.047ed15294b126bf7c75.js
+++ b/dev/static/js/20.047ed15294b126bf7c75.js
--- a/dev/static/js/20.a112b8942f1547a84373.js
+++ b/dev/static/js/20.a112b8942f1547a84373.js
--- a/dev/static/js/25.3564931bf25e41dc51df.js
+++ b/dev/static/js/25.3564931bf25e41dc51df.js
--- a/dev/static/js/manifest.4bcd2cf31014b7e0393a.js
+++ b/dev/static/js/manifest.4bcd2cf31014b7e0393a.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,d){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(c&&c(a,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=n(n.s=d[i]);return b};var a={},f={41:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"2aa556f8dc46a4ba266a",1:"e63cc8e8ea0eb51e34ae",2:"7beea4eb4f828fe771ad",3:"05a9632fa1b23e83453a",4:"03ce00e1c2648491b33d",5:"704a06f101829605fa7b",6:"026f7f4db0d0ec20019d",7:"52328654031215eec384",8:"ca8f31349f4c36b068c4",9:"607e2d29cc548a9ebc22",10:"b2c12d1a02836ebca36f",11:"6def6f87c50233d10294",12:"7609488df4fe9c22187f",13:"082f8365b64f58842f5a",14:"dd6b593e0b43c281248f",15:"7ed79964df837616767d",16:"578c715a9dfd07cb907d",17:"21d093a7c64e8e6383b1",18:"39d5f787179d4df7b4eb",19:"6ae799274e5b0051cb30",20:"a112b8942f1547a84373",21:"b7de45138dad7ef570bb",22:"084b354db77cd0cb9f1f",23:"71004b18332c6b148168",24:"d71f9865d3c4d59dd149",25:"3564931bf25e41dc51df",26:"ec0b7ada347942460200",27:"064e840e501ff9b79ae6",28:"4c5f0f68a13dd3e8a01c",29:"8d04a62ee78fc628a5b9",30:"9bcd686cd8b422f87c3b",31:"40604333d87e3ab7124e",32:"36917bae854a9d5d9250",33:"755d516b1380106ec605",34:"d4b49737304046ad821d",35:"484f3779289c054e3d13",36:"db8a14af0eae5772fc12",37:"11cef8d0e4a5fc526257",38:"484fb0d46b52bbc4cf54"}[e]+".js";var t=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=o,r.appendChild(d),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,f){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(c&&c(a,d,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={41:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var d=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"2aa556f8dc46a4ba266a",1:"e63cc8e8ea0eb51e34ae",2:"7beea4eb4f828fe771ad",3:"05a9632fa1b23e83453a",4:"03ce00e1c2648491b33d",5:"704a06f101829605fa7b",6:"026f7f4db0d0ec20019d",7:"52328654031215eec384",8:"ca8f31349f4c36b068c4",9:"607e2d29cc548a9ebc22",10:"b2c12d1a02836ebca36f",11:"6def6f87c50233d10294",12:"7609488df4fe9c22187f",13:"082f8365b64f58842f5a",14:"dd6b593e0b43c281248f",15:"7ed79964df837616767d",16:"578c715a9dfd07cb907d",17:"21d093a7c64e8e6383b1",18:"39d5f787179d4df7b4eb",19:"6ae799274e5b0051cb30",20:"047ed15294b126bf7c75",21:"b7de45138dad7ef570bb",22:"084b354db77cd0cb9f1f",23:"71004b18332c6b148168",24:"d71f9865d3c4d59dd149",25:"ebe972085ec57d0f84ed",26:"ec0b7ada347942460200",27:"064e840e501ff9b79ae6",28:"4c5f0f68a13dd3e8a01c",29:"8d04a62ee78fc628a5b9",30:"9bcd686cd8b422f87c3b",31:"40604333d87e3ab7124e",32:"36917bae854a9d5d9250",33:"755d516b1380106ec605",34:"d4b49737304046ad821d",35:"484f3779289c054e3d13",36:"db8a14af0eae5772fc12",37:"11cef8d0e4a5fc526257",38:"484fb0d46b52bbc4cf54"}[e]+".js";var t=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(t);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,d.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/subAccount/accept.vue
+++ b/src/components/subAccount/accept.vue
@@ -16,7 +16,7 @@
    <div class="text" v-if="acceptStatus==1">
      <p>此账号已成为{{userDetail.nickname}}在 唱唱启蒙英语上的子账户</p>
    </div>
-    <div class="text" v-if="acceptStatus==2&&errMsg==4004">
+    <div class="text" v-if="acceptStatus==2&&errMsg==4002">
      <p>主账号和子账号身份</p>
      <p>只能二选一</p>
    </div>
@@ -24,7 +24,7 @@
      <p>您的账号存在课程</p>
      <p>不能接受其他的看课授权</p>
    </div>
-    <div class="text" v-if="acceptStatus==2&&errMsg==4002">
+    <div class="text" v-if="acceptStatus==2&&errMsg==4004">
      <p>绑定子账号数超额</p>
      <p>一个主账号只能绑定一个子账号</p>
    </div>
@@ -111,7 +111,7 @@ export default {
    text-align: center;
    color: #333333;
    margin-top: 20* @toVw;
-    line-height: 32* @toVw;
+    line-height: 26* @toVw;
  }
  .btnBox{
    text-align: center;

--- a/src/components/subAccount/index.vue
+++ b/src/components/subAccount/index.vue
@@ -113,8 +113,9 @@ export default {
          }
          this.enableShare(option)
        })
+      }else{
+        Toast('授权次数已用完');
      }
    },
    relieve(){
      unbindAccountApi().then(res =>{