diff --git a/common/param.js b/common/param.js index 9c7afac..049dfce 100644 --- a/common/param.js +++ b/common/param.js @@ -20,6 +20,7 @@ module.exports = { specialgoodType: "2909" ,//特产类型 methodType: "2907" ,//攻略类型 hotevent:"2906", //活动类型 + siren:"2931", //私人订制 hoteventType: "21" ,//活动筛选类型 hoteventTypeKey:"sub_column1", //活动类型key对应的后台字段 hoteventPhoneKey:"sub_column2", //活动电话key对应的后台字段 diff --git a/manifest.json b/manifest.json index 38e1b75..44949a7 100644 --- a/manifest.json +++ b/manifest.json @@ -9,8 +9,8 @@ "app-plus" : { "usingComponents" : true, "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, + "alwaysShowBeforeRender" : false, + "waiting" : false, "autoclose" : true, "delay" : 0 }, @@ -50,7 +50,10 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : {}, + "splashscreen" : { + "androidStyle" : "common" + } } }, /* 快应用特有相关 */ @@ -64,9 +67,9 @@ "postcss" : true, "es6" : true }, - "optimization" : { - "subPackages" : true - }, + "optimization" : { + "subPackages" : true + }, "usingComponents" : true, "permission" : { "scope.userLocation" : { diff --git a/pages.json b/pages.json index 982db35..c421e1b 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,13 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + // { + // "path": "pages/welcome/welcome", + // "style": { + // "navigationBarTitleText": "衡水老白干", + // "enablePullDownRefresh": false + // } + // }, { "path": "pages/index/index", "style": { @@ -20,7 +27,7 @@ } }, - + { "path": "pages/hotevent/hoteventlist/hoteventlist", "style": { @@ -76,7 +83,7 @@ "navigationBarTitleText": "数字导览" } }, - + { "path": "pages/myComment/list/list", "style": { @@ -86,7 +93,7 @@ { "path": "pages/index/login/login", "style": {} - }, { + }, { "path": "pages/index/lvfadahui/lvfadahui", "style": { "navigationBarTitleText": "详情", @@ -135,8 +142,8 @@ "navigationBarTitleText": "投诉填报" } - }, - + }, + { "path": "pages/myReserve/myReserve", "style": { @@ -151,7 +158,7 @@ } }, - + { "path": "pages/personcenter/scanCodeRecord/scanCodeRecord", @@ -248,7 +255,7 @@ "style": { "navigationBarTitleText": "隐私政策" } - }, + }, { @@ -275,13 +282,26 @@ "style": { "navigationBarTitleText": "数字导览" } + }, { + "path": "pages/sirendingzhi/sirendingzhilist/sirendingzhilist", + "style": { + "navigationBarTitleText": "私人订制", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail", + "style": { + "navigationBarTitleText": "私人订制详情", + "enablePullDownRefresh": false + } + } ], //分包加载配置,此配置为小程序的分包加载机制。 "subPackages": [{ "root": "sunPackIndex", //子包的根目录 - "pages": [ - { + "pages": [{ "path": "cate/destination", "style": { "navigationBarTitleText": "详情", @@ -302,7 +322,7 @@ "path": "scenic/sceniclist/sceniclist", "style": { "navigationBarTitleText": "景点推荐" - + } }, { @@ -323,7 +343,7 @@ { "path": "scenic/imageshow/imageshow", "style": {} - }, + }, { "path": "scenic/scenicdetial/url720/url720", "style": { @@ -334,129 +354,127 @@ "style": { "navigationBarTitleText": "数字导览" } - },{ - "path": "scenic/scenicdetial/ticket/ticket", - "style": { - "navigationStyle": "custom", - "app-plus": { - "titleView": false - } - } - }, { - "path": "scenic/subscribe/subscribe", - "style": { - "navigationBarTitleText": "详情", - "navigationStyle": "custom", - "app-plus": { - "titleView": false + }, { + "path": "scenic/scenicdetial/ticket/ticket", + "style": { + "navigationStyle": "custom", + "app-plus": { + "titleView": false + } } + }, { + "path": "scenic/subscribe/subscribe", + "style": { + "navigationBarTitleText": "详情", + "navigationStyle": "custom", + "app-plus": { + "titleView": false + } - } - },{ - "path": "scenic/subscribe/yue_form", - "style": { - "navigationBarTitleText": "景区预约", - "navigationStyle": "custom", - "app-plus": { - "titleView": false } + }, { + "path": "scenic/subscribe/yue_form", + "style": { + "navigationBarTitleText": "景区预约", + "navigationStyle": "custom", + "app-plus": { + "titleView": false + } - } - },{ - "path": "scenic/subscribe/qrcode/qrcode", - "style": { - "navigationBarTitleText": "二维码" + } + }, { + "path": "scenic/subscribe/qrcode/qrcode", + "style": { + "navigationBarTitleText": "二维码" - } - }, - { - "path": "scenic/subscribe/qrcode/erweima", - "style": { - "navigationBarTitleText": "二维码" + } + }, + { + "path": "scenic/subscribe/qrcode/erweima", + "style": { + "navigationBarTitleText": "二维码" - } - }, + } + }, - { - "path": "scenic/subscribe/qrcode/reserve_detail", - "style": { - "navigationBarTitleText": "预约详情" + { + "path": "scenic/subscribe/qrcode/reserve_detail", + "style": { + "navigationBarTitleText": "预约详情" - } - }, - { - "path": "scenic/subscribe/qrcode/reserve_detail_2", - "style": { - "navigationBarTitleText": "预约详情" + } + }, + { + "path": "scenic/subscribe/qrcode/reserve_detail_2", + "style": { + "navigationBarTitleText": "预约详情" - } - }, - { - "path": "scenic/subscribe/qrcode/yue_detail", - "style": { - "navigationBarTitleText": "预约详情" + } + }, + { + "path": "scenic/subscribe/qrcode/yue_detail", + "style": { + "navigationBarTitleText": "预约详情" - } - }, - { - "path": "scenic/subscribe/yuyue/yue_detail_2", - "style": { - "navigationBarTitleText": "预约详情" + } + }, + { + "path": "scenic/subscribe/yuyue/yue_detail_2", + "style": { + "navigationBarTitleText": "预约详情" - } - }, + } + }, - { - "path": "scenic/subscribe/yuyue/yue_form_2", - "style": { - "navigationBarTitleText": "预约详情" + { + "path": "scenic/subscribe/yuyue/yue_form_2", + "style": { + "navigationBarTitleText": "预约详情" - } - }, - { - "path": "scenic/subscribe/yuyue/yue_list", - "style": { - "navigationBarTitleText": "预约景区" + } + }, + { + "path": "scenic/subscribe/yuyue/yue_list", + "style": { + "navigationBarTitleText": "预约景区" - } - }, - { - "path": "scenic/subscribe/yuyue/yue_time", - "style": { - "navigationBarTitleText": "预约景区详情" + } + }, + { + "path": "scenic/subscribe/yuyue/yue_time", + "style": { + "navigationBarTitleText": "预约景区详情" - } - },{ - "path": "scenic/subscribe/yuyue/yue_list_js", - "style": { - "navigationBarTitleText": "预约景区" + } + }, { + "path": "scenic/subscribe/yuyue/yue_list_js", + "style": { + "navigationBarTitleText": "预约景区" - } - }, { - "path": "scenic/subscribe/yuyue/yue_time_js", - "style": { - "navigationBarTitleText": "预约景区详情", - "app-plus": { - "titleNView": { - "type": "transparent" + } + }, { + "path": "scenic/subscribe/yuyue/yue_time_js", + "style": { + "navigationBarTitleText": "预约景区详情", + "app-plus": { + "titleNView": { + "type": "transparent" + } } } - } - }, { - "path": "scenic/subscribe/yuyue/yue_form_js", - "style": { - "navigationBarTitleText": "填写预约表单" - } - }, { - "path": "scenic/subscribe/yuyue/yue_detail_js", - "style": { - "navigationBarTitleText": "预约详情" + }, { + "path": "scenic/subscribe/yuyue/yue_form_js", + "style": { + "navigationBarTitleText": "填写预约表单" + } + }, { + "path": "scenic/subscribe/yuyue/yue_detail_js", + "style": { + "navigationBarTitleText": "预约详情" + } } - } - - ] }], diff --git a/pages/feiyi/feiyilist/feiyilist.vue b/pages/feiyi/feiyilist/feiyilist.vue index b365ede..86492d0 100644 --- a/pages/feiyi/feiyilist/feiyilist.vue +++ b/pages/feiyi/feiyilist/feiyilist.vue @@ -245,7 +245,6 @@ export default { this.get_data(); }, getData: function() { - debugger var that = this; var data = { "key": this.$param.userkey + "_feiyi_list" @@ -431,7 +430,6 @@ export default { } }, get_data: function() { - debugger uni.showLoading({ title: '加载中', mask: true diff --git a/pages/hotevent/hoteventlist/hoteventlist.vue b/pages/hotevent/hoteventlist/hoteventlist.vue index 6aa757a..e98fcf5 100644 --- a/pages/hotevent/hoteventlist/hoteventlist.vue +++ b/pages/hotevent/hoteventlist/hoteventlist.vue @@ -387,6 +387,7 @@ export default { a.noData || a.finished || a.loading || this.get_data(); }, getRedisData: function() { + debugger var that = this; var data = { key: this.$param.userkey + '_hotEvent_list' @@ -422,6 +423,7 @@ export default { }); }, get_data: function() { + debugger this.param.loading = true; // var type = this.selectcondition.type; // if (type != undefined && type != null && type != '') { diff --git a/pages/index/index.vue b/pages/index/index.vue index 14e8a46..50b7735 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -601,9 +601,9 @@ export default { url: '/pages/traffic/outTraffic' }); } else if (type == 'dingzhi') { - //交通指南 + //私人订制 uni.navigateTo({ - url: '/pages/traffic/outTraffic' + url: '/pages/sirendingzhi/sirendingzhilist/sirendingzhilist' }); } else if (type == 'shop') { uni.navigateToMiniProgram({ diff --git a/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.css b/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.css new file mode 100644 index 0000000..560e0b5 --- /dev/null +++ b/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.css @@ -0,0 +1,357 @@ +page { + background: #fff; +} + +.lh-swiper { + width: 100%; + height: 425rpx; + position: relative; +} + +.slide-image { + width: 100%; + height: 416rpx; +} + +.swiper-info { + color: #c8c8c8; + height: 50rpx; + line-height: 50rpx; + position: absolute; + right: 0; + bottom: 0; + left: 0; + padding: 0 30rpx; + font-size: 24rpx; + background: rgba(0,0,0,.6); +} + +.pdc-common-info { + width: 100%; + padding: 0rpx 30rpx; + margin-bottom: 16rpx; + box-sizing: border-box; + background: #fff; +} + + +.info-box { + padding: 30rpx 0; +} + + +.info-list { + display: -webkit-box; + padding: 10rpx 0; + +} + +.info-list:last-child { + border-bottom: none; +} + +.info-list .pic { + + + + width: 50rpx; + height: 37rpx; + display: flex; + flex-direction: column; + justify-content: center; + +} + +.info-list .pic image { + width: 32rpx; + height: 32rpx; +} + +.info-list .address { + -webkit-box-flex: 1; + font-size: 28rpx; + color: #666; + + +} + +.info-list .txt { + -webkit-box-flex: 1; + font-size: 26rpx; + color: #2a2a2a; + + +} + + +.info-list .title { + + font-size: 36rpx; + font-weight:bold; + padding: 20rpx 0 0 0; +} + +.swiper-tab-wrap { + width: 100%; + background: #fff; +} + +.swiper-tab-bar { + width: 100%; + height: 80rpx; + line-height: 80rpx; + border-bottom: 2rpx solid #e6e6e6; + text-align: center; +} + +.swiper-tab-nav { + width: 33.33%; + height: 76rpx; + display: inline-block; + font-size: 32rpx; +} + +.on { + color: #00b7ee; + border-bottom: 4rpx solid #00b7ee; +} + +.swiper-tab-box { + display: none; +} + +.show { + display: block; +} + +.line-type-wrap { + padding: 0 30rpx; +} + +.line-type-item { + display: flex; + padding: 20rpx 0; + border-bottom: 2rpx solid #e6e6e6; +} + +.line-type-item:last-child { + border-bottom: none; +} + +.l-info { + flex: 1; +} + +.l-info .tit { + font-size: 28rpx; +} + +.l-info .txt { + color: #969696; + padding-top: 15rpx; + font-size: 22rpx; +} + +.r-info { + width: 150rpx; + margin-left: 20rpx; + text-align: center; +} + +.r-info .pri { + color: #ff6b1a; + font-size: 24rpx; +} + +.r-info .pri .num { + font-size: 28rpx; +} + +.r-info .booking-btn { + color: #fff; + display: inline-block; + height: 42rpx; + line-height: 42rpx; + padding: 0 24rpx; + border-radius: 8rpx; + font-size: 28rpx; + background: #f63; +} + +.r-info .booking-btnhui { + color: #fff; + display: inline-block; + height: 42rpx; + line-height: 42rpx; + padding: 0 24rpx; + border-radius: 8rpx; + font-size: 28rpx; + background: #c8c8c8; +} + +.line-show-wrap { +} + +.line-show-item { + padding: 20rpx 30rpx; +} + +.yd-box { + padding: 15rpx 30rpx; + border-top: 1rpx solid #bfbfc3; +} + +.yd-box .yd-btn { + color: #fff; + display: block; + width: 100%; + height: 70rpx; + line-height: 70rpx; + text-align: center; + font-size: 28rpx; + border-radius: 5rpx; + background: #f63; + border: 1rpx solid #f63; +} + +.line-show-item .item-title { + + + + font-size: 32rpx; + font-weight:bold; + color: #05A9F0; + padding: 20rpx 0 ; + border-bottom: 2rpx solid #05A9F0; + +} + +.line-show-item .item-txt { + color: #2a2a2a; + line-height: 50rpx; + padding-top: 10rpx; + font-size: 28rpx; +} + +.line-show-item .item-txt image { + max-width: 100%!important; +} + +.day-block { +} + +.day-block .day-tit { + display: flex; + padding-top: 20rpx; + font-size: 26rpx; +} + +.day-block .day-tit .sz { + width: 108rpx; +} + +.day-block .day-tit .bt { + flex: 1; +} + +.day-block .attr { + display: flex; + padding-top: 20rpx; + font-size: 24rpx; +} + +.day-block .attr .hd { + width: 108rpx; + line-height: 40rpx; +} + +.day-block .attr .bd { + color: #666; + flex: 1; + line-height: 40rpx; +} + +.day-block .attr .bd .label { + display: block; +} + +.day-block .attr .icon { + width: 24rpx; + height: 24rpx; + vertical-align: middle; + margin: -8rpx 6rpx 0 0; +} + +.comment-container { +} + +.comment-container .tip-bar { + display: flex; + padding: 0 30rpx; + justify-content: space-between; + border-bottom: 1px solid #e6e6e6; +} + +.comment-container .tip-bar .item { + line-height: 80rpx; + font-size: 28rpx; +} + +.comment-container .tip-bar .item .num { + color: #f80; +} + +.conment-list { + padding: 30rpx; + border-bottom: 1px solid #e6e6e6; +} + +.conment-list .comt-info { + display: flex; +} + +.conment-list .comt-info .pic { + width: 86rpx; + height: 86rpx; +} + +.conment-list .comt-info .pic image { + width: 86rpx; + height: 86rpx; + border-radius: 50%; +} + +.conment-list .comt-info .user { + flex: 1; + padding: 0 20rpx; +} + +.conment-list .comt-info .user .name { + line-height: 40rpx; + font-size: 28rpx; +} + +.conment-list .comt-info .user .date { + color: #999; + line-height: 40rpx; + font-size: 24rpx; +} + + + +/* .info-list .more { + width: 40rpx; + height: 40rpx; + position: relative; +} */ + +.info-list .more:after { + content: ""; + width: 16rpx; + height: 16rpx; + position: absolute; + top: 50%; + border-top: 4rpx solid #c7c7cc; + border-right: 4rpx solid #c7c7cc; + transform: rotate(45deg) translateY(-70%); +} \ No newline at end of file diff --git a/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.vue b/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.vue new file mode 100644 index 0000000..486411f --- /dev/null +++ b/pages/sirendingzhi/sirendingzhidetail/sirendingzhidetail.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.css b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.css new file mode 100644 index 0000000..16d0b9d --- /dev/null +++ b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.css @@ -0,0 +1,40 @@ +page{position:relative;overflow-y:hidden;height:100%;} +/* .search-container{position:relative;z-index:3;overflow:hidden;width:100%;height:100%;background:#fff;} +.search-tip-bar{display:flex;height:60rpx;border-bottom:2rpx solid #e5e5e5;justify-content:space-between;} +.search-tip-item{width:33.333333%;height:60rpx;text-align:center;font-size:28rpx;line-height:60rpx;} +.search-tip-item:after{display:inline-block;margin:-2rpx 0 0 6rpx;width:0;height:0;border-top:8rpx solid #666;border-right:8rpx solid transparent;border-left:8rpx solid transparent;content:"";vertical-align:middle;} +.search-tip-item.active:after{border-top:0;border-right:8rpx solid transparent;border-bottom:8rpx solid #666;border-left:8rpx solid transparent;} */ +.scroll-view{position:absolute;top:80rpx;right:0;bottom:0;left:0;z-index:4;} +.list-container{width:100%;background:#fff;} +.list-wrap{box-sizing:border-box;padding:0 30rpx;width:100%;} +.list-item{position:relative;margin-top:40rpx; width:100%;box-shadow: rgba(0,0,0,.1) 0 0 20rpx;border-radius:10rpx;} +.list-item .item-pic{margin:0;width:100%;height:350rpx;border-radius:10rpx 10rpx 0 0;} +.list-item .item-info .bt{overflow:hidden;padding:10px 2% 15px;text-overflow:ellipsis;white-space:nowrap;font-size:13px;line-height:14px;-webkit-line-clamp:1;-webkit-box-orient:vertical;} +.item-city{position:absolute;top:10px;right:10px;padding:8rpx 15rpx;border:2rpx solid rgba(255,194,48,1);border-radius:25rpx 0 20rpx 0rpx;background:rgba(255,194,48,1);color:#510202;font-size:24rpx;} +.item-city text{margin:auto 5px;} +.item-title{position:absolute;top:80px;overflow:hidden;margin-left:5%;width:90%;color:#fff;text-overflow:ellipsis;white-space:nowrap;font-size:16px;} + +.hd_wp_2{/* position:absolute; bottom: 0;background:linear-gradient(bottom,rgba(0,0,0,.8),rgba(0,0,0,0)); */ padding: 20rpx 0; width: 100%;} +.hd_bt{color:#333;font-size:30rpx; padding-left: 20rpx; font-weight: 700; padding-bottom: 10rpx;text-overflow:ellipsis;white-space:pre-wrap;-webkit-box-orient:vertical;-webkit-line-clamp:1;display:-webkit-box;overflow:hidden; position: relative; } +.hd_bt:before{ content: ''; display: inline-block; width: 6rpx; height: 24rpx; border-radius: 50%; background: rgb(22, 119, 255); vertical-align: middle; position: absolute; left: 0rpx; top:10rpx } +.hd_time{color:#999; font-size: 28rpx;padding-left: 20rpx;} + +/* .item-desc{position:absolute;top:140px;bottom:20rpx;display:block;overflow:hidden;padding:20rpx 0;width:100%;border-bottom-right-radius:10rpx;border-bottom-left-radius:10rpx;background:linear-gradient(bottom,rgba(0,0,0,.8),rgba(0,0,0,0));color:#fff;text-indent:30rpx;text-overflow:ellipsis;text-shadow:1px 2px 5px #000;text-shadow:0 0 10rpx rgba(0,0,0,.5);white-space:nowrap;font-weight:600;font-size:32rpx;} +.item-eventdate{position:absolute;top:175px;overflow:hidden;margin-left:5%;width:90%;color:#fff;text-overflow:ellipsis;white-space:nowrap;font-size:25rpx;opacity:.6;} */ +.sort-page{position:absolute;top:62rpx;right:0;bottom:0;left:0;z-index:10;background:rgba(0,0,0,.5);} +.sort-group{background:#fff;} +.sort-item{position:relative;padding:0 30rpx;height:78rpx;border-bottom:2rpx solid #e5e5e5;color:#666;font-size:28rpx;line-height:78rpx;} +.sort-item-active{color:#1677ff;} +.sort-item-active:after{position:absolute;top:50%;right:20rpx;display:inline-block;margin-top:-14rpx;width:22rpx;height:18rpx;background:url("") center no-repeat;background-size:contain;content:"";} +.filter-page{position:absolute;top:62rpx;right:0;bottom:0;left:0;z-index:10;background:#fff;} +.filter-box{position:absolute;top:0;right:0;bottom:108rpx;left:0;display:-webkit-box;} +.filter-hd{width:220rpx;height:100%;background:#f2f6f9;} +.filter-hd-item{position:relative;padding:0 20rpx;height:80rpx;font-size:28rpx;line-height:80rpx;} +.filter-bd-item-active,.filter-hd-item-active{background:#fff;color:#1677ff;} +.filter-bd-item-active:after{position:absolute;top:50%;right:20rpx;display:inline-block;margin-top:-14rpx;width:22rpx;height:18rpx;background:url("") center no-repeat;background-size:contain;content:"";} +.filter-bd{padding:0 20rpx;height:100%;-webkit-box-flex:1;} +.filter-bd-item{position:relative;padding:0 20rpx;height:78rpx;border-bottom:2rpx solid #e5e5e5;font-size:28rpx;line-height:78rpx;} +.control-bar-block{position:absolute;right:0;bottom:0;left:0;display:-webkit-box;padding:14rpx 20rpx;height:80rpx;background:#fafafa;} +.control-back-btn{margin-right:20rpx;width:170rpx;height:76rpx;border:2rpx solid #b8b8b8;border-radius:10rpx;color:#8a8a8a;text-align:center;font-size:26rpx;line-height:76rpx;} +.control-confirm-btn{height:80rpx;border-radius:10rpx;background:#1677ff;color:#fff;text-align:center;font-size:30rpx;line-height:80rpx;-webkit-box-flex:1;} +.goTop{position:fixed;right:30rpx;bottom:50rpx;width:80rpx;height:80rpx;border-radius:50%;} diff --git a/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue new file mode 100644 index 0000000..894ea46 --- /dev/null +++ b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue @@ -0,0 +1,512 @@ + + + + + diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue new file mode 100644 index 0000000..8f249fb --- /dev/null +++ b/pages/welcome/welcome.vue @@ -0,0 +1,40 @@ + + + + +