From 08c5478bf13e2015de295219335b51f93148b777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 10 May 2022 15:05:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsAddress.vue       | 118 +++++++++++++++++++++++++++++++--
 pages/goods/detail/_id.vue     |   7 +-
 pages/goods/list/index.vue     |   3 +-
 static/images/goods/add.png    | Bin 0 -> 653 bytes
 static/images/goods/point.png  | Bin 0 -> 928 bytes
 static/images/goods/switch.png | Bin 0 -> 540 bytes
 6 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 static/images/goods/add.png
 create mode 100644 static/images/goods/point.png
 create mode 100644 static/images/goods/switch.png

diff --git a/components/BsAddress.vue b/components/BsAddress.vue
index 8f0db1d..7b81097 100644
--- a/components/BsAddress.vue
+++ b/components/BsAddress.vue
@@ -1,20 +1,130 @@
 <template>
   <div>
-    <div class="address"></div>
+    <div class="address flex flex-middle" v-if="!isEdit">
+      <article class="address__msg">
+        <div class="address__msg-line flex flex-middle">
+          <img src="@/static/images/goods/point.png" alt="收货地址" />
+          <span class="address__msg-line--txt">默认地址</span>
+          <UiButton type="yellow_panel">修改</UiButton>
+        </div>
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">收货地址:</span>
+          <span class="address__msg-line--txt"
+            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
+          >
+        </div>
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">收 货 人 :</span>
+          <span class="address__msg-line--txt"
+            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
+          >
+        </div>
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">手机号码:</span>
+          <span class="address__msg-line--txt"
+            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
+          >
+        </div>
+      </article>
+      <div class="hr"></div>
+      <div class="address__operation flex flex-column flex-middle">
+        <UiButton type="grey" class="flex flex-middle"
+          ><img
+            class="icon"
+            src="@/static/images/goods/switch.png"
+            alt="切换地址"
+          />
+          切换地址</UiButton
+        >
+        <UiButton type="grey" class="flex flex-middle"
+          ><img
+            class="icon"
+            src="@/static/images/goods/add.png"
+            alt="切换地址"
+          />
+          新建地址</UiButton
+        >
+      </div>
+    </div>
+    <div class="address flex flex-middle" v-else>
+      <article class="address__msg"></article>
+      <div class="hr"></div>
+      <div class="address__operation"></div>
+    </div>
   </div>
 </template>
 <script>
+import UiButton from "@/components/UiButton.vue";
 export default {
+  components: { UiButton },
   data() {
-    return {};
+    return {
+      isEdit: false,
+    };
   },
   methods: {},
 };
 </script>
 <style lang="scss" scoped>
 .address {
-  width: 1200px;
-  height: 189px;
+  @include layout-box;
+  min-height: 189px;
   border: 1px solid #dddddd;
+  padding: 28px 34px 8px;
+  &__msg {
+    width: 776px;
+    &-line {
+      margin-bottom: 20px;
+      img {
+        width: 20px;
+        height: 24px;
+        margin-right: 14px;
+      }
+      &--type {
+        width: 70px;
+        font-size: 14px;
+        font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+        font-weight: 400;
+        color: #999999;
+      }
+      &--txt {
+        font-size: 14px;
+        font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+        font-weight: 400;
+        color: #333333;
+      }
+      /deep/.ui-button__yellow_panel {
+        width: 62px;
+        height: 30px;
+        color: #ff875b;
+        background: rgba(255, 135, 91, 0.1);
+        border-radius: 4px 4px 4px 4px;
+        margin-left: 54px;
+      }
+    }
+  }
+  .hr {
+    width: 2px;
+    height: 107px;
+    background: #eeeeee;
+  }
+  &__operation {
+    flex: 1;
+    /deep/.ui-button__grey {
+      width: 114px;
+      font-size: 14px;
+      font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+      font-weight: 400;
+      color: #666666;
+      &:nth-child(1) {
+        margin-bottom: 30px;
+      }
+    }
+    .icon {
+      width: 18px;
+      height: 18px;
+      margin-right: 10px;
+    }
+  }
 }
 </style>
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 68bf1f5..a9b4f40 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <BsAddress></BsAddress>
     <nav class="nav flex flex-middle flex-center">
       <p class="nav__crumbs">
         全部商品
@@ -119,6 +120,7 @@
   </div>
 </template>
 <script>
