Merge branch 'feature/wheel' into test

CHANGELOG.md

@@ -2,6 +2,50 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.3.9](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.8...v1.3.9) (2023-09-27)
+
+
+### Features
+
+* 优化 ([1836f7b](https://gitlab.aodianyun.com/activities/web-lottery/commit/1836f7b537debd110eed47d6bd501cecafbcffdf))
+
+### [1.3.8](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.2...v1.3.8) (2023-09-27)
+
+
+### Features
+
+* 抽奖新增福袋、宝箱 ([d155896](https://gitlab.aodianyun.com/activities/web-lottery/commit/d15589639500d3154a9c97af634125bd76f9891a))
+* 抽奖信息同步后台 ([8cf648e](https://gitlab.aodianyun.com/activities/web-lottery/commit/8cf648e306266ab63364f726c63a94658f477d4a))
+* 登陆改版 ([47ef8e7](https://gitlab.aodianyun.com/activities/web-lottery/commit/47ef8e7ec5b218075bccd167dd2dd13950ac4144))
+* 更改滚动条布局 ([9783b6e](https://gitlab.aodianyun.com/activities/web-lottery/commit/9783b6efa73ca7e472c2c819273f6ab85927c56b))
+* 更新config ([d3349d0](https://gitlab.aodianyun.com/activities/web-lottery/commit/d3349d0235c5534b79a9a9574f25c842a9174e87))
+* 更新config版本 ([ff054ff](https://gitlab.aodianyun.com/activities/web-lottery/commit/ff054ffe479e21d9575eefe2e490bba8a25d3bce))
+* 交互优化 ([eed16ee](https://gitlab.aodianyun.com/activities/web-lottery/commit/eed16eeec34a80771f7979c857b7cc0a7b48c117))
+* 交互优化 ([017c6b1](https://gitlab.aodianyun.com/activities/web-lottery/commit/017c6b196ff435fdcca29da9b928bff5a5f0961e))
+* 新增中奖说明 ([0c98f18](https://gitlab.aodianyun.com/activities/web-lottery/commit/0c98f182496df0712dbabde268b4157a27dd7ef3))
+* 新增中奖说明 ([a00f565](https://gitlab.aodianyun.com/activities/web-lottery/commit/a00f565c0ce4997d01ecdeda8148635836e66367))
+* 修复参与人数模式下的错误 ([ce6f971](https://gitlab.aodianyun.com/activities/web-lottery/commit/ce6f971aa4532a852953e6df1e51f7291e1af195))
+* 修复抽奖记录、手动上线时间显示问题 ([901a041](https://gitlab.aodianyun.com/activities/web-lottery/commit/901a0414843b137a8e4555045f192cf6d2c89042))
+* 修复抽奖记录、手动上线时间显示问题 ([42fbe75](https://gitlab.aodianyun.com/activities/web-lottery/commit/42fbe75f9eedb1d5484275c5e6a60486a89a0e89))
+* 修复toast只弹一次的问题 ([f506751](https://gitlab.aodianyun.com/activities/web-lottery/commit/f506751e5d3ba80df43c907da849b5d30ba36425))
+* 样式调整 ([3aefc40](https://gitlab.aodianyun.com/activities/web-lottery/commit/3aefc40986b882e382e85f34a35be0d438be8676))
+* 样式调整 ([683e8ac](https://gitlab.aodianyun.com/activities/web-lottery/commit/683e8ac6339bba1630f302dd4114f2e03f644fe6))
+* 样式更改 ([e91fcc9](https://gitlab.aodianyun.com/activities/web-lottery/commit/e91fcc9b6dd6b1bd84256180e27e12b0d7494ad9))
+* 样式优化 ([64b16bf](https://gitlab.aodianyun.com/activities/web-lottery/commit/64b16bf64ba0a15caa8380325bd84d1af7ae3757))
+* 优化中奖信息 ([1cb519b](https://gitlab.aodianyun.com/activities/web-lottery/commit/1cb519b8619c8d8a679f8fc0fa148da1faf1048d))
+* 展示优化 ([0514277](https://gitlab.aodianyun.com/activities/web-lottery/commit/0514277e5911c61b1e3f5feadbdbcfbb03167134))
+* 中奖详情优化 ([17edb7d](https://gitlab.aodianyun.com/activities/web-lottery/commit/17edb7d525e39b6901b64a41b92f3145e32a70fb))
+* **cbnclouds:** 私有环境接口统一线上接口规则 ([34d1a64](https://gitlab.aodianyun.com/activities/web-lottery/commit/34d1a64ab3eaa50f65880d7bb1ea3695a81a217f))
+* **config:** 集成配置中心 & 统一全局变量名 & 统一工程命令 ([c66ea3c](https://gitlab.aodianyun.com/activities/web-lottery/commit/c66ea3c2b21ac08cba9cae196d8a509be8a2e83a))
+* **config:** update config ([a3d0778](https://gitlab.aodianyun.com/activities/web-lottery/commit/a3d0778dab0d6cb97b687565b7a88dfe55a3331d))
+* mini新增banner ([9cc97d2](https://gitlab.aodianyun.com/activities/web-lottery/commit/9cc97d2ff2e35880500aa80922d2acc3fd0f5a99))
+
+
+### Bug Fixes
+
+* **login:** 修复登录逻辑中错误未捕获的问题 ([5ab4349](https://gitlab.aodianyun.com/activities/web-lottery/commit/5ab4349b03d91db816a26705617d696467c7fb63))
+* **nuxtconfgi:** 修复webpack-define-plugin挂载数据暴露ak的问题 ([86d1aa3](https://gitlab.aodianyun.com/activities/web-lottery/commit/86d1aa33e78985385f5a7186584bf233b466d16f))
+
 ### [1.3.7](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.6...v1.3.7) (2023-07-27)
 
 

components/Lottery/Instant/Main.vue

@@ -214,7 +214,8 @@ export default {
         id: 0, // 中奖等级
         name: '谢谢参与' // 中奖等级
       }, // 中奖信息
-      randomType: Math.floor(Math.random() * (2 - 1 + 1)) + 1 // 部分抽奖类型随机进1或2
+      randomType: Math.floor(Math.random() * (2 - 1 + 1)) + 1, // 部分抽奖类型随机进1或2
+      formattedPrizeList: []
     }
   },
   computed: {
@@ -228,13 +229,8 @@ export default {
     prizeList() {
       return this.lotteryInfo.prizeConfigs
     },
-    formattedPrizeList() {
-      const prizeLen = this.lotteryInfo?.prizeConfigs?.length || 0
-      if (prizeLen >= 6 && prizeLen % 2 === 0) {
-        const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
-        return [...this.lotteryInfo.prizeConfigs, ...freePrizes]
-      }
-      return this.lotteryInfo.prizeConfigs
+    prizeLen() {
+      return this.prizeList.length
     },
     isNotStart() {
       // 抽奖不在活动日期内
@@ -251,7 +247,25 @@ export default {
       return ''
     },
   },
+  watch: {
+    prizeLen(nVal, oVal) {
+      if (nVal === oVal) {
+        return
+      }
+      if (this.nVal >= 6 && this.nVal % 2 === 0) {
+        const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
+        this.formattedPrizeList = [...this.lotteryInfo.prizeConfigs, ...freePrizes]
+      }
+      this.formattedPrizeList = this.lotteryInfo.prizeConfigs
+    }
+  },
   mounted() {
+    if (this.prizeLen >= 6 && this.prizeLen % 2 === 0) {
+      const freePrizes = new Array(2).fill({ id: 0, name: '谢谢参与' })
+      this.formattedPrizeList = [...this.lotteryInfo.prizeConfigs, ...freePrizes]
+    }else {
+      this.formattedPrizeList = this.lotteryInfo.prizeConfigs
+    }
     // this.lotteryInfo.showType = 4
     Bus.$on('updateMain', data => {
       for (const [key, value] of Object.entries(data)) {

package.json

 {
   "name": "web-lottery",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

store/lottery.js

@@ -30,7 +30,7 @@ export const mutations = {
   },
   SET_ISSHOWBIND: (state, isShow) => {
     state.isShowBind = isShow
-  }
+  },
 }
 
 export const actions = {
@@ -70,9 +70,9 @@ export const actions = {
       }
     })
   },
-  updateInfo({ state }, val) {
+  updateInfo({ commit, state }, val) {
     // const lotteryInfo = cloneDeep(state.lotteryInfo)
-    state.lotteryInfo = { ...state.lotteryInfo, ...val }
+    commit('SET_LOTTERYINFO', { ...state.lotteryInfo, ...val })
   },
 }
 export const getters = {