feat(optimization): 冗余代码删除 & 代码优化 & bug修复

602ea5e5 · 赖慧粮 · ccfc44ab · 602ea5e5 · 602ea5e5 · 602ea5e5
Commit 602ea5e5 authored Apr 15, 2022 by 赖慧粮
15 changed files
--- a/certs/localhost-key.pem
+++ b/certs/localhost-key.pem
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCnrHWf3t0TI+/4
+GokbavkLtPuHyBU1cskWDxYPXPl4PRBozzFF0UBZ1snMfRF7Wnst26LMpnkEhiLv
+uEcN6ZOwfEorclLMT2WW5LUHZq6xcBJx79t9hQH1Nq/UbYMb0qCtfVFmZhoV465w
+JOBSj+dhTe7a9u0ViKTVFco3UMTWRSbyOtuISs17N8XeiiamFQVVjft945g8OVss
+xXvY7jqH63VQ9WwUH/J0IuFj43d0+1xjlX2tMrTfZUUMMq+kN76GJXJLdHT2bfBM
+6bbVTvChK/ceSB0szQwVjfkt+zAFWvoia2sglz9+UgJeFAaJbZaaTjpo8FHy0c4J
+0Qw2FxxDAgMBAAECggEAeLVDCJCcfscEXoxb4A0mtTLZUWrNOekksmix7OV2AwWS
+5qEiS6zUsthZ9oijKTZ+LwlLLiE6RfN6+zCilnVtCUSw8I4g5UzTScnkOSvG355a
+6QNP9BDo0+tGsZsVI9aCLeNl0l32sYNzdPBXPZizbe144tGY5EO2xmAlb6UJz2ZW
+zPLBvzFbwP1BpqlIrzjSZ0X1WEE3FzAN9+X3gfJgPIb0VqyeoiOlpOtlfS9YVWWd
+qY0SZewV/C6q8BZDVkVE9jhhC0W0Y9M9O1bzMOPN89OVXHVTwN0G78DSe/T7U2ZC
+aMmBp0SUdzPCOmbO6n1X5HkBf+KTerjWD5QZvk9yoQKBgQDM/aJalhqgoGKhwAfF
+Q+CMYA3ALb74p8c2kMDWufyqaC2gOJKPtqtZ+pmHynG3om5JuUnZdW+hTDbMA51I
+R6h5wXxseBp59CAgWm0ifKjl/VYAlApfDW3JmCOfr0Joipb1QiZEAQ9wXOBISJWf
+zd93TwoBnZtT5RT0ux8U3iHINwKBgQDRZaTcRDDwyWufget/OVmDOXnplccVClNW
+rlvEvoYShzsrQHJfRPBrMmgQhLvs/BUIVq0oiBNRK3Q8DT5UeeDsdPooHrcHIh/L
+OTKZHz8mDeU8ffxIK6cDvTSC4WnNRcFyucoIqwhMhDfry94nFtHN7+i05L9CWXYt
+D7K3+ehuVQKBgF2DgzIB8em+4N/bI3BZM7G2C+/Urp7uoxGAXYhXVi1C0zWZOTr4
+YRjuGmX484GLRva44TijuyYBB6pwJ6sWjYPlwWYWMDXcKV+5ALpP1hj9ReODpWuR
+S7lAf1fUct4QAyelYqF5PlrK88Hl4uQA3eWml/D+viI6iiHOzzIM16pnAoGAFUXg
+Q8hhuHSeDGxkgl5PK7exHPvsZ8TOxqWcCRbaBBPc/P3lIKyeSCWs0NDLTr4lXN2B
+Zfa9D6f8fQVTab2gDiWsLFtCeOUMmdbLvyafgbwzp7uc37AfnY+hQBKqbwJBLuiV
+D+BgTXW5QKlLfmkhE2zmFUqP66uvB9DqdSpcZKkCgYAR9R+tbFF5QXLTnh/znHSR
+F3tFFJAS7o3aCRsAe3A3r+1+OV25sJS9/lN3DzA6SbHUf7ai+CpwbFP53Uti9WGs
+4fjKPK6YYhhrFZWCKAPSgoP1PNNQ/t5L7hSmUjMshACnAwKqA/fgDNuZ5bM8AKVV
+SHsTxerh7+nKObyW/P+Lww==
+-----END PRIVATE KEY-----
--- a/certs/localhost.pem
+++ b/certs/localhost.pem
+-----BEGIN CERTIFICATE-----
+MIIFTDCCA7SgAwIBAgIRAKMTFU0EZwmzpqODTBtj284wDQYJKoZIhvcNAQELBQAw
+eTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMScwJQYDVQQLDB5sYWV2
+QEhlZHdpZ3MtTWFjQm9vay1Qcm8ubG9jYWwxLjAsBgNVBAMMJW1rY2VydCBsYWV2
+QEhlZHdpZ3MtTWFjQm9vay1Qcm8ubG9jYWwwHhcNMjIwMzI5MDcxNTUyWhcNMjQw
+NjI5MDcxNTUyWjBSMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlm
+aWNhdGUxJzAlBgNVBAsMHmxhZXZASGVkd2lncy1NYWNCb29rLVByby5sb2NhbDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKesdZ/e3RMj7/gaiRtq+Qu0
+4fIFTVyyRYPFg9c+Xg9EGjPMUXRQFnWycx9EXtaey3bosymeQSGIu+4Rw3pk7B8
+SityUsxPZZbktQdmrrFwEnHv232FAfU2r9RtgxvSoK19UWZmGhXjrnAk4FKP52FN
+7tr27RWIpNUVyjdQxNZFJvI624hKzXs3xd6KJqYVBVWN+33jmDw5WyzFe9juOofr
+dVD1bBQf8nQi4WPjd3T7XGOVfa0ytN9lRQwyr6Q3voYlckt0dPZt8EzpttVO8KEr
+9x5IHSzNDBWN+S37MAVa+iJrayCXP35SAl4UBoltlppOOmjwUfLRzgnRDDYXHEMC
+AwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD
+ATAfBgNVHSMEGDAWgBSlclQJXlu/1FD8V9KCrf+apxoH2TCCASYGA1UdEQSCAR0w
+ggEZgglsb2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBAAAAACHBMCo
+AWSHBMCoAWWHBMCoAWaHBMCoAWeHBMCoAWiHBMCoAWmHBMCoAWqHBMCoAWuHBMCo
+AWyHBMCoAW2HBMCoAW6HBMCoAmSHBMCoAmWHBMCoAmaHBMCoAmeHBMCoAmiHBMCo
+AmmHBMCoAmqHBMCoAmuHBMCoAmyHBMCoAm2HBMCoAm6HBMCoBAKHBMCoBAOHBMCo
+BASHBMCoBAWHBMCoBAaHBMCoBAeHBMCoBAiHBMCoBAmHBMCoBAqHBMCoBAuHBMCo
+BAyHBMCoBA2HBMCoBA6HBMCoBA+HBMCoBBCHBMCoBBGHBMCoBBOHBMCoBBQwDQYJ
+KoZIhvcNAQELBQADggGBABAifrf4aXTNlc/HdPfScXUJXhaydOcKKTSy4kk6vv/L
+5BbersBMMcoB+vUEYrSCu1V4xN15IAQLSIoyBj4ahf8JHcMqfn2jwmvPny5U65wP
+bPKcM7bzkCNSpJoqw2JTN98OS2nerEiqyf5BT/eGOZWiJhJpH0IW4hAyEmiLSQnR
+JrbJxN6k9/eAJoRMRcz/X8Kbm1iLFLtiY7CT5DZmVblNruV0vqJrkp7UxjaPkXWU
+InPJ5Lx6WLtw/Y2a+2Yp5nLricUFrlDJup7EHgEjxNzwUhD0/lKY02zQKNX7KTHq
+ZYf/jz6hwv7u5F/M5C2NENdBSGLHYpStUHTZkXUi2mFrx81/v66qtP5T7zMfOscq
+Iv+b59KeJ1n1QuxJa0gI1wK8AIYJGasKB752/j8iQAYMXtyn4d4D3WwlL2EUGpCs
+x45ysdnakB2Ij3Cd0NaNCQ3AGTY4kyhLDELj3qE3qK8HVo+XA5/hkFPl6+Gn/P+J
+eNLRPgQQCW8ie1vi9vijJw==
+-----END CERTIFICATE-----
--- a/components/Lottery/Instant/CountdownBar.vue
+++ b/components/Lottery/Instant/CountdownBar.vue
@@ -4,8 +4,8 @@
      class="countdown-bar__status"
      :style="barStyle"
    >