+import BsAddress from '@/components/BsAddress.vue'
 import UiMoney from "@/components/UiMoney.vue";
 import UiButton from "@/components/UiButton.vue";
 import {
@@ -128,7 +130,7 @@ import {
 } from "@/plugins/api/goods";
 import UiGoodsItem from "@/components/UiGoodsItem.vue";
 export default {
-  componetns: { UiMoney, UiButton, UiGoodsItem },
+  componetns: { UiMoney, UiButton, UiGoodsItem,BsAddress },
   data() {
     return {
       curBuyNum: 1,
@@ -301,8 +303,7 @@ export default {
   }
 }
 .main {
-  width: 1200px;
-  margin: 0 auto;
+  @include layout-box;
   &__preview {
     width: 456px;
     margin-right: 30px;
diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue
index 85c191f..0669bc2 100644
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@@ -144,8 +144,7 @@ export default {
 }
 
 .main {
-  width: 1200px;
-  margin: 0 auto;
+  @include layout-box;
   padding-top: 14px;
   padding-bottom: 60px;
 
diff --git a/static/images/goods/add.png b/static/images/goods/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b54677875a716ecda845116c78684a483bf123b
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%M@d9MR5(wql)-BgK@`TnH`xRa9t?OaTD3t1MFnqC34)>^g4jR>!G+z~;6YSS
zqz5S;ya^%*CU16eZz_liA`}!F@elCOgC&U&!9x!o1TSStW@JJ(tm#TAIH%>Y@Atm<
zy*ESnPlxh2^?Ln?F~$XO7Qoc#pPn&hiHI7^{B1JtFOciH+ls~FBLMS4h;T3%ymuU@
zXOsH<{<IL{5&&BuY`5EYTCG+;1&%=$QYw``09XfbnVEm)sr7w-N(k}X81t*s>0C@<
zV~~{cDG|-I+wF7NN>a)TM6`>UpQPZC@?`)Yl~VU?d<c?K9tE&WM3qS;K@cojpO{%@
z6}qlFT`HAU27|$|D2lp6P!I&xmvv@dm~2N%xj;mFCqbh;WsF&~s#4Hbt@X7q3|l#%
z+eEZK4<w~LPegZ_c{T<87D60uG#b5ny?#Y&ePTQfBD)GZ0DQ_6Syf6s_B`)Up-_0o
z%zHL~eBVDMgqXDxC!)UA`XqpzLWtMK7zcnuM61na^JN}rMQeS1tF8IIKPQB^k!{VI
z4Q9Tz6|<$3&xokY%nydGd7d{@C=|YEtq+D__#+GZ*Z9+%BuOf99IuTRa<l@+lO#DE
z$Fbe+;R%A^j4@`nQc9(<TCKLdTrPhG@RphHj~CK@RI62|QmMSL#%itSqbT~GcSV9A
z*azU1F{Z1Os%^My8Q3Bb-30K$Ry4*8FD-xr0PNn(0eF}y$pxiB+rJRvDiKvP&xrMI
nDM^yZdNQdt_dUvMX|vcLB7+Jdc@iMK00000NkvXXu0mjf-mx13

literal 0
HcmV?d00001

diff --git a/static/images/goods/point.png b/static/images/goods/point.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6f09088408eeac2f6bd4904c0bf1570567c5db6
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq000yK000;W1^@s6`b*t*00001b5ch_0Itp)
z=>Px&T1iAfR7gvWl}~6LMI6V!-`yPgAcv4tsJB<B*v3OPGb<<xZ9yR(3Q7elMkuJ@
zMQlN#2SuTV9xPZv@StL#1tTJQC^X<f1x3M~VNb6W3w;L<1^XTa1DiwN{^YmJhGF{>
zoYU@aXFl`&{as?p>i7Hm=I7^60$2g?B!K;4+Z_PE0NC{2e+}SX_c*%-W6TQxJ|KB$
z+GVXxL~a6jCxCah#=se4%!ee;gs-;&tc%Fc0Q9h~LnMy^I1S){8bsuh_x|lx?GDfw
z^HB>Ek&EN;_}$@fxV=Y6&XasAf}Yjq2B>b5+z5wXbIyIfm%HsZW6Uba%K>^y-DgO^
zb&`Em7UcgQUbDwqdjY^X5gCrh<0CZ2yhQQ}fZL<d=wR&T($dl+X_}tXOq1Lekxi0o
z&N<C?vsBQ+!on?$sfes9@GFw109<s=X>gmhyu5sr<W-Wh9l3v3RrTm#FwmrRRc<Ko
zR&e(j@BL=9=`YQy)}4r~B}p<{*YyQ0ClT53-oF^da)snIb(_}O3cx-9N1Ssvg1S6O
zl0N`!PbQNG%d)(y_AJYerD^)3+MRQ~=<>q=uB%-Y{u|ud0p@vrOhokH9p~HwQx3v8
zw^MS~+6E{hTdGjWhehOs_x@^7GMA?5KLBP(zFHK;7y4|i{VWu9>6}}RE_xQgcK~jv
z!Y@gl7LiZ9_isd-&TDIh8oL?1Xu1QybI!T%qrIO3cwI!+RbfLHk-K$WA8g|l6e(1@
zVJ3hzmS?^9>n$wHvbiKlG_iAfQ4<GiZIe+Ex#GQlIW7}x?S2u-Np6isqoUi6#+b__
zSGC`ra}PDZC<*#{#yR(Kr}n14T5I0~a7jOsJYE#VPw{YgkL3H|W1EOwxp|(yA|g%C
zi-?Y~wdQPmBAPh&w0nx8_;wmG&-0U7+#1_3zM4sMA27u88vxI1P1SY1QkLbfF*M7v
zCz2%5o}TS?%v7M>YK*x?@+pNTNs<>u@n?wj!*yL30j9r!6W!myeZK%bxVX4D+w1jy
z0PvVjp~+<OxZ2Y+{Vh!D->a&6dN3Glbwe^07@!Awy`Hw8wpG*P?Q>OC$Kz=eLw5!0
zrYy_)kt#JcYRj@5?w0;Nfgwq%Q2SJuwp^=rD)T?l{+`;5u)-Sv0000<MNUMnLSTZi
CO~P>i

literal 0
HcmV?d00001

diff --git a/static/images/goods/switch.png b/static/images/goods/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..80caeb366d7837ba8ee59a9214246bd60bb6b7d6
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$)=5M`R5(wqRKHK#KoovY!4U(4BQbR7z>s8P$bdwp4p}>OC{bAuH`teSVBqh7
z0jW!Kw$+o`rAh}@re;8b0SP3w2t=wfR*DA(bdK+#7dcf#om35YI{D7u`+l7fp6S7P
zaT<-rQm50o8-G6+P^;BivDRK9qStP>zcJVds9vuxR4SGCh`5kVI95tsPqJkOrBdl#
z_HG#f_IXW2pOPfm9RYcs_Yx7mjF1ss09YIh25XblrIft?nuz+mkBI9TP;9MT`%4<L
zt5&Ng0C1s{^7*ioa+`<_h-fto!`n>S4FH@OV;WlPey&GCh!w|i&WY#^5&bR{3g-Z@
zrIb2k;7q14#)Mky`#&D#CFgnG`fxbBC>D#%jy>C%mGI2eq?8}o7h}w;@#JY>Q-PYz
z=365Anx<(D5tqX-JpFG*S&Ekcup7tmch_})0l;Pu1V<AdZTEV;cDLId=6aN+_5%R=
zN~tYA<omur#64?m?Qv>pnr=i<^m8Ol2=T&k9PSAhl6$li$8l}4N51cWX1@U7c5089
zMY&ww95>rqdmKg4)#GNnuDdaAHZ#l$sgor6@T9v&L_0wc=$SqG*Iz*h;cBhpC*A(M
eA#+K~19|`{>e>AiWLMY#0000<MNUMnLSTYVLh>R2

literal 0
HcmV?d00001


From e9a3cf9d60b30df4227bcd1e530168dc4d14579f Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Tue, 10 May 2022 15:06:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20static=E7=9B=AE=E5=BD=95=E4=B8=8B?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?assets=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +-
 {static/images => assets/img}/goods/left.png  | Bin
 {static/images => assets/img}/goods/more.png  | Bin
 {static/images => assets/img}/goods/right.png | Bin
 .../images => assets/img}/goods/sort-b1.png   | Bin
 .../images => assets/img}/goods/sort-b2.png   | Bin
 .../images => assets/img}/goods/sort-t1.png   | Bin
 .../images => assets/img}/goods/sort-t2.png   | Bin
 .../images => assets/img}/layout/footer-1.png | Bin
 .../images => assets/img}/layout/footer-2.png | Bin
 .../images => assets/img}/layout/footer-3.png | Bin
 .../images => assets/img}/layout/footer-4.png | Bin
 .../img}/layout/icon-arrow.png                | Bin
 .../img}/layout/icon-category.png             | Bin
 .../img}/layout/icon-login-sticky.png         | Bin
 .../img}/layout/icon-message.png              | Bin
 .../img}/layout/icon-order.png                | Bin
 .../img}/layout/icon-phone.png                | Bin
 .../img}/layout/icon-search-sticky.png        | Bin
 .../img}/layout/icon-search.png               | Bin
 .../img}/layout/icon-shop-sticky.png          | Bin
 .../img}/layout/icon-shop.png                 | Bin
 .../img}/layout/icon-up-light.png             | Bin
 .../images => assets/img}/layout/icon-up.png  | Bin
 .../img}/layout/logo-sticky.png               | Bin
 {static/images => assets/img}/layout/logo.png | Bin
 .../img}/login/icon-accept.png                | Bin
 .../img}/login/icon-close.png                 | Bin
 .../images => assets/img}/login/icon-logo.png | Bin
 components/BsLogin.vue                        |   6 +-
 layouts/module/footer/index.vue               |   8 +-
 layouts/module/header/HeaderInfoBar.vue       |  12 +--
 layouts/module/header/index.vue               |  14 +--
 pages/account/index.vue                       |  81 ++++++++++++++----
 pages/account/index/home/index.vue            |  17 ++--
 pages/goods/detail/_id.vue                    |   6 +-
 pages/goods/list/module/SortItem.vue          |   8 +-
 plugins/vue-inject.js                         |   2 +-
 38 files changed, 100 insertions(+), 56 deletions(-)
 rename {static/images => assets/img}/goods/left.png (100%)
 rename {static/images => assets/img}/goods/more.png (100%)
 rename {static/images => assets/img}/goods/right.png (100%)
 rename {static/images => assets/img}/goods/sort-b1.png (100%)
 rename {static/images => assets/img}/goods/sort-b2.png (100%)
 rename {static/images => assets/img}/goods/sort-t1.png (100%)
 rename {static/images => assets/img}/goods/sort-t2.png (100%)
 rename {static/images => assets/img}/layout/footer-1.png (100%)
 rename {static/images => assets/img}/layout/footer-2.png (100%)
 rename {static/images => assets/img}/layout/footer-3.png (100%)
 rename {static/images => assets/img}/layout/footer-4.png (100%)
 rename {static/images => assets/img}/layout/icon-arrow.png (100%)
 rename {static/images => assets/img}/layout/icon-category.png (100%)
 rename {static/images => assets/img}/layout/icon-login-sticky.png (100%)
 rename {static/images => assets/img}/layout/icon-message.png (100%)
 rename {static/images => assets/img}/layout/icon-order.png (100%)
 rename {static/images => assets/img}/layout/icon-phone.png (100%)
 rename {static/images => assets/img}/layout/icon-search-sticky.png (100%)
 rename {static/images => assets/img}/layout/icon-search.png (100%)
 rename {static/images => assets/img}/layout/icon-shop-sticky.png (100%)
 rename {static/images => assets/img}/layout/icon-shop.png (100%)
 rename {static/images => assets/img}/layout/icon-up-light.png (100%)
 rename {static/images => assets/img}/layout/icon-up.png (100%)
 rename {static/images => assets/img}/layout/logo-sticky.png (100%)
 rename {static/images => assets/img}/layout/logo.png (100%)
 rename {static/images => assets/img}/login/icon-accept.png (100%)
 rename {static/images => assets/img}/login/icon-close.png (100%)
 rename {static/images => assets/img}/login/icon-logo.png (100%)

