529

2de70999 · chenyishuai@singsingenglish.com · 7d5f8ee1 · 2de70999 · 2de70999 · 2de70999
Commit 2de70999 authored May 29, 2019 by chenyishuai@singsingenglish.com
4 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.a33637a3392be2fde512aa6031b6e4df.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 type=text/javascript src=static/js/manifest.04b3ff45fa0fca697e88.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.f78bebe7c61fc4c48778.js></script></body></html>
\ No newline at end of file
+        }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.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 type=text/javascript src=static/js/manifest.22bb21760113901c806a.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.f78bebe7c61fc4c48778.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/19.8d52ce8e990b5df52965.js
+++ b/dev/static/js/19.8d52ce8e990b5df52965.js
--- a/dev/static/js/manifest.04b3ff45fa0fca697e88.js
+++ b/dev/static/js/manifest.04b3ff45fa0fca697e88.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var a={},f={37: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 t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"ef4d55f7f57d0d2bb9a9",7:"f1db37c6902f5aa481c6",8:"357c9ae60e469117c0d4",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"8d52ce8e990b5df52965",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),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 e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var a={},f={37: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 t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"ef4d55f7f57d0d2bb9a9",7:"f1db37c6902f5aa481c6",8:"357c9ae60e469117c0d4",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"7ff063ec487da95ff623",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),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 e}}([]);
\ No newline at end of file
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -337,12 +337,6 @@ export default {
    window.scrollTo(0,0);
    let that = this
    this.unlook = localStorage.getItem('unlook');
-    if(sessionStorage.getItem('orderShadow')){
-      this.pt = false
-      // debugger
-    }else{
-      this.pt = true
-    }
    // console.log(this.pt)
    // console.log(document.body.clientWidth)
    if(document.body.clientWidth>700){
@@ -481,6 +475,7 @@ export default {
              if(this.$store.state.couponShadow){
                // debugger
                this.couponShadow=true
+                console.log(this.pt)
                this.$store.dispatch('setCouponShadow',false)
              }
              // if(!localStorage.getItem('activity')){
@@ -600,6 +595,10 @@ export default {
        res.list.forEach(el => {
          console.log()
          if(el.buy_type==2&&el.status==1){
+            if(!sessionStorage.getItem('orderShadow')){
+                this.pt = true
+                // debugger
+              }
            if(new Date(el.group_info.deadline.replace(/-/g, '/')).getTime()>=new Date().getTime()){
                el.goods_desc= JSON.parse(el.goods_desc)
                arr.push(el)