From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期二, 25 十月 2022 14:53:57 +0800
Subject: [PATCH] 设备管理 样式调整
---
src/views/productDetail/components/ConfirmOrder.vue | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/views/productDetail/components/ConfirmOrder.vue b/src/views/productDetail/components/ConfirmOrder.vue
index 6c2d2da..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">
@@ -30,13 +31,13 @@
>{{ item + " " }}</span
>
</p>
- <p>
+ <p v-if="scope.row.ChCount">
閫氶亾鏁伴噺锛�
- <span>{{ scope.row.chCount || 0 }}</span>
+ <span>{{ scope.row.ChCount }}</span>
</p>
- <p>
+ <p v-if="scope.row.authCount">
鎺堟潈鏁伴噺锛�
- <span>{{ scope.row.authCount || 0 }}</span>
+ <span>{{ scope.row.authCount }}</span>
</p>
<p v-if="scope.row.sdkNames.length > 0">
绠楁硶锛�
@@ -46,6 +47,7 @@
>{{ item + " " }}</span
>
</p>
+
<p>
鏈嶅姟鏃堕暱锛�
<span>{{ scope.row.serveYear + "骞�" }}</span>
@@ -54,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">
@@ -64,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>
@@ -75,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
@@ -89,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">
@@ -133,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
@@ -141,6 +151,7 @@
@close="showUploadBox = false"
@back="back"
v-if="showUploadBox"
+ @closeAll="closeAll"
>
</UploadBox>
</div>
@@ -177,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) => {
@@ -218,9 +222,10 @@
if (this.orderInfo.orderMoney == 0) {
resumePay({ orderId, payMethod: 5 }).then((res) => {
if (res.success) {
+ this.$router.push("/trialCenter");
this.$notify({
type: "success",
- message: "鍏嶈垂璇曠敤",
+ message: "鎴愬姛璇曠敤",
duration: 2500,
offset: 57,
});
@@ -262,6 +267,10 @@
}
},
close() {
+ this.$emit("close");
+ },
+ closeAll() {
+ this.showUploadBox = false;
this.$emit("close");
},
confirmOrder() {
@@ -378,7 +387,7 @@
.policy {
margin-top: 10px;
display: flex;
- justify-content: end;
+ justify-content: flex-end;
align-items: center;
font-size: 14px;
@@ -398,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