620

63591658 · chenyishuai@singsingenglish.com · bb53a6f1 · 63591658 · 63591658 · 63591658
Commit 63591658 authored Jun 21, 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.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.965957e4039c8f71b383.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.66faa984322e04e868f1.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.640a2e0afcc01ff05ac3.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.66faa984322e04e868f1.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/18.4d2a96cc4b7a79d3a61c.js
+++ b/dev/static/js/18.4d2a96cc4b7a79d3a61c.js
--- a/dev/static/js/manifest.965957e4039c8f71b383.js
+++ b/dev/static/js/manifest.965957e4039c8f71b383.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var d,b,o,i=0,u=[];i<f.length;i++)b=f[i],c[b]&&u.push(c[b][0]),c[b]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var f={},c={46:0};function n(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,n){a=c[e]=[f,n]});a[2]=f;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:"66f30f37970d706e6b17",1:"d5f0428b3266b3abeda1",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"6ce25ae809dcabe97131",8:"4c37bd70d65f96539867",9:"d8fa80fce9ae41ef689a",10:"de3e0e9cd5ee98d6c928",11:"68ed40adad67d85c0313",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"443e7c8bba8ab9d657a7",16:"98ce85ad5ab95594e0f7",17:"c9ce4f409d177a19d16d",18:"4d2a96cc4b7a79d3a61c",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"435db0664814c2a63988",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 d=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(d);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var d,b,o,i=0,u=[];i<f.length;i++)b=f[i],c[b]&&u.push(c[b][0]),c[b]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var f={},c={46:0};function n(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,n){a=c[e]=[f,n]});a[2]=f;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:"66f30f37970d706e6b17",1:"d5f0428b3266b3abeda1",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"6ce25ae809dcabe97131",8:"4c37bd70d65f96539867",9:"d8fa80fce9ae41ef689a",10:"de3e0e9cd5ee98d6c928",11:"68ed40adad67d85c0313",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"443e7c8bba8ab9d657a7",16:"98ce85ad5ab95594e0f7",17:"c9ce4f409d177a19d16d",18:"2dba3cc2c130a74eecdc",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"435db0664814c2a63988",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 d=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(d);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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/buy/index.vue
+++ b/src/components/buy/index.vue
@@ -120,7 +120,7 @@
            </div>
            <div
              :class=" groupData && groupData.status !== 0 ? 'btn big price':'btn big'"
-              @click="groupPay(0);buttonClick('购买按钮',groupId ? '重新开团':'单独购买')"
+              @click="groupPay(0,'suc');buttonClick('购买按钮',groupId ? '重新开团':'单独购买')"
              :id="groupId ? 'reGroup':'singleBuy'"
            >
              <span v-if="!groupId">￥{{groupDetail.original_price/100}}</span>
@@ -252,7 +252,8 @@ export default {
      groupDetail: false,
      groupData: null,
      couponInfo: {},
-      couponShadow: false
+      couponShadow: false,
+      groupSuc:''
    };
  },
  mounted() {
@@ -283,19 +284,22 @@ export default {
      if (this.buyType === 0 && !this.groupId) {
        query.type = "single";
        this.buyType = "single";
-      } else if (this.buyType === 0 && this.groupId) {
-        // debugger
+      }
+       else if (this.buyType === 0 && this.groupId) {
        // 已购买生成团
        this.$router.push({
-          name: "buyDetail",
+          name: "buy",
          query: {
            shopId: this.shopId,
-            invite_code: this.invite_code
+            invite_code: this.invite_code,
+            type:""
          }
        });
-        window.location.reload();
+        // debugger
+        // window.location.reload();
        return false;
-      } else {
+      }
+       else {
        query.type = "";
      }
      if (localStorage.getItem("gdt_vid")) {
@@ -306,6 +310,8 @@ export default {
      if (window.location.href.indexOf("cct_user_id") > -1) {
        query.cct_user_id = comment.getUrlParam().cct_user_id;
      }
+      console.log(query)
+      // debugger
      this.$router.push({
        name: "buy",
        query: query
@@ -553,24 +559,21 @@ export default {
        buttonName: buttonName
      });
    },
-    groupPay(type) {
-      console.log(JSON.parse(localStorage.getItem("userDesc")).mobile)
+    groupPay(type,status) {
      this.buyType = type;
+      if(status){
+        this.groupSuc = status
+        // console.log(status)
+      }
      if (
        !JSON.parse(localStorage.getItem("userDesc")).mobile ||
        JSON.parse(localStorage.getItem("userDesc")).mobile === ""
      ) {
-        // debugger
-        
-        if(!this.$route.query.groupId){
        this.bindMobile.flag = type;
        this.bindMobile.show = true;
        setTimeout(() => {
          this.$sa.track("ViewRegisterpage", {});
        }, 1000);
-        }else{
-          this.goToBuyPage();
-        }
      } else {
        this.goToBuyPage();
      }