diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index dc50b6a275ecf40508d36ce9a8b87985ba557599..0000000000000000000000000000000000000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Java1_SpringBoot
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/App.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/App.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..27a75687f2db36acbaaac7fdc540238e8cb0971e
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/App.vue"
@@ -0,0 +1,15 @@
+<script setup>
+import LayoutView from "@/views/Layout/LayoutView.vue";
+import {RouterView} from "vue-router";
+
+
+</script>
+
+<template>
+  <RouterView/>
+</template>
+
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/assets/logo.svg" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/assets/logo.svg"
new file mode 100644
index 0000000000000000000000000000000000000000..7565660356e5b3723c9c33d508b830c9cfbea29f
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/assets/logo.svg"
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Address/AddressCard.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Address/AddressCard.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..16b633cffc9da2d26ae7eb8849a8a76ecf7992a5
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Address/AddressCard.vue"
@@ -0,0 +1,55 @@
+<script setup>
+import {useUserStore} from '@/stores/user.js';
+import {useRouter} from "vue-router";
+
+const {currentUserInfo,updateCurrentAddress} = useUserStore();
+const router = useRouter();
+let addressList;
+if (!currentUserInfo) {
+  console.log(55)
+
+  alert("请先登录")
+  router.push("/login")
+  currentUserInfo.addressList = {name:'未登录'};
+
+}
+addressList = currentUserInfo.addressList;
+
+const chooseAddress=(address)=>{
+  updateCurrentAddress(address);
+router.go(-1)
+}
+</script>
+
+<template>
+  <div class="card" v-for="(item, index) in addressList" @click="chooseAddress(item)">
+    <div class="info">
+      <div class="name">{{ item.name }}</div>
+      <div class="tel">{{ item.phone }}</div>
+    </div>
+    <div class="address_text">{{ item.address_text }}</div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+
+.card {
+  margin: .18rem;
+  padding: .18rem;
+  background-color: $bgColor;
+  border-radius: .04rem;
+  font-size: .14rem;
+
+  .info {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: .08rem;
+    color: $light-fontColor;
+
+    div {
+      flex: 1;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartBottom.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartBottom.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..02278b1ffe0b6408fa1cde56880f2612ef55879f
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartBottom.vue"
@@ -0,0 +1,255 @@
+<script setup>
+import Product from "@/components/Shop/Product.vue";
+import {useShopInfoStore} from "@/stores/shop.js";
+import {storeToRefs} from "pinia";
+import {useRoute, useRouter} from "vue-router";
+import {computed, ref, watch} from "vue";
+
+const toggleCart = ref();
+const shopInfoStore = useShopInfoStore();
+const {nearbyList} = storeToRefs(shopInfoStore);
+const route = useRoute();
+const shopID = Number(route.params.id);
+const shopInfo = ref(nearbyList.value.find(item => item.id === shopID));
+console.log(shopInfo);
+const countSum = () => {
+  shopInfo.value.cartList.forEach(item => {
+    shopInfo.value.cartList.sum += item.number * item.price
+  })
+};
+countSum();
+const resetCart = () => {
+  shopInfoStore.resetCart(shopInfo)
+}
+const router = useRouter();
+const orderConfirm = () => {
+  router.push({name: 'orderConfirmation', query: {shopID: shopID, sum: shopInfo.value[0].cartList.sum}})
+}
+const plusCart = (goodID) => {
+  shopInfoStore.plusNum(goodID, shopInfo)
+}
+
+const minusCart = (goodID) => {
+  shopInfoStore.minusNum(goodID, shopInfo)
+};
+const checkedAll = () => {
+  let find = shopInfo.value.cartList.forEach(item => {
+    item.checked = shopInfo.value.cartList.checked;
+  });
+  shopInfo.value.cartList.checked = !shopInfo.value.cartList.checked;
+};
+const checkedBtn = (index) => {
+  shopInfo.value.cartList[index].checked = !shopInfo.value.cartList[index].checked;
+  let find = shopInfo.value.cartList.filter(item => {
+    return item.checked === true;
+  });
+  console.log(find)
+  shopInfo.value.cartList.checked = null;
+  if (find.length === shopInfo.value.cartList.length) {
+    shopInfo.value.cartList.checked = true
+  } else {
+    shopInfo.value.cartList.checked = false
+  }
+}
+</script>
+
+<template>
+  <div class="cart">
+    <div class="cart_mask" v-if="toggleCart" v-show="shopInfo.cartList.length!==0"></div>
+    <div class="cart_product" v-if="toggleCart" v-show="shopInfo.cartList.length!==0">
+      <div class="cart_product_header" v-if="true">
+        <div class="cart_product_header_allChecked" @click="checkedAll">
+          <input type="checkbox" class="circle-checkbox" :checked="shopInfo.cartList.checkAll"> 全选
+        </div>
+        <div class="cart_product_header_clear" @click="resetCart">清空购物车</div>
+      </div>
+      <div class="cart_product_list" v-for="(item, index) in shopInfo.cartList">
+        <div class="cart_product_list_item">
+          <div class="checkbox" @click="checkedBtn(index)">
+            <!-- <input type="checkbox" class="circle-checkbox" :checked="item.checked" @change="changeChecked(item)" name="" id=""> -->
+            <input type="checkbox" class="circle-checkbox" :checked="item.checked">
+          </div>
+          <div class="content">
+            <Product :product="{item}" @plusCart="plusCart" @minusCart="minusCart"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="cart_check">
+      <div class="cart_check_icon" @click="toggleCart=!toggleCart">
+        <img src="http://www.dell-lee.com/imgs/vue3/basket.png" alt="">
+        <span class="tag" v-if="shopInfo.cartList.length!==0">{{ shopInfo.cartList.length }}</span>
+      </div>
+      <div class="cart_check_empty" v-if="shopInfo.cartList.length===0">购物车是空的</div>
+      <div class="cart_check_content" v-else>
+        <div class="cart_check_content_total_price">总计 : <span
+            class="check_content_total_price_number">￥{{ shopInfo.cartList.sum.toFixed(2) }}</span></div>
+        <div class="cart_check_content_submit" @click="orderConfirm">结算</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+
+.cart {
+  &_mask {
+    position: absolute;
+    top: 0;
+    bottom: .5rem;
+    left: 0;
+    right: 0;
+    background-color: rgba($color: #000000, $alpha: .4);
+  }
+
+  &_product {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: .5rem;
+    background-color: $bgColor;
+
+    //圆形复选框
+    /* 设置选中背景 */
+    .circle-checkbox:checked {
+      background: #1673ff;
+    }
+
+    /* 设置复选框样式 */
+    .circle-checkbox {
+      width: .2rem;
+      height: .2rem;
+      background-color: #ffffff;
+      border: solid 1px $light-fontColor;
+      -webkit-border-radius: 50%;
+      border-radius: 50%;
+      font-size: 0.8rem;
+      margin: 0;
+      padding: 0;
+      position: relative;
+      display: inline-block;
+      vertical-align: top;
+      cursor: default;
+      -webkit-appearance: none;
+      -webkit-user-select: none;
+      user-select: none;
+    }
+
+    /* 设置伪类，即显现的对勾样式 */
+    .circle-checkbox:checked::after {
+      content: "";
+      top: 5px;
+      left: 4px;
+      position: absolute;
+      background: transparent;
+      border: #fff solid 2px;
+      border-top: none;
+      border-right: none;
+      height: 3px;
+      width: 8px;
+      -moz-transform: rotate(-45deg);
+      -ms-transform: rotate(-45deg);
+      -webkit-transform: rotate(-45deg);
+      transform: rotate(-45deg);
+    }
+
+    &_header {
+      padding: .18rem;
+      display: flex;
+      justify-content: space-between;
+    }
+
+    &_list {
+      max-height: 3rem;
+      overflow-y: scroll;
+
+      &_item {
+        display: flex;
+
+        .checkbox {
+          display: flex;
+          align-items: center;
+          margin-left: .18rem;
+        }
+
+        .content {
+          flex: 1;
+          width: 100%;
+        }
+      }
+    }
+  }
+
+  &_check {
+    width: 100%;
+    height: .49rem;
+    border-top: .01rem solid $content-bgColor;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    display: flex;
+    // 购物车图标
+    &_icon {
+      width: .84rem;
+      height: .49rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+
+      img {
+        width: .28rem;
+        height: .26rem;
+      }
+
+      .tag {
+        display: inline-block;
+        width: .15rem;
+        height: .15rem;
+        border-radius: 50%;
+        background-color: $hightlight-fontColor;
+        color: $bgColor;
+        font-size: .1rem;
+        text-align: center;
+        position: absolute;
+        top: .05rem;
+        right: .18rem;
+      }
+
+    }
+
+    // 空购物车
+    &_empty {
+      line-height: .49rem;
+    }
+
+    // 总价
+    &_content {
+      flex: 1;
+      display: flex;
+      position: relative;
+      width: 100%;
+
+      &_total_price {
+        flex: 1;
+        line-height: .49rem;
+        color: $hightlight-fontColor;
+
+        &_number {
+          font-size: .18rem;
+        }
+      }
+
+      &_submit {
+        width: .98rem;
+        height: .49rem;
+        background-color: $btn-bgColor;
+        color: $bgColor;
+        text-align: center;
+        line-height: .49rem;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartCard.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartCard.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..3f32c7122d644739a69349b040fdfa45a9035d99
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Cart/CartCard.vue"
@@ -0,0 +1,107 @@
+<script setup>
+import {useShopInfoStore} from "@/stores/shop.js";
+import {storeToRefs} from "pinia";
+import {ref} from "vue";
+import {useRouter} from "vue-router";
+
+const shopInfoStore = useShopInfoStore();
+const {nearbyList} = storeToRefs(shopInfoStore);
+// if (nearbyList.value.)
+const shopInfo = ref([]);
+
+nearbyList.value.forEach((item, index) => {
+  // console.log(item)
+  if (item.cartList.length !== 0) {
+    shopInfo.value.push(item)
+    // console.log(item)
+    // console.log(shopInfo.value)
+  }
+});
+  let router = useRouter();
+console.log()
+  const jumpPage=()=>{
+  router.push({name: 'orderConfirmation',query:{shopID:shopInfo.value[0].id}})
+}
+</script>
+
+<template>
+  <div class="card" v-for="(item, index) in shopInfo" :key="index" @click="jumpPage">
+    <div class="card_shop_name">{{ item.name }}</div>
+    <div class="card_list" v-for="(item, index) in item.cartList">
+      <div class="card_list_item">
+        <div class="card_list_item_img">
+          <img :src="`http://www.dell-lee.com/imgs/vue3/`+item.imgName+`.png`" alt="">
+        </div>
+        <div class="card_list_item_content">
+          <div class="card_list_item_content_title">{{ item.title }}</div>
+          <div class="card_list_item_content_price">
+            <span class="highlight">￥{{ item.price }} x {{item.number}}</span>
+            <span>￥{{ (item.price * item.number).toFixed(2) }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="card_total">共计{{item.cartList.length}}件</div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+@import "@/style/mixins.scss";
+.card {
+  margin: .18rem;
+  padding: .18rem;
+  background-color: $bgColor;
+
+  &_shop_name {
+    line-height: .42rem;
+    font-size: .16rem;
+    margin-bottom: .18rem;
+  }
+
+  &_list {
+    &_item {
+      display: flex;
+      margin-bottom: .18rem;
+
+      &_img {
+        width: .48rem;
+        margin-right: .18rem;
+        img {
+          width: .48rem;
+          height: .48rem;
+        }
+      }
+      &_content {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+
+        &_title {
+          font-size: .14rem;
+          font-weight: bold;
+          color: $content_fontcolor;
+          @include ellipse;
+        }
+        &_price {
+          display: flex;
+          justify-content: space-between;
+
+          .highlight {
+            color: $hightlight-fontColor;
+          }
+        }
+      }
+    }
+  }
+
+  &_total {
+    line-height: .26rem;
+    text-align: center;
+    font-size: .14rem;
+    color: $light-fontColor;
+    background-color: $search-bgColor;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/NearBy.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/NearBy.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..f08621a52d6ec73b3f5949087db7725e3b5bb3e7
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/NearBy.vue"
@@ -0,0 +1,44 @@
+<script setup>
+import ShopInfo from '@/components/Home/ShopInfo.vue';
+import {useShopInfoStore} from '@/stores/shop'
+import {useRouter} from "vue-router";
+
+const router = useRouter();
+const showShop = (id) => {
+  router.push({
+    name: 'shop',
+    params: {
+      id: id
+    }
+  })
+}
+</script>
+
+<template>
+  <!-- 附近店铺 -->
+  <div class="nearby">
+    <h3 class="nearby_title">附近店铺</h3>
+    <a v-for="(item, index) in useShopInfoStore().nearbyList" @click="showShop(item.id)">
+      <ShopInfo :shopInfo="item" :key="index"/>
+    </a>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+
+.nearby {
+  &_title {
+    margin: .16rem 0;
+    font-size: .18rem;
+    font-family: PingFangSC-Medium;
+    font-weight: normal;
+    line-height: .25rem;
+    color: $content_fontcolor;
+  }
+
+  a {
+    text-decoration: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/ShopInfo.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/ShopInfo.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..3d0b1dbfca76831243519cf052e9712dea893e9c
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/ShopInfo.vue"
@@ -0,0 +1,72 @@
+<script setup>
+const props = defineProps({
+  shopInfo: Object
+});
+</script>
+
+<template>
+  <div class="shop">
+    <div class="shop_img">
+      <img :src="props.shopInfo.imgUrl" :alt="props.shopInfo.name">
+    </div>
+    <div class="shop_content">
+      <div class="shop_content_title">{{ props.shopInfo.name }}</div>
+      <div class="shop_content_tags">
+        <span class="shop_content_tag">月售: {{ props.shopInfo.sales }}</span>
+        <span class="shop_content_tag">起送: {{ props.shopInfo.expressLimit }}</span>
+        <span class="shop_content_tag">基础运费: {{ props.shopInfo.expressPrice }}</span>
+      </div>
+      <div class="shop_content_highlight">{{ props.shopInfo.slogan }}</div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+.shop {
+  display: flex;
+  margin: .12rem 0;
+  min-height: .9rem;
+  border-bottom: solid .01rem $content_bgColor;
+
+  &_img {
+    display: flex;
+    align-items: center;
+    margin-right: .16rem;
+
+    img {
+      width: .56rem;
+      height: .56rem;
+    }
+  }
+
+  &_content {
+    min-width: 2.67rem;
+    font-family: PingFangSC-Regular;
+    color: $content_fontcolor;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    &_title {
+      line-height: .22rem;
+      font-size: .16rem;
+      margin-bottom: .08rem;
+    }
+    &_tags {
+      font-size: .13rem;
+      margin-bottom: .08rem;
+    }
+    &_tag {
+      line-height: .18rem;
+      margin-right: .16rem;
+    }
+    &_highlight {
+      line-height: .18rem;
+      margin-right: .16rem;
+      color: #E93B3B;
+      margin-bottom: .08rem;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/StaticPart.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/StaticPart.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..9c1b5f11ad1121ea9ba506a12f20fca77fc68014
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Home/StaticPart.vue"
@@ -0,0 +1,131 @@
+<script setup>
+//数据
+import {useRouter} from "vue-router";
+
+const iconList = [
+  { imgName: "超市", desc: "超市便利" },
+  { imgName: "菜市场", desc: "菜市场" },
+  { imgName: "水果店", desc: "水果店" },
+  { imgName: "鲜花", desc: "鲜花绿植" },
+  { imgName: "医药健康", desc: "医药健康" },
+  { imgName: "家居", desc: "家居时尚" },
+  { imgName: "蛋糕", desc: "烘培蛋糕" },
+  { imgName: "签到", desc: "签到" },
+  { imgName: "大牌免运", desc: "大牌免运" },
+  { imgName: "红包", desc: "红包套餐" }
+]
+const router = useRouter();
+const to = () => {
+  router.push({
+    name:'address'
+  })
+}
+</script>
+
+<template>
+  <!-- 定位 -->
+  <div class="position">
+    <span class="iconfont position_icon" @click.prevent="to">&#xe619;</span>
+    <span class="position_name" @click.prevent="to">北京理工大学国防科技园2号楼10层</span>
+    <span class="iconfont position_notice">&#xe7e5;</span>
+  </div>
+  <!-- 搜索 -->
+  <div class="search">
+    <span class="iconfont">&#xe632;</span>
+    <span class="search_text">山姆会员商店优惠商品</span>
+  </div>
+  <!-- banner -->
+  <div class="banner">
+    <img src="http://www.dell-lee.com/imgs/vue3/banner.jpg" alt="" class="banner_img">
+  </div>
+  <!-- 图标列表 -->
+  <div class="icon_list">
+    <div class="icon_item" v-for="(item, index) in iconList">
+      <img class="icon_item_img" :src="'http://www.dell-lee.com/imgs/vue3/'+item.imgName+'.png'" :alt="item.imgName">
+      <p class="icon_item_desc">{{ item.desc }}</p>
+    </div>
+  </div>
+  <!-- 分割线 -->
+  <div class="gap"></div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/mixins.scss';
+@import '@/style/viriables.scss';
+
+//定位
+.position {
+  position: relative;
+  display: flex;
+  align-items: center;
+  line-height: .22rem;
+  font-size: .16rem;
+  padding: .16rem .24rem .16rem 0;
+
+  .position_icon {
+    font-size: .2rem;
+  }
+  &_name {
+    @include ellipse;
+    margin-left: .08rem;
+    color: $content-fontcolor;
+  }
+  .position_notice {
+    position: absolute;
+    right: 0;
+    font-size: .2rem;
+  }
+}
+
+//搜索
+.search {
+  margin-bottom: .16rem;
+  padding-left: .16rem;
+  line-height: .32rem;
+  background-color: #F5F5F5;
+  border-radius: .16rem;
+
+  &_text {
+    margin-left: .12rem;
+    font-size: .14rem;
+    font-family: PingFangSC-Regular;
+    color: #B7B7B7;
+  }
+}
+
+//banner
+.banner {
+  &_img {
+    width: 100%;
+  }
+}
+
+//图标列表
+.icon_list {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: .16rem;
+
+  .icon_item {
+    width: 20%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    &_img {
+      width: .4rem;
+      height: .4rem;
+    }
+    &_desc {
+      margin: .06rem 0 .16rem 0;
+    }
+  }
+}
+
+//分割线
+.gap {
+  height: .1rem;
+  background-color: #F1F1F1;
+  margin: 0 -0.18rem;
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Layout/Tabbar.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Layout/Tabbar.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..4f9ddfc8396fd4d85898d637f19593bd6cb3e987
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Layout/Tabbar.vue"
@@ -0,0 +1,86 @@
+<script setup>
+// axios get tabbarList
+//数据
+import {useRoute, useRouter} from "vue-router";
+import {ref} from "vue";
+
+const tabbarList = [
+  {icon: '&#xe651;', text: '首页', to: {path: '/home'}},
+  {icon: '&#xe690;', text: '购物车', to: {path: '/cart'}},
+  {icon: '&#xe655;', text: '订单', to: {path: '/order'}},
+  {icon: '&#xe60b;', text: '我的', to: {path: '/my'}},
+]
+
+const router = useRouter()
+const to = (item) => {
+  router.push(item.to)
+}
+let activeIndex =ref(sessionStorage.getItem('activeIndex'));
+switch (useRoute().path) {
+  case '/home':
+    activeIndex.value = '0';
+    break;
+  case '/cart':
+    activeIndex.value = '1';
+    break;
+  case '/order':
+    activeIndex.value = '2';
+    break;
+  case '/my':
+    activeIndex.value = '3';
+    break;
+  default:
+    activeIndex.value = '0';
+}
+const changeIndex=(index)=>{
+  activeIndex.value = index;
+}
+</script>
+<template>
+  <!-- 底部tabbar -->
+  <div class="tabbar">
+    <div class="tabbar_item " :class="{'tabbar_item--active':index===Number(activeIndex)}" v-for="(item, index) in tabbarList">
+      <a href="/home" @click.prevent="to(item),changeIndex(index)">
+        <span class="iconfont" v-html="item.icon"></span>
+        <span class="tabbar_title" >{{ item.text }}</span>
+      </a>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+
+.tabbar {
+  width: 100%;
+  height: .49rem;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  border-top: .01rem solid $content_bgColor;
+  display: flex;
+
+  &_item {
+    width: 25%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    a {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      text-decoration: none;
+      color: $content_fontcolor;
+
+    }
+    //活动样式
+    &--active {
+      a {
+        color: #1FA4FC;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Order/OrderCard.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Order/OrderCard.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..fd6440e5f9be8e54711db9497a8a8cff7c7f5541
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Order/OrderCard.vue"
@@ -0,0 +1,83 @@
+<script setup>
+import {useShopInfoStore} from "@/stores/shop.js";
+import {storeToRefs} from "pinia";
+
+const shopInfoStore = useShopInfoStore();
+const {orderList} = storeToRefs(shopInfoStore);
+console.log(orderList.value)
+</script>
+
+<template>
+    <div style="text-align: center;font-size: 10px;line-height: 20px;font-weight: bolder;color: red" v-if="orderList.length===0">暂无订单</div>
+  <div class="card" v-for="item of orderList">
+    <div class="card_title">
+      <div class="name">{{ item.name }}</div>
+      <div class="state">已下单</div>
+    </div>
+    <div class="card_content">
+      <div class="img_list">
+        <div class="img" v-for="(item,index) of item.cartList" :key=index>
+          <img :src="`http://www.dell-lee.com/imgs/vue3/`+item.imgName+`.png`" alt="">
+        </div>
+      </div>
+      <div class="count">
+        <div class="price">￥{{ (item.cartList.sum) }}</div>
+        <div class="total_number">共{{ item.cartList.length }}件</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+@import "@/style/mixins.scss";
+
+.card {
+  margin: .18rem;
+  padding: .18rem;
+  background-color: $bgColor;
+  border-radius: .04rem;
+
+  &_title {
+    display: flex;
+    justify-content: space-between;
+    font-size: .16rem;
+    .name {
+      color: $content-fontcolor;
+    }
+    .state {
+      color: $light-fontColor;
+    }
+  }
+
+  &_content {
+    display: flex;
+    margin-top: .18rem;
+    .img_list {
+      flex: 1;
+      display: flex;
+      .img {
+        margin-right: .08rem;
+        img {
+          width: .4rem;
+          height: .4rem;
+          display: block;
+        }
+      }
+    }
+    .count {
+      width: .6rem;
+      text-align: right;
+      .price {
+        line-height: .2rem;
+        color: $hightlight-fontColor;
+      }
+      .total_number {
+        line-height: .14rem;
+        margin-top: .06rem;
+        font-size: .12rem;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Shop/Product.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Shop/Product.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..c42e663ec43ffa0652311ee79d9aedcbd74d9c2a
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/components/Shop/Product.vue"
@@ -0,0 +1,113 @@
+<script setup>
+
+const props = defineProps({
+  product: {
+    type: Object
+  }
+});
+const emit = defineEmits(['addCart', 'minusCart', 'plusCart']);
+const plusCart = (goodsID) => {
+  emit('plusCart', goodsID)
+};
+const minusCart = (goodsID) => {
+  emit('minusCart', goodsID)
+};
+const addCart = (goodsID) => {
+  emit('addCart', goodsID)
+};
+</script>
+
+<template>
+  <div class="product" v-for="(item, index) in props.product" :key="index">
+    <div class="product_img">  <!-- <div class="product_img--min"> -->
+      <img :src="`http://www.dell-lee.com/imgs/vue3/`+item.imgName+`.png`" alt="pic">
+    </div>
+    <div class="product_content">
+      <div class="product_content_title">{{ item.title }}</div>
+       <div class="product_content_sales">月售 {{ item.sales }} 件</div>
+      <slot></slot>
+      <div class="product_content_price">￥{{ item.price }} <span class="product_content_old_price">￥{{ item.oldPrice }}</span></div>
+
+    </div>
+    <div class="product_number">
+      <span class="product_number_minus" @click="minusCart(item.id)">-</span>
+      {{ item.number }}
+      <span class="product_number_plus" @click="plusCart(item.id)">+</span>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+@import '@/style/mixins.scss';
+.product {
+  padding: .18rem;
+  box-sizing: border-box;
+  display: flex;
+  position: relative;
+  border-bottom: .01rem solid $content-bgColor;
+
+  &_img {
+    width: .68rem;
+    margin-right: .18rem;
+
+    img {
+      width: .68rem;
+      height: .68rem;
+    }
+  }
+  &_img--min {
+    width: .48rem;
+    margin-right: .18rem;
+
+    img {
+      width: .48rem;
+      height: .48rem;
+    }
+  }
+  &_content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    &_title {
+      font-size: .14rem;
+      font-weight: bold;
+      color: $content_fontcolor;
+      @include ellipse;
+    }
+    &_price {
+      color: $hightlight-fontColor;
+    }
+    &_old_price {
+      color: $light-fontColor;
+      text-decoration: line-through;
+    }
+  }
+  &_number {
+    position: absolute;
+    right: .18rem;
+    bottom: .18rem;
+
+    &_minus,&_plus {
+      display: inline-block;
+      width: .2rem;
+      height: .2rem;
+      border-radius: 50%;
+      font-size: .16rem;
+      text-align: center;
+    }
+    &_minus {
+      border: .01rem solid $medium-fontColor;
+      color: $medium-fontColor;
+      margin-right: .08rem;
+    }
+    &_plus {
+      background-color: $btn-bgColor;
+      color: $bgColor;
+      margin-left: .08rem;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/main.js" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/main.js"
new file mode 100644
index 0000000000000000000000000000000000000000..13a91bc50efbe97582b09176d29d6d6867483a91
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/main.js"
@@ -0,0 +1,16 @@
+// import './assets/main.css'
+import './style/base.scss'
+import './style/iconfont.css'
+
+import { createApp } from 'vue'
+import { createPinia } from 'pinia'
+
+import App from './App.vue'
+import router from './router/index'
+
+const app = createApp(App)
+
+app.use(createPinia())
+app.use(router)
+
+app.mount('#app')
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/router/index.js" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/router/index.js"
new file mode 100644
index 0000000000000000000000000000000000000000..ee819b6f4d10b09233f4c5ef060f083f9a9eb3d7
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/router/index.js"
@@ -0,0 +1,59 @@
+import {createRouter, createWebHistory} from "vue-router";
+
+const router = createRouter({
+    history: createWebHistory(),
+    routes: [{
+        path: '/',
+        name: 'layout',
+        redirect: '/login',
+        component: () => import('@/views/Layout/LayoutView.vue'),
+        children: [
+            {
+                path: 'home',
+                name: 'home',
+                component: () => import('@/views/Home/HomeView.vue')
+            },
+            {
+                path: 'cart',
+                name: 'cart',
+                component: () => import('@/views/Cart/CartView.vue')
+            },
+            {
+                path: 'order',
+                name: 'order',
+                component: () => import('@/views/Order/OrderView.vue')
+            },
+            {
+                path: 'my',
+                name: 'my',
+                component: () => import('@/views/My/MyView.vue')
+            }
+        ]
+    }, {
+        path: '/shop/:id',
+        name: 'shop',
+        component: () => import('@/views/Shop/ShopView.vue')
+    }, {
+        path: '/address',
+        name: 'address',
+        component: () => import('@/views/Address/AddressView.vue')
+    }, {
+        path: '/address/create',
+        name: 'createAddress',
+        component: () => import('@/views/Address/CreateAddressView.vue')
+    }, {
+        path: '/login',
+        name: 'LoginView',
+        component: () => import('@/views/Login/LoginView.vue')
+    }, {
+        path: '/register',
+        name: 'RegisterView',
+        component: () => import('@/views/Login/RegisterView.vue'),
+    },{
+        path:'/orderConfirmation',
+        name:'orderConfirmation',
+        component:()=>import('@/views/Order/OrderConfirmationView.vue')
+    }]
+});
+
+export default router;
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/shop.js" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/shop.js"
new file mode 100644
index 0000000000000000000000000000000000000000..665e87c93b20b443c534acbdf1d530c650283f7b
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/shop.js"
@@ -0,0 +1,266 @@
+import {defineStore} from "pinia";
+import {ref} from "vue";
+
+
+export const useShopInfoStore = defineStore('ShopInfo', () => {
+    const nearbyList = ref([
+        {
+            id: 1,
+            name: "沃尔码",
+            imgUrl: "http://www.dell-lee.com/imgs/vue3/near.png",
+            sales: 10000,
+            expressLimit: 0,
+            expressPrice: 5,
+            slogan: "VIP尊享满89元减4元运费券",
+            category: [
+                {
+                    id: 11,
+                    name: "新鲜水果",
+                    list: [
+                        {
+                            id: 111,
+                            title: "番茄 250g / 份",
+                            imgName: "tomato",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 3.6,
+                            oldPrice: 5.6
+                        },
+                        {
+                            id: 112,
+                            title: "车厘子 500g / 份",
+                            imgName: "cherry",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 33.9,
+                            oldPrice: 39.9
+                        },
+                        {
+                            id: 113,
+                            title: "橙子 500g / 份",
+                            imgName: "orange",
+                            sales: 110,
+                            number: 0,
+                            checked: false,
+                            price: 12.9,
+                            oldPrice: 22.9
+                        }
+                    ]
+                },
+                {
+                    id: 12,
+                    name: "海鲜水产",
+                    list: [
+                        {
+                            id: 121,
+                            title: "帝王蟹 250g / 份",
+                            imgName: "crab",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 99.9,
+                            oldPrice: 199.9
+                        }
+                    ]
+                }
+            ],
+            cartList: []
+        },
+        {
+            id: 2,
+            name: "山姆会员商店",
+            imgUrl: "http://www.dell-lee.com/imgs/vue3/near.png",
+            sales: 2000,
+            expressLimit: 0,
+            expressPrice: 5,
+            slogan: "联合利华洗护满10减5",
+            category: [
+                {
+                    id: 21,
+                    name: "新鲜水果",
+                    list: [
+                        {
+                            id: 211,
+                            title: "番茄 250g / 份",
+                            imgName: "tomato",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 3.6,
+                            oldPrice: 5.6
+                        },
+                        {
+                            id: 212,
+                            title: "桃子 500g / 份",
+                            imgName: "tomato",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 33.9,
+                            oldPrice: 39.9
+                        },
+                        {
+                            id: 213,
+                            title: "橙子 500g / 份",
+                            imgName: "orange",
+                            sales: 110,
+                            number: 0,
+                            checked: false,
+                            price: 12.9,
+                            oldPrice: 22.9
+                        }
+                    ]
+                },
+                {
+                    id: 22,
+                    name: "海鲜水产",
+                    list: [
+                        {
+                            id: 221,
+                            title: "帝王蟹 250g / 份",
+                            imgName: "crab",
+                            sales: 9,
+                            number: 0,
+                            checked: false,
+                            price: 99.9,
+                            oldPrice: 199.9
+                        },
+                        {
+                            id: 222,
+                            title: "虾 250g / 份",
+                            imgName: "tomato",
+                            sales: 19,
+                            number: 0,
+                            checked: false,
+                            price: 39.9,
+                            oldPrice: 59.9
+                        }
+                    ]
+                },
+                {
+                    id: 23,
+                    name: "零食小吃",
+                    list: [
+                        {
+                            id: 231,
+                            title: "薯片 250g / 份",
+                            imgName: "tomato",
+                            sales: 20,
+                            number: 0,
+                            checked: false,
+                            price: 9.9,
+                            oldPrice: 19.9
+                        },
+                        {
+                            id: 232,
+                            title: "饼干 250g / 份",
+                            imgName: "tomato",
+                            sales: 10,
+                            number: 0,
+                            checked: false,
+                            price: 3.9,
+                            oldPrice: 5.9
+                        }
+                    ]
+                }
+            ],
+            cartList: []
+        }
+    ]);
+
+    const handleClick = () => {
+        console.log('click');
+    };
+    const plusNum = (goodId, shopInfo) => {
+        shopInfo.value.category.forEach((item, index) => {
+            if (item.list.find(item => item.id === goodId)) {
+                shopInfo.value.category[index].list.forEach((item) => {
+                    if (item.id === goodId) {
+                        item.number++;
+                        // console.log(shopInfo.value.category[index].list)
+                        // shopInfo.value.category[index].list[0].checked = item.number!==0
+                        item.checked = item.number !== 0
+                    }
+                })
+            }
+            addCart(shopInfo, item)
+        })
+    };
+
+    const minusNum = (goodId, shopInfo) => {
+        shopInfo.value.category.forEach((item, index) => {
+            if (item.list.find(item => item.id === goodId)) {
+                shopInfo.value.category[index].list.forEach((item) => {
+                    if (item.id === goodId) {
+                        if (item.number === 0) return alert("商品数量不能为负数");
+                        item.number--;
+                        // shopInfo.value.category[index].list[0].checked = item.number !== 0
+                        item.checked = item.number !== 0
+                    }
+                });
+            }
+            addCart(shopInfo, item)
+        });
+    };
+
+    function addCart(shopInfo, goodInfo) {
+
+        // console.log(goodInfo.list)
+        goodInfo.list.forEach((item) => {
+            // console.log(item)
+            if (item.checked) {
+                // shopInfo.value.cartList.push(item)
+                // console.log(item.id);
+                const goodID = item.id;
+                shopInfo.value.cartList = shopInfo.value.cartList.filter(item => item.id !== goodID)
+                // if (shopInfo.value.cartList.find(item => item.id === goodID)) {
+                //     return;
+                // }
+                shopInfo.value.cartList.push(item);
+                // item.checked=false
+
+            } else if (!item.checked) {
+                const goodID = item.id;
+                shopInfo.value.cartList = shopInfo.value.cartList.filter(item => item.id !== goodID)
+            }
+        });
+        shopInfo.value.cartList.sum = 0;
+        shopInfo.value.cartList.forEach((item) => {
+            //保留小数点后两位
+            shopInfo.value.cartList.sum += Number((item.number * item.price).toFixed(2));
+        });
+    }
+
+    function resetCart(shopInfo) {
+        shopInfo.value.cartList = [] // 购物车清空
+        shopInfo.value.category.forEach(item => {
+                item.list.forEach(item => {
+                    item.number = 0; // 商品数量清空
+                    item.checked = false; // 商品选中状态清空
+            })
+        })
+    }
+
+// watch([nearbyList.value], (newVal, oldVal) => {
+//     nearbyList.value.forEach(item => {
+//             let cartList;
+//         item.category.forEach(item => {
+//             // console.log(item.list)
+//             cartList = item.list.filter(item => item.checked);
+//         })
+//         // console.log(cartList)
+//         // console.log(item.cartList=cartList)
+//     })
+// })
+const orderList = ref([]);
+    return {
+        orderList,
+        nearbyList,
+        plusNum,
+        minusNum,
+        handleClick,
+        resetCart
+    }
+});
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/user.js" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/user.js"
new file mode 100644
index 0000000000000000000000000000000000000000..9a4262ecbe591efb7b24c3ca9fd8ea6ef0606f17
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/stores/user.js"
@@ -0,0 +1,59 @@
+import {defineStore} from "pinia";
+import {ref} from "vue";
+
+
+export const useUserStore = defineStore('user', () => {
+    const updateCurrentAddress=(userInfo)=>{
+        userList.value.find(item=>item.id===currentUserInfo.value.id).currentAddress=userInfo
+    }
+    const addUser=(userInfo)=>{
+            userList.value.find(item=>item.id===currentUserInfo.value.id).addressList.push(userInfo)
+
+    }
+    const currentUserInfo = ref(null);
+    const userList = ref([
+        {
+            name: 'zhangsan',
+            password: '123',
+            id: '000001',
+            imgUrl: 'http://www.dell-lee.com/imgs/vue3/orange.png',
+            list: [
+                {title: '红包', content: 218},
+                {title: '优惠劵', content: '12张'},
+                {title: '红豆', content: 88},
+                {title: '白条', content: 1000}
+            ],
+            addressList: [
+                {
+                    name: '小慕',
+                    phone: 18611111111,
+                    address_text: '北京 海淀区西三环北路2号院北京理工大学国防科技园2号楼10号'
+                },
+                {
+                    name: '小可',
+                    phone: 18622222222,
+                    address_text: '北京 朝阳区北京工业大学3号楼303'
+                }
+            ],
+            currentAddress: null
+        },
+        {
+            name: 'admin',
+            password: '123',
+            id: '000002',
+            imgUrl: 'http://www.dell-lee.com/imgs/vue3/orange.png',
+            list: [
+                {title: '红包', content: 22},
+                {title: '优惠劵', content: '7张'},
+                {title: '红豆', content: 120},
+                {title: '白条', content: 2000}
+            ],
+            addressList: [],
+            currentAddress: null
+        }
+    ]);
+
+
+    return {userList,currentUserInfo,addUser,updateCurrentAddress}
+});
+
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/base.scss" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/base.scss"
new file mode 100644
index 0000000000000000000000000000000000000000..b7d4aeabdd5690899aa58c70b089a81ddf8da463
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/base.scss"
@@ -0,0 +1,17 @@
+html {
+    font-size: 100px;
+}
+
+body {
+    font-size: .12rem;
+    margin: 0;
+    padding: 0;
+}
+
+a {
+    //去掉a标签点击背景颜色
+    -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+    -webkit-user-select: none;
+    -moz-user-focus: none;
+    -moz-user-select: none;
+}
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/iconfont.css" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/iconfont.css"
new file mode 100644
index 0000000000000000000000000000000000000000..4fa1b8f9486c2ef1d9569d61d9ebcd31c6a3d2c5
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/iconfont.css"
@@ -0,0 +1,43 @@
+/* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
+@font-face {
+  font-family: 'iconfont';  /* Project id 3759887 */
+  src: url('//at.alicdn.com/t/c/font_3759887_yn0hf157sy.woff2?t=1669254870518') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3759887_yn0hf157sy.woff?t=1669254870518') format('woff'),
+       url('//at.alicdn.com/t/c/font_3759887_yn0hf157sy.ttf?t=1669254870518') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-position:before {
+  content: "\e619";
+}
+
+.icon-bell:before {
+  content: "\e7e5";
+}
+
+.icon-wodedingdan:before {
+  content: "\e655";
+}
+
+.icon-dingdan:before {
+  content: "\e645";
+}
+
+.icon-home:before {
+  content: "\e651";
+}
+
+.icon-gouwuche:before {
+  content: "\e690";
+}
+
+.icon-wode:before {
+  content: "\e60b";
+}
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/mixins.scss" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/mixins.scss"
new file mode 100644
index 0000000000000000000000000000000000000000..2b78818f9d1686dd7f8a98eaac91ac07f50e4564
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/mixins.scss"
@@ -0,0 +1,5 @@
+@mixin ellipse {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/viriables.scss" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/viriables.scss"
new file mode 100644
index 0000000000000000000000000000000000000000..92b796945b3eb7fe6c4e9ed8042c71e430dfa471
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/style/viriables.scss"
@@ -0,0 +1,12 @@
+$content-fontcolor: #333;
+$medium-fontColor: #666;
+$light-fontColor: #999;
+$content-notice-fontcolor: #777;
+$content-bgColor: #F1F1F1;
+$search-bgColor: #F5F5F5;
+$search-fontColor: #B7B7B7;
+$hightlight-fontColor: #E93B3B;
+$btn-bgColor: #0091FF;
+$bgColor: #FFF;
+$dark-fontColor: #000;
+$dark-bgColor: #F8F8F8;
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/AddressView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/AddressView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..cda9fe69d7d8b31926f75ed0fecedfb8006f6cb1
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/AddressView.vue"
@@ -0,0 +1,56 @@
+<script setup>
+import AddressCard from '@/components/Address/AddressCard.vue'
+import {useRouter} from "vue-router";
+const router = useRouter();
+if (!sessionStorage.getItem("isLogin")){
+  alert("请先登录")
+  router.push("/login")
+}
+</script>
+
+<template>
+  <div class="address_list">
+    <div class="address_list_header">
+      <span class="iconfont title_back" @click="$router.go(-1)">&#xe697;</span>
+      <div class="title_text">收货地址</div>
+      <div class="create" @click="$router.push('/address/create')">新建</div>
+    </div>
+    <div class="address_list_content">
+      <div class="address_list_content_item">
+        <AddressCard/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+.address_list {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: $dark-bgColor;
+  overflow-y: scroll;
+
+  &_header {
+    padding: .08rem .18rem;
+    font-size: .16rem;
+    color: $content-fontcolor;
+    text-align: center;
+    line-height: .24rem;
+    background-color: $bgColor;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  &_content {
+    margin-top: .58rem;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/CreateAddressView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/CreateAddressView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..fa85ea6343f0c074504595b1a97325de93eb880a
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Address/CreateAddressView.vue"
@@ -0,0 +1,111 @@
+<script setup>
+import {useUserStore} from "@/stores/user.js";
+import {ref} from "vue";
+import {useRouter} from "vue-router";
+
+const userStore = useUserStore();
+const router = useRouter();
+const address_text1 = ref();
+const address_text2 = ref();
+const address_text3 = ref();
+const name = ref();
+const phone = ref();
+const saveAddress = () => {
+  console.log(address_text1.value, address_text2.value, address_text3.value, name.value, phone.value);
+  // 判断输入是否为空
+  if (!address_text1.value || !address_text2.value || !address_text3.value || !name.value || !phone.value) {
+    alert("请将信息填写完整");
+    return;
+  }
+  userStore.addUser({
+    address_text: ''.concat(address_text1.value, address_text2.value, address_text3.value),
+    name:name.value, phone:phone.value
+  });
+  console.log(55)
+  router.push({
+    name: "address"
+  })
+}
+</script>
+
+<template>
+  <div class="create_address">
+    <div class="create_address_header">
+      <span class="iconfont title_back" @click="$router.push({name: 'address'})">&#xe697;</span>
+      <div class="title_text">新建收货地址</div>
+      <div class="save" @click="saveAddress">保存</div>
+    </div>
+    <div class="create_address_form">
+      <div class="form_item">
+        <div class="form_item_label">所在城市:</div>
+        <input type="text" class="form_item_content" placeholder="如北京市" v-model="address_text1">
+      </div>
+      <div class="form_item">
+        <div class="form_item_label">小区/大厦/学校:</div>
+        <input type="text" class="form_item_content" placeholder="如理工大学国防科技园" v-model="address_text2">
+      </div>
+      <div class="form_item">
+        <div class="form_item_label">楼号-门牌号:</div>
+        <input type="text" class="form_item_content" placeholder="如A号楼B层" v-model="address_text3">
+      </div>
+      <div class="form_item">
+        <div class="form_item_label">收货人:</div>
+        <input type="text" class="form_item_content" placeholder="请填写收货人姓名" v-model="name">
+      </div>
+      <div class="form_item">
+        <div class="form_item_label">联系电话:</div>
+        <input type="text" class="form_item_content" placeholder="请填写收货手机号" v-model="phone">
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+
+.create_address {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: $dark-bgColor;
+  overflow-y: scroll;
+
+  &_header {
+    padding: .08rem .18rem;
+    font-size: .16rem;
+    color: $content-fontcolor;
+    text-align: center;
+    line-height: .24rem;
+    background-color: $bgColor;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  &_form {
+    margin-top: .4rem;
+    padding: 0 .18rem;
+    background-color: $bgColor;
+    font-size: .14rem;
+
+    .form_item {
+      display: flex;
+      padding: .12rem;
+      line-height: .2rem;
+      border-top: .01rem solid $content-bgColor;
+
+      &_content {
+        flex: 1;
+        margin-left: .08rem;
+        border: none;
+        outline: none;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Cart/CartView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Cart/CartView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..b53f59499e44f99add80f2fdfbc2e4c948c3f546
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Cart/CartView.vue"
@@ -0,0 +1,62 @@
+<script setup>
+import CartCard from '@/components/Cart/CartCard.vue'
+import {useShopInfoStore} from "@/stores/shop.js";
+import {storeToRefs} from "pinia";
+import {ref} from "vue";
+
+const shopInfoStore = useShopInfoStore();
+const {nearbyList} = storeToRefs(shopInfoStore);
+const shopInfo = ref([]);
+nearbyList.value.forEach((item, index) => {
+  // console.log(item)
+  if (item.cartList.length!==0){
+    shopInfo.value.push(item)
+    // console.log(item)
+    // console.log(shopInfo.value)
+  }
+})
+</script>
+
+<template>
+  <div class="cart_list">
+    <div class="cart_list_header">我的全部购物车
+      <span>({{ shopInfo.length }})</span>
+    </div>
+    <div class="cart_list_content">
+      <div class="cart_list_content_item">
+        <div style="text-align: center;color: red;font-weight: bolder" v-if="shopInfo.length===0">暂无购物车</div>
+        <CartCard/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+.cart_list {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: .5rem;
+  background-color: $dark-bgColor;
+  overflow-y: scroll;
+
+  &_header {
+    padding: .08rem .18rem;
+    font-size: .16rem;
+    color: $content-fontcolor;
+    text-align: center;
+    line-height: .24rem;
+    background-color: $bgColor;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+  }
+
+  &_content {
+    margin-top: .58rem;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Home/HomeView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Home/HomeView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..8ea22f3cfe719e59d4ec21c8ee94de1745399b19
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Home/HomeView.vue"
@@ -0,0 +1,27 @@
+<script setup>
+
+import StaticPart from "@/components/Home/StaticPart.vue";
+import NearBy from "@/components/Home/NearBy.vue";
+</script>
+
+<template>
+  <div class="home">
+    <!-- 头图+菜单静态组件 -->
+    <static-part/>
+    <!-- 附近商店组件 -->
+    <near-by/>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.home {
+  overflow-y: auto;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: .5rem;
+  padding: 0 .18rem .1rem .18rem;
+}
+</style>
+
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Layout/LayoutView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Layout/LayoutView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..f8688278bb386c1003cacacb0046385732f9afd6
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Layout/LayoutView.vue"
@@ -0,0 +1,19 @@
+<script setup>
+import {RouterView, useRouter} from "vue-router";
+import Tabbar from "@/components/Layout/Tabbar.vue";
+
+let router = useRouter();
+if (!sessionStorage.getItem("isLogin")) {
+  alert("请先登录")
+  router.push("/login")
+}
+</script>
+<template>
+  <!-- 展示区 -->
+  <RouterView/>
+  <!-- 导航区 -->
+  <tabbar/>
+</template>
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/LoginView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/LoginView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..5e4150764a21926aa3295b1461a7e3a60c240556
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/LoginView.vue"
@@ -0,0 +1,100 @@
+<script setup>
+import { useRouter } from 'vue-router'
+import { ref } from 'vue'
+import { useUserStore } from '@/stores/user.js'
+import {storeToRefs} from "pinia";
+
+const router = useRouter()
+const user = storeToRefs(useUserStore());
+const username = ref('')
+const password = ref('')
+console.log(user)
+const login = () => {
+    //验证
+
+    // 匹配
+    let res = ref(user.userList.value.find(item => item.name === username.value && item.password === password.value));
+  console.log(res)
+    if(!res) {
+        alert('用户不存在或者密码错误')
+    }else {
+        // 匹配成功，登录
+        router.push({ path: '/home'})
+        user.currentUserInfo.value = res.value
+        // 本地存储
+        sessionStorage.setItem('isLogin', true)
+
+        // localStorage
+    }
+}
+</script>
+
+<template>
+  <div class="login">
+        <div class="login_img">
+            <img src="http://www.dell-lee.com/imgs/vue3/user.png" alt="">
+        </div>
+        <div class="login_phone">
+            <input type="text" v-model="username" placeholder="请输入用户名">
+        </div>
+        <div class="login_password">
+            <input type="password" v-model="password" placeholder="请输入密码">
+        </div>
+        <div class="login_btn" @click="login">登录</div>
+        <div class="login_link" @click="router.push({ path: '/register'})">立即注册</div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+.login {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    right: 0;
+    transform: translateY(-50%);
+
+    &_img {
+        img {
+            width: .66rem;
+            height: .66rem;
+            display: block;
+            margin: 0 auto .4rem auto;
+        }
+    }
+    &_phone, &_password {
+        margin: 0 .4rem .16rem .4rem;
+        line-height: .48rem;
+        border: .01rem solid rgba(0, 0, 0, .1);
+        border-radius: .06rem;
+        padding: 0 .16rem;
+        background-color: $dark-bgColor;
+
+        input {
+            border: none;
+            outline: none;
+            line-height: .48rem;
+            width: 100%;
+            background: none;
+            font-size: .16rem;
+            color: $content-fontcolor;
+        }
+    }
+    &_btn {
+        margin: .32rem .4rem .16rem .4rem;
+        line-height: .48rem;
+        text-align: center;
+        background: $btn-bgColor;
+        box-shadow: 0 0.04rem 0.08rem 0 rgba(0, 145, 255, 0.32);
+        border-radius: 0.04rem;
+        color: $bgColor;
+        font-size: 0.16rem;
+        cursor:pointer;
+    }
+    &_link {
+        text-align: center;
+        font-size: .14rem;
+        color: $content-notice-fontcolor;
+    }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/RegisterView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/RegisterView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..c92a318a04f1270bd4395ada07ff69fd8c300601
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Login/RegisterView.vue"
@@ -0,0 +1,114 @@
+<script setup>
+import { useRouter } from 'vue-router'
+import { ref } from 'vue'
+import { useUserStore } from '@/stores/user.js'
+
+const router = useRouter()
+const user = useUserStore()
+
+const username = ref('')
+const password = ref('')
+const confirmPassword = ref('')
+
+const register = () => {
+    // 验证
+
+    // 数组中最后一个用户对象
+    let lastUser = user.userList[user.userList.length-1]
+    // 当前注册id
+    let id = parseInt(lastUser.id) + 1
+    // 创建注册用户对象
+    const person = {
+        name: username.value,
+        password: password.value,
+        // id: (Array(6).join('0') + id).slice(-6),
+        id: ('00000' + id).slice(-6),
+        imgUrl: 'http://www.dell-lee.com/imgs/vue3/orange.png',
+        list: [
+            { title: '红包', content: 0},
+            { title: '优惠劵', content: '0张'},
+            { title: '红豆', content: 0},
+            { title: '白条', content: 0}
+        ],
+        addressList: [],
+        currrentAddress: null
+    }
+    // axios post
+    user.userList.push(person)
+
+    console.log(user.userList)
+}
+
+</script>
+
+<template>
+   <div class="register">
+        <div class="register_img">
+            <img src="http://www.dell-lee.com/imgs/vue3/user.png" alt="">
+        </div>
+        <div class="register_phone">
+            <input type="text" v-model="username" placeholder="请输入用户名">
+        </div>
+        <div class="register_password">
+            <input type="password" v-model="password" placeholder="请输入密码">
+        </div>
+        <div class="register_confirm_password">
+            <input type="password" v-model="confirmPassword" placeholder="确认密码">
+        </div>
+        <div class="register_btn" @click="register">注册</div>
+        <div class="register_link" @click="router.push({ path: '/login'})">已有账号去登录</div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+.register {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    right: 0;
+    transform: translateY(-50%);
+
+    &_img {
+        img {
+            width: .66rem;
+            height: .66rem;
+            display: block;
+            margin: 0 auto .4rem auto;
+        }
+    }
+    &_phone, &_password, &_confirm_password {
+        margin: 0 .4rem .16rem .4rem;
+        line-height: .48rem;
+        border: .01rem solid rgba(0, 0, 0, .1);
+        border-radius: .06rem;
+        padding: 0 .16rem;
+        background-color: $dark-bgColor;
+
+        input {
+            border: none;
+            outline: none;
+            line-height: .48rem;
+            width: 100%;
+            background: none;
+            font-size: .16rem;
+            color: $content-fontcolor;
+        }
+    }
+    &_btn {
+        margin: .32rem .4rem .16rem .4rem;
+        line-height: .48rem;
+        text-align: center;
+        background: $btn-bgColor;
+        box-shadow: 0 0.04rem 0.08rem 0 rgba(0, 145, 255, 0.32);
+        border-radius: 0.04rem;
+        color: $bgColor;
+        font-size: 0.16rem;
+    }
+    &_link {
+        text-align: center;
+        font-size: .14rem;
+        color: $content-notice-fontcolor;
+    }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/My/MyView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/My/MyView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..6dbf83b56cf38a4c418bbd0928708e81995705a7
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/My/MyView.vue"
@@ -0,0 +1,197 @@
+<script setup>
+import {useUserStore} from "@/stores/user.js";
+import {useRouter} from "vue-router";
+
+const userStore = useUserStore();
+let userList = userStore.currentUserInfo;
+let router = useRouter();
+const LogOut = () => {
+  router.push({name: 'LoginView'})
+  sessionStorage.removeItem('isLogin')
+}
+if (!userList){
+  alert('请先登录！')
+  router.push({name:'LoginView'})
+  userList = 1;
+}
+</script>
+
+<template>
+  <div class="my">
+    <div class="header">
+      <div class="person">
+        <!-- 头像 -->
+        <div class="person_avatar">
+          <img :src="userList.imgUrl" alt="">
+        </div>
+        <!-- 个人信息 -->
+        <div class="person_info">
+          <div class="person_info_name">{{ userList.name }}</div>
+          <div class="person_info_id">ID: {{ userList.id }}</div>
+        </div>
+        <!-- 列表信息 -->
+        <div class="person_message">
+          <div class="person_message_item" v-for="(item,index) of userList.list" :key="index">
+            <div class="person_message_item_title">{{ item.title }}</div>
+            <div class="person_message_item_content">{{ item.content }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="list">
+      <!-- 功能列表 -->
+      <div class="list_item">
+        <span class="iconfont list_item_icon list_item_wallet">&#xe631;</span>
+        <div class="list_item_message">我的钱包</div>
+        <span class="iconfont list_item_arrow">&#xe8f1;</span>
+      </div>
+      <div class="list_item">
+        <span class="iconfont list_item_icon list_item_address">&#xe60d;</span>
+        <div class="list_item_message" @click="$router.push('/address')">我的地址</div>
+        <span class="iconfont list_item_arrow">&#xe8f1;</span>
+      </div>
+      <div class="list_item">
+        <span class="iconfont list_item_icon list_item_help">&#xe616;</span>
+        <div class="list_item_message">客服与帮助</div>
+        <span class="iconfont list_item_arrow">&#xe8f1;</span>
+      </div>
+    </div>
+    <div class="logout" @click="LogOut">退出登录</div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/viriables.scss';
+
+.my {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+
+  .header {
+    position: relative;
+    height: 2.5rem;
+    background-image: linear-gradient(239deg, #3A6FF3 0%, #50C7FB 100%);
+    border-radius: 0 0 35% 35%;
+
+    .person {
+      position: absolute;
+      top: 1rem;
+      left: .18rem;
+      right: .18rem;
+      background-color: $bgColor;
+      padding-top: .6rem;
+      border-radius: .08rem;
+      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, .08);
+      //头像
+      &_avatar {
+        position: absolute;
+        left: 50%;
+        top: -0.47rem;
+        transform: translateX(-50%);
+        border-radius: 50%;
+        overflow: hidden;
+        z-index: 1;
+
+        img {
+          width: .94rem;
+          height: .94rem;
+          display: block;
+        }
+      }
+
+      //个人信息
+      &_info {
+        border-bottom: .01rem solid $content_bgColor;
+        padding: .16rem 0;
+
+        &_name {
+          line-height: .36rem;
+          text-align: center;
+          font-size: .24rem;
+          color: #262628;
+        }
+
+        &_id {
+          text-align: center;
+          font-size: .14rem;
+          color: #C1C0C9;
+        }
+      }
+
+      //列表信息
+      &_message {
+        padding: .16rem .28rem;
+        display: flex;
+
+        &_item {
+          flex: 1;
+          text-align: center;
+
+          &_title {
+            color: #C1C0C9;
+          }
+
+          &_content {
+            font-size: .2rem;
+            color: #262628;
+            margin-top: .03rem;
+          }
+        }
+      }
+    }
+  }
+
+  .list {
+    margin: 1rem .18rem 0 .18rem;
+    border-radius: .08rem;
+    box-shadow: 0 .0 .16rem .08rem rgba(0, 0, 0, .08);
+
+    &_item {
+      display: flex;
+      align-items: center;
+      padding: .12rem .16rem;
+      //图标
+      &_icon {
+        font-size: .16rem;
+        padding: .03rem;
+        color: $bgColor;
+        border-radius: .08rem;
+        margin-right: .16rem;
+
+      }
+
+      // 钱包
+      &_wallet {
+        background-color: #ED4A47;
+      }
+
+      // 地址
+      &_address {
+        background-color: #32C5FF;
+      }
+
+      //客服与帮助
+      &_help {
+        background-color: #9013FE;
+      }
+
+      //文字
+      &_message {
+        flex: 1;
+        font-size: .14rem;
+      }
+    }
+  }
+
+  .logout {
+    margin: .18rem;
+    line-height: .32rem;
+    background-color: $btn_bgColor;
+    color: $bgColor;
+    text-align: center;
+    border-radius: .04rem;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderConfirmationView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderConfirmationView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..9d308b3d6744b310e14265f664c056471186d84a
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderConfirmationView.vue"
@@ -0,0 +1,234 @@
+<script setup>
+import CartCard from '@/components/Cart/CartCard.vue';
+import {useUserStore} from "@/stores/user.js";
+import {useRoute, useRouter} from "vue-router";
+import {ref} from "vue";
+import {useShopInfoStore} from "@/stores/shop.js";
+import {storeToRefs} from "pinia";
+
+const route = useRoute();
+const router = useRouter();
+const shopInfoStore = useShopInfoStore();
+const {nearbyList,orderList} = storeToRefs(shopInfoStore);
+const shopID = ref(Number(route.query.shopID));
+const shopInfo = ref(nearbyList.value.filter(item => item.id === shopID.value));
+// console.log(shopInfo.value[0])
+// currentUserInfo = '';
+let {currentUserInfo} = storeToRefs(useUserStore());
+// console.log(Boolean(currentUserInfo))
+if (!currentUserInfo.value){
+  currentUserInfo.value = {currentAddress:null}
+  alert('请先登录');
+  router.push({name: 'LoginView'});
+}
+const show=ref(false)
+
+const confirmOrder = () => {
+  orderList.value.push(shopInfo.value[0]);
+  router.push({name: 'order'});
+
+  // shopInfo.value[0].cartList=[]
+}
+if (shopInfo.value.length!==0){
+  const countSum = () => {
+    shopInfo.value[0].cartList.forEach(item => {
+      shopInfo.value[0].cartList.sum+=item.number*item.price.toFixed(2)
+    })
+  };
+  countSum();
+}
+</script>
+
+<template>
+  <div class="order_confirmation">
+    <div class="order_confirmation_header">
+      <div class="order_confirmation_header_title">
+        <span class="iconfont title_back" @click="$router.go(-1)">&#xe697;</span>
+        <div class="title_text">确定订单</div>
+      </div>
+      <div class="order_confirmation_header_address">
+        <div class="address_title">收货地址</div>
+        <div class="current_address" @click="$router.push('/address')">
+          <div class="current_address_info" v-if="currentUserInfo.currentAddress">
+            <div>{{ currentUserInfo.currentAddress.address_text }}</div>
+            <div>{{ currentUserInfo.currentAddress.name }} {{ currentUserInfo.currentAddress.phone }}</div>
+          </div>
+          <div class="current_address_info" v-else >暂无收货地址</div>
+          <div class="iconfont current_address_icon" >&#xe697;</div>
+        </div>
+      </div>
+    </div>
+    <div class="order_confirmation_content">
+      <CartCard />
+    </div>
+    <div class="order_confirmation_footer">
+      <div class="total_price">实付金额: <b>￥{{ (shopInfo[0].cartList.sum) }}</b></div>
+      <div class="submit" v-if="true" @click="show = true">提交订单</div>
+    </div>
+    <!-- 蒙层 -->
+    <div class="mask" v-if="show">
+      <div class="mask_content">
+        <div class="mask_content_title">确认要离开收银台?</div>
+        <div class="mask_content_desc">请尽快完成支付,否则将被取消</div>
+        <div class="mask_content_btn">
+          <div class="btn cancel" @click="show = false">取消订单</div>
+          <div class="btn confirm" @click="confirmOrder">确定支付</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+.order_confirmation {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: #eee;
+
+  &_header {
+    padding: .18rem;
+    height: 1.6rem;
+    background-image: linear-gradient(0deg, rgba(0, 145, 255, 0.00) 4%, #0091FF 50%);
+    background-size: 100% 1.6rem;
+    background-repeat: no-repeat;
+
+    &_title {
+      display: flex;
+      color: $bgColor;
+
+      .title_back {
+        font-size: .22rem;
+      }
+      .title_text {
+        flex: 1;
+        text-align: center;
+        font-size: .16rem;
+      }
+    }
+    &_address {
+      padding: .18rem;
+      background-color: $bgColor;
+      margin-top: .28rem;
+      line-height: .22rem;
+      font-size: .16rem;
+      color: $content_fontcolor;
+      border-radius: .04rem;
+      .address_title {
+        margin-bottom: .18rem;
+      }
+      .current_address {
+        display: flex;
+        justify-content: space-between;
+
+        &_info {
+          div:last-child {
+            font-size: .12rem;
+          }
+        }
+
+        &_icon {
+          transform: rotate(180deg);
+          margin-right: .08rem;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+        }
+      }
+    }
+  }
+
+  &_content {
+    width: 100%;
+    position: absolute;
+    top: 2rem;
+    bottom: .5rem;
+    box-sizing: border-box;
+    overflow-y: scroll;
+  }
+
+  &_footer {
+    height: .5rem;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: $bgColor;
+    line-height: .5rem;
+    display: flex;
+
+    .total_price {
+      flex: 1;
+      padding-left: .18rem;
+    }
+    .submit {
+      width: 1rem;
+      height: .5rem;
+      background-color: $btn-bgColor;
+      color: $bgColor;
+      text-align: center;
+      font-size: .14rem;
+    }
+  }
+
+  // 蒙层
+  .mask {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 999;
+    background-color: rgba($color: #000000, $alpha: .5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &_content {
+      width: 80%;
+      padding: .24rem;
+      box-sizing: border-box;
+      background-color: $bgColor;
+      border-radius: .04rem;
+      text-align: center;
+
+      &_title {
+        font-size: .18rem;
+        font-weight: bold;
+        color: $content_fontcolor;
+      }
+      &_desc {
+        margin: .12rem 0;
+        line-height: .2rem;
+        font-size: .14rem;
+        color: $medium-fontColor;
+      }
+      &_btn {
+        display: flex;
+        justify-content: center;
+
+        .btn {
+          width: .8rem;
+          height: .32rem;
+          border-radius: .24rem;
+          font-size: .14rem;
+          line-height: .32rem;
+        }
+        .cancel {
+          margin-right: .12rem;
+          border: solid .01rem $btn-bgColor;
+          color: $btn-bgColor;
+        }
+        .confirm {
+          background-color: $btn-bgColor;
+          color: $bgColor;
+        }
+      }
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..985bccb98ac6f75cb0728282d57abddb435bb01d
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Order/OrderView.vue"
@@ -0,0 +1,44 @@
+<script setup>
+import OrderCard from '@/components/Order/OrderCard.vue';
+</script>
+
+<template>
+  <div class="order_list">
+    <div class="order_list_header">我的订单</div>
+    <div class="order_list_content">
+      <div class="order_list_content_item">
+        <OrderCard/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+.order_list {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: .5rem;
+  background-color: $dark-bgColor;
+  overflow-y: scroll;
+
+  &_header {
+    padding: .08rem .18rem;
+    font-size: .16rem;
+    color: $content-fontcolor;
+    text-align: center;
+    line-height: .24rem;
+    background-color: $bgColor;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+  }
+
+  &_content {
+    margin-top: .58rem;
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Shop/ShopView.vue" "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Shop/ShopView.vue"
new file mode 100644
index 0000000000000000000000000000000000000000..6c8c73b184b7602562c5ce3d77cb4acdb1630056
--- /dev/null
+++ "b/\345\221\250\345\216\232\350\276\260/01.\344\272\254\344\270\234\345\210\260\345\256\266/src/views/Shop/ShopView.vue"
@@ -0,0 +1,168 @@
+<script setup>
+import {useRoute, useRouter} from "vue-router";
+import {storeToRefs} from "pinia";
+import Product from "@/components/Shop/Product.vue";
+import ShopInfo from "@/components/Home/ShopInfo.vue";
+import {useShopInfoStore} from "@/stores/shop.js";
+import {ref} from "vue";
+import CartBottom from "@/components/Cart/CartBottom.vue";
+
+const shopInfoStore = useShopInfoStore();
+const {nearbyList} = storeToRefs(shopInfoStore);
+const router = useRouter();
+const route = useRoute();
+const id = Number(route.params.id);
+const shopInfo = ref(nearbyList.value.find(item => item.id === id));
+const goBack = () => {
+  router.go(-1);
+};
+function activeOff() {
+  shopInfo.value.category.forEach(item => {
+    item.active = false;
+  })
+}
+
+const changeType = (id, index) => {
+  product.value = shopInfo.value.category.find(item => item.id === id).list;
+  activeOff()
+  shopInfo.value.category[index].active = true;
+  active = false;
+}
+
+let active = true;
+const product = ref([]);
+
+function resetProduct() {
+  active = true;
+  activeOff();
+  product.value = [];
+  shopInfo.value.category.map(item => {
+    item.list.map(item => {
+      product.value.push(item)
+    })
+  })
+  shopInfo.value.cartList.sum = 0;
+}
+
+resetProduct();
+const plusCart=(goodID)=>{
+  shopInfoStore.plusNum(goodID,shopInfo)
+}
+
+const minusCart=(goodID)=>{
+  shopInfoStore.minusNum(goodID,shopInfo)
+}
+</script>
+
+<template>
+  <div class="shop">
+    <!-- 搜索 -->
+    <div class="search">
+      <span class="iconfont search_back" @click="goBack">&#xe697;</span>
+      <div class="search_content">
+        <span class="iconfont search_content_icon">&#xe632;</span>
+        <input type="text" class="search_content_input" placeholder="请输入商品名称">
+      </div>
+    </div>
+    <!-- 商店信息 -->
+    <div class="shop_info">
+      <ShopInfo :shop-info="shopInfo"/>
+    </div>
+    <!-- 内容 -->
+    <div class="content">
+      <div class="category">
+        <div class="category_item " @click="resetProduct" v-bind:class="active ? 'category_item--active' : '' ">
+          全部商品
+        </div>
+        <div class="category_item" v-for="(item, index) in shopInfo.category" @click="changeType(item.id,index)"
+             :class="item.active ? 'category_item--active' : ''">{{ item.name }}
+        </div>
+      </div>
+      <div class="product">
+        <div>
+          <product :product="product" @plusCart="plusCart" @minusCart="minusCart"/>
+        </div>
+      </div>
+    </div>
+    <!-- 购物车底部 -->
+<CartBottom/>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+@import "@/style/viriables.scss";
+
+.shop {
+  //搜索
+  .search {
+    margin: .18rem;
+    display: flex;
+    align-items: center;
+
+    &_back {
+      font-size: .24rem;
+      margin-right: .08rem;
+      color: #b6b6b6;
+    }
+
+    &_content {
+      flex: 1;
+      height: .32rem;
+      background-color: #f5f5f5;
+      border-radius: .16rem;
+      display: flex;
+      align-items: center;
+
+      &_icon {
+        color: #b6b6b6;
+        margin: 0 .12rem;
+      }
+
+      &_input {
+        border: none;
+        outline: none;
+        background: none;
+        width: 100%;
+        height: .32rem;
+      }
+    }
+  }
+
+  //商店信息
+  .shop_info {
+    margin: 0 .18rem;
+  }
+
+  // 内容
+  .content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 1.7rem;
+    bottom: .5rem;
+    display: flex;
+
+    .category {
+      overflow-y: scroll;
+      width: .78rem;
+      background-color: #f5f5f5;
+
+      &_item {
+        line-height: .4rem;
+        font-size: .14rem;
+        text-align: center;
+        color: $content_fontcolor;
+
+        &--active {
+          background-color: $bgColor;
+        }
+      }
+    }
+
+    .product {
+      flex: 1;
+      overflow-y: scroll;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git "a/\345\260\217\346\234\261/123.txt" "b/\345\260\217\346\234\261/123.txt"
deleted file mode 100644
index d800886d9c86731ae5c4a62b0b77c437015e00d2..0000000000000000000000000000000000000000
--- "a/\345\260\217\346\234\261/123.txt"
+++ /dev/null
@@ -1 +0,0 @@
-123
\ No newline at end of file