比对库同时修改bug

heyujie

2022-01-28 9ca36901bf15c4daf89baf7d9cd1fd487bce8a96

 src/pages/desktop/index/components/Desktop.vue

@@ -11,94 +11,106 @@
    ></safari>

    <div class="warn-tag" v-if="showFreeVersion">
      <span class="text"
      <span v-if="!snExpire" class="text"
        >试用版尚未激活，仅支持部分功能使用，如需使用全部功能，请尽快激活系统。</span
      >
      <span v-else class="text">SmartAIOS 试用期已到期，请您尽快激活系统</span>
      <span class="go-to" @click="gotoActive">前往激活</span>
      <span class="icon iconfont" @click="showFreeVersion = false"
        >&#xe61b;</span
      >
    </div>

    <el-dialog title="激活SmartAI" :visible.sync="dialogVisible" width="750px" :show-close="false" :close-on-click-modal="false" :close-on-press-escape="false">
    <el-dialog
      title="激活SmartAI"
      :visible.sync="activeDialog"
      width="750px"
      :show-close="false"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
    >
      <el-dialog
        width="30%"
        title="账户激活"
        :visible.sync="innerVisible"
        append-to-body
        class="inner-login-dialog"
      >
        <div class="info">
          请输入你在SmartAI商城账户的手机号并完成验证码校验，实现系统激活！
        </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="请输入手机号"
              >
                <i slot="prefix" class="el-icon-mobile-phone"></i>
              </el-input>
            </el-form-item>
            <el-form-item prop="verifyCode">
              <el-input
                @keyup.enter.native="phoneLogin"
                v-model="phone.verifyCode"
                autocomplete="off"
                style="width: 254px"
                placeholder="请输入验证码"
              >
                <i slot="prefix" class="el-icon-message"></i>
              </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>
        </span>
      </el-dialog>
      <div class="ver"><span class="ver-text">版本：</span>{{ version }}</div>
      <div class="ver">
        <span class="ver-text">状态：</span>{{ versionState }}
      </div>
      <el-divider></el-divider>
      <div class="info">
        如果还没有产品密钥，你可以使用手机扫码或前往此链接
        <a href="http://os.smartai.com:7004" target="_blank"
          >http://os.smartai.com:7004</a
        >
        购买。
        如果您已连接到Internet并且已购买产品密钥，可以尝试验证SmartAI商城账户激活系统。
        <div>
          <el-button type="primary" @click="innerVisible = true">
            账户激活
          </el-button>
        </div>
      </div>

      <!-- <img class="qr-code-img" src="/images/desktop/weather.png" /> -->
      <!-- <img class="qr-code-img" src="http://192.168.8.10:7009/version/offline/qrcode" /> -->
      <img
        class="qr-code-img"
        src="http://192.168.20.189:7009/version/offline/qrcode"
      />

      <div class="info">
        如果您未连接Internet或激活失败，可尝试离线激活，使用手机扫码购买产品或验证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">
        如果你具有SmartAI提供的产品密钥，请在此处输入激活SmartAI。
      </div>

      <div class="validate">
        <form id="myForm">
          <!-- <el-input
            class="single-input"
            size="small"
            ref="secrectKey"
            :maxlength="4"
            v-model="secrectKey"
            placeholder=""
            @input="onInput(1)"
          ></el-input
          >-
          <el-input
            class="single-input"
            size="small"
            ref="input2"
            :maxlength="4"
            v-model="input2"
            placeholder=""
            @input="onInput(2)"
          ></el-input
          >-
          <el-input
            class="single-input"
            size="small"
            ref="input3"
            :maxlength="4"
            v-model="input3"
            placeholder=""
            @input="onInput(3)"
          ></el-input>
          -
          <el-input
            class="single-input"
            size="small"
            ref="input4"
            :maxlength="4"
            v-model="input4"
            placeholder=""
            @input="onInput(4)"
          ></el-input
          >-
          <el-input
            class="single-input"
            size="small"
            ref="input5"
            :maxlength="4"
            v-model="input5"
            placeholder=""
            @input="onInput(5)"
          ></el-input> -->

          <el-input
            type="textarea"
            autosize
@@ -117,13 +129,71 @@
          :show-file-list="false"
        >
          <el-button size="small" type="primary">导入产品密钥文件</el-button>

          <!-- <div class="el-upload__tip" slot="tip"></div> -->
        </el-upload>
      </div>

      <span slot="footer" class="dialog-footer">
        <el-button @click="dialogVisible = false">继续试用</el-button>
        <el-button v-if="!snExpire" @click="activeDialog = false"
          >继续试用</el-button
        >
        <el-button v-else @click="quit">退出登录</el-button>
        <el-button type="primary" @click="activateVersion">激活</el-button>
      </span>
    </el-dialog>

    <el-dialog
      title="我的订单"
      :visible.sync="innerDialog"
      width="750px"
      :show-close="false"
      :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>
      </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
        >
        <el-button v-else @click="quit">退出登录</el-button>
        <el-button type="primary" @click="activateVersion">激活</el-button>
      </span>
    </el-dialog>
