liwei

3dbd8acc · liwei · 77b97ff4 · 3dbd8acc · 3dbd8acc · 3dbd8acc
Commit 3dbd8acc authored Jul 02, 2019 by liwei
68 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.d6b59e638c8b14385d0d.js></script><script type=text/javascript src=static/js/vendor.0c0fd269a85b0b124df6.js></script><script type=text/javascript src=static/js/app.3e82d3e8482792f3f30b.js></script></body></html>
+        /* 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.fd93ec6ba8a5c264513c.js></script><script type=text/javascript src=static/js/vendor.0c0fd269a85b0b124df6.js></script><script type=text/javascript src=static/js/app.0604f3b573dff906ccd4.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.dd8ea6a7e9072fb5be4a.js
+++ b/dev/static/js/0.dd8ea6a7e9072fb5be4a.js
--- a/dev/static/js/1.965417a30eadb453274e.js
+++ b/dev/static/js/1.965417a30eadb453274e.js
--- a/dev/static/js/1.ffe3a2f12bcb0615902f.js
+++ b/dev/static/js/1.ffe3a2f12bcb0615902f.js
--- a/dev/static/js/10.26def7c3616cf36cf732.js
+++ b/dev/static/js/10.26def7c3616cf36cf732.js
--- a/dev/static/js/10.681a02b9c28151c39d6f.js
+++ b/dev/static/js/10.681a02b9c28151c39d6f.js
--- a/dev/static/js/18.c3a93273bb3ae4b7dafa.js
+++ b/dev/static/js/18.c3a93273bb3ae4b7dafa.js
--- a/dev/static/js/11.c14c3aad06f86693a57f.js
+++ b/dev/static/js/11.c14c3aad06f86693a57f.js
--- a/dev/static/js/12.190a7f38a4d5988d52ea.js
+++ b/dev/static/js/12.190a7f38a4d5988d52ea.js
--- a/dev/static/js/12.5b384228e65b702f78cb.js
+++ b/dev/static/js/12.5b384228e65b702f78cb.js
--- a/dev/static/js/13.33f41ee822bd5fb60e57.js
+++ b/dev/static/js/13.33f41ee822bd5fb60e57.js
--- a/dev/static/js/13.447bf5f7da5f881a2388.js
+++ b/dev/static/js/13.447bf5f7da5f881a2388.js
--- a/dev/static/js/14.25895a97757b2945f070.js
+++ b/dev/static/js/14.25895a97757b2945f070.js
--- a/dev/static/js/14.cbe2b61570c1997bb119.js
+++ b/dev/static/js/14.cbe2b61570c1997bb119.js
--- a/dev/static/js/15.43f92e0a5e45ec76183c.js
+++ b/dev/static/js/15.43f92e0a5e45ec76183c.js
--- a/dev/static/js/15.56bd2e12f115188cd7ea.js
+++ b/dev/static/js/15.56bd2e12f115188cd7ea.js
--- a/dev/static/js/16.26f36b5dbfdf42ac4b0d.js
+++ b/dev/static/js/16.26f36b5dbfdf42ac4b0d.js
--- a/dev/static/js/16.f8231b433cdcc14dadac.js
+++ b/dev/static/js/16.f8231b433cdcc14dadac.js
--- a/dev/static/js/17.2ff785807e8eeb754ac4.js
+++ b/dev/static/js/17.2ff785807e8eeb754ac4.js
--- a/dev/static/js/17.64855326b8e8140f732b.js
+++ b/dev/static/js/17.64855326b8e8140f732b.js
--- a/dev/static/js/18.f518ec626c15c7282b34.js
+++ b/dev/static/js/18.f518ec626c15c7282b34.js
--- a/dev/static/js/19.3eed88069afd94469d0f.js
+++ b/dev/static/js/19.3eed88069afd94469d0f.js
--- a/dev/static/js/19.67e29b40ac62e5c248aa.js
+++ b/dev/static/js/19.67e29b40ac62e5c248aa.js
--- a/dev/static/js/2.65605480950e253d47ff.js
+++ b/dev/static/js/2.65605480950e253d47ff.js
--- a/dev/static/js/2.9043b16e63fdd53d0f5e.js
+++ b/dev/static/js/2.9043b16e63fdd53d0f5e.js
--- a/dev/static/js/20.36db71ebefcf9ac79b82.js
+++ b/dev/static/js/20.36db71ebefcf9ac79b82.js
--- a/dev/static/js/21.77c7f6ee30648ac5055f.js
+++ b/dev/static/js/21.77c7f6ee30648ac5055f.js
--- a/dev/static/js/22.e5ef952c2fb531efe208.js
+++ b/dev/static/js/22.e5ef952c2fb531efe208.js
--- a/dev/static/js/24.02b51883118642314f7e.js
+++ b/dev/static/js/24.02b51883118642314f7e.js
--- a/dev/static/js/23.1ef0e12d26a42b9f733a.js
+++ b/dev/static/js/23.1ef0e12d26a42b9f733a.js
--- a/dev/static/js/25.78c4ba32dfe1be4550d1.js
+++ b/dev/static/js/25.78c4ba32dfe1be4550d1.js
--- a/dev/static/js/26.0e35e57a72cc21330061.js
+++ b/dev/static/js/26.0e35e57a72cc21330061.js
--- a/dev/static/js/27.3d67383e6bd7ee4e5f3f.js
+++ b/dev/static/js/27.3d67383e6bd7ee4e5f3f.js
--- a/dev/static/js/26.a09e2120bf73a20c2b16.js
+++ b/dev/static/js/26.a09e2120bf73a20c2b16.js
--- a/dev/static/js/28.44449f452975b279fbf0.js
+++ b/dev/static/js/28.44449f452975b279fbf0.js
--- a/dev/static/js/30.47c460a7adbdabb7a29b.js
+++ b/dev/static/js/30.47c460a7adbdabb7a29b.js
--- a/dev/static/js/32.c434bea6e6961cff41c2.js
+++ b/dev/static/js/32.c434bea6e6961cff41c2.js
--- a/dev/static/js/29.ae0a6646f480c3905151.js
+++ b/dev/static/js/29.ae0a6646f480c3905151.js
--- a/dev/static/js/3.0f447ff961ea128c1cdd.js
+++ b/dev/static/js/3.0f447ff961ea128c1cdd.js
--- a/dev/static/js/33.a729b75d0d25c3308a1d.js
+++ b/dev/static/js/33.a729b75d0d25c3308a1d.js
--- a/dev/static/js/31.aa40731a2459ff29e90d.js
+++ b/dev/static/js/31.aa40731a2459ff29e90d.js
-webpackJsonp([31],{"3xxH":function(r,n,e){r.exports=e.p+"static/img/error.6b7c895.png"},RYpB:function(r,n,e){(r.exports=e("FZ+f")(!0)).push([r.i,"\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n","",{version:3,sources:["/Users/bory/Desktop/说唱教育/wechat/src/components/error.vue"],names:[],mappings:";AACA;EACE,mBAAmB;EACnB,mBAAmB;CACpB;AACD;EACE,WAAW;EACX,oBAAoB;CACrB;AACD;EACE,gBAAgB;EAChB,YAAY;CACb;AACD;EACE,gBAAgB;EAChB,sBAAsB;EACtB,0BAA0B;EAC1B,eAAe;EACf,aAAa;EACb,mBAAmB;EACnB,iBAAiB;CAClB",file:"error.vue",sourcesContent:["\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n"],sourceRoot:""}])},Zazt:function(r,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var t=e("3xxH"),a=e.n(t),o={name:"error",data:function(){return{errorImageUrl:a.a}}},i=function(){var r=this,n=r.$createElement,e=r._self._c||n;return e("div",{staticClass:"error-page"},[e("img",{attrs:{src:r.errorImageUrl}}),r._v(" "),e("div",{staticClass:"error-text"},[r._v("\n    404! 很抱歉，页面未找到\n    "),e("br"),r._v(" "),e("div",{staticClass:"button",on:{click:function(n){r.$router.push({name:"index"})}}},[r._v("返回首页")])])])};i._withStripped=!0;var p={render:i,staticRenderFns:[]},s=p;var A=!1;var c=e("VU/8")(o,s,!1,function(r){A||e("zqTw")},"data-v-ea0f4bb0",null);c.options.__file="src/components/error.vue";n.default=c.exports},zqTw:function(r,n,e){var t=e("RYpB");"string"==typeof t&&(t=[[r.i,t,""]]),t.locals&&(r.exports=t.locals);e("rjj0")("0cf4c8e0",t,!1,{})}});
\ No newline at end of file
--- a/dev/static/js/34.f689b542b5ae22569ccf.js
+++ b/dev/static/js/34.f689b542b5ae22569ccf.js
--- a/dev/static/js/35.b9f709a2f6763b88f3ab.js
+++ b/dev/static/js/35.b9f709a2f6763b88f3ab.js
--- a/dev/static/js/36.f93a47bcf5f49b461dfb.js
+++ b/dev/static/js/36.f93a47bcf5f49b461dfb.js
--- a/dev/static/js/34.1d922fd78cb7a69ea747.js
+++ b/dev/static/js/34.1d922fd78cb7a69ea747.js
--- a/dev/static/js/37.72a378819978f73fe791.js
+++ b/dev/static/js/37.72a378819978f73fe791.js
--- a/dev/static/js/38.52e53e780cc0fe367a85.js
+++ b/dev/static/js/38.52e53e780cc0fe367a85.js
--- a/dev/static/js/39.ee7efc201792fb872d69.js
+++ b/dev/static/js/39.ee7efc201792fb872d69.js
--- a/dev/static/js/38.ac86a25ad5f3aa01eaa8.js
+++ b/dev/static/js/38.ac86a25ad5f3aa01eaa8.js
--- a/dev/static/js/39.3409ced4aef10c54c4f1.js
+++ b/dev/static/js/39.3409ced4aef10c54c4f1.js
--- a/dev/static/js/4.4de6edc3006e75ebe76f.js
+++ b/dev/static/js/4.4de6edc3006e75ebe76f.js
--- a/dev/static/js/3.6733934297c8505bb286.js
+++ b/dev/static/js/3.6733934297c8505bb286.js
--- a/dev/static/js/5.1b1a6585bb7cc87167a6.js
+++ b/dev/static/js/5.1b1a6585bb7cc87167a6.js
--- a/dev/static/js/5.54b033857102562d909d.js
+++ b/dev/static/js/5.54b033857102562d909d.js
--- a/dev/static/js/6.49ec4166bdcb9c3655f0.js
+++ b/dev/static/js/6.49ec4166bdcb9c3655f0.js
--- a/dev/static/js/6.7ea4e29bc2b65b26b9a6.js
+++ b/dev/static/js/6.7ea4e29bc2b65b26b9a6.js
--- a/dev/static/js/7.1da764e85fad3718075f.js
+++ b/dev/static/js/7.1da764e85fad3718075f.js
--- a/dev/static/js/7.a3591b982aefc1a53327.js
+++ b/dev/static/js/7.a3591b982aefc1a53327.js
--- a/dev/static/js/8.66bbc89c202a66cc81ae.js
+++ b/dev/static/js/8.66bbc89c202a66cc81ae.js
--- a/dev/static/js/8.d57c99762d1e5f52c50c.js
+++ b/dev/static/js/8.d57c99762d1e5f52c50c.js
--- a/dev/static/js/9.7f723fbdc47ac3c0895f.js
+++ b/dev/static/js/9.7f723fbdc47ac3c0895f.js
--- a/dev/static/js/9.8930f666bcd46a4de8dc.js
+++ b/dev/static/js/9.8930f666bcd46a4de8dc.js
--- a/dev/static/js/app.3e82d3e8482792f3f30b.js
+++ b/dev/static/js/app.3e82d3e8482792f3f30b.js
--- a/dev/static/js/manifest.d6b59e638c8b14385d0d.js
+++ b/dev/static/js/manifest.d6b59e638c8b14385d0d.js
--- a/dev/static/js/manifest.fd93ec6ba8a5c264513c.js
+++ b/dev/static/js/manifest.fd93ec6ba8a5c264513c.js
--- a/src/components/mine/address.vue
+++ b/src/components/mine/address.vue
@@ -22,7 +22,7 @@
        <div class="line"></div>
        <div class="timeInfo">
          <div class="text">
-            <p>地址修改时间：{{deliverDetail.updated_at}}</p>
+            <!-- <p>地址修改时间：{{deliverDetail.updated_at}}</p> -->
            <p v-if="!!deliverDetail.express_no">发货时间：{{deliverDetail.deliver_at}}</p>
            <p
              v-if="!!!deliverDetail.express_no"
@@ -86,7 +86,7 @@
        </div>
      </div>
    </div>
-    <div class="tip" v-if="deliverDetail || noDeliverDetail">
+    <div class="tip" v-if="(deliverDetail && isShowCurrent)|| (noDeliverDetail && isShowNext )">
      <div class="tip-title">*</div>
      <div style="white-space: wrap;flex:1;">预计发货时间内不可修改地址,若有需要请联系您的专属班主任老师</div>
    </div>

--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
--- a/src/service/index.js
+++ b/src/service/index.js