diff --git a/pages/home/home.js b/pages/home/home.js index b3bb9db..772580b 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -7,19 +7,28 @@ import { import { getSearchRecList } from '~/services/home/getSearchRecList'; +import { + TableDataList +} from '~/services/home/getTableDataList'; +import { + getProductsInvolvedList +} from '~/services/table-data/getProductsInvolvedList'; import Toast from 'tdesign-miniprogram/toast/index'; Page({ data: { imgSrcs: [], - tabList: [{ - text: "精选推荐", - key: 0, - categoryGuid: 1, - }], - hotCategoryList: [], + tableDataList: [], noticeList: [], popularWords: [], + params: { + pageSize: 10, + pageNum: 1, + isLastUpdate: true, + search: "", + type: 0, + order: "default" + }, pageLoading: false, current: 0, autoplay: true, @@ -34,20 +43,8 @@ Page({ categoryGuid: 0, loadMoreStatus: 0, product: { - value: 'all', - options: [{ - value: 'all', - label: '全部产品', - }, - { - value: 'new', - label: '最新产品', - }, - { - value: 'hot', - label: '最火产品', - }, - ], + value: '0', + options: [], }, sorter: { value: 'default', @@ -56,15 +53,27 @@ Page({ label: '默认排序', }, { - value: 'price', + value: 'date-down', + label: '日期降序', + }, + { + value: 'date-up', + label: '日期升序', + }, + { + value: 'price-up', label: '价格从高到低', }, + { + value: 'price-down', + label: '价格从低到高', + }, ], }, }, page: { - size: 20, + size: 10, num: 1, }, privateData: { @@ -81,7 +90,7 @@ Page({ // 划到底部触发 onReachBottom() { - this.getEmocticonLastData() + this.getTableDataList() }, onPullDownRefresh() { @@ -99,8 +108,9 @@ Page({ pageLoading: true, }); + this.getTableDataList(false, "") + this.getProductsInvolvedListFun() // this.getBanner() - // this.getRec() // this.getNotice() }, @@ -116,38 +126,63 @@ Page({ }); }, - getRec() { - // 获取搜索推荐 - getSearchRecList().then((res) => { + // 获取涉及产品类别 + getProductsInvolvedListFun() { + getProductsInvolvedList().then((res) => { if (res.code == 200) { - this.setData({ - popularWords: res.data, - pageLoading: false + res.data.unshift({ + value: '0', + label: '全部类别', }); - } else {} + this.setData({ + "product.value": "0", + "product.options": res.data, + }); + console.log(this.data); + } }); }, // 获取列表 - getEmocticonLastData() { - const params = { - pageSize: this.page.size, - pageNum: this.page.num, - isLastUpdate: true - }; + getTableDataList(isInit = false) { + if (isInit) { + this.page.num = 1 + } + else{ + this.setData({ + "params.pageSize": this.page.size, + "params.pageNum": this.page.num + }) + } + // const params = { + // pageSize: this.page.size, + // pageNum: this.page.num, + // isLastUpdate: true, + // search, + // type, + // order + // }; this.setData({ loadMoreStatus: 1, }); - // 获取最近更新表情包列表 - getEmoticonDataList(params).then((res) => { + TableDataList(this.data.params).then((res) => { if (res.code == 200) { - this.page.num++; - - this.setData({ - lastUpdatedList: this.data.lastUpdatedList.concat(res.data.result), - loadMoreStatus: 0 - }); + if (!isInit) { + this.page.num++; + this.setData({ + tableDataList: this.data.tableDataList.concat(res.data.result), + loadMoreStatus: 0, + pageLoading: false + }); + } else { + this.setData({ + tableDataList: res.data.result, + loadMoreStatus: 0, + pageLoading: false + }); + } + console.log(this.data); } else {} }); }, @@ -170,28 +205,53 @@ Page({ }); }, - - // 点击搜索推荐 - handleRecTap(e) { - const { - dataset - } = e.currentTarget; - const _searchValue = dataset?.value; - if (_searchValue) { - wx.navigateTo({ - url: `/pages/emoticon/result/index?searchValue=${_searchValue}`, - }); - } - }, - gotoDetail(e) { const { dataset } = e.currentTarget; - const id = dataset?.value; + const id = dataset?.id; wx.navigateTo({ url: `/pages/table-data/index?id=${id}`, }); - } + }, + + // 搜索 + search(e) { + this.setData({ + "params.search" : e.detail.value + }) + this.getTableDataList(true); + }, + + onChange(e) { + this.setData({ + 'product.value': e.detail.value, + }); + if(e.detail.value == 0){ + this.init() + } + else{ + this.setData({ + "params.type" : e.detail.value + }) + this.getTableDataList(true); + } + }, + + + onChangeOrder(e) { + // this.setData({ + // 'product.value': e.detail.value, + // }); + if(e.detail.value == 0){ + this.init() + } + else{ + this.setData({ + "params.order" : e.detail.value + }) + this.getTableDataList(true); + } + }, }); \ No newline at end of file diff --git a/pages/home/home.wxml b/pages/home/home.wxml index 7fd006d..32b2ab1 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -21,8 +21,8 @@ --> - - + + @@ -32,28 +32,28 @@ - + - + - 渤银理财理财分销对接代销系统采购项目 + {{item.tableDataProcurementContent}} 中标价格： - + 价格待定 - 2023-11-18 + {{item.tableDataDate}} - - 2023-12-20 + {{item.tableDataDeadline}} - 房产 + {{item}} - 查看详情 + diff --git a/pages/home/home.wxss b/pages/home/home.wxss index 7263c95..09bc03e 100644 --- a/pages/home/home.wxss +++ b/pages/home/home.wxss @@ -182,6 +182,7 @@ page { border-radius: 20rpx; padding-top: 30rpx; padding-bottom: 20rpx; + margin-bottom: 40rpx; } .table-data-list-item{ diff --git a/pages/table-data/index.js b/pages/table-data/index.js index d6e5d7b..39eaffe 100644 --- a/pages/table-data/index.js +++ b/pages/table-data/index.js @@ -1,3 +1,13 @@ +import { + getTableDataDetails +} from '~/services/table-data/getTableDataDetails'; +import { + follow +} from '~/services/table-data/follow'; +import { + cancelfollow +} from '~/services/table-data/cancelfollow'; + // pages/table-data/index.js Page({ @@ -5,14 +15,90 @@ Page({ * 页面的初始数据 */ data: { - + tableDataId: 0, + tableDataDetail: {} }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + this.setData({ + tableDataId:options.id + }) + this.init() + // console.log(options.id); + }, + init() { + this.details() + }, + + details() { + let params = { + tableDataId: this.data.tableDataId + } + + getTableDataDetails(params).then((res) => { + if (res.code == 200) { + this.setData({ + tableDataDetail: res.data, + }); + console.log(this.data); + } else {} + }); + }, + + + toSubcribe() { + wx.navigateTo({ + url: `/pages/usercenter/subscribe/index`, + }); + }, + + toLink() { + var that = this; + wx.setClipboardData({ + data: that.data.tableDataDetail.tableDataLink, + success(res) { + wx.showToast({ + title: '复制成功', + }) + } + }) + }, + + // 关注 + followFun() { + let params = { + tableDataGuid: this.data.tableDataDetail.tableDataGuid + } + follow(params).then((res) => { + if (res.code == 200) { + wx.showToast({ + title: res.data, + }) + setTimeout(() => { + this.init() + }, 1000); + } else {} + }); + }, + + cancelFollow() { + let params = { + tableDataGuid: this.data.tableDataDetail.tableDataGuid + } + cancelfollow(params).then((res) => { + if (res.code == 200) { + wx.showToast({ + title: res.data, + }) + setTimeout(() => { + this.init() + }, 1000); + } else {} + }); }, /** diff --git a/pages/table-data/index.wxml b/pages/table-data/index.wxml index d9d659a..e21cd61 100644 --- a/pages/table-data/index.wxml +++ b/pages/table-data/index.wxml @@ -3,7 +3,7 @@ - 渤银理财理财分销对接代销系统采购项目 + {{tableDataDetail.tableDataProcurementContent}} - 我感兴趣 + 我感兴趣 + 取消关注 \ No newline at end of file diff --git a/pages/table-data/index.wxss b/pages/table-data/index.wxss index efc63c7..25c2076 100644 --- a/pages/table-data/index.wxss +++ b/pages/table-data/index.wxss @@ -68,4 +68,5 @@ .btn{ width: 100%; + margin-top: 30rpx; } \ No newline at end of file diff --git a/pages/usercenter/subscribe/index.js b/pages/usercenter/subscribe/index.js index efdff15..48d2c15 100644 --- a/pages/usercenter/subscribe/index.js +++ b/pages/usercenter/subscribe/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - + }, /** diff --git a/services/emoticon/index.js b/services/emoticon/index.js deleted file mode 100644 index 223853f..0000000 --- a/services/emoticon/index.js +++ /dev/null @@ -1,52 +0,0 @@ -import { - request -} from '../_utils/request'; - -/** 获取热门表情包分类列表 */ -export function getHotEmotionCategoryList() { - return new Promise((resolve, reject) => { - request({ - url: `EmotionCategoryApi/getHotEmotionCategoryList`, - method: 'GET', - success: function (res) { - resolve(res); - }, - fail: function (error) { - reject(error); - } - }); - }); -} - -/** 获取表情包分类列表 */ -export function getEmotionCategoryList() { - return new Promise((resolve, reject) => { - request({ - url: `EmotionCategoryApi/getEmotionCategoryList`, - method: 'GET', - success: function (res) { - resolve(res); - }, - fail: function (error) { - reject(error); - } - }); - }); -} - -/** 获取表情包列表 */ -export function getEmoticonDataList(parm) { - return new Promise((resolve, reject) => { - request({ - url: `EmoticonDataApi/getEmoticonDataList`, - method: 'GET', - data: parm, - success: function (res) { - resolve(res); - }, - fail: function (error) { - reject(error); - } - }); - }); -} \ No newline at end of file diff --git a/services/home/getTableDataList.js b/services/home/getTableDataList.js new file mode 100644 index 0000000..08b5bc8 --- /dev/null +++ b/services/home/getTableDataList.js @@ -0,0 +1,20 @@ +import { + request +} from '../_utils/request'; + +/** 获取列表 */ +export function TableDataList(parm) { + return new Promise((resolve, reject) => { + request({ + url: `TableDataApi/getTableDataList`, + method: 'GET', + data: parm, + success: function (res) { + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/login/login.js b/services/login/login.js index 576f0e6..19b2c17 100644 --- a/services/login/login.js +++ b/services/login/login.js @@ -14,8 +14,8 @@ export function login(data) { method: 'POST', data: data, success: async function (res) { - setStorage('userInfo', res.data.user, 86400); - setStorage('Authorization', res.data.jwt, 86400); + setStorage('userInfo', res.data.user, 2592000); + setStorage('Authorization', res.data.jwt, 2592000); // const pages = getCurrentPages(); //获取小程序页面栈 // const beforePage = pages[pages.length - 1]; //获取上个页面的实例对象 -3是上上一个页面 // wx.navigateBack({ diff --git a/services/table-data/cancelfollow.js b/services/table-data/cancelfollow.js new file mode 100644 index 0000000..a35793b --- /dev/null +++ b/services/table-data/cancelfollow.js @@ -0,0 +1,20 @@ +import { + request +} from '../_utils/request'; + +/** 取消关注表格数据 */ +export function cancelfollow(parm) { + return new Promise((resolve, reject) => { + request({ + url: `TableDataApi/cancelfollow`, + method: 'POST', + data: parm, + success: function (res) { + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/table-data/follow.js b/services/table-data/follow.js new file mode 100644 index 0000000..0559ce0 --- /dev/null +++ b/services/table-data/follow.js @@ -0,0 +1,20 @@ +import { + request +} from '../_utils/request'; + +/** 关注表格数据 */ +export function follow(parm) { + return new Promise((resolve, reject) => { + request({ + url: `TableDataApi/follow`, + method: 'POST', + data: parm, + success: function (res) { + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/table-data/getProductsInvolvedList.js b/services/table-data/getProductsInvolvedList.js new file mode 100644 index 0000000..3d8cd52 --- /dev/null +++ b/services/table-data/getProductsInvolvedList.js @@ -0,0 +1,20 @@ +import { + request +} from '../_utils/request'; + +/** 获取涉及产品列表 */ +export function getProductsInvolvedList(parm) { + return new Promise((resolve, reject) => { + request({ + url: `TableDataApi/getProductsInvolvedList`, + method: 'GET', + data: parm, + success: function (res) { + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/table-data/getTableDataDetails.js b/services/table-data/getTableDataDetails.js new file mode 100644 index 0000000..aa512ed --- /dev/null +++ b/services/table-data/getTableDataDetails.js @@ -0,0 +1,20 @@ +import { + request +} from '../_utils/request'; + +/** 获取详情 */ +export function getTableDataDetails(parm) { + return new Promise((resolve, reject) => { + request({ + url: `TableDataApi/getTableDataDetails`, + method: 'GET', + data: parm, + success: function (res) { + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file