支付提交

0e9a11a6 · IvyXia123 · 54d52ab8 · 0e9a11a6 · 0e9a11a6 · 0e9a11a6
Commit 0e9a11a6 authored Sep 27, 2019 by IvyXia123
7 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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.264c50a0ebe6e6cc7af8.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.d64183541ae3d7fbf23c.js></script></body></html>
+        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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.fbd2e589c62d7ae1eff0.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.b58e5b5d6607d1336963.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/47.b4c66a0e3c8219f14770.js
+++ b/dist/static/js/47.b4c66a0e3c8219f14770.js
--- a/dist/static/js/app.d64183541ae3d7fbf23c.js
+++ b/dist/static/js/app.d64183541ae3d7fbf23c.js
--- a/dist/static/js/manifest.264c50a0ebe6e6cc7af8.js
+++ b/dist/static/js/manifest.264c50a0ebe6e6cc7af8.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(f&&f(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},a={69:0};function d(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,d){f=a[e]=[c,d]});f[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"ae6d2eb4f06f9106a0ee",1:"8d5852f2ec9ad4d5ee85",2:"6fc3fd4f87b5f4fd1a3f",3:"cc023d5c874b9141a208",4:"aa3f49b3c3e5f1772157",5:"def8f4d8646672b08ed7",6:"902c1ac874941b0dd409",7:"860e58d41962f4e0ab50",8:"27ebe98fd09ac8d0b165",9:"ee87105b48f64b787127",10:"578b6bc67d58dc820b09",11:"65885c6f888e6ef9f63b",12:"bcd5e8f1318bb3c79e8d",13:"b01b98d68e1fa7d2364f",14:"d411dd43f6f87ec93d9f",15:"b7be808bd16c3c2b27de",16:"31a81e9a84fff14ea15a",17:"8be5a5f18a06a704996e",18:"2af804e8cbf10128cd98",19:"3465ee66a06d6a2976a0",20:"b9ef4345e91aef98aeab",21:"e07095365ce1beacb006",22:"b561ae9eecfbbafededb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"893d97c0c3bfc70d5efe",26:"0be4571ab390eb999425",27:"8ee0be7fbb0fb087db54",28:"853f88fddc6cdf6e76dd",29:"55a9f695dc4d85b00f82",30:"2272497b4ac6f7f9d683",31:"496a4f1feee35020b28e",32:"2fe57e5391faf7679e88",33:"23d58fac9b8c404b3188",34:"4b8b51094caa00ff9b1c",35:"f02b529bcd0f44cb0d63",36:"06ed863f8aa3d15b0c68",37:"813b04277d4a12e809a4",38:"3ca2090614a86bd3d8df",39:"a4a12d5e85d54caccf7c",40:"ff3778361e9c6e46fe3d",41:"441276f0ad5e7f00212d",42:"71228043e13acf59dc5c",43:"258c5a2a0219e06992af",44:"bb2ae7a02495e20df4c8",45:"d55c8bbbb2bd98e7c07a",46:"27ea399e0901f7ab807f",47:"b4c66a0e3c8219f14770",48:"3a715ff2fe5ab9ac84f8",49:"5e454442d7bf0135d9ef",50:"fb4ef93cfadffac2e7b0",51:"005a161e611e7c8a6810",52:"76d2f64279f977b68354",53:"7c84d0c3360d9f1faf71",54:"3e441ce6f21d3020c5ba",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"de878d75a83684169295",59:"c5bb7e2ee330bcffa04d",60:"e197d19bcfe7fcc6ed05",61:"253b4ccb0686ebc6fa49",62:"64d908b6b439898533ec",63:"f6ff62d24eb5ce25ba96",64:"caf94f2c30470c5b5010",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,f,c){d.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(f,"a",f),f},d.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(f&&f(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},a={69:0};function d(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,d){f=a[e]=[c,d]});f[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"ae6d2eb4f06f9106a0ee",1:"8d5852f2ec9ad4d5ee85",2:"6fc3fd4f87b5f4fd1a3f",3:"cc023d5c874b9141a208",4:"aa3f49b3c3e5f1772157",5:"def8f4d8646672b08ed7",6:"902c1ac874941b0dd409",7:"860e58d41962f4e0ab50",8:"27ebe98fd09ac8d0b165",9:"ee87105b48f64b787127",10:"578b6bc67d58dc820b09",11:"65885c6f888e6ef9f63b",12:"bcd5e8f1318bb3c79e8d",13:"b01b98d68e1fa7d2364f",14:"d411dd43f6f87ec93d9f",15:"b7be808bd16c3c2b27de",16:"31a81e9a84fff14ea15a",17:"8be5a5f18a06a704996e",18:"2af804e8cbf10128cd98",19:"3465ee66a06d6a2976a0",20:"b9ef4345e91aef98aeab",21:"e07095365ce1beacb006",22:"b561ae9eecfbbafededb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"893d97c0c3bfc70d5efe",26:"0be4571ab390eb999425",27:"8ee0be7fbb0fb087db54",28:"853f88fddc6cdf6e76dd",29:"55a9f695dc4d85b00f82",30:"2272497b4ac6f7f9d683",31:"496a4f1feee35020b28e",32:"2fe57e5391faf7679e88",33:"23d58fac9b8c404b3188",34:"4b8b51094caa00ff9b1c",35:"f02b529bcd0f44cb0d63",36:"06ed863f8aa3d15b0c68",37:"813b04277d4a12e809a4",38:"3ca2090614a86bd3d8df",39:"a4a12d5e85d54caccf7c",40:"ff3778361e9c6e46fe3d",41:"441276f0ad5e7f00212d",42:"71228043e13acf59dc5c",43:"258c5a2a0219e06992af",44:"bb2ae7a02495e20df4c8",45:"d55c8bbbb2bd98e7c07a",46:"27ea399e0901f7ab807f",47:"606f7541dd79e6573d14",48:"3a715ff2fe5ab9ac84f8",49:"5e454442d7bf0135d9ef",50:"fb4ef93cfadffac2e7b0",51:"005a161e611e7c8a6810",52:"76d2f64279f977b68354",53:"7c84d0c3360d9f1faf71",54:"3e441ce6f21d3020c5ba",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"de878d75a83684169295",59:"c5bb7e2ee330bcffa04d",60:"e197d19bcfe7fcc6ed05",61:"253b4ccb0686ebc6fa49",62:"64d908b6b439898533ec",63:"f6ff62d24eb5ce25ba96",64:"caf94f2c30470c5b5010",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,f,c){d.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(f,"a",f),f},d.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/buy/buySuccess.vue
+++ b/src/components/buy/buySuccess.vue
@@ -111,13 +111,10 @@ export default {
          this.groupDetail = data
        })
      }else {
-        console.log("支付：" + 454235)
        this.groupDetail = JSON.parse(localStorage.getItem('groupDetail'));
-        console.log(this.groupDetail)
      }
      if (sessionStorage.getItem("buyindex") == 1) {
        getUserDetailApi().then(res => {
-          console.log(res, 22222)
          localStorage.setItem("userDesc", JSON.stringify(res));
          this.userDesc = res;
          this.subscribe = this.userDesc.open_info.is_subscribe;
@@ -131,7 +128,6 @@ export default {
        });
      } else {
        this.userDesc = JSON.parse(localStorage.getItem("userDesc"));
-        console.log(this.userDesc)
        this.subscribe = this.userDesc.open_info.is_subscribe;
        getOrderDetailApi(this.orderNo).then(res => {
          this.goods_id = res.goods_id;

--- a/src/main.js
+++ b/src/main.js
@@ -58,7 +58,7 @@ if(window.localStorage.out_trade_no) {
      if(res.status === "SUCCESS") {
        sessionStorage.setItem("buyindex", 1);
        Dialog.confirm({ title: '标题', message: '支付成功'}).then(() => {
-          if(outTradEno.goods_type == 1) {
+          if(res.buy_type == 1) {
            router.push({ name: "buySuccess",  query: outTradEno });
          }else {
            router.push({ name: "success", query: outTradEno });

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -629,9 +629,6 @@ router.beforeEach((to, from, next) => {
    localStorage.setItem('cct_user_id', common.getUrlParam().cct_user_id);
    localStorage.setItem('redeem_code', common.getUrlParam().cct_user_id);
  }
  // extensionV1Shop
  // extensionV1
  if (to.name === 'order' || to.name === 'buySuccess' ||  to.name === 'success' || to.name === 'guidelines' || to.name === 'spcShop' || to.name === 'mpShop' || to.name === 'extensionV1Shop' || to.name === 'extensionV1' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit'  || to.name === 'buyDetail'|| to.name === 'passShop'|| to.name === 'ybIndex' ) {