From d2c9edfbd4ea92f497788f0116febdcad692fe09 Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 23 Jul 2024 10:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom.page.js           |  6 ++--
 src/pages.json           | 13 ++-------
 src/pages/jlgh/index.vue | 59 +++++++++++++++++++++++++++++-----------
 src/pages/jlgh/login.vue | 26 +++++++++---------
 src/types/uni-pages.d.ts |  3 +-
 vite.config.ts           |  7 -----
 vite.plugin.js           |  2 +-
 7 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/custom.page.js b/custom.page.js
index 3a3be64..985cc49 100644
--- a/custom.page.js
+++ b/custom.page.js
@@ -3,10 +3,10 @@ import path from 'path'
 
 const config = {
   pages: './src/pages',
-  pagesInclude: ['jlgh/coupon.vue', 'jlgh/redeem.vue'],
-  // pagesInclude: ['jlgh/index.vue'],
+  // pagesInclude: ['jlgh/coupon.vue', 'jlgh/redeem.vue'],
+  pagesInclude: ['jlgh/index.vue'],
   // pagesInclude: ['jlgh/login.vue'],
-  // pagesInclude: ['index'],
+  // pagesInclude: ['jlgh'],
 }
 
 const { pages, pagesInclude } = config
diff --git a/src/pages.json b/src/pages.json
index c94603a..29209eb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -15,19 +15,12 @@
   },
   "pages": [
     {
-      "path": "pages/jlgh/coupon",
+      "path": "pages/jlgh/index",
       "type": "page",
+      "layout": "default",
       "style": {
         "navigationStyle": "custom",
-        "navigationBarTitleText": "我的奖品"
-      }
-    },
-    {
-      "path": "pages/jlgh/redeem",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "奖品兑换"
+        "navigationBarTitleText": "工行长春消费季"
       }
     }
   ],
diff --git a/src/pages/jlgh/index.vue b/src/pages/jlgh/index.vue
index 561a761..670239d 100644
--- a/src/pages/jlgh/index.vue
+++ b/src/pages/jlgh/index.vue
@@ -168,7 +168,7 @@
 </template>
 
 <script>
-// import AlmostLottery from '@/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue'
+import AlmostLottery from '@/uni_modules/almost-lottery/components/almost-lottery/almost-lottery.vue'
 import lotteryBg from '../../assets/images/jlgh/panpan.png'
 import dizuo from '../../assets/images/jlgh/dizuo.png'
 import Api from './api'
@@ -176,7 +176,7 @@ import { useUserStore } from '@/store'
 export default {
   name: 'Home',
   components: {
-    // AlmostLottery,
+    AlmostLottery,
   },
   data() {
     return {
@@ -207,7 +207,7 @@ export default {
   },
   onLoad(options) {
     // eslint-disable-next-line camelcase
-    const { activity_code, token } = this.getUrlParams()
+    const { activity_code = 'JLGH', token } = this.getUrlParams()
     const useStore = useUserStore()
     if (token) {
       useStore.setUserInfo({ token })
@@ -278,25 +278,52 @@ export default {
         }
       })
     },
+    // 额外填充奖品到6个，未中奖谢谢参与算一个,所以默认值为5
+    fillPrize(prizes, targetLength = 5) {
+      if (!prizes.length || !prizes) return []
+      if (prizes.length >= targetLength) {
+        return prizes.map((ele) => ({
+          prizeId: ele.product_id,
+          prizeName: ele.show_name,
+          name: ele.show_name,
+        }))
+      }
+      const result = []
+      let index = 0
+      while (result.length < targetLength) {
+        const item = prizes[index]
+        result.push({
+          prizeId: item.product_id,
+          prizeName: item.show_name,
+          name: item.show_name,
+        })
+        index++
+        if (index > prizes.length - 1) {
+          index = 0
+        }
+      }
+      return result
+    },
     // 获取奖品列表
     getPrizeList() {
       Api.getProducts({
-        activity_code: this.activity_code || 'zgp',
+        activity_code: this.activity_code,
       }).then((res) => {
         if (res.code === 200) {
           const { products } = res.data
-          if (products.length > 0) {
-            while (this.prizeList.length < 5) {
-              products.forEach((item) => {
-                this.prizeList.push({
-                  prizeId: item.product_id,
-                  prizeName: item.show_name,
-                  name: item.show_name,
-                })
-              })
-            }
-          }
-          this.prizeList = this.prizeList.slice(0, 5)
+          // if (products.length > 0) {
+          //   while (this.prizeList.length < 5) {
+          //     products.forEach((item) => {
+          //       this.prizeList.push({
+          //         prizeId: item.product_id,
+          //         prizeName: item.show_name,
+          //         name: item.show_name,
+          //       })
+          //     })
+          //   }
+          // }
+          // this.prizeList = this.prizeList.slice(0, 5)
+          this.prizeList = this.fillPrize(products)
           this.prizeList.push({
             prizeId: 0,
             prizeName: '谢谢参与',
diff --git a/src/pages/jlgh/login.vue b/src/pages/jlgh/login.vue
index c0fda5d..56432b6 100644
--- a/src/pages/jlgh/login.vue
+++ b/src/pages/jlgh/login.vue
@@ -112,26 +112,26 @@ const login = async () => {
   const params = {
     phone: phone.value,
     code: code.value,
-    activity_code: query.activity_code,
+    activity_code: query.activity_code || 'JLGH',
   }
   const res: any = await Api.getLogin(params)
   if (res.code === 200) {
     const token = res.data.token
     useStore.setUserInfo({ token })
     // #ifdef H5
-    window.parent.postMessage(
-      {
-        data: {
-          message: 'success',
-          type: 'login',
-        },
-      },
-      '*',
-    )
+    // window.parent.postMessage(
+    //   {
+    //     data: {
+    //       message: 'success',
+    //       type: 'login',
+    //     },
+    //   },
+    //   '*',
+    // )
     // #endif
-    // uni.navigateTo({
-    //   url: '/pages/jlgh/index',
-    // })
+    uni.navigateTo({
+      url: '/pages/jlgh/index',
+    })
   } else {
     uni.showToast({
       title: res.message,
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index c625dfb..f5dd4dd 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -4,8 +4,7 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: "/pages/jlgh/coupon" |
-       "/pages/jlgh/redeem";
+  url: "/pages/jlgh/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
diff --git a/vite.config.ts b/vite.config.ts
index 4489f12..e27458b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -77,13 +77,6 @@ export default ({ command, mode }) => {
         // 通过这个插件，在修改vite.config.js文件则不需要重新运行也生效配置
         restart: ['vite.config.js'],
       }),
-      // UNI_PLATFORM === 'h5' &&
-      //   mode === 'production' &&
-      //   vitePluginRemoveDir({
-      //     source: `dist/build/h5/static/images`,
-      //     target: `${outputDirName.split('-')[0]}`,
-      //     mode: 2,
-      //   }),
       UNI_PLATFORM === 'h5' &&
         mode === 'production' &&
         viteCopyToNewFolderPlugin({
diff --git a/vite.plugin.js b/vite.plugin.js
index df9f680..d5a0510 100644
--- a/vite.plugin.js
+++ b/vite.plugin.js
@@ -22,7 +22,7 @@ function viteCopyToNewFolderPlugin(options = {}) {
  * options下各个参数说明
  * soure  路径
  * target 目标文件夹
- * mode  1代表删除target文件夹  2代表删除target以外的所有文件夹 默认1
+ * mode  1代表删除target文件夹  2代表删除target以外的所有文件夹(暂时还用不上) 默认1
  */
 
 function vitePluginRemoveDir(options = {}) {