From f2cc6c66303c54e424b5accf052904040a568e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=90=E8=8B=B1=E6=9D=B0?= <3427731738@qq.com>
Date: Fri, 29 Nov 2024 22:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=EF=BC=88=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=A6=81=E5=80=BC=E7=82=B9=E5=87=BB=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/marketing/marketing.js                    |  8 ++
 pages.json                                    |  5 +
 pages/marketing/addTeam.vue                   | 13 +++
 pages/marketing/index.vue                     | 95 ++++++++++++++++---
 .../uni-pagination/uni-pagination.vue         |  2 +-
 5 files changed, 110 insertions(+), 13 deletions(-)
 create mode 100644 pages/marketing/addTeam.vue

diff --git a/api/marketing/marketing.js b/api/marketing/marketing.js
index e4fec9a..66ee325 100644
--- a/api/marketing/marketing.js
+++ b/api/marketing/marketing.js
@@ -8,3 +8,11 @@ export function getList(data) {
         'data': data
     })
 }
+//跳转 拼团
+export function jumpTeamInfo(data) {
+    return request({
+        'url': '/marketing/team/getTeamInfo',
+        'method': 'get',
+        'data': data
+    })
+}
diff --git a/pages.json b/pages.json
index 53bc653..504bfc9 100644
--- a/pages.json
+++ b/pages.json
@@ -75,6 +75,11 @@
     "style": {
       "navigationBarTitleText": "营销活动"
     }
+  }, {
+    "path": "pages/marketing/addTeam",
+    "style": {
+      "navigationBarTitleText": "加团"
+    }
   }],
   "tabBar": {
     "color": "#000000",
diff --git a/pages/marketing/addTeam.vue b/pages/marketing/addTeam.vue
new file mode 100644
index 0000000..db78651
--- /dev/null
+++ b/pages/marketing/addTeam.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "addTeam"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/pages/marketing/index.vue b/pages/marketing/index.vue
index ef8e0e3..a2d0bd5 100644
--- a/pages/marketing/index.vue
+++ b/pages/marketing/index.vue
@@ -1,23 +1,24 @@
 <template>
 	<view class="container">
 
-
     <view class="cu-card dynamic" v-for="(item,index) in teamInfoList" :key="index">
-      <uni-section title="拼团名称" type="line">
-
+      <uni-section :title="item.name" type="line">
         <uni-card padding="0" spacing="0">
           <template v-slot:cover>
             <view class="custom-cover">
-              <image class="cover-image" mode="aspectFill" :src="item.productImage">
+              <image class="cover-image" mode="aspectFill"
+                     :src="item.productImage" >
               </image>
+
               <view class="cover-content">
-                <text class="uni-subtitle uni-white">拼团</text>
+                <text class="uni-subtitle uni-white">{{item.content+"..."}}</text>
+                <text class="uni-subtitle uni-white" v-if=" 'N' == item.status" style="color: red">该活动已结束</text>
+                <text class="uni-subtitle uni-white" @click="jumpTeamInfo(item.teamId)" v-if=" 'Y' == item.status" style="color: green">点击我参加</text>
               </view>
             </view>
           </template>
 
           <uni-list>
-            <uni-list-item title="拼团详情" showArrow></uni-list-item>
           </uni-list>
           <view slot="actions" class="card-actions no-border">
             <view class="card-actions-item" @click="actionsClick('分享')">
@@ -36,22 +37,38 @@
         </uni-card>
       </uni-section>
     </view>
-
-
-
+    <uni-section title="修改数据长度" type="line" padding>
+      <uni-pagination :current="current" :total="this.total" title="标题文字" :show-icon="true" @change="change" />
+      <view class="btn-view">
+        <view>
+          <text class="example-info">当前页：{{ this.current }}，数据总量：{{ this.total }}条，每页数据：{{ pageSize }}</text>
+        </view>
+      </view>
+    </uni-section>
 	</view>
+
 </template>
 
 <script>
 
 import { getList } from 'api/marketing/marketing'
+import upload from '@/utils/upload'
+import request from '@/utils/request'
+
 	export default {
 		components: {},
-
+    //分页
 
 		data() {
 			return {
+        isDisabled: true ,// 控制是否禁用点击
+        //分页
+        current: 0,
+        total: 0,
+        pageSize: 0,
+        //拼团活动列表
         teamInfoList:[],
+        //列表req
         teamInfoListReq : {
           keyWord:"",
           status:"",
@@ -76,9 +93,30 @@ import { getList } from 'api/marketing/marketing'
     },
 
 		methods: {
+
+      add() {
+        this.total += 10
+      },
+      reset() {
+        this.total = 0;
+        this.current = 1
+      },
+      change(e) {
+        console.log(e)
+        this.current = e.current
+      },
+
+      //点击 拼团
+      jumpTeamInfo(teamId){
+
+        alert(teamId)
+      } ,
     getListGoods(){
     getList(this.teamInfoListReq).then(res =>{
-      this.teamInfoList=res.data
+      this.teamInfoList=res.data.list;
+      this.total=res.data.total;
+      this.current=res.data.pageNum;
+      this.pageSize=res.data.pageSize;
     })
     },
 
@@ -96,7 +134,9 @@ import { getList } from 'api/marketing/marketing'
 	}
 </script>
 <style lang="scss">
-
+.image-with-overlay {
+  position: relative; /* 确保覆盖层能正确叠放 */
+}
 	.container {
 		overflow: hidden;
 	}
@@ -147,5 +187,36 @@ import { getList } from 'api/marketing/marketing'
 	.no-border {
 		border-width: 0;
 	}
+  .example-body {
+    /* #ifndef APP-NVUE */
+    display: block;
+    /* #endif */
+  }
+
+  .btn-view {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex-direction: column;
+    /* #endif */
+    padding: 15px;
+    text-align: center;
+    background-color: #fff;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .btn-flex {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .button {
+    margin: 20px;
+    width: 150px;
+    font-size: 14px;
+    color: #333;
+  }
 </style>
 
diff --git a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
index 5305b5f..49e479a 100644
--- a/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
+++ b/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue
@@ -109,7 +109,7 @@
 			pageSize: {
 				// 每页数据量
 				type: [Number, String],
-				default: 10
+				default: 1
 			},
 			showIcon: {
 				// 是否以 icon 形式展示按钮