@@ -133,11 +203,14 @@
<script>
import DFrame from "./DFrame";
import Safari from "./Safari";
import { isPhone } from "../../../../scripts/validate.ts";
import {
  getActiveQrCode,
  getSN,
  activateVersion,
  uploadKey,
  getSmsCode,
  loginShopInSmart,getShopOrderList,
} from "@/api/system";
export default {
  name: "Desktop",
@@ -148,54 +221,157 @@
  data() {
    return {
      showFreeVersion: false,
      dialogVisible: false,
      activeDialog: false, 
      countdown: 60,
      innerDialog: false,
      version: "SmartAI试用版",
      codeMsg: "获取验证码",
      versionState: "尚未激活",
      secrectKey: "",
      codeDisabled: false,
      innerVisible: false,
      snExpire: false,
      timer: null,token: "",
      phone: {
        phoneNum: "",
        verifyCode: "",
      },
      phoneCodeRule: {
        phoneNum: [{ validator: isPhone, trigger: "change" }],
        verifyCode: [
          { required: true, message: "请输入验证码", trigger: "change" },
        ],
      },
    };
  },
  mounted() {
    getSN().then((res) => {
      this.showFreeVersion = res.data.sn !== "";
    });
  created() {
    this.validateSn();
  },
  methods: {
    activateVersion() {
      if (this.secrectKey.trim()=="") {
        this.$message.warning("请先填写产品密钥")
        return 
      }
      activateVersion({code:this.secrectKey.trim()}).then((res) => {
        debugger
        if (res.code==200) {
          this.$notify.success("激活成功")
          this.goToSysInfo()
          this.dialogVisible = false;

        }else{
          this.$notify.error(res.msg)
    quit() {
      this.$emit("quit");
    },
    validateSn() {
      getSN().then((res) => {
        this.snExpire = res.data.expire;
        this.showFreeVersion = res.data.sn == "" || res.data.expire;
      });
    },
    getValidStr() {
      if (this.countdown > 0 && this.countdown <= 60) {
        this.countdown--;
        if (this.countdown !== 0) {
          this.codeMsg = "重新发送(" + this.countdown + ")";
        } else {
          clearInterval(this.timer);
          this.codeMsg = "获取验证码";
          this.countdown = 60;
          this.timer = null;
          this.codeDisabled = false;
        }
      }).catch((err) => {
          this.$notify.error(err.msg)
      })
      }
    },
    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 = {};
      //   }
      // });
    },
    cancelLogin(){
      this.innerVisible= false
    },
    // 获取验证码
    getCode() {
      // 验证码60秒倒计时
      var pattern = /^1[345789]\d{9}$/;
      if (this.phone.phoneNum == "") {
        this.$refs["phoneLogin"].fields[0].validateMessage = "请输入手机号";
        this.$refs["phoneLogin"].fields[0].validateState = "error";
        return;
      }
      if (!pattern.test(this.phone.phoneNum)) {
        this.$refs["phoneLogin"].fields[0].validateMessage = "手机号码格式有误";
        this.$refs["phoneLogin"].fields[0].validateState = "error";
        return;
      }
      if (!this.timer) {
        this.codeDisabled = true;
        this.getValidStr();
        this.timer = setInterval(this.getValidStr, 1000);
        getSmsCode({ phoneNum: this.phone.phoneNum })
          .then((res) => {
            this.gotCode = true;
          })
          .catch((err) => {
            this.$refs["phoneLogin"].fields[0].validateMessage = err.data.msg;
            this.$refs["phoneLogin"].fields[0].validateState = "error";
          });
      }
    },
    activateVersion() {
      if (this.secrectKey.trim() == "") {
        this.$message.warning("请先填写产品密钥");
        return;
      }
      activateVersion({ code: this.secrectKey.trim() })
        .then((res) => {
          debugger;
          if (res.code == 200) {
            this.$notify.success("激活成功");
            this.validateSn();
            this.goToSysInfo();
            this.activeDialog = false;
          } else {
            this.$notify.error(res.msg);
          }
        })
        .catch((err) => {
          this.$notify.error(err.msg);
        });
    },
    goToSysInfo() {
      window.parent.postMessage({ msg: `toVindicate?menu=系统信息` }, "*");
    },
    gotoActive() {
      // this.showFreeVersion = false;
      this.dialogVisible = true;
      this.activeDialog = true;
    },
    uploadKey(params) {
      debugger;
      let param = new FormData();
      param.append("code", params.file);
      uploadKey(param).then(
        (res) => {
          this.$message.success("导入成功");
          this.secrectKey = res.data;
          if (res.code == 200) {
            this.$message.success("导入成功");
            this.secrectKey = res.data;
          } else {
            this.$message.error(res.msg);
          }
        },
        (err) => {
          this.$message.error("导入失败");
          this.$message.error(err.msg);
        }
      );
    },
@@ -262,6 +438,89 @@
    font-size: 15px;
  }
}
.inner-login-dialog {
  .info {
    padding: 0 30px;
  }
  .el-dialog__body {
    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;
    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%;
  }
}
.el-dialog.my-order {
  .tip {
    width: auto;
    height: 40px;
    background: rgb(145, 213, 255, 0.2);
    box-sizing: border-box;
    border: 1px rgb(145, 213, 255) solid;
    display: flex;
    padding: 0 10px;
    border-radius: 5px;
    align-items: center;
    i {
      margin-right: 5px;
      font-size: 16px;
      color: rgb(24, 144, 255);
    }
    span {
      font-size: 14px;
    }
  }
  .order-list {
    margin: 20px 0;

    .order-card {
      height: 150px;
      background: #fff;
      margin-bottom: 15px;

      border-radius: 8px;
      box-shadow: 0px 0px 4px rgb(0 0 0 / 25%);
      .head {
        height: 40px;
        line-height: 40px;
        text-align: left;
        box-sizing: border-box;
        padding: 0 20px;
        border-bottom: 1px rgba(242, 242, 242, 1) solid;
        font-size: 14px;
        display: flex;
        justify-content: space-between;
      }
      .desc {
        display: flex;
        flex-direction: column;
        justify-content: space-evenly;
        height: 110px;
        text-align: left;
        box-sizing: border-box;
        padding: 0 20px;
      }
    }
  }
}
.warn-tag {
  width: 640px;
  text-align: left;