diff --git a/pages/index/index.js b/pages/index/index.js
index 677da7b..c6f3103 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -436,6 +436,12 @@ Page({
path: 'pages/home/home'
})
return;
+ }else if (e.currentTarget.dataset.event == 'changshu_click') {
+ wx.navigateToMiniProgram({
+ appId: 'wx4df5fd9a6a5ea123',
+ path: 'pages/index'
+ })
+ return;
}else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
wx.navigateToMiniProgram({
appId: 'wxd323e63a10aa6865',
@@ -829,7 +835,7 @@ Page({
if (item.type == 'h5') {
app.globalData.weburl = item.url
wx.navigateTo({
- url: "/pages/pbService/web/index"
+ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
})
} else if (item.type == 'mini') {
wx.navigateToMiniProgram({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c5ccbf0..817be63 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -309,6 +309,22 @@
廉洁地图
-->
+
+
+
+
+ 书香借阅
+
+
+
+
+
+ 公共文化资源库
+
-
-
- 书香借阅
-
-
-
-
-
-
- 公共文化资源库
-
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 06c0e4f..c058797 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -327,7 +327,7 @@ page {
.pbservice {
/* width: calc(175rpx * 6); */
/* 元旦修改 */
- width: calc(190rpx * 6);
+ width: calc(190rpx * 8);
display: flex;
margin-top: 20rpx;
flex-wrap: wrap;
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index 021a01c..7bb8b85 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -14,7 +14,8 @@ Page({
lon:null,
page:1,
isMore:true,
- list:[]
+ list:[],
+ keyword:"",
},
/**
@@ -93,6 +94,24 @@ Page({
// url: 'info/ticket/index?id='+item.third_id+"&title="+item.title
// })
// },
+ inputKeyword:function(e){
+ this.setData({
+ keyword:e.detail.value
+ })
+ },
+ search:function(){
+ if(!this.data.keyword) {
+ wx.showToast({
+ title: '请输入关键字',
+ icon:'none'
+ })
+ return;
+ }
+ this.getList()
+ // wx.navigateTo({
+ // url: 'list/index?keyword='+this.data.keyword,
+ // })
+ },
gotoDetail1:function(e){
let item = e.currentTarget.dataset.item;
wx.navigateTo({
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 0ae5aa5..5345a58 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -1,4 +1,11 @@
+
热映
影院
diff --git a/pages/list/movieticket/index.wxss b/pages/list/movieticket/index.wxss
index ab30723..cd124ce 100644
--- a/pages/list/movieticket/index.wxss
+++ b/pages/list/movieticket/index.wxss
@@ -181,4 +181,42 @@ page {
}
.cinemalist .cinema:last-child {
border-bottom: none;
+}
+.my-top-search {
+ /* position: fixed; */
+ left: 0;
+ right: 0;
+ background: #f0f0f0;
+ padding: 16rpx 0;
+ z-index: 1;
+}
+.my-search-box {
+ height: 56rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-left: 20rpx;
+ background: #fff;
+ border-radius: 30rpx;
+ margin: 0 auto;
+ width: 560rpx;
+}
+.my-search-box .iconfont {
+ color: #999999;
+ flex-shrink: 0;
+}
+.my-search-box input {
+ display: block;
+ flex: 1;
+ margin: 0 20rpx;
+ font-size: 26rpx;
+}
+.my-search-btn {
+ flex-shrink: 0;
+ width: 110rpx;
+ text-align: center;
+ font-size: 26rpx;
+ color: #0B898E;
+ border-left: 1rpx solid #ccc;
+ line-height: 40rpx;
}
\ No newline at end of file
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index c571922..8968e3a 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -1,6 +1,6 @@
-
+
@@ -47,7 +47,7 @@
停车场
-
+
公共自行车
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index a6d3748..fecee13 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -5,7 +5,7 @@
{{product.product.title + product.isGroup==1?'（团体预约）':product.sku.sku_name}}
免费
-