Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre

b9ad80b1 · IvyXia123 · 15e79249 · 21dc41e2 · b9ad80b1 · b9ad80b1
Commit b9ad80b1 authored Sep 04, 2019 by IvyXia123
97 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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></script><script type=text/javascript src=static/js/manifest.e0a02d2014e2d2fa32ea.js></script><script type=text/javascript src=static/js/vendor.b61a7454120fbd9654e1.js></script><script type=text/javascript src=static/js/app.1c616d3d97116d8cc7a6.js></script></body></html>
\ No newline at end of file
+        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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></script><script type=text/javascript src=static/js/manifest.494d60487f1894e7ed32.js></script><script type=text/javascript src=static/js/vendor.25be221f36f388c88178.js></script><script type=text/javascript src=static/js/app.5c924a3ba607cd01b792.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/1.34176ac8a792689cd932.js
+++ b/dist/static/js/1.34176ac8a792689cd932.js
--- a/dist/static/js/1.50c622747bb80ea84c33.js
+++ b/dist/static/js/1.50c622747bb80ea84c33.js
--- a/dist/static/js/9.e911f3c929216e39ba02.js
+++ b/dist/static/js/9.e911f3c929216e39ba02.js
--- a/dist/static/js/10.f30683c3a19339d7c7ea.js
+++ b/dist/static/js/10.f30683c3a19339d7c7ea.js
--- a/dist/static/js/11.cc81ee735b377d30f453.js
+++ b/dist/static/js/11.cc81ee735b377d30f453.js
--- a/dist/static/js/12.bcf7aff7d3e404daf3fa.js
+++ b/dist/static/js/12.bcf7aff7d3e404daf3fa.js
--- a/dist/static/js/12.c1d0b6f157e73d7cdbf2.js
+++ b/dist/static/js/12.c1d0b6f157e73d7cdbf2.js
--- a/dist/static/js/13.a905fc53a2c373a61996.js
+++ b/dist/static/js/13.a905fc53a2c373a61996.js
--- a/dist/static/js/13.f685edb80dad7c74578f.js
+++ b/dist/static/js/13.f685edb80dad7c74578f.js
--- a/dist/static/js/14.5fab46d1539e8d8e9959.js
+++ b/dist/static/js/14.5fab46d1539e8d8e9959.js
--- a/dist/static/js/14.a0bbd71d7bd415cb2b44.js
+++ b/dist/static/js/14.a0bbd71d7bd415cb2b44.js
--- a/dist/static/js/15.b214e575647864ca0c66.js
+++ b/dist/static/js/15.b214e575647864ca0c66.js
--- a/dist/static/js/16.3da136abf4d4f9998be0.js
+++ b/dist/static/js/16.3da136abf4d4f9998be0.js
--- a/dist/static/js/17.0034ec0206996de68def.js
+++ b/dist/static/js/17.0034ec0206996de68def.js
--- a/dist/static/js/17.76102ef96ef5264e2f2f.js
+++ b/dist/static/js/17.76102ef96ef5264e2f2f.js
--- a/dist/static/js/18.02aa949cdc05d9d94c59.js
+++ b/dist/static/js/18.02aa949cdc05d9d94c59.js
--- a/dist/static/js/19.12140c0c6276fd74aa42.js
+++ b/dist/static/js/19.12140c0c6276fd74aa42.js
--- a/dist/static/js/18.141bd06336ddc9a321dd.js
+++ b/dist/static/js/18.141bd06336ddc9a321dd.js
--- a/dist/static/js/2.aa6329edd741532bf257.js
+++ b/dist/static/js/2.aa6329edd741532bf257.js
--- a/dist/static/js/2.b9030b2c2b747f856e8c.js
+++ b/dist/static/js/2.b9030b2c2b747f856e8c.js
--- a/dist/static/js/20.73fbdf2d66ec0258184d.js
+++ b/dist/static/js/20.73fbdf2d66ec0258184d.js
--- a/dist/static/js/20.f641b3b48896af1a6eec.js
+++ b/dist/static/js/20.f641b3b48896af1a6eec.js
--- a/dist/static/js/21.dc32437e9a5480402ddb.js
+++ b/dist/static/js/21.dc32437e9a5480402ddb.js
--- a/dist/static/js/21.2cd35651774540f9a0e6.js
+++ b/dist/static/js/21.2cd35651774540f9a0e6.js
--- a/dist/static/js/23.77bc40f9ea4250ea6e21.js
+++ b/dist/static/js/23.77bc40f9ea4250ea6e21.js
--- a/dist/static/js/22.b32b3d99736a80aa81cf.js
+++ b/dist/static/js/22.b32b3d99736a80aa81cf.js
--- a/dist/static/js/24.2dd05eb09be909597ea5.js
+++ b/dist/static/js/24.2dd05eb09be909597ea5.js
--- a/dist/static/js/24.8bd60feb395db1a3496c.js
+++ b/dist/static/js/24.8bd60feb395db1a3496c.js
--- a/dist/static/js/25.28638a14b208d7e52cca.js
+++ b/dist/static/js/25.28638a14b208d7e52cca.js
--- a/dist/static/js/25.fb09516d5d1b1c08f373.js
+++ b/dist/static/js/25.fb09516d5d1b1c08f373.js
--- a/dist/static/js/26.eae4e64745dcf01719f6.js
+++ b/dist/static/js/26.eae4e64745dcf01719f6.js
--- a/dist/static/js/27.f81ca9b879095d70d072.js
+++ b/dist/static/js/27.f81ca9b879095d70d072.js
--- a/dist/static/js/26.6113dc3c9dd5b9c1e8b7.js
+++ b/dist/static/js/26.6113dc3c9dd5b9c1e8b7.js
--- a/dist/static/js/28.0a5a8bc4a28dbe6c0258.js
+++ b/dist/static/js/28.0a5a8bc4a28dbe6c0258.js
--- a/dist/static/js/28.cd80bf405312a00dd27b.js
+++ b/dist/static/js/28.cd80bf405312a00dd27b.js
--- a/dist/static/js/29.24374c0780130ca41fe2.js
+++ b/dist/static/js/29.24374c0780130ca41fe2.js
--- a/dist/static/js/3.2dc6ec3ac13046d785a2.js
+++ b/dist/static/js/3.2dc6ec3ac13046d785a2.js
--- a/dist/static/js/3.6c3676e8302b74647cbc.js
+++ b/dist/static/js/3.6c3676e8302b74647cbc.js
--- a/dist/static/js/30.a485dd695c280e89e10f.js
+++ b/dist/static/js/30.a485dd695c280e89e10f.js
--- a/dist/static/js/29.f9195f9a203f4593667b.js
+++ b/dist/static/js/29.f9195f9a203f4593667b.js
--- a/dist/static/js/31.26dd4e34f382a47cc981.js
+++ b/dist/static/js/31.26dd4e34f382a47cc981.js
--- a/dist/static/js/32.1a1ddd8584ecc4d4df14.js
+++ b/dist/static/js/32.1a1ddd8584ecc4d4df14.js
--- a/dist/static/js/33.1250686fed5426f7da3c.js
+++ b/dist/static/js/33.1250686fed5426f7da3c.js
--- a/dist/static/js/34.c9991e993d937fb3d3fe.js
+++ b/dist/static/js/34.c9991e993d937fb3d3fe.js
--- a/dist/static/js/35.7d605de035fb80b3dc4d.js
+++ b/dist/static/js/35.7d605de035fb80b3dc4d.js
--- a/dist/static/js/36.7adb6951b90267341e15.js
+++ b/dist/static/js/36.7adb6951b90267341e15.js
--- a/dist/static/js/37.a9a400f11ed26d3a0706.js
+++ b/dist/static/js/37.a9a400f11ed26d3a0706.js
--- a/dist/static/js/38.ae143e8165c1a62a43b8.js
+++ b/dist/static/js/38.ae143e8165c1a62a43b8.js
--- a/dist/static/js/39.6e75aa5c523efb46ecf2.js
+++ b/dist/static/js/39.6e75aa5c523efb46ecf2.js
--- a/dist/static/js/4.36c83d1dc74ff38c5200.js
+++ b/dist/static/js/4.36c83d1dc74ff38c5200.js
--- a/dist/static/js/4.5e9ce966ff7bdc5ca435.js
+++ b/dist/static/js/4.5e9ce966ff7bdc5ca435.js
--- a/dist/static/js/40.69f43039512c4303fe40.js
+++ b/dist/static/js/40.69f43039512c4303fe40.js
--- a/dist/static/js/41.134cc94b0f05afaf8e7e.js
+++ b/dist/static/js/41.134cc94b0f05afaf8e7e.js
--- a/dist/static/js/41.2d0949e14872f28dcdd9.js
+++ b/dist/static/js/41.2d0949e14872f28dcdd9.js
--- a/dist/static/js/42.c59498c1a0e6b300b696.js
+++ b/dist/static/js/42.c59498c1a0e6b300b696.js
--- a/dist/static/js/43.bf05df515e54c7432a05.js
+++ b/dist/static/js/43.bf05df515e54c7432a05.js
--- a/dist/static/js/43.fe38138cfd48b2378031.js
+++ b/dist/static/js/43.fe38138cfd48b2378031.js
--- a/dist/static/js/44.abf0960bbb2dbaa61d59.js
+++ b/dist/static/js/44.abf0960bbb2dbaa61d59.js
--- a/dist/static/js/45.7ac507642c34ed38473a.js
+++ b/dist/static/js/45.7ac507642c34ed38473a.js
--- a/dist/static/js/46.07776e73dd61e71cd1f8.js
+++ b/dist/static/js/46.07776e73dd61e71cd1f8.js
--- a/dist/static/js/46.d0db90740a7763e81a85.js
+++ b/dist/static/js/46.d0db90740a7763e81a85.js
--- a/dist/static/js/47.4969c0686917acbb872e.js
+++ b/dist/static/js/47.4969c0686917acbb872e.js
--- a/dist/static/js/48.62fae8ff207438a3241a.js
+++ b/dist/static/js/48.62fae8ff207438a3241a.js
--- a/dist/static/js/49.209aa34afb7c0ee15a97.js
+++ b/dist/static/js/49.209aa34afb7c0ee15a97.js
--- a/dist/static/js/49.f7d490d29da167056272.js
+++ b/dist/static/js/49.f7d490d29da167056272.js
--- a/dist/static/js/5.1944d424dedd37d62aea.js
+++ b/dist/static/js/5.1944d424dedd37d62aea.js
--- a/dist/static/js/5.233db5c85a636e6112a4.js
+++ b/dist/static/js/5.233db5c85a636e6112a4.js
--- a/dist/static/js/50.0eaaed88f2e66a9ddde5.js
+++ b/dist/static/js/50.0eaaed88f2e66a9ddde5.js
--- a/dist/static/js/50.e94f0be889244f07f898.js
+++ b/dist/static/js/50.e94f0be889244f07f898.js
--- a/dist/static/js/52.2a9e625a9addaabede09.js
+++ b/dist/static/js/52.2a9e625a9addaabede09.js
--- a/dist/static/js/52.d6c0c0d0881755cc8506.js
+++ b/dist/static/js/52.d6c0c0d0881755cc8506.js
--- a/dist/static/js/53.f92b2a14b684c3e0962b.js
+++ b/dist/static/js/53.f92b2a14b684c3e0962b.js
--- a/dist/static/js/54.b40fbd7fe5e19f1cb96c.js
+++ b/dist/static/js/54.b40fbd7fe5e19f1cb96c.js
--- a/dist/static/js/55.49c7483f3f57592efea0.js
+++ b/dist/static/js/55.49c7483f3f57592efea0.js
--- a/dist/static/js/56.32326dbd9039c0525dcf.js
+++ b/dist/static/js/56.32326dbd9039c0525dcf.js
--- a/dist/static/js/56.850a2a72f5cac7b39e5b.js
+++ b/dist/static/js/56.850a2a72f5cac7b39e5b.js
--- a/dist/static/js/57.2c739f835f434ed8e5fd.js
+++ b/dist/static/js/57.2c739f835f434ed8e5fd.js
--- a/dist/static/js/57.7a366c59834cb5edef23.js
+++ b/dist/static/js/57.7a366c59834cb5edef23.js
--- a/dist/static/js/58.8784e4aa9ee0e423e6b8.js
+++ b/dist/static/js/58.8784e4aa9ee0e423e6b8.js
--- a/dist/static/js/59.85900cccbdc8874571e8.js
+++ b/dist/static/js/59.85900cccbdc8874571e8.js
--- a/dist/static/js/6.e4c95ee5ae48b5164715.js
+++ b/dist/static/js/6.e4c95ee5ae48b5164715.js
--- a/dist/static/js/7.2311dabb37556e483652.js
+++ b/dist/static/js/7.2311dabb37556e483652.js
--- a/dist/static/js/7.d321521bb404f007a42f.js
+++ b/dist/static/js/7.d321521bb404f007a42f.js
--- a/dist/static/js/8.6b02ad1eec8aacc4a6af.js
+++ b/dist/static/js/8.6b02ad1eec8aacc4a6af.js
--- a/dist/static/js/6.f9caad0c0529c3f80c7a.js
+++ b/dist/static/js/6.f9caad0c0529c3f80c7a.js
--- a/dist/static/js/9.2d95330d2777552301cd.js
+++ b/dist/static/js/9.2d95330d2777552301cd.js
--- a/dist/static/js/app.1c616d3d97116d8cc7a6.js
+++ b/dist/static/js/app.1c616d3d97116d8cc7a6.js
--- a/dist/static/js/manifest.494d60487f1894e7ed32.js
+++ b/dist/static/js/manifest.494d60487f1894e7ed32.js
--- a/dist/static/js/manifest.e0a02d2014e2d2fa32ea.js
+++ b/dist/static/js/manifest.e0a02d2014e2d2fa32ea.js
--- a/dist/static/js/vendor-async.a1d0990d015aaaa0706f.js
+++ b/dist/static/js/vendor-async.a1d0990d015aaaa0706f.js
--- a/dist/static/js/vendor.25be221f36f388c88178.js
+++ b/dist/static/js/vendor.25be221f36f388c88178.js
--- a/dist/static/js/vendor.b61a7454120fbd9654e1.js
+++ b/dist/static/js/vendor.b61a7454120fbd9654e1.js
--- a/src/components/activity/extensionV1Shop.vue
+++ b/src/components/activity/extensionV1Shop.vue
 <template>
  <div class="activity">
    <img v-lazy="img1" alt />
