620

366a5c2f · chenyishuai@singsingenglish.com · 562a2ab2 · 366a5c2f · 366a5c2f · 562a2ab2
Commit 366a5c2f authored Jun 21, 2019 by chenyishuai@singsingenglish.com
10 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></script><script type=text/javascript src=static/js/manifest.8993df2079a1b6e77a53.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.2e382bf51b5b621efc23.js></script></body></html>
\ No newline at end of file
+        }</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></script><script type=text/javascript src=static/js/manifest.072ffdef846b3e02fa8c.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.2e382bf51b5b621efc23.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/15.443e7c8bba8ab9d657a7.js
+++ b/dev/static/js/15.443e7c8bba8ab9d657a7.js
--- a/dev/static/js/15.5fa2ffb44b23e6ecb895.js
+++ b/dev/static/js/15.5fa2ffb44b23e6ecb895.js
--- a/dev/static/js/17.bd621ce4cbbbb2c6ffe0.js
+++ b/dev/static/js/17.bd621ce4cbbbb2c6ffe0.js
--- a/dev/static/js/24.1c5e14b94415c30962b0.js
+++ b/dev/static/js/24.1c5e14b94415c30962b0.js
--- a/dev/static/js/24.88ee161b576e3029f75c.js
+++ b/dev/static/js/24.88ee161b576e3029f75c.js
--- a/dev/static/js/manifest.8993df2079a1b6e77a53.js
+++ b/dev/static/js/manifest.8993df2079a1b6e77a53.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,d,i=0,u=[];i<a.length;i++)o=a[i],c[o]&&u.push(c[o][0]),c[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(f&&f(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)d=b(b.s=r[i]);return d};var a={},c={46:0};function b(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,b){f=c[e]=[a,b]});f[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"7c91b765547702e5edba",1:"dada630babb87cb2bbd1",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"6ce25ae809dcabe97131",8:"4c37bd70d65f96539867",9:"d8fa80fce9ae41ef689a",10:"de3e0e9cd5ee98d6c928",11:"5b8996c5ca49aecbc56f",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"5fa2ffb44b23e6ecb895",16:"98ce85ad5ab95594e0f7",17:"bd621ce4cbbbb2c6ffe0",18:"22e8f09aa63e61d385f7",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"88ee161b576e3029f75c",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"3f1e7217c310f4810b2f",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"74eff696b7ca2b2659d0",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,f,a){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,o,d,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var c={},f={46:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"7c91b765547702e5edba",1:"dada630babb87cb2bbd1",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"6ce25ae809dcabe97131",8:"4c37bd70d65f96539867",9:"d8fa80fce9ae41ef689a",10:"de3e0e9cd5ee98d6c928",11:"5b8996c5ca49aecbc56f",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"443e7c8bba8ab9d657a7",16:"98ce85ad5ab95594e0f7",17:"c9ce4f409d177a19d16d",18:"22e8f09aa63e61d385f7",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"1c5e14b94415c30962b0",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"3f1e7217c310f4810b2f",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"74eff696b7ca2b2659d0",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -733,7 +733,7 @@ export default {
  padding-bottom: 50 * @toVw;
 }
 .couponActivity{
-  padding:12 * @toVw  20 * @toVw 12 * @toVw;
+  padding:0  20 * @toVw 12 * @toVw;
  background: white;
  margin: 0 0 10 * @toVw;
  position: relative;
@@ -1107,7 +1107,7 @@ export default {
 }
 .orderBox{
  position: relative;
-  padding: 0 20 * @toVw 12 * @toVw;
+  padding: 12 * @toVw 20 * @toVw 12 * @toVw;
  background: white;
  margin-top: 10* @toVw;
  .item:first-child{position: relative;z-index: 2000;background: white; }

--- a/src/components/orderTrans/index.vue
+++ b/src/components/orderTrans/index.vue
@@ -60,20 +60,9 @@
          this.sizeChange = false
        }else{
          this.sizeChange = true
-          // console.log(11)
        }
-        // console.log(11)
      }  
-      // document.body.addEventListener('focusout', () => { //软键盘关闭事件
-      // document.documentElement.scrollTop = 0
-      // document.body.scrollTop = 0
-      //   console.log("键盘收起")  
-      // })
      var oEvent = window.event;
-      document.body.addEventListener('onkeydown', (event) => { //软键盘关闭事件
-        var e = event || window.event || arguments.callee.caller.arguments[0];
-        console.log(e)
-      })
    },
    data(){
      return {

--- a/src/components/star/starRank.vue
+++ b/src/components/star/starRank.vue
@@ -282,7 +282,7 @@ export default {
          console.log(this.$refs.unStart)
          console.log(document.documentElement.clientHeight)
          let top =  (document.documentElement.clientHeight-Number(getComputedStyle(this.$refs.floatBox).height.replace('px','')))/2
-          this.$refs.unStart.height = top
+          this.$refs.unStart.style.top = top+'px'
          console.log(top)
        }, 200);
        // if(this.$refs.unStart){
@@ -436,7 +436,7 @@ export default {
      text-align: center;
      color: #F27321;
      font-size: 13 * @toVw;
-      top: 50%;
+      // top: 50%;
      position: absolute;
      width: 94%;
      text-align: center;