From 6af35a46320a8e3e4f482c28c5279c0e27319681 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Tue, 26 Nov 2024 17:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E9=A6=96=E9=A1=B5=E6=94=B9?= =?UTF-8?q?=E9=80=A0=EF=BC=8Cbanner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- components/avatar/index.wxss | 4 +- pages/home/components/home-swiper/index.js | 68 ++++++++++++++++++++ pages/home/components/home-swiper/index.json | 6 ++ pages/home/components/home-swiper/index.wxml | 21 ++++++ pages/home/components/home-swiper/index.wxss | 1 + pages/home/index.js | 1 + pages/home/index.json | 3 +- pages/home/index.wxml | 30 +++++---- pages/home/index.wxss | 5 +- pages/webPage/index.js | 67 +++++++++++++++++++ pages/webPage/index.json | 3 + pages/webPage/index.wxml | 2 + pages/webPage/index.wxss | 1 + project.private.config.json | 7 ++ service/system.js | 5 ++ 16 files changed, 209 insertions(+), 18 deletions(-) create mode 100644 pages/home/components/home-swiper/index.js create mode 100644 pages/home/components/home-swiper/index.json create mode 100644 pages/home/components/home-swiper/index.wxml create mode 100644 pages/home/components/home-swiper/index.wxss create mode 100644 pages/webPage/index.js create mode 100644 pages/webPage/index.json create mode 100644 pages/webPage/index.wxml create mode 100644 pages/webPage/index.wxss diff --git a/app.json b/app.json index a03d56c..ab0a4e3 100644 --- a/app.json +++ b/app.json @@ -22,7 +22,8 @@ "pages/special/index", "pages/encyclopedia/index", "pages/encyclopediaDetail/index", - "pages/workBench/index" + "pages/workBench/index", + "pages/webPage/index" ], "subPackages": [ { diff --git a/components/avatar/index.wxss b/components/avatar/index.wxss index f37dea3..fdfbc76 100644 --- a/components/avatar/index.wxss +++ b/components/avatar/index.wxss @@ -1,7 +1,7 @@ /* components/avatar/index.wxss */ .wrapper { - width: 120rpx; - height: 120rpx; + width: 100rpx; + height: 100rpx; border-radius: 50%; background: radial-gradient(circle, var(--light-green), var(--middle-green),var(--deep-green) ); display: flex; diff --git a/pages/home/components/home-swiper/index.js b/pages/home/components/home-swiper/index.js new file mode 100644 index 0000000..2a4734e --- /dev/null +++ b/pages/home/components/home-swiper/index.js @@ -0,0 +1,68 @@ +import { getBannerList } from "../../../../service/system" +import { alertInfo } from "../../../../utils/index"; +import request from '../../../../utils/request' + +const { OK } = request; + +// pages/home/components/home-swiper/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + park: String, + }, + observers: { + 'park': function(newValue) { + this.init(newValue) + } + }, + /** + * 组件的初始数据 + */ + data: { + indicatorDots: true, + vertical: false, + autoplay: false, + interval: 2000, + duration: 500, + list: [], + }, + /** + * 组件的方法列表 + */ + methods: { + async init(park) { + const { code, message, data = [] } = await getBannerList(park, 1); + if (code !== OK) { + alertInfo(message); + this.setData({ list: [] }) + return + } + this.setData({ list: data }) + }, + handleJump(e) { + const { data = {} } = e.currentTarget.dataset; + switch(data.jumpType) { + case 1: + wx.navigateToMiniProgram({ + appId: data.appId, + path: data.wxPath, + envVersion: "trial" + }) + break; + case 2: + wx.navigateTo({ + url: data.value, + }) + break; + case 3: + wx.navigateTo({ + url: '/pages/webPage/index?path=' + data.value, + }) + break; + } + } + } +}) \ No newline at end of file diff --git a/pages/home/components/home-swiper/index.json b/pages/home/components/home-swiper/index.json new file mode 100644 index 0000000..6279c88 --- /dev/null +++ b/pages/home/components/home-swiper/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-image": "@vant/weapp/image/index" + } +} \ No newline at end of file diff --git a/pages/home/components/home-swiper/index.wxml b/pages/home/components/home-swiper/index.wxml new file mode 100644 index 0000000..57b0830 --- /dev/null +++ b/pages/home/components/home-swiper/index.wxml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/pages/home/components/home-swiper/index.wxss b/pages/home/components/home-swiper/index.wxss new file mode 100644 index 0000000..6297483 --- /dev/null +++ b/pages/home/components/home-swiper/index.wxss @@ -0,0 +1 @@ +/* pages/home/components/home-swiper/index.wxss */ \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js index 2fa926b..6d1b144 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -27,6 +27,7 @@ Page({ { name: '微信支付', }, { name: '对公支付' }, ], + }, /** diff --git a/pages/home/index.json b/pages/home/index.json index 205dfa6..df853ba 100644 --- a/pages/home/index.json +++ b/pages/home/index.json @@ -9,7 +9,8 @@ "picker": "/components/picker/index", "van-grid": "@vant/weapp/grid/index", "van-grid-item": "@vant/weapp/grid-item/index", - "van-action-sheet": "@vant/weapp/action-sheet/index" + "van-action-sheet": "@vant/weapp/action-sheet/index", + "home-swiper": "./components/home-swiper/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/home/index.wxml b/pages/home/index.wxml index d5f57f9..d432c53 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -20,7 +20,7 @@ - + 请登录 @@ -30,9 +30,10 @@ {{tenement.name}} - 欢迎使用华昌宝能用电管理系统！ + + @@ -40,13 +41,13 @@ {{ tenement.shortName}} - {{ meter.address }} -- - - - 切换电表 + + + 切换电表 - + 电表余额： {{meter.money}} --- - - - 刷新 + + + 刷新 @@ -86,11 +87,14 @@ size="large" type="digit" /> + + 去缴费 + - - 去缴费 - + diff --git a/pages/home/index.wxss b/pages/home/index.wxss index 32e116e..6113c94 100644 --- a/pages/home/index.wxss +++ b/pages/home/index.wxss @@ -34,7 +34,7 @@ } .notLoginWrapper, .logined { - padding: 24rpx 32rpx; + padding: 16rpx 32rpx; padding-left: 50rpx; background-color: var(--middle-green); display: flex; @@ -62,6 +62,7 @@ .rechargeWrapper { background: linear-gradient(to bottom, var(--middle-green), #fff ); overflow: hidden; + padding-top: 24rpx; } .card { @@ -153,6 +154,8 @@ .moneyInput { margin-top: 24rpx; margin-bottom: 24rpx; + display: flex; + justify-content: space-between; } .others { diff --git a/pages/webPage/index.js b/pages/webPage/index.js new file mode 100644 index 0000000..01574e0 --- /dev/null +++ b/pages/webPage/index.js @@ -0,0 +1,67 @@ +// pages/webPage/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { path } = options + this.setData({ path }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/webPage/index.json b/pages/webPage/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/webPage/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/webPage/index.wxml b/pages/webPage/index.wxml new file mode 100644 index 0000000..e2a4dea --- /dev/null +++ b/pages/webPage/index.wxml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pages/webPage/index.wxss b/pages/webPage/index.wxss new file mode 100644 index 0000000..4c85802 --- /dev/null +++ b/pages/webPage/index.wxss @@ -0,0 +1 @@ +/* pages/webPage/index.wxss */ \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index b31992c..f341ec3 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -10,6 +10,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/my/index", + "pathName": "pages/my/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "childPackage/pages/electricQuery/index", "pathName": "childPackage/pages/electricQuery/index", diff --git a/service/system.js b/service/system.js index db5407a..a268001 100644 --- a/service/system.js +++ b/service/system.js @@ -49,4 +49,9 @@ export const getEncyclopediaList = async function(categoryId, page) { // 获取分类列表 export const getEncyclopediaDetail = async function(id) { return await GET(`/wx/getEncyclopediaDetail/${id}`); +} + +// 获取分类列表 +export const getBannerList = async function(park = "", address = "") { + return await GET(`/wx/getBannerList?park=${park}&address=${address}`); } \ No newline at end of file