From ecb9144a2ec9bae1ab6a29fc550b31409e68851e Mon Sep 17 00:00:00 2001
From: "lenovo008\\lenovo" <lenovo008>
Date: Thu, 25 Jul 2024 09:01:51 +0800
Subject: [PATCH 1/4] feat(prize): add lucky five selection page and API

- Add new pages for lucky five selection in user center.
- Implement API endpoints for getting today's lucky five results and ranking.
- Update menu list in user/discounts page to include lucky five selection.
- Refactor prize API to include new endpoints for lucky five functionality.
---
 yudao-mall-uniapp-master/pages.json           |  24 +++
 .../pages/user/alternative.vue                | 152 ++++++++++++++++++
 .../pages/user/discounts.vue                  |  81 ++++++++++
 .../sheep/api/prize/index.js                  |  29 +++-
 4 files changed, 279 insertions(+), 7 deletions(-)
 create mode 100644 yudao-mall-uniapp-master/pages/user/alternative.vue
 create mode 100644 yudao-mall-uniapp-master/pages/user/discounts.vue

diff --git a/yudao-mall-uniapp-master/pages.json b/yudao-mall-uniapp-master/pages.json
index 77c041b..9761d30 100644
--- a/yudao-mall-uniapp-master/pages.json
+++ b/yudao-mall-uniapp-master/pages.json
@@ -273,6 +273,30 @@
 						"group": "用户中心"
 					}
 				},
