726

66f0d761 · chenyishuai@singsingenglish.com · 6f8c0510 · 66f0d761 · 66f0d761 · 6f8c0510
Commit 66f0d761 authored Jul 26, 2019 by chenyishuai@singsingenglish.com
70 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -11,4 +11,4 @@
          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.adbac863e2f3e26b90f4.js></script><script type=text/javascript src=static/js/vendor.5c7b919633d1497d7060.js></script><script type=text/javascript src=static/js/app.ea8ce2bfd58a082956ac.js></script></body></html>
+        /* 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.d0f7f822783464587d25.js></script><script type=text/javascript src=static/js/vendor.5d7f312b4e27ca12aa18.js></script><script type=text/javascript src=static/js/app.8a955169f611d7d1df5e.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/1.7d2215b2a57138e725e1.js
+++ b/dev/static/js/1.7d2215b2a57138e725e1.js
--- a/dev/static/js/10.62eb72d70f3b59cf3c98.js
+++ b/dev/static/js/10.62eb72d70f3b59cf3c98.js
--- a/dev/static/js/11.17d157f148499d1af3ae.js
+++ b/dev/static/js/11.17d157f148499d1af3ae.js
--- a/dev/static/js/14.51a1d19c98899b83356f.js
+++ b/dev/static/js/14.51a1d19c98899b83356f.js
--- a/dev/static/js/12.631e5d6f4becfed8523c.js
+++ b/dev/static/js/12.631e5d6f4becfed8523c.js
--- a/dev/static/js/15.30032705d1e0b3aa03e9.js
+++ b/dev/static/js/15.30032705d1e0b3aa03e9.js
--- a/dev/static/js/16.8d7eb9dd53dde6d7f14c.js
+++ b/dev/static/js/16.8d7eb9dd53dde6d7f14c.js
--- a/dev/static/js/17.255276ce4d8c15be4db2.js
+++ b/dev/static/js/17.255276ce4d8c15be4db2.js
--- a/dev/static/js/18.f3d7b94110fc6e2b0f06.js
+++ b/dev/static/js/18.f3d7b94110fc6e2b0f06.js
--- a/dev/static/js/13.7ed678425e44945ce745.js
+++ b/dev/static/js/13.7ed678425e44945ce745.js
--- a/dev/static/js/17.e7f6fa37b265093a4d43.js
+++ b/dev/static/js/17.e7f6fa37b265093a4d43.js
--- a/dev/static/js/18.b5bcfabc88d8c13e73e5.js
+++ b/dev/static/js/18.b5bcfabc88d8c13e73e5.js
--- a/dev/static/js/19.bb824225fdec4ba535f0.js
+++ b/dev/static/js/19.bb824225fdec4ba535f0.js
--- a/dev/static/js/2.07cceb1e803acf6db9f2.js
+++ b/dev/static/js/2.07cceb1e803acf6db9f2.js
--- a/dev/static/js/20.2f684fdd3c89f5915cc0.js
+++ b/dev/static/js/20.2f684fdd3c89f5915cc0.js
--- a/dev/static/js/20.7ebfa8f4c91914e77fef.js
+++ b/dev/static/js/20.7ebfa8f4c91914e77fef.js
--- a/dev/static/js/21.e7f7eb9f774000cc83ca.js
+++ b/dev/static/js/21.e7f7eb9f774000cc83ca.js
--- a/dev/static/js/22.eaac7e701de1edf25c4e.js
+++ b/dev/static/js/22.eaac7e701de1edf25c4e.js
--- a/dev/static/js/23.34774c7556175ec5edc1.js
+++ b/dev/static/js/23.34774c7556175ec5edc1.js
--- a/dev/static/js/24.f3601dcd673958fc32ef.js
+++ b/dev/static/js/24.f3601dcd673958fc32ef.js
--- a/dev/static/js/25.04fd3f15b9a0284d8896.js
+++ b/dev/static/js/25.04fd3f15b9a0284d8896.js
--- a/dev/static/js/26.270271a59d37b4a77b0d.js
+++ b/dev/static/js/26.270271a59d37b4a77b0d.js
--- a/dev/static/js/27.16245875ab7f8c9ff27c.js
+++ b/dev/static/js/27.16245875ab7f8c9ff27c.js
--- a/dev/static/js/28.1ccb5029fd0e4b1eb927.js
+++ b/dev/static/js/28.1ccb5029fd0e4b1eb927.js
--- a/dev/static/js/3.503dcd71b1717b18911e.js
+++ b/dev/static/js/3.503dcd71b1717b18911e.js
--- a/dev/static/js/29.1d38dfc535d5ff073768.js
+++ b/dev/static/js/29.1d38dfc535d5ff073768.js
--- a/dev/static/js/30.b63461282cfdd6308fad.js
+++ b/dev/static/js/30.b63461282cfdd6308fad.js
--- a/dev/static/js/31.1d9b056cab58aa69addc.js
+++ b/dev/static/js/31.1d9b056cab58aa69addc.js
--- a/dev/static/js/33.2c2efef87c9844fc3cf4.js
+++ b/dev/static/js/33.2c2efef87c9844fc3cf4.js
--- a/dev/static/js/32.bdc2d69db6de72eb8cb4.js
+++ b/dev/static/js/32.bdc2d69db6de72eb8cb4.js
--- a/dev/static/js/34.acbbc3488acfb4c9558b.js
+++ b/dev/static/js/34.acbbc3488acfb4c9558b.js
--- a/dev/static/js/34.de6dd06ce3cf927052cf.js
+++ b/dev/static/js/34.de6dd06ce3cf927052cf.js
--- a/dev/static/js/35.dd99e86c7c5f93e912b3.js
+++ b/dev/static/js/35.dd99e86c7c5f93e912b3.js
--- a/dev/static/js/36.b08e05deb2fbd68b8a28.js
+++ b/dev/static/js/36.b08e05deb2fbd68b8a28.js
--- a/dev/static/js/37.bac71fac563b85eb584f.js
+++ b/dev/static/js/37.bac71fac563b85eb584f.js
--- a/dev/static/js/38.6314b9669797423fd23b.js
+++ b/dev/static/js/38.6314b9669797423fd23b.js
--- a/dev/static/js/4.b504a301ad60083fa9b6.js
+++ b/dev/static/js/4.b504a301ad60083fa9b6.js
--- a/dev/static/js/39.3146301b90e1787c32df.js
+++ b/dev/static/js/39.3146301b90e1787c32df.js
--- a/dev/static/js/40.2e3059f5ceb70cf15062.js
+++ b/dev/static/js/40.2e3059f5ceb70cf15062.js
--- a/dev/static/js/41.e0c1ee31abd7525635a6.js
+++ b/dev/static/js/41.e0c1ee31abd7525635a6.js
--- a/dev/static/js/42.3362d132290ca513f321.js
+++ b/dev/static/js/42.3362d132290ca513f321.js
--- a/dev/static/js/43.0bd3aa57e4ab944faf10.js
+++ b/dev/static/js/43.0bd3aa57e4ab944faf10.js
--- a/dev/static/js/44.85969d2a9d7b8e916636.js
+++ b/dev/static/js/44.85969d2a9d7b8e916636.js
--- a/dev/static/js/45.83d29d45291dbaa688af.js
+++ b/dev/static/js/45.83d29d45291dbaa688af.js
--- a/dev/static/js/46.ea3e7515c164b9660fc4.js
+++ b/dev/static/js/46.ea3e7515c164b9660fc4.js
--- a/dev/static/js/47.a4c475d9d8b723e6861c.js
+++ b/dev/static/js/47.a4c475d9d8b723e6861c.js
--- a/dev/static/js/48.0ad5e74f1a79b31a5300.js
+++ b/dev/static/js/48.0ad5e74f1a79b31a5300.js
--- a/dev/static/js/48.c4054d308fdb4adf56a1.js
+++ b/dev/static/js/48.c4054d308fdb4adf56a1.js
--- a/dev/static/js/5.5255e63afe0aef34e090.js
+++ b/dev/static/js/5.5255e63afe0aef34e090.js
--- a/dev/static/js/49.7ce73a974766e3941637.js
+++ b/dev/static/js/49.7ce73a974766e3941637.js
--- a/dev/static/js/50.3c0ca06ebc16fb9d77c9.js
+++ b/dev/static/js/50.3c0ca06ebc16fb9d77c9.js
--- a/dev/static/js/7.660f5bdb4edd1edd55e7.js
+++ b/dev/static/js/7.660f5bdb4edd1edd55e7.js
--- a/dev/static/js/6.fd2048a132ac01c66f31.js
+++ b/dev/static/js/6.fd2048a132ac01c66f31.js
--- a/dev/static/js/7.5a275aa794d6e86574f4.js
+++ b/dev/static/js/7.5a275aa794d6e86574f4.js
--- a/dev/static/js/8.b8b60fb161ff88d940c0.js
+++ b/dev/static/js/8.b8b60fb161ff88d940c0.js
--- a/dev/static/js/9.97b956ce42ad06875d0b.js
+++ b/dev/static/js/9.97b956ce42ad06875d0b.js
--- a/dev/static/js/app.8a955169f611d7d1df5e.js
+++ b/dev/static/js/app.8a955169f611d7d1df5e.js
--- a/dev/static/js/app.ea8ce2bfd58a082956ac.js
+++ b/dev/static/js/app.ea8ce2bfd58a082956ac.js
--- a/dev/static/js/manifest.adbac863e2f3e26b90f4.js
+++ b/dev/static/js/manifest.adbac863e2f3e26b90f4.js
--- a/dev/static/js/manifest.d0f7f822783464587d25.js
+++ b/dev/static/js/manifest.d0f7f822783464587d25.js
--- a/dev/static/js/vendor-async.958ed8eae638066fd814.js
+++ b/dev/static/js/vendor-async.958ed8eae638066fd814.js
--- a/dev/static/js/vendor.5c7b919633d1497d7060.js
+++ b/dev/static/js/vendor.5c7b919633d1497d7060.js
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
@@ -256,9 +256,6 @@
          if(this.groupDetail.goods_type === 2 && !this.type){
            json.buy_type = 2
          }
-          if(this.group_order_id){
-            json.group_order_id = this.group_order_id
-          }
          if(this.invite_code){
            json.invite_code = this.invite_code
          }

--- a/src/components/buy/buySuccess.vue
+++ b/src/components/buy/buySuccess.vue
--- a/src/components/buy/passShop.vue
+++ b/src/components/buy/passShop.vue
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -342,9 +342,6 @@ export default {
    // window.scrollTo(0,0);
    let that = this
    // localStorageFn.set('liuyi',true)
-    // debugger
-    // cookie.delete('liuyi')
-    // console.log(html2canvas)
    this.unlook = localStorage.getItem('unlook');
    if(document.body.clientWidth>700){
      that.orientationchange=true

--- a/src/main.js
+++ b/src/main.js
@@ -40,9 +40,9 @@ Vue.component('scroll', scroll);
 // Vue.prototype.$throw = (error)=> errorHandler(error,this);
 /* eslint-disable no-new */
