From ece5b7b7d24f85a3253cf722291e69ca7a406192 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 16 八月 2022 13:05:18 +0800
Subject: [PATCH] 完善大屏

---
 src/views/productDetail/components/ConfirmOrder.vue |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/productDetail/components/ConfirmOrder.vue b/src/views/productDetail/components/ConfirmOrder.vue
index 3fde954..7dbcee9 100644
--- a/src/views/productDetail/components/ConfirmOrder.vue
+++ b/src/views/productDetail/components/ConfirmOrder.vue
@@ -17,9 +17,10 @@
           <el-table-column
             prop="productName"
             label="浜у搧鍚嶇О"
+            width="200"
           ></el-table-column>
 
-          <el-table-column label="閰嶇疆璇︽儏">
+          <el-table-column label="閰嶇疆璇︽儏" width="250">
             <template slot-scope="scope">
               <div style="text-align: left">
                 <p v-if="scope.row.moduleNames.length > 0">
@@ -55,7 +56,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="devCount" label="璐拱鏁伴噺"></el-table-column>
-          <el-table-column pro="devIdList" label="缁戝畾璁惧">
+          <el-table-column pro="devIdList" label="缁戝畾璁惧" width="250">
             <template slot-scope="scope">
               <div>
                 <p v-for="item in scope.row.devIdList" :key="item">
@@ -65,7 +66,11 @@
             </template>
           </el-table-column>
           <el-table-column label="浼樻儬" prop="discount"></el-table-column>
-          <el-table-column label="灏忚" prop="productPrice"></el-table-column>
+          <el-table-column label="灏忚">
+            <template>
+              {{ orderInfo.orderMoney }}
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div class="title">鏀粯鏂瑰紡</div>
@@ -76,12 +81,12 @@
           @click="checkPayway('offpay')"
         >
           <img
-            src="/images/product/姹囨鐏�.png"
+            src="/images/product/pay2.png"
             class="moneyIcon"
             v-if="this.payWay === 'ali'"
             alt=""
           />
-          <img class="moneyIcon" src="/images/product/姹囨.png" v-else alt="" />
+          <img class="moneyIcon" src="/images/product/pay.png" v-else alt="" />
           <span>绾夸笅姹囨</span>
         </div>
         <div
@@ -90,17 +95,17 @@
           @click="checkPayway('ali')"
         >
           <img
-            src="/images/product/鏀粯瀹�.png"
+            src="/images/product/alipay.png"
             v-if="this.payWay === 'ali'"
             alt=""
           />
-          <img src="/images/product/鏀粯瀹濈伆.png" v-else alt="" />
+          <img src="/images/product/alipay2.png" v-else alt="" />
         </div>
       </div>
 
       <div class="total">
         <div class="money">
-          搴斾粯娆�<span class="number">{{ sum }}鍏�</span>
+          搴斾粯娆�<span class="number">{{ orderInfo.orderMoney }}鍏�</span>
         </div>
 
         <div class="policy">
@@ -134,7 +139,11 @@
       <OffpayInstruct
         v-if="showOffpayInstruct"
         @close="showOffpayInstruct = false"
-        :offerData="{ username: username, sum: sum, orderId: orderId }"
+        :offerData="{
+          username: username,
+          sum: orderInfo.orderMoney,
+          orderId: orderId,
+        }"
         @confirm="confirmOrder"
       ></OffpayInstruct>
       <UploadBox
@@ -142,6 +151,7 @@
         @close="showUploadBox = false"
         @back="back"
         v-if="showUploadBox"
+        @closeAll="closeAll"
       >
       </UploadBox>
     </div>
@@ -178,21 +188,14 @@
       showUploadBox: false,
     };
   },
-  computed: {
-    sum() {
-      let sum = 0;
-      sum = this.orders.reduce((prev, next) => prev + next.productPrice, 0);
-      return this.numeral(sum).format("0,0.00");
-    },
-  },
   mounted() {
     this.getResumeList();
     this.username = JSON.parse(sessionStorage.getItem("userInfo")).username;
   },
   methods: {
     assureOnlinePay() {
-      this.onlinePayVisible = false;
-      this.$router.replace("/Layout/ManageOrder");
+      this.$emit("close");
+      this.$router.replace("/personalCenter?id=0");
     },
     getResumeList() {
       getOrderById(this.orderId).then((res) => {
@@ -264,6 +267,10 @@
       }
     },
     close() {
+      this.$emit("close");
+    },
+    closeAll() {
+      this.showUploadBox = false;
       this.$emit("close");
     },
     confirmOrder() {
@@ -380,7 +387,7 @@
       .policy {
         margin-top: 10px;
         display: flex;
-        justify-content: end;
+        justify-content: flex-end;
         align-items: center;
         font-size: 14px;
 
@@ -400,7 +407,7 @@
     right: 20px;
     bottom: 20px;
     display: flex;
-    justify-content: end;
+    justify-content: flex-end;
     text-align: center;
     line-height: 40px;
 

--
Gitblit v1.8.0