From 4552980f3dec06aa4aa293d6a5fac1bbc47ea917 Mon Sep 17 00:00:00 2001
From: yuepenglong <1547476325@qq.com>
Date: Thu, 27 Mar 2025 13:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E9=80=89=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         |   4 +-
 src/components/ex-list/ex-list.vue | 147 -----------------------
 src/pages/electionList/index.vue   |   6 +-
 src/pages/votingElection/index.vue |  55 +++++----
 src/uni.scss                       |   2 +-
 uni.css                            | 181 +++++++++++++++++++++++++++++
 6 files changed, 223 insertions(+), 172 deletions(-)
 delete mode 100644 src/components/ex-list/ex-list.vue
 create mode 100644 uni.css

diff --git a/.gitignore b/.gitignore
index 87c06c5..f50aa78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,6 @@ yarn-error.log*
 .hbuilderx
 
 package-lock.josn
-pnpm-lock.yaml
\ No newline at end of file
+pnpm-lock.yaml
+
+/types/auto-imports.d.ts
\ No newline at end of file
diff --git a/src/components/ex-list/ex-list.vue b/src/components/ex-list/ex-list.vue
deleted file mode 100644
index 8d86195..0000000
--- a/src/components/ex-list/ex-list.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<script setup lang="ts">
-import { onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app';
-import { ref, reactive, toRefs, nextTick, onMounted } from 'vue'
-
-type argument = {
-    customListType?: 'default' | 'custom' | 'scroll'
-    isPerformSearch?: boolean
-    isPullDownRefresh?: boolean
-    onFormSearch: (formData: any, onSuccess: Function) => void
-    onRender?: Function
-    options?: { [n: string]: string | number | boolean }
-    emptyText?: string
-    emptyHeight?: number
-}
-
-const props = withDefaults(defineProps<argument>(), {
-    customListType: 'default',
-    isPerformSearch: true,
-    isPullDownRefresh: true,
-    onFormSearch: () => {
-        console.log('onFormSearch')
-    },
-    onRender: () => {
-        console.log('onRender')
-    },
-    options: () => {
-        return {}
-    },
-    emptyText: '暂无数据~',
-    emptyHeight: 60
-})
-
-let { options, isPerformSearch, isPullDownRefresh, onFormSearch, onRender } = toRefs(props)
-
-const list = ref<any[]>([])
-const status = ref('loading')
-const initing = ref(true)
-const loading = ref(true)
-const query = reactive({
-    page: 1,
-    limit: 10,
-    total: 0
-})
-
-const loadData = (callback?: Function) => {
-    uni.showLoading({ title: '数据加载中' })
-    loading.value = true
-    const params = { ...query, ...options.value } as { [n: string]: string | number | boolean }
-    delete params.total
-
-    setTimeout(() => {
-        onFormSearch.value(params, ({ data }: { data: { data: any; total: number } }) => {
-            loading.value = false
-            initing.value = false
-            callback && callback()
-            query.page = params.page as number
-            query.limit = params.limit as number
-            query.total = data.total || 0
-            list.value = [...list.value, ...data.data]
-
-            status.value = query.page * query.limit >= query.total ? 'nomore' : 'loading'
-
-            onRender.value && onRender.value(data)
-
-            uni.hideLoading()
-        })
-    }, 100)
-}
-
-const refreshFn = (callback?: Function) => {
-    query.page = 1
-    query.total = 0
-    list.value = []
-    initing.value = true
-    loadData(callback)
-}
-
-const onScrolltolower = () => {
-    if (query.page * query.limit >= query.total) {
-        status.value = 'nomore'
-    } else {
-        if (loading.value) return
-
-        setTimeout(() => {
-            status.value = 'loading'
-            query.page += 1
-            loadData()
-        }, 1000)
-    }
-}
-
-onMounted(() => {
-    if (isPerformSearch.value) {
-        nextTick(() => {
-            refreshFn()
-        })
-    }
-})
-
-onPullDownRefresh(() => {
-    if (isPullDownRefresh.value) refreshFn(() => uni.stopPullDownRefresh())
-})
-
-onReachBottom(() => {
-    if (props.customListType !== 'scroll') {
-        onScrolltolower()
-    }
-})
-
-defineExpose({
-    list,
-    refreshFn
-})
-</script>
-
-<template>
-    <view v-if="!initing">
-        <block v-if="list.length > 0">
-            <template v-if="customListType === 'custom'">
-                <slot v-bind:data="list" />
-                <u-loadmore :status="status" />
-            </template>
-            <template v-else-if="customListType === 'scroll'">
-                <scroll-view class="scroll-view" scroll-y @scrolltolower="onScrolltolower">
-                    <view v-for="(item, index) in list" :key="index">
-                        <slot v-bind:row="item" v-bind:index="index" />
-                    </view>
-                    <u-loadmore :status="status" />
-                </scroll-view>
-            </template>
-            <template v-else>
-                <view v-for="(item, index) in list" :key="index">
-                    <slot v-bind:row="item" v-bind:index="index" />
-                </view>
-                <u-loadmore :status="status" />
-            </template>
-        </block>
-        <ex-empty v-show="list.length <= 0 && status === 'nomore'" :height="emptyHeight" :tips="emptyText" />
-    </view>
-</template>
-
-<style lang="scss" scoped>
-.scroll-view {
-    width: 100%;
-    height: 100%;
-}
-</style>
diff --git a/src/pages/electionList/index.vue b/src/pages/electionList/index.vue
index 197b0e5..223379f 100644
--- a/src/pages/electionList/index.vue
+++ b/src/pages/electionList/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-	import EcList from '@/components/ex-list/ex-list.vue'
+
 const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
     onSuccess({
         data: {
@@ -15,7 +15,7 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
 
 <template>
     <view class="electionList">
-        <EcList ref="reListRef" custom-list-type="scroll" :on-form-search="doSearch">
+        <ex-list ref="reListRef" custom-list-type="scroll" :on-form-search="doSearch">
             <template v-slot="{ row, index }">
                 <view class="items" :uid="'items' + index">
                     <view class="flex">
@@ -69,7 +69,7 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
                     </view>
                 </view>
             </template>
-        </EcList>
+        </ex-list>
     </view>
 </template>
 
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 085d275..9ac13b5 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -8,30 +8,40 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
     onSuccess({
         data: {
             data: [
-                {
+                {	
+					id: 1,
                     img: '/static/img/grxx.png',
                     name: '陈志远',
-                    class: '现任财务总监'
+                    class: '现任财务总监',
+					yijian: ''
                 },
-                {
+                {	
+					id: 2,
                     img: '/static/img/grxx.png',
                     name: '陈志远',
-                    class: '现任财务总监'
+                    class: '现任财务总监',
+					yijian: ''
                 },
-                {
+                {	
+					id: 3,
                     img: '/static/img/grxx.png',
                     name: '陈志远',
-                    class: '现任财务总监'
+                    class: '现任财务总监',
+					yijian: ''
                 },
-                {
+                {	
+					id: 4,
                     img: '/static/img/grxx.png',
                     name: '陈志远',
-                    class: '现任财务总监'
+                    class: '现任财务总监',
+					yijian: ''
                 },
-                {
+                {	
+					id: 5,
                     img: '/static/img/grxx.png',
                     name: '陈志远',
-                    class: '现任财务总监'
+                    class: '现任财务总监',
+					yijian: ''
                 }
             ],
             total: 0
@@ -42,31 +52,37 @@ const doSearch = (_formData: { page: number; limit: number }, onSuccess: Functio
 const selectIndex = ref(0)
 const buttlist = ref([
     {
+		type: 'agree',
         butname: '同意'
     },
     {
+		type: 'disagree',
         butname: '反对'
     },
     {
+		type: 'neutral',
         butname: '弃权'
     }
 ])
 
-const selectBut = (index: number) => {
-    selectIndex.value = index
+const selectBut = (data: any, cardid: any,type: string) => {
+    const target = data.find((card: { id: any; }) => card.id === cardid);
+      if (target) {
+        target.yijian = target.yijian === type ? null : type;
+      }
 }
 </script>
 
 <template>
     <!-- 你的页面内容 -->
     <view class="box">
-        <ex-list ref="reListRef" custom-list-type="scroll" :on-form-search="doSearch" empty-text="">
-            <template v-slot="{ data }">
                 <view class="headpart">
                     <view class="title">2024年度董事会成员选举</view>
                     <view class="time">投票开始时间：2024年3月15日 18:00</view>
                     <view class="time">投票截止时间：2024年3月15日 18:00</view>
                 </view>
+        <ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch">
+            <template v-slot="{ data }">
                 <view class="tppart">
                     <view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
                         <view class="topp">
@@ -83,10 +99,10 @@ const selectBut = (index: number) => {
                         <view class="bottomp">
                             <view
                                 class="minbut"
-                                v-for="(item, index) in buttlist"
-                                :key="'minbut' + index"
-                                @click="selectBut(index)"
-                                :class="{ active: selectIndex === index }"
+                                v-for="(item, ele) in buttlist"
+                                :key="ele"
+                                @click="selectBut(data,row.id,item.type)"
+                                :class="{ active: row.yijian === item.type }"
                             >
                                 {{ item.butname }}
                             </view>
@@ -105,11 +121,10 @@ const selectBut = (index: number) => {
 <style scoped lang="scss">
 .box {
     width: 100%;
-    height: 100vh;
     background-color: #f9fafb;
 
     .headpart {
-        width: 86%;
+        width: 92%;
         height: 194rpx;
         border-radius: 24rpx;
         background-color: #eff6ff;
diff --git a/src/uni.scss b/src/uni.scss
index 0703013..aabfee7 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -1,4 +1,4 @@
-@import 'uview-plus/theme.scss';
+// @import 'uview-plus/theme.scss';
 // @use 'uview-plus/theme.scss';
 
 #app {
diff --git a/uni.css b/uni.css
new file mode 100644
index 0000000..257c1a5
--- /dev/null
+++ b/uni.css
@@ -0,0 +1,181 @@
+@charset "UTF-8";
+#app {
+  box-sizing: border-box;
+  background-color: #f5f5f5;
+}
+
+/* 颜色变量 */
+/*============================= 文字尺寸 =============================*/
+image {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+view {
+  box-sizing: border-box;
+}
+
+/*============================= 弹性盒子 =============================*/
+.flex-end-evenly, .flex-end-around, .flex-end-between, .flex-end-end, .flex-end-center, .flex-end-start, .flex-center-evenly, .flex-center-around, .flex-center-between, .flex-center-end, .flex-center-start, .flex-start-evenly, .flex-start-around, .flex-start-between, .flex-start-end, .flex-start-center, .flex-start-start, .flex {
+  display: flex;
+  flex-wrap: nowrap;
+}
+
+.flex {
+  align-items: center;
+  justify-content: center;
+}
+.flex-start-start {
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.flex-start-center {
+  align-items: flex-start;
+  justify-content: center;
+}
+.flex-start-end {
+  align-items: flex-start;
+  justify-content: flex-end;
+}
+.flex-start-between {
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.flex-start-around {
+  align-items: flex-start;
+  justify-content: space-around;
+}
+.flex-start-evenly {
+  align-items: flex-start;
+  justify-content: space-evenly;
+}
+.flex-center-start {
+  align-items: center;
+  justify-content: flex-start;
+}
+.flex-center-end {
+  align-items: center;
+  justify-content: flex-end;
+}
+.flex-center-between {
+  align-items: center;
+  justify-content: space-between;
+}
+.flex-center-around {
+  align-items: center;
+  justify-content: space-around;
+}
+.flex-center-evenly {
+  align-items: center;
+  justify-content: space-evenly;
+}
+.flex-end-start {
+  align-items: flex-end;
+  justify-content: flex-start;
+}
+.flex-end-center {
+  align-items: flex-end;
+  justify-content: center;
+}
+.flex-end-end {
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+.flex-end-between {
+  align-items: flex-end;
+  justify-content: space-between;
+}
+.flex-end-around {
+  align-items: flex-end;
+  justify-content: space-around;
+}
+.flex-end-evenly {
+  align-items: flex-end;
+  justify-content: space-evenly;
+}
+
+[class*=flex-].nowrap,
+[class^=flex].nowrap {
+  flex-wrap: nowrap;
+}
+[class*=flex-].stretch,
+[class^=flex].stretch {
+  align-items: stretch;
+}
+[class*=flex-].row,
+[class^=flex].row {
+  flex-direction: row;
+}
+[class*=flex-].row-reverse,
+[class^=flex].row-reverse {
+  flex-direction: "row-reverse";
+}
+[class*=flex-].column,
+[class^=flex].column {
+  flex-direction: column;
+}
+[class*=flex-].column-reverse,
+[class^=flex].column-reverse {
+  flex-direction: "column-reverse";
+}
+[class*=flex-].wrap,
+[class^=flex].wrap {
+  flex-wrap: wrap;
+}
+[class*=flex-].wrap-reverse,
+[class^=flex].wrap-reverse {
+  flex-wrap: "wrap-reverse";
+}
+
+.flex1 {
+  flex: 1;
+}
+
+.flex2 {
+  flex: 2;
+}
+
+.flex3 {
+  flex: 3;
+}
+
+.flex4 {
+  flex: 4;
+}
+
+/*============================= 文字溢出 =============================*/
+.text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.text-ellipsis-2 {
+  overflow: hidden;
+  white-space: normal;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  line-clamp: 1;
+  -webkit-line-clamp: 2;
+}
+.text-ellipsis-3 {
+  overflow: hidden;
+  white-space: normal;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  line-clamp: 1;
+  -webkit-line-clamp: 3;
+}
+.text-ellipsis-4 {
+  overflow: hidden;
+  white-space: normal;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  line-clamp: 1;
+  -webkit-line-clamp: 4;
+}
+
+/*# sourceMappingURL=uni.css.map */