75

0fda9e9c · chenyishuai@singsingenglish.com · 5f9d4fc7 · dc0c7fbf · 0fda9e9c · 0fda9e9c
Commit 0fda9e9c authored Jul 05, 2019 by chenyishuai@singsingenglish.com
59 changed files
--- a/dev/index.html
+++ b/dev/index.html
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><script>// setSize();
+    //   addEventListener('resize',setSize);
+    //   function setSize() {
+    //       document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
+    //   }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
+        -webkit-overflow-scrolling: touch
+      }
+      .wrapper {
+          height: 100vh;
+          overflow: hidden;
+          position: fixed;
+          background: #f4f4f4;
+        }
+        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.515c844b0ff4b6e3c0f6.js></script><script type=text/javascript src=static/js/vendor.0c0fd269a85b0b124df6.js></script><script type=text/javascript src=static/js/app.0604f3b573dff906ccd4.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.c69107783cac1c8d367e.js
+++ b/dev/static/js/0.c69107783cac1c8d367e.js
--- a/dev/static/js/1.965417a30eadb453274e.js
+++ b/dev/static/js/1.965417a30eadb453274e.js
--- a/dev/static/js/10.26def7c3616cf36cf732.js
+++ b/dev/static/js/10.26def7c3616cf36cf732.js
--- a/dev/static/js/11.353b3213d24fc6cfe4ff.js
+++ b/dev/static/js/11.353b3213d24fc6cfe4ff.js
--- a/dev/static/js/12.190a7f38a4d5988d52ea.js
+++ b/dev/static/js/12.190a7f38a4d5988d52ea.js
--- a/dev/static/js/13.33f41ee822bd5fb60e57.js
+++ b/dev/static/js/13.33f41ee822bd5fb60e57.js
--- a/dev/static/js/14.25895a97757b2945f070.js
+++ b/dev/static/js/14.25895a97757b2945f070.js
--- a/dev/static/js/15.56bd2e12f115188cd7ea.js
+++ b/dev/static/js/15.56bd2e12f115188cd7ea.js
--- a/dev/static/js/16.26f36b5dbfdf42ac4b0d.js
+++ b/dev/static/js/16.26f36b5dbfdf42ac4b0d.js
--- a/dev/static/js/17.64855326b8e8140f732b.js
+++ b/dev/static/js/17.64855326b8e8140f732b.js
--- a/dev/static/js/18.f518ec626c15c7282b34.js
+++ b/dev/static/js/18.f518ec626c15c7282b34.js
--- a/dev/static/js/19.67e29b40ac62e5c248aa.js
+++ b/dev/static/js/19.67e29b40ac62e5c248aa.js
--- a/dev/static/js/2.65605480950e253d47ff.js
+++ b/dev/static/js/2.65605480950e253d47ff.js
--- a/dev/static/js/20.9c1dab5ea0429d926a78.js
+++ b/dev/static/js/20.9c1dab5ea0429d926a78.js
--- a/dev/static/js/21.00193446b079e16c912d.js
+++ b/dev/static/js/21.00193446b079e16c912d.js
--- a/dev/static/js/22.6068b4047acb96099e4c.js
+++ b/dev/static/js/22.6068b4047acb96099e4c.js
--- a/dev/static/js/23.cea956e62f1b1dd873b2.js
+++ b/dev/static/js/23.cea956e62f1b1dd873b2.js
--- a/dev/static/js/24.a3143f2775ff72eca3d4.js
+++ b/dev/static/js/24.a3143f2775ff72eca3d4.js
--- a/dev/static/js/25.df4a1887b9cfa805007d.js
+++ b/dev/static/js/25.df4a1887b9cfa805007d.js
--- a/dev/static/js/26.a09e2120bf73a20c2b16.js
+++ b/dev/static/js/26.a09e2120bf73a20c2b16.js
--- a/dev/static/js/27.abda378429844b5eb091.js
+++ b/dev/static/js/27.abda378429844b5eb091.js
--- a/dev/static/js/28.32c65edf9448dfe3d451.js
+++ b/dev/static/js/28.32c65edf9448dfe3d451.js
--- a/dev/static/js/29.6fab030fcfd2ce2e1540.js
+++ b/dev/static/js/29.6fab030fcfd2ce2e1540.js
--- a/dev/static/js/3.0f447ff961ea128c1cdd.js
+++ b/dev/static/js/3.0f447ff961ea128c1cdd.js
--- a/dev/static/js/30.a43b836a57797234bf1a.js
+++ b/dev/static/js/30.a43b836a57797234bf1a.js
--- a/dev/static/js/31.c5eb6a0b67d46aca8738.js
+++ b/dev/static/js/31.c5eb6a0b67d46aca8738.js
+webpackJsonp([31],{"5iK7":function(n,t,a){n.exports=a.p+"static/img/no.415cb0b.png"},CpNa:function(n,t,a){var e=a("jcJe");"string"==typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);a("rjj0")("7b2afc85",e,!1,{})},jcJe:function(n,t,a){(n.exports=a("FZ+f")(!0)).push([n.i,"\n.fl-r[data-v-55b47e52] {\n  float: right;\n}\n.fr[data-v-55b47e52] {\n  float: right;\n}\n.fl[data-v-55b47e52] {\n  float: left;\n}\n.main-block[data-v-55b47e52] {\n  margin: 5px;\n  background: white;\n  padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n  content: '';\n  display: block;\n  clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n  border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n  width: 5px;\n  height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n  background-color: #999;\n  border-radius: 10px;\n  min-height: 10px;\n}\n@-webkit-keyframes myfirst-data-v-55b47e52 {\n0% {\n    -webkit-transform: scale(1);\n}\n50% {\n    -webkit-transform: scale(1.1);\n}\n100% {\n    -webkit-transform: scale(1);\n}\n}\n.van-button--info[data-v-55b47e52] {\n  background: #40A9FF;\n  border: 1px solid #40A9FF;\n}\n.van-popup[data-v-55b47e52] {\n  background: transparent;\n}\n.noWechat-page[data-v-55b47e52] {\n  text-align: center;\n  font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n  width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n  font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n  font-size: 8vw;\n  margin-bottom: 2.66666667vw;\n}\n","",{version:3,sources:["/Users/bory/Desktop/说唱教育/wechat/src/components/noWechat.vue"],names:[],mappings:";AACA;EACE,aAAa;CACd;AACD;EACE,aAAa;CACd;AACD;EACE,YAAY;CACb;AACD;EACE,YAAY;EACZ,kBAAkB;EAClB,aAAa;CACd;AACD;EACE,YAAY;EACZ,eAAe;EACf,YAAY;CACb;AACD;EACE,oBAAoB;CACrB;AACD;EACE,WAAW;EACX,YAAY;CACb;AACD;EACE,uBAAuB;EACvB,oBAAoB;EACpB,iBAAiB;CAClB;AACD;AACA;IACI,4BAA4B;CAC/B;AACD;IACI,8BAA8B;CACjC;AACD;IACI,4BAA4B;CAC/B;CACA;AACD;EACE,oBAAoB;EACpB,0BAA0B;CAC3B;AACD;EACE,wBAAwB;CACzB;AACD;EACE,mBAAmB;EACnB,gBAAgB;CACjB;AACD;EACE,WAAW;CACZ;AACD;EACE,wBAAwB;CACzB;AACD;EACE,eAAe;EACf,4BAA4B;CAC7B",file:"noWechat.vue",sourcesContent:["\n.fl-r[data-v-55b47e52] {\n  float: right;\n}\n.fr[data-v-55b47e52] {\n  float: right;\n}\n.fl[data-v-55b47e52] {\n  float: left;\n}\n.main-block[data-v-55b47e52] {\n  margin: 5px;\n  background: white;\n  padding: 5px;\n}\n.clear-both[data-v-55b47e52]:after {\n  content: '';\n  display: block;\n  clear: both;\n}\n[data-v-55b47e52]::-webkit-scrollbar-track-piece {\n  border-radius: 10px;\n}\n[data-v-55b47e52]::-webkit-scrollbar {\n  width: 5px;\n  height: 5px;\n}\n[data-v-55b47e52]::-webkit-scrollbar-thumb {\n  background-color: #999;\n  border-radius: 10px;\n  min-height: 10px;\n}\n@-webkit-keyframes myfirst-data-v-55b47e52 {\n0% {\n    -webkit-transform: scale(1);\n}\n50% {\n    -webkit-transform: scale(1.1);\n}\n100% {\n    -webkit-transform: scale(1);\n}\n}\n.van-button--info[data-v-55b47e52] {\n  background: #40A9FF;\n  border: 1px solid #40A9FF;\n}\n.van-popup[data-v-55b47e52] {\n  background: transparent;\n}\n.noWechat-page[data-v-55b47e52] {\n  text-align: center;\n  font-size: 18px;\n}\n.noWechat-page img[data-v-55b47e52] {\n  width: 70%;\n}\n.noWechat-page .text-block[data-v-55b47e52] {\n  font-size: 3.73333333vw;\n}\n.noWechat-page .text-block .title[data-v-55b47e52] {\n  font-size: 8vw;\n  margin-bottom: 2.66666667vw;\n}\n"],sourceRoot:""}])},nmbt:function(n,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var e=a("5iK7"),A=a.n(e),o={name:"noWechat",data:function(){return{noUrl:A.a}}},r=function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"noWechat-page"},[t("img",{attrs:{src:this.noUrl}}),this._v(" "),this._m(0)])};r._withStripped=!0;var i={render:r,staticRenderFns:[function(){var n=this.$createElement,t=this._self._c||n;return t("div",{staticClass:"text-block"},[t("div",{staticClass:"title"},[this._v("\n      请在微信中打开链接\n    ")]),this._v("\n    您可以复制链接后，粘贴到微信任意对话框，\n    "),t("br"),this._v("\n    或发送给微信中的任意好友，\n    "),t("br"),this._v("\n    点击链接即可查看哦~\n  ")])}]},b=i;var s=!1;var c=a("VU/8")(o,b,!1,function(n){s||a("CpNa")},"data-v-55b47e52",null);c.options.__file="src/components/noWechat.vue";t.default=c.exports}});
\ No newline at end of file
--- a/dev/static/js/32.15a988c96813e1501225.js
+++ b/dev/static/js/32.15a988c96813e1501225.js
--- a/dev/static/js/33.c26b04b67f5147e16012.js
+++ b/dev/static/js/33.c26b04b67f5147e16012.js
--- a/dev/static/js/34.1d922fd78cb7a69ea747.js
+++ b/dev/static/js/34.1d922fd78cb7a69ea747.js
--- a/dev/static/js/35.fc6d82a7ec11de276280.js
+++ b/dev/static/js/35.fc6d82a7ec11de276280.js
--- a/dev/static/js/36.eb9ade55fbd0b8ab0953.js
+++ b/dev/static/js/36.eb9ade55fbd0b8ab0953.js
--- a/dev/static/js/37.3d2ba9064819014f5e15.js
+++ b/dev/static/js/37.3d2ba9064819014f5e15.js
--- a/dev/static/js/38.ac86a25ad5f3aa01eaa8.js
+++ b/dev/static/js/38.ac86a25ad5f3aa01eaa8.js
--- a/dev/static/js/39.3409ced4aef10c54c4f1.js
+++ b/dev/static/js/39.3409ced4aef10c54c4f1.js
--- a/dev/static/js/4.4b033754560a9e49527e.js
+++ b/dev/static/js/4.4b033754560a9e49527e.js
--- a/dev/static/js/5.54b033857102562d909d.js
+++ b/dev/static/js/5.54b033857102562d909d.js
--- a/dev/static/js/6.7ea4e29bc2b65b26b9a6.js
+++ b/dev/static/js/6.7ea4e29bc2b65b26b9a6.js
--- a/dev/static/js/7.1da764e85fad3718075f.js
+++ b/dev/static/js/7.1da764e85fad3718075f.js
--- a/dev/static/js/8.d57c99762d1e5f52c50c.js
+++ b/dev/static/js/8.d57c99762d1e5f52c50c.js
--- a/dev/static/js/9.7f723fbdc47ac3c0895f.js
+++ b/dev/static/js/9.7f723fbdc47ac3c0895f.js
--- a/dev/static/js/app.0604f3b573dff906ccd4.js
+++ b/dev/static/js/app.0604f3b573dff906ccd4.js
--- a/dev/static/js/manifest.515c844b0ff4b6e3c0f6.js
+++ b/dev/static/js/manifest.515c844b0ff4b6e3c0f6.js
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/app.a76fa1ec0607e806f450f2327cff0c66.css
+++ b/dist/static/css/app.a76fa1ec0607e806f450f2327cff0c66.css
--- a/dist/static/js/2.501d38d14f5fe366ab7d.js
+++ b/dist/static/js/2.501d38d14f5fe366ab7d.js
--- a/dist/static/js/3.792dee913ed83ed02c40.js
+++ b/dist/static/js/3.792dee913ed83ed02c40.js
--- a/dist/static/js/4.0246aac2a22b92f76e43.js
+++ b/dist/static/js/4.0246aac2a22b92f76e43.js
--- a/dist/static/js/app.86c9b76863a5b4872114.js
+++ b/dist/static/js/app.86c9b76863a5b4872114.js
--- a/dist/static/js/manifest.f6b8851f9b7968a0e316.js
+++ b/dist/static/js/manifest.f6b8851f9b7968a0e316.js
--- a/src/assets/activity/btn@2x.png
+++ b/src/assets/activity/btn@2x.png
--- a/src/assets/activity/popup@2x.png
+++ b/src/assets/activity/popup@2x.png
--- a/src/assets/activity/popup_btn.png
+++ b/src/assets/activity/popup_btn.png
--- a/src/components/buy/activityInvite.vue
+++ b/src/components/buy/activityInvite.vue
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
--- a/src/components/mine/address.vue
+++ b/src/components/mine/address.vue
--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
@@ -34,7 +34,7 @@
          <div :class="{'image-block':true}" ref="imageBlock"  @click="imgPop=true">
            <img ref="imgItem" :src="showObj.audio[index].image">
          </div>
-          <div>
+          <div class="btnBox">
            <div class="title-block hp">
              <div class="title">
                {{showObj.audio[index].title}}
@@ -934,6 +934,7 @@
          margin-right: 80*@toVw;
          .hp-top{
            display: -webkit-flex;
+            display: flex;
            width: 100%;
          }
        }
@@ -952,16 +953,21 @@
            border-radius: 999 * @toVw;
          }
        }
+        .btnBox{
+          flex: 1;
+        }
        .title-block{
          margin-top: 24*@toVw;
           display: none;
          &.hp{
            display: -webkit-flex;
            }
          .title{
            font-size:16*@toVw;
            font-family:PingFang-SC-Medium;
            font-weight:500;
+            // width: 100*@toVw;
            color:rgba(102,102,102,1);
          }
          .tips{

--- a/src/service/index.js
+++ b/src/service/index.js