From e34520a3a8f44802a72c32441b46c8374436b049 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 23 Feb 2023 14:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/placeOrder.vue   | 113 ++++++++++--------
 1 file changed, 60 insertions(+), 53 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
index a48b62be..4052f89c 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/placeOrder.vue
@@ -21,30 +21,30 @@
             </div>
             <div class="steps">
               <a-steps direction="vertical" size="small" :current="current">
-                <a-step title="提交订单" description="2022-12-24 12:23:00" >
+                <a-step title="提交订单" :description="this.model.orderTime" >
                   <a-icon slot="icon" type="container" />
                 </a-step>
-                <a-step title="已支付" description="This is a description." >
+                <a-step title="已支付"  >
                   <a-icon slot="icon" type="credit-card" />
                 </a-step>
 
-                <a-step title="待生产" description="This is a description." >
+                <a-step title="待生产"  >
                   <a-icon slot="icon" type="rocket" />
                 </a-step>
 
-                <a-step title="生产中" description="2022-12-24 12:23:00" >
+                <a-step title="生产中"  >
                   <a-icon slot="icon" type="reconciliation" />
                 </a-step>
 
-                <a-step title="已发货" description="2022-12-24 12:23:00">
+                <a-step title="已发货" >
                   <a-icon slot="icon" type="car" />
                 </a-step>
 
-                <a-step title="已到货" description="This is a description." >
+                <a-step title="已到货"  >
                   <a-icon slot="icon" type="home" />
                 </a-step>
 
-                <a-step title="已签收" description="This is a description." >
+                <a-step title="已签收"  >
                   <a-icon slot="icon" type="printer" />
                 </a-step>
 
@@ -53,40 +53,29 @@
           </div>
           <div class="r">
             <div class="title d-flex">
-              <span class="f_20 c_333">订单号#{{this.model.orderNum}}<span class="line f_16 c_1B">|</span>2022-08-19</span>
+              <span class="f_20 c_333">订单号#{{this.model.orderNum}}<span class="line f_16 c_1B">|</span>{{this.model.orderTime}}</span>
               <div class="right d-flex f_16"><span>数量</span><span>价格</span><span>总计</span></div>
             </div>
             <div class="d-flex orderDiv">
               <div class="orderAddr">
                 <p class="headline">配送至</p>
-                <a-button style="padding-top: 10px;word-wrap: break-word;
-                  overflow-wrap: break-word;
-                  white-space: normal;
-                  height: auto;
-                  text-align:left;
-                  margin-bottom:10px;
-                  overflow: hidden;">
-                  <p class="text">河南省</p>
-                  <p class="text">驻马店市 驿城区</p>
-                  <p class="text">黄淮学院南校区学府花园26号楼3602</p>
-                  <p class="text d-flex"><span>463000</span><span>默认地址</span></p>
-                </a-button>
-                <a-button style="padding-top: 10px;word-wrap: break-word;
+                <a-button
+                  class="defaultAddr"
+                  style="padding-top: 10px;word-wrap: break-word;
                   overflow-wrap: break-word;
                   white-space: normal;
                   height: auto;
                   margin-bottom:10px;
                   text-align:left;
-                  overflow: hidden;">
-                  <p class="text">河南省</p>
-                  <p class="text">驻马店市 驿城区</p>
-                  <p class="text">黄淮学院南校区学府花园26号楼3602</p>
-                  <p class="text">463000</p>
+                  overflow: hidden;" v-for="(item,index) in addrList" :key="index" @click="chooseAddr(item)" >
+                  <p class="text">{{item.addr1}}</p>
+                  <p class="text">{{item.addr2}}</p>
+                  <p class="text d-flex"><span>463000</span><span v-if="item.flag">默认地址</span></p>
                 </a-button>
-                <p class="headline">已发货</p>
-                <p class="text">您的订单已经发出。</p>
-                <p class="headline">尊享免费配送，您的物流单号：</p>
-                <p class="text">4263882788397</p>
+<!--                <p class="headline">已发货</p>-->
+<!--                <p class="text">您的订单已经发出。</p>-->
+<!--                <p class="headline">尊享免费配送，您的物流单号：</p>-->
+<!--                <p class="text">4263882788397</p>-->
               </div>
               <div class="orderList ">
                 <div class="item d-flex">
@@ -124,7 +113,10 @@
             </div>
           </div>
         </div>
-        <div class="btn"><router-link to="/shopping/person" class="c_fff f_16">返回</router-link></div>
+        <div class="btn">
+          <a  class="c_fff f_16" @click="handleBack">返回</a>
+          <a  class="c_fff f_16">提交</a>
+        </div>
       </div>
     </div>
     <Footer></Footer>
@@ -140,34 +132,48 @@
       return {
         current:0,//目前步骤条在第几步
         model:{
-          id:'',
-          orderNum:'',
-          pay:false,
-          receipt:false
-        }
+          id:'',//订单id
+          orderNum:'1111111',//订单编号
+          orderTime:'2022-08-19',//下单时间
+          pay:false,//是否已支付
+          // receipt:false
+        },
+        addrList:[//地址列表
+          {
+            id:1,
+            addr1:'河南省 驻马店市 驿城区',
+            addr2:'黄淮学院南校区学府花园26号楼3602',
+            flag:true//是否默认地址
+          },
+          {
+            id:2,
+            addr1:'河南省 驻马店市 驿城区',
+            addr2:'黄淮学院南校区学府花园26号楼3601',
+            flag:false
+          }
+        ]
       };
     },
-    created() {
-      // this.model.id = this.$route.query.id
-      // this.model.orderNum = this.$route.query.orderNum
-      // this.model.pay = JSON.parse(this.$route.query.pay)
-      // this.model.receipt = JSON.parse(this.$route.query.receipt)
-      // switch (this.$route.query.key) {
-      //   case 'daizhifu':
-      //     this.current=0
-      //     break;
-      //   case 'daishouhuo':
-      //     this.current=4
-      //     break;
-      //   case 'yiwancheng':
-      //     this.current=6
-      //     break;
-      // }
+    methods:{
+      chooseAddr(item){
+        console.log(item)
+      },
+      handleBack(){
+        this.$router.push({
+          path: "/shopping/ClothDetail",
+          query: {
+            // id: item.id,
+          },
+        });
+      }
+    },
+    mounted() {
+
     },
   };
 </script>
 <style>
-  .placeOrder .top .middle .router-link-exact-active.router-link-active {
+  .placeOrder .top .middle .fzlx {
     border-bottom: 2px solid #000;
   }
 </style>
@@ -315,6 +321,7 @@
     height: 56px;
     background: #1B1B1B;
     line-height: 56px;
+    margin-right: 20px;
   }
   &:hover{
     color: red;