-      <template v-if="parseInt(status, 10) !== LOTTERY_STATUS.end">
+      <template v-if="+status !== LOTTERY_STATUS.end">
-        <div class="countdown-bar__text">{{ LOTTERY_STATUS_TXT[parseInt(status, 10)].actionLabel }}倒计时：</div>
+        <div class="countdown-bar__text">{{ LOTTERY_STATUS_TXT[+status].actionLabel }}倒计时：</div>
        <van-count-down millisecond :time="time" :style="{ color: barStyle.color }">
          <template #default="timeData">
            <span v-if="timeData.days" class="time-item">
@@ -27,7 +27,7 @@
          </template>
        </van-count-down>
      </template>
-      <div v-if="parseInt(status, 10) === LOTTERY_STATUS.end" class="countdown-bar__end">抽奖已结束</div>
+      <div v-if="+status === LOTTERY_STATUS.end" class="countdown-bar__end">抽奖已结束</div>
    </div>
  </section>
 </template>

--- a/components/Lottery/Instant/Main.vue
+++ b/components/Lottery/Instant/Main.vue
@@ -381,11 +381,6 @@ export default {
      setTimeout(() => {
        this.isShowWin = true
      }, 400)
-    },
-    updateData(data) {
-      for (const [key, value] of Object.entries(data)) {
-        this[key] = value
-      }
    }
  }
 }

