620

ef68c983 · chenyishuai@singsingenglish.com · 0fa249dd · ef68c983 · 0fa249dd · ef68c983
Commit ef68c983 authored Jun 20, 2019 by chenyishuai@singsingenglish.com
7 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.d8e9f828786fff81e88a.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.3280fd311264702ddf68.js></script></body></html>
+        }</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.694b91ed923a671d6ee0.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.3280fd311264702ddf68.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/11.6142ce54950eb56c1359.js
+++ b/dev/static/js/11.6142ce54950eb56c1359.js
--- a/dev/static/js/11.8f71ed363d00da55cbc5.js
+++ b/dev/static/js/11.8f71ed363d00da55cbc5.js
--- a/dev/static/js/24.925b7ec5c0f1e6eae6fd.js
+++ b/dev/static/js/24.925b7ec5c0f1e6eae6fd.js
--- a/dev/static/js/manifest.d8e9f828786fff81e88a.js
+++ b/dev/static/js/manifest.d8e9f828786fff81e88a.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={46:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"da93ff1640ed7e809353",1:"8576667dbb88ead6b2a6",2:"6d3b63c4f8b4bdc1c90f",3:"5056a8f06532edee8808",4:"6528f0c70abdd51f99dd",5:"b5ec55e076dc518c6328",6:"54d14654e6a69232341f",7:"07cd733b10209e864be1",8:"737b260bf0bf06099e86",9:"a318302d76aaa3a2e31d",10:"4c098debba80cdf62453",11:"6142ce54950eb56c1359",12:"9ac8dea8c833f0231898",13:"1e86ad46f63aff07223a",14:"c44f1d07493f4a4a41b6",15:"bd0014a0f8e1c447eab3",16:"98ce85ad5ab95594e0f7",17:"c0ddbe89dfc32ff1b649",18:"0359b17f83f06cf51995",19:"e7fa951380a3baf4f132",20:"81210dd42f0ae76eeab1",21:"cd96acda4906a176b3af",22:"da0e52752d33c4b976b5",23:"52c139bed6992be26830",24:"925b7ec5c0f1e6eae6fd",25:"d8d2c6c6f4d5d50b1784",26:"fc6d0fbfdbbb6ba72635",27:"108c762e6804985b4b08",28:"1673a7e4466233c74228",29:"fa14b41d7c77e07c8120",30:"1462bc901d3511f4d593",31:"c13f346329db13512e9a",32:"9fd70a9f8ee45369ebbe",33:"251b1966a404efc50fad",34:"fa09b9b4595825929978",35:"4cc5c8808f6ddc45f715",36:"9594f93847f714f6511c",37:"5561b87aa887f3a9c76d",38:"b201feadfefea39aa937",39:"8e53c672f4d3c67c1858",40:"14d5af2c3f95a297e399",41:"2029e6324e09b0e2cd49",42:"0b8b7d3b5740983f5d3f",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var t,b,o,i=0,u=[];i<f.length;i++)b=f[i],c[b]&&u.push(c[b][0]),c[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var f={},c={46:0};function d(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,d),c.l=!0,c.exports}d.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,d){a=c[e]=[f,d]});a[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"da93ff1640ed7e809353",1:"8576667dbb88ead6b2a6",2:"6d3b63c4f8b4bdc1c90f",3:"5056a8f06532edee8808",4:"6528f0c70abdd51f99dd",5:"b5ec55e076dc518c6328",6:"54d14654e6a69232341f",7:"07cd733b10209e864be1",8:"737b260bf0bf06099e86",9:"a318302d76aaa3a2e31d",10:"4c098debba80cdf62453",11:"8f71ed363d00da55cbc5",12:"9ac8dea8c833f0231898",13:"1e86ad46f63aff07223a",14:"c44f1d07493f4a4a41b6",15:"bd0014a0f8e1c447eab3",16:"98ce85ad5ab95594e0f7",17:"c0ddbe89dfc32ff1b649",18:"0359b17f83f06cf51995",19:"e7fa951380a3baf4f132",20:"81210dd42f0ae76eeab1",21:"cd96acda4906a176b3af",22:"da0e52752d33c4b976b5",23:"52c139bed6992be26830",24:"bc0dbefbb05a76e204b6",25:"d8d2c6c6f4d5d50b1784",26:"fc6d0fbfdbbb6ba72635",27:"108c762e6804985b4b08",28:"1673a7e4466233c74228",29:"fa14b41d7c77e07c8120",30:"1462bc901d3511f4d593",31:"c13f346329db13512e9a",32:"9fd70a9f8ee45369ebbe",33:"251b1966a404efc50fad",34:"fa09b9b4595825929978",35:"4cc5c8808f6ddc45f715",36:"9594f93847f714f6511c",37:"5561b87aa887f3a9c76d",38:"b201feadfefea39aa937",39:"8e53c672f4d3c67c1858",40:"14d5af2c3f95a297e399",41:"2029e6324e09b0e2cd49",42:"0b8b7d3b5740983f5d3f",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/mine/addressEdit.vue
+++ b/src/components/mine/addressEdit.vue
@@ -107,7 +107,7 @@ export default {
    },
    getUserAddress: function () {
      getActivityAddressApi().then((res) => {
-        if(res){
+        if(res.receive_name){
          let addressInfo = res;
          this.receiveName = addressInfo.receive_name ? addressInfo.receive_name : '';
          this.receiveMobile = addressInfo.receive_mobile;
@@ -128,7 +128,7 @@ export default {
 .addressEdit {
  background: #f5f5f9;
-  .mint-cell-wrapper{border-bottom: 1px solid #E2E2E2;width: 94%;}
+  // .mint-cell-wrapper{border-bottom: 1px solid #E2E2E2;width: 94%;}
  input::-webkit-input-placeholder{color:#CCCCCC;}
  .van-popup{background: white;}
  .gray{background: #CCCCCC;border: none;}
@@ -151,7 +151,7 @@ export default {
     color: rgb(219, 208, 204);
     position: absolute;
     top:98* @toVw;
-     left: 111* @toVw;
+     left: 103* @toVw;
    //  font-size: 
   }
  // .mint-cell-value{color: #333333;}

--- a/src/components/star/starRank.vue
+++ b/src/components/star/starRank.vue
@@ -281,7 +281,7 @@ export default {
        // console.log(this.tabIndex)
      })
      getActivityAddressApi().then(res=>{
-        if(res.length){
+        if(res.receive_name){
          this.addressObj = res
        }
      });