diff --git a/app.json b/app.json index 4ca298e..d718c34 100644 --- a/app.json +++ b/app.json @@ -25,7 +25,9 @@ "pages/workBench/index", "pages/webPage/index", "pages/aid/finance/index", - "pages/aid/law/index" + "pages/aid/law/index", + "pages/aid/detail/index", + "pages/aid/consult/index" ], "subPackages": [ { diff --git a/components/aid/index.js b/components/aid/index.js index 5a36049..63e0888 100644 --- a/components/aid/index.js +++ b/components/aid/index.js @@ -1,3 +1,9 @@ +import { getAidList } from "../../service/system"; +import { alertInfo, alertSuccess } from "../../utils/index"; +import request from '../../utils/request' + +const { OK } = request; + // components/aid/index.js Component({ @@ -5,20 +11,68 @@ Component({ * 组件的属性列表 */ properties: { - + type: Number, + bannerType: Number, + + }, + lifetimes: { + attached() { + this.init(); + } }, - /** * 组件的初始数据 */ data: { - + park: {}, + list: [], + total: 0, + page: 1, + size: 20, + }, + lifetimes: { + attached() { + this.init() + } }, - /** * 组件的方法列表 */ methods: { - + async init() { + const { type, page, size } = this.data; + const { code, message, data = [], total } = await getAidList(page, size, type); + console.log('data', data) + if (code !== OK) { + alertInfo(message) + return + } + this.setData({ + list: data, + total + }, () => { + console.log("this.data", this.data) + }) + }, + onRefresh() { + const that = this; + this.setData({ + page: 1, + }, () => { + that.init(); + }) + }, + jumpToDetail(e) { + const { id = "" } = e.currentTarget.dataset; + const { type } = this.data; + wx.navigateTo({ + url: `/pages/aid/detail/index?id=${id}&type=${type}`, + }) + }, + consult() { + wx.navigateTo({ + url: `/pages/aid/consult/index?id=${this.data.type}`, + }) + } } }) \ No newline at end of file diff --git a/components/aid/index.json b/components/aid/index.json index e8cfaaf..ba9c8eb 100644 --- a/components/aid/index.json +++ b/components/aid/index.json @@ -1,4 +1,9 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "Banner": "/components/banner/index", + "van-image": "@vant/weapp/image/index", + "empty": "/components/empty/index", + "van-icon": "@vant/weapp/icon/index" + } } \ No newline at end of file diff --git a/components/aid/index.wxml b/components/aid/index.wxml index 29fc280..6b0b643 100644 --- a/components/aid/index.wxml +++ b/components/aid/index.wxml @@ -1,2 +1,29 @@ -components/aid/index.wxml \ No newline at end of file + +
行业精英
+ + + + + + + + {{ item.name }} + {{ item.level }} + + {{item.synopsis}}{{item.synopsis}} {{item.synopsis}} + + + 在线咨询 + + + + + + + \ No newline at end of file diff --git a/components/aid/index.wxss b/components/aid/index.wxss index dbf7339..a2aa762 100644 --- a/components/aid/index.wxss +++ b/components/aid/index.wxss @@ -1 +1,44 @@ -/* components/aid/index.wxss */ \ No newline at end of file +/* components/aid/index.wxss */ + +.title { + padding-top: 30rpx; + padding-left: 30rpx; + display: flex; +} + +.userInfoItem { + padding: 30rpx; +} + +.userInfoItem .content { + display: flex; + align-items: center; + border-bottom: 1rpx solid #ccc; +} + +.userInfo { + height: 200rpx; + margin-left: 30rpx; + flex: 1; +} + +.userLevel { + margin-left: 30rpx; + font-weight: 600; +} + +.synopsis { + height: 80rpx; + overflow: hidden; + margin-top: 20rpx; + margin-bottom: 10rpx; + font-size: 32rpx; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} + +.connect { + display: flex; + justify-content: flex-end; +} \ No newline at end of file diff --git a/pages/home/components/home-swiper/index.js b/components/banner/index.js similarity index 70% rename from pages/home/components/home-swiper/index.js rename to components/banner/index.js index 2a4734e..af12535 100644 --- a/pages/home/components/home-swiper/index.js +++ b/components/banner/index.js @@ -1,6 +1,6 @@ -import { getBannerList } from "../../../../service/system" -import { alertInfo } from "../../../../utils/index"; -import request from '../../../../utils/request' +import { getBannerList } from "../../service/system" +import { alertInfo } from "../../utils/index"; +import request from '../../utils/request' const { OK } = request; @@ -12,10 +12,14 @@ Component({ */ properties: { park: String, + type: Number, }, observers: { - 'park': function(newValue) { - this.init(newValue) + 'park,type': function(newPark, newType) { + if ((!newPark && newType === 0) || (!newType && newType !== 0)) { + return + } + this.init(newPark, newType) } }, /** @@ -33,11 +37,11 @@ Component({ * 组件的方法列表 */ methods: { - async init(park) { - const { code, message, data = [] } = await getBannerList(park, 1); + async init(park, type) { + const { code, message, data = [] } = await getBannerList(park, type); if (code !== OK) { alertInfo(message); - this.setData({ list: [] }) + this.setData({ list: [], park, type }) return } this.setData({ list: data }) @@ -47,7 +51,7 @@ Component({ switch(data.jumpType) { case 1: wx.navigateToMiniProgram({ - appId: data.appId, + appId: data.appid, path: data.wxPath, envVersion: "trial" }) diff --git a/pages/home/components/home-swiper/index.json b/components/banner/index.json similarity index 100% rename from pages/home/components/home-swiper/index.json rename to components/banner/index.json diff --git a/pages/home/components/home-swiper/index.wxml b/components/banner/index.wxml similarity index 85% rename from pages/home/components/home-swiper/index.wxml rename to components/banner/index.wxml index 57b0830..cd88901 100644 --- a/pages/home/components/home-swiper/index.wxml +++ b/components/banner/index.wxml @@ -5,8 +5,9 @@ interval="{{interval}}" duration="{{duration}}" wx:if="{{list.length}}" + style="height: 288rpx" > - + + + + + + + + + + + + + + + 取消编辑 + 保存 + \ No newline at end of file diff --git a/pages/aid/consult/index.wxss b/pages/aid/consult/index.wxss new file mode 100644 index 0000000..eb6977e --- /dev/null +++ b/pages/aid/consult/index.wxss @@ -0,0 +1,8 @@ +/* pages/aid/consult/index.wxss */ + +.submit { + margin: 32rpx; + margin-bottom: 50rpx; + display: flex; + align-items: center; + } \ No newline at end of file diff --git a/pages/aid/detail/index.js b/pages/aid/detail/index.js new file mode 100644 index 0000000..00a1804 --- /dev/null +++ b/pages/aid/detail/index.js @@ -0,0 +1,87 @@ +import { getAidDetail } from "../../../service/system"; +import { alertInfo } from "../../../utils/index"; +import request from "../../../utils/request" +const { OK } = request; +// pages/aid/detail/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + detail: {}, + id: "", + type: undefined, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const that = this; + const { type, id } = options; + this.setData({ type, id }, () => { + that.init(); + }) + + }, + async init() { + const { id, type } = this.data; + const { code, message, data = {} } = await getAidDetail(id); + if (code !== OK) { + alertInfo(message) + return; + } + this.setData({ + detail: data + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/aid/detail/index.json b/pages/aid/detail/index.json new file mode 100644 index 0000000..1aed5dd --- /dev/null +++ b/pages/aid/detail/index.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "aid": "/components/aid/index", + "navigator": "/components/navigator/index", + "mp-html": "/components/mp-html/index", + "van-field": "@vant/weapp/field/index" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/aid/detail/index.wxml b/pages/aid/detail/index.wxml new file mode 100644 index 0000000..e4b2a5c --- /dev/null +++ b/pages/aid/detail/index.wxml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/aid/detail/index.wxss b/pages/aid/detail/index.wxss new file mode 100644 index 0000000..15a2e8e --- /dev/null +++ b/pages/aid/detail/index.wxss @@ -0,0 +1 @@ +/* pages/aid/detail/index.wxss */ \ No newline at end of file diff --git a/pages/aid/finance/index.json b/pages/aid/finance/index.json index 8835af0..1b14537 100644 --- a/pages/aid/finance/index.json +++ b/pages/aid/finance/index.json @@ -1,3 +1,7 @@ { - "usingComponents": {} + "usingComponents": { + "aid": "/components/aid/index", + "navigator": "/components/navigator/index" + }, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/aid/finance/index.wxml b/pages/aid/finance/index.wxml index 4b299fb..4090685 100644 --- a/pages/aid/finance/index.wxml +++ b/pages/aid/finance/index.wxml @@ -1,2 +1,3 @@ -pages/aid/finance/index.wxml \ No newline at end of file + + \ No newline at end of file diff --git a/pages/aid/law/index.json b/pages/aid/law/index.json index 8835af0..1b14537 100644 --- a/pages/aid/law/index.json +++ b/pages/aid/law/index.json @@ -1,3 +1,7 @@ { - "usingComponents": {} + "usingComponents": { + "aid": "/components/aid/index", + "navigator": "/components/navigator/index" + }, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/aid/law/index.wxml b/pages/aid/law/index.wxml index 763c442..d92f32c 100644 --- a/pages/aid/law/index.wxml +++ b/pages/aid/law/index.wxml @@ -1,2 +1,3 @@ -pages/aid/law/index.wxml \ No newline at end of file + + \ No newline at end of file diff --git a/pages/home/index.json b/pages/home/index.json index df853ba..7033ddc 100644 --- a/pages/home/index.json +++ b/pages/home/index.json @@ -10,7 +10,7 @@ "van-grid": "@vant/weapp/grid/index", "van-grid-item": "@vant/weapp/grid-item/index", "van-action-sheet": "@vant/weapp/action-sheet/index", - "home-swiper": "./components/home-swiper/index" + "banner": "/components/banner/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/home/index.wxml b/pages/home/index.wxml index d432c53..a081e7b 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -33,7 +33,7 @@ - + diff --git a/project.private.config.json b/project.private.config.json index f341ec3..ee87624 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -10,6 +10,20 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/aid/consult/index", + "pathName": "pages/aid/consult/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "pages/aid/law/index", + "pathName": "pages/aid/law/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "pages/my/index", "pathName": "pages/my/index", diff --git a/service/system.js b/service/system.js index a268001..cec3fd1 100644 --- a/service/system.js +++ b/service/system.js @@ -51,7 +51,17 @@ export const getEncyclopediaDetail = async function(id) { return await GET(`/wx/getEncyclopediaDetail/${id}`); } -// 获取分类列表 +// 获取banner列表 export const getBannerList = async function(park = "", address = "") { return await GET(`/wx/getBannerList?park=${park}&address=${address}`); +} + +// 获取财务/律师援助列表 +export const getAidList = async function(page = 1, size = 10, type = 0) { + return await GET(`/aid/getList?page=${page}&size=${size}&type=${type}`); +} + +// 获取财务/律师援助详情 +export const getAidDetail = async function(id) { + return await GET(`/aid/detail/${id}`); } \ No newline at end of file