diff --git a/app.json b/app.json index a99fe59..4387a30 100644 --- a/app.json +++ b/app.json @@ -97,6 +97,16 @@ "pages/refusedOrEndedDetail/refusedOrEndedDetail", "pages/cancelDetail/cancelDetail" ] + }, + { + "root": "subpages/understandJs", + "pages": [ + "pages/index/index", + "pages/impression/impression", + "pages/delicious/delicious", + "pages/sclerotia/sclerotia", + "pages/archives/archives" + ] } ], "preloadRule": { diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 2ef3b0c..3bffee9 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -354,6 +354,12 @@ Page({ }) // wx.miniProgram.navigateTo({ url: '/pages/detail/detail?weburl=' + encodeURIComponent(global.baseURL + 'info') }) }, + //了解锦水 + toUnderstandJs(){ + wx.navigateTo({ + url: '/subpages/understandJs/pages/index/index' + }) + }, // 跳转到banner详情 navigatetoBannerDetail(e) { diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 05ca92e..81ee870 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -128,7 +128,7 @@ 政策导航 - 了解锦水 diff --git a/subpages/understandJs/images/jsda.png b/subpages/understandJs/images/jsda.png new file mode 100644 index 0000000..ae74c98 Binary files /dev/null and b/subpages/understandJs/images/jsda.png differ diff --git a/subpages/understandJs/images/jswd.png b/subpages/understandJs/images/jswd.png new file mode 100644 index 0000000..e39f3a8 Binary files /dev/null and b/subpages/understandJs/images/jswd.png differ diff --git a/subpages/understandJs/images/jsyh.png b/subpages/understandJs/images/jsyh.png new file mode 100644 index 0000000..d9352f4 Binary files /dev/null and b/subpages/understandJs/images/jsyh.png differ diff --git a/subpages/understandJs/images/jsyx.png b/subpages/understandJs/images/jsyx.png new file mode 100644 index 0000000..bde35af Binary files /dev/null and b/subpages/understandJs/images/jsyx.png differ diff --git a/subpages/understandJs/images/phone.png b/subpages/understandJs/images/phone.png new file mode 100644 index 0000000..92ece29 Binary files /dev/null and b/subpages/understandJs/images/phone.png differ diff --git a/subpages/understandJs/images/search.png b/subpages/understandJs/images/search.png new file mode 100644 index 0000000..c6e6a6c Binary files /dev/null and b/subpages/understandJs/images/search.png differ diff --git a/subpages/understandJs/images/test.jpg b/subpages/understandJs/images/test.jpg new file mode 100644 index 0000000..f6508f2 Binary files /dev/null and b/subpages/understandJs/images/test.jpg differ diff --git a/subpages/understandJs/images/wenjian.png b/subpages/understandJs/images/wenjian.png new file mode 100644 index 0000000..49a85b8 Binary files /dev/null and b/subpages/understandJs/images/wenjian.png differ diff --git a/subpages/understandJs/pages/archives/archives.js b/subpages/understandJs/pages/archives/archives.js new file mode 100644 index 0000000..dc52274 --- /dev/null +++ b/subpages/understandJs/pages/archives/archives.js @@ -0,0 +1,66 @@ +// subpages/understandJs/pages/archives/archives.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/subpages/understandJs/pages/archives/archives.json b/subpages/understandJs/pages/archives/archives.json new file mode 100644 index 0000000..43aa612 --- /dev/null +++ b/subpages/understandJs/pages/archives/archives.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "锦水档案" +} \ No newline at end of file diff --git a/subpages/understandJs/pages/archives/archives.wxml b/subpages/understandJs/pages/archives/archives.wxml new file mode 100644 index 0000000..7cc817e --- /dev/null +++ b/subpages/understandJs/pages/archives/archives.wxml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + 玫瑰街道医疗物质采购档案 + + + 存放位置：玫瑰街道档案室 + + + + 玫瑰街道医疗物质采购档案 + + + 存放位置：玫瑰街道档案室 + + \ No newline at end of file diff --git a/subpages/understandJs/pages/archives/archives.wxss b/subpages/understandJs/pages/archives/archives.wxss new file mode 100644 index 0000000..701c017 --- /dev/null +++ b/subpages/understandJs/pages/archives/archives.wxss @@ -0,0 +1,117 @@ +page { + background: #f7f7f7; +} + +.mian { + margin-top: 3rpx; + width: 100%; + height: 94rpx; + background: #fff; + display: flex; + align-items: center; +} + +.search { + /* margin-top: 17rpx; */ + width: calc(100% - 60rpx); + height: 66rpx; + margin-left: 30rpx; + background: rgba(242, 242, 242, 1); + border-radius: 33rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.search .item-all { + height: 30rpx; + width: 100%; + width: calc(100% - 60rpx); + display: flex; + align-items: center; + justify-content: space-between; +} + +.search .item-all .item-left { + /* background: red; */ + width: calc(100% - 73rpx); + height: 30rpx; + border-right: 1rpx solid #BFBFBF; + display: flex; + align-items: center; + justify-content: space-between; +} + +.search .item-all .item-left image { + width: 30rpx; + height: 28rpx; +} + +.search .item-all .item-left input { + width: calc(100% - 41rpx); + height: 30rpx; + font-size: 28rpx; + color: #333; +} + +.placeholder-style { + font-size: 28rpx; + font-weight: 500; + color: rgba(168, 168, 168, 1); +} + +.search .item-all .item-right { + font-size: 28rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); +} + +button { + width: 53rpx; + height: 28rpx; + padding: 0; + border-radius: 0; + line-height: 28rpx; +} + +button::after { + border-radius: 0px; + border: none; +} + +/* 列表 */ +.list-item { + margin-top: 16rpx; + padding-top: 30rpx; + width: 100%; + height: 170rpx; + background: #fff; +} + +.list-item .list-name { + width: calc(100% - 60rpx); + margin-left: 30rpx; + font-size: 34rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); +} +.list-item .list-position { + width: calc(100% - 60rpx); + margin-left: 30rpx; + height: 26rpx; + margin-top: 35rpx; + display: flex; + align-items: center; +} +.list-item .list-position image{ + width: 30rpx; + height: 22rpx; +} +.list-item .list-position .list-position-name{ + margin-left: 10rpx; + font-size:26rpx; + font-weight:500; + color:rgba(170,170,170,1); + line-height:26rpx; +} + diff --git a/subpages/understandJs/pages/delicious/delicious.js b/subpages/understandJs/pages/delicious/delicious.js new file mode 100644 index 0000000..870a40d --- /dev/null +++ b/subpages/understandJs/pages/delicious/delicious.js @@ -0,0 +1,66 @@ +// subpages/understandJs/pages/delicious/delicious.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/subpages/understandJs/pages/delicious/delicious.json b/subpages/understandJs/pages/delicious/delicious.json new file mode 100644 index 0000000..9b3b5f5 --- /dev/null +++ b/subpages/understandJs/pages/delicious/delicious.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "锦水味道" +} \ No newline at end of file diff --git a/subpages/understandJs/pages/delicious/delicious.wxml b/subpages/understandJs/pages/delicious/delicious.wxml new file mode 100644 index 0000000..29c615f --- /dev/null +++ b/subpages/understandJs/pages/delicious/delicious.wxml @@ -0,0 +1,20 @@ + + + + + 锦水美食 + + + + + + 锦水美食 + + + + + + 锦水美食 + + + \ No newline at end of file diff --git a/subpages/understandJs/pages/delicious/delicious.wxss b/subpages/understandJs/pages/delicious/delicious.wxss new file mode 100644 index 0000000..f01b4e9 --- /dev/null +++ b/subpages/understandJs/pages/delicious/delicious.wxss @@ -0,0 +1,37 @@ +.box { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + border-top: 1rpx solid #F4F4F4; + padding: 50rpx 30rpx; +} + +.box .item:first-child { + margin-top: 0rpx; +} + +.box .item:nth-child(2) { + margin-top: 0rpx; +} + +.box .item { + margin-top: 40rpx; + width: calc(50% - 10rpx); + height: 257rpx; +} + +.box .item image { + width: 100%; + height: 206rpx; + border-radius: 10rpx; +} + +.box .item .name { + width: 100%; + height: 51rpx; + line-height: 60.5rpx; + font-size: 32rpx; + font-weight: bold; + color: rgba(36, 36, 36, 1); +} \ No newline at end of file diff --git a/subpages/understandJs/pages/impression/impression.js b/subpages/understandJs/pages/impression/impression.js new file mode 100644 index 0000000..a9df67d --- /dev/null +++ b/subpages/understandJs/pages/impression/impression.js @@ -0,0 +1,66 @@ +// subpages/understandJs/pages/impression/impression.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/subpages/understandJs/pages/impression/impression.json b/subpages/understandJs/pages/impression/impression.json new file mode 100644 index 0000000..8a96328 --- /dev/null +++ b/subpages/understandJs/pages/impression/impression.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "锦水印象" +} \ No newline at end of file diff --git a/subpages/understandJs/pages/impression/impression.wxml b/subpages/understandJs/pages/impression/impression.wxml new file mode 100644 index 0000000..7a95e42 --- /dev/null +++ b/subpages/understandJs/pages/impression/impression.wxml @@ -0,0 +1,3 @@ + + 锦水印象 + \ No newline at end of file diff --git a/subpages/understandJs/pages/impression/impression.wxss b/subpages/understandJs/pages/impression/impression.wxss new file mode 100644 index 0000000..a2ccb37 --- /dev/null +++ b/subpages/understandJs/pages/impression/impression.wxss @@ -0,0 +1 @@ +/* subpages/understandJs/pages/impression/impression.wxss */ \ No newline at end of file diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js new file mode 100644 index 0000000..34c3b57 --- /dev/null +++ b/subpages/understandJs/pages/index/index.js @@ -0,0 +1,86 @@ +// subpages/understandJs/pages/index/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + goImpression(){ + wx.navigateTo({ + url: '../impression/impression' + }) + }, + goDeliDcious(){ + wx.navigateTo({ + url: '../delicious/delicious' + }) + }, + goArchives(){ + wx.navigateTo({ + url: '../archives/archives' + }) + }, + goSclerotia(){ + wx.navigateTo({ + url: '../sclerotia/sclerotia' + }) + } +}) \ No newline at end of file diff --git a/subpages/understandJs/pages/index/index.json b/subpages/understandJs/pages/index/index.json new file mode 100644 index 0000000..afa02d1 --- /dev/null +++ b/subpages/understandJs/pages/index/index.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "了解锦水" +} \ No newline at end of file diff --git a/subpages/understandJs/pages/index/index.wxml b/subpages/understandJs/pages/index/index.wxml new file mode 100644 index 0000000..f8f7677 --- /dev/null +++ b/subpages/understandJs/pages/index/index.wxml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/subpages/understandJs/pages/index/index.wxss b/subpages/understandJs/pages/index/index.wxss new file mode 100644 index 0000000..54ff08f --- /dev/null +++ b/subpages/understandJs/pages/index/index.wxss @@ -0,0 +1,52 @@ +.index { + width: calc(100% - 60rpx); + /* margin-top: 28rpx; */ + height: 300rpx; + margin-left: 30rpx; + border-radius: 10rpx; + position: relative; + margin-bottom: 28rpx; + padding: 0; + background: #fff; +} + +button::after { + border: none; +} + +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); +} + +.index.top { + margin-top: 28rpx; +} + +.index .img-bj { + border-radius: 10rpx; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + z-index: 10; +} + +.index .shadow { + border-radius: 10rpx; + position: relative; + width: 100%; + height: 100%; + z-index: 999; + /* background: rgba(0, 0, 0, 1); */ + background: rgba(0, 0, 0, 0.6); + display: flex; + align-items: center; + justify-content: center; +} + +.index .shadow .img-name { + width: 210rpx; + height: 58rpx; + opacity: 1; +} diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.js b/subpages/understandJs/pages/sclerotia/sclerotia.js new file mode 100644 index 0000000..b9f9fd1 --- /dev/null +++ b/subpages/understandJs/pages/sclerotia/sclerotia.js @@ -0,0 +1,66 @@ +// subpages/understandJs/pages/sclerotia/sclerotia.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.json b/subpages/understandJs/pages/sclerotia/sclerotia.json new file mode 100644 index 0000000..6e08539 --- /dev/null +++ b/subpages/understandJs/pages/sclerotia/sclerotia.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "硬核锦水" +} \ No newline at end of file diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxml b/subpages/understandJs/pages/sclerotia/sclerotia.wxml new file mode 100644 index 0000000..b30c29d --- /dev/null +++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxml @@ -0,0 +1,29 @@ + + + 玫瑰社区 + + + + + 0531-88888888 + + + + + + + + + + 玫瑰社区 + + + + + 0531-88888888 + + + + + + \ No newline at end of file diff --git a/subpages/understandJs/pages/sclerotia/sclerotia.wxss b/subpages/understandJs/pages/sclerotia/sclerotia.wxss new file mode 100644 index 0000000..738cd14 --- /dev/null +++ b/subpages/understandJs/pages/sclerotia/sclerotia.wxss @@ -0,0 +1,42 @@ +page { + background: #f7f7f7; +} + +.list-item { + margin-top: 16rpx; + background: #fff; + height: 196rpx; + width: 100%; + padding: 0 30rpx; +} + +.list-item .top { + width: calc(100% - 60rpx); + height: 90rpx; + border-bottom: 1rpx solid #f7f7f7; + font-size: 34rpx; + font-weight: bold; + color: rgba(51, 51, 51, 1); + line-height: 90rpx; +} + +.list-item .bottom { + width: calc(100% - 60rpx); + height: 106rpx; + display: flex; + align-items: center; + justify-content: space-between; +} + +.list-item .bottom .name { + height: 106rpx; + line-height: 106rpx; + font-size: 34rpx; + font-weight: 500; + color: rgba(119, 119, 119, 1); +} + +.list-item .bottom image { + width: 156rpx; + height: 56rpx; +} \ No newline at end of file diff --git a/utils/understandJs.js b/utils/understandJs.js new file mode 100644 index 0000000..66d28ec --- /dev/null +++ b/utils/understandJs.js @@ -0,0 +1,8 @@ +var fly = require('./request.js') +module.exports = { + noticelist: noticelist +} +// 通知列表(通) +function noticelist(params) { + return fly.get('news/v2/notice/list', params) +} \ No newline at end of file