+				{
+					"path": "discounts",
+					"style": {
+						"navigationBarTitleText": "活动"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "活动",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "alternative",
+					"style": {
+						"navigationBarTitleText": "幸运五选一"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "幸运五选一",
+						"group": "用户中心"
+					}
+				},
 				{
 					"path": "PrizesWon",
 					"style": {
diff --git a/yudao-mall-uniapp-master/pages/user/alternative.vue b/yudao-mall-uniapp-master/pages/user/alternative.vue
new file mode 100644
index 0000000..c0faf10
--- /dev/null
+++ b/yudao-mall-uniapp-master/pages/user/alternative.vue
@@ -0,0 +1,152 @@
+<template>
+    <s-layout class="set-wrap" title="五选一" :bgStyle="{ color: '#FFF' }">
+        <view class="_bgc">
+
+            <view class="body">
+                <view class="top">
+                    <view>
+                        <view class="txt">总人数</view> {{ rankingData.totalNum }}
+                    </view>
+                    <view>
+                        <view class="txt">我的排名</view> {{ rankingData.rankNum }}
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="title">已出线人数列表</view>
+                    <view class="table">
+                        <scroll-view lower-threshold="300" scroll-y @scrolltolower="onPageScroll"
+                            class="scroll-content">
+                            <view v-for="(i, v) in ListData" :key="v" class="item">
+                                <view>{{ v }}</view>
+                                <view>{{ i.userName }}</view>
+                                <view>{{ formattedDateTime(i.outTime)}}</view>
+                            </view>
+                        </scroll-view>
+                    </view>
+                </view>
+            </view>
+
+        </view>
+    </s-layout>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad, onReachBottom, onShow, onUnload, onHide } from '@dcloudio/uni-app';
+import MineApi from '@/sheep/api/prize/index'
+import sheep from '@/sheep';
+import { name } from 'dayjs/locale/zh-cn';
+
+
+let params = ref({
+    pageNo: 1,
+    pageSize: 50,
+})
+
+onLoad(async () => {
+    getRanking()// 获取排名
+    getListData()// 今日已出线列表
+})
+
+
+let rankingData = ref([])
+const getRanking = async () => {
+    const res = await MineApi.ranking()
+    rankingData.value = res.data
+}
+let ListData = ref([])
+const getListData = async () => {
+    const res = await MineApi.wzyycx(params.value)
+    ListData.value.push(...res.data.list)
+}
+
+const onPageScroll = (event) => {
+    console.log(event, '12312313213132');
+    params.value.pageNo += 1
+    getListData()
+}
+
+const formattedDateTime = (timestampInMilliseconds) => {
+    const date = new Date(timestampInMilliseconds);
+    const year = date.getFullYear();
+    const month = ('0' + (date.getMonth() + 1)).slice(-2);
+    const day = ('0' + date.getDate()).slice(-2);
+    const hours = ('0' + date.getHours()).slice(-2);
+    const minutes = ('0' + date.getMinutes()).slice(-2);
+    const seconds = ('0' + date.getSeconds()).slice(-2);
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+</script>
+
+<style lang="scss" scoped>
+._bgc {
+    width: 100%;
+    height: 89vh;
+    padding-top: 10rpx;
+}
+
+.body {
+    .top {
+        display: flex;
+        height: 150rpx;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-content: center;
+        justify-content: space-around;
+        align-items: center;
+        font-size: 35rpx;
+        border: 5rpx solid #e6e6e6;
+        border-radius: 20rpx;
+        background-color: #fff6f6;
+        width: 95%;
+        margin: 0 auto;
+        font-weight: 600;
+
+        &>view {
+            text-align: center;
+        }
+
+        .txt {
+            font-size: 42rpx;
+        }
+    }
+
+    .content {
+        background-color: #f5eaea;
+        border-radius: 20rpx;
+        width: 95%;
+        margin: 0 auto;
+        margin-top: 20rpx;
+
+        .title {
+            font-size: 35rpx;
+            text-align: center;
+            line-height: 88rpx;
+        }
+
+        .table {
+            // background-color: red;
+            width: 100%;
+            margin: 0 auto;
+            height: 72vh;
+            border-radius: 20rpx;
+
+            .scroll-content {
+                height: 100%;
+
+                .item {
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-around;
+                    align-items: center;
+                    height: 88rpx;
+
+                    &>view:nth-of-type(1) {
+                        width: 5%;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/yudao-mall-uniapp-master/pages/user/discounts.vue b/yudao-mall-uniapp-master/pages/user/discounts.vue
new file mode 100644
index 0000000..b510b1a
--- /dev/null
+++ b/yudao-mall-uniapp-master/pages/user/discounts.vue
@@ -0,0 +1,81 @@
+<template>
+    <s-layout class="set-wrap" title="活动中心" :bgStyle="{ color: '#FFF' }">
+        <view class="_bgc">
+
+            <view class="menu">
+                <view v-for="(v, i) in menulist" :key="i">
+                    <view class="menu_item" @tap="sheep.$router.go(v?.path)">
+                        <image class="menu_item_img" :src="v?.url"></image>
+                        <text class="menu_item_text">{{ v.title }}</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- <view class="menu">
+                <view class="menu_item" >
+                    <image class="item_img"
+                        src="http://zda.huamar.com/admin-api/infra/file/4/get/d4b717094fa8162e981eb8c17cd4cef1f25da1327d4d214fece3375962b5e59f.png">
+                    </image>
+                    <text class="menu_item_text">抽奖</text>
+                </view>
+                <view class="menu_item">
+                    <image class="item_img"
+                        src="http://zda.huamar.com/admin-api/infra/file/4/get/d4b717094fa8162e981eb8c17cd4cef1f25da1327d4d214fece3375962b5e59f.png">
+                    </image>
+                    <text class="menu_item_text">幸运五占一</text>
+                </view>
+            </view> -->
+
+        </view>
+    </s-layout>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad, onReachBottom, onShow, onUnload, onHide } from '@dcloudio/uni-app';
+import MineApi from '@/sheep/api/prize/index'
+import sheep from '@/sheep';
+
+let menulist = ref([
+    {
+        title: '抽奖',
+        path: '/pages/user/prize',
+        url: 'http://zda.huamar.com/admin-api/infra/file/4/get/d4b717094fa8162e981eb8c17cd4cef1f25da1327d4d214fece3375962b5e59f.png'
+    },
+    {
+        title: '幸运五选一',
+        path: '/pages/user/alternative',
+        url: 'http://zda.huamar.com/admin-api/infra/file/4/get/082a147eb0480692b717a010b42b0299b27a563b0c85840708b9c53247dcb52f.png'
+    },
+])
+</script>
+
+<style lang="scss" scoped>
+._bgc {
+    width: 100%;
+    height: 100vh;
+}
+
+.menu {
+    display: flex;
+    // justify-content: space-around;
+
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-content: center;
+    align-items: center;
+
+    .menu_item {
+        margin: 40rpx;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        align-content: center;
+        .menu_item_img {
+            width: 100rpx;
+            height: 100rpx;
+        }
+    }
+}
+</style>
diff --git a/yudao-mall-uniapp-master/sheep/api/prize/index.js b/yudao-mall-uniapp-master/sheep/api/prize/index.js
index 6210c2c..6c3daac 100644
--- a/yudao-mall-uniapp-master/sheep/api/prize/index.js
+++ b/yudao-mall-uniapp-master/sheep/api/prize/index.js
@@ -1,7 +1,6 @@
 import request from '@/sheep/request';
 
 const PayOrderApi = {
-  
   // 开始抽奖
   lottery: (id) => {
     return request({
@@ -18,16 +17,12 @@ const PayOrderApi = {
       params: { activityId: id },
     });
   },
-
-
-  
-
-// 获得抽奖照片
+  // 获得抽奖照片
   prizeImg: (id) => {
     return request({
       url: '/promotion/prize-draw/activity-prize/list-by-activity-id',
       method: 'GET',
-      params: { activityId:id },
+      params: { activityId: id },
     });
   },
   // 规则
@@ -38,6 +33,26 @@ const PayOrderApi = {
       params,
     });
   },
+
+  // 五占一接口--------------------------------
+
+  // 今日已出线列表
+  wzyycx: (params) => {
+    return request({
+      url: '/member/distribution-log/outTodaypage',
+      method: 'GET',
+      params,
+    });
+  },
+
+  // 排名
+  ranking: (params) => {
+    return request({
+      url: '/member/distribution-log/getUserId',
+      method: 'GET',
+      params,
+    });
+  },
 };
 
 export default PayOrderApi;

From f2a0dba1d2cd6e11b03c3be16b1adc49c6f68a8f Mon Sep 17 00:00:00 2001
From: "lenovo008\\lenovo" <lenovo008>
Date: Thu, 25 Jul 2024 13:30:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-mall-uniapp-master/.env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-mall-uniapp-master/.env.development b/yudao-mall-uniapp-master/.env.development
index 7854d99..ee5e7ed 100644
--- a/yudao-mall-uniapp-master/.env.development
+++ b/yudao-mall-uniapp-master/.env.development
@@ -2,4 +2,4 @@
 #  SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080
 
  # 线上地址
- SHOPRO_DEV_BASE_URL = https://zda.huamar.com
\ No newline at end of file
+ SHOPRO_DEV_BASE_URL = https://zd.huamar.com
\ No newline at end of file

From cd53d818b887a49b59ec49e6a7ff23ec88cf270e Mon Sep 17 00:00:00 2001
From: "lenovo008\\lenovo" <lenovo008>
Date: Fri, 26 Jul 2024 14:07:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9B=A2=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-mall-uniapp-master/pages/commission/team.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-mall-uniapp-master/pages/commission/team.vue b/yudao-mall-uniapp-master/pages/commission/team.vue
index 82a492e..2ca062b 100644
--- a/yudao-mall-uniapp-master/pages/commission/team.vue
+++ b/yudao-mall-uniapp-master/pages/commission/team.vue
@@ -25,10 +25,10 @@
       <view style="padding: 0 30rpx">
         <view class="nav acea-row row-around l1">
           <view :class="state.level == 1 ? 'item on' : 'item'" @click="setType(1)">
-            一级({{ state.summary.firstBrokerageUserCount || 0 }})
+            直属下级({{ state.summary.firstBrokerageUserCount || 0 }})
           </view>
           <view :class="state.level == 2 ? 'item on' : 'item'" @click="setType(2)">
-            二级({{ state.summary.secondBrokerageUserCount || 0 }})
+            我的团队({{ state.summary.secondBrokerageUserCount || 0 }})
           </view>
         </view>
         <view
@@ -141,11 +141,11 @@
                   <text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
                 </view>
                 <view>
-                  <text class="num">{{ item.orderCount || 0 }}</text
+                  <text class="num">{{ item.brokerageOrderCount || 0 }}</text
                   >单</view
                 >
                 <view>
-                  <text class="num">{{ item.brokeragePrice || 0 }}</text
+                  <text class="num">{{ Number(item.brokeragePrice|| 0  )/100  }}</text
                   >元
                 </view>
               </view>
@@ -282,7 +282,7 @@
     let { code, data } = await BrokerageApi.getBrokerageUserChildSummaryPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
-      level: state.level,
+      level: state.level== 1 ? state.level  : '',
       'sortingField.order': state.isAsc,
       'sortingField.field': state.sortKey,
       nickname: state.nickname,

From 027e6609db7319283bd081866fbdff20af182678 Mon Sep 17 00:00:00 2001
From: "lenovo008\\lenovo" <lenovo008>
Date: Fri, 26 Jul 2024 14:24:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(commission=E5=9B=A2=E9=98=9F=E9=A1=B5):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=E5=92=8C=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化了团队页的样式，包括搜索框和排序项的布局，以提升用户体验。
- 移除了无用的注释和代码，提高了代码的可读性和维护性。
- 调整了团队人数和订单数量的显示逻辑，确保在没有数据时显示为0。
- 在用户页面添加了页面内顶部间距的样式，改善了页面的整体布局。

通过这些改动，我们旨在改善页面的用户界面和交互细节，同时简化代码结构，使之更易于管理和维护。
---
 .../pages/commission/team.vue                 | 82 +++++--------------
 yudao-mall-uniapp-master/pages/index/user.vue |  6 +-
 2 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/yudao-mall-uniapp-master/pages/commission/team.vue b/yudao-mall-uniapp-master/pages/commission/team.vue
index 2ca062b..1bf30b3 100644
--- a/yudao-mall-uniapp-master/pages/commission/team.vue
+++ b/yudao-mall-uniapp-master/pages/commission/team.vue
@@ -2,17 +2,18 @@
 <template>
   <s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner">
     <view class="promoter-list">
-      <view
-        class="promoterHeader bg-color"
-        style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff"
-      >
+      <view class="promoterHeader bg-color" style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff">
         <view class="headerCon acea-row row-between" style="padding: 28px 29px 0 29px">
           <view>
             <view class="name" style="color: #fff">推广人数</view>
             <view>
               <text class="num" style="color: #fff">
+                <!-- {{
+                state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount ||
+                0
+                }} -->
                 {{
-                  state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount ||
+                   state.summary.secondBrokerageUserCount ||
                   0
                 }}
               </text>
@@ -31,42 +32,21 @@
             我的团队({{ state.summary.secondBrokerageUserCount || 0 }})
           </view>
         </view>
-        <view
-          class="search acea-row row-between-wrapper"
-          style="display: flex; height: 100rpx; align-items: center"
-        >
+        <view class="search acea-row row-between-wrapper" style="display: flex; height: 100rpx; align-items: center">
           <view class="input">
-            <input
-              placeholder="点击搜索会员名称"
-              v-model="state.nickname"
-              confirm-type="search"
-              name="search"
-              @confirm="submitForm"
-            />
+            <input placeholder="点击搜索会员名称" v-model="state.nickname" confirm-type="search" name="search"
+              @confirm="submitForm" />
           </view>
-          <image
-            src="/static/images/search.png"
-            mode=""
-            style="width: 60rpx; height: 64rpx"
-            @click="submitForm"
-          />
+          <image src="/static/images/search.png" mode="" style="width: 60rpx; height: 64rpx" @click="submitForm" />
         </view>
         <view class="list">
           <view class="sortNav acea-row row-middle" style="display: flex; align-items: center">
-            <view
-              class="sortItem"
-              @click="setSort('userCount', 'asc')"
-              v-if="sort === 'userCountDESC'"
-            >
+            <view class="sortItem" @click="setSort('userCount', 'asc')" v-if="sort === 'userCountDESC'">
               团队排序
               <!-- TODO 芋艿：看看怎么从项目里拿出去 -->
               <image src="/static/images/sort1.png" />
             </view>
-            <view
-              class="sortItem"
-              @click="setSort('userCount', 'desc')"
-              v-else-if="sort === 'userCountASC'"
-            >
+            <view class="sortItem" @click="setSort('userCount', 'desc')" v-else-if="sort === 'userCountASC'">
               团队排序
               <image src="/static/images/sort3.png" />
             </view>
@@ -78,11 +58,7 @@
               金额排序
               <image src="/static/images/sort1.png" />
             </view>
-            <view
-              class="sortItem"
-              @click="setSort('price', 'desc')"
-              v-else-if="sort === 'priceASC'"
-            >
+            <view class="sortItem" @click="setSort('price', 'desc')" v-else-if="sort === 'priceASC'">
               金额排序
               <image src="/static/images/sort3.png" />
             </view>
@@ -90,19 +66,11 @@
               金额排序
               <image src="/static/images/sort2.png" />
             </view>
-            <view
-              class="sortItem"
-              @click="setSort('orderCount', 'asc')"
-              v-if="sort === 'orderCountDESC'"
-            >
+            <view class="sortItem" @click="setSort('orderCount', 'asc')" v-if="sort === 'orderCountDESC'">
               订单排序
               <image src="/static/images/sort1.png" />
             </view>
-            <view
-              class="sortItem"
-              @click="setSort('orderCount', 'desc')"
-              v-else-if="sort === 'orderCountASC'"
-            >
+            <view class="sortItem" @click="setSort('orderCount', 'desc')" v-else-if="sort === 'orderCountASC'">
               订单排序
               <image src="/static/images/sort3.png" />
             </view>
@@ -113,10 +81,7 @@
           </view>
           <block v-for="(item, index) in state.pagination.list" :key="index">
             <view class="item acea-row row-between-wrapper" style="display: flex">
-              <view
-                class="picTxt acea-row row-between-wrapper"
-                style="display: flex; align-items: center"
-              >
+              <view class="picTxt acea-row row-between-wrapper" style="display: flex; align-items: center">
                 <view class="pictrue">
                   <image :src="item.avatar" />
                 </view>
@@ -128,25 +93,20 @@
                   </view>
                 </view>
               </view>
-              <view
-                class="right"
-                style="
+              <view class="right" style="
                   justify-content: center;
                   flex-direction: column;
                   display: flex;
                   margin-left: auto;
-                "
-              >
+                ">
                 <view>
                   <text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
                 </view>
                 <view>
-                  <text class="num">{{ item.brokerageOrderCount || 0 }}</text
-                  >单</view
-                >
+                  <text class="num">{{ item.brokerageOrderCount || 0 }}</text>单
+                </view>
                 <view>
-                  <text class="num">{{ Number(item.brokeragePrice|| 0  )/100  }}</text
-                  >元
+                  <text class="num">{{ Number(item.brokeragePrice|| 0 )/100 }}</text>元
                 </view>
               </view>
             </view>
diff --git a/yudao-mall-uniapp-master/pages/index/user.vue b/yudao-mall-uniapp-master/pages/index/user.vue
index 705451a..34b4f9b 100644
--- a/yudao-mall-uniapp-master/pages/index/user.vue
+++ b/yudao-mall-uniapp-master/pages/index/user.vue
@@ -39,4 +39,8 @@
   onPageScroll(() => {});
 </script>
 
-<style></style>
+<style>
+.page-app .page-main .page-body{
+  padding-top: 100rpx;
+}
+</style>