liwei

296b5aa9 · liwei · c7fb7865 · 296b5aa9 · 296b5aa9 · c7fb7865
Commit 296b5aa9 authored Jul 02, 2019 by liwei
7 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.add2d2a61dfaa3b86332.js></script><script type=text/javascript src=static/js/vendor.4c54d1e3ed1fbf8fe16d.js></script><script type=text/javascript src=static/js/app.3b91d10e8de066cf361e.js></script></body></html>
\ No newline at end of file
+        /* 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.86b8f26a5d438859f323.js></script><script type=text/javascript src=static/js/vendor.4c54d1e3ed1fbf8fe16d.js></script><script type=text/javascript src=static/js/app.3b91d10e8de066cf361e.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/3.6adc3c3e7951833f732c.js
+++ b/dev/static/js/3.6adc3c3e7951833f732c.js
--- a/dev/static/js/5.78dc0d450bb412a51806.js
+++ b/dev/static/js/5.78dc0d450bb412a51806.js
--- a/dev/static/js/5.85f42979ca423086c2ef.js
+++ b/dev/static/js/5.85f42979ca423086c2ef.js
--- a/dev/static/js/manifest.add2d2a61dfaa3b86332.js
+++ b/dev/static/js/manifest.add2d2a61dfaa3b86332.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var b,o,d,i=0,u=[];i<f.length;i++)o=f[i],a[o]&&u.push(a[o][0]),a[o]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var f={},a={47:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[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:"dd8ea6a7e9072fb5be4a",1:"ffe3a2f12bcb0615902f",2:"9043b16e63fdd53d0f5e",3:"6adc3c3e7951833f732c",4:"4de6edc3006e75ebe76f",5:"78dc0d450bb412a51806",6:"49ec4166bdcb9c3655f0",7:"a3591b982aefc1a53327",8:"66bbc89c202a66cc81ae",9:"8930f666bcd46a4de8dc",10:"681a02b9c28151c39d6f",11:"c14c3aad06f86693a57f",12:"5b384228e65b702f78cb",13:"447bf5f7da5f881a2388",14:"cbe2b61570c1997bb119",15:"43f92e0a5e45ec76183c",16:"f8231b433cdcc14dadac",17:"2ff785807e8eeb754ac4",18:"c3a93273bb3ae4b7dafa",19:"3eed88069afd94469d0f",20:"36db71ebefcf9ac79b82",21:"77c7f6ee30648ac5055f",22:"e5ef952c2fb531efe208",23:"1ef0e12d26a42b9f733a",24:"02b51883118642314f7e",25:"78c4ba32dfe1be4550d1",26:"0e35e57a72cc21330061",27:"3d67383e6bd7ee4e5f3f",28:"44449f452975b279fbf0",29:"ae0a6646f480c3905151",30:"47c460a7adbdabb7a29b",31:"aa40731a2459ff29e90d",32:"c434bea6e6961cff41c2",33:"a729b75d0d25c3308a1d",34:"f689b542b5ae22569ccf",35:"b9f709a2f6763b88f3ab",36:"f93a47bcf5f49b461dfb",37:"72a378819978f73fe791",38:"52e53e780cc0fe367a85",39:"ee7efc201792fb872d69",40:"d9f78fe0911a1e7a0f16",41:"e3200e038523549c8401",42:"7f42672c8911b18175c5",43:"b89c87b547ef4c02056d",44:"96ccc6ea2817e62a98bd"}[e]+".js";var b=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(b);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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 console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var b,o,d,i=0,u=[];i<f.length;i++)o=f[i],a[o]&&u.push(a[o][0]),a[o]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var f={},a={47:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[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:"dd8ea6a7e9072fb5be4a",1:"ffe3a2f12bcb0615902f",2:"9043b16e63fdd53d0f5e",3:"da40b00df8fddc26c085",4:"4de6edc3006e75ebe76f",5:"85f42979ca423086c2ef",6:"49ec4166bdcb9c3655f0",7:"a3591b982aefc1a53327",8:"66bbc89c202a66cc81ae",9:"8930f666bcd46a4de8dc",10:"681a02b9c28151c39d6f",11:"c14c3aad06f86693a57f",12:"5b384228e65b702f78cb",13:"447bf5f7da5f881a2388",14:"cbe2b61570c1997bb119",15:"43f92e0a5e45ec76183c",16:"f8231b433cdcc14dadac",17:"2ff785807e8eeb754ac4",18:"c3a93273bb3ae4b7dafa",19:"3eed88069afd94469d0f",20:"36db71ebefcf9ac79b82",21:"77c7f6ee30648ac5055f",22:"e5ef952c2fb531efe208",23:"1ef0e12d26a42b9f733a",24:"02b51883118642314f7e",25:"78c4ba32dfe1be4550d1",26:"0e35e57a72cc21330061",27:"3d67383e6bd7ee4e5f3f",28:"44449f452975b279fbf0",29:"ae0a6646f480c3905151",30:"47c460a7adbdabb7a29b",31:"aa40731a2459ff29e90d",32:"c434bea6e6961cff41c2",33:"a729b75d0d25c3308a1d",34:"f689b542b5ae22569ccf",35:"b9f709a2f6763b88f3ab",36:"f93a47bcf5f49b461dfb",37:"72a378819978f73fe791",38:"52e53e780cc0fe367a85",39:"ee7efc201792fb872d69",40:"d9f78fe0911a1e7a0f16",41:"e3200e038523549c8401",42:"7f42672c8911b18175c5",43:"b89c87b547ef4c02056d",44:"96ccc6ea2817e62a98bd"}[e]+".js";var b=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(b);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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 console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/mine/address.vue
+++ b/src/components/mine/address.vue
@@ -137,10 +137,10 @@ export default {
              if (typeof res.deliver_detail == "object") {
                if (res.deliver_detail instanceof Array) {
                  if (res.deliver_detail.length > 0) {
-                    this.deliverDetail = res.deliverDetail[0];
+                    this.deliverDetail = res.deliver_detail[0];
                  }
                } else {
-                  this.deliverDetail = res.deliverDetail;
+                  this.deliverDetail = res.deliver_detail;
                }
              }
            }
@@ -155,6 +155,18 @@ export default {
                }
              }
            }
+            if (
+              !this.deliverDetail.receive_name ||
+              this.deliverDetail.receive_name.length === 0 ||
+              !this.deliverDetail.receive_mobile ||
+              this.deliverDetail.receive_mobile.length === 0 ||
+              !this.deliverDetail.address ||
+              this.deliverDetail.address.length === 0
+            ) {
+              this.isShowCurrent = false;
+            } else {
+              this.isShowCurrent = true;
+            }
            if (
              !this.noDeliverDetail.receive_name ||
              this.noDeliverDetail.receive_name.length === 0 ||

--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
@@ -117,10 +117,10 @@ export default {
              if (typeof res.deliver_detail == "object") {
                if (res.deliver_detail instanceof Array) {
                  if (res.deliver_detail.length > 0) {
-                    this.deliverDetail = res.deliverDetail[0];
+                    this.deliverDetail = res.deliver_detail[0];
                  }
                } else {
-                  this.deliverDetail = res.deliverDetail;
+                  this.deliverDetail = res.deliver_detail;
                }
              }
            }