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 | 595 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 410 insertions(+), 185 deletions(-)
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 80853de..a0737fb 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -12,19 +12,27 @@
<div class="warn-tag" v-if="showFreeVersion">
<span v-if="!snExpire" class="text"
- >璇曠敤鐗堝皻鏈縺娲伙紝浠呮敮鎸侀儴鍒嗗姛鑳戒娇鐢紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲荤郴缁熴��</span
+ >{{
+ versionName
+ }}灏氭湭婵�娲伙紝浠呮敮鎸佷娇鐢ㄩ儴鍒嗗姛鑳斤紝濡傞渶浣跨敤鍏ㄩ儴鍔熻兘锛岃灏藉揩婵�娲汇��</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"
+ v-if="!snExpire"
+ @click="showFreeVersion = false"
+ ></span
+ >
+ </div>
</div>
<el-dialog
title="婵�娲籗martAI"
:visible.sync="activeDialog"
- width="750px"
+ width="640px"
+ custom-class="my-activate"
:show-close="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
@@ -32,28 +40,26 @@
<el-dialog
width="30%"
title="璐︽埛婵�娲�"
+ custom-class="my-account"
:visible.sync="innerVisible"
append-to-body
class="inner-login-dialog"
>
<div class="info">
- 璇疯緭鍏ヤ綘鍦⊿martAI鍟嗗煄璐︽埛鐨勬墜鏈哄彿骞跺畬鎴愰獙璇佺爜鏍￠獙锛屽疄鐜扮郴缁熸縺娲伙紒
+ <span style="font-size: 14px; line-height: 21px; color: #5f5f5f">
+ 璇疯緭鍏ヤ綘鍦⊿martAI鍟嗗煄璐︽埛鐨勬墜鏈哄彿骞跺畬鎴愰獙璇佺爜鏍￠獙锛屽疄鐜扮郴缁熸縺娲伙紒
+ </span>
</div>
<div class="login-content">
<el-form
:model="phone"
- status-icon
:rules="phoneCodeRule"
:validate-on-rule-change="false"
ref="phoneLogin"
class="demo-ruleForm"
>
<el-form-item prop="phoneNum" style="margin-top: 20px">
- <el-input
- v-model="phone.phoneNum"
- style="width: 380px"
- placeholder="璇疯緭鍏ユ墜鏈哄彿"
- >
+ <el-input v-model="phone.phoneNum" placeholder="璇疯緭鍏ユ墜鏈哄彿">
<i slot="prefix" class="el-icon-mobile-phone"></i>
</el-input>
</el-form-item>
@@ -62,63 +68,76 @@
@keyup.enter.native="phoneLogin"
v-model="phone.verifyCode"
autocomplete="off"
- style="width: 254px"
placeholder="璇疯緭鍏ラ獙璇佺爜"
>
<i slot="prefix" class="el-icon-message"></i>
+ <el-button
+ class="code-btn"
+ slot="suffix"
+ style="margin-left: 15px"
+ :disabled="codeDisabled"
+ @click="getCode"
+ >{{ codeMsg }}</el-button
+ >
</el-input>
- <el-button
- class="code-btn"
- style="margin-left: 15px"
- :disabled="codeDisabled"
- @click="getCode"
- >{{ codeMsg }}</el-button
- >
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="cancelLogin">鍙栨秷</el-button>
- <el-button type="primary" @click="loginShop">纭畾</el-button>
+ <div class="btns">
+ <el-button class="cancel" @click="cancelLogin">鍙栨秷</el-button>
+ <el-button class="ok" type="primary" @click="loginShop"
+ >纭畾</el-button
+ >
+ </div>
</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姝ｅ紡鐗�'">
- 濡傛灉鎮ㄥ凡杩炴帴鍒癐nternet骞朵笖宸茶喘涔颁骇鍝佸瘑閽ワ紝鍙互灏濊瘯楠岃瘉SmartAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
- <div class="margin-top:10px;">
+ <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鍟嗗煄璐︽埛婵�娲荤郴缁熴��
+ </span>
+ <div style="padding: 15px 0">
<el-button type="primary" @click="innerVisible = true">
璐︽埛婵�娲�
</el-button>
</div>
</div>
- <div class="info" v-if="versionName=='SmartAI姝ｅ紡鐗�'">
- 濡傛灉鎮ㄦ湭杩炴帴Internet鎴栨縺娲诲け璐ワ紝鍙皾璇曠绾挎縺娲伙紝浣跨敤鎵嬫満鎵爜璐拱浜у搧鎴栭獙璇丼martAI鍟嗗煄璐︽埛婵�娲荤郴缁熴��
+ <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姝ｅ紡鐗�'">
- 濡傛灉杩樻病鏈変骇鍝佸瘑閽ワ紝浣犲彲浠ヤ娇鐢ㄦ墜鏈烘壂鐮佹垨鍓嶅線姝ら摼鎺�
- <a href="http://apps.smartai.com" target="_blank"
- >http://apps.smartai.com</a
- >
- 璐拱銆�
+ <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">
+ 濡傛灉杩樻病鏈変骇鍝佸瘑閽ワ紝浣犲彲浠ヤ娇鐢ㄦ墜鏈烘壂鐮佹垨鍓嶅線姝ら摼鎺�
+ <a href="http://apps.smartai.com" target="_blank"
+ >http://apps.smartai.com</a
+ >
+ 璐拱銆�
+ </span>
</div>
<img class="qr-code-img" src="/version/offline/qrcode" />
- <el-divider></el-divider>
<div class="ask">
- 濡傛灉浣犲叿鏈塖martAI鎻愪緵鐨勪骇鍝佸瘑閽ワ紝璇峰湪姝ゅ杈撳叆婵�娲籗martAI銆�
+ <span style="font-weight: bold; font-size: 18px">路 </span>
+ <span style="font-size: 14px; line-height: 21px; color: #5f5f5f">
+ 濡傛灉鎮ㄦ湁SmartAI鎻愪緵鐨勪骇鍝佸瘑閽ワ紝璇峰湪姝ゅ杈撳叆锛屾縺娲籗martAI銆�
+ </span>
</div>
<div class="validate">
<form id="myForm">
<el-input
type="textarea"
autosize
- style="width: 480px"
- placeholder="灏嗕骇鍝佸瘑閽ョ矘璐村湪姝ゅ"
+ style="width: 450px"
+ placeholder="璇疯緭鍏ユ垨瀵煎叆瀵嗛挜"
v-model="secrectKey"
>
</el-input>
@@ -131,16 +150,29 @@
:limit="1"
:show-file-list="false"
>
- <el-button size="small" type="primary">瀵煎叆浜у搧瀵嗛挜鏂囦欢</el-button>
+ <el-button size="small" type="primary">瀵煎叆瀵嗛挜</el-button>
</el-upload>
</div>
+ <!-- <el-divider></el-divider> -->
<span slot="footer" class="dialog-footer">
- <el-button v-if="!snExpire && versionName!='SmartAI姝ｅ紡鐗�'" @click="activeDialog = false"
- >缁х画璇曠敤</el-button
- >
- <el-button v-if="snExpire && versionName!='SmartAI姝ｅ紡鐗�'" @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
- <el-button type="primary" @click="activateVersion">婵�娲�</el-button>
+ <div class="btns">
+ <el-button
+ v-if="!snExpire && versionName != '姝ｅ紡鐗�'"
+ class="cancel"
+ @click="activeDialog = false"
+ >缁х画璇曠敤</el-button
+ >
+ <el-button
+ class="cancel"
+ v-if="snExpire && versionName != '姝ｅ紡鐗�'"
+ @click="$emit('quit')"
+ >閫�鍑虹櫥闄�
+ </el-button>
+ <el-button class="ok" type="primary" @click="activateVersion"
+ >婵�娲�</el-button
+ >
+ </div>
</span>
</el-dialog>
@@ -148,59 +180,59 @@
title="鎴戠殑璁㈠崟"
:visible.sync="innerDialog"
width="750px"
- :show-close="false"
+ :show-close="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
custom-class="my-order"
>
<div class="tip">
<i class="el-icon-info"></i>
- <span> 璇锋鏌ヨ鍗曚俊鎭紝纭鏃犺鍚庡啀婵�娲荤郴缁熴�� </span>
+ <span>璇锋鏌ヨ鍗曚俊鎭槸鍚︽纭紝纭鏃犺鍚庡啀婵�娲荤郴缁�</span>
</div>
- <div class="order-list">
- <div class="wrap" style=" margin: 0 5px;" v-for="(item, index) in orderList" :key="index">
+ <div class="order-list" v-if="orderList.length">
+ <div
+ class="wrap"
+ style="margin: 0 5px"
+ v-for="(item, index) in orderList"
+ :key="index"
+ >
<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>
+ <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>
-
+ <span>{{ item.orderMoney }} 鍏�</span>
+ </div>
+ <div class="desc">
+ <div>璁㈠崟鐢熸垚鏃ユ湡锛歿{ item.createTime }}</div>
+ <div>浜у搧鍚嶇О锛歿{ prod.productName }}</div>
+ <div>浜у搧绫诲瀷锛歿{ prod.productTypeName }}</div>
+ <div>绯荤粺鐗堟湰锛歿{ prod.edition }}</div>
+ <div>閫氶亾鏁伴噺锛歿{ prod.ChCount }}</div>
+ <div>鎺堟潈鏁伴噺锛歿{ prod.authCount }}</div>
+ <div>
+ 璧锋鏈嶅姟鏃堕棿 锛歿{
+ startAndEnd(item.createTime, prod.serveYear)
+ }}
+ </div>
+ </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>
+ {{
+ loadingOrders ? "璁㈠崟鍔犺浇涓紝璇风◢鍚�..." : "鎶辨瓑锛屾湭鏌ヨ鍒拌鍗曚俊鎭紒"
+ }}
+ </div>
<span slot="footer" class="dialog-footer">
- <!-- <el-button v-if="!snExpire" @click="activeDialog = false"
- >鍙栨秷婵�娲�</el-button
- > -->
- <el-button @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
- <el-button type="primary" @click="activeVerByOrd">婵�娲�</el-button>
+ <div class="btns">
+ <el-button class="cancel" @click="$emit('quit')">閫�鍑虹櫥褰�</el-button>
+ <el-button class="ok" type="primary" @click="activeVerByOrd"
+ >婵�娲�</el-button
+ >
+ </div>
</span>
</el-dialog>
</div>
@@ -217,7 +249,8 @@
uploadKey,
getSmsCode,
loginShopInSmart,
- getShopOrderList,activeByOrder,
+ getShopOrderList,
+ activeByOrder,
} from "@/api/system";
export default {
name: "Desktop",
@@ -233,15 +266,16 @@
innerDialog: false,
versionName: "",
codeMsg: "鑾峰彇楠岃瘉鐮�",
- versionState: "灏氭湭婵�娲�",
secrectKey: "",
- curOrder:{},
- curProd:{},
+ curOrder: {},
+ curProd: {},
codeDisabled: false,
innerVisible: false,
snExpire: false,
timer: null,
- token: "",orderList:[],
+ token: "",
+ loadingOrders: true,
+ orderList: [],
phone: {
phoneNum: "",
verifyCode: "",
@@ -258,22 +292,33 @@
this.validateSn();
},
methods: {
- activeVerByOrd(){
+ startAndEnd(createTime, serveYear) {
+ let year = createTime.split("-")[0];
+ let endTime = parseInt(year) + serveYear + createTime.slice(4);
+ return createTime + " - " + endTime;
+ },
+ activeVerByOrd() {
activeByOrder({
- token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMzODUzNjgsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6ZWRpdFwiLFwiY29kZU1hbmdlOmFkZFwiLFwibG9nTWFuYWdlXCIsXCJkaWNNYW5hZ2VcIixcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpwYXlcIixcIm9yZGVyTWFuZ2U6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXJcIixcImFwcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwicHJvZHVjdE1hbmdlOnZpZXdcIixcInZpcE1hbmFnZVwiLFwiYXBpXCIsXCJ2aXBNYW5hZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZVwiLFwicHJvZHVjdE1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJhZG1pbk1hbmFnZTphZGRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJzZGtNYW5hZ2VcIixcImRldmljZU1hbmFnZTphZGRcIixcImNvZGVNYW5nZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJkZXZpY2VNYW5hZ2VcIixcImhvbWVcIixcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZVwiLFwicHJvZHVjdE1hbmdlOm9mZlNhbGVcIixcImFkbWluTWFuYWdlOmVkaXRcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.WVdowrEmEmIrZUhELckbNGBzwwaHOD9UgvB0Ki1Jbe0",
- activateCode:this.curProd.activateCode,
- productId:this.curProd.productId,
- orderId:this.curOrder.id
+ token: this.token,
+ activateCode: this.curProd.activateCode,
+ productId: this.curProd.productId,
+ orderId: this.curOrder.id,
}).then((res) => {
- debugger
- })
+ 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.activeDialog = res.data.expire;
this.showFreeVersion = res.data.sn == "" || res.data.expire;
- this.versionName = this.getVersionName('official');
- // this.versionName = this.getVersionName(res.data.edition);
+ this.versionName = this.getVersionName(res.data.edition);
});
},
getValidStr() {
@@ -290,57 +335,56 @@
}
}
},
- choseProd(order,prod){
- debugger
- this.curOrder= order
- this.curProd=prod
+ choseProd(order, prod) {
+ 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;
}
},
loginShop() {
- this.innerDialog = true
- this.activeDialog=false
- getShopOrderList({
- token:
- "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMzODUzNjgsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6ZWRpdFwiLFwiY29kZU1hbmdlOmFkZFwiLFwibG9nTWFuYWdlXCIsXCJkaWNNYW5hZ2VcIixcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpwYXlcIixcIm9yZGVyTWFuZ2U6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXJcIixcImFwcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwicHJvZHVjdE1hbmdlOnZpZXdcIixcInZpcE1hbmFnZVwiLFwiYXBpXCIsXCJ2aXBNYW5hZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZVwiLFwicHJvZHVjdE1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJhZG1pbk1hbmFnZTphZGRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJzZGtNYW5hZ2VcIixcImRldmljZU1hbmFnZTphZGRcIixcImNvZGVNYW5nZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJkZXZpY2VNYW5hZ2VcIixcImhvbWVcIixcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZVwiLFwicHJvZHVjdE1hbmdlOm9mZlNhbGVcIixcImFkbWluTWFuYWdlOmVkaXRcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.WVdowrEmEmIrZUhELckbNGBzwwaHOD9UgvB0Ki1Jbe0",
- }).then((res) => {
- this.orderList=res.data.list
- });
- // this.$refs["phoneLogin"].validate((valid) => {
- // if (valid) {
+ 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;
- // 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 = {};
- // }
- // });
+ 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("鑾峰彇璁㈠崟鍒楄〃澶辫触");
+ }
+ })
+ .catch(() => {
+ this.$notify.error("鑾峰彇璁㈠崟鍒楄〃澶辫触");
+ });
+ });
+ } else {
+ this.nullRule = {};
+ }
+ });
},
cancelLogin() {
this.innerVisible = false;
@@ -378,7 +422,6 @@
}
activateVersion({ code: this.secrectKey.trim() })
.then((res) => {
- debugger;
if (res.code == 200) {
this.$notify.success("婵�娲绘垚鍔�");
this.validateSn();
@@ -399,7 +442,6 @@
this.activeDialog = true;
},
uploadKey(params) {
- debugger;
let param = new FormData();
param.append("code", params.file);
uploadKey(param).then(
@@ -433,13 +475,19 @@
width: 100%;
height: 100%;
.el-dialog__header {
- padding: 15px 20px 10px;
- text-align: left;
- font-weight: 600;
+ padding: 14px 20px 13px;
+ text-align: center;
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.08);
+ .el-dialog__title {
+ font-weight: 600;
+ font-size: 18px;
+ color: #5f5f5f;
+ line-height: 25px;
+ }
}
.el-dialog__body {
text-align: left;
- padding: 30px 50px;
+ padding: 30px;
padding-top: 20px;
}
.el-divider--horizontal {
@@ -449,11 +497,29 @@
display: flex;
align-items: baseline;
margin-top: 15px;
+ .upload-demo {
+ .el-button--small {
+ font-size: 14px;
+ border-radius: 3px;
+ border-radius: 16px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ min-width: 120px;
+ }
+ }
}
#myForm {
display: flex;
align-items: center;
margin-right: 10px;
+ .el-textarea__inner {
+ min-height: 32px;
+ height: 32px;
+ border: 1px solid #d4d6d9;
+ box-sizing: border-box;
+ border-radius: 16px;
+ }
+
.single-input {
margin: 0 8px;
width: 60px;
@@ -462,82 +528,238 @@
.ver {
margin-bottom: 10px;
font-size: 16px;
+ color: #5f5f5f;
+ font-weight: bold;
.ver-text {
- font-weight: 600;
+ color: #666666;
+ font-weight: 400;
}
}
.info {
- font-size: 15px;
margin-bottom: 10px;
- }
- .qr-code-img {
- // width: 120px;
- // height: 120px;
+ .el-button--primary {
+ font-size: 14px;
+ color: #fff;
+ background-color: var(--colorCard);
+ border-color: #4e94ff !important;
+ background: #4e94ff !important;
+ border-radius: 16px;
+ width: 200px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 32px;
+ line-height: 32px;
+ }
}
.ask {
margin-top: 20px;
font-size: 15px;
}
}
-.inner-login-dialog {
- .info {
- padding: 0 30px;
+
+.el-dialog.my-account {
+ border-radius: 24px;
+ .btns {
+ display: flex;
+ justify-content: right;
+ .cancel {
+ width: 76px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ line-height: 40px;
+ font-size: 14px;
+ color: var(--colorCard);
+ border-color: var(--colorCard) !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .ok {
+ width: 76px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ color: #fff;
+ line-height: 40px;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ .login-content {
+ box-sizing: border-box;
+ .el-input__prefix {
+ left: 20px;
+ transition: all 0.3s;
+ font-size: 20px;
+ }
+ .el-input__suffix-inner {
+ .code-btn {
+ padding: 6px 20px;
+ border: none;
+ border-left: 1px solid #d4d6d9;
+ color: var(--colorCard);
+ }
+ .code-btn:hover {
+ background: none;
+ }
+ }
+ .el-input__inner {
+ background-color: #ffffff;
+ border: 1px solid #d4d6d9;
+ box-sizing: border-box;
+ color: #606266;
+ display: inline-block;
+ font-size: 14px;
+ height: 40px;
+ line-height: 40px;
+ outline: none;
+ padding: 0 50px;
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+ width: 100%;
+ border-radius: 20px;
+ }
+ }
+ .el-dialog__footer {
+ padding: 30px;
+ text-align: left;
+ box-sizing: border-box;
+ box-shadow: 0px -1px 0px rgb(0 0 0 / 8%);
+ }
+ .el-dialog__header {
+ padding: 14px 20px 13px;
+ text-align: center;
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.08);
+ .el-dialog__title {
+ font-weight: 600;
+ font-size: 18px;
+ color: #5f5f5f;
+ line-height: 25px;
+ }
}
.el-dialog__body {
+ padding: 30px 30px 10px 30px;
+ }
+ .info {
text-align: left;
}
}
-.login-content {
- box-sizing: border-box;
- padding: 0 30px;
- .el-input__inner {
- -webkit-appearance: none;
- background-color: #ffffff;
- background-image: none;
- border-radius: 4px;
- border: 1px solid #dcdfe6;
+.el-dialog.my-activate {
+ border-radius: 24px;
+ .el-dialog__footer {
+ padding: 30px;
+ text-align: left;
box-sizing: border-box;
- color: #606266;
- display: inline-block;
- font-size: 16px;
- border-radius: 5px;
- height: 40px;
- line-height: 40px;
- outline: none;
- padding: 0 15px;
- transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
- width: 100%;
+ box-shadow: 0px -1px 0px rgb(0 0 0 / 8%);
+ .btns {
+ display: flex;
+ .cancel {
+ width: 140px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ line-height: 40px;
+ font-size: 14px;
+ color: var(--colorCard);
+ border-color: var(--colorCard) !important;
+ margin-right: 12px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .ok {
+ width: 140px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ color: #fff;
+ line-height: 40px;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
}
}
.el-dialog.my-order {
+ border-radius: 24px;
+ .el-dialog__body {
+ padding: 22px 20px;
+ }
+ .btns {
+ display: flex;
+ justify-content: right;
+ .cancel {
+ width: 140px;
+
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ line-height: 40px;
+ font-size: 14px;
+ color: var(--colorCard);
+ border-color: var(--colorCard) !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .ok {
+ width: 140px;
+ height: 40px;
+ cursor: pointer;
+ border-radius: 20px;
+ background-color: var(--colorCard) !important;
+ border-color: var(--colorCard) !important;
+ color: #fff;
+ line-height: 40px;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
.tip {
width: auto;
- height: 40px;
- background: rgb(145, 213, 255, 0.2);
- box-sizing: border-box;
- border: 1px rgb(145, 213, 255) solid;
+ display: -webkit-box;
+ display: -ms-flexbox;
display: flex;
padding: 0 10px;
border-radius: 5px;
+ color: #5f5f5f;
+ line-height: 20px;
+ font-weight: bold;
+ -ms-flex-align: center;
align-items: center;
+ justify-content: center;
i {
margin-right: 5px;
- font-size: 16px;
- color: rgb(24, 144, 255);
+ font-size: 24px;
+ color: var(--colorCard);
}
span {
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;
margin-bottom: 15px;
-
border-radius: 8px;
box-shadow: 0px 0px 4px rgb(0 0 0 / 25%);
.head {
@@ -555,16 +777,18 @@
display: flex;
flex-direction: column;
justify-content: space-evenly;
- height: 110px;
text-align: left;
box-sizing: border-box;
- padding: 0 20px;
+ font-size: 13px;
+
+ padding: 8px 20px;
+ line-height: 20px;
}
}
}
}
.warn-tag {
- width: 650px;
+ width: 630px;
text-align: left;
box-sizing: border-box;
padding: 0 25px;
@@ -575,11 +799,11 @@
display: flex;
justify-content: space-between;
top: 55px;
- left: calc(50% - 325px);
+ left: calc(50% - 315px);
line-height: 45px;
border-radius: 5px;
.go-to {
- color: rgba(71, 153, 247, 1);
+ color: var(--colorCard);
cursor: pointer;
text-decoration: underline;
font-weight: 600;
@@ -591,6 +815,7 @@
.icon {
font-size: 14px;
cursor: pointer;
+ margin-left: 25px;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0