-    <div class="title">注册领取课程</div>
+    <div class="box">
      <div class="form-block">
+        <div class="title">注册领取课程</div>
        <div class="input-block">
          <input
            placeholder="手机（用于接收课程信息）"
@@ -32,6 +33,7 @@
          <img :src="lock" alt />&nbsp;唱唱会保护您的隐私 请放心输入
        </div>
      </div>
+    </div>
    <img v-lazy="img2" alt />
    <img v-lazy="img3" alt />
    <img v-lazy="img4" alt />
@@ -127,7 +129,8 @@ export default {
        query.cct_user_id = comment.getParamhref().cct_user_id;
      }
      console.log(json);
-      bindMobileApi(json).then(data => {
+      bindMobileApi(json)
+        .then(data => {
          getUserDetailApi().then(res => {
            localStorage.setItem("userDesc", JSON.stringify(res));
            this.$router.push({
@@ -135,7 +138,8 @@ export default {
              query: query
            });
          });
-        }).catch(res => {});
+        })
+        .catch(res => {});
    },
    refImgCode() {
      this.$refs.imgCode.src = "/api/public/img/verify?flag=" + Math.random();
@@ -189,13 +193,13 @@ video {
 @borderRadius: 8px;
 .activity {
  background-color: #f9d048;
-  padding-bottom: 63* @toVw;
-  .title{
+  padding-bottom: 63 * @toVw;
+  .title {
    font-size: 16 * @toVw;
    font-weight: bold;
    color: #952700;
    text-align: center;
-    margin-top: 13 * @toVw;
+    margin: 4 * @toVw 0  13 * @toVw;
  }
  .codeMsg {
    border-radius: 4 * @toVw;
@@ -209,22 +213,27 @@ video {
      opacity: 0.5;
    }
  }
+  .box{
+    padding: 0 12 * @toVw 10 * @toVw;
+    margin-top: 10 * @toVw;
+  }
  .form-block {
    // position: relative;
    z-index: 10;
    background: #f9d048;
    // top: -42*@toVw;
-    padding: 20 * @toVw;
-    // border-radius:20*@toVw;
+    background: white;
+    border-radius:5*@toVw;
+    padding: 10*@toVw;
    .tip {
      font-size: 12 * @toVw;
      color: #952700;
      text-align: center;
      margin-top: 16px;
-      img{
-        width: 11* @toVw;
+      img {
+        width: 11 * @toVw;
        position: relative;
-        top: 2* @toVw;
+        top: 2 * @toVw;
      }
    }
    .input-block {

--- a/src/components/index.vue
+++ b/src/components/index.vue
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
--- a/src/main.js
+++ b/src/main.js
@@ -37,7 +37,6 @@ const errorHandler = (error, vm)=>{
 }
 Vue.config.errorHandler = errorHandler;
 Vue.prototype.$throw = (error)=> errorHandler(error,this);
-
 Vue.prototype.$common = common
 //VConsole关闭屏蔽代码
 // if (process.env.NODE_ENV != 'production') {