--- a/components/Lottery/Instant/MiniMain.vue
+++ b/components/Lottery/Instant/MiniMain.vue
@@ -119,7 +119,7 @@
          <div class="lottery-instant__wheel" :class="{ 'lottery-instant__wheel--no-lightning': !isLottering }">
            <PrizeWheel
              ref="prizeWheel"
-              :list="formatedPrizeList"
+              :list="formattedPrizeList"
              :light-num="16"
              :container-border="24"
              @onEnd="runEnd"
@@ -232,7 +232,7 @@ export default {
    prizeList() {
      return this.lotteryInfo.prizeConfigs
    },
-    formatedPrizeList() {
+    formattedPrizeList() {
      const prizeLen = this.lotteryInfo?.prizeConfigs?.length || 0
      if (prizeLen >= 6 && prizeLen % 2 === 0) {
        const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
@@ -256,7 +256,6 @@ export default {
    }
  },
  mounted() {
-    // this.lotteryInfo.showType = 4
    Bus.$on('updateMain', data => {
      for (const [key, value] of Object.entries(data)) {
        if (key === 'func') {
@@ -380,11 +379,6 @@ export default {
        this.isShowWin = true
      }, 400)
    },
-    updateData(data) {
-      for (const [key, value] of Object.entries(data)) {
-        this[key] = value
-      }
-    }
  }
 }
 </script>

--- a/components/LotteryEntry/index.vue
+++ b/components/LotteryEntry/index.vue
--- a/nuxt.config.js
+++ b/nuxt.config.js
 /* eslint-disable nuxt/no-cjs-in-config */
 const path = require('path')
+const fs = require('fs')
 /* env configs */
 const globalEnvConfig = require(`./config/global.js`)
@@ -23,7 +24,7 @@ const plugins = IS_USE_OSS
        region: 'oss-cn-hangzhou',
        bucket: `guangdianyun-static-${env.run_server}`,
        prefix: PROJECT_NAME,
-        limit: 10, // 备份最近 3 个版本的 oss 文件
+        limit: 10, // 备份最近 10 个版本的 oss 文件
        format: version,
        exclude: [/.*\.html$/], // 或者 /.*\.html$/,排除.html文件的上传
        deleteAll: false, // 优先匹配 format 配置项
@@ -166,6 +167,10 @@ export default {
  ...gtagConfig,
  axios: {},
  server: {
+    https: {
+      cert: fs.readFileSync('./certs/localhost.pem'),
+      key: fs.readFileSync('./certs/localhost-key.pem')
+    },
    port: env.run_port, // default: 3000
    host: '0.0.0.0' // default: localhost
  },

--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
    "normalize.css": "^8.0.1",
    "nuxt": "^2.15.8",
    "qrcode": "^1.4.4",
-    "tippy.js": "^6.3.1",
    "uuid": "^8.3.2",
    "vant": "^2.12.22",
    "vconsole": "^3.9.1",

--- a/pages/index/index.vue
+++ b/pages/index/index.vue
 <template>
  <section class="lottery-box">
    <component
-      :is="lotteryComponents[parseInt(lotteryInfo.type, 10)]"
+      :is="lotteryComponents[+lotteryInfo.type]"
      v-if="'type' in lotteryInfo && lotteryInfo.type"
    ></component>
    <ComplaintsDeal></ComplaintsDeal>
@@ -32,8 +32,6 @@ export default {
      },
      id: this.$route.query.id || null, // 接收抽奖id
      sessionId: this.$route.query.sessionId || null // 接收抽奖场次id
-      // sid: this.$route.query.sid || null, // 引用id
-      // stype: this.$route.query.stype || null, // 引用类型
    }
  },
  computed: {
@@ -91,7 +89,7 @@ export default {
      Bus.$on('LotteryInfoUpdate', data => {
        const { id } = data
        const { uin, id: currentId, sessionId: currentPlayId } = this
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.getLotteryDetail({ id, playId: currentPlayId, uin })
        }
      })
@@ -99,7 +97,7 @@ export default {
      Bus.$on('LotteryStateUpdate', data => {
        const { id, playId } = data
        const { sessionId: currentPlayId, id: currentId } = this
-        if (parseInt(id, 10) === parseInt(currentId, 10) && parseInt(playId, 10) === parseInt(currentPlayId, 10)) {
+        if (+id === +currentId && +playId === +currentPlayId) {
          const { status, startTime, endTime, userTimes } = data
          // 状态
          this.updateInfo({

--- a/pages/list/index.vue
+++ b/pages/list/index.vue
@@ -100,7 +100,7 @@ export default {
      Bus.$on('LotteryInfoUpdate', data => {
        const { id } = data
        const { uin, id: currentId } = this.$route.query
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.getSessionList({ id, uin })
        }
      })

--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -228,14 +228,14 @@ export default {
      Bus.$on('LotteryInfoUpdate', data => {
        const { id } = data
        const { id: currentId } = this.$route.query
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.loadData()
        }
      })
      Bus.$on('LotteryStateUpdate', data => {
        const { id } = data
        const { id: currentId } = this.$route.query
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.loadData()
        }
      })

--- a/pages/mini/index/index.vue
+++ b/pages/mini/index/index.vue
 <template>
  <section class="lottery-box">
    <component
-      :is="lotteryComponents[parseInt(lotteryInfo.type, 10)]"
+      :is="lotteryComponents[+lotteryInfo.type]"
      v-if="'type' in lotteryInfo && lotteryInfo.type"
    ></component>
    <Loading v-model="isLoading" class="lottery-box__loading"></Loading>
@@ -31,8 +31,6 @@ export default {
      sessionId: this.$route.query.sessionId || null, // 接收抽奖场次id
      connection: null,
      timer: null
-      // sid: this.$route.query.sid || null, // 引用id
-      // stype: this.$route.query.stype || null, // 引用类型
    }
  },
  computed: {
@@ -109,7 +107,7 @@ export default {
      Bus.$on('LotteryInfoUpdate', data => {
        const { id } = data
        const { uin, id: currentId, sessionId: currentPlayId } = this
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.getLotteryDetail({ id, playId: currentPlayId, uin })
        }
      })
@@ -117,7 +115,7 @@ export default {
      Bus.$on('LotteryStateUpdate', data => {
        const { id, playId } = data
        const { sessionId: currentPlayId, id: currentId } = this
-        if (parseInt(id, 10) === parseInt(currentId, 10) && parseInt(playId, 10) === parseInt(currentPlayId, 10)) {
+        if (+id === +currentId && +playId === +currentPlayId) {
          const { status, startTime, endTime, userTimes } = data
          // 状态
          this.updateInfo({

--- a/pages/mini/list/index.vue
+++ b/pages/mini/list/index.vue
@@ -86,7 +86,7 @@ export default {
      Bus.$on('LotteryInfoUpdate', data => {
        const { id } = data
        const { uin, id: currentId } = this.$route.query
-        if (parseInt(id, 10) === parseInt(currentId, 10)) {
+        if (+id === +currentId) {
          this.getSessionList({ id, uin })
        }
      })

--- a/pages/records/index.vue
+++ b/pages/records/index.vue
@@ -62,7 +62,8 @@ export default {
      page: 1,
      pageSize: 10,
      isShowDetail: false,
-      detailId: null
+      detailId: null,
+      scrollTop: null
    }
  },
  computed: {
@@ -70,6 +71,21 @@ export default {
      return !this.isLoading && !this.hasMore && this.recordList.length === 0
    }
  },
+  watch: {
+    isShowDetail(val) {
+      if (val) {
+        const scrollTop = document.documentElement.scrollTop || document.body.scrollTop
+        this.scrollTop = scrollTop
+        return
+      }
+      if (!val && this.scrollTop) {
+        this.$nextTick(() => {
+          document.documentElement.scrollTop = document.body.scrollTop = this.scrollTop
+          this.scrollTop = null
+        })
+      }
+    }
+  },
  methods: {
    loadData() {
      const { page: currentPage, pageSize: num, recordList: currentList } = this

--- a/yarn.lock
+++ b/yarn.lock
@@ -1431,7 +1431,7 @@
  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"
  integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==
-"@popperjs/core@^2.8.3", "@popperjs/core@^2.9.2":
+"@popperjs/core@^2.9.2":
  version "2.9.2"
  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
@@ -5945,10 +5945,10 @@ lodash@^4.15.0, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-lotteries@^1.2.0:
+lotteries@^1.2.1:
-  version "1.2.0"
+  version "1.2.1"
-  resolved "https://registry.npmmirror.com/lotteries/-/lotteries-1.2.0.tgz#3618790ebcedaaa15d301c06a4eca21af08f0152"
+  resolved "https://registry.yarnpkg.com/lotteries/-/lotteries-1.2.1.tgz#be7646516184c1afb7eaa7706a3f2fdc28977db8"
-  integrity sha512-61UppC/jWn1oj8svSr4Uq+5sbTeFaQeRmteSJDwvsub79wdt9B3dRDqjLOiBUpW6pqW/giyVlKXclPFnQPiNbQ==
+  integrity sha512-etHCCqwfCK3NW54p7TdyqwoMOIcJG6clDDzzEeROS7zgJ5xpKqe33UxeTf4R7SmDyQVm+ecex1gkz0+XOagfIQ==
  dependencies:
    core-js "^3.6.5"
    matter-js "^0.18.0"
@@ -9229,13 +9229,6 @@ tiny-emitter@^2.0.0:
  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
-tippy.js@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.1.tgz#3788a007be7015eee0fd589a66b98fb3f8f10181"
-  integrity sha512-JnFncCq+rF1dTURupoJ4yPie5Cof978inW6/4S6kmWV7LL9YOSEVMifED3KdrVPEG+Z/TFH2CDNJcQEfaeuQww==
-  dependencies:
-    "@popperjs/core" "^2.8.3"
 tmp@^0.0.33:
  version "0.0.33"
  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"