-if (process.env.NODE_ENV != 'production') {
+// if (process.env.NODE_ENV != 'production') {
-  new VConsole();
+//   new VConsole();
-}
+// }
 router.beforeEach((to, from, next) => {
  next()

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -445,6 +445,14 @@ const router = new Router({
        noNew: true,
      }
    },
+    {
+      path: '/passShop',
+      name: 'passShop',
+      component: e => require(['@/components/buy/passShop'], e),
+      meta: {
+        noNew: true,
+      }
+    },
    {
      path: '*',
      component: e => require(['@/components/error'], e),
@@ -491,7 +499,7 @@ router.beforeEach((to, from, next) => {
      next()
    }
  };
-  if (to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit') {
+  if (to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit' || to.name === 'passShop' ) {
    // 无需登录的页面
    console.log(488)
    next()

--- a/src/service/api.js
+++ b/src/service/api.js
@@ -350,4 +350,8 @@ export const getReceiveCouponApi = function (goods_id) {
 export const getCountTimeApi = function () {
  return Vue.prototype.$fetch(`/api/client/user/watch/time`)
 };
-///api/client/user/watch/time
+//领取商品可用优惠券
+export const getPassGoodInfoApi = function (goods_id) {
+  return Vue.prototype.$fetch(`/api/client/goods/info/no/auth/${goods_id}`)
+};
+///goods/info/no/auth/{goods_id}