4.18

239f10dd · chenyishuai@singsingenglish.com · 83a8905c · 239f10dd · 83a8905c · 239f10dd
Commit 239f10dd authored Apr 18, 2019 by chenyishuai@singsingenglish.com
5 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.f016ba765d8b5ed4f51f80904de686cd.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.36befd4825d7f13fd31b.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.d5f5fa5968ab41d9459d.js></script></body></html>
\ No newline at end of file
+        }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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.2642ce5de5c3d7654ee5.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.d5f5fa5968ab41d9459d.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/8.7fb695ec1c525bc4a53b.js
+++ b/dev/static/js/8.7fb695ec1c525bc4a53b.js
--- a/dev/static/js/8.b556016bed449e73a0e1.js
+++ b/dev/static/js/8.b556016bed449e73a0e1.js
--- a/dev/static/js/manifest.36befd4825d7f13fd31b.js
+++ b/dev/static/js/manifest.36befd4825d7f13fd31b.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={35:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"c812fee810d76562c256",1:"cf672d22abe13040a43b",2:"b036dd58b5b725f0ac56",3:"8dfb98444be7be3da1f8",4:"cdf31adad2a6a45f7c0f",5:"aaf704a2afdad27e785d",6:"49b3695fbd2d990d2894",7:"2a5254f70cbab5f9c0d7",8:"7fb695ec1c525bc4a53b",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"43f421c3eb64a990eab2",14:"0c5e62e6b434c95d03ae",15:"41891c3305defdb96564",16:"7c5c0be3f8db0f62bd91",17:"853adc3315c2f095d554",18:"deb5e2d1e8ead14ac201",19:"5478c1b4f0bb4a05cfb2",20:"4d03512be3a553567e4a",21:"795a6773fdc82edebf56",22:"b2b1e56e8ed816005297",23:"fb5f9e53f1c0866bff74",24:"afb3e5a1f610d054d5c9",25:"515dd3235544c43fc199",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"d547450680950bf22eeb",29:"c2eed2e6a0b5c18a746b",30:"9afcd9ee64dd8a85d769",31:"40ffa653a51d55ef6be0",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,t,f){for(var d,o,b,i=0,u=[];i<n.length;i++)o=n[i],r[o]&&u.push(r[o][0]),r[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(a&&a(n,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=c(c.s=f[i]);return b};var n={},r={35:0};function c(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,c){a=r[e]=[n,c]});a[2]=n;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"c812fee810d76562c256",1:"cf672d22abe13040a43b",2:"b036dd58b5b725f0ac56",3:"8dfb98444be7be3da1f8",4:"cdf31adad2a6a45f7c0f",5:"aaf704a2afdad27e785d",6:"49b3695fbd2d990d2894",7:"2a5254f70cbab5f9c0d7",8:"b556016bed449e73a0e1",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"43f421c3eb64a990eab2",14:"0c5e62e6b434c95d03ae",15:"41891c3305defdb96564",16:"7c5c0be3f8db0f62bd91",17:"853adc3315c2f095d554",18:"deb5e2d1e8ead14ac201",19:"5478c1b4f0bb4a05cfb2",20:"4d03512be3a553567e4a",21:"795a6773fdc82edebf56",22:"b2b1e56e8ed816005297",23:"fb5f9e53f1c0866bff74",24:"afb3e5a1f610d054d5c9",25:"515dd3235544c43fc199",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"d547450680950bf22eeb",29:"c2eed2e6a0b5c18a746b",30:"9afcd9ee64dd8a85d769",31:"40ffa653a51d55ef6be0",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),n},c.m=e,c.c=n,c.d=function(e,a,n){c.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(a,"a",a),a},c.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},c.p="",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/buy/success.vue
+++ b/src/components/buy/success.vue
@@ -26,7 +26,7 @@
    <!-- <div class="banner">
      <img :src="img.weChat">
    </div> -->
-    <div class="shop-block" v-if="groupDetail">
+    <div class="shop-block" v-if="groupDetail&&subscribe==1">
      <div class="shop">
        <div class="img-block">
          <img :src="groupDetail.goods_desc.img[0].url">
@@ -80,7 +80,8 @@
  import successIconUrl from '../../assets/successIcon.png'
  import weChatQrUrl from '../../assets/weChatCode.png'
  import weChatIcon from '../../assets/wechat.jpg'
-  import {getwechatParam,getOrderDetailApi,getGoodsDetailApi} from "../../service/api";
+  import {Toast} from 'vant'
+  import {getwechatParam,getOrderDetailApi,getGoodsDetailApi,getUserDetailApi} from "../../service/api";
  import shareUrl from '../../assets/Bitmap@2x.png'
  export default {
    name: "success",
@@ -107,7 +108,7 @@
        m:0,
        s:0,
        userDesc:{},
-        subscribe:''
+        subscribe:'2'
      }
    },
    computed:{
@@ -185,12 +186,22 @@
        })
      },
      initPage(){
+        Toast.loading({
+          mask: true,
+          message: ''
+        });
        if(this.$route.query.out_trade_no&&this.$route.query.out_trade_no !== '' && this.$route.query.out_trade_no !== null){
          this.orderNo =  this.$route.query.out_trade_no;
        }else{
          this.groupId =  this.$route.query.groupId;
        }
-        getOrderDetailApi(this.orderNo).then(res=>{
+        getUserDetailApi().then(res=>{
+        // debugger
+          localStorage.setItem('userDesc',JSON.stringify(res));
+        this.userDesc = res
+        this.subscribe = this.userDesc.open_info.subscribe
+          getOrderDetailApi(this.orderNo).then(res=>{
+            Toast.clear()
          console.log(res)
          this.groupId =  res.order_group_id;
          this.user_info = res.user_info;
@@ -224,8 +235,13 @@
            this.onShare();
          })
        })
-        this.userDesc = JSON.parse(localStorage.getItem('userDesc'))
-        this.subscribe = this.userDesc.open_info.subscribe
+        }).catch((res)=>{
+          console.log(res)
+          // debugger
+          if(localStorage.getItem('userDesc')){
+          }
+        });
+
      },

      leftTimer(){
@@ -259,12 +275,12 @@
    color: #BAB9B5;
    font-size: 12px;
    text-align: center;
-    padding: 10px 0 8px;
+    padding: 33px 0 8px;
    img{width: 12px;height: 12px;}
  }
  .step2Box{
    width: 343*@toVw;
-    height:207*@toVw;
+    height:360*@toVw;
    background: #f3e8d2;
    border: 2px dashed #d8c0a6;
    text-align: center;
@@ -272,7 +288,7 @@
      .p1{color: #CF1322;font-size: 16px;line-height: 22px;margin-top: 10px;}
      .p2{color: #CF1322;font-size: 14px;line-height: 20px;}
    }
-    img{width: 134*@toVw;margin-top: 10*@toVw;}
+    img{width: 264*@toVw;margin-top: 10*@toVw;}
  }
  .block-white{
    height: 60 *@toVw;