From b966a7fa7fa90e35b9a3dbd7c7607eed79f49c09 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Mon, 29 Jul 2024 11:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E4=B8=8A=E7=BA=BF=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/nodata/nodata.vue | 38 ++++
config/api.js | 3 +-
config/request.js | 3 +-
config/site.config.js | 2 +-
pages/index/index - 副本.vue | 10 --
pages/index/index.vue | 16 --
pages/subPage/ballots/ballotsList/ballotsList.vue | 16 +-
pages/subPage/ballots/vote/comp/topInfo.vue | 1 +
pages/subPage/ballots/vote/vote.vue | 2 +-
pages/subPage/ballots/vote/voteReslut.vue | 6 +-
pages/subPage/login/login.vue | 27 ++-
pages/subPage/notice/notice.vue | 7 +-
.../subPage/privacyAgreement/privacyAgreement.vue | 6 +-
pages/tabbar/index/index.vue | 23 ++-
pages/tabbar/mine/mine.vue | 87 ++++++---
static/css/app.scss | 5 +-
static/images/bigImg/homebanner.png | Bin 646893 -> 0 bytes
static/images/bigImg/homebanner2.png | Bin 307047 -> 0 bytes
static/images/bigImg/homebanner3.png | Bin 106842 -> 0 bytes
static/images/bigImg/minebg.png | Bin 223252 -> 0 bytes
static/images/nodata.png | Bin 0 -> 27478 bytes
static/images/状态60-异常态-空状态.png | Bin 27478 -> 0 bytes
static/logo.png | Bin 4023 -> 0 bytes
store/index.js | 30 +++-
unpackage/dist/dev/mp-weixin/app.wxss | 4 +
unpackage/dist/dev/mp-weixin/common/assets.js | 16 +-
.../dist/dev/mp-weixin/components/nodata/nodata.js | 11 ++
.../dev/mp-weixin/components/nodata/nodata.json | 4 +
.../dev/mp-weixin/components/nodata/nodata.wxml | 1 +
.../dev/mp-weixin/components/nodata/nodata.wxss | 46 +++++
.../mp-weixin/components/searchRow/searchRow.js | 2 +-
unpackage/dist/dev/mp-weixin/config/api.js | 4 +-
unpackage/dist/dev/mp-weixin/config/request.js | 2 +-
.../subPage/ballots/ballotsList/ballotsList.js | 27 ++-
.../subPage/ballots/ballotsList/ballotsList.json | 4 +-
.../subPage/ballots/ballotsList/ballotsList.wxml | 2 +-
.../subPage/ballots/ballotsList/ballotsList.wxss | 2 +-
.../pages/subPage/ballots/vote/comp/topInfo.wxml | 2 +-
.../mp-weixin/pages/subPage/ballots/vote/vote.wxss | 2 +-
.../pages/subPage/ballots/vote/voteReslut.wxss | 2 +-
.../dev/mp-weixin/pages/subPage/login/login.js | 21 +--
.../dev/mp-weixin/pages/subPage/notice/notice.js | 23 ++-
.../dev/mp-weixin/pages/subPage/notice/notice.json | 2 +
.../dev/mp-weixin/pages/subPage/notice/notice.wxml | 2 +-
.../subPage/privacyAgreement/privacyAgreement.js | 123 +------------
.../dist/dev/mp-weixin/pages/tabbar/index/index.js | 22 ++-
.../dev/mp-weixin/pages/tabbar/index/index.wxml | 2 +-
.../dev/mp-weixin/pages/tabbar/index/index.wxss | 5 +-
.../dist/dev/mp-weixin/pages/tabbar/mine/mine.js | 53 +++---
.../dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml | 2 +-
.../dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss | 8 +-
unpackage/dist/dev/mp-weixin/static/css/app.scss | 5 +-
.../dist/dev/mp-weixin/static/images/nodata.png | Bin 0 -> 27478 bytes
.../static/images/状态60-异常态-空状态.png | Bin 27478 -> 0 bytes
unpackage/dist/dev/mp-weixin/static/logo.png | Bin 4023 -> 0 bytes
unpackage/dist/dev/mp-weixin/store/index.js | 30 +++-
.../uview-plus/components/u-line/props.js | 37 ++++
.../uview-plus/components/u-line/u-line.js | 133 ++++++++++++++
.../uview-plus/components/u-line/u-line.json | 4 +
.../uview-plus/components/u-line/u-line.wxml | 1 +
.../uview-plus/components/u-line/u-line.wxss | 44 +++++
.../uview-plus/components/u-loading-icon/props.js | 63 +++++++
.../components/u-loading-icon/u-loading-icon.js | 200 +++++++++++++++++++++
.../components/u-loading-icon/u-loading-icon.json | 4 +
.../components/u-loading-icon/u-loading-icon.wxml | 1 +
.../components/u-loading-icon/u-loading-icon.wxss | 173 ++++++++++++++++++
.../uview-plus/components/u-loadmore/props.js | 98 ++++++++++
.../uview-plus/components/u-loadmore/u-loadmore.js | 198 ++++++++++++++++++++
.../components/u-loadmore/u-loadmore.json | 7 +
.../components/u-loadmore/u-loadmore.wxml | 1 +
.../components/u-loadmore/u-loadmore.wxss | 70 ++++++++
.../uview-plus/libs/function/colorGradient.js | 1 +
72 files changed, 1433 insertions(+), 313 deletions(-)
create mode 100644 components/nodata/nodata.vue
delete mode 100644 pages/index/index - 副本.vue
delete mode 100644 pages/index/index.vue
delete mode 100644 static/images/bigImg/homebanner.png
delete mode 100644 static/images/bigImg/homebanner2.png
delete mode 100644 static/images/bigImg/homebanner3.png
delete mode 100644 static/images/bigImg/minebg.png
create mode 100644 static/images/nodata.png
delete mode 100644 static/images/状态60-异常态-空状态.png
delete mode 100644 static/logo.png
create mode 100644 unpackage/dist/dev/mp-weixin/components/nodata/nodata.js
create mode 100644 unpackage/dist/dev/mp-weixin/components/nodata/nodata.json
create mode 100644 unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/static/images/nodata.png
delete mode 100644 unpackage/dist/dev/mp-weixin/static/images/状态60-异常态-空状态.png
delete mode 100644 unpackage/dist/dev/mp-weixin/static/logo.png
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/props.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.json
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/props.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.json
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.wxss
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/props.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.js
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.json
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.wxml
create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.wxss
diff --git a/components/nodata/nodata.vue b/components/nodata/nodata.vue
new file mode 100644
index 0000000..68534fd
--- /dev/null
+++ b/components/nodata/nodata.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/api.js b/config/api.js
index 5a5df9f..1249a52 100644
--- a/config/api.js
+++ b/config/api.js
@@ -12,7 +12,8 @@ export const loginSMS = (data) => http.post('member/auth/sms-login', data, { cus
// 用户协议和隐私协议
export const getAgreement = (params={}) => http.get('app/student-record/getAgreement', {params})
// 获取个人信息
-export const getUserInfo = (data) => http.post('member/user/get', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
+// export const getUserInfo = (data) => http.post('face/user_info', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
+export const getUserInfo = (data) => http.post('face/user_info',)
// 退出登录
export const logOut = (data={}) => http.post('member/auth/logout', data, {custom: {catch: true, toast: false }})
diff --git a/config/request.js b/config/request.js
index d2c1bee..9e658d5 100644
--- a/config/request.js
+++ b/config/request.js
@@ -38,7 +38,8 @@ let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
config.header['Signature'] = hash
config.data = jsonString
- let token = counterStore.token
+ let token = uni.getStorageSync('token')
+
if(token) {
config.header.Authorization = 'Bearer ' + token
}
diff --git a/config/site.config.js b/config/site.config.js
index 967a0c6..434c4d1 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -16,6 +16,6 @@ let obj = {
};
export default obj
-// http://123.6.232.1:8099/测试地址
+// http://192.168.1.106:8518/测试地址
// http://192.168.1.43:8318/本地地址
//http://www.lyjppt.com/正式地址
diff --git a/pages/index/index - 副本.vue b/pages/index/index - 副本.vue
deleted file mode 100644
index ae206ad..0000000
--- a/pages/index/index - 副本.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
deleted file mode 100644
index 3b2f5c0..0000000
--- a/pages/index/index.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 题库
-
-
-
-
\ No newline at end of file
diff --git a/pages/subPage/ballots/ballotsList/ballotsList.vue b/pages/subPage/ballots/ballotsList/ballotsList.vue
index 950cb88..297c5ee 100644
--- a/pages/subPage/ballots/ballotsList/ballotsList.vue
+++ b/pages/subPage/ballots/ballotsList/ballotsList.vue
@@ -27,6 +27,10 @@
+
+
+
+ 暂无投票信息~
@@ -36,10 +40,11 @@
import {
onLoad,
onPullDownRefresh,
+ onReachBottom
} from '@dcloudio/uni-app'
import { reactive, ref } from 'vue';
import { votePage, mineVotePage } from '@/config/api.js'
-
+ let status = ref('loading')
const tabArr = reactive([
{ name: '投票列表', id: 0 },
{ name: '我的投票', id: 1 },
@@ -93,6 +98,7 @@
}
voteList.value.push(...res.list)
total.value = res.total
+ if(voteList.value.length>=total.value) status.value = 'nomore'
console.log(voteList.value)
}
votePageFn()
@@ -107,6 +113,12 @@
await initList()
uni.stopPullDownRefresh()
})
+
+ onReachBottom(()=>{
+ if(total.value > voteList.value.length) {
+ votePageFn()
+ }
+ })