From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/desktop/index/components/Desktop.vue | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index cf01e71..a0737fb 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -12,7 +12,9 @@
<div class="warn-tag" v-if="showFreeVersion">
<span v-if="!snExpire" class="text"
- >璇曠敤鐗堝皻鏈縺娲伙紝浠呮敮鎸佷娇鐢ㄩ儴鍒嗗姛鑳斤紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲汇��</span
+ >{{
+ versionName
+ }}灏氭湭婵�娲伙紝浠呮敮鎸佷娇鐢ㄩ儴鍒嗗姛鑳斤紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲汇��</span
>
<span v-else class="text">SmartAIOS 璇曠敤鏈熷凡鍒版湡锛岃鎮ㄥ敖蹇縺娲荤郴缁�</span>
<div>
@@ -49,7 +51,6 @@
</span>
</div>
<div class="login-content">
- <!-- status-icon -->
<el-form
:model="phone"
:rules="phoneCodeRule"
@@ -92,13 +93,11 @@
</span>
</el-dialog>
<div class="ver">
- <span class="ver-text">鐗堟湰锛�</span>{{ versionName }}
+ <span class="ver-text">鐗堟湰锛�</span>SmartAI{{ versionName }}
</div>
- <div class="ver">
- <span class="ver-text">鐘舵�侊細</span>{{ versionState }}
- </div>
+ <div class="ver"><span class="ver-text">鐘舵�侊細</span>灏氭湭婵�娲�</div>
<el-divider></el-divider>
- <div class="info" v-if="versionName == 'SmartAI姝ｅ紡鐗�'">
+ <div class="info" v-if="versionName == '姝ｅ紡鐗�'">
<span style="font-weight: bold; font-size: 18px">路 </span>
<span style="font-size: 14px; line-height: 21px; color: #5f5f5f">
濡傛灉鎮ㄥ凡杩炴帴鍒癐nternet骞朵笖宸茶喘涔颁骇鍝佸瘑閽ワ紝鍙互灏濊瘯楠岃瘉SmartAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
@@ -109,13 +108,13 @@
</el-button>
</div>
</div>
- <div class="info" v-if="versionName == 'SmartAI姝ｅ紡鐗�'">
+ <div class="info" v-if="versionName == '姝ｅ紡鐗�'">
<span style="font-weight: bold; font-size: 18px">路 </span>
<span style="font-size: 14px; line-height: 21px; color: #5f5f5f">
濡傛灉鎮ㄦ湭杩炴帴Internet鎴栨縺娲诲け璐ワ紝鍙皾璇曠绾挎縺娲伙紝璇风敤鎵嬫満鎵爜璐拱浜у搧鎴栭獙璇丼martAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
</span>
</div>
- <div class="info" v-if="versionName !== 'SmartAI姝ｅ紡鐗�'">
+ <div class="info" v-if="versionName !== '姝ｅ紡鐗�'">
<span style="font-weight: bold; font-size: 18px">路 </span>
<span style="font-size: 14px; line-height: 21px; color: #5f5f5f">
濡傛灉杩樻病鏈変骇鍝佸瘑閽ワ紝浣犲彲浠ヤ娇鐢ㄦ墜鏈烘壂鐮佹垨鍓嶅線姝ら摼鎺�
@@ -157,19 +156,18 @@
<!-- <el-divider></el-divider> -->
<span slot="footer" class="dialog-footer">
- <!-- v-if="!snExpire && versionName != 'SmartAI姝ｅ紡鐗�'" -->
<div class="btns">
<el-button
- v-if="!snExpire && versionName != 'SmartAI姝ｅ紡鐗�'"
+ v-if="!snExpire && versionName != '姝ｅ紡鐗�'"
class="cancel"
@click="activeDialog = false"
>缁х画璇曠敤</el-button
>
<el-button
class="cancel"
- v-if="snExpire && versionName != 'SmartAI姝ｅ紡鐗�'"
+ v-if="snExpire && versionName != '姝ｅ紡鐗�'"
@click="$emit('quit')"
- >閫�鍑虹櫥褰�
+ >閫�鍑虹櫥闄�
</el-button>
<el-button class="ok" type="primary" @click="activateVersion"
>婵�娲�</el-button
@@ -213,13 +211,21 @@
<div>浜у搧绫诲瀷锛歿{ prod.productTypeName }}</div>
<div>绯荤粺鐗堟湰锛歿{ prod.edition }}</div>
<div>閫氶亾鏁伴噺锛歿{ prod.ChCount }}</div>
- <div>鎽勫儚鏈烘暟閲忥細{{ prod.cameraCount }}</div>
- <div>璧锋鏈嶅姟鏃堕棿 锛歿{ startAndEnd(item.createTime, prod.serveYear) }}</div>
+ <div>鎺堟潈鏁伴噺锛歿{ prod.authCount }}</div>
+ <div>
+ 璧锋鏈嶅姟鏃堕棿 锛歿{
+ startAndEnd(item.createTime, prod.serveYear)
+ }}
+ </div>
</div>
</div>
</div>
</div>
- <div class="no-order-list" v-else>鎶辨瓑锛屾病鏈夋煡璇㈠埌璁㈠崟銆�</div>
+ <div class="no-order-list" v-else>
+ {{
+ loadingOrders ? "璁㈠崟鍔犺浇涓紝璇风◢鍚�..." : "鎶辨瓑锛屾湭鏌ヨ鍒拌鍗曚俊鎭紒"
+ }}
+ </div>
<span slot="footer" class="dialog-footer">
<div class="btns">
<el-button class="cancel" @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
@@ -260,7 +266,6 @@
innerDialog: false,
versionName: "",
codeMsg: "鑾峰彇楠岃瘉鐮�",
- versionState: "灏氭湭婵�娲�",
secrectKey: "",
curOrder: {},
curProd: {},
@@ -269,7 +274,8 @@
snExpire: false,
timer: null,
token: "",
- orderList: [ ],
+ loadingOrders: true,
+ orderList: [],
phone: {
phoneNum: "",
verifyCode: "",
@@ -286,10 +292,10 @@
this.validateSn();
},
methods: {
- startAndEnd(createTime,serveYear){
- let year = createTime.split("-")[0]
- let endTime = parseInt(year) + serveYear + createTime.slice(4)
- return createTime + " - " + endTime
+ startAndEnd(createTime, serveYear) {
+ let year = createTime.split("-")[0];
+ let endTime = parseInt(year) + serveYear + createTime.slice(4);
+ return createTime + " - " + endTime;
},
activeVerByOrd() {
activeByOrder({
@@ -310,6 +316,7 @@
validateSn() {
getSN().then((res) => {
this.snExpire = res.data.expire;
+ this.activeDialog = res.data.expire;
this.showFreeVersion = res.data.sn == "" || res.data.expire;
this.versionName = this.getVersionName(res.data.edition);
});
@@ -329,24 +336,23 @@
}
},
choseProd(order, prod) {
- debugger;
this.curOrder = order;
this.curProd = prod;
},
getVersionName(s) {
switch (s) {
case "alpha":
- return "SmartAI鍐呮祴鐗�";
+ return "鍐呮祴鐗�";
case "beta":
- return "SmartAI鍏祴鐗�";
+ return "鍏祴鐗�";
case "trial":
- return "SmartAI璇曠敤鐗�";
+ return "璇曠敤鐗�";
case "test":
- return "SmartAI娴嬭瘯鐗�";
+ return "娴嬭瘯鐗�";
case "official":
- return "SmartAI姝ｅ紡鐗�";
+ return "姝ｅ紡鐗�";
default:
- return "SmartAI瀹氬埗鐗�";
+ return "瀹氬埗鐗�";
break;
}
},
@@ -360,11 +366,13 @@
loginShopInSmart(param).then((res) => {
this.innerDialog = true;
this.activeDialog = false;
+
this.token = res.data.access_token;
getShopOrderList({ token: this.token })
.then((res) => {
if (res.code == 200) {
this.orderList = res.data.list;
+ this.loadingOrders = false;
} else {
this.$notify.error("鑾峰彇璁㈠崟鍒楄〃澶辫触");
}
@@ -414,7 +422,6 @@
}
activateVersion({ code: this.secrectKey.trim() })
.then((res) => {
- debugger;
if (res.code == 200) {
this.$notify.success("婵�娲绘垚鍔�");
this.validateSn();
@@ -435,7 +442,6 @@
this.activeDialog = true;
},
uploadKey(params) {
- debugger;
let param = new FormData();
param.append("code", params.file);
uploadKey(param).then(
@@ -752,10 +758,8 @@
height: 550px;
overflow-y: auto;
.order-card {
- // height: 150px;
background: #fff;
margin-bottom: 15px;
-
border-radius: 8px;
box-shadow: 0px 0px 4px rgb(0 0 0 / 25%);
.head {
@@ -774,9 +778,11 @@
flex-direction: column;
justify-content: space-evenly;
text-align: left;
- box-sizing: border-box; font-size: 13px;
+ box-sizing: border-box;
+ font-size: 13px;
- padding: 8px 20px; line-height: 20px;
+ padding: 8px 20px;
+ line-height: 20px;
}
}
}
--
Gitblit v1.8.0