From 7f5093021e958658620df3b5aed6f48dde50c111 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 9 Feb 2023 14:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopping/components/Order/placeOrder.vue  | 33 +++++++++++++++++-
 .../src/views/shopping/pages/sirendingzhi.vue |  8 +++--
 .../src/views/shopping/shopHome.vue           | 34 +++++--------------
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
index 4e56837f..8558d2a6 100644
--- a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
@@ -1,11 +1,42 @@
 <template>
   <div class="placeOrder">
-    下单页面
+    <div class="jz d-flex">
+      <div class="leftDiv">
+        <div class="phoneDiv">
+          <p class="f_14">手机号码:</p>
+          <p class="f_14">我们将通过以下手机号码向您发送订单相关信息</p>
+          <p class="f_14 phone">17719145652</p>
+        </div>
+      </div>
+      <div class="rightDiv">1</div>
+    </div>
+
   </div>
 </template>
 <style lang="less" scoped>
   .placeOrder{
     padding-top: 54px;
     background-color: #F6F6F6;
+    & >.jz{
+      justify-content: space-around;
+      .leftDiv{
+         width: 820px;
+        .phoneDiv{
+          padding: 15px 25px;
+          background-color: #fff;
+          margin-bottom: 25px;
+          p{
+            margin-bottom: 11px;
+            font-weight: 600;
+          }
+          .phone{
+            color: #999;
+          }
+        }
+       }
+      .rightDiv{
+        width: 410px;
+      }
+    }
   }
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
index 162fcb5e..a07c18df 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/sirendingzhi.vue
@@ -152,16 +152,20 @@
       </div>
     </div>
     <div class="steps__wrapper" v-if="current == 1"></div>
+    <div v-if="current == 3">
+      <PlaceOrder></PlaceOrder>
+    </div>
   </div>
 </template>
 <script>
   import Header from "../components/Header/HeaderView";
+  import PlaceOrder from "../components/Order/placeOrder"
   export default {
     name: "sirendingzhi",
-    components: { Header },
+    components: { Header ,PlaceOrder},
     data() {
       return {
-        current: 0,
+        current: 3,
         dialogVisible: false,
         dialogModel: {
           imgUrl: "",
diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
index e553cb6d..34fc7037 100644
--- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue
@@ -88,8 +88,8 @@
           </div>
           <div class="box" v-for="(item, index) in clothList2" :key="index">
             <img :src="item.imgUrl" alt="" />
-            <p class="box1">{{item.title}}</p>
-            <p class="box2">{{item.time}}</p>
+            <p class="box1">CLOTHING NAM</p>
+            <p class="box2">15分钟前定制</p>
           </div>
         </a-carousel>
         <div class="more d-flex" style="padding-top: 20px">
@@ -124,7 +124,7 @@
               >
                 <img :src="item.imgUrl" alt="" />
                 <p class="title_6">
-                  {{ item.title1 }}<span class="line">|</span>{{ item.title2 }}
+                  {{ item.title1 }}<span class="line">|</span>{{ item.title1 }}
                 </p>
                 <div>
                   <el-tag type="warning" size="small">{{ item.tag1 }}</el-tag
@@ -151,7 +151,7 @@
               >
                 <img :src="item.imgUrl" alt="" />
                 <p>
-                  {{ item.title1 }}<span class="line">|</span>{{ item.title2 }}
+                  {{ item.title1 }}<span class="line">|</span>{{ item.title1 }}
                 </p>
                 <div>
                   <el-tag type="warning" size="small">{{ item.tag1 }}</el-tag
@@ -178,7 +178,7 @@
               >
                 <img :src="item.imgUrl" alt="" />
                 <p>
-                  {{ item.title1 }}<span class="line">|</span>{{ item.title2 }}
+                  {{ item.title1 }}<span class="line">|</span>{{ item.title1 }}
                 </p>
                 <div>
                   <el-tag type="warning" size="small">{{ item.tag1 }}</el-tag
@@ -215,8 +215,6 @@
         activeName: "first",
         url: {
           zxdz: "/zygoods/zyGoods/zxdz",
-          tjsp: "/zygoods/zyGoods/tjsp",
-          fzlx: "/zygoods/zyGoods/fzlx",
         },
         // 轮播图数据
         imgList: [
@@ -632,27 +630,11 @@
       this.vh = window.screen.availHeight - 100;
       getAction(this.url.zxdz).then((res) => {
         if (res.success) {
+          console.log(res.result);
           this.clothList = res.result;
         }else{
           this.$message.error(res.message);
         }
-      });
-      getAction(this.url.tjsp).then((res) => {
-        if (res.success) {
-          this.clothList2 = res.result;
-        }else{
-          this.$message.error(res.message);
-        }
-      });
-      getAction(this.url.fzlx).then((res) => {
-        if (res.success) {
-          console.log(res.result)
-          this.nanzhuang = res.result.nz;
-          this.nvzhuang = res.result.nvz;
-          this.tongzhuang = res.result.tz;
-        }else{
-          this.$message.error(res.message);
-        }
       })
     },
   }
@@ -881,16 +863,18 @@
     padding-bottom: 10px;
   }
   .section5 .tabs .jz {
-    justify-content: space-between;
+    justify-content: flex-start;
     flex-wrap: wrap;
   }
   .section5 .tabs .jz .item {
     background-color: #fff;
     width: 19%;
+    min-width: 270px;
     flex-direction: column;
     align-items: center;
     padding-bottom: 30px;
     margin-bottom: 30px;
+    margin-right: 11px;
   }
   .section5 .tabs .jz .item img {
     width: 80%;