From d365829b14ca4256d39694b9cdcd43bad0ad8595 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 11 二月 2022 18:18:39 +0800
Subject: [PATCH] bug修复
---
src/pages/desktop/index/components/Desktop.vue | 255 ++++++++++++++++++++++++++++++++------------------
1 files changed, 162 insertions(+), 93 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 51996d2..a343368 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -15,10 +15,12 @@
>璇曠敤鐗堝皻鏈縺娲伙紝浠呮敮鎸侀儴鍒嗗姛鑳戒娇鐢紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲荤郴缁熴��</span
>
<span v-else class="text">SmartAIOS 璇曠敤鏈熷凡鍒版湡锛岃鎮ㄥ敖蹇縺娲荤郴缁�</span>
- <span class="go-to" @click="gotoActive">鍓嶅線婵�娲�</span>
- <span class="icon iconfont" @click="showFreeVersion = false"
- ></span
- >
+ <div>
+ <span class="go-to" @click="gotoActive">鍓嶅線婵�娲�</span>
+ <span class="icon iconfont" @click="showFreeVersion = false"
+ ></span
+ >
+ </div>
</div>
<el-dialog
@@ -82,30 +84,33 @@
<el-button type="primary" @click="loginShop">纭畾</el-button>
</span>
</el-dialog>
- <div class="ver"><span class="ver-text">鐗堟湰锛�</span>{{ version }}</div>
+ <div class="ver">
+ <span class="ver-text">鐗堟湰锛�</span>{{ versionName }}
+ </div>
<div class="ver">
<span class="ver-text">鐘舵�侊細</span>{{ versionState }}
</div>
<el-divider></el-divider>
- <div class="info">
+ <div class="info" v-if="versionName == 'SmartAI姝ｅ紡鐗�'">
濡傛灉鎮ㄥ凡杩炴帴鍒癐nternet骞朵笖宸茶喘涔颁骇鍝佸瘑閽ワ紝鍙互灏濊瘯楠岃瘉SmartAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
- <div>
+ <div class="margin-top:10px;">
<el-button type="primary" @click="innerVisible = true">
璐︽埛婵�娲�
</el-button>
</div>
</div>
- <div class="info">
+ <div class="info" v-if="versionName == 'SmartAI姝ｅ紡鐗�'">
濡傛灉鎮ㄦ湭杩炴帴Internet鎴栨縺娲诲け璐ワ紝鍙皾璇曠绾挎縺娲伙紝浣跨敤鎵嬫満鎵爜璐拱浜у搧鎴栭獙璇丼martAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
- <!-- <a href="http://apps.smartai.com" target="_blank"
+ </div>
+ <div class="info" v-if="versionName !== 'SmartAI姝ｅ紡鐗�'">
+ 濡傛灉杩樻病鏈変骇鍝佸瘑閽ワ紝浣犲彲浠ヤ娇鐢ㄦ墜鏈烘壂鐮佹垨鍓嶅線姝ら摼鎺�
+ <a href="http://apps.smartai.com" target="_blank"
>http://apps.smartai.com</a
>
- 濡傛灉杩樻病鏈変骇鍝佸瘑閽ワ紝浣犲彲浠ヤ娇鐢ㄦ墜鏈烘壂鐮佹垨鍓嶅線姝ら摼鎺�
- 璐拱銆� -->
+ 璐拱銆�
</div>
<img class="qr-code-img" src="/version/offline/qrcode" />
<el-divider></el-divider>
-
<div class="ask">
濡傛灉浣犲叿鏈塖martAI鎻愪緵鐨勪骇鍝佸瘑閽ワ紝璇峰湪姝ゅ杈撳叆婵�娲籗martAI銆�
</div>
@@ -133,10 +138,16 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button v-if="!snExpire" @click="activeDialog = false"
+ <el-button
+ v-if="!snExpire && versionName != 'SmartAI姝ｅ紡鐗�'"
+ @click="activeDialog = false"
>缁х画璇曠敤</el-button
>
- <el-button v-else @click="quit">閫�鍑虹櫥褰�</el-button>
+ <el-button
+ v-if="snExpire && versionName != 'SmartAI姝ｅ紡鐗�'"
+ @click="$emit('quit')"
+ >閫�鍑虹櫥褰�</el-button
+ >
<el-button type="primary" @click="activateVersion">婵�娲�</el-button>
</span>
</el-dialog>
@@ -155,46 +166,50 @@
<span> 璇锋鏌ヨ鍗曚俊鎭紝纭鏃犺鍚庡啀婵�娲荤郴缁熴�� </span>
</div>
- <div class="order-list">
- <div class="order-card">
- <div class="head">
- <el-checkbox v-model="checked">
- <span>璁㈠崟ID锛歿{ 22322323423 }}</span>
- </el-checkbox>
-
- <span>锟{ 111 }} 鍏�</span>
- </div>
- <div class="desc">
- <div>绯荤粺鐗堟湰锛歿{ 22322323423 }}</div>
- <div>閫氶亾鏁伴噺锛歿{ 22322323423 }}</div>
- <div>鎽勫儚鏈烘暟閲忥細{{ 22322323423 }}</div>
- <div>鏈嶅姟鏃堕暱锛歿{ 22322323423 }}</div>
- </div>
- </div>
-
- <div class="order-card">
- <div class="head">
- <el-checkbox v-model="checked">
- <span>璁㈠崟ID锛歿{ 31423233423 }}</span>
- </el-checkbox>
-
- <span>锟{ 111 }} 鍏�</span>
- </div>
- <div class="desc">
- <div>绯荤粺鐗堟湰锛歿{ 22322323423 }}</div>
- <div>閫氶亾鏁伴噺锛歿{ 22322323423 }}</div>
- <div>鎽勫儚鏈烘暟閲忥細{{ 22322323423 }}</div>
- <div>鏈嶅姟鏃堕暱锛歿{ 22322323423 }}</div>
- </div>
- </div>
- </div>
-
- <span slot="footer" class="dialog-footer">
- <el-button v-if="!snExpire" @click="activeDialog = false"
- >鍙栨秷婵�娲�</el-button
+ <div class="order-list" v-if="orderList.length">
+ <div
+ class="wrap"
+ style="margin: 0 5px"
+ v-for="(item, index) in orderList"
+ :key="index"
>
- <el-button v-else @click="quit">閫�鍑虹櫥褰�</el-button>
- <el-button type="primary" @click="activateVersion">婵�娲�</el-button>
+ <div class="order-card" v-for="(prod, i) in item.products" :key="i">
+ <div class="head">
+ <el-checkbox v-model="checked" @change="choseProd(item, prod)">
+ <span>璁㈠崟ID锛歿{ item.id }}</span>
+ </el-checkbox>
+
+ <span>{{ item.orderMoney }} 鍏�</span>
+ </div>
+ <div class="desc">
+ <div>绯荤粺鐗堟湰锛歿{ prod.edition }}</div>
+ <div>閫氶亾鏁伴噺锛歿{ prod.ChCount }}</div>
+ <div>鎽勫儚鏈烘暟閲忥細{{ prod.cameraCount }}</div>
+ <div>鏈嶅姟鏃堕暱锛歿{ prod.serveYear }} 骞�</div>
+ </div>
+ </div>
+ </div>
+ <!-- <div class="order-card" v-for="(item, index) in orderList" :key="index">
+ <div class="head">
+ <el-checkbox v-model="checked">
+ <span>璁㈠崟ID锛歿{ item.id }}</span>
+ </el-checkbox>
+
+ <span>锟{ item.orderMoney }} 鍏�</span>
+ </div>
+ <div class="desc">
+ <div>绯荤粺鐗堟湰锛歿{ item.products[0]&&item.products[0].productVersion }}</div>
+ <div>閫氶亾鏁伴噺锛歿{ item.products[0]&&item.products[0].ChCount }}</div>
+ <div>鎽勫儚鏈烘暟閲忥細{{ item.products[0]&&item.products[0].cameraCount }}</div>
+ <div>鏈嶅姟鏃堕暱锛歿{ item.products[0]&&item.products[0].serveYear }} 骞�</div>
+
+ </div>
+ </div> -->
+ </div>
+ <div class="no-order-list" v-else>鎶辨瓑锛屾病鏈夋煡璇㈠埌璁㈠崟銆�</div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
+ <el-button type="primary" @click="activeVerByOrd">婵�娲�</el-button>
</span>
</el-dialog>
</div>
@@ -210,7 +225,9 @@
activateVersion,
uploadKey,
getSmsCode,
- loginShopInSmart,getShopOrderList,
+ loginShopInSmart,
+ getShopOrderList,
+ activeByOrder,
} from "@/api/system";
export default {
name: "Desktop",
@@ -221,25 +238,29 @@
data() {
return {
showFreeVersion: false,
- activeDialog: false,
+ activeDialog: false,
countdown: 60,
innerDialog: false,
- version: "SmartAI璇曠敤鐗�",
+ versionName: "",
codeMsg: "鑾峰彇楠岃瘉鐮�",
versionState: "灏氭湭婵�娲�",
secrectKey: "",
+ curOrder: {},
+ curProd: {},
codeDisabled: false,
innerVisible: false,
snExpire: false,
- timer: null,token: "",
+ timer: null,
+ token: "",
+ orderList: [],
phone: {
phoneNum: "",
verifyCode: "",
},
phoneCodeRule: {
- phoneNum: [{ validator: isPhone, trigger: "change" }],
+ phoneNum: [{ validator: isPhone, trigger: "blur" }],
verifyCode: [
- { required: true, message: "璇疯緭鍏ラ獙璇佺爜", trigger: "change" },
+ { required: true, message: "璇疯緭鍏ラ獙璇佺爜", trigger: "blur" },
],
},
};
@@ -248,13 +269,27 @@
this.validateSn();
},
methods: {
- quit() {
- this.$emit("quit");
+ activeVerByOrd() {
+ activeByOrder({
+ token: this.token,
+ activateCode: this.curProd.activateCode,
+ productId: this.curProd.productId,
+ orderId: this.curOrder.id,
+ }).then((res) => {
+ if (res.code == 200) {
+ this.$notify.success("婵�娲绘垚鍔�");
+ this.innerDialog = false;
+ this.versionName = this.getVersionName(res.data.edition);
+ } else {
+ this.$notify.error("婵�娲诲け璐�");
+ }
+ });
},
validateSn() {
getSN().then((res) => {
this.snExpire = res.data.expire;
this.showFreeVersion = res.data.sn == "" || res.data.expire;
+ this.versionName = this.getVersionName(res.data.edition);
});
},
getValidStr() {
@@ -271,40 +306,67 @@
}
}
},
+ choseProd(order, prod) {
+ debugger;
+ this.curOrder = order;
+ this.curProd = prod;
+ },
+ getVersionName(s) {
+ switch (s) {
+ case "alpha":
+ return "SmartAI鍐呮祴鐗�";
+ case "beta":
+ return "SmartAI鍏祴鐗�";
+ case "trial":
+ return "SmartAI璇曠敤鐗�";
+ case "test":
+ return "SmartAI娴嬭瘯鐗�";
+ case "official":
+ return "SmartAI姝ｅ紡鐗�";
+ default:
+ return "SmartAI瀹氬埗鐗�";
+ break;
+ }
+ },
loginShop() {
// this.innerDialog = true
// this.activeDialog=false
- getShopOrderList({token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMyMTYyODMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJhZG1pbk1hbmFnZTphZGRcIixcImRldmljZU1hbmFnZTphZGRcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJ2aXBNYW5hZ2VcIixcImRpY01hbmFnZVwiLFwicHJvZHVjdENlbnRlcjp2aWV3XCIsXCJvcmRlck1hbmdlOnBheVwiLFwibG9nTWFuYWdlXCIsXCJkZXZpY2VNYW5hZ2VcIixcImFkbWluTWFuYWdlXCIsXCJwcm9kdWN0TWFuZ2VcIixcInZpcE1hbmFnZTplZGl0XCIsXCJjb2RlTWFuZ2VcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwic2RrTWFuYWdlXCIsXCJob21lXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpkb3dubG9hZFwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwidmlwTWFuYWdlOmFkZFwiLFwiYXBwTWFuYWdlXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImFwaVwiLFwicHJvZHVjdE1hbmdlOnB1Ymxpc2hcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.DaTOv8pnh8kG1TPtuNVSo2qPc2z9wGxl2cMZtJ8iwo0"}).then((res) => {
- debugger
- res.data
- })
- // this.$refs["phoneLogin"].validate((valid) => {
- // if (valid) {
-
- // let param = {
- // phoneNum: this.phone.phoneNum,
- // verifyCode: this.phone.verifyCode,
- // };
- // loginShopInSmart(param).then((res) => {
- // this.innerDialog = true;
- // this.activeDialog = false;
- // this.token = res.data.access_token
- // getShopOrderList({token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMyMTYyODMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJhZG1pbk1hbmFnZTphZGRcIixcImRldmljZU1hbmFnZTphZGRcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJ2aXBNYW5hZ2VcIixcImRpY01hbmFnZVwiLFwicHJvZHVjdENlbnRlcjp2aWV3XCIsXCJvcmRlck1hbmdlOnBheVwiLFwibG9nTWFuYWdlXCIsXCJkZXZpY2VNYW5hZ2VcIixcImFkbWluTWFuYWdlXCIsXCJwcm9kdWN0TWFuZ2VcIixcInZpcE1hbmFnZTplZGl0XCIsXCJjb2RlTWFuZ2VcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwic2RrTWFuYWdlXCIsXCJob21lXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpkb3dubG9hZFwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwidmlwTWFuYWdlOmFkZFwiLFwiYXBwTWFuYWdlXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImFwaVwiLFwicHJvZHVjdE1hbmdlOnB1Ymxpc2hcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.DaTOv8pnh8kG1TPtuNVSo2qPc2z9wGxl2cMZtJ8iwo0"}).then((res) => {
- // debugger
- // res.data
- // })
- // });
- // } else {
- // this.nullRule = {};
- // }
+ // getShopOrderList({
+ // token: "",
+ // }).then((res) => {
+ // this.orderList=res.data.list
// });
+ this.$refs["phoneLogin"].validate((valid) => {
+ if (valid) {
+ let param = {
+ phoneNum: this.phone.phoneNum,
+ verifyCode: this.phone.verifyCode,
+ };
+ 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;
+ } else {
+ this.$notify.error("鑾峰彇璁㈠崟鍒楄〃澶辫触");
+ }
+ })
+ .catch(() => {
+ this.$notify.error("鑾峰彇璁㈠崟鍒楄〃澶辫触");
+ });
+ });
+ } else {
+ this.nullRule = {};
+ }
+ });
},
- cancelLogin(){
- this.innerVisible= false
+ cancelLogin() {
+ this.innerVisible = false;
},
- // 鑾峰彇楠岃瘉鐮�
getCode() {
- // 楠岃瘉鐮�60绉掑�掕鏃�
var pattern = /^1[345789]\d{9}$/;
if (this.phone.phoneNum == "") {
this.$refs["phoneLogin"].fields[0].validateMessage = "璇疯緭鍏ユ墜鏈哄彿";
@@ -488,9 +550,15 @@
font-size: 14px;
}
}
+ .no-order-list {
+ margin-top: 20px;
+ font-size: 16px;
+ color: red;
+ }
.order-list {
margin: 20px 0;
-
+ height: 550px;
+ overflow-y: auto;
.order-card {
height: 150px;
background: #fff;
@@ -522,7 +590,7 @@
}
}
.warn-tag {
- width: 640px;
+ width: 630px;
text-align: left;
box-sizing: border-box;
padding: 0 25px;
@@ -533,7 +601,7 @@
display: flex;
justify-content: space-between;
top: 55px;
- left: calc(50% - 320px);
+ left: calc(50% - 315px);
line-height: 45px;
border-radius: 5px;
.go-to {
@@ -541,14 +609,15 @@
cursor: pointer;
text-decoration: underline;
font-weight: 600;
- font-size: 13px;
+ font-size: 14px;
}
.text {
- font-size: 13px;
+ font-size: 14px;
}
.icon {
font-size: 14px;
cursor: pointer;
+ margin-left: 25px;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0