diff --git a/README.md b/README.md
index a55ca49..3ddfead 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ this.$store.commit('setLoginOut')
 this.$store.state.userInfo
 
 // 登录拦截
-// 示例：点击购买课程前需要判断当前用户是否登录
+// 示例：点击购买课程前需要判断当前用户是否登录，未登录则弹出登录弹窗
 function onPurchaseCourse() {
 	if (!this.$isLoginValidate()) {
 		return;
diff --git a/static/images/goods/left.png b/assets/img/goods/left.png
similarity index 100%
rename from static/images/goods/left.png
rename to assets/img/goods/left.png
diff --git a/static/images/goods/more.png b/assets/img/goods/more.png
similarity index 100%
rename from static/images/goods/more.png
rename to assets/img/goods/more.png
diff --git a/static/images/goods/right.png b/assets/img/goods/right.png
similarity index 100%
rename from static/images/goods/right.png
rename to assets/img/goods/right.png
diff --git a/static/images/goods/sort-b1.png b/assets/img/goods/sort-b1.png
similarity index 100%
rename from static/images/goods/sort-b1.png
rename to assets/img/goods/sort-b1.png
diff --git a/static/images/goods/sort-b2.png b/assets/img/goods/sort-b2.png
similarity index 100%
rename from static/images/goods/sort-b2.png
rename to assets/img/goods/sort-b2.png
diff --git a/static/images/goods/sort-t1.png b/assets/img/goods/sort-t1.png
similarity index 100%
rename from static/images/goods/sort-t1.png
rename to assets/img/goods/sort-t1.png
diff --git a/static/images/goods/sort-t2.png b/assets/img/goods/sort-t2.png
similarity index 100%
rename from static/images/goods/sort-t2.png
rename to assets/img/goods/sort-t2.png
diff --git a/static/images/layout/footer-1.png b/assets/img/layout/footer-1.png
similarity index 100%
rename from static/images/layout/footer-1.png
rename to assets/img/layout/footer-1.png
diff --git a/static/images/layout/footer-2.png b/assets/img/layout/footer-2.png
similarity index 100%
rename from static/images/layout/footer-2.png
rename to assets/img/layout/footer-2.png
diff --git a/static/images/layout/footer-3.png b/assets/img/layout/footer-3.png
similarity index 100%
rename from static/images/layout/footer-3.png
rename to assets/img/layout/footer-3.png
diff --git a/static/images/layout/footer-4.png b/assets/img/layout/footer-4.png
similarity index 100%
rename from static/images/layout/footer-4.png
rename to assets/img/layout/footer-4.png
diff --git a/static/images/layout/icon-arrow.png b/assets/img/layout/icon-arrow.png
similarity index 100%
rename from static/images/layout/icon-arrow.png
rename to assets/img/layout/icon-arrow.png
diff --git a/static/images/layout/icon-category.png b/assets/img/layout/icon-category.png
similarity index 100%
rename from static/images/layout/icon-category.png
rename to assets/img/layout/icon-category.png
diff --git a/static/images/layout/icon-login-sticky.png b/assets/img/layout/icon-login-sticky.png
similarity index 100%
rename from static/images/layout/icon-login-sticky.png
rename to assets/img/layout/icon-login-sticky.png
diff --git a/static/images/layout/icon-message.png b/assets/img/layout/icon-message.png
similarity index 100%
rename from static/images/layout/icon-message.png
rename to assets/img/layout/icon-message.png
diff --git a/static/images/layout/icon-order.png b/assets/img/layout/icon-order.png
similarity index 100%
rename from static/images/layout/icon-order.png
rename to assets/img/layout/icon-order.png
diff --git a/static/images/layout/icon-phone.png b/assets/img/layout/icon-phone.png
similarity index 100%
rename from static/images/layout/icon-phone.png
rename to assets/img/layout/icon-phone.png
diff --git a/static/images/layout/icon-search-sticky.png b/assets/img/layout/icon-search-sticky.png
similarity index 100%
rename from static/images/layout/icon-search-sticky.png
rename to assets/img/layout/icon-search-sticky.png
diff --git a/static/images/layout/icon-search.png b/assets/img/layout/icon-search.png
similarity index 100%
rename from static/images/layout/icon-search.png
rename to assets/img/layout/icon-search.png
diff --git a/static/images/layout/icon-shop-sticky.png b/assets/img/layout/icon-shop-sticky.png
similarity index 100%
rename from static/images/layout/icon-shop-sticky.png
rename to assets/img/layout/icon-shop-sticky.png
diff --git a/static/images/layout/icon-shop.png b/assets/img/layout/icon-shop.png
similarity index 100%
rename from static/images/layout/icon-shop.png
rename to assets/img/layout/icon-shop.png
diff --git a/static/images/layout/icon-up-light.png b/assets/img/layout/icon-up-light.png
similarity index 100%
rename from static/images/layout/icon-up-light.png
rename to assets/img/layout/icon-up-light.png
diff --git a/static/images/layout/icon-up.png b/assets/img/layout/icon-up.png
similarity index 100%
rename from static/images/layout/icon-up.png
rename to assets/img/layout/icon-up.png
diff --git a/static/images/layout/logo-sticky.png b/assets/img/layout/logo-sticky.png
similarity index 100%
rename from static/images/layout/logo-sticky.png
rename to assets/img/layout/logo-sticky.png
diff --git a/static/images/layout/logo.png b/assets/img/layout/logo.png
similarity index 100%
rename from static/images/layout/logo.png
rename to assets/img/layout/logo.png
diff --git a/static/images/login/icon-accept.png b/assets/img/login/icon-accept.png
similarity index 100%
rename from static/images/login/icon-accept.png
rename to assets/img/login/icon-accept.png
diff --git a/static/images/login/icon-close.png b/assets/img/login/icon-close.png
similarity index 100%
rename from static/images/login/icon-close.png
rename to assets/img/login/icon-close.png
diff --git a/static/images/login/icon-logo.png b/assets/img/login/icon-logo.png
similarity index 100%
rename from static/images/login/icon-logo.png
rename to assets/img/login/icon-logo.png
diff --git a/components/BsLogin.vue b/components/BsLogin.vue
index 8a76a80..17e4000 100644
--- a/components/BsLogin.vue
+++ b/components/BsLogin.vue
@@ -10,7 +10,7 @@
       <div class="bs-login-wrap">
         <img
           class="bs-login-wrap__logo"
-          src="@/static/images/login/icon-logo.png"
+          src="~/assets/img/login/icon-logo.png"
         />
         <div class="bs-login-wrap__content">
           <el-form :model="form" :rules="rules" ref="ruleForm">
@@ -43,7 +43,7 @@
               <img
                 v-if="isAcceptAgreement"
                 class="icon-choose"
-                src="@/static/images/login/icon-accept.png"
+                src="~/assets/img/login/icon-accept.png"
               />
               <span v-else class="icon-unchoose"></span>
             </div>
@@ -53,7 +53,7 @@
           </div>
         </div>
         <div class="bs-login-wrap__btn--close" @click="onClose">
-          <img src="@/static/images/login/icon-close.png" />
+          <img src="~/assets/img/login/icon-close.png" />
         </div>
       </div>
     </el-dialog>
diff --git a/layouts/module/footer/index.vue b/layouts/module/footer/index.vue
index c7d4263..37ed298 100644
--- a/layouts/module/footer/index.vue
+++ b/layouts/module/footer/index.vue
@@ -27,19 +27,19 @@ export default {
       promiseList: [
         {
           label: "马士兵严选",
-          icon: require("@/static/images/layout/footer-1.png"),
+          icon: require("~/assets/img/layout/footer-1.png"),
         },
         {
           label: "马士兵严选",
-          icon: require("@/static/images/layout/footer-2.png"),
+          icon: require("~/assets/img/layout/footer-2.png"),
         },
         {
           label: "马士兵严选",
-          icon: require("@/static/images/layout/footer-3.png"),
+          icon: require("~/assets/img/layout/footer-3.png"),
         },
         {
           label: "马士兵严选",
-          icon: require("@/static/images/layout/footer-4.png"),
+          icon: require("~/assets/img/layout/footer-4.png"),
         },
       ],
     };
diff --git a/layouts/module/header/HeaderInfoBar.vue b/layouts/module/header/HeaderInfoBar.vue
index 84af96f..a97ff74 100644
--- a/layouts/module/header/HeaderInfoBar.vue
+++ b/layouts/module/header/HeaderInfoBar.vue
@@ -32,7 +32,7 @@
                 :command="item.value"
               >
                 <span> {{ item.label }}</span>
-                <img src="@/static/images/layout/icon-arrow.png" />
+                <img src="~/assets/img/layout/icon-arrow.png" />
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -50,7 +50,7 @@
             class="header-wrap-content__common flex flex-middle"
             @click="onJumpPersonalPage('message')"
           >
-            <img src="@/static/images/layout/icon-message.png" />
+            <img src="~/assets/img/layout/icon-message.png" />
             <span>消息</span>
             <div class="wrap-content-message__tip">33</div>
           </div>
@@ -60,12 +60,12 @@
           class="header-wrap-content__common flex flex-middle"
           @click="onJumpPersonalPage('order/list')"
         >
-          <img src="@/static/images/layout/icon-order.png" />
+          <img src="~/assets/img/layout/icon-order.png" />
           <span>我的订单</span>
         </div>
         <div class="header-wrap-content--line"></div>
         <div class="header-wrap-content__common flex flex-middle">
-          <img src="@/static/images/layout/icon-phone.png" />
+          <img src="~/assets/img/layout/icon-phone.png" />
           <span>下载app</span>
         </div>
       </div>
@@ -105,8 +105,8 @@ export default {
     ...mapState(["userInfo", "token"]),
     menuIcon() {
       return this.menuVisible
-        ? require("@/static/images/layout/icon-up-light.png")
-        : require("@/static/images/layout/icon-up.png");
+        ? require("~/assets/img/layout/icon-up-light.png")
+        : require("~/assets/img/layout/icon-up.png");
     },
   },
   methods: {
diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue
index 4f4ff3a..2d1ec76 100644
--- a/layouts/module/header/index.vue
+++ b/layouts/module/header/index.vue
@@ -6,7 +6,7 @@
           <div class="flex flex-middle">
             <img
               class="bar-header-wrap__logo"
-              src="@/static/images/layout/logo-sticky.png"
+              src="~/assets/img/layout/logo-sticky.png"
             />
             <el-menu
               :default-active="tabPath"
@@ -22,9 +22,9 @@
             </el-menu>
           </div>
           <div class="bar-header-wrap__icons flex flex-middle">
-            <img src="@/static/images/layout/icon-search-sticky.png" />
+            <img src="~/assets/img/layout/icon-search-sticky.png" />
             <div class="header-wrap-icons__shop">
-              <img src="@/static/images/layout/icon-shop-sticky.png" />
+              <img src="~/assets/img/layout/icon-shop-sticky.png" />
               <span class="">3</span>
             </div>
             <div v-if="token" class="header-wrap-icons__login">
@@ -48,7 +48,7 @@
           <div class="bar-header-box__wrap flex flex-between flex-middle">
             <img
               class="header-box-wrap__logo"
-              src="@/static/images/layout/logo.png"
+              src="~/assets/img/layout/logo.png"
             />
             <div class="header-box-wrap__right flex flex-middle">
               <div class="box-wrap-right__search flex">
@@ -62,14 +62,14 @@
                   class="search-icon flex flex-center flex-middle"
                   @click="onSearch"
                 >
-                  <img src="@/static/images/layout/icon-search.png" />
+                  <img src="~/assets/img/layout/icon-search.png" />
                 </div>
               </div>
               <div
                 class="box-wrap-right__cart flex flex-middle"
                 @click="onJumpCart"
               >
-                <img src="@/static/images/layout/icon-shop.png" />
+                <img src="~/assets/img/layout/icon-shop.png" />
                 <span>购物车</span>
                 <div class="wrap-right-cart__tip">3</div>
               </div>
@@ -83,7 +83,7 @@
               @mouseleave="handleCategoryChange(false)"
             >
               <div class="tab-category__label flex flex-center flex-middle">
-                <img src="@/static/images/layout/icon-category.png" />
+                <img src="~/assets/img/layout/icon-category.png" />
                 <span>热门分类</span>
               </div>
               <div
diff --git a/pages/account/index.vue b/pages/account/index.vue
index f484ddc..7da4820 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -6,9 +6,25 @@
  * @Description: file content
 -->
 <template>
-  <div class="account">
-    <div class="account--nav">左侧栏</div>
-    <nuxt-child class="account--main" />
+  <div class="account flex">
+    <div class="account-nav-wrap flex flex-column flex-center flex-middle">
+      <ul
+        v-for="(item, index) in navTabs"
+        :key="index"
+        class="account-nav-wrap__ul"
+      >
+        <div class="nav-wrap-ul__title">{{ item.label }}</div>
+        <li
+          class="nav-wrap-ul__li"
+          :class="{ 'nav-wrap-ul__li--light': itemChild.value === $route.path }"
+          v-for="itemChild in item.list"
+          :key="itemChild.value"
+        >
+          <nuxt-link :to="itemChild.value"> {{ itemChild.label }}</nuxt-link>
+        </li>
+      </ul>
+    </div>
+    <nuxt-child class="account-main-wrap" />
   </div>
 </template>
 <script>
@@ -19,23 +35,23 @@ export default {
       navTabs: [
         {
           label: "个人中心",
-          childrens: [
-            { label: "我的主页", value: "/home" },
-            { label: "消息通知", value: "/message" },
+          list: [
+            { label: "我的主页", value: "/account/home" },
+            { label: "消息通知", value: "/account/message" },
           ],
         },
         {
           label: "订单中心",
-          childrens: [
-            { label: "我的订单", value: "/order/lsit" },
-            { label: "售后订单", value: "/order/saleAfter" },
+          list: [
+            { label: "我的订单", value: "/account/order/list" },
+            { label: "售后订单", value: "/account/order/saleAfter/list" },
           ],
         },
         {
           label: "账户管理",
-          childrens: [
-            { label: "个人资料", value: "/userInfo" },
-            { label: "收货地址", value: "/address" },
+          list: [
+            { label: "个人资料", value: "/account/userInfo" },
+            { label: "收货地址", value: "/account/address" },
           ],
         },
       ],
@@ -46,15 +62,46 @@ export default {
 <style lang="scss" scoped>
 .account {
   @include layout-box;
-  padding: 30px 0;
-  margin: 0 auto;
-  display: flex;
-  &--nav {
+  padding: 40px 0;
+  background: #ffffff;
+  .account-nav-wrap {
     width: 170px;
-    height: 300px;
+    height: 402px;
     border: 1px solid #ddd;
     border-radius: 4px;
     margin-right: 30px;
+    font-size: 14px;
+    .account-nav-wrap__ul {
+      &:last-child {
+        margin-bottom: 0;
+      }
+      margin-bottom: 30px;
+      .nav-wrap-ul__title {
+        font-size: 16px;
+        color: #333333;
+        margin-bottom: 12px;
+      }
+      .nav-wrap-ul__li--light {
+        a {
+          color: #ff875b !important;
+        }
+      }
+      .nav-wrap-ul__li {
+        margin-bottom: 14px;
+        a {
+          color: #666666;
+        }
+        cursor: pointer;
+        &:hover {
+          a {
+            color: #ff875b;
+          }
+        }
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
   }
   &--main {
     flex: 1;
diff --git a/pages/account/index/home/index.vue b/pages/account/index/home/index.vue
index f867020..8876370 100644
--- a/pages/account/index/home/index.vue
+++ b/pages/account/index/home/index.vue
@@ -7,17 +7,14 @@
 -->
 
 <template>
-	<div>我是个人中心首页</div>
+  <div class="account-home"></div>
 </template>
 <script>
 export default {
-	data(){
-		return {
-			
-		}
-	}
-}
+  name: "AccountHome",
+  data() {
+    return {};
+  },
+};
 </script>
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index 68bf1f5..b46df9d 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -21,7 +21,7 @@
         <div class="main__preview-control">
           <img
             class="main__preview-control--left"
-            src="~/static/images/goods/left.png"
+            src="~/assets/img/goods/left.png"
             alt="左侧切换"
             @click="onImgLeft"
           />
@@ -44,7 +44,7 @@
           </div>
           <img
             class="main__preview-control--right"
-            src="~/static/images/goods/right.png"
+            src="~/assets/img/goods/right.png"
             alt="右侧切换"
             @click="onImgRight"
           />
@@ -68,7 +68,7 @@
             >
             <img
               class="msg-icon"
-              src="~/static/images/goods/more.png"
+              src="~/assets/img/goods/more.png"
               alt="服务"
             />
           </div>
diff --git a/pages/goods/list/module/SortItem.vue b/pages/goods/list/module/SortItem.vue
index ea36522..c887235 100644
--- a/pages/goods/list/module/SortItem.vue
+++ b/pages/goods/list/module/SortItem.vue
@@ -4,22 +4,22 @@
     <div class="sort-img-box">
       <img
         v-if="sortType === 0 || sortType === 1"
-        src="~/static/images/goods/sort-t1.png"
+        src="~/assets/img/goods/sort-t1.png"
         alt="sort"
       />
       <img
         v-if="sortType === 2"
-        src="~/static/images/goods/sort-t2.png"
+        src="~/assets/img/goods/sort-t2.png"
         alt="sort"
       />
       <img
         v-if="sortType === 0 || sortType === 2"
-        src="~/static/images/goods/sort-b1.png"
+        src="~/assets/img/goods/sort-b1.png"
         alt="sort"
       />
       <img
         v-if="sortType === 1"
-        src="~/static/images/goods/sort-b2.png"
+        src="~/assets/img/goods/sort-b2.png"
         alt="sort"
       />
     </div>
diff --git a/plugins/vue-inject.js b/plugins/vue-inject.js
index 7d8acb5..0ea1a64 100644
--- a/plugins/vue-inject.js
+++ b/plugins/vue-inject.js
@@ -2,7 +2,7 @@ import Vue from "vue";
 import { TOKEN_KEY } from "@/constants";
 
 const injectOptions = {
-  // 是否需要登录拦截
+  // 是否需要登录拦截，如果未登录，会默认唤起登录弹窗
   $isLoginValidate() {
     if (this.$cookies.get(TOKEN_KEY)) {
       return true;

From a670935eff41c5aba993ccdf8afb42e4907b166d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 10 May 2022 16:55:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsAddress.vue   | 280 +++++++++++++++++++++++++++++++++----
 nuxt.config.js             |   7 +-
 package.json               |   1 +
 pages/goods/detail/_id.vue |  21 +--
 4 files changed, 272 insertions(+), 37 deletions(-)

diff --git a/components/BsAddress.vue b/components/BsAddress.vue
index 7b81097..fc59b8c 100644
--- a/components/BsAddress.vue
+++ b/components/BsAddress.vue
@@ -3,66 +3,218 @@
     <div class="address flex flex-middle" v-if="!isEdit">
       <article class="address__msg">
         <div class="address__msg-line flex flex-middle">
-          <img src="@/static/images/goods/point.png" alt="收货地址" />
+          <img src="@/assets/img/goods/point.png" alt="收货地址" />
           <span class="address__msg-line--txt">默认地址</span>
           <UiButton type="yellow_panel">修改</UiButton>
         </div>
         <div class="address__msg-line flex flex-middle">
           <span class="address__msg-line--type">收货地址:</span>
-          <span class="address__msg-line--txt"
-            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
-          >
+          <span class="address__msg-line--txt">{{
+            curAddressListItem.area +
+            curAddressListItem.city +
+            curAddressListItem.province +
+            curAddressListItem.detailAddress
+          }}</span>
         </div>
         <div class="address__msg-line flex flex-middle">
           <span class="address__msg-line--type">收 货 人 :</span>
-          <span class="address__msg-line--txt"
-            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
-          >
+          <span class="address__msg-line--txt">{{
+            curAddressListItem.name
+          }}</span>
         </div>
         <div class="address__msg-line flex flex-middle">
           <span class="address__msg-line--type">手机号码:</span>
-          <span class="address__msg-line--txt"
-            >北京市XXXXX区XXXX路xxxxxx小区XXX单元</span
-          >
+          <span class="address__msg-line--txt">{{
+            curAddressListItem.phone
+          }}</span>
         </div>
       </article>
       <div class="hr"></div>
       <div class="address__operation flex flex-column flex-middle">
-        <UiButton type="grey" class="flex flex-middle"
-          ><img
-            class="icon"
-            src="@/static/images/goods/switch.png"
-            alt="切换地址"
-          />
-          切换地址</UiButton
-        >
-        <UiButton type="grey" class="flex flex-middle"
-          ><img
+        <UiButton type="grey" class="flex flex-middle" @click="onSwtich">
+          <img
             class="icon"
-            src="@/static/images/goods/add.png"
+            src="@/assets/img/goods/switch.png"
             alt="切换地址"
           />
-          新建地址</UiButton
-        >
+          切换地址
+        </UiButton>
+        <UiButton type="grey" @click="isEdit = true" class="flex flex-middle">
+          <img class="icon" src="@/assets/img/goods/add.png" alt="新建地址" />
+          新建地址
+        </UiButton>
       </div>
     </div>
     <div class="address flex flex-middle" v-else>
-      <article class="address__msg"></article>
+      <article class="address__msg">
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">所在区域</span>
+          <no-ssr><v-distpicker @selected="onSelected"></v-distpicker></no-ssr>
+        </div>
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">详细地址</span>
+          <el-input
+            v-model="detailAddress"
+            type="textarea"
+            :rows="3"
+            class="max-ipt"
+          ></el-input>
+        </div>
+        <div class="address__msg-line flex flex-middle">
+          <span class="address__msg-line--type">收货人</span>
+          <el-input v-model="addressUser" class="min-ipt"></el-input>
+          <span class="address__msg-line--type">手机号码</span>
+          <el-input
+            v-model="addressPhone"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            class="min-ipt"
+          ></el-input>
+        </div>
+      </article>
       <div class="hr"></div>
-      <div class="address__operation"></div>
+      <div class="address__operation flex flex-column flex-middle">
+        <el-checkbox v-model="defaultAddress">设为默认地址</el-checkbox>
+        <div>
+          <UiButton
+            v-if="addressList && addressList.length"
+            type="grey"
+            @click="isEdit = false"
+            >取消</UiButton
+          >
+          <UiButton type="yellow_panel" @click="onAddAddress"
+            >保存地址</UiButton
+          >
+        </div>
+      </div>
     </div>
+
+    <el-dialog
+      title="选择地址"
+      center
+      :visible.sync="dialogVisible"
+      width="380px"
+    >
+      <div class="address__list">
+        <section
+          @click="onAddressItem(item)"
+          class="address__list--item"
+          v-for="item in addressList"
+          :key="item.id"
+        >
+          <div>收货人：{{ item.name }}</div>
+          <div>手机号码：{{ item.phone }}</div>
+          <div>收货地址：{{ item.detailAddress }}</div>
+        </section>
+      </div>
+      <span slot="footer" class="dialog-footer flex flex-between">
+        <UiButton type="grey" @click="onCancel">取消</UiButton>
+        <UiButton type="yellow_panel">确认</UiButton>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import UiButton from "@/components/UiButton.vue";
+
+import { ApiGetAddress, ApiPostAddress } from "@/plugins/api/base";
 export default {
   components: { UiButton },
+  props: {
+    addressData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  model: {
+    prop: "addressData",
+    event: "emitAddress",
+  },
   data() {
     return {
       isEdit: false,
+      dialogVisible: false,
+      detailAddress: "",
+      addressUser: "",
+      addressPhone: "",
+      defaultAddress: true,
+      selectData: {},
+      addressList: [{}],
+      curAddressListItem: 0,
     };
   },
-  methods: {},
+  created() {
+    this.getAddressData();
+  },
+  methods: {
+    async getAddressData() {
+      let vm = this;
+      let res = await ApiGetAddress();
+      if (res.result && res.result.length) {
+        vm.isEdit = false;
+        vm.addressList = res.result;
+        let curIndex = vm.addressList.findIndex((item) => item.id == 3);
+        vm.curAddressListItem =
+          curIndex > -1 ? vm.addressList[curIndex] : vm.addressList[0];
+        vm.$emit("emitAddress", vm.curAddressListItem);
+      } else {
+        vm.isEdit = true;
+      }
+      console.log("获取收货地址", res);
+    },
+    onSwtich() {
+      this.dialogVisible = true;
+    },
+    onCancel() {
+      this.dialogVisible = false;
+    },
+    onSelected(data) {
+      console.log(data);
+      this.selectData = data;
+    },
+    async onAddAddress() {
+      let vm = this;
+      if (!vm.selectData?.area?.code) {
+        vm.$message.error("请选择所在区域~");
+        return;
+      }
+      if (!vm.detailAddress) {
+        vm.$message.error("请输入详细地址~");
+        return;
+      }
+      if (!vm.addressUser) {
+        vm.$message.error("请输入收货人~");
+        return;
+      }
+      if (!vm.addressPhone) {
+        vm.$message.error("请输入收货人手机号码~");
+        return;
+      }
+      let params = {
+        area: vm.selectData.area.value,
+        areaCode: vm.selectData.area.code,
+        city: vm.selectData.city.value,
+        cityCode: vm.selectData.city.code,
+        detailAddress: vm.detailAddress,
+        isDefault: vm.defaultAddress,
+        name: vm.addressUser,
+        phone: vm.addressPhone,
+        province: vm.selectData.province.value,
+        provinceCode: vm.selectData.province.code,
+      };
+      let res = await ApiPostAddress(params);
+      if (!res.error) {
+        vm.$message.success("添加成功!");
+        vm.getAddressData();
+      }
+      console.log(res);
+    },
+    onAddressItem(item) {
+      let vm = this;
+      vm.curAddressListItem = item;
+      vm.$emit("emitAddress", item);
+      vm.dialogVisible = false;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -101,6 +253,22 @@ export default {
         border-radius: 4px 4px 4px 4px;
         margin-left: 54px;
       }
+
+      .max-ipt {
+        width: 450px;
+      }
+
+      .min-ipt {
+        width: 164px;
+        margin-right: 50px;
+        /deep/.el-input__inner {
+          width: 164px;
+          height: 28px;
+          background: #ffffff;
+          border-radius: 2px;
+          border: 1px solid rgba(0, 0, 0, 0.15);
+        }
+      }
     }
   }
   .hr {
@@ -127,4 +295,64 @@ export default {
     }
   }
 }
+
+.address__list {
+  height: 265px;
+  overflow-y: auto;
+  //滚动条样式
+  overflow-y: auto;
+  scrollbar-width: none;
+  &::-webkit-scrollbar {
+    width: 4px;
+  }
+  /*定义滚动条轨道 内阴影+圆角*/
+  &::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+  }
+  /*定义滑块 内阴影+圆角*/
+  &::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background-color: #eeeeee;
+  }
+  &--item {
+    width: 320px;
+    height: 120px;
+    border: 1px solid #dddddd;
+    margin-bottom: 24px;
+  }
+}
+
+.dialog-footer {
+  /deep/.ui-button {
+    width: 150px;
+    height: 36px;
+    background: #ffffff;
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid #eeeeee;
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #000;
+  }
+  /deep/.ui-button__yellow_panel {
+    background: #ff875b;
+    color: #fff;
+  }
+}
+
+/deep/.distpicker-address-wrapper {
+  select {
+    width: 164px;
+    height: 28px;
+    background: #ffffff;
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #333333;
+    padding: 0;
+  }
+}
 </style>
diff --git a/nuxt.config.js b/nuxt.config.js
index 8af2ead..521cc4b 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -43,7 +43,8 @@ export default {
 		'@/plugins/element-ui',
 		'@/plugins/axios',
 		'@plugins/axiosTk.js',
-		'@plugins/vue-inject.js'
+		'@plugins/vue-inject.js',
+    '@/plugins/v-distpicker', 
 	],
 
 	// Auto import components: https://go.nuxtjs.dev/config-components
@@ -53,6 +54,10 @@ export default {
 	buildModules: [
 	],
 
+  build: {
+    vendor: ['v-distpicker']
+  },
+
 	styleResources: {
 		scss: '@/assets/scss/global.scss'
 	},
diff --git a/package.json b/package.json
index 13fe036..2d092e4 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "element-ui": "^2.15.8",
     "js-util-all": "^1.0.6",
     "nuxt": "^2.15.8",
+    "v-distpicker": "^1.2.13",
     "vue": "^2.6.14",
     "vue-server-renderer": "^2.6.14",
     "vue-template-compiler": "^2.6.14"
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index ca3db6d..a2ed4d5 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BsAddress></BsAddress>
+    <BsAddress v-model="addressData"></BsAddress>
     <nav class="nav flex flex-middle flex-center">
       <p class="nav__crumbs">
         全部商品
@@ -120,17 +120,17 @@
   </div>
 </template>
 <script>
-import BsAddress from '@/components/BsAddress.vue'
+import BsAddress from "@/components/BsAddress.vue";
 import UiMoney from "@/components/UiMoney.vue";
 import UiButton from "@/components/UiButton.vue";
+import UiGoodsItem from "@/components/UiGoodsItem.vue";
 import {
   ApiGetGoodsDetail,
   ApiGetGoodsSkus,
   ApiGetRecommendedGoodsList,
 } from "@/plugins/api/goods";
-import UiGoodsItem from "@/components/UiGoodsItem.vue";
 export default {
-  componetns: { UiMoney, UiButton, UiGoodsItem,BsAddress },
+  componetns: { UiMoney, UiButton, UiGoodsItem, BsAddress },
   data() {
     return {
       curBuyNum: 1,
@@ -445,6 +445,13 @@ export default {
             margin-bottom: 6px;
             border-color: #ccc;
           }
+          .attr-item__active {
+            border: 1px solid #FF512B;
+          }
+          .attr-item__disabled {
+            color: #999999;
+            background: #eeeeee;
+          }
         }
       }
     }
@@ -493,10 +500,4 @@ export default {
     color: #666666;
   }
 }
-.attr-item__active {
-  background: red !important;
-}
-.attr-item__disabled {
-  background: cyan !important;
-}
 </style>

From 834146eeba527895dded688b85a863238601b311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 10 May 2022 16:56:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail/_id.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index a2ed4d5..ef0d9f0 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <BsAddress v-model="addressData"></BsAddress>
     <nav class="nav flex flex-middle flex-center">
       <p class="nav__crumbs">
         全部商品