From 95c26dad3da8ab39f80bea35b650eb1b5dd29c66 Mon Sep 17 00:00:00 2001 From: Myth Date: Sat, 9 Oct 2021 17:15:15 +0800 Subject: [PATCH] 1 --- app.json | 2 + pages/index/index.wxml | 6 +- pages/info/culturalUnitInfo/index.js | 79 +++++++++++++++++++++++++ pages/info/culturalUnitInfo/index.json | 5 ++ pages/info/culturalUnitInfo/index.wxml | 20 +++++++ pages/info/culturalUnitInfo/index.wxss | 32 ++++++++++ pages/list/culturalUnit/index.js | 82 ++++++++++++++++++++++++++ pages/list/culturalUnit/index.json | 5 ++ pages/list/culturalUnit/index.wxml | 8 +++ pages/list/culturalUnit/index.wxss | 39 ++++++++++++ pages/map/index.js | 11 ++-- pages/map/index.wxml | 4 ++ pages/map/index.wxss | 5 ++ pages/order/food/index.wxml | 2 +- pages/order/hotel/index.wxml | 2 +- pages/order/movie/index.wxml | 2 +- pages/order/roadOrder/index.wxml | 2 +- pages/pbService/index.wxml | 8 +-- pages/user/address/add/index.wxml | 2 +- pages/user/bindtel/index.wxml | 6 +- pages/user/linkman/add/index.wxml | 2 +- pages/user/retail/apply/index.wxml | 2 +- project.private.config.json | 4 +- 23 files changed, 306 insertions(+), 24 deletions(-) create mode 100644 pages/info/culturalUnitInfo/index.js create mode 100644 pages/info/culturalUnitInfo/index.json create mode 100644 pages/info/culturalUnitInfo/index.wxml create mode 100644 pages/info/culturalUnitInfo/index.wxss create mode 100644 pages/list/culturalUnit/index.js create mode 100644 pages/list/culturalUnit/index.json create mode 100644 pages/list/culturalUnit/index.wxml create mode 100644 pages/list/culturalUnit/index.wxss diff --git a/app.json b/app.json index 39de64c..145379c 100644 --- a/app.json +++ b/app.json @@ -37,6 +37,7 @@ "pages/info/strategyInfo/index", "pages/info/guideInfo/index", "pages/info/groupOrderInfo/index", + "pages/info/culturalUnitInfo/index", "pages/user/user", "pages/user/retail/index", "pages/user/retail/apply/index", @@ -71,6 +72,7 @@ "pages/list/mayday/index", "pages/list/feiyi/index", "pages/list/haoxing/index", + "pages/list/culturalUnit/index", "pages/list/food/index", "pages/list/techan/index", "pages/list/museum/index", diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 982c36c..91ffc71 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -241,9 +241,13 @@ 团队预约 - + + + + 文化单位 diff --git a/pages/info/culturalUnitInfo/index.js b/pages/info/culturalUnitInfo/index.js new file mode 100644 index 0000000..0d8c3af --- /dev/null +++ b/pages/info/culturalUnitInfo/index.js @@ -0,0 +1,79 @@ +const { default: https } = require("../../../utils/https") + +// pages/info/culturalUnitInfo/index.js +import commonApi from "../../../utils/https/common" +Page({ + + /** + * 页面的初始数据 + */ + data: { + info:null + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + commonApi._post("pbservice/cultural_units/getDetail",{ + id:options.id + }).then(res=>{ + res.data.list_img = res.data.list_img?res.data.list_img.split(","):[] + if(res.data.list_img.length==0 && res.data.head_img){ + res.data.list_img.push(res.data.head_img) + } + this.setData({ + info:res.data + }) + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/info/culturalUnitInfo/index.json b/pages/info/culturalUnitInfo/index.json new file mode 100644 index 0000000..35cf02f --- /dev/null +++ b/pages/info/culturalUnitInfo/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "title":"/pages/component/TitleHeader" + } +} \ No newline at end of file diff --git a/pages/info/culturalUnitInfo/index.wxml b/pages/info/culturalUnitInfo/index.wxml new file mode 100644 index 0000000..e6a1447 --- /dev/null +++ b/pages/info/culturalUnitInfo/index.wxml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + 地址：{{info.address}} + 电话：{{info.mobile}} + + + + + diff --git a/pages/info/culturalUnitInfo/index.wxss b/pages/info/culturalUnitInfo/index.wxss new file mode 100644 index 0000000..663f9f5 --- /dev/null +++ b/pages/info/culturalUnitInfo/index.wxss @@ -0,0 +1,32 @@ +.swiper { + width: 100%; + height: 400rpx; +} +.swiper image { + height: 400rpx; + display: block; + width: 100%; +} +page { + background: #fff; +} +.top-box { + padding: 20rpx 39rpx; + background: white; + border-radius: 20rpx 20rpx 0px 0px; + margin-bottom: 25rpx; +} +.title { + font-size: 32rpx; + color: #000; + font-weight:500; +} +.info-address { + color: #666; + font-size: 27rpx; +} +.content { + font-size: 30rpx; + padding: 40rpx; + background: white; +} \ No newline at end of file diff --git a/pages/list/culturalUnit/index.js b/pages/list/culturalUnit/index.js new file mode 100644 index 0000000..81e15ce --- /dev/null +++ b/pages/list/culturalUnit/index.js @@ -0,0 +1,82 @@ +// pages/list/culturalUnit/index.js +import commonApi from "../../../utils/https/common" +Page({ + + /** + * 页面的初始数据 + */ + data: { + page:1, + list:[], + total:1 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getList() + }, + getList(){ + if(this.data.total<=this.data.list.length) return; + commonApi._post("pbservice/cultural_units/getList",{ + limit:20, + page:this.data.page + }).then(res=>{ + this.setData({ + list:this.data.list.concat(res.data.data), + total:res.data.total, + page:this.data.page+1 + }) + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.getList() + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/list/culturalUnit/index.json b/pages/list/culturalUnit/index.json new file mode 100644 index 0000000..35cf02f --- /dev/null +++ b/pages/list/culturalUnit/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "title":"/pages/component/TitleHeader" + } +} \ No newline at end of file diff --git a/pages/list/culturalUnit/index.wxml b/pages/list/culturalUnit/index.wxml new file mode 100644 index 0000000..fcac7c1 --- /dev/null +++ b/pages/list/culturalUnit/index.wxml @@ -0,0 +1,8 @@ + + + + + {{item.company_name}} + {{item.address}} + +暂无数据 \ No newline at end of file diff --git a/pages/list/culturalUnit/index.wxss b/pages/list/culturalUnit/index.wxss new file mode 100644 index 0000000..4569de4 --- /dev/null +++ b/pages/list/culturalUnit/index.wxss @@ -0,0 +1,39 @@ +/* pages/list/culturalUnit/index.wxss */ +page { + background: #EDEDED; +} +.item { + width: 690rpx; + height: 420rpx; + background: #fff; + border-radius: 20rpx; + margin: 20rpx auto; + overflow: hidden; +} +.item image { + display: block; + width: 100%; + height: 300rpx; + margin-bottom: 10rpx; +} +.title { + font-size: 30rpx; + margin: 0 20rpx; + padding: 10rpx 0; +} +.location { + display: flex; + align-items: center; + margin: 0 20rpx; + font-size: 26rpx; +} +.location .iconfont { + color: #0B898E; + margin-right: 10rpx; +} +.nomoredata { + text-align: center; + color: #666; + line-height: 90rpx; + font-size: 26rpx; +} \ No newline at end of file diff --git a/pages/map/index.js b/pages/map/index.js index 176a461..8435a69 100644 --- a/pages/map/index.js +++ b/pages/map/index.js @@ -89,6 +89,11 @@ Page({ url: '/pages/info/foodInfo/index?id='+this.data.info.info.id, }) } + else if(this.data.info.info.type=='units'){ + wx.navigateTo({ + url: '/pages/info/culturalUnitInfo/index?id='+this.data.info.info.id + }) + } else { util.gotoDetail(this.data.info.info) } @@ -410,11 +415,10 @@ Page({ }, getList:function(){ this.mapCtx = wx.createMapContext("map"); - let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes'],that = this; + let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','units'],that = this; this.mapCtx.getRegion({ type: 'gcj02', success: function(res) { - console.log(res) commonApi._post("act/map_travel",{ type:types[that.data.type], title:that.data.keywords, @@ -452,9 +456,6 @@ Page({ // }) } }) - - - }, search:function(e){ console.log(e) diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 690e077..3ef917c 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -42,6 +42,10 @@ 江南小书场 + + + 文化单位 + diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 461d29d..8a8edfb 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -85,6 +85,11 @@ background: #9d6b00; border-color: #9d6b00; } +.right-menus .right-menu-item:nth-child(9).active { + background: rgb(160, 248, 248); + border-color: rgb(160, 248, 248); +} + .right-menu-item.active .iconfont { color: #fff !important; } diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml index a483092..ba82d4b 100644 --- a/pages/order/food/index.wxml +++ b/pages/order/food/index.wxml @@ -23,7 +23,7 @@ 手机号码： - + diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml index 604c477..0378ab9 100644 --- a/pages/order/hotel/index.wxml +++ b/pages/order/hotel/index.wxml @@ -47,7 +47,7 @@ 手机号 - + diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml index fb3730b..745162f 100644 --- a/pages/order/movie/index.wxml +++ b/pages/order/movie/index.wxml @@ -12,7 +12,7 @@ 手机号码： - + diff --git a/pages/order/roadOrder/index.wxml b/pages/order/roadOrder/index.wxml index c0c0354..9a1f845 100644 --- a/pages/order/roadOrder/index.wxml +++ b/pages/order/roadOrder/index.wxml @@ -18,7 +18,7 @@ 联系方式 - + 文物查询 @@ -103,4 +99,4 @@ 廉洁地图 - \ No newline at end of file + --> \ No newline at end of file diff --git a/pages/user/address/add/index.wxml b/pages/user/address/add/index.wxml index 09107c3..42336f3 100644 --- a/pages/user/address/add/index.wxml +++ b/pages/user/address/add/index.wxml @@ -8,7 +8,7 @@ 手机号 - + 选择地区 diff --git a/pages/user/bindtel/index.wxml b/pages/user/bindtel/index.wxml index e4c4f58..999a0b6 100644 --- a/pages/user/bindtel/index.wxml +++ b/pages/user/bindtel/index.wxml @@ -4,17 +4,17 @@ 手机号 - + 图形验证码 - + 验证码 - + diff --git a/pages/user/linkman/add/index.wxml b/pages/user/linkman/add/index.wxml index 319b0b3..e09220a 100644 --- a/pages/user/linkman/add/index.wxml +++ b/pages/user/linkman/add/index.wxml @@ -8,7 +8,7 @@ 手机号 - + 证件类型 diff --git a/pages/user/retail/apply/index.wxml b/pages/user/retail/apply/index.wxml index 5ce46ea..b8d11d4 100644 --- a/pages/user/retail/apply/index.wxml +++ b/pages/user/retail/apply/index.wxml @@ -18,7 +18,7 @@ 手机号： - + 身份证号： diff --git a/project.private.config.json b/project.private.config.json index ddd5747..61e95b9 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -13,8 +13,8 @@ "miniprogram": { "list": [ { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", + "name": "pages/list/culturalUnit/index", + "pathName": "pages/list/culturalUnit/index", "query": "url=https%3A%2F%2Fm.cloud.sz-trip.com%2FphotoWorksDetail%3Fid%3D1157%26type_id%3D1", "scene": null },