diff --git a/src/api/index.ts b/src/api/index.ts
index 3108710..af2db7c 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -25,10 +25,19 @@ export function bannerInfo(id:string) {
}
//活动列表
-export function activityList(page: string,limit: string) {
+export function activityList(data:any) {
return request.http({
- url: '/api/huiqitong/activity_list?page='+page+'&limit='+limit,
- method: 'GET'
+ url: '/api/huiqitong/activity_list',
+ method: 'GET',
+ data
+ })
+}
+
+//活动详情
+export function activityInfo(id:string) {
+ return request.http({
+ url: '/api/huiqitong/activity_info/'+id,
+ method: 'GET',
})
}
diff --git a/src/api/memberCenter.ts b/src/api/memberCenter.ts
new file mode 100644
index 0000000..30e68fe
--- /dev/null
+++ b/src/api/memberCenter.ts
@@ -0,0 +1,45 @@
+import { request } from '@/utils/http'
+
+//标签列表
+export function memberTagList() {
+ return request.http({
+ url: '/api/huiqitong/member_tag_list',
+ method: 'GET'
+ })
+}
+
+//会员列表
+export function memberCenter(data:any) {
+ return request.http({
+ url: '/api/huiqitong/member_center',
+ method: 'GET',
+ data
+ })
+}
+
+//会员详情
+export function memberCenterInfo(id: string) {
+ return request.http({
+ url: '/api/huiqitong/member_center_info/'+id,
+ method: 'GET'
+ })
+}
+
+//入会申请
+export function memberApply(data:any) {
+ return request.http({
+ url: '/api/huiqitong/member_apply',
+ method: 'POST',
+ data
+ })
+}
+
+//我的入会申请
+export function myMemberApply() {
+ return request.http({
+ url: '/api/huiqitong/my_member_apply',
+ method: 'POST',
+ })
+}
+
+
diff --git a/src/pages.json b/src/pages.json
index 598c96a..a77e237 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -166,6 +166,20 @@
{
"navigationBarTitleText" : "信息完善"
}
+ },
+ {
+ "path" : "pages/index/active/activelist",
+ "style" :
+ {
+ "navigationBarTitleText" : "更多活动"
+ }
+ },
+ {
+ "path" : "pages/index/active/activeDetail",
+ "style" :
+ {
+ "navigationBarTitleText" : "活动详情"
+ }
}
],
"permission": {
diff --git a/src/pages/index/active/activeDetail.vue b/src/pages/index/active/activeDetail.vue
new file mode 100644
index 0000000..0f4f394
--- /dev/null
+++ b/src/pages/index/active/activeDetail.vue
@@ -0,0 +1,158 @@
+
+
+
+ {{detaildata.title}}
+ 活动地点：{{detaildata.address}}
+
+ 活动时间：{{detaildata.activity_time}}
+
+ 阅读量：
+
+ {{detaildata.count}}
+
+
+
+
+
+ 活动详情
+
+
+ {{detaildata.create_time}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/active/activelist.vue b/src/pages/index/active/activelist.vue
new file mode 100644
index 0000000..c06ac09
--- /dev/null
+++ b/src/pages/index/active/activelist.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.activity_time}}
+
+
+
+
+ {{item.address}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e61e10f..8798a81 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,7 +3,8 @@
@leftClick="leftClick">
-
+
-
+
+
要活动
-
+
更多活动 >
-
+
@@ -45,7 +47,7 @@
小店帮
-
+
开店帮
@@ -90,7 +92,7 @@
推荐会员
-
+
更多会员 >
@@ -98,16 +100,18 @@
-
+
-
+
{{item.name}}
-
+
+ {{item.member_tag_title}}
+
- {{item.company}}
+ {{item.enterprise?item.enterprise[0].title:'无'}}
@@ -117,7 +121,7 @@
-
+
diff --git a/src/pages/index/tabsComm.vue b/src/pages/index/tabsComm.vue
index 0a43af7..03e3cf9 100644
--- a/src/pages/index/tabsComm.vue
+++ b/src/pages/index/tabsComm.vue
@@ -22,7 +22,7 @@
:class="{ 'active': activeTab === tab.id }"
@click="handleTabSelect(tab.id)"
>
- {{ tab.label }}
+ {{ tab.title.slice(0,2) }}
@@ -33,7 +33,7 @@
@click.stop="show=true"
>
更多 {{ dropdownVisible ? '▲' : '▼' }}
-
+
diff --git a/src/pages/memberCenter/index.vue b/src/pages/memberCenter/index.vue
index 142e4b8..9f9d079 100644
--- a/src/pages/memberCenter/index.vue
+++ b/src/pages/memberCenter/index.vue
@@ -1,31 +1,34 @@
-
-
-
+
+
-
+
-
-
+
+
-
+
{{item.name}}
-
+
+ {{item.member_tag_title}}
+
- {{item.company}}
+ {{item.enterprise?item.enterprise[0].title:'无'}}
-
+
@@ -36,78 +39,123 @@
ref
} from 'vue';
import tabsComm from '../index/tabsComm.vue'
+ import {
+ memberTagList,
+ memberCenter
+ } from '@/api/memberCenter'
+
+ const baseurl = ref(import.meta.env.VITE_APP_BASE_URL + '/')
// 响应式数据
const keyword = ref('');
+ const page = ref(1)
+ const pagesize = ref(6)
- const search = (val) => {
- console.log(val);
+ const search = async (val) => {
+ page.value = 1
+ pagesize.value = 6
+ await getMemberCenter(currentTab.value.id, keyword.value, page.value, pagesize.value)
}
- const clickIcon = () => {
- console.log(keyword.value);
+ const clickIcon = async () => {
+ page.value = 1
+ pagesize.value = 6
+ await getMemberCenter(currentTab.value.id, keyword.value, page.value, pagesize.value)
}
- const hyList = ref([{
- img: '/static/img/Frame.png',
- name: '韩梅梅',
- company: '内蒙古数心法律资讯事务所'
- },
- {
- img: '/static/img/Frame.png',
- name: '韩梅梅',
- company: '内蒙古数心法律资讯事务所'
- }
- ])
+ const clear = async () => {
+ page.value = 1
+ pagesize.value = 6
+ await getMemberCenter(currentTab.value.id, keyword.value, page.value, pagesize.value)
+ }
+
+ const hyList = ref([])
const currentTab = ref('全部');
// 选项卡配置（第一个必须是"全部"）
- const filterTabs = reactive([{
- id: 0,
- name: '全部'
- },
- {
- id: 1,
- name: '法律'
- },
- {
- id: 2,
- name: '媒体'
- }
- ]);
-
+ const filterTabs = ref([{
+ id: 0,
+ title: '全部'
+ }]);
+
const leftClick = () => {
- uni.navigateTo({
- url: '/pages/memberCenter/inpart'
- })
+ if (uni.getStorageSync('access_token') === '') {
+ uni.showToast({
+ title: '请登录',
+ icon: 'fail'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/memberCenter/inpart'
+ })
+ }
}
// 处理选项卡选择
- const handleTabSelect = (tab) => {
+ const handleTabSelect = async (tab) => {
+ page.value = 1
+ pagesize.value = 6
currentTab.value = tab;
// 这里可以添加数据加载逻辑
- console.log('选择tab:', tab);
+ await getMemberCenter(tab.id, '', page.value, pagesize.value)
};
const godetail = (id) => {
uni.navigateTo({
- url: '/pages/index/shoppage/mediaDetail?id='+id
+ url: '/pages/index/shoppage/mediaDetail?id=' + id
})
}
- onMounted(() => {
+ const getbqlist = async () => {
+ filterTabs.value = [{
+ id: 0,
+ title: '全部'
+ }]
+ await memberTagList().then((res) => {
+ filterTabs.value = [...filterTabs.value, ...res.data]
+ console.log(res.data);
+ })
+ }
+ const getMemberCenter = async (id, name, page, limit) => {
+ let params = {
+ 'member_tag_id': id,
+ 'name': name,
+ 'page': page,
+ 'limit': limit
+ }
+ await memberCenter(params).then((res) => {
+ hyList.value = res.data.data
+ })
+ }
+
+ const onloadmore = async () => {
+ page.value++
+ let params = {
+ 'member_tag_id': currentTab.value.id,
+ 'name': keyword.value,
+ 'page': page.value,
+ 'limit': pagesize.value
+ }
+ await memberCenter(params).then((res) => {
+ hyList.value = [...hyList.value, ...res.data.data]
+ })
+ }
+
+ onShow(async () => {
+ await getbqlist()
+ await getMemberCenter('', '', page.value, pagesize.value)
})