Skip to content

严立 / mini-shimao

Go to a project
Commit b826bd05 by 严立
Options

LL - 二期初始代码

parent 848a39fe
Inline Side-by-side
Showing with 1420 additions and 2416 deletions
app.js
import iMiment from './npm/miment.js'
import iUtils from './utils/utils.js'
App({
modular: {
'utils': iUtils,
'miment': iMiment,
},
globalData: {
appImageBase: '../../../image/',
appResourcesBase: 'https://sm-web.meiqicloud.com/userfiles/appResources/',
token: '',
refreshToken: '',
......
app.json
{
"pages": [
"pages/home/home",
"pages/mine/mine",
"pages/play/play",
"pages/ownerCertification/ownerCertification",
"pages/hotelAccommodation/hotelAccommodation",
"pages/login/login",
"pages/guide/guide",
"pages/campsite/campsite",
"pages/campsite-mirror/campsite-mirror",
"pages/myInfo/myInfo",
"pages/myActivity/myActivity",
"pages/myAppointment/myAppointment",
"pages/moreProblems/moreProblems",
"pages/customerService/customerService",
"pages/appointment/appointment",
"pages/activity/activity",
"pages/activityDetail/activityDetail",
"pages/activity-detail/activity-detail",
"pages/activity-entry/activity-entry",
"pages/notice/notice",
"pages/notice-detail/notice-detail",
"pages/shop-detail/shop-detail",
"pages/shop-point-detail/shop-point-detail",
"pages/strategy/strategy",
"pages/index/index"
"pages/home/home/home",
"pages/home/dynamic/dynamic",
"pages/home/dynamic-detail/dynamic-detail",
"pages/home/night-appointment/night-appointment",
"pages/home/guide/guide",
"pages/home/history/history",
"pages/play/home/home",
"pages/play/service/service",
"pages/play/service-detail/service-detail",
"pages/play/service-sell/service-sell",
"pages/play/activity/activity",
"pages/play/activity-detail/activity-detail",
"pages/play/activity-entry/activity-entry",
"pages/play/movie/movie",
"pages/play/movie-detail/movie-detail",
"pages/play/point-detail/point-detail",
"pages/play/strategy-detail/strategy-detail",
"pages/commodity/home/home",
"pages/commodity/shopping-cart/shopping-cart",
"pages/commodity/food/food",
"pages/commodity/project/project",
"pages/commodity/snacks/snacks",
"pages/commodity/art/art",
"pages/commodity/room/room",
"pages/commodity/room-appointment/room-appointment",
"pages/campsite/home/home",
"pages/campsite/home-mirror/home-mirror",
"pages/mine/home/home",
"pages/mine/info/info",
"pages/mine/order/order",
"pages/mine/card/card",
"pages/mine/accumulate/accumulate",
"pages/mine/appointment/appointment",
"pages/mine/appointment-ticket/appointment-ticket",
"pages/mine/appointment-detail/appointment-detail",
"pages/mine/authentication-state/authentication-state",
"pages/mine/authentication-input/authentication-input",
"pages/mine/question/question",
"pages/mine/question-more/question-more",
"pages/pay/home/home",
"pages/pay/order-input/order-input",
"pages/pay/order-detail/order-detail",
"pages/pay/coupon/coupon",
"pages/pay/coupon-input/coupon-input",
"pages/pay/coupon-detail/coupon-detail",
"pages/login/login"
],
"usingComponents": {
"navigation": "../component/navigation/navigation",
......@@ -45,13 +62,13 @@
"l-tabpanel": "../miniprogram_npm/lin-ui/tabpanel/index",
"l-toast": "../miniprogram_npm/lin-ui/toast/index",
"l-water-flow": "../miniprogram_npm/lin-ui/water-flow/index",
"l-input":"../miniprogram_npm/lin-ui/input/index",
"l-mask":"../miniprogram_npm/lin-ui/mask/index",
"l-arc-popup":"../miniprogram_npm/lin-ui/arc-popup/index",
"l-collapse":"../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item":"../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea":"../miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar":"../miniprogram_npm/lin-ui/notice-bar/index"
"l-input": "../miniprogram_npm/lin-ui/input/index",
"l-mask": "../miniprogram_npm/lin-ui/mask/index",
"l-arc-popup": "../miniprogram_npm/lin-ui/arc-popup/index",
"l-collapse": "../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "../miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index"
},
"window": {
"navigationStyle": "custom",
......@@ -67,25 +84,25 @@
"backgroundColor": "#ffffff",
"list": [
{
"pagePath": "pages/home/home",
"pagePath": "pages/home/home/home",
"iconPath": "image/tabbar/home.png",
"selectedIconPath": "image/tabbar/home-s.png",
"text": "首页"
},
{
"pagePath": "pages/play/play",
"pagePath": "pages/play/home/home",
"iconPath": "image/tabbar/play.png",
"selectedIconPath": "image/tabbar/play-s.png",
"text": "畅玩"
},
{
"pagePath": "pages/campsite/campsite",
"pagePath": "pages/campsite/home/home",
"iconPath": "image/tabbar/campsite.png",
"selectedIconPath": "image/tabbar/campsite-s.png",
"text": "营地"
},
{
"pagePath": "pages/mine/mine",
"pagePath": "pages/mine/home/home",
"iconPath": "image/tabbar/mine.png",
"selectedIconPath": "image/tabbar/mine-s.png",
"text": "我的"
......
component/swiper-point/swiper-point.js
Component({
/**
* 组件的属性列表
*/
properties: {
bannerActiveIndex: {
type: Number,
......@@ -37,7 +34,6 @@ Component({
lifetimes: {
attached: function () {
console.log(this.data.bannerStyle)
this.setStyle()
},
},
......
pages/activityDetail/activityDetail.js deleted 100644 → 0
// pages/activityDetail/activityDetail.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
type:'1',
cover: '',
activityName: '',
activeDate: '',
name: '',
mobile: '',
enrollDate: '',
enrollNum: '',
activityId: '',
// 接口参数
enrollId: '',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that =this;
console.log(options);
// var options = JSON.parse(options);
that.setData({
enrollId : options.enrollid
})
app.login({
success: function() {
that.getMyActivityDetail()
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
activityDetail() {
wx.navigateTo({
url: '/pages/activity-detail/activity-detail?id='+this.data.activityId
})
},
// 我的活动详情
getMyActivityDetail() {
let that = this
wx.lin.showToast({
icon: 'loading',
title: '正在加载',
show: true,
duration: 1000*60,
})
app.wxRequest({
url: '/api/v1/activity/getMyActivityDetail',
data: {
enrollId: this.data.enrollId
},
success: function(res) {
wx.lin.hideToast()
let state = res.data.activeState*1
let type = 0
switch (state) {
case 0: type = 1;break;
case 1: type = 0;break;
case 2: type = 2;break;
}
that.setData({
activityId: res.data.activityId,
type: type,
cover: res.data.cover,
activityName: res.data.activityName,
activeDate: res.data.activeDate,
name: res.data.name,
mobile: res.data.mobile,
enrollDate: res.data.enrollDate,
enrollNum: res.data.enrollNum + '人',
})
},
fail: function(err) {
wx.lin.showToast({
image: '/image/error.png',
title: err.msg,
})
}
})
}
})
\ No newline at end of file
pages/activityDetail/activityDetail.wxml deleted 100644 → 0
<l-toast l-image-class="toast-image"></l-toast>
<navigation class="navigation" titleText="报名详情" backIcon="/image/back.png"></navigation>
<view class="container">
<view class="header {{type == 0 ? 'ongoingBGC' : (type == 2 ? 'endBGC':'')}}" >
<!-- 活动未开始 -->
<image wx:if="{{type == 1}}" class="fontsImg" src="./image/nostart.png"></image>
<!-- 活动进行中 -->
<image wx:if="{{type == 0}}" class="fontsImg" src="./image/ing.png"></image>
<!-- 活动结束 -->
<image wx:if="{{type == 2}}" class="fontsImg" src="./image/end.png"></image>
</view>
<view class="body">
<view class="activityBody">
<view class="title">报名活动</view>
<view class="item" bindtap="activityDetail">
<image class="activity-contanier-img" src="{{cover}}"></image>
<view class="my-activities-content">
<view class="my-activities-title clamp-ellipsis">{{activityName}}</view>
<view class="time ellipsis">{{activeDate}}</view>
</view>
<l-icon name="right" color="rgb(172,172,174)" size="26" style="margin-right:12rpx;"/>
</view>
<view class="title">报名信息</view>
<view class="info-item">
<text>姓名</text>
<text>{{name}}</text>
</view>
<view class="info-item">
<text>手机号</text>
<text>{{mobile}} </text>
</view>
<view class="info-item">
<text>报名日期</text>
<text>{{enrollDate}}</text>
</view>
<view class="info-item">
<text>报名人数</text>
<text>{{enrollNum}}</text>
</view>
</view>
</view>
</view>
<wxs module="status" >
var status =function(type){
if(type == 0){
return '活动进行中'
}else if(type == 1){
return '活动未开始'
}else{
return '活动已结束'
}
}
module.exports.status = status;
</wxs>
pages/activityDetail/activityDetail.wxss deleted 100644 → 0
/* pages/activityDetail/activityDetail.wxss */
.header{
width: 750rpx;
height: 380rpx;
background:rgba(206,218,194,1);
}
.fontsImg{
width: 250rpx;
height: 50rpx;
position: absolute;
top: 260rpx;
left: 40rpx;
}
/* 进行中的背景图 */
.ongoingBGC{
background:rgba(199,224,235,1);
}
/* 已结束的背景色 */
.endBGC{
background:rgba(231,233,237,1);
}
.status{
position: absolute;
top: 260rpx;
left: 40rpx;
font-size: 40rpx;
font-weight: 500;
}
.body{
width: 750rpx;
background-color: white;
height: auto;
}
.activityBody{
width: 670rpx;
padding-top: 60rpx;
margin: auto;
}
.title{
color:rgba(149,157,169,1);
font-size:30rpx;
letter-spacing: 1px;
font-weight:400;
margin-bottom: 45rpx;
}
.item{
width: 100%;
height: 220rpx;
background:rgba(245,246,248,1);
display: flex;
align-items: center;
justify-content: space-around;
margin-bottom: 60rpx;
}
.activity-contanier-img{
width: 140rpx;
height: 140rpx;
}
.my-activities-content{
height: 140rpx;
width: 380rpx;
display: flex;
flex-direction: column;
justify-content: center;
}
.my-activities-title{
color:rgba(21,25,31,1);
font-weight: 500;
font-size: 30rpx;
letter-spacing: 1px;
margin-bottom: 16rpx;
}
.time{
font-size: 26rpx;
color:rgba(101,110,123,1);
}
/* 超出部分省略 */
.ellipsis{
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
/* 两行超出部分省略 */
.clamp-ellipsis{
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.info-item{
width: 100%;
display: flex;
justify-content: space-between;
margin-bottom: 90rpx;
color: rgb(32, 29, 32);
}
pages/campsite-mirror/campsite-mirror.js → pages/campsite/home-mirror/home-mirror.js
......@@ -7,6 +7,8 @@ let logicData = {
Page({
data: {
imageBase: App.globalData.appImageBase,
winSide: true,
sideHeight: 1250,
......
pages/campsite-mirror/campsite-mirror.wxml → pages/campsite/home-mirror/home-mirror.wxml
......@@ -8,10 +8,10 @@
</view>
<view class="appointment-side col con-b align-c" hidden="{{winSide}}">
<button class="appointment-side-top" bindtap="onBackTop">
<image src="../../image/top.png"></image>
<image src="{{imageBase + 'top.png'}}"></image>
</button>
<button class="appointment-side-phone" bind:tap="onServic">
<image src="../../image/phone.png"></image>
<image src="{{imageBase + 'phone.png'}}"></image>
</button>
</view>
<block wx:for="{{detailImageUrl}}" wx:for-index="index" wx:for-item="item" wx:key="index">
......
pages/campsite/campsite.js → pages/campsite/home/home.js
......@@ -7,6 +7,8 @@ let logicData = {
Page({
data: {
imageBase: App.globalData.appImageBase,
winSide: true,
sideHeight: 1250,
......
pages/campsite/campsite.wxml → pages/campsite/home/home.wxml
......@@ -4,10 +4,10 @@
</view>
<view class="appointment-side col con-b align-c" hidden="{{winSide}}">
<button class="appointment-side-top" bindtap="onBackTop">
<image src="../../image/top.png"></image>
<image src="{{imageBase + 'top.png'}}"></image>
</button>
<button class="appointment-side-phone" bind:tap="onServic">
<image src="../../image/phone.png"></image>
<image src="{{imageBase + 'phone.png'}}"></image>
</button>
</view>
<block wx:for="{{detailImageUrl}}" wx:for-index="index" wx:for-item="item" wx:key="index">
......
pages/index/index.js → pages/commodity/art/art.js
import iLinuiUtil from "../../miniprogram_npm/lin-ui/utils/device-util"
Page({
data: {
capsuleBarHeight: iLinuiUtil.getNavigationBarHeight(),
},
onLoad: function (options) {
},
onShow: function () {
},
onHide: function () {
},
onUnload: function () {
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/art/art.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/art/art.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/food/food.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/food/food.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/food/food.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/home/home.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/home/home.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/home/home.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/project/project.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/project/project.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/project/project.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/room-appointment/room-appointment.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/room-appointment/room-appointment.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/room-appointment/room-appointment.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/room/room.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/room/room.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/room/room.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/shopping-cart/shopping-cart.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/commodity/snacks/snacks.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/commodity/snacks/snacks.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/commodity/snacks/snacks.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/notice-detail/notice-detail.js → pages/home/dynamic-detail/dynamic-detail.js
......@@ -14,7 +14,7 @@ Page({
})
let that = this
app.login({
success: function() {
success: function () {
that.getNoticeDetail()
}
})
......
pages/activity-entry/activity-entry.json → pages/home/dynamic-detail/dynamic-detail.json
{
"navigationBarTextStyle": "black",
"usingComponents": {
"picker":"../../component/picker/picker"
"parser": "../../component/parser.min/parser"
}
}
\ No newline at end of file
pages/notice/notice.js → pages/home/dynamic/dynamic.js
import iMiment from '../../npm/miment.js'
const app = getApp()
const App = getApp()
Page({
data: {
......@@ -14,8 +13,8 @@ Page({
onLoad: function () {
var that = this
app.login({
success: function(token) {
App.login({
success: function (token) {
that.getNoticeList()
}
})
......@@ -24,17 +23,17 @@ Page({
onNoticeDetail: function (funcItem) {
console.log(funcItem)
wx.navigateTo({
url: '/pages/notice-detail/notice-detail?id='+funcItem.currentTarget.dataset.id
url: '/pages/notice-detail/notice-detail?id=' + funcItem.currentTarget.dataset.id
})
},
// 最新动态列表
getNoticeList() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/dynamic/getList',
data: { pageSize: that.data.pageSize, pageNo: that.data.pageNo},
success: function(res) {
data: { pageSize: that.data.pageSize, pageNo: that.data.pageNo },
success: function (res) {
that.setData({
loading: false
})
......@@ -67,7 +66,7 @@ Page({
}
},
fail: function(err) {
fail: function (err) {
that.setData({
loading: false
})
......@@ -75,7 +74,7 @@ Page({
})
},
onReachBottom: function() {
onReachBottom: function () {
console.log('触底啦')
if (this.data.loading || !this.data.moreData) {
return
......
pages/notice-detail/notice-detail.json → pages/home/dynamic/dynamic.json
{
"navigationBarTextStyle": "black",
"usingComponents": {
"parser":"../../component/parser.min/parser"
"parser": "../../component/parser.min/parser"
}
}
\ No newline at end of file
pages/guide/guide.js → pages/home/guide/guide.js
......@@ -185,12 +185,15 @@ Page({
},
onPointDetail: function () {
console.log('onPointDetail')
// 当从景点详情进入屏蔽该功能
if (logicData.option.id) return
let funcPointInfo = this.data.pointInfo
for (let i = 0, l = funcPointInfo.length; i < l; i++) {
if (funcPointInfo[i].isActive) {
console.log(funcPointInfo[i].detail)
wx.navigateTo({
url: funcPointInfo[i].detail
})
......
pages/guide/js/point.js → pages/home/guide/js/point.js
......@@ -6,7 +6,7 @@ let output = [
name: '温泉洋房（建设中）',
icon: './image/icon/01.png',
card: './image/card/01.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=105',
detail: '/pages/play/point-detail/point-detail?id=105',
isActive: false,
}, {
x: 810,
......@@ -15,7 +15,7 @@ let output = [
name: '海错图2号馆',
icon: './image/icon/02.png',
card: './image/card/02.png',
detail: '/pages/shop-detail/shop-detail?id=1',
detail: '/pages/play/service-detail/service-detail?id=1',
isActive: false,
}, {
x: 1060,
......@@ -24,7 +24,7 @@ let output = [
name: '海错图1号馆',
icon: './image/icon/03.png',
card: './image/card/03.png',
detail: '/pages/shop-detail/shop-detail?id=1',
detail: '/pages/play/service-detail/service-detail?id=1',
isActive: false,
}, {
x: 1300,
......@@ -33,7 +33,7 @@ let output = [
name: '原味舒食',
icon: './image/icon/04.png',
card: './image/card/04.png',
detail: '/pages/shop-detail/shop-detail?id=4',
detail: '/pages/play/service-detail/service-detail?id=4',
isActive: false,
}, {
x: 666,
......@@ -42,7 +42,7 @@ let output = [
name: '星空影院',
icon: './image/icon/05.png',
card: './image/card/05.png',
detail: '/pages/shop-detail/shop-detail?id=6',
detail: '/pages/play/service-detail/service-detail?id=6',
isActive: false,
}, {
x: 1120,
......@@ -51,7 +51,7 @@ let output = [
name: '元养水韵SPA',
icon: './image/icon/06.png',
card: './image/card/06.png',
detail: '/pages/shop-detail/shop-detail?id=3',
detail: '/pages/play/service-detail/service-detail?id=3',
isActive: false,
}, {
x: 1370,
......@@ -60,7 +60,7 @@ let output = [
name: '原野MOJITO',
icon: './image/icon/07.png',
card: './image/card/07.png',
detail: '/pages/shop-detail/shop-detail?id=5',
detail: '/pages/play/service-detail/service-detail?id=5',
isActive: false,
}, {
x: 1708,
......@@ -69,7 +69,7 @@ let output = [
name: '拾光花坊',
icon: './image/icon/08.png',
card: './image/card/08.png',
detail: '/pages/shop-detail/shop-detail?id=2',
detail: '/pages/play/service-detail/service-detail?id=2',
isActive: false,
}, {
x: 1016,
......@@ -78,7 +78,7 @@ let output = [
name: '星光广场',
icon: './image/icon/09.png',
card: './image/card/09.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=101',
detail: '/pages/play/point-detail/point-detail?id=101',
isActive: false,
}, {
x: 1002,
......@@ -87,7 +87,7 @@ let output = [
name: '云之亭',
icon: './image/icon/10.png',
card: './image/card/10.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=102',
detail: '/pages/play/point-detail/point-detail?id=102',
isActive: false,
}, {
x: 1390,
......@@ -96,7 +96,7 @@ let output = [
name: '湿地公园',
icon: './image/icon/11.png',
card: './image/card/11.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=103',
detail: '/pages/play/point-detail/point-detail?id=103',
isActive: false,
}, {
x: 1782,
......@@ -105,7 +105,7 @@ let output = [
name: '新月码头',
icon: './image/icon/12.png',
card: './image/card/12.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=104',
detail: '/pages/play/point-detail/point-detail?id=104',
isActive: false,
}, {
x: 2794,
......@@ -114,7 +114,7 @@ let output = [
name: '儿童营地',
icon: './image/icon/13.png',
card: './image/card/13.png',
detail: '/pages/campsite-mirror/campsite-mirror',
detail: '/pages/campsite/home-mirror/home-mirror',
isActive: false,
}, {
x: 2112,
......@@ -123,7 +123,7 @@ let output = [
name: '星耀银湖',
icon: './image/icon/14.png',
card: './image/card/14.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=106',
detail: '/pages/play/point-detail/point-detail?id=106',
isActive: false,
}, {
x: 1610,
......@@ -132,7 +132,7 @@ let output = [
name: '奇幻森林',
icon: './image/icon/15.png',
card: './image/card/15.png',
detail: '/pages/shop-point-detail/shop-point-detail?id=107',
detail: '/pages/play/point-detail/point-detail?id=107',
isActive: false,
},
......
pages/home/history/history.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/home/history/history.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/home/history/history.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/home/home.js → pages/home/home/home.js
import iUtils from '../../utils/utils.js'
const app = getApp()
const App = getApp()
let logicData = {
pageScrollLock: false,
......@@ -9,6 +7,8 @@ let logicData = {
Page({
data: {
imageBase: App.globalData.appImageBase,
// 导航栏相关属性
navigationStyle: {
normal: {
......@@ -54,31 +54,14 @@ Page({
},
onLoad: function (options) {
// this.queryBanner()
// this.queryStrategy()
this.setNavigationLogo()
// wx.lin.showToast({
// title: '创建成功~',
// icon: 'success',
// image: '/image/more-w.png',
// success: (res) => {
// console.log(res)
// },
// complete: (res) => {
// console.log(res)
// }
// })
},
onShow: function() {
this.setData({
pageNo: 1
})
var that = this
app.login({
App.login({
success: function(token) {
that.getBanner()
that.loadVisiterPlanList()
......@@ -87,107 +70,28 @@ Page({
})
},
/**
* 获取 banner 渲染数据
* @function
* @param {string} - funcToken
* @returns
*/
queryBanner: function () {
let funcUrl = [
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/banner/banner-0.jpg',
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/banner/banner-1.jpg',
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/banner/banner-2.jpg',
]
this.setData({
banner: funcUrl
})
},
/**
* 获取 strategy 渲染数据
* @function
* @param {string} - funcToken
* @returns
*/
queryStrategy: function () {
let response = [{
id: '1',
index: 0,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-01.jpg',
title: '碧海银湖里的自然系饮食|原味舒食。',
date: '2020-07-10'
}, {
id: '2',
index: 1,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-02.jpg',
title: '漫游海岛奇境，搞定熊孩子的理想国约15000m²',
date: '2020-07-10'
}, {
id: '3',
index: 2,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-03.jpg',
title: '盛放的海岛秘境，全家人敞开玩的度假胜地之选，后面的内容巴拉巴拉。',
date: '2020-07-10'
}, {
id: '4',
index: 3,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-04.jpg',
title: '周末给不了你的快乐，40万方超级乐园给你尽情玩耍。',
date: '2020-07-10'
}, {
id: '5',
index: 4,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-05.jpg',
title: '这里的蓝真的舒服，美好的微风吹得让人沉醉了，躺下了。',
date: '2020-07-10'
}, {
id: '6',
index: 5,
image: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/home/strategy/strategy-06.jpg',
title: '懂生活的你，必定喜欢懂品质的碧海银湖。',
date: '2020-07-10'
}]
this.setData({
strategyList: response
})
// 游客攻略瀑布列表
wx.lin.renderWaterFlow(this.data.strategyList, false, () => {})
},
/**
* 获取 notice 渲染数据
* @function
* @param {string} - funcToken
* @returns
*/
queryNotice: function () {
},
setNavigationLogo: function () {
this.setData({
navigationLogoTop: iUtils.navigationElementCenterMarginTop(60)
navigationLogoTop: App.modular.utils.navigationElementCenterMarginTop(60)
})
},
onGuide: function () {
console.log('onGuide')
wx.navigateTo({
url: '/pages/guide/guide'
url: '/pages/home/guide/guide'
})
},
onNotice: function (event) {
wx.navigateTo({
url: '/pages/notice/notice'
url: '/pages/home/dynamic/dynamic'
})
},
onAppointmentInto: function () {
wx.navigateTo({
url: '/pages/appointment/appointment?type=1'
url: '/pages/home/night-appointment/night-appointment?type=1'
})
},
......@@ -276,7 +180,7 @@ Page({
break;
case 2:
wx.navigateTo({
url: '/pages/notice-detail/notice-detail?id='+jumpId
url: '/pages/home/dynamic-detail/dynamic-detail?id='+jumpId
})
break;
case 3:
......@@ -290,13 +194,13 @@ Page({
noticClick(e) {
let notic = this.data.notice[e.detail.index]
wx.navigateTo({
url: '/pages/notice-detail/notice-detail?id='+notic.id
url: '/pages/home/dynamic-detail/dynamic-detail?id='+notic.id
})
},
getBanner() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/banner/getList',
success: function(res) {
that.setData({
......@@ -311,7 +215,7 @@ Page({
loadVisiterPlanList() {
this.data.loading = true
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/strategy/getList',
data: { pageSize: that.data.pageSize+'', pageNo: that.data.pageNo+''},
success: function (res) {
......@@ -389,7 +293,7 @@ Page({
// 最新动态列表
getNoticeList() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/dynamic/getList',
data: { pageSize: 5, pageNo: 1, orderBy: " a.release_time desc "},
success: function(res) {
......
pages/home/home.wxml → pages/home/home/home.wxml
......@@ -28,7 +28,7 @@
</view>
<view class="row con-b align-c">
<l-notice-bar show="{{true}}" type="swip" swip-arr="{{noticeTitles}}" speed="2000" l-class="notice-bar" bind:lintap="noticClick"></l-notice-bar>
<image class="banner-image" src="../../image/more-g.png" bindtap="onNotice"></image>
<image class="banner-image" src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
</view>
</view>
</view>
......@@ -48,7 +48,7 @@
</view>
<view class="night-info-more row align-c">
<text>去预约</text>
<image src="../../image/more-w.png"></image>
<image src="{{imageBase + 'more-w.png'}}"></image>
</view>
</view>
......@@ -64,22 +64,6 @@
</view>
</view>
<!-- 预约看房 -->
<view class="appointment detail-item">
<view class="appointment-content" bindtap="onAppointmentHouse">
<image class="background-image" src="./image/appointment.png" mode="aspectFit"></image>
<view class="row con-b align-c">
<view class="col">
<text class="appointment-info-title">看房预约</text>
<text class="appointment-info-describe">体验海洋温泉，享受湿地与海景双重景观</text>
</view>
<view class="appointment-info-more">
<image src="../../image/more-w.png"></image>
</view>
</view>
</view>
</view>
<!-- 游客攻略 -->
<block wx:if="{{strategyOriginList.length > 0}}">
<view class="strategy detail-item" bindtap="onFirstStrategyDetail">
......
pages/appointment/appointment.js → pages/home/night-appointment/night-appointment.js
import iMiment from '../../npm/miment.js'
const app = getApp()
const App = getApp()
Page({
data: {
imageBase: App.globalData.appImageBase,
navigationTitle: '123213231',
formType: 1,
......@@ -35,7 +36,7 @@ Page({
},
setReset: function () {
let funcDate = iMiment(new Date().getTime()).format('YYYY-MM-DD')
let funcDate = App.modular.miment(new Date().getTime()).format('YYYY-MM-DD')
let endDate = this.getNextDay(funcDate, 3)
console.log('endDate', endDate)
this.setData({
......@@ -101,6 +102,7 @@ Page({
break
}
this.updateSubmitButtonStatus()
},
onQuantityCut: function () {
......@@ -110,15 +112,15 @@ Page({
errorQuantity: '',
})
}
this.inspectForm()
this.updateSubmitButtonStatus()
},
onQuantityAdd: function () {
if (this.data.total*1 == 0) {
if (this.data.total * 1 == 0) {
this.setData({
errorQuantity: '所选日期预约名额已满'
})
} else if (this.data.formQuantity >= this.data.total*1) {
} else if (this.data.formQuantity >= this.data.total * 1) {
this.setData({
errorQuantity: '所选日期预约的名额仅剩' + activityTime.residue + '人'
})
......@@ -131,8 +133,8 @@ Page({
formQuantity: this.data.formQuantity + 1,
errorQuantity: '',
})
this.inspectForm()
}
this.updateSubmitButtonStatus()
},
onSelectionDate: function (event) {
......@@ -192,10 +194,33 @@ Page({
},
updateSubmitButtonStatus() {
let complete = true
if (this.data.formName === '') {
complete = false
}
if (this.data.formPhone === '') {
complete = false
} else if (this.data.formPhone.length != 11) {
complete = false
}
if (this.data.formQuantity === 0) {
complete = false
}
this.setData({
canSubmit: complete
})
return complete
},
onSubmit: function () {
var that = this
app.login({
success: function() {
App.login({
success: function () {
if (!that.inspectForm()) {
return
......@@ -206,9 +231,9 @@ Page({
title: '提交中',
show: true,
mask: true,
duration: 1000*60,
duration: 1000 * 60,
})
app.wxRequest({
App.wxRequest({
url: '/api/v1/subscribe/doSubscribe',
data: {
mobile: that.data.formPhone,
......@@ -217,13 +242,13 @@ Page({
name: that.data.formName,
type: that.data.formType === 1 ? 0 : 1,
},
success: function(res) {
success: function (res) {
that.setData({
appointmentComplete: true,
})
wx.lin.hideToast()
},
fail: function(err) {
fail: function (err) {
wx.lin.showToast({
image: '/image/error.png',
title: err.msg,
......@@ -250,20 +275,22 @@ Page({
// 预约入园查询返回剩余名额
getResidue() {
var that = this
app.login({
success: function() {
app.wxRequest({
App.login({
success: function () {
App.wxRequest({
url: '/api/v1/subscribe/getResidue',
data: {
subscribeDate: that.data.formDate + ' 00:00:00',
type: 0,
},
success: function(res) {
success: function (res) {
that.setData({
total: res.data.total,
winQuota: true,
formQuantity: 0,
})
that.updateSubmitButtonStatus()
}
})
......@@ -272,15 +299,15 @@ Page({
},
getNextDay(d,t){
console.log(d,t)//格式为---2019-02-13 3
getNextDay(d, t) {
console.log(d, t)//格式为---2019-02-13 3
d = new Date(d);
console.log(d)//格式为---Wed Feb 13 2019 08:00:00 GMT+0800 (中国标准时间)
d = +d + (1000*60*60*24)*t;
d = +d + (1000 * 60 * 60 * 24) * t;
console.log(d)//格式为--时间戳1550275200000
d = new Date(d);
console.log(d)//格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间)
return iMiment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00"
return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00"
},
})
\ No newline at end of file
pages/appointment/appointment.wxml → pages/home/night-appointment/night-appointment.wxml
......@@ -61,11 +61,11 @@
</view>
<view class="input-wrap row con-b align-c" style="padding: 0">
<l-button special="{{true}}" bind:lintap="onQuantityCut">
<image class="input-icon" src="../../image/cut.png"></image>
<image class="input-icon" src="{{imageBase + 'cut.png'}}"></image>
</l-button>
<text class="text" style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text>
<l-button special="{{true}}" bind:lintap="onQuantityAdd">
<image class="input-icon" src='../../image/add.png'></image>
<image class="input-icon" src="{{imageBase + 'add.png'}}"></image>
</l-button>
</view>
</view>
......@@ -83,9 +83,9 @@
</view>
<view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate">
<view class="picker text">{{formDate}}</view>
<view class="picker text" style="display: inline-block;width:400rpx">{{formDate}}</view>
<image class="input-icon" style="float: right;" src="{{imageBase + 'more.png'}}"></image>
</picker>
<image class="input-icon" src="../../image/more.png"></image>
</view>
</view>
<view class="quota row con-e align-c" hidden="{{!winQuota}}">
......@@ -151,9 +151,9 @@
</view>
<view class="input-wrap row align-c" style="padding: 0 0 0 24rpx">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate">
<view class="picker text">{{formDate}}</view>
<view class="picker text" style="display: inline-block;width:400rpx">{{formDate}}</view>
<image class="input-icon" style="float: right;" src="{{imageBase + 'more.png'}}"></image>
</picker>
<image class="input-icon" src="../../image/more.png"></image>
</view>
</view>
</view>
......
pages/appointment/appointment.wxss → pages/home/night-appointment/night-appointment.wxss
......@@ -93,7 +93,7 @@
font-size: 30rpx;
font-weight: 400;
color: #1E2025;
line-height: 32rpx;
line-height: 80rpx;
}
.input-tip {
......@@ -110,6 +110,7 @@
.input-picker {
flex-grow: 1;
display: flex;
}
.form-error {
......
pages/hotelAccommodation/hotelAccommodation.wxml deleted 100644 → 0
<navigation class="navigation" titleText="预约凭证" color="#FFFFFF" backIcon="/image/back-w.png"></navigation>
<view class="container">
<image class="Img" wx:if="{{type == 0}}" src="http://upload.miaomiao-bao.com/f6dfe202008192103225871.jpg"></image>
<image class="Img" wx:if="{{type == 1}}" src="http://upload.miaomiao-bao.com/8883f202008192105356616.jpg"></image>
<view class="appiont-container">
<image wx:if="{{type == 0}}" class="bgcImg" src="http://upload.miaomiao-bao.com/f8e92202008192102227949.jpg"></image>
<image wx:if="{{type == 1}}" class="bgcImg" src="http://upload.miaomiao-bao.com/11174202008192100431340.jpg"></image>
<view class="form">
<image class="card" src="http://upload.miaomiao-bao.com/b6d15202008192102456807.png"></image>
<image wx:if="{{type == 0}}" src="http://sm-web.meiqicloud.com/userfiles/appResources/appointment/night/title-1.png" class="title" style="width:400rpx;margin-left:112rpx;"></image>
<image wx:if="{{type == 1}}" src="http://sm-web.meiqicloud.com/userfiles/appResources/appointment/night/title-2.png" class="title" style="width:300rpx;margin-left:160rpx;"></image>
<view class="form-content">
<view class="form-item">
<view class="form-item-nav">姓名</view>
<view class="form-item-content">{{name}}</view>
</view>
<view class="form-item">
<view class="form-item-nav">手机号</view>
<view class="form-item-content">{{mobile}}</view>
</view>
<view class="form-item" wx:if="{{type == 0}}">
<view class="form-item-nav">入园人数</view>
<view class="form-item-content">{{num}}人</view>
</view>
<view class="form-item" wx:if="{{type == 0}}">
<view class="form-item-nav">入园时间</view>
<view class="form-item-content">{{time}}</view>
</view>
<view class="form-item" wx:if="{{type == 1}}">
<view class="form-item-nav">看房日期</view>
<view class="form-item-content">{{time}}</view>
</view>
</view>
<image src="http://sm-web.meiqicloud.com/userfiles/appResources/appointment/night/ornament-1.png" class="thanks"></image>
</view>
<view class="custom" bindtap="showHotline">客服咨询</view>
</view>
</view>
<!-- 客服热线 -->
<l-arc-popup show="{{hotline}}" arc-radius="30">
<view class="phone">{{phone}}</view>
<view class="call" bindtap="call">呼叫</view>
<view style="height:10rpx;background-color:rgb(246,247,249);"></view>
<view class="call" bindtap="cancel">取消</view>
</l-arc-popup>
pages/hotelAccommodation/hotelAccommodation.wxss deleted 100644 → 0
/* pages/hotelAccommodation/hotelAccommodation.wxss */
.Img{
position: absolute;
z-index: -2;
width: 100%;
height: 1624rpx;
}
.bgcImg{
width: 100%;
height: 316rpx;
}
.appiont-container{
width: 622rpx;
padding-top: 173rpx;
margin: auto;
position: relative;
z-index: 0;
}
.form{
width: 100%;
height: auto;
position: relative;
height: 780rpx;
margin-top: -5rpx;
overflow: hidden;
}
.card{
width: 100%;
height: 1096rpx;
position: absolute;
z-index: -1;
top:-316rpx;
}
.title{
height: 50rpx;
margin-top: 50rpx;
margin-bottom: 94rpx;
}
.form-content{
width: 494rpx;
margin: auto;
}
.form-item{
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 48rpx;
}
.form-item-nav{
width: 120rpx;
height: 40rpx;
line-height: 40rpx;
text-align: justify;
text-align-last: justify;
font-size:30rpx;
color:rgba(149,157,169,1);
}
.form-item-nav::after{
content: "";
display: inline-block;
width: 100%;
height: 0;
}
.form-item-content{
width: 310rpx;
font-size:30rpx;
font-weight:400;
color:rgba(21,25,31,1);
}
.thanks{
width: 462rpx;
height: 22rpx;
position: absolute;
bottom: 56rpx;
left: 76rpx;
}
.icon{
width: 170rpx;
height: 52rpx;
position: absolute;
top: 210rpx;
right: 46rpx;
z-index: 10;
}
.custom{
width:622rpx;
height:96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
margin-top: 72rpx;
line-height: 96rpx;
text-align: center;
color:rgba(255,255,255,1);
margin-bottom: 68rpx;
}
.phone{
height: 85rpx;
text-align: center;
color: rgb(160, 157, 160);
line-height: 85rpx;
}
.call{
height: 125rpx;
text-align: center;
line-height: 125rpx;
font: 30rpx;
}
\ No newline at end of file
pages/index/index.wxml deleted 100644 → 0
<view class="container">
<scroll-view scroll-y style="height: 800rpx">
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui</view>
<view>shui3333</view>
<view>shui2222</view>
<view>shui1111</view>
</scroll-view>
</view>
\ No newline at end of file
pages/index/index.wxss deleted 100644 → 0
.container {
width:100%;
border: 1rpx red solid;
overflow: scroll;
background: green;
}
.navigation-bar-image{
width:100%;
position:fixed;
top:0;
left:0;
}
\ No newline at end of file
pages/login/login.js
// pages/login/login.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
height:'',
islogin:false,
isphone:false,
height: '',
islogin: false,
isphone: false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
let mobile = wx.getStorageSync('mobile')
let nickName = wx.getStorageSync('nickName')
let avatarUrl = wx.getStorageSync('avatarUrl')
......@@ -26,61 +17,8 @@ Page({
islogin: (nickName && avatarUrl) ? true : false,
isphone: (mobile) ? true : false,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
/*
* 返回
*/
back: function(e) {
if (this.data.islogin && this.data.isphone) {
console.log('授权及绑定成功')
......@@ -164,7 +102,7 @@ Page({
registUserInfo(obj) {
app.registUserInfo({
param: obj.param,
success: function (res) {
success: function(res) {
if (obj.success) {
obj.success(res)
}
......@@ -177,5 +115,4 @@ Page({
wx.navigateBack({})
}
}
})
\ No newline at end of file
pages/login/login.wxml
<!--pages/login/login.wxml-->
<navigation class="navigation" backIcon="/image/back-w.png" bindback="back"></navigation>
<view class="container" >
<view class="container">
<view style="height:{{height}}px;overflow:hidden;">
<image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image>
<view class="imgContainer">
......@@ -11,9 +11,15 @@
</view>
<view class="btn-contanier">
<button class="loginBtn" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button>
<view class="isloginBtn loginBtn" hidden="{{!islogin}}"> <view style="margin-right:10rpx;">已授权</view> <l-icon name="success" color="rgba(255,255,255,1);" size="28" /></view>
<view class="isloginBtn loginBtn" hidden="{{!islogin}}">
<view style="margin-right:10rpx;">已授权</view>
<l-icon name="success" color="rgba(255,255,255,1);" size="28" />
</view>
<button class="loginBtn" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button>
<view class="isloginBtn loginBtn" hidden="{{!isphone}}"><view style="margin-right:10rpx;">已绑定手机号</view><l-icon name="success" color="rgba(255,255,255,1);" size="28"/></view>
<view class="isloginBtn loginBtn" hidden="{{!isphone}}">
<view style="margin-right:10rpx;">已绑定手机号</view>
<l-icon name="success" color="rgba(255,255,255,1);" size="28" />
</view>
</view>
</view>
......
pages/login/login.wxss
/* pages/login/login.wxss */
.all{
.all {
height: 100%;
}
.content{
width:750rpx;
position:relative;
.content {
width: 750rpx;
position: relative;
/* overflow: hidden; */
}
.bgClass{
.bgClass {
height: 1624rpx;
width: 750rpx;
z-index: -1;
}
.imgContainer{
.imgContainer {
width: 750rpx;
position: absolute;
top: 326rpx;
......@@ -20,41 +24,46 @@
flex-direction: column;
align-items: center;
}
.titleImg{
.titleImg {
width: 528rpx;
height: 230rpx;
left: 112rpx;
margin-bottom: 26rpx;
}
.contentImg{
.contentImg {
width: 456rpx;
height: 190rpx;
margin-top: 132rpx;
}
.font{
.font {
height: 42rpx;
margin-bottom: 32rpx;
}
.btn-contanier{
width:558rpx;
.btn-contanier {
width: 558rpx;
position: absolute;
bottom: 80rpx;
left: 96rpx;
/* margin-top: 176rpx; */
}
.loginBtn{
width:558rpx;
height:96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
.loginBtn {
width: 558rpx;
height: 96rpx;
background: rgba(134, 197, 225, 1);
border-radius: 4px;
line-height: 96rpx;
text-align: center;
color:rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
margin-bottom: 44rpx;
font-size: 32rpx;
}
.isloginBtn{
.isloginBtn {
background-color: rgb(200, 225, 236);
display: flex;
justify-content: center;
......
pages/mine/accumulate/accumulate.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/mine/accumulate/accumulate.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/mine/accumulate/accumulate.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/mine/appointment-detail/appointment-detail.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/mine/appointment-detail/appointment-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/appointment-detail/appointment-detail.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/mine/appointment-detail/appointment-detail.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/mine/appointment-ticket/appointment-ticket.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/mine/appointment-ticket/appointment-ticket.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/appointment-ticket/appointment-ticket.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/mine/appointment-ticket/appointment-ticket.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/myActivity/myActivity.js → pages/mine/appointment/appointment.js
......@@ -7,26 +7,37 @@ Page({
* 页面的初始数据
*/
data: {
navItem:[
{content:'全部',type:'0'},
{content:'未开始',type:'1'},
{content:'进行中',type:'2'},
{content:'已结束',type:'3'},
navItem: [{
content: '全部',
type: '0'
},
{
content: '未开始',
type: '1'
},
{
content: '进行中',
type: '2'
},
{
content: '已结束',
type: '3'
},
],
height:0,
data:[],
active:0,
height: 0,
data: [],
active: 0,
pageNo: 1,
pageSize: 10,
loading: false,
moreData: true,
},
goPlay(){
goPlay() {
wx.switchTab({
url: '../../pages/play/play',
})
},
chageNav(e){
chageNav(e) {
let index = e.currentTarget.dataset.index
this.setData({
active: index,
......@@ -34,78 +45,35 @@ Page({
})
this.getMyActivityList()
},
activityDetail(e){
activityDetail(e) {
wx.navigateTo({
url: '../activityDetail/activityDetail?enrollid='+e.currentTarget.dataset.enrollid,
url: '../activityDetail/activityDetail?enrollid=' + e.currentTarget.dataset.enrollid,
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
})
this.getMyActivityList()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
// 我的活动
getMyActivityList() {
let state = ''
switch (Number(this.data.active)) {
case 0: state = ''; break;
case 1: state = 0; break;
case 2: state = 1; break;
case 3: state = 2; break;
case 0:
state = '';
break;
case 1:
state = 0;
break;
case 2:
state = 1;
break;
case 3:
state = 2;
break;
}
var that = this
app.login({
......@@ -115,20 +83,30 @@ Page({
})
app.wxRequest({
url: '/api/v1/activity/getMyActivityList',
data: { activeState: state, pageSize: that.data.pageSize, pageNo: that.data.pageNo },
data: {
activeState: state,
pageSize: that.data.pageSize,
pageNo: that.data.pageNo
},
success: function(res) {
let list = res.data.list
let tmpArr = []
list.forEach(item => {
let state = item.activeState*1
let state = item.activeState * 1
let type = 0
switch (state) {
case 0: type = 1;break;
case 1: type = 0;break;
case 2: type = 2;break;
case 0:
type = 1;
break;
case 1:
type = 0;
break;
case 2:
type = 2;
break;
}
let obj = {
time: item.enrollDate,//item.activeDate + ' ' + item.activeTime,
time: item.enrollDate, //item.activeDate + ' ' + item.activeTime,
type: type,
content: item.address,
title: item.name,
......@@ -145,7 +123,7 @@ Page({
loading: false,
})
that.setData({
moreData: (that.data.data.length >= res.data.count*1) ? false: true
moreData: (that.data.data.length >= res.data.count * 1) ? false : true
})
},
fail: function(err) {
......
pages/index/index.json → pages/mine/appointment/appointment.json
{
"disableScroll": true,
"navigationStyle": "custom",
"usingComponents": {}
}
\ No newline at end of file
pages/myActivity/myActivity.wxml → pages/mine/appointment/appointment.wxml
<navigation class="navigation" titleText="我的活动" backIcon="/image/back.png"></navigation>
<view class="container all" >
<view class="container all">
<view class="myActivity-container" style="min-height:{{height}}px;">
<view class="activity-nav">
<!-- 遍历头部导航 -->
......@@ -19,7 +19,7 @@
<view class="ellipsis itemContent {{item.type == 2?'contentEndColor':''}}">{{item.content}}</view>
</view>
<view style="width:80rpx;height:100%;display:flex;align-items: center;flex-direction: row-reverse;">
<l-icon name="right" color="rgb(172,172,174)" size="26" style="margin-right:12rpx;"/>
<l-icon name="right" color="rgb(172,172,174)" size="26" />
</view>
</view>
</view>
......@@ -27,7 +27,7 @@
</view>
<view class="noActive" hidden="{{data.length > 0}}" >
<view class="noActive" hidden="{{data.length > 0}}">
<view class="noActive-title">暂无已报名的活动</view>
<view class="noActive-botton" bindtap="goPlay">发现畅玩活动</view>
</view>
......@@ -36,13 +36,13 @@
</view>
<!-- 状态值格式化 -->
<wxs module="status" >
var status =function(type){
if(type == 0){
<wxs module="status">
var status = function(type) {
if (type == 0) {
return '进行中'
}else if(type == 1){
} else if (type == 1) {
return '未开始'
}else{
} else {
return '已结束'
}
}
......
pages/myActivity/myActivity.wxss → pages/mine/appointment/appointment.wxss
/* pages/myActivity/myActivity.wxss */
.all{
background-color: rgba(243,244,246,1);
.all {
background-color: rgba(243, 244, 246, 1);
}
.myActivity-container{
.myActivity-container {
width: 750rpx;
height: 100%;
}
.noActive{
.noActive {
width: 750rpx;
position: absolute;
top: 50%;
text-align: center;
height: auto;
}
.noActive-title{
font-size:38rpx;
font-weight:500;
color:rgba(149,157,169,1);
line-height:52rpx;
}
.noActive-rule{
font-size:26rpx;
font-weight:400;
color:rgba(149,157,169,1);
line-height:36rpx;
.noActive-title {
font-size: 38rpx;
font-weight: 500;
color: rgba(149, 157, 169, 1);
line-height: 52rpx;
}
.noActive-rule {
font-size: 26rpx;
font-weight: 400;
color: rgba(149, 157, 169, 1);
line-height: 36rpx;
margin-top: 24rpx;
}
.noActive-botton{
width:308rpx;
height:96rpx;
font-size:26rpx;
.noActive-botton {
width: 308rpx;
height: 96rpx;
font-size: 26rpx;
text-align: center;
font-weight:400;
font-weight: 400;
line-height: 96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
color:rgba(255,255,255,1);
font-size:30rpx;
background: rgba(134, 197, 225, 1);
border-radius: 4px;
color: rgba(255, 255, 255, 1);
font-size: 30rpx;
margin: 0 auto;
margin-top: 64rpx;
}
.activity-nav{
.activity-nav {
width: 750rpx;
padding-top: 150rpx;
padding-top: 224rpx;
/* height: 95rpx; */
border-bottom: 1px solid rgb(238, 238, 238);
background: -webkit-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Firefox 3.6 - 15 */
background: linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* 标准的语法（必须放在最后） */
background: -webkit-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Firefox 3.6 - 15 */
background: linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* 标准的语法（必须放在最后） */
display: flex;
justify-content: space-around;
}
.navItem{
.navItem {
line-height: 95rpx;
color: #959DA9;
color: #959da9;
}
.active{
.active {
border-bottom: 3px solid rgb(0, 0, 2);
color: #15191F;
color: #15191f;
}
.itemContent{
font-size:26rpx;
color:rgba(149,157,169,1);
.itemContent {
font-size: 26rpx;
color: rgba(149, 157, 169, 1);
}
.activity-body{
.activity-body {
width: 750rpx;
/* min-height: 1400rpx; */
padding-top: 50rpx;
background-color: rgb(243,244,246,1);
background-color: rgb(243, 244, 246, 1);
height: auto;
position: relative;
}
.my-activities-item{
.my-activities-item {
width: 675rpx;
height: 280rpx;
position: relative;
margin: 0 auto;
margin-bottom: 50rpx;
}
.my-activities-top{
.my-activities-top {
position: absolute;
top: 0;
padding:0 25rpx 0 25rpx;
padding: 0 25rpx 0 25rpx;
height: 60rpx;
background-color: rgb(2, 0, 2);
color: white;
line-height:60rpx ;
line-height: 60rpx;
z-index: 2;
border-radius: 3px;
font-size: 30rpx;
}
.my-activities-bottom{
.my-activities-bottom {
width: 100%;
height: 250rpx;
position: absolute;
......@@ -100,18 +113,21 @@
background-color: white;
border-radius: 3px;
}
.my-activities-title{
.my-activities-title {
line-height: 2;
color:rgba(21,25,31,1);
color: rgba(21, 25, 31, 1);
font-size: 30rpx;
}
.my-activities-content{
.my-activities-content {
color: rgb(169, 174, 181);
font-size: 26rpx;
padding-left:50rpx ;
padding-left: 50rpx;
line-height: 2;
}
.subscribe{
.subscribe {
width: 150rpx;
height: 70rpx;
position: absolute;
......@@ -121,62 +137,77 @@
line-height: 70rpx;
text-align: center;
font-size: 26rpx;
top:92rpx ;
top: 92rpx;
}
.activity-status{
.activity-status {
text-align: right;
line-height: 65rpx;
/* line-height: 65rpx; */
padding-top: 32rpx;
padding-right: 30rpx;
color: rgb(154, 192, 227);
font-size: 28rpx;
}
.activity-contanier{
.activity-contanier {
height: 160rpx;
width: 600rpx;
margin: auto;
display: flex;
align-items: center;
}
.activity-contanier-img{
.activity-contanier-img {
width: 140rpx;
height: 140rpx;
height: 136rpx;
}
.my-activities-content{
.my-activities-content {
height: 140rpx;
width: 380rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
justify-content: center;
}
.my-activities-title{
.my-activities-title {
font-weight: 500;
letter-spacing: 1px;
}
/* 超出部分省略 */
.ellipsis{
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
.ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/* 两行超出部分省略 */
.clamp-ellipsis{
.clamp-ellipsis {
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.opcity{
.opcity {
opacity: 0.6;
}
.timeendColor{
background:rgba(217,222,231,1);
.timeendColor {
background: rgba(217, 222, 231, 1);
}
.contentEndColor{
color:rgba(194,199,207,1);
.contentEndColor {
color: rgba(194, 199, 207, 1);
}
/* 未开始字体颜色 */
.stautsColor{
.stautsColor {
color: rgb(164, 183, 133) !important;
}
pages/ownerCertification/ownerCertification.js → pages/mine/authentication-input/authentication-input.js
......@@ -7,90 +7,90 @@ Page({
*/
data: {
type: 1, //判断页面显示的类型 1.填写表单 2.认证中 3.认证失败
nameErr:'',// 请输入姓名
phoneErr:'',//请输入正确的手机号
idCardErr:'',//请输入正确的身份证号,
roomErr:'',//请输入房号
room:'',
name:'',
phone:'',
idCard:'',
list:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权'],
nameErr: '', // 请输入姓名
phoneErr: '', //请输入正确的手机号
idCardErr: '', //请输入正确的身份证号,
roomErr: '', //请输入房号
room: '',
name: '',
phone: '',
idCard: '',
list: ['园区门票优惠', '餐厅价格优惠', 'SPA服务优惠', '免费观看电影', '无须预约入园', '尽享多重特权'],
remarks: '',
},
//输入房号
inputRoom(e){
inputRoom(e) {
this.setData({
room:e.detail.value
room: e.detail.value
})
},
roomBlur(e){
roomBlur(e) {
let val = e.detail.value;
if(!val){
if (!val) {
this.setData({
roomErr:'请输入房号'
roomErr: '请输入房号'
})
}else{
} else {
this.setData({
roomErr:''
roomErr: ''
})
}
},
//输入身份证
inputIdCard(e){
inputIdCard(e) {
this.setData({
idCard:e.detail.value
idCard: e.detail.value
})
},
idCardBlur(e){
idCardBlur(e) {
let val = e.detail.value;
if(!val || (val.length != 18)){
if (!val || (val.length != 18)) {
this.setData({
idCardErr:'请输入正确的身份证号'
idCardErr: '请输入正确的身份证号'
})
}else{
} else {
this.setData({
idCardErr:''
idCardErr: ''
})
}
},
//输入姓名
inputName(e){
inputName(e) {
this.setData({
name:e.detail.value
name: e.detail.value
})
},
//输入框姓名失去焦点事件
nameBlur(e){
nameBlur(e) {
let val = e.detail.value;
console.log(val)
if(!val){
if (!val) {
this.setData({
nameErr:'请输入姓名'
nameErr: '请输入姓名'
})
}else{
} else {
this.setData({
nameErr:''
nameErr: ''
})
}
},
//手机号输入
inputPhone(e){
inputPhone(e) {
this.setData({
phone:e.detail.value
phone: e.detail.value
})
},
//手机号验证
phoneBlur(e){
phoneBlur(e) {
let val = e.detail.value;
if(!val || (val.length != 11)){
if (!val || (val.length != 11)) {
this.setData({
phoneErr:'请输入正确的手机号'
phoneErr: '请输入正确的手机号'
})
}else{
} else {
this.setData({
phoneErr:''
phoneErr: ''
})
}
},
......@@ -101,56 +101,56 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
this.getAuth()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
},
......@@ -161,10 +161,12 @@ Page({
url: '/api/v1/userAuth/getAuth',
method: 'GET',
success: function(res) {
let state = res.data.state*1 // 0 待审核 1 审核通过 2 不通过
let state = res.data.state * 1 // 0 待审核 1 审核通过 2 不通过
let type = 1 // 判断页面显示的类型 1.填写表单 2.认证中 3.认证失败
switch (state) {
case 0: type = 2; break;
case 0:
type = 2;
break;
case 1:
wx.lin.showToast({
image: '/image/success.png',
......@@ -174,7 +176,9 @@ Page({
wx.navigateBack({})
}, 2000)
break;
case 2: type = 3; break;
case 2:
type = 3;
break;
}
that.setData({
type: type,
......@@ -209,7 +213,7 @@ Page({
icon: 'loading',
title: '提交中',
show: true,
duration: 1000*60,
duration: 1000 * 60,
})
app.wxRequest({
url: '/api/v1/userAuth/doAuth',
......
pages/mine/authentication-input/authentication-input.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/ownerCertification/ownerCertification.wxml → pages/mine/authentication-input/authentication-input.wxml
......@@ -18,7 +18,7 @@
</view>
</view>
<view class="content" wx:if="{{type == 1}}" >
<view class="content" wx:if="{{type == 1}}">
<view class="content-title">填写认证信息</view>
<text class="rquire">请填写与购房合同一致的信息</text>
<view class="form">
......@@ -48,7 +48,7 @@
<view class="marginB">
<view class="form-item">
<view class="form-item-nav">房号</view>
<input placeholder-class="placeholder" maxlength="10" class="{{roomErr.length>0 ? 'form-input-error' : 'form-input'}}"bindinput="inputRoom" bindblur="roomBlur" placeholder="请输入房号" value="{{room}}"></input>
<input placeholder-class="placeholder" maxlength="10" class="{{roomErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputRoom" bindblur="roomBlur" placeholder="请输入房号" value="{{room}}"></input>
</view>
<view class="error" hidden="{{!roomErr.length>0}}">{{roomErr}}</view>
</view>
......@@ -58,7 +58,7 @@
</view>
<!-- 审核状态 -->
<view class="content" wx:else >
<view class="content" wx:else>
<view class="aduit">
<image wx:if="{{type == 2}}" src="/image/audit-ing.png" class="audit-Img"></image>
<image wx:if="{{type == 3}}" src="/image/audit-err.png" class="audit-Img"></image>
......
pages/ownerCertification/ownerCertification.wxss → pages/mine/authentication-input/authentication-input.wxss
/* pages/ownerCertification/ownerCertification.wxss */
.banner{
.banner {
width: 750rpx;
height: 594rpx;
position: absolute;
z-index: -1;
}
.header{
.header {
width: 750rpx;
height: 594rpx;
}
.yztq{
.yztq {
width: 320rpx;
height: 78rpx;
}
.items{
.items {
width: 584rpx;
margin: auto;
margin-top: 60rpx;
......@@ -22,195 +25,222 @@
flex-wrap: wrap;
justify-content: space-between;
}
.item{
.item {
/* width: 50%; */
display: flex;
align-items: center;
margin-bottom: 24rpx;
}
.item-text{
color: rgba(246,219,191,1);
font-size:30rpx;
font-weight:400;
.item-text {
color: rgba(246, 219, 191, 1);
font-size: 30rpx;
font-weight: 400;
margin-left: 16rpx;
}
.rule{
font-weight:400;
color:rgba(255,255,255,1);
font-size:22rpx;
margin-left: 8rpx;
opacity: 0.4;
.rule {
font-weight: 400;
color: rgba(255, 255, 255, 1);
font-size: 22rpx;
margin-left: 8rpx;
opacity: 0.4;
}
.content{
.content {
width: 670rpx;
height: auto;
margin: auto;
padding-top: 55rpx;
}
.content-title{
font-size:30rpx;
font-weight:500;
color:rgba(21,25,31,1);
.content-title {
font-size: 30rpx;
font-weight: 500;
color: rgba(21, 25, 31, 1);
}
.rquire{
color: #D1A074;
font-size:26rpx;
line-height:36rpx;
.rquire {
color: #d1a074;
font-size: 26rpx;
line-height: 36rpx;
}
.form{
.form {
width: 100%;
margin-top: 48rpx;
}
.form-item{
.form-item {
width: 100%;
display: flex;
align-items: center;
}
.form-item-nav{
.form-item-nav {
width: 120rpx;
height: 80rpx;
line-height: 80rpx;
text-align:justify;
text-align-last:justify ;
font-size:30rpx;
text-align: justify;
text-align-last: justify;
font-size: 30rpx;
vertical-align: middle;
}
.form-item-nav::after{
.form-item-nav::after {
content: "";
display: inline-block;
width: 100%;
height: 0;
}
.form-input{
width:510rpx;
height:80rpx;
border-radius:4px;
border:1px solid rgba(200,200,200,1);
.form-input {
width: 510rpx;
height: 80rpx;
border-radius: 4px;
border: 1px solid rgba(200, 200, 200, 1);
font-size: 32rpx;
margin-left: 40rpx;
padding-left:24rpx ;
padding-left: 24rpx;
}
.form-input-error{
width:510rpx;
height:80rpx;
.form-input-error {
width: 510rpx;
height: 80rpx;
font-size: 32rpx;
border-radius:4px;
border:1px solid rgba(217,43,58,1);
border-radius: 4px;
border: 1px solid rgba(217, 43, 58, 1);
margin-left: 40rpx;
padding-left:24rpx ;
padding-left: 24rpx;
}
.marginB{
.marginB {
width: 100%;
height: 120rpx;
margin-bottom: 32rpx;
}
.error{
color: #D92B3A;
font-weight:400;
.error {
color: #d92b3a;
font-weight: 400;
font-size: 22rpx;
padding-left: 160rpx;
padding-top: 10rpx;
}
.prompt{
font-size:26rpx;
font-weight:400;
color:rgba(21,25,31,1);
line-height:36rpx;
.prompt {
font-size: 26rpx;
font-weight: 400;
color: rgba(21, 25, 31, 1);
line-height: 36rpx;
}
.placeholder {
/* WebKit browsers */
color:rgba(194,199,207,1);
}
input:-moz-placeholder {
color: rgba(194, 199, 207, 1);
}
input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color:rgba(194,199,207,1);
}
input::-moz-placeholder {
color: rgba(194, 199, 207, 1);
}
input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color:rgba(194,199,207,1);
}
input:-ms-input-placeholder {
color: rgba(194, 199, 207, 1);
}
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
color:rgba(194,199,207,1);
}
.submit{
width:670rpx;
height:96rpx;
background:rgba(37,37,50,1);
border-radius:1px;
color: rgba(194, 199, 207, 1);
}
.submit {
width: 670rpx;
height: 96rpx;
background: rgba(37, 37, 50, 1);
border-radius: 1px;
margin-top: 24rpx;
line-height: 96rpx;
font-size:30rpx;
font-weight:500;
color:rgba(241,233,220,1);
font-size: 30rpx;
font-weight: 500;
color: rgba(241, 233, 220, 1);
text-align: center;
margin-bottom: 80rpx;
}
.aduit{
width:112rpx;
height:112rpx;
background:rgba(243,244,246,1);
}
.aduit {
width: 112rpx;
height: 112rpx;
background: rgba(243, 244, 246, 1);
border-radius: 50%;
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
}
.audit-Img{
}
.audit-Img {
width: 64rpx;
height: 64rpx;
}
.audit-results{
}
.audit-results {
margin-top: 48rpx;
text-align: center;
font-size:54rpx;
font-weight:500;
color:rgba(21,25,31,1);
line-height:76rpx;
}
.audit-results-err{
color: #D92B3A;
}
.aduit-prompt{
font-size: 54rpx;
font-weight: 500;
color: rgba(21, 25, 31, 1);
line-height: 76rpx;
}
.audit-results-err {
color: #d92b3a;
}
.aduit-prompt {
margin-top: 16rpx;
font-size:26rpx;
font-weight:400;
color:rgba(101,110,123,1);
line-height:36rpx;
font-size: 26rpx;
font-weight: 400;
color: rgba(101, 110, 123, 1);
line-height: 36rpx;
text-align: center;
}
.audit-info{
}
.audit-info {
width: 100%;
height:360rpx;
background:rgba(243,244,246,1);
border-radius:2px;
height: 360rpx;
background: rgba(243, 244, 246, 1);
border-radius: 2px;
margin-top: 64rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
margin-bottom: 70rpx;
}
.audit-infoItems{
}
.audit-infoItems {
width: 574rpx;
margin:auto;
margin: auto;
margin-top: 48rpx;
margin-bottom: 48rpx;
}
.audit-infoItems{
}
.audit-infoItems {
display: flex;
justify-content: space-between;
}
.audit-item-nav{
color:rgba(21,25,31,1);
font-size:30rpx;
font-weight:500;
}
.audit-item-nav {
color: rgba(21, 25, 31, 1);
font-size: 30rpx;
font-weight: 500;
margin-bottom: 16rpx;
}
.audit-item-content{
font-weight:400;
color:rgba(21,25,31,1);
font-size:30rpx;
}
}
.audit-item-content {
font-weight: 400;
color: rgba(21, 25, 31, 1);
font-size: 30rpx;
}
pages/hotelAccommodation/hotelAccommodation.js → pages/mine/authentication-state/authentication-state.js
// pages/hotelAccommodation/hotelAccommodation.js
// pages/mine/authentication-state/authentication-state.js
Page({
/**
* 页面的初始数据
*/
data: {
phone:'13685970580',
hotline:false,//客服热线
type:0,//夜间入园
name: '',
mobile: '',
num: '',
time: '',
},
showHotline(){
this.setData({
hotline:true
})
},
//客服热线拨打
call(){
wx.makePhoneCall({
phoneNumber: this.data.phone,
})
},
//取消拨打
cancel(){
this.setData({
hotline:false,
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('.............', options.detail)
let detail=JSON.parse(options.detail);
console.log(detail);
this.setData({
type: detail.type,
name: detail.name,
mobile: detail.mobile,
num: detail.num,
time: detail.time,
})
},
/**
......
pages/mine/authentication-state/authentication-state.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/authentication-state/authentication-state.wxml 0 → 100644
<!--pages/mine/authentication-state/authentication-state.wxml-->
<text>pages/mine/authentication-state/authentication-state.wxml</text>
pages/mine/authentication-state/authentication-state.wxss 0 → 100644
/* pages/mine/authentication-state/authentication-state.wxss */
\ No newline at end of file
pages/mine/card/card.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/strategy/strategy.json → pages/mine/card/card.json
{
"usingComponents": {
"parser":"../../component/parser.min/parser"
}
"usingComponents": {}
}
\ No newline at end of file
pages/mine/card/card.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/mine/card/card.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/mine/mine.js → pages/mine/home/home.js
import iRequest from '../../utils/request/corvus.js'
const app = getApp()
const App = getApp()
Page({
......@@ -9,26 +8,26 @@ Page({
data: {
mobile: '',
nickName: '',
avatarUrl: '/pages/mine/image/avatar.png',
avatarUrl: '/pages/mine/home/image/avatar.png',
stateTest: '去认证',
mask:false,
type:0, //判断是否是认证的了
approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权'],
mask: false,
type: 0, //判断是否是认证的了
approveList: ['园区门票优惠', '餐厅价格优惠', 'SPA服务优惠', '免费观看电影', '无须预约入园', '尽享多重特权'],
activityList: [],
appointmentList: [],
isRegister: false, // 是否注册
},
close(){
close() {
this.setData({
mask:false
mask: false
});
wx.showTabBar({
animation: true,
})
},
maskShow(){
maskShow() {
this.setData({
mask:true
mask: true
});
wx.hideTabBar({
animation: true,
......@@ -52,8 +51,8 @@ Page({
isRegister: true,
})
app.login({
success: function(token) {
App.login({
success: function (token) {
that.getMyActivityList()
that.getList()
that.getAuth()
......@@ -77,17 +76,17 @@ Page({
return true
} else {
wx.navigateTo({
url: '../login/login',
url: '/pages/login/login',
})
return false
}
},
//去认证
goApprove(){
goApprove() {
if (this.checkRegister()) {
wx.navigateTo({
url: '../ownerCertification/ownerCertification',
url: '/pages/mine/authentication-input/authentication-input',
})
}
},
......@@ -95,7 +94,7 @@ Page({
myActivity() {
if (this.checkRegister()) {
wx.navigateTo({
url: "../myActivity/myActivity",
url: '/pages/mine/appointment/appointment',
})
}
},
......@@ -111,29 +110,29 @@ Page({
customerService() {
if (this.checkRegister()) {
wx.navigateTo({
url: "../customerService/customerService",
url: "/pages/mine/question/question",
})
}
},
//我的活动详情
activityDetail(e){
activityDetail(e) {
wx.navigateTo({
url: '../activityDetail/activityDetail?enrollid='+e.currentTarget.dataset.enrollid,
url: '../activityDetail/activityDetail?enrollid=' + e.currentTarget.dataset.enrollid,
})
},
//预约凭证
gohotelAccommodation(e){
gohotelAccommodation(e) {
wx.navigateTo({
url: '../hotelAccommodation/hotelAccommodation?detail='+JSON.stringify(e.currentTarget.dataset.item),
url: '../hotelAccommodation/hotelAccommodation?detail=' + JSON.stringify(e.currentTarget.dataset.item),
})
},
//点击前往修改页面
goMyInfo(){
goMyInfo() {
if (this.checkRegister()) {
wx.navigateTo({
url: '../myInfo/myInfo',
url: '/pages/mine/info/info',
})
}
},
......@@ -141,19 +140,19 @@ Page({
// 我的活动
getMyActivityList() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/getMyActivityList',
data: { activeState: '0,1', pageSize: 10, pageNo: 1 },
success: function(res) {
success: function (res) {
let list = res.data.list
let tmpArr = []
list.forEach(item => {
let state = item.activeState*1
let state = item.activeState * 1
let type = 0
switch (state) {
case 0: type = 1;break;
case 1: type = 0;break;
case 2: type = 2;break;
case 0: type = 1; break;
case 1: type = 0; break;
case 2: type = 2; break;
}
let obj = {
time: item.enrollDate,//activeDate + ' ' + item.activeTime,
......@@ -174,16 +173,16 @@ Page({
// 预约列表/我的预约
getList() {
let that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/subscribe/getList',
data: {
state: '1',
type: ''//0 入园预约 1 看房预约 全部 空字符
},
success: function(res) {
success: function (res) {
let tmpArr = []
res.data.forEach(item => {
let type = item.type*1
let type = item.type * 1
let title = ''
let url = ''
switch (type) {
......@@ -197,9 +196,9 @@ Page({
break;
}
let obj = {
title:title,
title: title,
type: type,
time: item.subscribeDate.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : ''),
time: item.subscribeDate.substring(5, 11).replace('-', '月').replace(' ', '日') + ((type == 0) ? ' 20:00-24:00' : ''),
num: item.subscribeNum,
url: url,
id: item.id,
......@@ -219,11 +218,11 @@ Page({
// 获取业主认证信息
getAuth() {
let that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/userAuth/getAuth',
method: 'GET',
success: function(res) {
let state = res.data.state*1 // 0 待审核 1 审核通过 2 不通过
success: function (res) {
let state = res.data.state * 1 // 0 待审核 1 审核通过 2 不通过
let stateTest = '去认证'
switch (state) {
case 0: stateTest = '审核中'; break;
......@@ -240,7 +239,7 @@ Page({
},
toHide: function(array) {
toHide: function (array) {
var mphone = array.substring(0, 3) + '****' + array.substring(7);
return mphone;
}
......
pages/mine/mine.wxml → pages/mine/home/home.wxml
......@@ -22,7 +22,6 @@
<text style="color:#333333;font-weight:500;">登录/注册</text>
</view>
</view>
</view>
</view>
......@@ -62,7 +61,11 @@
</view>
<view class="menu">
<l-list l-content-class="menu-title" l-class="listClass" title="我的活动" bind:lintap="myActivity"></l-list>
<l-list l-content-class="menu-title" l-class="listClass" bind:lintap="myActivity">
<view slot="left-section">
<image class="fontImg" src="./image/myactive.png"></image>
</view>
</l-list>
<!-- 我的活动 -->
<view class="my-activities" wx:if="{{activityList.length > 0}}">
<view class="my-activities-item" data-enrollid="{{item.enrollId}}" wx:for="{{activityList}}" wx:for-index="index" wx:for-item="item" wx:key="index" bindtap="activityDetail">
......@@ -70,13 +73,17 @@
<text decode="{{true}}">&nbsp;&nbsp;{{item.time}}&nbsp;&nbsp;</text>
</view>
<view class="my-activities-bottom">
<view class="my-activities-title">{{item.title}}</view>
<view class="my-activities-title" style="padding-top:70rpx;">{{item.title}}</view>
<view class="my-activities-content">{{item.content}}</view>
</view>
</view>
<view class="my-activities-item"></view>
</view>
<l-list l-content-class="menu-title" title="我的预约" l-class="listClass" bind:lintap="myAppointment"></l-list>
<l-list l-content-class="menu-title" l-class="listClass" bind:lintap="myAppointment">
<view slot="left-section">
<image class="fontImg" src="./image/myappion.png"></image>
</view>
</l-list>
<!-- 我的预约 -->
<view class="my-activities" wx:if="{{appointmentList.length > 0}}">
<view class="my-activities-item" wx:for="{{appointmentList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
......@@ -86,15 +93,21 @@
</view>
</view>
<view class="my-activities-bottom">
<view class="my-activities-bottom-view">
<view class="my-activities-title">{{item.title}}</view>
<view class="my-activities-content" wx:if="{{item.type == 0}}">预约人数 {{item.num}}人</view>
</view>
<view class="subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
</view>
</view>
<view class="my-activities-item"></view>
</view>
<l-list l-content-class="menu-title" title="客服中心" l-class="listClass" bind:lintap="customerService"></l-list>
<l-list l-content-class="menu-title" l-class="listClass" bind:lintap="customerService">
<view slot="left-section">
<image class="fontImg" src="./image/mycustom@2x.png"></image>
</view>
</l-list>
</view>
</view>
......
pages/mine/mine.wxss → pages/mine/home/home.wxss
......@@ -131,9 +131,16 @@
background-color: rgb(239, 242, 250);
border-radius: 3px;
}
.my-activities-bottom-view{
display: flex;
flex-direction: column;
justify-content: center;
height: 110rpx;
margin-top: 70rpx;
}
.my-activities-title{
padding-left:50rpx ;
margin-top: 70rpx;
line-height: 2;
font-size:30rpx;
font-weight:500;
......@@ -154,13 +161,19 @@
width: 150rpx;
height: 70rpx;
position: absolute;
border: 1px solid rgb(134, 137, 145);
border: 1px solid #15191F;
border-radius: 3px;
right: 50rpx;
line-height: 70rpx;
text-align: center;
font-size: 26rpx;
top:92rpx ;
font-weight: 500;
color: #15191F;
}
.fontImg{
width: 120rpx;
height: 30rpx;
}
.approve{
padding-top: 100rpx;
......
pages/mine/image/inform.png → pages/mine/home/image/inform.png
pages/mine/image/inform.png

633 Bytes | W: | H:

pages/mine/home/image/inform.png

633 Bytes | W: | H:

pages/mine/image/inform.png
pages/mine/home/image/inform.png
pages/mine/image/inform.png
pages/mine/home/image/inform.png
  • 2-up
  • Swipe
  • Onion skin
pages/mine/image/mine.png → pages/mine/home/image/mine.png
pages/mine/image/mine.png

17.4 KB | W: | H:

pages/mine/home/image/mine.png

17.4 KB | W: | H:

pages/mine/image/mine.png
pages/mine/home/image/mine.png
pages/mine/image/mine.png
pages/mine/home/image/mine.png
  • 2-up
  • Swipe
  • Onion skin
pages/myInfo/myInfo.js → pages/mine/info/info.js
// pages/myInfo/myInfo.js
import iMiment from '../../npm/miment.js'
const app = getApp()
const App = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
birthdayEnd: iMiment(new Date().getTime()).format('YYYY-MM-DD'),
birthdayEnd: App.modular.miment(new Date().getTime()).format('YYYY-MM-DD'),
mobile: '',
nickName: '',
avatarUrl: '',
......@@ -20,10 +14,6 @@ Page({
birthday: '',
address: '',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let mobile = wx.getStorageSync('mobile')
......@@ -36,62 +26,13 @@ Page({
mobile: this.toHide(mobile),
nickName: nickName,
avatarUrl: avatarUrl,
genderIndex: sex == 1 ? 0 : 1,
genderIndex: sex == 2 ? 1 : 0,
birthday: birthday ? birthday : this.data.birthdayEnd,
address: address,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
toHide: function(array) {
toHide: function (array) {
var mphone = array.substring(0, 3) + '****' + array.substring(7);
return mphone;
},
......@@ -154,10 +95,10 @@ Page({
birthday: birthday,
}
console.log(param)
app.wxRequest({
App.wxRequest({
url: '/api/v1/smUser/doUpdateInfo',
data: param,
success: function(res) {
success: function (res) {
wx.setStorageSync('nickName', nickName)
wx.setStorageSync('sex', sex)
wx.setStorageSync('birthday', birthday)
......
pages/mine/info/info.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/myInfo/myInfo.wxml → pages/mine/info/info.wxml
......@@ -6,39 +6,32 @@
<view class="myInfo">
<l-list is-hover="{{false}}" l-content-class="menu-title" title="头像" is-link="{{false}}">
<view style="margin-bottom:30rpx;" slot="right-section">
<l-avatar size="100" src="{{avatarUrl}}"/>
<l-avatar size="100" src="{{avatarUrl}}" />
</view>
</l-list>
<l-list is-hover="{{false}}" l-content-class="menu-title" title="姓名" is-link="{{false}}">
<view slot="right-section">
<input maxlength="10" style="text-align:right;" placeholder="请填写姓名" placeholder-class="phone" value="{{nickName}}" data-type="name" bindblur="onInputBlur"/>
<input maxlength="10" style="text-align:right;" placeholder="请填写姓名" placeholder-class="phone" value="{{nickName}}" data-type="name" bindblur="onInputBlur" />
</view>
</l-list>
<l-list is-hover="{{false}}" l-content-class="menu-title" title="性别" is-link="{{false}}">
<picker slot="right-section" class="input-picker" mode="selector" range-key="{{'name'}}" range="{{genderArray}}" bindchange="onSelectionGender">
<picker slot="right-section" class="input-picker" mode="selector" value="{{genderIndex}}" range-key="{{'name'}}" range="{{genderArray}}" bindchange="onSelectionGender">
<view class="picker">{{genderArray[genderIndex].name}}</view>
</picker>
<!-- <view slot="right-section">
<input style="text-align:right;" value="女" />
</view> -->
</l-list>
<l-list is-hover="{{false}}" l-content-class="menu-title" title="生日" is-link="{{false}}">
<!-- <view slot="right-section">
<input style="text-align:right;" value="1990-01-01" />
</view> -->
<picker slot="right-section" class="input-picker" mode="date" value="{{birthday}}" end="{{birthdayEnd}}" bindchange="onSelectionDate">
<view class="picker">{{birthday}}</view>
</picker>
</l-list>
<l-list is-hover="{{false}}" l-content-class="menu-title" title="地址" is-link="{{false}}">
<view slot="right-section">
<input maxlength="30" style="text-align:right;" placeholder="请填写地址" placeholder-class="phone" value="{{address}}" data-type="address" bindblur="onInputBlur"/>
<input maxlength="30" style="text-align:right;" placeholder="请填写地址" placeholder-class="phone" value="{{address}}" data-type="address" bindblur="onInputBlur" />
</view>
</l-list>
<l-list is-hover="{{false}}" l-content-class="menu-title" title="手机号" is-link="{{false}}">
<view slot="right-section">
<view class="phone">{{mobile}}</view>
<!-- <view class="phone">{{phone.toHide("13685970580")}}</view> -->
</view>
</l-list>
</view>
......@@ -46,9 +39,9 @@
<!-- 使用wxs 手机号码中间四位显示为*号 -->
<wxs module="phone">
var toHide = function(array) {
var toHide = function(array) {
var mphone = array.substring(0, 3) + '****' + array.substring(7);
return mphone;
}
module.exports.toHide = toHide;
}
module.exports.toHide = toHide;
</wxs>
\ No newline at end of file
pages/mine/order/order.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/mine/order/order.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/order/order.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/mine/order/order.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/moreProblems/moreProblems.js → pages/mine/question-more/question-more.js
......@@ -6,23 +6,23 @@ Page({
* 页面的初始数据
*/
data: {
isExpandContent:false,
isExpandContent: false,
checkInProblems: [], // 入住问题
ticketsProblems: [], // 门票问题
serviceProblems: [], // 服务问题
},
linexpand(e){
linexpand(e) {
console.log(e)
},
linfold(e){
linfold(e) {
console.log('66');
console.log(e)
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: function(options) {
this.getCommonProblem(1)
this.getCommonProblem(2)
this.getCommonProblem(3)
......@@ -31,70 +31,70 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onShareAppMessage: function() {
},
checkInTranform(e){
checkInTranform(e) {
let flag = !e.currentTarget.dataset.flag
let index = e.currentTarget.dataset.index;
this.setData({
[`checkInProblems[${index}].flag`]:flag
[`checkInProblems[${index}].flag`]: flag
});
},
ticketsTranform(e){
ticketsTranform(e) {
let flag = !e.currentTarget.dataset.flag
let index = e.currentTarget.dataset.index;
this.setData({
[`ticketsProblems[${index}].flag`]:flag
[`ticketsProblems[${index}].flag`]: flag
});
},
tranform(e){
tranform(e) {
let flag = !e.currentTarget.dataset.flag
let index = e.currentTarget.dataset.index;
this.setData({
[`serviceProblems[${index}].flag`]:flag
[`serviceProblems[${index}].flag`]: flag
});
},
// 常见问题
......@@ -107,8 +107,8 @@ Page({
top: '',
},
success: function(res) {
res.data.forEach(function(item){
item.flag =false;
res.data.forEach(function(item) {
item.flag = false;
})
switch (type) {
case 1:
......
pages/mine/question-more/question-more.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/moreProblems/moreProblems.wxml → pages/mine/question-more/question-more.wxml
......@@ -5,7 +5,7 @@
<block wx:if="{{checkInProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./images/Icon／24pt／Service@2x.png"></image>
<image class="icon-img" src="./image/Icon／24pt／Service@2x.png"></image>
</view>
<view class="title">入住问题</view>
</view>
......@@ -14,12 +14,12 @@
<view class="content-item" wx:for="{{checkInProblems}}" wx:key="index">
<l-collapse>
<l-collapse-item l-body-class="l-body-class" l-title-class="l-title-class" customTitle="{{true}}" data-index="{{index}}" data-flag="{{item.flag}}" bindtap="checkInTranform">
<view class="item-title" slot="title" >
<view class="item-title" slot="title">
<view class="row align-c">
<view class="circle"></view>
<view>{{item.title}}</view>
</view>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="28" color="#999"/>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="28" color="#999" />
</view>
<text class="text">{{item.content}}</text>
......@@ -33,7 +33,7 @@
<block wx:if="{{ticketsProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./images/Icon／24pt／Ticket@2x.png"></image>
<image class="icon-img" src="./image/Icon／24pt／Ticket@2x.png"></image>
</view>
<view class="title">门票问题</view>
</view>
......@@ -41,12 +41,12 @@
<view class="content-item" wx:for="{{ticketsProblems}}" wx:key="index">
<l-collapse>
<l-collapse-item l-body-class="l-body-class" l-title-class="l-title-class" customTitle="{{true}}" data-index="{{index}}" data-flag="{{item.flag}}" bindtap="ticketsTranform">
<view class="item-title" slot="title" >
<view class="item-title" slot="title">
<view class="row align-c">
<view class="circle"></view>
<view>{{item.title}}</view>
</view>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="28" color="#999"/>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="28" color="#999" />
</view>
<view class="text">{{item.content}}</view>
......@@ -59,7 +59,7 @@
<block wx:if="{{serviceProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./images/Icon／24pt／Ticket@2x.png"></image>
<image class="icon-img" src="./image/Icon／24pt／Ticket@2x.png"></image>
</view>
<view class="title">服务问题</view>
</view>
......@@ -67,12 +67,12 @@
<view class="content-item" wx:for="{{serviceProblems}}" wx:key="index">
<l-collapse>
<l-collapse-item l-body-class="l-body-class" l-title-class="l-title-class" customTitle="{{true}}" data-index="{{index}}" data-flag="{{item.flag}}" bindtap="tranform">
<view class="item-title" slot="title" >
<view class="item-title" slot="title">
<view class="row align-c">
<view class="circle"></view>
<view>{{item.title}}</view>
</view>
<l-icon name="right" l-class="{{item.flag ? 'tranform':''}}" size="28" color="#999"/>
<l-icon name="right" l-class="{{item.flag ? 'tranform':''}}" size="28" color="#999" />
</view>
<view class="text">{{item.content}}</view>
......@@ -85,10 +85,3 @@
</view>
</view>
\ No newline at end of file
pages/moreProblems/moreProblems.wxss → pages/mine/question-more/question-more.wxss
/* pages/moreProblems/moreProblems.wxss */
.body{
.body {
width: 670rpx;
padding-top: 200rpx;
}
.icon{
.icon {
width: 75rpx;
height: 75rpx;
border-radius: 50%;
......@@ -12,41 +14,47 @@
align-items: center;
justify-content: center;
}
.icon-img{
.icon-img {
width: 55rpx;
height: 55rpx;
}
.title{
.title {
font-size: 40rpx;
margin-left: 25rpx;
color: rgb(24, 23, 26);
font-weight: 500;
}
.content{
.content {
padding-top: 60rpx;
padding-bottom: 60rpx;
}
.content-item{
.content-item {
width: 100%;
height: auto;
border-bottom: 1px solid rgb(247, 246, 247);
}
.circle{
.circle {
width: 10rpx;
height: 10rpx;
border-radius: 50%;
background-color: black;
margin-right: 20rpx;
}
.item-title{
.item-title {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding:30rpx 0 30rpx 0;
padding: 30rpx 0 30rpx 0;
}
.text{
.text {
width: 610rpx;
height: auto;
margin: auto;
......@@ -55,6 +63,7 @@
padding-left: 40rpx;
margin-bottom: 20rpx;
}
.tranform{
.tranform {
transform: rotate(90deg);
}
pages/customerService/customerService.js → pages/mine/question/question.js
// pages/customerService/customerService.js
const app = getApp()
const App = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
title:'客服中心',
inputHidden:true,
title: '客服中心',
inputHidden: true,
commonProblems: [],
data:[
{title:'进入碧海银虎园区需要提前预约吗？'},
{title:'园区餐厅有哪些？如何预订？'},
{title:'如何预订海错图门票？'},
{title:'如何预订儿童营地门票？'},
data: [{
title: '进入碧海银虎园区需要提前预约吗？'
},
{
title: '园区餐厅有哪些？如何预订？'
},
{
title: '如何预订海错图门票？'
},
{
title: '如何预订儿童营地门票？'
},
],
mask:false,//控制客服微信的遮罩层显示
phone:'13316748039',
hotline:false,//客服热线
bottom:0,
focus:false,
height: 0,
mask: false, //控制客服微信的遮罩层显示
phone: '13316748039',
hotline: false, //客服热线
bottom: 0,
focus: false,
remark: '',
isIphoneX: '', //判断是否为iphonex
},
//获取焦点的时候
linfocus(e){
console.log('linfocus', e.detail.height)
linfocus(e) {
this.setData({
bottom: e.detail.height,
})
wx.pageScrollTo({
scrollTop:0,
scrollTop: 0,
})
},
saveImage(e){
saveImage(e) {
let url = e.currentTarget.dataset.url;
console.log(url);
//用户需要授权
......@@ -43,40 +46,40 @@ Page({
if (!res.authSetting['scope.writePhotosAlbum']) {
wx.authorize({
scope: 'scope.writePhotosAlbum',
success:()=> {
success: () => {
// 同意授权
this.saveImg1(url);
},
fail: (res) =>{
fail: (res) => {
console.log(res);
}
})
}else{
} else {
// 已经授权了
this.saveImg1(url);
}
},
fail: (res) =>{
fail: (res) => {
console.log(res);
}
})
},
saveImg1(url){
saveImg1(url) {
wx.getImageInfo({
src: url,
success:(res)=> {
success: (res) => {
let path = res.path;
wx.saveImageToPhotosAlbum({
filePath:path,
success:(res)=> {
filePath: path,
success: (res) => {
console.log(res);
},
fail:(res)=>{
fail: (res) => {
console.log(res);
}
})
},
fail:(res)=> {
fail: (res) => {
console.log(res);
}
})
......@@ -84,123 +87,78 @@ Page({
//失去焦点
inputBlur(e) {
this.setData({
inputHidden:true,
title:'客服中心',
inputHidden: true,
title: '客服中心',
})
},
bindFeedbackInput: function (e) {
bindFeedbackInput: function(e) {
this.setData({
remark: e.detail.value
})
},
//填写反馈
feedback(e){
feedback(e) {
console.log(e.detail.height);
this.setData({
focus:true,
inputHidden:false,
title:'填写反馈'
focus: true,
inputHidden: false,
title: '填写反馈'
})
},
// 关闭遮罩层
close(){
close() {
this.setData({
mask:false
mask: false
})
},
//开启微信客服
openMask(){
openMask() {
this.setData({
mask:true
mask: true
})
},
//客服热线拨打
call(){
call() {
wx.makePhoneCall({
phoneNumber: this.data.phone,
})
},
//取消拨打
cancel(){
cancel() {
this.setData({
hotline:false,
hotline: false,
})
},
showHotline(){
showHotline() {
this.setData({
hotline:true
hotline: true
})
},
moreProblems(){
moreProblems() {
wx.navigateTo({
url: '../moreProblems/moreProblems',
url: '/pages/mine/question-more/question-more',
})
},
tranform(e){
tranform(e) {
let flag = !e.currentTarget.dataset.flag
let index = e.currentTarget.dataset.index;
this.setData({
[`commonProblems[${index}].flag`]:flag
[`commonProblems[${index}].flag`]: flag
});
console.log(this.data.commonProblems);
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.getCommonProblem()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
onLoad: function(options) {
this.getCommonProblem();
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
isIphoneX: wx.getSystemInfoSync().model.indexOf("iPhone X")
})
},
// 提交意见反馈
......@@ -214,9 +172,9 @@ Page({
title: '提交中',
show: true,
mask: true,
duration: 1000*60,
duration: 1000 * 60,
})
app.wxRequest({
App.wxRequest({
url: '/api/v1/smFeedback/doFeedBack',
data: {
content: that.data.remark
......@@ -227,8 +185,8 @@ Page({
title: '提交成功',
})
that.setData({
inputHidden:true,
title:'客服中心',
inputHidden: true,
title: '客服中心',
remark: '',
})
},
......@@ -244,14 +202,14 @@ Page({
// 常见问题
getCommonProblem() {
let that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/smCommonProblem/getList',
data: {
type: '',
top: 1,
},
success: function(res) {
res.data.forEach(function(item){
res.data.forEach(function(item) {
item.flag = false;
});
that.setData({
......
pages/mine/question/question.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/customerService/customerService.wxml → pages/mine/question/question.wxml
<!--pages/customerService/customerService.wxml-->
<l-toast l-image-class="toast-image"></l-toast>
<navigation class="navigation" titleText="{{title}}" backIcon="/image/back-w.png" color="#ffffff"></navigation>
<view class="container">
<view style="height:{{height}}px;background-color:white;">
<image class="banner-img" src="http://upload.miaomiao-bao.com/70161202008161703131621.jpg"></image>
<view class="customer-body">
<view class="customer-body-header">
<view class="customer-body-title">常见问题</view>
<view class="row" style="align-items: center;">
<view class="row" style="align-items: center;padding-right:10rpx;">
<text bindtap="moreProblems" style="color:rgb(43,45,46);padding-right:15rpx;font-size:26rpx;">更多问题</text>
<l-icon name="right" color="rgb(172,172,174)" size="26"/>
<l-icon name="right" color="rgb(172,172,174)" size="26" />
</view>
</view>
<block wx:if="{{commonProblems.length > 0}}">
......@@ -21,7 +20,7 @@
<view class="circle"></view>
<view style="width:540rpx;">{{item.title}}</view>
</view>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="28" color="#999"/>
<l-icon l-class="{{item.flag ? 'tranform':''}}" name="right" size="26" color="#999" />
</view>
<view class="text">{{item.content}}</view>
......@@ -39,7 +38,7 @@
</view> -->
</view>
</view>
<view class="footer-nav">
<view class="footer-nav" style="padding-bottom:{{isIphoneX >=0?68:0}}rpx;">
<view class="nav-item" bindtap="call">
<image class="nav-icon" src="./images/Hotline@2x.png"></image>
<view class="nav-item-title">客服热线</view>
......@@ -70,7 +69,7 @@
</view>
<view class="close" bindtap="close">
<l-icon name="close" color="black" size="28"/>
<l-icon name="close" color="black" size="28" />
</view>
</l-mask>
......@@ -85,7 +84,8 @@
<!-- 填写意见反馈 -->
<view class="textBox" style="bottom:{{bottom}}px" hidden="{{inputHidden}}">
<view class="textBox-container">
<l-textarea cursor-spacing='0' bind:linblur="inputBlur" bind:lininput="bindFeedbackInput" focus="{{focus}}" adjust-position="{{false}}" bind:linfocus="linfocus" l-class="textArea-class" indicator="{{true}}" maxlength="200" placeholder="请留下您的宝贵意见" value="{{remark}}"/>
<l-textarea cursor-spacing='0' bind:linblur="inputBlur" bind:lininput="bindFeedbackInput" focus="{{focus}}" adjust-position="{{false}}" bind:linfocus="linfocus" l-class="textArea-class" indicator="{{true}}" maxlength="200" placeholder="请留下您的宝贵意见" value="{{remark}}"
/>
<view class="feedbackButton" bindtap="feedbackSubmit">提交反馈</view>
</view>
......
pages/customerService/customerService.wxss → pages/mine/question/question.wxss
.banner-img{
.banner-img {
width: 750rpx;
height: 480rpx;
}
.footer-nav{
.footer-nav {
position: fixed;
bottom: 38rpx;
bottom: 0rpx;
width: 750rpx;
height: 100rpx;
min-height: 100rpx;
height: auto;
display: flex;
align-items: center;
justify-content: space-around;
border-top: 1px solid rgb(244, 242, 244);
background-color: white;
}
.customer-body{
.customer-body {
padding-bottom: 120rpx;
padding-top: 60rpx;
width: 670rpx;
margin: auto;
height: auto;
}
.tranform{
.tranform {
transform: rotate(90deg);
}
.customer-body-header{
.customer-body-header {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10rpx;
}
.customer-body-title{
font-size:46rpx ;
.customer-body-title {
font-size: 46rpx;
}
.circle{
.circle {
width: 10rpx;
height: 10rpx;
border-radius: 50%;
......@@ -41,29 +48,41 @@
margin-left: 12rpx;
margin-right: 18rpx;
}
.nav-item{
text-align: center;
.nav-item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
}
.nav-item-title{
font-size: 24rpx;
color: rgb(169, 171, 177);
.nav-item-title {
font-size: 22rpx;
font-weight: 400;
color: #959da9;
line-height: 32rpx;
}
.nav-icon{
.nav-icon {
width: 48rpx;
height: 48rpx;
margin-top: 14rpx;
}
.mask-content{
.mask-content {
width: 610rpx;
height: 860rpx;
background-color: white;
position: relative;
}
.mask-img{
.mask-img {
width: 100%;
position: absolute;
bottom:0 ;
bottom: 0;
}
.mask-contanier{
.mask-contanier {
width: 570rpx;
height: 820rpx;
margin: auto;
......@@ -73,42 +92,49 @@
left: 20rpx;
border-radius: 3px;
}
.logo-container{
.logo-container {
/* width: 300rpx; */
height: 110rpx;
overflow: hidden;
position: relative;
margin-top: 30rpx;
}
.logo{
.logo {
width: 300rpx;
position: absolute;
top: -190rpx;
right: 30rpx;
}
.er-code-div{
.er-code-div {
width: 280rpx;
height: 280rpx;
margin:auto;
margin: auto;
margin-top: 30rpx;
}
.er-code{
.er-code {
width: 280rpx;
height: 280rpx;
}
.title{
.title {
font-size: 38rpx;
text-align: center;
margin-top: 40rpx;
color: rgb(59, 59, 59);
}
.operation{
.operation {
font-size: 26rpx;
text-align: center;
margin-top: 20rpx;
color: rgb(63, 61, 59);
}
.close{
.close {
width: 80rpx;
height: 80rpx;
background-color: rgb(172, 169, 170);
......@@ -118,36 +144,42 @@
border-radius: 50%;
line-height: 80rpx;
}
.phone{
.phone {
height: 85rpx;
text-align: center;
color: rgb(160, 157, 160);
line-height: 85rpx;
}
.call{
.call {
height: 125rpx;
text-align: center;
line-height: 125rpx;
font: 30rpx;
}
.textBox{
.textBox {
width: 750rpx;
height: 510rpx;
background-color: white;
position: absolute;
bottom: 0;
}
.textBox-container{
.textBox-container {
width: 660rpx;
height: 300rpx;
margin: auto;
margin-top: 50rpx;
}
.textArea-class{
.textArea-class {
height: 300rpx;
background-color: rgb(244, 246, 250);
}
.feedbackButton{
.feedbackButton {
margin-top: 30rpx;
border-radius: 3px;
width: 100%;
......@@ -157,11 +189,13 @@
background-color: rgb(132, 199, 224);
text-align: center;
}
.content{
.content {
padding-top: 0rpx;
padding-bottom: 60rpx;
}
.content-item{
.content-item {
width: 100%;
height: auto;
border-bottom: 1px solid rgb(247, 246, 247);
......@@ -174,14 +208,16 @@
background-color: black;
margin-right: 20rpx;
} */
.item-title{
.item-title {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding:30rpx 0 30rpx 0;
padding: 30rpx 0 30rpx 0;
}
.text{
.text {
width: 610rpx;
height: auto;
margin: auto;
......
pages/myAppointment/myAppointment.js deleted 100644 → 0
// pages/myAppointment/myAppointment.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
navItem:[
// {content:'全部',type:'0'},
{content:'夜间入园预约',type:'1'},
{content:'看房预约',type:'2'},
],
data:[ // 假数据数组,type=0入园预约,type=1 看房预约
// {title:'夜间入园预约',type:'0',time:'6月30日 20:00-24:00',num:3,url:'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'},
// {title:'看房预约',type:'1',time:'6月30日',num:3,url:' http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'},
],
active:0,
height:0,
},
// 点击导航切换，默认是全部的
chageNav(e){
let index = e.currentTarget.dataset.index
this.setData({
active: index
})
this.getList(index)
},
//预约凭证
gohotelAccommodation(e){
console.log(e)
wx.navigateTo({
url: '../hotelAccommodation/hotelAccommodation?detail='+JSON.stringify(e.currentTarget.dataset.item),
})
},
//预约
goAppoint(e){
let type = e.currentTarget.dataset.index;
wx.navigateTo({
url: '/pages/appointment/appointment?type='+type,
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
})
this.getList(this.data.active)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
// 预约列表/我的预约
getList(index) {
let type = ''
switch (index) {
case 0: type = 0; break;
case 1: type = 1 ; break;
}
let that = this
app.wxRequest({
url: '/api/v1/subscribe/getList',
data: {
state: '',
type: type//0 入园预约 1 看房预约 全部 空字符
},
success: function(res) {
let tmpArr = []
res.data.forEach(item => {
let type = item.type*1
let title = ''
let url = ''
switch (type) {
case 0:
title = '夜间入园预约'
url = 'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'
break;
case 1:
title = '看房预约'
url = 'http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'
break;
}
let obj = {
title:title,
type: type,
time: item.subscribeDate.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : ''),
num: item.subscribeNum,
url: url,
id: item.id,
mobile: item.mobile,
name: item.name,
}
tmpArr.push(obj)
})
that.setData({
data: tmpArr
})
}
})
}
})
\ No newline at end of file
pages/myAppointment/myAppointment.wxml deleted 100644 → 0
<!--pages/myAppointment/myAppointment.wxml-->
<navigation class="navigation" titleText="我的预约" backIcon="/image/back.png"></navigation>
<view class="container all">
<view class="myActivity-container" style="min-height:{{height}}px;">
<view class="myAppointment-nav">
<!-- 遍历头部导航 -->
<view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
</view>
<view class="myAppointment-body">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index">
<image src="{{item.url}}" class="item-img"></image>
<view class="item-content">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
<view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view>
<view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view>
</view>
<view class="button" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
</view>
</view>
</view>
<view class="noActive" hidden="{{data.length > 0 || active == 1}}" >
<view class="noActive-title">暂无夜间入园预约</view>
<view class="noActive-rule">20:00后入园需要提前预约，每日限流200人</view>
<view class="noActive-botton" data-index="1" bindtap="goAppoint">去预约</view>
</view>
<view class="noActive" hidden="{{data.length > 0 || active == 0}}" >
<view class="noActive-title">暂无看房预约</view>
<view class="noActive-botton" data-index="2" bindtap="goAppoint">去预约</view>
</view>
</view>
<wxs module = "m1">
var getDate = function(date,type){
return date.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : '');
}
module.exports.getDate = getDate;
</wxs>
pages/myAppointment/myAppointment.wxss deleted 100644 → 0
/* pages/myAppointment/myAppointment.wxss */
.myAppointment-nav{
width: 750rpx;
padding-top: 150rpx;
/* height: 95rpx; */
border-bottom: 1px solid rgb(238, 238, 238);
background: -webkit-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* Firefox 3.6 - 15 */
background: linear-gradient(rgb(255,255,255), rgb(249,249,251)); /* 标准的语法（必须放在最后） */
display: flex;
justify-content: space-around;
}
.all{
background-color: rgba(243,244,246,1);
}
.navItem{
line-height: 95rpx;
color: rgb(156, 158, 163);
}
.active{
border-bottom: 3px solid rgb(0, 0, 2);
color: rgb(28, 27, 30);
}
.myAppointment-body{
width: 750rpx;
/* min-height: 1000rpx; */
height: auto;
/* background-color: rgb(245, 244, 249); */
padding-top: 50rpx;
}
.noActive{
width: 750rpx;
position: absolute;
top: 50%;
text-align: center;
height: auto;
}
.noActive-title{
font-size:38rpx;
font-weight:500;
color:rgba(149,157,169,1);
line-height:52rpx;
}
.noActive-rule{
font-size:26rpx;
font-weight:400;
color:rgba(149,157,169,1);
line-height:36rpx;
margin-top: 24rpx;
}
.noActive-botton{
width:308rpx;
height:96rpx;
font-size:26rpx;
text-align: center;
font-weight:400;
line-height: 96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
color:rgba(255,255,255,1);
font-size:30rpx;
margin: 0 auto;
margin-top: 64rpx;
}
.myAppointment-item{
width: 670rpx;
height: 360rpx;
margin: auto;
margin-bottom: 50rpx;
background-color: rgb(220, 214, 220);
border-radius: 4px;
position: relative;
overflow: hidden;
}
.item-img{
width: 100%;
position: absolute;
height:360rpx;
}
.item-content{
width: 610rpx;
height: auto;
position: absolute;
bottom: 45rpx;
left: 30rpx;
}
.item-title{
font-size: 36rpx;
line-height: 70rpx;
}
.item-time{
line-height: 48rpx;
font-size: 28rpx;
color: rgb(220, 214, 220);
}
.item-num{
font-size:28rpx ;
color: rgb(220, 214, 220);
line-height: 48rpx;
}
/* 入园标题样式 */
.item-num-1{
color: rgb(244, 254, 255);
}
.item-time-1{
color: rgb(40, 50, 56);
}
.button{
width: 170rpx;
height: 70rpx;
position: absolute;
bottom: 45rpx;
right: 30rpx;
line-height: 70rpx;
text-align: center;
color: white;
background:rgba(255,255,255,0.53);
border-radius: 3px;
font-size: 28rpx;
}
\ No newline at end of file
pages/pay/coupon-detail/coupon-detail.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/coupon-detail/coupon-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/coupon-detail/coupon-detail.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/coupon-detail/coupon-detail.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/pay/coupon-input/coupon-input.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/coupon-input/coupon-input.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/coupon-input/coupon-input.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/coupon-input/coupon-input.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/pay/coupon/coupon.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/coupon/coupon.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/coupon/coupon.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/coupon/coupon.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/pay/home/home.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/home/home.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/home/home.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/home/home.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/pay/order-detail/order-detail.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/order-detail/order-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/order-detail/order-detail.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/order-detail/order-detail.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/pay/order-input/order-input.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/pay/order-input/order-input.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/pay/order-input/order-input.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/pay/order-input/order-input.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/activity-detail/activity-detail.js → pages/play/activity-detail/activity-detail.js
const app = getApp()
const App = getApp()
let logicData = {
pageScrollLock: false,
......@@ -38,56 +38,22 @@ Page({
},
onLoad: function (options) {
// this.queryDetail()
this.setData({
id: options.id
})
var that = this
app.login({
success: function() {
App.login({
success: function () {
that.getActivityDetail()
}
})
},
/**
* 获取 banner 渲染数据
* @function
* @param {string} - funcToken
* @returns
*/
queryDetail: function () {
let response = {
banner: [
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/banner-1.png',
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/banner-2.png',
'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/banner-3.png',
],
title: '艺术花坊国际花艺设计基础知识交流分享会',
date: '6月30日 - 7月12日 10:00 - 18:30',
address: '艺术花坊五号展厅',
quota: '50人',
describe: '跟随老师结合各类花材，运用色彩，将生活灵感巧妙实践于花艺作品中。体验者全程鲜花实操亲自参与鲜花制作，用花木来抒发情怀，从而点缀生活中的美。',
contact: '13316748039'
}
this.setData({
banner: response.banner,
info: {
title: response.title,
date: response.date,
address: response.address,
quota: response.quota,
describe: response.describe,
contact: response.contact,
}
})
},
onContact: function () {
if (this.data.activeState == 1) {
wx.navigateTo({
url: '/pages/activity-entry/activity-entry?id='+this.data.id
url: '/pages/play/activity-entry/activity-entry?id=' + this.data.id
})
}
......@@ -106,12 +72,12 @@ Page({
},
//主题活动详情
getActivityDetail(){
getActivityDetail() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/getDetail',
data: { id: that.data.id },
success: function(res) {
success: function (res) {
var response = res.data
that.setData({
banner: response.banners,
......@@ -124,19 +90,19 @@ Page({
// contact: response.contact,
}
})
that.configActiveState(response.activeState*1)
that.configActiveState(response.activeState * 1)
}
})
},
configActiveState(state) {
var text = this.data.stateText
switch(state) {
case 0:text = '未开始'
switch (state) {
case 0: text = '未开始'
break;
case 1:text = '立即报名'
case 1: text = '立即报名'
break;
case 2:text = '报名已截止'
case 2: text = '报名已截止'
break;
}
this.setData({
......
pages/activity-detail/activity-detail.json → pages/play/activity-detail/activity-detail.json
{
"usingComponents": {
"parser":"../../component/parser.min/parser"
"parser": "../../../component/parser.min/parser"
}
}
\ No newline at end of file
pages/activity-entry/activity-entry.js → pages/play/activity-entry/activity-entry.js
import iMiment from '../../npm/miment.js'
const app = getApp()
const App = getApp()
Page({
data: {
......@@ -15,7 +14,7 @@ Page({
activityImage: '',
activityName: '',
activeTime: '',
activityTimes: [{beginTime:'',endTime:'', date:''}],// 活动场次
activityTimes: [{ beginTime: '', endTime: '', date: '' }],// 活动场次
activityIndex: 0,
isShow: false,
......@@ -36,31 +35,14 @@ Page({
id: options.id
})
// this.setReset()
var that = this
app.login({
success: function() {
App.login({
success: function () {
that.getEnrollView()
}
})
},
// setReset: function () {
// let funcDate = iMiment(new Date().getTime()).format('YYYY-MM-DD')
// let funcFormInto = {
// name: '',
// phone: '',
// quantity: 0,
// date: funcDate,
// }
// this.setData({
// formInto: funcFormInto,
// appointmentDate: funcDate,
// })
// },
onQuantityCut: function () {
let funcFormInto = this.data.formInto
if (0 < funcFormInto.quantity) {
......@@ -69,6 +51,8 @@ Page({
this.setData({
formInto: funcFormInto
})
this.updateSubmitButtonStatus()
},
onQuantityAdd: function () {
......@@ -80,11 +64,11 @@ Page({
})
return
}
if (1 == activityTime.enroll*1) {
if (1 == activityTime.enroll * 1) {
this.setData({
errorQuantity: '该场次已报名过，请选择其他场次',
})
} else if (funcFormInto.quantity >= activityTime.residue*1) {
} else if (funcFormInto.quantity >= activityTime.residue * 1) {
this.setData({
errorQuantity: '该场次剩余名额' + activityTime.residue + '人',
})
......@@ -103,6 +87,7 @@ Page({
formInto: funcFormInto
})
this.updateSubmitButtonStatus()
},
showPicker() {
......@@ -122,11 +107,11 @@ Page({
let activityTime = this.data.activityTimes[this.data.activityIndex]
if (1 == activityTime.enroll*1) {
if (1 == activityTime.enroll * 1) {
this.setData({
errorQuantity: '该场次已报名过，请选择其他场次',
})
} else if (0 == activityTime.residue*1) {
} else if (0 == activityTime.residue * 1) {
this.setData({
errorQuantity: '该场次人数已满，请选择其他场次',
})
......@@ -136,6 +121,8 @@ Page({
})
}
this.updateSubmitButtonStatus()
},
cancleCallBack() {
this.setData({
......@@ -151,8 +138,8 @@ Page({
onSubmit: function () {
var that = this
app.login({
success: function() {
App.login({
success: function () {
that.doActivityEnroll()
}
})
......@@ -214,15 +201,17 @@ Page({
})
}
}
this.updateSubmitButtonStatus()
},
//活动报名页
getEnrollView(){
getEnrollView() {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/getEnrollView',
data: { id: that.data.id },
success: function(res) {
success: function (res) {
var response = res.data
if (response.activityTimes.length > 0) {
var activityTimes = []
......@@ -282,12 +271,12 @@ Page({
let activityTime = this.data.activityTimes[this.data.activityIndex]
if (1 == activityTime.enroll*1) {
if (1 == activityTime.enroll * 1) {
this.setData({
errorQuantity: '该场次已报名过，请选择其他场次',
})
complete = false
} else if (0 == activityTime.residue*1) {
} else if (0 == activityTime.residue * 1) {
this.setData({
errorQuantity: '该场次人数已满，请选择其他场次',
})
......@@ -311,6 +300,37 @@ Page({
},
updateSubmitButtonStatus() {
let complete = true
let formInto = this.data.formInto
if (formInto.name === '') {
complete = false
}
if (formInto.phone === '') {
complete = false
} else if (formInto.phone.length != 11) {
complete = false
}
let activityTime = this.data.activityTimes[this.data.activityIndex]
if (1 == activityTime.enroll * 1) {
complete = false
} else if (0 == activityTime.residue * 1) {
complete = false
} else if (formInto.quantity === 0) {
complete = false
}
this.setData({
canSubmit: complete
})
return complete
},
// 活动报名
doActivityEnroll() {
if (!this.inspectForm()) {
......@@ -323,10 +343,10 @@ Page({
title: '提交中',
show: true,
mask: true,
duration: 1000*60,
duration: 1000 * 60,
})
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/doActivityEnroll',
data: {
activityId: that.data.id,
......@@ -335,13 +355,13 @@ Page({
name: formInto.name,
mobile: formInto.phone,
},
success: function(res) {
success: function (res) {
that.setData({
entryComplete: true,
})
wx.lin.hideToast()
},
fail: function(err) {
fail: function (err) {
wx.lin.showToast({
image: '/image/error.png',
title: err.msg,
......
pages/notice/notice.json → pages/play/activity-entry/activity-entry.json
{
"navigationBarTextStyle": "black",
"usingComponents": {
"parser":"../../component/parser.min/parser"
"picker": "../../../component/picker/picker"
}
}
\ No newline at end of file
pages/activity-entry/activity-entry.wxml → pages/play/activity-entry/activity-entry.wxml
......@@ -70,7 +70,7 @@
<view class="input-picker" bindtap="showPicker">
<text class="picker">{{activityTimes[activityIndex].beginTime}}</text>
</view>
<image class="input-icon" src="../../image/more.png"></image>
<image class="input-icon" src="../../image/more.png" bindtap="showPicker"></image>
</view>
</view>
<view class="form-error row align-c">
......
pages/activity/activity.js → pages/play/activity/activity.js
import iMiment from '../../npm/miment.js'
const app = getApp()
const App = getApp()
Page({
data: {
......@@ -8,11 +7,9 @@ Page({
},
onLoad: function () {
// this.queryActivity()
// this.queryOther()
var that = this
app.login({
success: function() {
App.login({
success: function () {
that.getActivityList(1)
that.getActivityList(0)
}
......@@ -20,80 +17,23 @@ Page({
},
queryActivity: function () {
let response = [
{
id: '1',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-1.png',
title: '夏日音乐节',
date: '6月30日-7月12日 10:00-12:00',
describe: '古典、电影、摇滚、民乐...无论你喜好哪种口味，都能在这里找到你的菜！',
}, {
id: '2',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-2.png',
title: '茶艺手作体验空间',
date: '7月25日-8月25日 10:00-12:00',
describe: '茶文化，以人为本，借此一叶一盏修心修德，茶席可看作茶人于 尘世间安身之处，寄托理想之所',
}, {
id: '3',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-3.png',
title: '书画艺术作品鉴赏分享活动',
date: '7月25日-8月25日 10:00-12:00',
describe: '历史画作历经数千年的沧桑巨变发展到今天，艺术魅力依然光彩照人，一起来感受它们的妙不可言',
}
]
this.setData({
activity: response
})
},
queryOther: function () {
let response = [
{
id: '1',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-other-1.png',
title: 'SPA养心体验',
date: '7月25日-8月25日',
describe: '',
}, {
id: '2',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-other-2.png',
title: '花艺鉴赏活动',
date: '7月25日-8月25日',
describe: '',
}, {
id: '3',
cover: 'https://image-1256588539.cos.ap-shanghai.myqcloud.com/miniapp/activity/activity-other-3.png',
title: '划船比赛',
date: '7月25日-8月25日',
describe: '',
},
]
this.setData({
other: response
})
},
onActivityDetail: function (funcItem) {
console.log('onActivityDetail',funcItem)
wx.navigateTo({
url: '/pages/activity-detail/activity-detail?id='+funcItem.currentTarget.dataset.id
url: '/pages/play/activity-detail/activity-detail?id=' + funcItem.currentTarget.dataset.id
})
},
//主题活动列表 type 1 近期 0 往期
getActivityList(type){
getActivityList(type) {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/getList',
data: {
listType: type,
pageSize: 20,
pageNo: 1,
},
success: function(res) {
success: function (res) {
var tmpArr = [];
res.data.list.forEach(item => {
var tmpItem = {
......
pages/activity/activity.wxml → pages/play/activity/activity.wxml
......@@ -2,6 +2,7 @@
<navigation class="navigation" titleText="主题活动" background="#ffffff" backIcon="/image/back.png"></navigation>
<view class="container">
<block wx:if="{{activity.length > 0}}">
<view class="title row">
<image src="./image/title.png"></image>
</view>
......@@ -20,6 +21,7 @@
</view>
</block>
</view>
</block>
<block wx:if="{{other.length > 0}}">
<view class="title row">
......@@ -37,8 +39,8 @@
<text>{{item.date}}</text>
</view>
</view>
<view class="other-item col"></view>
</block>
<view class="other-item col"></view>
</view>
</block>
</view>
\ No newline at end of file
pages/play/play.js → pages/play/home/home.js
import iUtils from '../../utils/utils.js'
import deviceUtil from "../../miniprogram_npm/lin-ui/utils/device-util.js"
const app = getApp()
const App = getApp()
let logicData = {
pageScrollLock: false,
......@@ -20,24 +17,24 @@ Page({
tab: [
{
'text': '艺文',
'defaultImage': '/pages/play/image/literatue.png',
'activeImage': '/pages/play/image/literatue-s.png',
'defaultImage': './image/literatue.png',
'activeImage': './image/literatue-s.png',
}, {
'text': '健康',
'defaultImage': '/pages/play/image/healthy.png',
'activeImage': '/pages/play/image/healthy-s.png',
'defaultImage': './image/healthy.png',
'activeImage': './image/healthy-s.png',
}, {
'text': '美食',
'defaultImage': '/pages/play/image/food.png',
'activeImage': '/pages/play/image/food-s.png',
'defaultImage': './image/food.png',
'activeImage': './image/food-s.png',
}, {
'text': '休闲',
'defaultImage': '/pages/play/image/relaxation.png',
'activeImage': '/pages/play/image/relaxation-s.png',
'defaultImage': './image/relaxation.png',
'activeImage': './image/relaxation-s.png',
}, {
'text': '住宿',
'defaultImage': '/pages/play/image/hotel.png',
'activeImage': '/pages/play/image/hotel-s.png',
'defaultImage': './image/hotel.png',
'activeImage': './image/hotel-s.png',
}
],
tabIndex: 0,
......@@ -69,63 +66,63 @@ Page({
let response = [
{
describe: [
app.globalData.appResourcesBase + 'play/detail/detail-1-1.png'
App.globalData.appResourcesBase + 'play/detail/detail-1-1.png'
],
shop: [{
id: 1,
name: '海错图展馆',
cover: app.globalData.appResourcesBase + 'play/detail/detail-1-2.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png',
x: 108,
y: 212,
}, {
id: 2,
name: '拾光花坊',
cover: app.globalData.appResourcesBase + 'play/detail/detail-1-3.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png',
x: 108,
y: 264,
}]
}, {
describe: [
app.globalData.appResourcesBase + 'play/detail/detail-2-1.png'
App.globalData.appResourcesBase + 'play/detail/detail-2-1.png'
],
shop: [{
id: 3,
name: '水元养韵SPA',
cover: app.globalData.appResourcesBase + 'play/detail/detail-2-2.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
app.globalData.appResourcesBase + 'play/detail/detail-3-1.png'
App.globalData.appResourcesBase + 'play/detail/detail-3-1.png'
],
shop: [{
id: 4,
name: '原味舒食',
cover: app.globalData.appResourcesBase + 'play/detail/detail-3-2.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png',
x: 108,
y: 212,
}, {
id: 5,
name: '原野MOJITO',
cover: app.globalData.appResourcesBase + 'play/detail/detail-3-3.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png',
x: 108,
y: 212,
}]
}, {
describe: [
app.globalData.appResourcesBase + 'play/detail/detail-4-1.png'
App.globalData.appResourcesBase + 'play/detail/detail-4-1.png'
],
shop: [{
id: 6,
name: '星空影院',
cover: app.globalData.appResourcesBase + 'play/detail/detail-4-2.png',
cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
app.globalData.appResourcesBase + 'play/detail/detail-5-1.png'
App.globalData.appResourcesBase + 'play/detail/detail-5-1.png'
],
shop: []
},
......@@ -139,7 +136,7 @@ Page({
setNavigationLogo: function () {
let funcUnitProportion = wx.getStorageSync('unitProportion')
let funcLogoTop = iUtils.navigationElementCenterMarginTop(50)
let funcLogoTop = App.modular.utils.navigationElementCenterMarginTop(50)
let funcLogoMinorTop = funcLogoTop + 50 * funcUnitProportion + 20 * funcUnitProportion
let funcTabMarginTop = funcLogoMinorTop + 20 * funcUnitProportion
......@@ -153,14 +150,14 @@ Page({
onActivity: function () {
wx.navigateTo({
url: '/pages/activity/activity'
url: '/pages/play/activity/activity'
})
},
onActivityDetail: function (funcItem) {
// console.log(funcItem)
wx.navigateTo({
url: '/pages/activity-detail/activity-detail?id='+funcItem.currentTarget.dataset.id
url: '/pages/activity-detail/activity-detail?id=' + funcItem.currentTarget.dataset.id
})
},
......@@ -170,7 +167,7 @@ Page({
})
},
onPageScroll: function(funcEvent) {
onPageScroll: function (funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
// if (logicData.pageScrollLock) return
......@@ -216,7 +213,7 @@ Page({
onShopDetail: function (funcItem) {
wx.navigateTo({
url: '/pages/shop-detail/shop-detail?id=' + funcItem.currentTarget.dataset.id
url: '/pages/play/service-detail/service-detail?id=' + funcItem.currentTarget.dataset.id
})
},
......@@ -227,9 +224,9 @@ Page({
},
//主题活动列表 type 1 近期 0 往期
getActivityList(type){
getActivityList(type) {
var that = this
app.wxRequest({
App.wxRequest({
url: '/api/v1/activity/getList',
data: {
listType: type,
......@@ -237,7 +234,7 @@ Page({
pageNo: 1,
tagId: '101',
},
success: function(res) {
success: function (res) {
var tmpArr = [];
res.data.list.forEach(item => {
var tmpItem = {
......
pages/play/image/food.png → pages/play/home/image/food.png
pages/play/image/food.png

3.61 KB | W: | H:

pages/play/home/image/food.png

3.61 KB | W: | H:

pages/play/image/food.png
pages/play/home/image/food.png
pages/play/image/food.png
pages/play/home/image/food.png
  • 2-up
  • Swipe
  • Onion skin
pages/play/image/hotel-s.png → pages/play/home/image/hotel-s.png
pages/play/image/hotel-s.png

719 Bytes | W: | H:

pages/play/home/image/hotel-s.png

719 Bytes | W: | H:

pages/play/image/hotel-s.png
pages/play/home/image/hotel-s.png
pages/play/image/hotel-s.png
pages/play/home/image/hotel-s.png
  • 2-up
  • Swipe
  • Onion skin
pages/play/movie-detail/movie-detail.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/play/movie-detail/movie-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/play/movie-detail/movie-detail.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/play/movie-detail/movie-detail.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/play/movie/movie.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/play/movie/movie.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/play/movie/movie.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/play/movie/movie.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/play/point-detail/point-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/shop-point-detail/shop-point-detail.wxml → pages/play/point-detail/point-detail.wxml
......@@ -23,4 +23,6 @@
<image src="{{item}}" mode="aspectFit"></image>
</block>
</view>
<view class="iphonexr-fill" style="{{info.background}}"></view>
</view>
\ No newline at end of file
pages/shop-point-detail/shop-point-detail.wxss → pages/play/point-detail/point-detail.wxss
......@@ -74,3 +74,13 @@ page {
height: 230rpx;
margin: 56rpx 0 40rpx 40rpx;
}
/* iphone x 底部颜色填充 */
.iphonexr-fill {
z-index: -1;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
height: 100%;
}
\ No newline at end of file
pages/shop-detail/shop-detail.js → pages/play/service-detail/service-detail.js
......@@ -8,6 +8,9 @@ let logicData = {
Page({
data: {
imageBase: App.globalData.appImageBase,
// 导航栏相关属性
navigationStyle: {
normal: {
......@@ -62,7 +65,6 @@ Page({
*/
queryDetail: function (funcIndex) {
funcIndex = funcIndex - 1
console.log('queryDetail' + funcIndex)
// 预设数据
let funcDetail = [
{
......@@ -189,7 +191,7 @@ Page({
onLocation: function () {
wx.navigateTo({
url: '/pages/guide/guide?id=' + Number(logicData.option.id)
url: '/pages/home/guide/guide?id=' + Number(logicData.option.id)
})
},
......
pages/play/service-detail/service-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/shop-detail/shop-detail.wxml → pages/play/service-detail/service-detail.wxml
......@@ -35,7 +35,7 @@
<image class="detail-other-location" src="./image/location.png"></image>
<text>地址</text>
<text>点击查看地址</text>
<image class="detail-other-more" src="../../image/more.png"></image>
<image class="detail-other-more" src="{{imageBase + 'more.png'}}"></image>
</view>
</view>
<view class="detail-describe">
......@@ -64,7 +64,7 @@
<image class="detail-other-location" src="./image/location.png"></image>
<text>地址</text>
<text>点击查看地址</text>
<image class="detail-other-more" src="../../image/more-g.png"></image>
<image class="detail-other-more" src="{{imageBase + 'more-g.png'}}"></image>
</view>
</view>
<view class="detail-describe">
......@@ -81,7 +81,7 @@
<!-- 侧边返回顶部 -->
<view class="appointment-side col con-b align-c" hidden="{{winSide}}">
<button class="appointment-side-top" bindtap="onBackTop">
<image src="../../image/top.png"></image>
<image src="{{imageBase + 'top.png'}}"></image>
</button>
</view>
</view>
\ No newline at end of file
pages/play/service-sell/service-sell.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/play/service-sell/service-sell.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/play/service-sell/service-sell.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/play/service-sell/service-sell.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/play/service/service.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/play/service/service.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/play/service/service.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/play/service/service.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/play/strategy-detail/strategy-detail.js 0 → 100644
Page({
data: {
},
onLoad: function (options) {
},
})
\ No newline at end of file
pages/play/strategy-detail/strategy-detail.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/play/strategy-detail/strategy-detail.wxml 0 → 100644
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
pages/play/strategy-detail/strategy-detail.wxss 0 → 100644
/* pages/home/home/home.wxss */
\ No newline at end of file
pages/strategy/strategy.js deleted 100644 → 0
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
const app = getApp()
Page({
data: {
isNavigationWhite: false,
banner: [],
bannerIndex: 0,
title: '',
content: '', // 内容
detailImage: [],
detailImageUrl: [],
detailIndex: 0,
relation: [],
date: '',
//接口参数
id: '',
},
onLoad: function (options) {
this.setData({
id: options.id,
})
var that = this
app.login({
success: function() {
that.loadStrategyDetail()
}
})
},
onSwiperChange: function (funcEvent) {
this.setData({
bannerIndex: funcEvent.detail.current
})
},
onPageScroll: function(funcEvent) {
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
if (funcEvent.scrollTop > 40 && !this.data.isNavigationWhite) {
this.setData({
isNavigationWhite: true
})
wx.setNavigationBarColor({
frontColor: '#000000',
backgroundColor: '#000000',
})
}
if (funcEvent.scrollTop <= 40) {
this.setData({
isNavigationWhite: false
})
wx.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: '#ffffff',
})
}
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 40)
},
// 攻略详情
loadStrategyDetail() {
var that = this
app.wxRequest({
url: '/api/v1/strategy/getDetail',
data: { id: that.data.id },
success: function(res) {
/**
* 此代码段处理目的为，匹配富文本代码中的 <img> 标签，并将其图片的宽度修改为适应屏幕
* width:100% --- 图片宽度加以限制，避免超出屏幕
* height:auto --- 高度自适应
* display:block --- 此代码，可以去掉图片之间的空白间隔，个人觉得好用
*/
var content = res.data.content.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
.replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
.replace(/<section/g, '<div')
.replace(/\/section>/g, '\div>');
that.setData({
banner: res.data.banners,
content: content,
date: res.data.updateDate,
title: res.data.title
})
that.getParksByParkIds(res.data.smParkIds)
},
})
},
shopDetail(e) {
let datasetId = e.currentTarget.dataset.id
let id = ''
if (datasetId == '21a0cbbd39604380bc46fba38ac5fb63') {
// 海错图展馆
id = 1
} else if (datasetId == 'b8f04379bf164b7f8bca69be14146a17') {
// 拾光花坊
id = 2
} else if (datasetId == 'd8922a8f759245d4949b62693099edb5') {
// 元养水韵SPA馆
id = 3
} else if (datasetId == 'd0e5ff414f794e15bc33c4e11f5356a8') {
// 原味舒食
id = 4
} else if (datasetId == '81078c007c034d46b7dfe59935d84f7a') {
// 原野MOJITO
id = 5
} else if (datasetId == '29e79743f0f94e5eb726e0ebdfe64248') {
// 星空影院
id = 6
} else if (datasetId == '559d980e9eaf4459883fb3a556d24347') {
// 儿童营地信息
wx.navigateTo({
url: '/pages/campsite-mirror/campsite-mirror',
})
} else if (datasetId == 'c0a2d795a7a54dcd9459dd1b969c1771') {
// 住宿信息
}
if (id != '') {
wx.navigateTo({
url: '/pages/shop-detail/shop-detail?id=' + id
})
}
},
// 攻略详情文中提及
getParksByParkIds(parkIds) {
if (!parkIds) {
return
}
var that = this
app.wxRequest({
url: '/api/v1/park/getParksByParkIds',
data: { smParkIds: parkIds },
success: function(res) {
var tmpArr = [];
res.data.forEach(item => {
var tmpItem = {
'id': item.id,
'cover': item.guideImg,
'title': item.name,
'time': '营业时间 ' + item.businessTime,
'price': item.chargeStandard,
'describe': '',
}
tmpArr.push(tmpItem)
})
that.setData({
relation: tmpArr
})
}
})
}
})
\ No newline at end of file
pages/strategy/strategy.wxml deleted 100644 → 0
<!-- 首页 - 游客攻略 -->
<navigation
class="navigation"
titleText="攻略详情"
color="{{isNavigationWhite ? '#000000' : '#ffffff'}}"
background="{{isNavigationWhite ? '#ffffff' : 'rgba(0, 0, 0, 0)'}}"
backIcon="{{isNavigationWhite ? '/image/back.png' : '/image/back-w.png'}}"
>
</navigation>
<view class="container">
<view id="banner" class="banner">
<swiper class="banner-swiper" autoplay circular interval="2000" duration="500" indicator-color="rgba(0, 0, 0, 0)" indicator-active-color="rgba(0, 0, 0, 0)" bindchange="onSwiperChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="banner-swiper-item">
<image class="banner-swiper-image" src="{{item}}"></image>
</swiper-item>
</block>
</swiper>
<view class="banner-swiper-point">
<swiper-point bannerActiveIndex="{{bannerIndex}}"></swiper-point>
</view>
</view>
<view class="detail column con-c">
<view class="detail-title">
<text>{{title}}</text>
</view>
<parser html="{{content}}"/>
<view class="detail-date">
<text>{{date}}</text>
</view>
</view>
<view class="relation" wx:if="{{relation.length>0}}">
<view class="relation-title">
<text>文中提及</text>
</view>
<block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="relation-item row con-b align-c" data-id="{{item.id}}" bindtap="shopDetail">
<image mode="widthFix" src="{{item.cover}}"></image>
<view class="relation-item-info col">
<text>{{item.title}}</text>
<text>{{item.time}}</text>
<text>{{item.price}}</text>
</view>
<view class="relation-item-more row align-c">
<image src="/image/more-g.png"></image>
</view>
</view>
</block>
</view>
</view>
pages/strategy/strategy.wxss deleted 100644 → 0
.navigation {
z-index: 1900;
position: fixed;
top: 0;
left: 0;
width: 750rpx;
}
.banner {
position: relative;
width: 750rpx;
height: 870rpx;
background: #ffffff;
}
.banner-swiper,
.banner-swiper-item,
.banner-swiper-image {
position: absolute;
top: 0 !important;
left: 0 !important;
width: 750rpx;
height: 870rpx;
}
.banner-swiper-point {
position: relative;
top: 760rpx;
left: 0;
}
.detail {
width: 750rpx;
padding: 6px 32rpx;
}
.detail-title {
width: 670rpx;
margin: 80rpx 0 64rpx 0;
font-size: 38rpx;
font-weight: 800;
color:#15191F;
line-height: 52rpx;
}
.detail-date {
/* width: 152rpx; */
height: 40rpx;
margin: 64rpx 0 32rpx 0;
font-size: 26rpx;
font-weight: 400;
color: #959DA9;
line-height: 40rpx;
}
.detail > image {
min-width: 100%;
}
rich-text {
margin-bottom: 52rpx;
font-size: 30rpx;
font-weight: 300;
color: #15191F;
line-height: 52rpx;
}
/* 攻略相关 */
.relation-title {
margin: 0 40rpx 90rpx 40rpx;
padding-top: 64rpx;
border-top: 1px #E2E7EF solid;
}
.relation-title text {
width: 120rpx;
height: 42rpx;
margin-top: 40rpx;
font-size: 30rpx;
font-weight: bold;
color:rgba(21,25,31,1);
}
.relation-item {
position: relative;
width: 670rpx;
height: 238rpx;
margin: 0 40rpx 104rpx 40rpx;
background:rgba(245, 246, 248, 1);
border-radius: 2px;
}
.relation-item > image {
position: absolute;
top: -24rpx;
left: 24rpx;
width: 176rpx;
height: 214rpx;
border-radius: 2px;
overflow: hidden;
}
.relation-item {
padding: 32rpx 32rpx 48rpx 230rpx;
}
.relation-item-info text:nth-child(1) {
font-size: 30rpx;
font-weight: bold;
line-height: 42rpx;
color:rgba(21, 25, 31, 1);
}
.relation-item-info text:nth-child(2) {
margin-top: 30rpx;
font-size: 26rpx;
line-height: 36rpx;
color: #656E7B;
}
.relation-item-info text:nth-child(3) {
margin-top: 12rpx;
font-size: 26rpx;
line-height: 36rpx;
color: #656E7B;
}
.relation-item-more {
height: 100%;
}
.relation-item-more image {
width: 32rpx;
height: 32rpx;
}
\ No newline at end of file
project.config.json
......@@ -37,7 +37,7 @@
"compileType": "miniprogram",
"libVersion": "2.10.0",
"appid": "wx4933acc52682049e",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
"debugOptions": {
"hidedInDevtools": []
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment