bug修复

ZZJ

2022-02-11 d365829b14ca4256d39694b9cdcd43bad0ad8595

 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"
        >&#xe61b;</span
      >
      <div>
        <span class="go-to" @click="gotoActive">前往激活</span>
        <span class="icon iconfont" @click="showFreeVersion = false"
          >&#xe61b;</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正式版'">
        如果您已连接到Internet并且已购买产品密钥，可以尝试验证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或激活失败，可尝试离线激活，使用手机扫码购买产品或验证SmartAI商城账户激活系统。
        <!-- <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">
        如果你具有SmartAI提供的产品密钥，请在此处输入激活SmartAI。
      </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>