Merge remote-tracking branch 'origin/dev' into dev

src/api_s2c/ApiSyncBtn.ts

@@ -43,7 +43,7 @@ export default async function (call: ApiCall<ReqSyncBtn, ResSyncBtn>) {
                 data[key] = {active: false};
                 change[key] = data[key];
                 let _hdList = await HuoDongFun.gethdList(call, 8)
-                if (_hdList) {
+                if (_hdList.length > 0) {
                     // 无此活动
                     data[key] = {active: true};
                     change[key] = data[key];

src/api_s2c/event/christmas/ApiLiBao.ts

@@ -27,7 +27,6 @@ export default async function (call: ApiCall<ReqLiBao, ResLiBao>) {
         // 判断是否选择奖励了
         return call.error('', { code: -3, message: globalThis.lng.yangchengmubiao_2 })
     }
-
     let _prize: atn[] = _con.basep
 
     for (let key in _select) {

src/api_s2c/event/christmas/ApiQianDao.ts

@@ -19,7 +19,7 @@ export default async function (call: ApiCall<ReqQianDao, ResQianDao>) {
         _mydata.qiandao.push(i)
         _prize = _prize.concat(_con[i])
     }
-    if (!_prize){
+    if (_prize.length <= 0){
         // 没有奖励可以领取
         return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 })
     }

src/api_s2c/event/christmas/ApiZhanLingRec.ts

@@ -30,7 +30,7 @@ export default async function (call: ApiCall<ReqZhanLingRec, ResZhanLingRec>) {
 
         _mydata.gj.push(index)
     }
-    if (!_prize) {
+    if (_prize.length <= 0) {
         // 没有奖励可以领取
         return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 })
     }

src/public/huodongfun.ts

@@ -54,7 +54,6 @@ export class HuoDongFun {
         if (htype != 0) _where["htype"] = htype
 
         let _res = await this.catAllHD(_where)
-
         let result = []
         for (let index = 0; index < _res.length; index++) {
             const element = _res[index];