Merge branch 'feature/12.14' into test

CHANGELOG.md

@@ -2,6 +2,43 @@
 
 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.3](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.2...v1.3.3) (2022-11-03)
+
+
+### Features
+
+* 抽奖新增福袋、宝箱 ([d155896](https://gitlab.aodianyun.com/activities/web-lottery/commit/d15589639500d3154a9c97af634125bd76f9891a))
+* 更改滚动条布局 ([9783b6e](https://gitlab.aodianyun.com/activities/web-lottery/commit/9783b6efa73ca7e472c2c819273f6ab85927c56b))
+* 更新config版本 ([ff054ff](https://gitlab.aodianyun.com/activities/web-lottery/commit/ff054ffe479e21d9575eefe2e490bba8a25d3bce))
+* 修复参与人数模式下的错误 ([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))
+* **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))
+
+
+### 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.2](http://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.0...v1.3.2) (2022-10-07)
+
+
+### Features
+
+* 新增手动设置抽奖 ([12bae56](http://gitlab.aodianyun.com/activities/web-lottery/commit/12bae567615aad29ef744b78cccf9f23cd2ea0af))
+
+
+### Bug Fixes
+
+* **nuxtconfgi:** 修复webpack-define-plugin挂载数据暴露ak的问题 ([f71855a](http://gitlab.aodianyun.com/activities/web-lottery/commit/f71855a3c1c22139eaf7dd3e6852c86b078ab7a1))
+
 ### [1.3.1](https://gitlab.aodianyun.com/activities/web-lottery/compare/v1.3.0...v1.3.1) (2022-08-04)
 
 

components/Lottery/Timing/JoinButton.vue

@@ -4,6 +4,7 @@
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.teaser">
         <button v-if="lotteryInfo.condition === 1" class="join-btn pre">未开始</button>
         <button v-if="lotteryInfo.condition === 2" class="join-btn pre">未开始</button>
+        <button v-if="lotteryInfo.condition === 3" class="join-btn pre">未开始</button>
       </template>
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.start">
         <template v-if="lotteryInfo.userTimes === 0 && lotteryInfo.isDraw">

components/Lottery/Timing/TimingStatus.vue

@@ -22,6 +22,11 @@
         <p>参与人数满 {{ lotteryInfo.joinNum }} 人自动开奖 ( 当前参与 {{ lotteryInfo.activeNum }} 人 )</p>
       </div>
     </template>
+    <template v-if="type === 3">
+      <div class="joinnum-box">
+        <p>当前参与 {{ lotteryInfo.activeNum }} 人 </p>
+      </div>
+    </template>
   </section>
 </template>
 

components/Records/DetailPopup.vue

@@ -23,10 +23,14 @@
           <span v-if="detailInfo.drawTime">{{ (detailInfo.drawTime * 1000) | formatDate('YYYY-MM-DD HH:mm') }}</span>
         </li>
         <li>
+          <label>中奖说明：</label>
+          <span>{{ detailInfo.drawIntro }}</span>
+        </li>
+        <li>
           <label>获得奖品：</label>
           <div>
             <p>{{ detailInfo.prizeName }}</p>
-            <img v-lazy="detailInfo.prizeIcon" class="detail-popup__info-img" alt="" />
+            <img v-if="detailInfo.prizeIcon" v-lazy="detailInfo.prizeIcon" class="detail-popup__info-img" alt="" />
           </div>
         </li>
         <li>

package.json

 {
   "name": "web-lottery",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

yarn.lock

@@ -966,7 +966,7 @@
 
 "@gdyfe/config@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@gdyfe/config/-/config-1.2.8.tgz#f93b04ce74579af6249f28dfb992c72818f46d8a"
+  resolved "https://registry.npmmirror.com/@gdyfe/config/-/config-1.2.8.tgz#f93b04ce74579af6249f28dfb992c72818f46d8a"
   integrity sha512-IEg9Pb/UAJqwOjIlNx05OFrWXjw+Ci6pDk0HdgdjDzqhI6RMpoNGAjCiDfA9UA1oQpMG/KUNlKyJnDCXmCj3gA==
   dependencies:
     node-rsa "^1.1.1"