diff --git a/app.json b/app.json
index 16a00cb..3f17a68 100644
--- a/app.json
+++ b/app.json
@@ -65,6 +65,7 @@
"pages/list/museum/index",
"pages/list/store/index",
"pages/list/activity/index",
+ "pages/list/activitynew/index",
"pages/list/road/index",
"pages/list/hotel/index",
"pages/list/strategy/index",
@@ -81,6 +82,8 @@
"pages/list/scene/index",
"pages/list/comments/index",
"pages/list/message/index",
+ "pages/list/minitrip/index",
+ "pages/list/oneday/index",
"pages/pbService/index",
"pages/pbService/sceneComfort/index",
"pages/pbService/gym/index",
@@ -106,7 +109,9 @@
"pages/pbService/wwcx/search/index",
"pages/ask/index",
"pages/ask/info/index",
- "pages/ask/my/index"
+ "pages/ask/my/index",
+ "pages/activity/year2020/index",
+ "pages/activity/suyear/index"
],
"permission": {
"scope.userLocation": {
diff --git a/pages/activity/suyear/index.js b/pages/activity/suyear/index.js
new file mode 100644
index 0000000..3ab4768
--- /dev/null
+++ b/pages/activity/suyear/index.js
@@ -0,0 +1,134 @@
+// pages/activity/suyear/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ tabs:[{
+ areaid:"",
+ imgname:'all'
+ },{
+ areaid:"320508",
+ imgname:'gs'
+ },{
+ areaid:"320506",
+ imgname:'wz'
+ },{
+ areaid:"320507",
+ imgname:'xc'
+ },{
+ areaid:"320509",
+ imgname:'wj'
+ },{
+ areaid:"320510",
+ imgname:'yq'
+ },{
+ areaid:"320582",
+ imgname:'zjg'
+ },{
+ areaid:"320585",
+ imgname:'tc'
+ },{
+ areaid:"320583",
+ imgname:'ks'
+ },{
+ areaid:"320581",
+ imgname:'cs'
+ }],
+ list:[],
+ total:1,
+ areas_id:""
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.getList()
+ },
+ changeArea:function(e){
+ let areas_id = e.currentTarget.dataset.area;
+ this.setData({
+ total:1,
+ list:[],
+ areas_id:areas_id
+ })
+ this.getList()
+ },
+ getList:function(){
+ if(this.data.total<=this.data.list.length) return;
+ commonApi._post('product/get_product_by_tag',{
+ tag_id:23,
+ offset:this.data.list.length,
+ areas_id:this.data.areas_id,
+ limit:10
+ }).then(res=>{
+ this.setData({
+ list:this.data.list.concat(res.data.list),
+ total:res.data.total
+ })
+ })
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ if(item.title=='沙家浜景区'){
+ wx.navigateToMiniProgram({
+ appId: 'wx98a352b4689e46d8',
+ path:'pages/sightspots/booking?id=24&type=default'
+ })
+ return;
+ }
+ util.gotoDetail(item)
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/activity/suyear/index.json b/pages/activity/suyear/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/pages/activity/suyear/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "title":"/pages/component/TitleHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/activity/suyear/index.wxml b/pages/activity/suyear/index.wxml
new file mode 100644
index 0000000..9d2886c
--- /dev/null
+++ b/pages/activity/suyear/index.wxml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
\ No newline at end of file
diff --git a/pages/activity/suyear/index.wxss b/pages/activity/suyear/index.wxss
new file mode 100644
index 0000000..cdf5039
--- /dev/null
+++ b/pages/activity/suyear/index.wxss
@@ -0,0 +1,93 @@
+/* pages/activity/suyear/index.wxss */
+page {
+ background: #FCDDB3;
+}
+.main-img {
+ display: block;
+ width: 100%;
+}
+.area-list {
+ display: flex;
+ align-items: center;
+ left: 30rpx;
+ right: 0;
+ overflow-x: auto;
+ position: absolute;
+ top: 700rpx;
+}
+.area-list image {
+ display: block;
+ flex-shrink: 0;
+ width: 110rpx;
+ margin-right: 20rpx;
+}
+.list {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ margin: 0 25rpx;
+ justify-content: space-between;
+ padding-top: 34rpx;
+}
+.item {
+ width: 345rpx;
+ height: 435rpx;
+ position: relative;
+ margin-bottom: 30rpx;
+}
+.item .bgimg {
+ position: absolute;
+ width: 100%;
+}
+.item image {
+ display: block;
+}
+.item .bgimgin {
+ position: absolute;
+ width: 307rpx;
+ left: 18rpx;
+ top: 18rpx;
+}
+.item .border {
+ position: absolute;
+ width: 79rpx;
+ margin-left: -19rpx;
+ bottom: 10rpx;
+}
+.item:nth-child(2n) .border {
+ margin-left: 280rpx;
+}
+.item .product-img {
+ position: absolute;
+ width: 308rpx;
+ height: 254rpx;
+ left: 50%;
+ margin-left: -154rpx;
+ top: 20rpx;
+}
+.item .title {
+ font-size: 32rpx;
+ font-family: Source Han Sans SC;
+ font-weight: bold;
+ color: #FFFFFF;
+ line-height: 45rpx;
+ background: linear-gradient(-50deg, #FCDDB2 0%, #F7B765 44.7021484375%, #FCDEB4 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ position: absolute;
+ top: 280rpx;
+ left: 30rpx;
+ right: 30rpx;
+}
+.item .btn {
+ position: absolute;
+ width: 260rpx;
+ left: 42rpx;
+ top: 357rpx;
+}
+.item .addressimg {
+ width: 110rpx;
+ left: 40rpx;
+ top: 15rpx;
+ position: absolute;
+}
\ No newline at end of file
diff --git a/pages/activity/year2020/index.js b/pages/activity/year2020/index.js
new file mode 100644
index 0000000..f911e1d
--- /dev/null
+++ b/pages/activity/year2020/index.js
@@ -0,0 +1,167 @@
+// pages/activity/year2020/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+let device = wx.getSystemInfoSync();
+const ratio = device.windowWidth / 750;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ zhouzhuang:[],
+ haofengguang:[],
+ dongshan:[],
+ huqiu:[],
+ jiangnan:[],
+ list:[],
+ total:1,
+ top:0
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ let rect = wx.getMenuButtonBoundingClientRect();
+ let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+ this.setData({
+ top:height
+ })
+ // 周庄年货专区
+ commonApi._post("adv/getAdvByKey",{
+ key:"zhouzhuangnianhuo"
+ }).then(res=>{
+ this.setData({
+ zhouzhuang:res.data.content || []
+ })
+ })
+ // 苏州好风光
+ commonApi._post("adv/getAdvByKey",{
+ key:"haofengguangnianhuo"
+ }).then(res=>{
+ this.setData({
+ haofengguang:res.data.content || []
+ })
+ })
+ // 东山爆款好物
+ commonApi._post("adv/getAdvByKey",{
+ key:"dongshannianhuo"
+ }).then(res=>{
+ this.setData({
+ dongshan:res.data.content || []
+ })
+ })
+ // 虎丘茶礼
+ commonApi._post("adv/getAdvByKey",{
+ key:"huqiunianhuo"
+ }).then(res=>{
+ this.setData({
+ huqiu:res.data.content || []
+ })
+ })
+ // 江南米造局
+ commonApi._post("adv/getAdvByKey",{
+ key:"jiangniannianhuo"
+ }).then(res=>{
+ this.setData({
+ jiangnan:res.data.content || []
+ })
+ })
+ this.getList()
+ },
+ getList:function(){
+ let list = this.data.list;
+ if(list.length>=this.data.total) return;
+ commonApi._post('product/get_product_by_tag',{
+ tag_id:22,
+ offset:list.length,
+ limit:10
+ }).then(res=>{
+ list = list.concat(res.data.list);
+ this.setData({
+ list:list,
+ total:res.data.total
+ })
+ })
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ let [type,id] = item.href.split(",");
+ util.gotoDetail({
+ type:type,
+ id:id
+ })
+ },
+ gotoDetail2:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item)
+ },
+ home:function(){
+ wx.reLaunch({
+ url: '/pages/index/index',
+ })
+ },
+ gotoScroll:function(e){
+ let that = this,index = e.currentTarget.dataset.index;
+ const query=wx.createSelectorQuery(); //创建节点查询器
+ query.select("#box"+index).boundingClientRect() //选择toViewid获取位置信息
+ query.selectViewport().scrollOffset() //获取页面查询位置的
+ query.exec(function(res) {
+ let scrollTop = res[0].top + res[1].scrollTop - that.data.top;
+ wx.pageScrollTo({
+ scrollTop: scrollTop + 4,
+ duration: 500
+ })
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/activity/year2020/index.json b/pages/activity/year2020/index.json
new file mode 100644
index 0000000..35cf02f
--- /dev/null
+++ b/pages/activity/year2020/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "title":"/pages/component/TitleHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/activity/year2020/index.wxml b/pages/activity/year2020/index.wxml
new file mode 100644
index 0000000..833d935
--- /dev/null
+++ b/pages/activity/year2020/index.wxml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.subtitle}}
+
+
+ 年货价
+ ￥
+
+ {{item.price/100}}
+
+
+
+
+
+
+ 返回首页
+
+
\ No newline at end of file
diff --git a/pages/activity/year2020/index.wxss b/pages/activity/year2020/index.wxss
new file mode 100644
index 0000000..bb039c4
--- /dev/null
+++ b/pages/activity/year2020/index.wxss
@@ -0,0 +1,122 @@
+/* pages/activity/year2020/index.wxss */
+page {
+ background: #c8070a;
+}
+.yearimg {
+ display: block;
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ margin-top: -15rpx;
+}
+.product-list {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 0 10rpx;
+ flex-wrap: wrap;
+ position: relative;
+ z-index: 1;
+}
+.product-list image {
+ width: 357rpx;
+ height: 409rpx;
+ margin-bottom: 15rpx;
+}
+.product-item {
+ width: 357rpx;
+ height: 409rpx;
+ overflow: hidden;
+ margin-bottom: 15rpx;
+ position: relative;
+}
+.product-list .main-img {
+ width: 357rpx;
+ height: 263rpx;
+ display: block;
+ margin-top: 7rpx;
+}
+.product-list .bg-img {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 357rpx;
+ height: 409rpx;
+ z-index: 2;
+}
+.info-box {
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 140rpx;
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ z-index: 2;
+ color: #282828;
+}
+.title {
+ font-size: 32rpx;
+ width: 357rpx;
+ line-height: 37rpx;
+ font-weight: lighter;
+}
+.subtitle {
+ font-size: 18rpx;
+ line-height: 30rpx;
+}
+.btn {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ background: url(https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/nianhuojie/btnbg.png);
+ background-size: 245rpx 51rpx;
+ width: 245rpx;
+ height: 51rpx;
+ color: #ffc8a8;
+}
+.btn-text {
+ font-size: 14rpx;
+ text-align: right;
+ margin: 0 15rpx;
+ margin-right: 7rpx;
+}
+.price {
+ font-size: 38rpx;
+ flex-shrink: 0;
+ text-align: center;
+}
+.btn image {
+ width: 90rpx;
+ margin: 0;
+ margin-right: 15rpx;
+ margin-left: 7rpx;
+ display: block;
+}
+.backhome-box {
+ text-align: center;
+ color: #fff;
+ font-size: 32rpx;
+ overflow: hidden;
+ margin: 60rpx 0;
+ line-height: 50rpx;
+}
+.backhome-box .iconfont {
+ transform: rotate(-90deg);
+ color: #ebca16;
+}
+.block1,.block2 {
+ position: absolute;
+ width: 359rpx;
+ height: 170rpx;
+ z-index: 1;
+ top: 645rpx;
+ left: 12rpx;
+}
+.block2 {
+ right: 11rpx;
+ left: auto;
+}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b761f55..8c75f53 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -20,7 +20,7 @@
-
+
活动日历
@@ -28,7 +28,7 @@
景点门票
-
+
酒店住宿
@@ -173,7 +173,7 @@
- 借书还书
+ 书香借阅
@@ -184,10 +184,10 @@
投资导引图
-
+
文物查询
diff --git a/pages/info/hotelProductInfo/index.js b/pages/info/hotelProductInfo/index.js
index 3a179a5..a885505 100644
--- a/pages/info/hotelProductInfo/index.js
+++ b/pages/info/hotelProductInfo/index.js
@@ -65,7 +65,6 @@ Page({
this.setData({
products:res.data
})
- console.log(res)
})
},
order:function(e){
@@ -168,7 +167,7 @@ Page({
})
// 如果开始日期要比结束日期晚的话 那么结束日期自动变成开始日期的下一天
let endDate = new Date(this.data.endDate.replace(/-/g,'/'));
- if(endDate.getTime()
- {{item.price_sum/100}}
+ {{item.price/100}}
预订
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index 3f9294e..24b011d 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -21,7 +21,7 @@
-
+
@@ -57,7 +57,7 @@
-->
- 线路详情
+ 产品详情
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
new file mode 100644
index 0000000..c36a0f8
--- /dev/null
+++ b/pages/list/activitynew/index.js
@@ -0,0 +1,332 @@
+// pages/activity/index.js
+var app = getApp()
+import util from "../../../utils/util"
+import commonApi from "../../../utils/https/common"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ selectDay:new Date().getTime(),
+ days: ['日','一','二','三','四','五','六'],
+ types:[null,'show','exhibition','scene','movie','lecture'],
+ weeks:[],
+ pageNo:1,
+ sort:"",
+ list:[],
+ date:null,
+ total:1,
+ areas:['姑苏','吴江','苏州'],
+ area:0,
+ type:2,
+ movieType:1,
+ moreFlag:true,
+ lat:"",
+ lon:"",
+ keywords:"",
+ realKeywords:""
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ let d = new Date();
+ let month = d.getMonth() + 1,day = d.getDate();
+ month = month>10?month:("0"+month);
+ day = day>10?day:("0"+day);
+ this.setData({
+ selectDay:d.getTime(),
+ date:d.getFullYear()+"-"+month+"-"+day
+ })
+ this.getWeekDay();
+ commonApi._post("pbservice/Other/getSuzhouAreas").then(res=>{
+ res.data.unshift({
+ area_code:"",
+ area_name:"苏州"
+ })
+ this.setData({
+ areas:res.data
+ })
+ this.getList()
+ })
+ },
+ changeType:function(e){
+ this.setData({
+ type:e.currentTarget.dataset.type,
+ list:[],
+ total:1,
+ pageNo:1,
+ moreFlag:true,
+ keywords:"",
+ realKeywords:""
+ })
+ this.getList();
+ },
+ changeArea:function(e){
+ this.setData({
+ area:e.detail.value,
+ list:[],
+ total:1,
+ pageNo:1
+ })
+ this.getList()
+ },
+ // 获取当前选择日期的一周日期范围
+ getWeekDay:function(){
+ var myDate = this.data.selectDay, daySecond = 24 * 60 * 60 * 1000,reslist=[];
+ for (let i = myDate - daySecond * 3; i <= myDate + daySecond * 3; i = i + daySecond){
+ let day = new Date(i),putDate = day.getDate();
+ putDate = putDate>=10?putDate:'0'+putDate
+ let item = {
+ times:i,
+ day:this.data.days[day.getDay()],
+ date:putDate,
+ isSelect:i==myDate
+ };
+ reslist.push(item);
+ }
+ this.setData({
+ weeks: reslist
+ })
+ },
+ // picker修改日期
+ bindDateChange:function(e){
+ console.log(e)
+ this.setData({
+ selectDay: new Date(e.detail.value).getTime(),
+ list:[],
+ pageNo:1,
+ total:1,
+ date:e.detail.value,
+ moreFlag:true
+ })
+ this.getWeekDay();
+ this.getList();
+ },
+ // 点击修改日期
+ changeDate:function(e){
+ let times = e.currentTarget.dataset.times,d = new Date(times);
+ let month = d.getMonth()+1,day = d.getDate();
+ month = month>10?month:('0'+month);
+ day = day>10?day:('0'+day);
+ this.setData({
+ selectDay: times,
+ date:d.getFullYear()+"-"+month+"-"+day,
+ list:[],
+ pageNo:1,
+ total:1,
+ moreFlag:true
+ })
+ this.getList();
+ },
+ getList:function(){
+ let list = this.data.list;
+ if(this.data.type==4){
+ this.getMovie();
+ return;
+ }
+ if(list.length>=this.data.total) return;
+ commonApi._post('pbservice/Actcalendar/getActList',{
+ page_no:this.data.pageNo,
+ date:this.data.date,
+ category:this.data.types[this.data.type],
+ keywords:this.data.realKeywords,
+ // area_key:this.data.areas[this.data.area].area_code,
+ page_num:10
+ }).then(res=>{
+ this.setData({
+ total:res.data.total,
+ list:list.concat(res.data.rows),
+ pageNo:this.data.pageNo+1
+ })
+ })
+ },
+ getMovie:function(e){
+ if(!this.data.moreFlag) return;
+ let service={
+ 1:"getHotMovieList",
+ 2:"getCinemaList",
+ 3:'getSoonShowsList'
+ };
+ let data = {
+ page:this.data.pageNo,
+ pageSize:10
+ };
+ if(this.data.movieType==2){
+ data.lat = this.data.lat;
+ data.lon = this.data.lon;
+ data.is_price_sort = this.data.sort=='price';
+ data.is_distance_sort = this.data.sort=='distance';
+ }
+ // if(this.data.movieType==1){
+ // data.queryDate = this.data.date
+ // }
+ if(this.data.movieType==2 && !this.data.lon){
+ wx.getLocation({
+ type: 'gcj02',
+ success:(res)=>{
+ this.setData({
+ lat:res.latitude,
+ lon:res.longitude
+ })
+ data.lat =res.latitude;
+ data.lon =res.longitude;
+ commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
+ res.data.map(item=>{
+ if(item.distance || item.distance==0){
+ if(item.distance>=1000){
+ item.distance = (item.distance/1000).toFixed(2)+'km';
+ }
+ else {
+ item.distance = (item.distance).toFixed(2)+'m';
+ }
+ }
+ })
+ this.setData({
+ list:this.data.list.concat(res.data),
+ pageNo:this.data.pageNo+1,
+ moreFlag:res.data.length<10?false:true
+ })
+ })
+ },
+ fail:()=>{
+ wx.showToast({
+ title: '请打开位置授权',
+ icon:'none'
+ })
+ commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
+ this.setData({
+ list:this.data.list.concat(res.data),
+ pageNo:this.data.pageNo+1,
+ moreFlag:res.data.length<10?false:true
+ })
+ })
+ }
+ })
+ }
+ else {
+ commonApi._post('Cinema/'+service[this.data.movieType],data).then(res=>{
+ res.data.map(item=>{
+ if(item.distance || item.distance==0){
+ if(item.distance>=1000){
+ item.distance = (item.distance/1000).toFixed(2)+'km';
+ }
+ else {
+ item.distance = (item.distance).toFixed(2)+'m';
+ }
+ }
+ })
+ this.setData({
+ list:this.data.list.concat(res.data),
+ pageNo:this.data.pageNo+1,
+ moreFlag:res.data.length<10?false:true
+ })
+ })
+ }
+ },
+ setSort:function(e){
+ let sort = e.currentTarget.dataset.sort;
+ if(this.data.sort==sort) sort="";
+ this.setData({
+ sort:sort,
+ list:[],
+ total:1,
+ pageNo:1,
+ moreFlag:true
+ })
+ this.getList();
+ },
+ changeMovieType:function(e){
+ let type = e.currentTarget.dataset.type;
+ this.setData({
+ movieType:type,
+ list:[],
+ pageNo:1,
+ total:1,
+ moreFlag:true
+ })
+ this.getList()
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ if(this.data.type==4 && this.data.movieType!=2){
+ wx.navigateTo({
+ url: '/pages/list/movieticket/list/info/index?id='+item.third_id
+ })
+ }
+ else if(this.data.type==4){
+ wx.navigateTo({
+ url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id
+ })
+ }
+ else {
+ wx.navigateTo({
+ url: '/pages/info/activityInfo/index?id='+item.id,
+ })
+ }
+ },
+ changeKeywords:function(e){
+ this.setData({
+ keywords:e.detail.value
+ })
+ },
+ search:function(){
+ this.setData({
+ realKeywords:this.data.keywords,
+ list:[],
+ pageNo:1,
+ total:1,
+ moreFlag:true
+ })
+ this.getList();
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/activitynew/index.json b/pages/list/activitynew/index.json
new file mode 100644
index 0000000..721f32c
--- /dev/null
+++ b/pages/list/activitynew/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "title-header": "/pages/component/TitleHeader",
+ "common-image":"/pages/component/commonImage/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
new file mode 100644
index 0000000..9cadf18
--- /dev/null
+++ b/pages/list/activitynew/index.wxml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+ 展览
+
+
+
+ 景区
+
+
+
+ 电影
+
+
+
+ 讲座
+
+
+
+ 演出
+
+
+
+
+ {{item.date}}
+ 周{{item.day}}
+
+
+
+
+
+
+
+
+
+
+ 热映
+ 影院
+ 即将上映
+
+
+ 离我最近
+ 价格最低
+
+
+
+
+ {{item.name || item.title}}
+
+ {{item.begin_date}}—{{item.end_date}}
+
+ {{item.from_platform?item.from_platform:""}}
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ 导演：{{item.director}}
+ 主演：{{item.leading_role}}
+
+
+
+
+
+
+ {{item.title}}
+ {{item.address}}
+
+
+ ￥{{item.price/100}}起
+ {{item.distance}}
+
+
+
+
+
+ 暂无内容
+
+
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
new file mode 100644
index 0000000..a9f3e39
--- /dev/null
+++ b/pages/list/activitynew/index.wxss
@@ -0,0 +1,207 @@
+/* pages/activity/index.wxss */
+
+page {
+ background: #fff;
+}
+.types {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ background: #fff;
+ font-size: 28rpx;
+ color: #666;
+ padding: 30rpx 40rpx;
+ border-bottom: 1rpx solid #d8d8d8;
+}
+.type-item {
+ width: 100rpx;
+ text-align: center;
+ line-height: 27rpx;
+ color: #333;
+}
+.type-item image {
+ display: block;
+ margin-bottom: 23rpx;
+ width: 100rpx;
+ height: 100rpx;
+}
+.date-box {
+ height: 140rpx;
+ background: rgba(255, 255, 255, 1);
+ display: flex;
+ padding: 0 30rpx;
+ justify-content: space-between;
+ align-items: center;
+}
+.date-item {
+ font-size: 26rpx;
+ color: #999;
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+}
+.date-item.active {
+ font-weight:500;
+ color: #0B898E;
+ font-size: 30rpx;
+}
+.calendar-img {
+ width: 56rpx;
+ height: 60rpx;
+ display: block;
+}
+.top-fixed-activity {
+ background: #f7f7f7;
+ z-index: 1;
+}
+.top-fixed-box {
+ background: #FFF;
+}
+.activity-list {
+ margin: 0 24rpx;
+ background: #0B898E;
+}
+.acitivity-search-box {
+ display: flex;
+ margin: 30rpx 24rpx;
+ justify-content: space-between;
+ align-items: center;
+}
+.acitivity-search-box .picker {
+ width: 203rpx;
+ height: 54rpx;
+ display: flex;
+ align-items: center;
+ border: 1rpx solid #ccc;
+ border-radius: 4rpx;
+}
+.areatext {
+ border-right: 1rpx solid #ccc;
+ flex: 1;
+ margin-left: 17rpx;
+ line-height: 54rpx;
+}
+.acitivity-search-box .picker image {
+ margin: 0 22rpx;
+ display: block;
+ width: 16rpx;
+ flex-shrink: 0;
+}
+.activity-search-bg {
+ width: 422rpx;
+ height: 56rpx;
+ border-radius: 28rpx;
+ background: #f6f6f6;
+ display: flex;
+ align-items: center;
+}
+.activity-search-bg .iconfont {
+ color: #B6B6B6;
+ font-size: 28rpx;
+ flex-shrink: 0;
+ margin: 0 20rpx;
+}
+.activity-search-bg input {
+ flex: 1;
+ font-size: 27rpx;
+}
+.activity-item {
+ margin: 27rpx 16rpx;
+ background: white;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
+ border-radius: 10rpx;
+ padding: 27rpx 22rpx;
+}
+.activity-item image {
+ width: 320rpx;
+ height: 220rpx;
+ border-radius: 10rpx;
+ flex-shrink: 0;
+ overflow: hidden;
+}
+.activity-info {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ font-size: 23rpx;
+ color: #999;
+ flex: 1;
+ height: 220rpx;
+ margin-right: 28rpx;
+}
+.activity-title {
+ font-weight: 500;
+ font-size: 31rpx;
+ line-height: 45rpx;
+ color: #333;
+}
+
+.movie-types {
+ display: flex;
+ justify-content: space-between;
+ padding: 30rpx;
+ background: #0B898E;
+}
+.movie-type {
+ width: 180rpx;
+ height: 60rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 10rpx;
+ color: #fff;
+ border: 2rpx solid;
+ box-sizing: border-box;
+ text-align: center;
+ font-size: 30rpx;
+}
+.movie-type.active {
+ background: #fff;
+ color: #0B898E;
+}
+.sort-box {
+ display: flex;
+ justify-content: flex-end;
+ padding: 30rpx;
+ padding-top: 0;
+ background: #0B898E;
+ color: #D8D8D8;
+ font-size: 26rpx;
+}
+.sort-box view:nth-child(1){
+ margin-right: 50rpx;
+}
+.sort-box view.active {
+ color: #fff;
+}
+.my-search-box {
+ display: flex;
+ margin: 20rpx 30rpx;
+ align-items: center;
+ border-radius: 30rpx;
+ height: 60rpx;
+ background: #ededed;
+ margin-bottom: 0;
+ font-size: 26rpx;
+}
+.my-search-box .iconfont {
+ width: 65rpx;
+ text-align: center;
+ font-size: 32rpx;
+ flex-shrink: 0;
+}
+.my-search-box input {
+ flex: 1;
+}
+.my-search-box .search-btn {
+ text-align: center;
+ width: 110rpx;
+ flex-shrink: 0;
+ line-height: 40rpx;
+ border-left: 1rpx solid #ccc;
+ color: #0B898E;
+}
\ No newline at end of file
diff --git a/pages/list/minitrip/index.js b/pages/list/minitrip/index.js
new file mode 100644
index 0000000..2aa7b93
--- /dev/null
+++ b/pages/list/minitrip/index.js
@@ -0,0 +1,128 @@
+// pages/list/road/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ types:[],
+ type:0,
+ list:[],
+ sort:"weight",
+ order:"desc",
+ total:1,
+ keywords:""
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.getList()
+ },
+ search:function(e){
+ this.setData(e.detail);
+ this.setData({
+ list:[],
+ total:1
+ })
+ this.getList();
+ },
+ changeType:function(e){
+ this.setData({
+ type:e.detail.value,
+ list:[],
+ total:1
+ })
+ this.getList()
+ },
+ changeSort:function(e){
+ console.log(e)
+ let data = e.currentTarget.dataset;
+ if(data.sort == this.data.sort && data.order==this.data.order) return;
+ this.setData({
+ sort:data.sort,
+ order:data.order,
+ list:[],
+ total:1
+ })
+ this.getList()
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item);
+ },
+ getList:function(){
+ let list = this.data.list;
+ if(list.length>=this.data.total) return;
+ commonApi._post('product/get_product_by_tag',{
+ type_id:24,
+ tag_id:17,
+ offset:list.length,
+ limit:10,
+ sort:this.data.sort,
+ order:this.data.order,
+ title:this.data.keywords
+ }).then(res=>{
+ res.data.list.map(item=>{
+ item.display_tags = (item.display_tags?item.display_tags.split(","):[]).splice(0,2)
+ })
+ this.setData({
+ list:list.concat(res.data.list),
+ total:res.data.total
+ })
+ console.log(res)
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/minitrip/index.json b/pages/list/minitrip/index.json
new file mode 100644
index 0000000..9f79876
--- /dev/null
+++ b/pages/list/minitrip/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "search":"/pages/component/SearchHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/list/minitrip/index.wxml b/pages/list/minitrip/index.wxml
new file mode 100644
index 0000000..f71386f
--- /dev/null
+++ b/pages/list/minitrip/index.wxml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ 综合
+
+ 价格
+
+
+
+
+
+ 销量
+ 好评
+
+
+
+
+ {{item.title}}
+ {{item.rate}}分月销{{item.sales_number}}份
+
+ {{item}}
+
+
+ {{item.supplier_name}}
+ ￥{{item.price/100}} 起
+
+
+
+
+
+ 暂无内容
+
\ No newline at end of file
diff --git a/pages/list/minitrip/index.wxss b/pages/list/minitrip/index.wxss
new file mode 100644
index 0000000..2a6e949
--- /dev/null
+++ b/pages/list/minitrip/index.wxss
@@ -0,0 +1,127 @@
+/* pages/list/road/index.wxss */
+pages {
+ background: white;
+}
+.topimg {
+ width: 100%;
+ display: block;
+}
+.top-box {
+ display: flex;
+ align-items: center;
+ height: 110rpx;
+ padding: 0 25rpx;
+ border: 1rpx solid #CCCCCC;
+ font-size: 27rpx;
+ color: #999;
+ justify-content: space-between;
+ font-weight: 500;
+}
+.picker {
+ width: 198rpx;
+ height: 54rpx;
+ display: flex;
+ align-items: center;
+ border: 1rpx solid #ccc;
+ border-radius: 4rpx;
+}
+.typetext {
+ white-space: nowrap;
+ border-right: 1rpx solid #ccc;
+ flex: 1;
+ margin-left: 17rpx;
+ line-height: 54rpx;
+ color: #000;
+}
+.typetext.disable {
+ color: #999;
+}
+.picker image {
+ margin: 0 22rpx;
+ display: block;
+ width: 16rpx;
+ flex-shrink: 0;
+}
+.top-box .active {
+ color: #000;
+}
+.top-box .price-box {
+ display: flex;
+ align-items: center;
+}
+.top-box .price-box image {
+ width: 15rpx;
+ opacity: 0.6;
+ display: block;
+}
+.top-box .price-box image.active {
+ opacity: 1;
+}
+.top-box .price-box image:nth-child(1){
+ transform: rotate(180deg);
+ margin-bottom: 5rpx;
+}
+.item {
+ margin: 0 25rpx;
+ padding: 30rpx 0;
+ border-bottom: 1rpx solid #ccc;
+ display: flex;
+ font-size: 24rpx;
+ justify-content: space-between;
+}
+.item image {
+ display: block;
+ width: 233rpx;
+ height: 233rpx;
+ border-radius: 10rpx;
+ flex-shrink: 0;
+ margin-right: 22rpx;
+}
+.info {
+ width: 400rpx;
+ flex: 1;
+}
+.info .textOver2 {
+ font-size: 33rpx;
+ line-height: 44rpx;
+ color: #2F2F2F;
+ font-weight: 500;
+ margin-bottom: 20rpx;
+}
+.score {
+ color: #D62828;
+ margin-right: 17rpx;
+}
+.sales {
+ color: #666;
+}
+.tags {
+ display: flex;
+ align-items: center;
+ margin: 20rpx 0;
+}
+.tags .tag {
+ color: #0B898E;
+ font-size: 20rpx;
+ position: relative;
+ margin-right: 25rpx;
+ line-height: 22rpx;
+}
+.tags .tag::after {
+ position: absolute;
+ content: "1";
+ font-size: 0;
+ left: 0;
+ right: 0;
+ height: 8rpx;
+ top: 17rpx;
+ z-index: -1;
+ background: #DAF3E9;
+}
+.price-out {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 23rpx;
+ color: #A3A3A3;
+}
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index e7b838b..a9f2831 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -28,7 +28,7 @@
导演：{{item.director}}
主演：{{item.leading_role}}
- 购票
+ 查看
diff --git a/pages/list/movieticket/list/info/index.js b/pages/list/movieticket/list/info/index.js
index 6ec3f33..0c6fc88 100644
--- a/pages/list/movieticket/list/info/index.js
+++ b/pages/list/movieticket/list/info/index.js
@@ -6,7 +6,8 @@ Page({
* 页面的初始数据
*/
data: {
- info:null
+ info:null,
+ showFlag:false
},
/**
@@ -16,11 +17,13 @@ Page({
commonApi._post("Cinema/getMovieDetail",{
show_id:options.id
}).then(res=>{
+ let showFlag = new Date(res.data.open_day.replace(/-/,'/')).getTime()<=new Date().getTime();
res.data.listimg = res.data.listimg.split(",") || []
this.setData({
- info:res.data
+ info:res.data,
+ showFlag:showFlag
})
- console.log(res)
+ console.log(showFlag)
})
},
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 431591e..18443c9 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -23,7 +23,7 @@
-
-
+
+
立即购票
\ No newline at end of file
diff --git a/pages/list/oneday/index.js b/pages/list/oneday/index.js
new file mode 100644
index 0000000..bde7128
--- /dev/null
+++ b/pages/list/oneday/index.js
@@ -0,0 +1,128 @@
+// pages/list/road/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ types:[],
+ type:0,
+ list:[],
+ sort:"weight",
+ order:"desc",
+ total:1,
+ keywords:""
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.getList()
+ },
+ search:function(e){
+ this.setData(e.detail);
+ this.setData({
+ list:[],
+ total:1
+ })
+ this.getList();
+ },
+ changeType:function(e){
+ this.setData({
+ type:e.detail.value,
+ list:[],
+ total:1
+ })
+ this.getList()
+ },
+ changeSort:function(e){
+ console.log(e)
+ let data = e.currentTarget.dataset;
+ if(data.sort == this.data.sort && data.order==this.data.order) return;
+ this.setData({
+ sort:data.sort,
+ order:data.order,
+ list:[],
+ total:1
+ })
+ this.getList()
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item);
+ },
+ getList:function(){
+ let list = this.data.list;
+ if(list.length>=this.data.total) return;
+ commonApi._post('product/get_product_by_tag',{
+ type_id:23,
+ tag_id:17,
+ offset:list.length,
+ limit:10,
+ sort:this.data.sort,
+ order:this.data.order,
+ title:this.data.keywords
+ }).then(res=>{
+ res.data.list.map(item=>{
+ item.display_tags = (item.display_tags?item.display_tags.split(","):[]).splice(0,2)
+ })
+ this.setData({
+ list:list.concat(res.data.list),
+ total:res.data.total
+ })
+ console.log(res)
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/oneday/index.json b/pages/list/oneday/index.json
new file mode 100644
index 0000000..9f79876
--- /dev/null
+++ b/pages/list/oneday/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "search":"/pages/component/SearchHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/list/oneday/index.wxml b/pages/list/oneday/index.wxml
new file mode 100644
index 0000000..6521f23
--- /dev/null
+++ b/pages/list/oneday/index.wxml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ 综合
+
+ 价格
+
+
+
+
+
+ 销量
+ 好评
+
+
+
+
+ {{item.title}}
+ {{item.rate}}分月销{{item.sales_number}}份
+
+ {{item}}
+
+
+ {{item.supplier_name}}
+ ￥{{item.price/100}} 起
+
+
+
+
+
+ 暂无内容
+
\ No newline at end of file
diff --git a/pages/list/oneday/index.wxss b/pages/list/oneday/index.wxss
new file mode 100644
index 0000000..2a6e949
--- /dev/null
+++ b/pages/list/oneday/index.wxss
@@ -0,0 +1,127 @@
+/* pages/list/road/index.wxss */
+pages {
+ background: white;
+}
+.topimg {
+ width: 100%;
+ display: block;
+}
+.top-box {
+ display: flex;
+ align-items: center;
+ height: 110rpx;
+ padding: 0 25rpx;
+ border: 1rpx solid #CCCCCC;
+ font-size: 27rpx;
+ color: #999;
+ justify-content: space-between;
+ font-weight: 500;
+}
+.picker {
+ width: 198rpx;
+ height: 54rpx;
+ display: flex;
+ align-items: center;
+ border: 1rpx solid #ccc;
+ border-radius: 4rpx;
+}
+.typetext {
+ white-space: nowrap;
+ border-right: 1rpx solid #ccc;
+ flex: 1;
+ margin-left: 17rpx;
+ line-height: 54rpx;
+ color: #000;
+}
+.typetext.disable {
+ color: #999;
+}
+.picker image {
+ margin: 0 22rpx;
+ display: block;
+ width: 16rpx;
+ flex-shrink: 0;
+}
+.top-box .active {
+ color: #000;
+}
+.top-box .price-box {
+ display: flex;
+ align-items: center;
+}
+.top-box .price-box image {
+ width: 15rpx;
+ opacity: 0.6;
+ display: block;
+}
+.top-box .price-box image.active {
+ opacity: 1;
+}
+.top-box .price-box image:nth-child(1){
+ transform: rotate(180deg);
+ margin-bottom: 5rpx;
+}
+.item {
+ margin: 0 25rpx;
+ padding: 30rpx 0;
+ border-bottom: 1rpx solid #ccc;
+ display: flex;
+ font-size: 24rpx;
+ justify-content: space-between;
+}
+.item image {
+ display: block;
+ width: 233rpx;
+ height: 233rpx;
+ border-radius: 10rpx;
+ flex-shrink: 0;
+ margin-right: 22rpx;
+}
+.info {
+ width: 400rpx;
+ flex: 1;
+}
+.info .textOver2 {
+ font-size: 33rpx;
+ line-height: 44rpx;
+ color: #2F2F2F;
+ font-weight: 500;
+ margin-bottom: 20rpx;
+}
+.score {
+ color: #D62828;
+ margin-right: 17rpx;
+}
+.sales {
+ color: #666;
+}
+.tags {
+ display: flex;
+ align-items: center;
+ margin: 20rpx 0;
+}
+.tags .tag {
+ color: #0B898E;
+ font-size: 20rpx;
+ position: relative;
+ margin-right: 25rpx;
+ line-height: 22rpx;
+}
+.tags .tag::after {
+ position: absolute;
+ content: "1";
+ font-size: 0;
+ left: 0;
+ right: 0;
+ height: 8rpx;
+ top: 17rpx;
+ z-index: -1;
+ background: #DAF3E9;
+}
+.price-out {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 23rpx;
+ color: #A3A3A3;
+}
diff --git a/pages/list/sale/index.wxss b/pages/list/sale/index.wxss
index 4dce904..07fc6d1 100644
--- a/pages/list/sale/index.wxss
+++ b/pages/list/sale/index.wxss
@@ -11,6 +11,7 @@
font-size: 29rpx;
color: #333;
background: white;
+ z-index: 2;
}
.sale-type {
position: relative;
diff --git a/pages/map/index.js b/pages/map/index.js
index a116f49..02f12f8 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -116,7 +116,7 @@ Page({
},
getList:function(){
this.mapCtx = wx.createMapContext("map");
- let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema'],that = this;
+ let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes'],that = this;
this.mapCtx.getRegion({
type: 'gcj02',
success: function(res) {
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index d29026f..e59ba95 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -38,6 +38,10 @@
运河十景
+
@@ -45,6 +49,6 @@
{{info.info.title}}
地址：{{info.info.address}}
- 查看详情
+ 查看详情
\ No newline at end of file
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index bfaad9a..f638149 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -81,6 +81,10 @@
background: #9342CB;
border-color: #9342CB;
}
+.right-menus .right-menu-item:nth-child(8).active {
+ background: #9d6b00;
+ border-color: #9d6b00;
+}
.right-menu-item.active .iconfont {
color: #fff !important;
}
diff --git a/pages/order/hotel/index.js b/pages/order/hotel/index.js
index 6831c8a..fdb4364 100644
--- a/pages/order/hotel/index.js
+++ b/pages/order/hotel/index.js
@@ -54,8 +54,7 @@ Page({
roomNumbers.push(i+1)
}
this.setData({
- roomNumbers:roomNumbers,
- CtripHotelCart:CtripHotelCart
+ roomNumbers:roomNumbers
})
commonApi.user_post("product/product_date_price",{
sku_id:CtripHotelCart.id,
@@ -63,8 +62,14 @@ Page({
start_date:CtripHotelCart.startDate
}).then(res=>{
res.data.splice(1,1);
+ let price_sum = 0;
+ res.data.map(item=>{
+ price_sum = price_sum + Number(item.price)
+ })
+ CtripHotelCart.price_sum = price_sum;
this.setData({
- priceInfo:res.data
+ priceInfo:res.data,
+ CtripHotelCart:CtripHotelCart
})
})
},
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index d20584c..10aad2e 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -53,10 +53,10 @@
非遗传承
-
+
文物查询
@@ -67,7 +67,7 @@
- 借书还书
+ 书香借阅
diff --git a/pages/pbService/library/index.wxml b/pages/pbService/library/index.wxml
index f21c147..939bab0 100644
--- a/pages/pbService/library/index.wxml
+++ b/pages/pbService/library/index.wxml
@@ -1,5 +1,5 @@
-
+