625

eecfba2a · chenyishuai@singsingenglish.com · fb05bac6 · eecfba2a · eecfba2a · eecfba2a
Commit eecfba2a authored Jun 25, 2019 by chenyishuai@singsingenglish.com
34 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.8bd451645327faba9fa8.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.2fcfe48cfca3ae87c589.js></script></body></html>
\ No newline at end of file
+        }</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.a40533755575dd262256.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.773ce5c6b155e273edaf.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.66f30f37970d706e6b17.js
+++ b/dev/static/js/0.66f30f37970d706e6b17.js
--- a/dev/static/js/10.468c0b84f73e90bad1e7.js
+++ b/dev/static/js/10.468c0b84f73e90bad1e7.js
--- a/dev/static/js/11.68ed40adad67d85c0313.js
+++ b/dev/static/js/11.68ed40adad67d85c0313.js
--- a/dev/static/js/10.de3e0e9cd5ee98d6c928.js
+++ b/dev/static/js/10.de3e0e9cd5ee98d6c928.js
--- a/dev/static/js/12.810ffb9db7e3431c0258.js
+++ b/dev/static/js/12.810ffb9db7e3431c0258.js
--- a/dev/static/js/13.bb677dc9e2d9aba1532f.js
+++ b/dev/static/js/13.bb677dc9e2d9aba1532f.js
--- a/dev/static/js/12.569df6356ef277433bf8.js
+++ b/dev/static/js/12.569df6356ef277433bf8.js
--- a/dev/static/js/13.80d75851ebf723ba0b00.js
+++ b/dev/static/js/13.80d75851ebf723ba0b00.js
--- a/dev/static/js/14.49e2faaa5a02eff36984.js
+++ b/dev/static/js/14.49e2faaa5a02eff36984.js
--- a/dev/static/js/16.98ce85ad5ab95594e0f7.js
+++ b/dev/static/js/16.98ce85ad5ab95594e0f7.js
--- a/dev/static/js/15.9d6cc6367f21cfbac19e.js
+++ b/dev/static/js/15.9d6cc6367f21cfbac19e.js
--- a/dev/static/js/17.1b9a9206d8e2f1c882d2.js
+++ b/dev/static/js/17.1b9a9206d8e2f1c882d2.js
--- a/dev/static/js/19.489a1a2bd284b566865d.js
+++ b/dev/static/js/19.489a1a2bd284b566865d.js
--- a/dev/static/js/18.c5d36ed475bb21ff44cf.js
+++ b/dev/static/js/18.c5d36ed475bb21ff44cf.js
--- a/dev/static/js/2.30eeee94663a4d6dc953.js
+++ b/dev/static/js/2.30eeee94663a4d6dc953.js
--- a/dev/static/js/2.f98de35fa41be9053f8a.js
+++ b/dev/static/js/2.f98de35fa41be9053f8a.js
--- a/dev/static/js/20.41d4020d70f1d8af0945.js
+++ b/dev/static/js/20.41d4020d70f1d8af0945.js
--- a/dev/static/js/20.ea0e446648e88f1d76e4.js
+++ b/dev/static/js/20.ea0e446648e88f1d76e4.js
--- a/dev/static/js/21.f62dfff013d1ecc467be.js
+++ b/dev/static/js/21.f62dfff013d1ecc467be.js
--- a/dev/static/js/22.0a1864b54026b8c72ef7.js
+++ b/dev/static/js/22.0a1864b54026b8c72ef7.js
--- a/dev/static/js/23.52c139bed6992be26830.js
+++ b/dev/static/js/23.52c139bed6992be26830.js
--- a/dev/static/js/24.a26ca5bd9e4f0c2c863c.js
+++ b/dev/static/js/24.a26ca5bd9e4f0c2c863c.js
--- a/dev/static/js/27.3f1e7217c310f4810b2f.js
+++ b/dev/static/js/27.3f1e7217c310f4810b2f.js
--- a/dev/static/js/app.2fcfe48cfca3ae87c589.js
+++ b/dev/static/js/app.2fcfe48cfca3ae87c589.js
--- a/dev/static/js/manifest.8bd451645327faba9fa8.js
+++ b/dev/static/js/manifest.8bd451645327faba9fa8.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(f&&f(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},a={46:0};function n(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,n),a.l=!0,a.exports}n.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,n){f=a[e]=[c,n]});f[2]=c;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:"66f30f37970d706e6b17",1:"b8f3d8e5aec8fa28cf01",2:"f98de35fa41be9053f8a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"de3e0e9cd5ee98d6c928",11:"68ed40adad67d85c0313",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"9d6cc6367f21cfbac19e",16:"98ce85ad5ab95594e0f7",17:"1b9a9206d8e2f1c882d2",18:"c5d36ed475bb21ff44cf",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"a26ca5bd9e4f0c2c863c",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"3f1e7217c310f4810b2f",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dev/static/js/manifest.a40533755575dd262256.js
+++ b/dev/static/js/manifest.a40533755575dd262256.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,b){for(var t,d,o,i=0,u=[];i<f.length;i++)d=f[i],c[d]&&u.push(c[d][0]),c[d]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(f,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var f={},c={46:0};function n(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,n),c.l=!0,c.exports}n.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,n){a=c[e]=[f,n]});a[2]=f;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"b8f3d8e5aec8fa28cf01",2:"30eeee94663a4d6dc953",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"468c0b84f73e90bad1e7",11:"92efb865b84db68417b7",12:"810ffb9db7e3431c0258",13:"bb677dc9e2d9aba1532f",14:"1eed8453bb8930f088ba",15:"3f1ba28cfdb73106ab72",16:"63a8eda77e6a90bde78c",17:"3b059c1297c2878cf360",18:"2a86dae3846ad0c55ede",19:"648c99c8e8fe2819fb13",20:"41d4020d70f1d8af0945",21:"d24a865b728397e73fae",22:"060e3341da0fa1a38cd1",23:"81a6e57c470e55803cb3",24:"9fd47715beb050e00ea1",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"31c1e69da4f897ae4765",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(t);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return b.onerror=b.onload=d,r.appendChild(b),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/assets/reflash2.png
+++ b/src/assets/reflash2.png
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
@@ -417,28 +417,30 @@
    }
  }
  .orderCancel{
+    top: 45%;
    img{
      width: 31.5rem;
    }
    .content{
      position: absolute;
      width: 31.5rem;
-      top: 12rem;
+      top: 11.2rem;
      text-align: center;
      h2{
        font-size: 2.5rem;
        color: #6C6C6C;
      }
-      p{font-size: 1.4rem;color: #999999;margin: 1.5rem;}
-      .warn{font-size: 1.5rem;color: #EC612A;margin-bottom: 3rem;}
+      p{font-size: 1.4rem;color: #999999;margin: 20 * @toVw 0 0;}
+      .warn{font-size: 1.5rem;color: #EC612A;margin: 10 * @toVw 0 25* @toVw;font-weight: bold;}
      .btnbox{
        display: flex;
-        .btn{width: 11.8rem;height: 4rem;line-height: 4rem;font-size: 1.4rem;color: white;border-radius: 2rem; }
+        .btn{width: 11.8rem;height: 4rem;line-height: 4rem;font-size: 1.4rem;color: white;border-radius: 2rem;font-weight:bold; }
        .fal{background: #F8D56B;box-shadow:0px 4px 0px 0px rgba(239,147,70,0.97);}
        .suc{background: #EC612A;box-shadow:0px 4px 0px 0px rgba(190,61,10,0.97);}
      }
    }
  }
+  
  .slide-fade-leave-active {
    transition: all .5s cubic-bezier(1.0, 0.5, 0.8, 1.0);
  }
@@ -625,6 +627,7 @@
        height: 60*@toVw;
        background: #F83534;
        color: white;
+        font-size: 1.6rem;
      }
    }
    .address-pop{

--- a/src/components/mine/address.vue
+++ b/src/components/mine/address.vue
@@ -22,7 +22,7 @@ import line from "../../assets/activity/img_line@2x.png";
 import {shopSuccess} from "../../util/imgUrl";
 import { getUserAdressApi } from "../../service/api";
 export default {
-  name: "address",
+  name: "Address",
  components: {},
  data() {
    return {

--- a/src/components/mine/addressEdit.vue
+++ b/src/components/mine/addressEdit.vue
--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
--- a/src/components/star/starRank.vue
+++ b/src/components/star/starRank.vue
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -77,7 +77,7 @@ const router =new Router({
    },
    {
      path: '/address',
-      name: 'address',
+      name: 'Address',
      component: e=>require(['@/components/mine/address'],e),//
      meta:{
        deep:0,