Skip to content

严立 / mini-shimao

Go to a project
Commit a08fb06f by 严立
Options

我的模块代码合并 

1.代码合并
2.界面细节调整
parent 58e751e1
Inline Side-by-side
Showing with 394 additions and 147 deletions
app.json
{ {
"pages": [ "pages": [
"pages/mine/mine",
"pages/customerService/customerService",
"pages/moreProblems/moreProblems",
"pages/myAppointment/myAppointment",
"pages/myActivity/myActivity",
"pages/activityDetail/activityDetail",
"pages/myInfo/myInfo",
"pages/home/home", "pages/home/home",
"pages/play/play", "pages/play/play",
"pages/campsite/campsite", "pages/campsite/campsite",
"pages/mine/mine",
"pages/myInfo/myInfo",
"pages/myActivity/myActivity",
"pages/myAppointment/myAppointment",
"pages/moreProblems/moreProblems",
"pages/customerService/customerService",
"pages/index/index",
"pages/appointment/appointment", "pages/appointment/appointment",
"pages/activity/activity", "pages/activity/activity",
"pages/activityDetail/activityDetail",
"pages/activity-detail/activity-detail", "pages/activity-detail/activity-detail",
"pages/activity-entry/activity-entry", "pages/activity-entry/activity-entry",
"pages/notice/notice", "pages/notice/notice",
"pages/notice-detail/notice-detail", "pages/notice-detail/notice-detail",
"pages/shop-detail/shop-detail", "pages/shop-detail/shop-detail",
"pages/strategy/strategy", "pages/strategy/strategy",
"pages/sites/sites" "pages/sites/sites",
"pages/index/index"
], ],
"usingComponents": { "usingComponents": {
"navigation": "../component/navigation/navigation", "navigation": "../component/navigation/navigation",
......
pages/activity-detail/activity-detail.js
...@@ -30,7 +30,7 @@ Page({ ...@@ -30,7 +30,7 @@ Page({
address: '艺术花坊五号展厅', address: '艺术花坊五号展厅',
quota: '50人', quota: '50人',
describe: '跟随老师结合各类花材，运用色彩，将生活灵感巧妙实践于花艺作品中。体验者全程鲜花实操亲自参与鲜花制作，用花木来抒发情怀，从而点缀生活中的美。', describe: '跟随老师结合各类花材，运用色彩，将生活灵感巧妙实践于花艺作品中。体验者全程鲜花实操亲自参与鲜花制作，用花木来抒发情怀，从而点缀生活中的美。',
contact: '18000000000' contact: '13316748039'
} }
this.setData({ this.setData({
banner: response.banner, banner: response.banner,
......
pages/activity-detail/activity-detail.wxml
<navigation class="navigation" titleText="主题活动" backIcon="/image/back.png"></navigation> <!-- 畅玩 - 活动详情 -->
<navigation class="navigation" titleText="主题活动" color="#ffffff" backIcon="/image/back-w.png"></navigation>
<view class="container"> <view class="container">
<view id="banner" class="banner"> <view id="banner" class="banner">
......
pages/activity-detail/activity-detail.wxss
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
height: 42rpx; height: 42rpx;
margin-right: 32rpx; margin-right: 32rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: lighter; font-weight: 300;
color: #959DA9; color: #959DA9;
line-height: 42rpx; line-height: 42rpx;
} }
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
width: 518rpx; width: 518rpx;
height: 40rpx; height: 40rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 400;
color: #000000; color: #000000;
line-height: 42rpx; line-height: 42rpx;
} }
......
pages/activity-entry/activity-entry.js
...@@ -71,7 +71,7 @@ Page({ ...@@ -71,7 +71,7 @@ Page({
onServic: function () { onServic: function () {
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: '18000000000' phoneNumber: '13316748039'
}) })
}, },
......
pages/activity-entry/activity-entry.json
{ {
"usingComponents": {} "navigationBarTextStyle": "black",
"usingComponents": {}
} }
\ No newline at end of file
pages/activity-entry/activity-entry.wxml
...@@ -73,6 +73,6 @@ ...@@ -73,6 +73,6 @@
</view> </view>
<view class="entry-operation"> <view class="entry-operation">
<l-button size="long" bind:lintap="onSubmit">确认报名</l-button> <button class="button row con-c align-c" bindtap="onSubmit">确认报名</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/activity-entry/activity-entry.wxss
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
width: 432rpx; width: 432rpx;
height: 80rpx; height: 80rpx;
border: 1px #15191f solid; border: 1px #15191f solid;
border-radius: 4rpx; border-radius: 2px;
color: #15191f; color: #15191f;
background: #fefcf9; background: #fefcf9;
} }
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
height: 216rpx; height: 216rpx;
margin-top: 56rpx; margin-top: 56rpx;
padding: 40rpx 32rpx; padding: 40rpx 32rpx;
border-radius: 4rpx; border-radius: 2px;
background: #F5F6F8; background: #F5F6F8;
} }
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
margin: 36rpx 0; margin: 36rpx 0;
padding: 0 24rpx; padding: 0 24rpx;
border: 1px #DBDFE5 solid; border: 1px #DBDFE5 solid;
border-radius: 4rpx; border-radius: 2px;
} }
.input-tip { .input-tip {
...@@ -150,6 +150,15 @@ ...@@ -150,6 +150,15 @@
background: #ffffff; background: #ffffff;
} }
.entry-operation-button { .entry-operation .button {
width: 670rpx;
height: 96rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
background: #86C5E1;
border-radius: 2px;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
} }
\ No newline at end of file
pages/activity-entry/image/tip-1.png
pages/activity-entry/image/tip-1.png

29.8 KB | W: | H:

pages/activity-entry/image/tip-1.png

26.8 KB | W: | H:

pages/activity-entry/image/tip-1.png
pages/activity-entry/image/tip-1.png
pages/activity-entry/image/tip-1.png
pages/activity-entry/image/tip-1.png
  • 2-up
  • Swipe
  • Onion skin
pages/activity/activity.json
{ {
"usingComponents": {} "navigationBarTextStyle": "black",
"usingComponents": {}
} }
\ No newline at end of file
pages/activity/activity.wxml
<!-- 畅玩 - 活动列表 -->
<navigation class="navigation" titleText="主题活动" background="#ffffff" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="主题活动" background="#ffffff" backIcon="/image/back.png"></navigation>
<view class="container"> <view class="container">
...@@ -20,6 +21,10 @@ ...@@ -20,6 +21,10 @@
</block> </block>
</view> </view>
<view class="title row">
<image src="./image/title-2.png"></image>
</view>
<view class="other row"> <view class="other row">
<block wx:for="{{other}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{other}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="other-item col" bindtap="onActivityDetail"> <view class="other-item col" bindtap="onActivityDetail">
......
pages/activity/activity.wxss
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.title { .title {
width: 750rpx; width: 750rpx;
height: 96rpx; height: 96rpx;
margin-top: 60rpx; margin-top: 50rpx;
padding: 0 40rpx; padding: 0 40rpx;
} }
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
width: 670rpx; width: 670rpx;
height: 644rpx; height: 644rpx;
margin-top: 48rpx; margin-top: 48rpx;
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
background: #ffffff; background: #ffffff;
} }
...@@ -73,17 +74,17 @@ ...@@ -73,17 +74,17 @@
/* 往期活动 */ /* 往期活动 */
.other { .other {
width: 710rpx; width: 710rpx;
margin-left: 40rpx; margin: 50rpx 0 50rpx 40rpx;
margin-bottom: 50rpx;
overflow: scroll; overflow: scroll;
} }
.other-item { .other-item {
width: 286rpx; min-width: 286rpx;
height: 476rpx; height: 476rpx;
margin-right: 32rpx; margin-right: 32rpx;
background: #ffffff; background: #ffffff;
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
} }
.other-item-info { .other-item-info {
......
pages/appointment/appointment.js
...@@ -6,18 +6,16 @@ Page({ ...@@ -6,18 +6,16 @@ Page({
appointmentDate: '', appointmentDate: '',
appointmentComplete: false, appointmentComplete: false,
formInto: { formName: '',
name: '', formPhone: '',
phone: '', formQuantity: 0,
quantity: 0, formDate: '',
date: '',
},
formHouse: {
name: '',
phone: '',
date: '',
},
errorName: '',
errorPhone: '',
errorQuantity: '',
isSubmit: false,
winQuota: false, winQuota: false,
}, },
...@@ -30,22 +28,11 @@ Page({ ...@@ -30,22 +28,11 @@ Page({
setReset: function () { setReset: function () {
let funcDate = iMiment(new Date().getTime()).format('YYYY-MM-DD') let funcDate = iMiment(new Date().getTime()).format('YYYY-MM-DD')
let funcFormInto = {
name: '',
phone: '',
quantity: 0,
date: funcDate,
}
let funcFormHouse = {
name: '',
phone: '',
date: funcDate,
}
this.setData({ this.setData({
formInto: funcFormInto, formName: '',
formHouse: funcFormHouse, formPhone: '',
formQuantity: this.data.formType === 1 ? 0 : 1,
formDate: funcDate,
appointmentDate: funcDate, appointmentDate: funcDate,
}) })
}, },
...@@ -56,46 +43,104 @@ Page({ ...@@ -56,46 +43,104 @@ Page({
}) })
}, },
onInputBlur: function (event) {
let funcType = event.target.dataset.type
let funcValue = event.detail.value
switch (funcType) {
case 'name':
this.setData({
formName: funcValue
})
break
case 'phone':
this.setData({
formPhone: funcValue
})
break
}
this.inspectForm()
},
onQuantityCut: function () { onQuantityCut: function () {
let funcFormInto = this.data.formInto if (0 < this.data.formQuantity) {
if (0 < funcFormInto.quantity) { this.setData({
funcFormInto.quantity = funcFormInto.quantity - 1 formQuantity: this.data.formQuantity - 1,
errorQuantity: '',
})
} }
this.setData({
formInto: funcFormInto
})
}, },
onQuantityAdd: function () { onQuantityAdd: function () {
let funcFormInto = this.data.formInto if (this.data.formQuantity < 5) {
if (funcFormInto.quantity < 5) { this.setData({
funcFormInto.quantity = funcFormInto.quantity + 1 formQuantity: this.data.formQuantity + 1,
errorQuantity: '',
})
} else { } else {
wx.lin.showToast({ this.setData({
title: '每个账号最多预约5人', errorQuantity: '每个账号最多预约5人'
icon: 'error',
}) })
} }
},
onSelectionDate: function (event) {
this.setData({ this.setData({
formInto: funcFormInto formDate: event.detail.value,
winQuota: true
}) })
}, },
onSelectionDate: function (event) { inspectForm: function () {
let funcFormInto = this.data.formInto if (this.data.formName === '') {
let funcFormHouse = this.data.formHouse this.setData({
isSubmit: false,
errorName: '请输入姓名'
})
return
} else {
this.setData({
errorName: ''
})
}
if (this.data.formPhone === '') {
this.setData({
isSubmit: false,
errorPhone: '请输入手机号码'
})
return
} else {
this.setData({
errorPhone: ''
})
}
funcFormInto.date = event.detail.value if (this.data.formQuantity === 0) {
funcFormHouse.date = event.detail.value this.setData({
isSubmit: false,
errorQuantity: '预约人数不能为 0'
})
return
} else {
this.setData({
errorQuantity: ''
})
}
this.setData({ this.setData({
formInto: funcFormInto, isSubmit: true
formHouse: funcFormHouse,
winQuota: true
}) })
}, },
onSubmit: function () { onSubmit: function () {
if (!this.data.isSubmit) {
this.inspectForm()
return
}
this.setData({ this.setData({
appointmentComplete: true appointmentComplete: true
}) })
......
pages/appointment/appointment.wxml
<l-toast></l-toast> <!-- 首页 - 入园预约 / 房屋预约 -->
<navigation class="navigation" backIcon="/image/back-w.png"></navigation> <navigation class="navigation" backIcon="/image/back-w.png"></navigation>
<view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}"> <view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
...@@ -21,43 +21,68 @@ ...@@ -21,43 +21,68 @@
</view> </view>
<view class="form"> <view class="form">
<!-- 名字输入 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">姓 名</text> <text>姓</text>
<text>名</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row align-c">
<input placeholder-class="input-tip" placeholder="请输入名字"></input> <input class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view>
<!-- 手机输入 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">手 机 号</text> <text>手</text>
<text>机</text>
<text>号</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row align-c">
<input placeholder-class="input-tip" placeholder="请输入手机号"></input> <input class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view>
<!-- 预约人数 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">预约人数</text> <text>预</text>
<text>约</text>
<text>人</text>
<text>数</text>
</view> </view>
<view class="input-wrap row con-b align-c"> <view class="input-wrap row con-b align-c">
<l-button special="{{true}}" bind:lintap="onQuantityCut"> <l-button special="{{true}}" bind:lintap="onQuantityCut">
<image class="input-icon" src="../../image/cut.png"></image> <image class="input-icon" src="../../image/cut.png"></image>
</l-button> </l-button>
<text>{{formInto.quantity}}</text> <text class="text" style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text>
<l-button special="{{true}}" bind:lintap="onQuantityAdd"> <l-button special="{{true}}" bind:lintap="onQuantityAdd">
<image class="input-icon" src="../../image/add.png"></image> <image class="input-icon" src="{{errorQuantity ? '../../image/add-g.png' : '../../image/add.png'}}"></image>
</l-button> </l-button>
</view> </view>
</view> </view>
<view class="form-error row align-c">
<text hidden="{{errorQuantity ? false : true}}">{{errorQuantity}}</text>
</view>
<!-- 预约日期 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">预约日期</text> <text>预</text>
<text>约</text>
<text>日</text>
<text>期</text>
</view> </view>
<view class="input-wrap row con-b align-c"> <view class="input-wrap row con-b align-c">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate"> <picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate">
<view class="picker">{{formInto.date}}</view> <view class="picker text">{{formDate}}</view>
</picker> </picker>
<image class="input-icon" src="../../image/more.png"></image> <image class="input-icon" src="../../image/more.png"></image>
</view> </view>
...@@ -69,8 +94,8 @@ ...@@ -69,8 +94,8 @@
</view> </view>
<view class="appointment-operation"> <view class="appointment-operation">
<l-button l-class="appointment-operation-button" size="long" bind:lintap="onSubmit">确认预约</l-button> <button class="{{isSubmit ? 'button' : 'button-disable'}} row con-c align-c" bindtap="onSubmit">确认预约</button>
<l-button size="long" plain="{{true}}" bind:lintap="onServic">电话咨询</l-button> <button class="button-plain row con-c align-c" bindtap="onServic">电话咨询</button>
</view> </view>
</view> </view>
...@@ -86,29 +111,46 @@ ...@@ -86,29 +111,46 @@
</view> </view>
<view class="form"> <view class="form">
<!-- 名字输入 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">姓 名</text> <text>姓</text>
<text>名</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row align-c">
<input placeholder-class="input-tip" placeholder="请输入名字"></input> <input class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view>
<!-- 手机输入 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">手 机 号</text> <text>手</text>
<text>机</text>
<text>号</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row align-c">
<input placeholder-class="input-tip" placeholder="请输入手机号"></input> <input class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view>
<!-- 预约日期 -->
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row con-b align-c">
<text space="ensp">看房日期</text> <text>看</text>
<text>房</text>
<text>日</text>
<text>期</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row align-c">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate"> <picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate">
<view class="picker">{{formHouse.date}}</view> <view class="picker text">{{formDate}}</view>
</picker> </picker>
<image class="input-icon" src="../../image/more.png"></image> <image class="input-icon" src="../../image/more.png"></image>
</view> </view>
...@@ -116,6 +158,6 @@ ...@@ -116,6 +158,6 @@
</view> </view>
<view class="appointment-operation"> <view class="appointment-operation">
<l-button size="long" bind:lintap="onSubmit">确认预约</l-button> <button class="{{isSubmit ? 'button' : 'button-disable'}} row con-c align-c" bindtap="onSubmit">确认预约</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/appointment/appointment.wxss
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
width: 432rpx; width: 432rpx;
height: 80rpx; height: 80rpx;
border: 1px #15191f solid; border: 1px #15191f solid;
border-radius: 4rpx; border-radius: 2px;
color: #15191f; color: #15191f;
background: #fefcf9; background: #fefcf9;
} }
...@@ -70,9 +70,12 @@ ...@@ -70,9 +70,12 @@
} }
.input-label { .input-label {
width: 156rpx; width: 120rpx;
height: 80rpx; height: 80rpx;
margin-right: 4rpx; margin-top: 32rpx;
margin-right: 40rpx;
font-size: 30rpx;
font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #1E2025; color: #1E2025;
} }
...@@ -80,10 +83,17 @@ ...@@ -80,10 +83,17 @@
.input-wrap { .input-wrap {
width: 510rpx; width: 510rpx;
height: 80rpx; height: 80rpx;
margin: 36rpx 0; margin-top: 32rpx;
padding: 0 24rpx; padding: 0 24rpx;
border: 1px #DBDFE5 solid; border: 1px #DBDFE5 solid;
border-radius: 4rpx; border-radius: 2px;
}
.input-wrap .text {
font-size: 30rpx;
font-weight: 400;
color: #1E2025;
line-height: 32rpx;
} }
.input-tip { .input-tip {
...@@ -101,10 +111,22 @@ ...@@ -101,10 +111,22 @@
flex-grow: 1; flex-grow: 1;
} }
.form-error {
width: 510rpx;
height: 32rpx;
margin-top: 8rpx;
margin-left: 160rpx;
font-size: 22rpx;
font-weight: 400;
color: #D92B3A;
line-height: 32rpx;
}
.quota { .quota {
position: relative; position: relative;
top: -20rpx; top: 16rpx;
right: 0; right: 0;
height: 42rpx;
} }
.quota text:nth-child(1) { .quota text:nth-child(1) {
...@@ -120,10 +142,48 @@ ...@@ -120,10 +142,48 @@
/* 操作按钮 */ /* 操作按钮 */
.appointment-operation { .appointment-operation {
width: 750rpx; width: 750rpx;
margin-top: 30rpx;
padding: 30rpx 40rpx; padding: 30rpx 40rpx;
background: #ffffff; background: #ffffff;
} }
.appointment-operation-button { .appointment-operation .button {
width: 670rpx;
height: 96rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
background: #86C5E1;
border-radius: 2px;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
}
.appointment-operation .button-plain {
width: 670rpx;
height: 96rpx;
margin-bottom: 40rpx;
background: #FFFFFF;
border:1px solid #86C5E1;
border-radius: 2px;
font-size: 30rpx;
font-weight: 500;
color: #86C5E1;
line-height: 42rpx;
}
.appointment-operation .button-disable {
width: 670rpx;
height: 96rpx;
margin-bottom: 40rpx;
background: #C8E1EC;
border: 1px solid #C8E1EC;
border-radius: 2px;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
} }
\ No newline at end of file
pages/appointment/image/banner-1.png
pages/appointment/image/banner-1.png

173 KB | W: | H:

pages/appointment/image/banner-1.png

172 KB | W: | H:

pages/appointment/image/banner-1.png
pages/appointment/image/banner-1.png
pages/appointment/image/banner-1.png
pages/appointment/image/banner-1.png
  • 2-up
  • Swipe
  • Onion skin
pages/appointment/image/tip-1.png
pages/appointment/image/tip-1.png

29.8 KB | W: | H:

pages/appointment/image/tip-1.png

27.5 KB | W: | H:

pages/appointment/image/tip-1.png
pages/appointment/image/tip-1.png
pages/appointment/image/tip-1.png
pages/appointment/image/tip-1.png
  • 2-up
  • Swipe
  • Onion skin
pages/appointment/image/tip-2.png
pages/appointment/image/tip-2.png

28.4 KB | W: | H:

pages/appointment/image/tip-2.png

25.5 KB | W: | H:

pages/appointment/image/tip-2.png
pages/appointment/image/tip-2.png
pages/appointment/image/tip-2.png
pages/appointment/image/tip-2.png
  • 2-up
  • Swipe
  • Onion skin
pages/campsite/campsite.js
...@@ -42,7 +42,7 @@ Page({ ...@@ -42,7 +42,7 @@ Page({
onServic: function () { onServic: function () {
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: '13856782234' phoneNumber: '13316748039'
}) })
}, },
......
pages/home/home.wxml
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<image class="background-image" src="./image/guide.png" mode="aspectFit"></image> <image class="background-image" src="./image/guide.png" mode="aspectFit"></image>
<view class="operation col"> <view class="operation col">
<text>探索精彩去处</text> <text>探索精彩去处</text>
<button>进入电子地图</button> <button class="row con-c align-c">进入电子地图</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/home/home.wxss
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
padding: 4rpx 32rpx; padding: 4rpx 32rpx;
background:rgba(255, 255, 255, 1); background:rgba(255, 255, 255, 1);
box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .05); box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .05);
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
} }
.banner-notice text:nth-child(2) { .banner-notice text:nth-child(2) {
...@@ -117,7 +118,8 @@ ...@@ -117,7 +118,8 @@
height: 150rpx; height: 150rpx;
padding: 28rpx 32rpx; padding: 28rpx 32rpx;
box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .07); box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .07);
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
} }
.night > image { .night > image {
...@@ -172,7 +174,8 @@ ...@@ -172,7 +174,8 @@
width: 670rpx; width: 670rpx;
height: 240rpx; height: 240rpx;
margin-top: 32rpx; margin-top: 32rpx;
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
} }
.guide-content .operation { .guide-content .operation {
...@@ -195,7 +198,7 @@ ...@@ -195,7 +198,7 @@
font-size: 26rpx; font-size: 26rpx;
color: #ffffff; color: #ffffff;
background:rgba(255, 255, 255, 0.2); background:rgba(255, 255, 255, 0.2);
border-radius: 4rpx; border-radius: 2px;
} }
/* 预约看房 */ /* 预约看房 */
...@@ -206,7 +209,7 @@ ...@@ -206,7 +209,7 @@
height: 188rpx; height: 188rpx;
margin-top: 32rpx; margin-top: 32rpx;
padding: 48rpx 0 0 40rpx; padding: 48rpx 0 0 40rpx;
border-radius: 4rpx; border-radius: 2px;
overflow: hidden; overflow: hidden;
} }
...@@ -245,7 +248,8 @@ ...@@ -245,7 +248,8 @@
width: 670rpx; width: 670rpx;
height: 320rpx; height: 320rpx;
margin-top: 32rpx; margin-top: 32rpx;
border-radius: 4rpx; border-radius: 2px;
overflow: hidden;
} }
.strategy-content .operation { .strategy-content .operation {
......
pages/mine/mine.json
{ {
"usingComponents": {} "navigationBarTextStyle": "black",
"usingComponents": {}
} }
\ No newline at end of file
pages/mine/mine.wxss
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
width: 654rpx; width: 654rpx;
height: 130rpx; height: 130rpx;
padding: 24rpx 32rpx 24rpx 40rpx; padding: 24rpx 32rpx 24rpx 40rpx;
border-radius: 4rpx; border-radius: 2px;
background: linear-gradient(#FBE9D0, #EBD3B2); background: linear-gradient(#FBE9D0, #EBD3B2);
} }
......
pages/notice-detail/notice-detail.json
{ {
"usingComponents": {} "navigationBarTextStyle": "black",
"usingComponents": {}
} }
\ No newline at end of file
pages/notice-detail/notice-detail.wxml
<!-- 首页 - 通知 - 通知详情 -->
<navigation class="navigation" titleText="动态详情" background="#ffffff" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="动态详情" background="#ffffff" backIcon="/image/back.png"></navigation>
<view class="container"> <view class="container">
......
pages/notice-detail/notice-detail.wxss
...@@ -31,9 +31,10 @@ ...@@ -31,9 +31,10 @@
.describe { .describe {
width: 670rpx; width: 670rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 300;
color: #15191F; color: #15191F;
line-height: 52rpx;
} }
.describe view { .describe view {
......
pages/notice/notice.json
{ {
"usingComponents": {} "navigationBarTextStyle": "black",
"usingComponents": {}
} }
\ No newline at end of file
pages/play/play.js
...@@ -9,7 +9,8 @@ let logicData = { ...@@ -9,7 +9,8 @@ let logicData = {
Page({ Page({
data: { data: {
navigationLogoTop: 0, navigationLogoTop: 0,
navigationLogoMinorTop: 0, navigationLogoMarginTop: 0,
tabMarginTop: 0,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
...@@ -52,7 +53,7 @@ Page({ ...@@ -52,7 +53,7 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
this.setData({ this.setData({
navigationFixedBoundary: 710 / 750 * wx.getSystemInfoSync().windowWidth navigationFixedBoundary: 700 / 750 * wx.getSystemInfoSync().windowWidth
}) })
this.setNavigationLogo() this.setNavigationLogo()
...@@ -178,10 +179,13 @@ Page({ ...@@ -178,10 +179,13 @@ Page({
let funcLogoTop = iUtils.navigationElementCenterMarginTop(50) let funcLogoTop = iUtils.navigationElementCenterMarginTop(50)
let funcLogoMinorTop = funcLogoTop + 50 * funcUnitProportion + 20 * funcUnitProportion let funcLogoMinorTop = funcLogoTop + 50 * funcUnitProportion + 20 * funcUnitProportion
let funcTabMarginTop = funcLogoMinorTop + 20 * funcUnitProportion
this.setData({ this.setData({
navigationLogoTop: funcLogoTop, navigationLogoTop: funcLogoTop,
navigationLogoMinorTop: funcLogoMinorTop navigationLogoMarginTop: funcLogoMinorTop,
tabMarginTop: funcTabMarginTop
}) })
}, },
...@@ -211,14 +215,12 @@ Page({ ...@@ -211,14 +215,12 @@ Page({
// 判断标签吸顶边距 // 判断标签吸顶边距
if (funcEvent.scrollTop - this.data.navigationFixedBoundary > -20 && !this.data.navigationFixed) { if (funcEvent.scrollTop - this.data.navigationFixedBoundary > -20 && !this.data.navigationFixed) {
console.log('show')
this.setData({ this.setData({
navigationFixed: true navigationFixed: true
}) })
} }
if (funcEvent.scrollTop - this.data.navigationFixedBoundary < -20 && this.data.navigationFixed) { if (funcEvent.scrollTop - this.data.navigationFixedBoundary < -20 && this.data.navigationFixed) {
console.log('hidden')
this.setData({ this.setData({
navigationFixed: false navigationFixed: false
}) })
......
pages/play/play.json
{ {
"navigationBarTextStyle": "black",
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
pages/play/play.wxml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<image class="logo" src="./image/title.png" style="{{'top: ' + navigationLogoTop + 'px'}}"></image> <image class="logo" src="./image/title.png" style="{{'top: ' + navigationLogoTop + 'px'}}"></image>
<view class="logo-minor row align-c" style="{{'top: ' + (navigationLogoMinorTop - 2) + 'px; background: ' + navigationBackground}}"> <view class="logo-minor row align-c" style="{{'top: ' + (navigationLogoMarginTop - 2) + 'px; background: ' + navigationBackground}}">
<image src="./image/title-minor.png"></image> <image src="./image/title-minor.png"></image>
</view> </view>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</view> </view>
<!-- 板块标签 --> <!-- 板块标签 -->
<view class="tab row con-b align-c {{navigationFixed ? 'tab-fixed' : ''}}"> <view class="tab row con-b align-c {{navigationFixed ? 'tab-fixed' : ''}}" style="{{navigationFixed ? 'top: ' + (tabMarginTop - 4) + 'px' : ''}}">
<block wx:for="{{tab}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{tab}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="tab-item col con-c" data-index="{{index}}" bindtap="onTabSelection"> <view class="tab-item col con-c" data-index="{{index}}" bindtap="onTabSelection">
<view class="row con-c align-c {{tabIndex === index ? 'tab-item-active' : 'tab-item-inactive'}}"> <view class="row con-c align-c {{tabIndex === index ? 'tab-item-active' : 'tab-item-inactive'}}">
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</view> </view>
</view> </view>
<view class="shop-operation"> <view class="shop-operation">
<l-button width="534" height="96" size="large" data-id="{{item.id}}" bindtap="onShopDetail">立即预定</l-button> <button class="button row con-c align-c" data-id="{{item.id}}" bindtap="onShopDetail">立即预定</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/play/play.wxss
...@@ -50,13 +50,15 @@ swiper-item { ...@@ -50,13 +50,15 @@ swiper-item {
height: 408rpx; height: 408rpx;
margin-top: 36rpx; margin-top: 36rpx;
padding: 0 24rpx; padding: 0 24rpx;
border-radius:4px; border-radius: 2px;
overflow: hidden;
} }
.banner-content-active { .banner-content-active {
width: 638rpx; width: 638rpx;
height: 480rpx; height: 480rpx;
border-radius:4px; border-radius: 2px;
overflow: hidden;
transition: all 0.2s ease-in 0s; transition: all 0.2s ease-in 0s;
} }
...@@ -98,7 +100,7 @@ swiper-item { ...@@ -98,7 +100,7 @@ swiper-item {
.tab-fixed { .tab-fixed {
z-index: 1700; z-index: 1700;
position: fixed; position: fixed;
top: 64px; top: 68px;
left: 0; left: 0;
padding: 40rpx; padding: 40rpx;
} }
...@@ -205,14 +207,15 @@ swiper-item { ...@@ -205,14 +207,15 @@ swiper-item {
.shop-describe { .shop-describe {
width: 534rpx; width: 534rpx;
height: 72rpx; height: 72rpx;
margin-top: 40rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: lighter; font-weight: 300;
color: #959DA9; color: #959DA9;
line-height: 36rpx; line-height: 36rpx;
} }
.shop-tip { .shop-tip {
margin-top: 80rpx; margin-top: 64rpx;
font-size: 26rpx; font-size: 26rpx;
} }
...@@ -222,15 +225,36 @@ swiper-item { ...@@ -222,15 +225,36 @@ swiper-item {
.tip-title { .tip-title {
margin-right: 48rpx; margin-right: 48rpx;
width: 52rpx;
height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400;
color: #959DA9; color: #959DA9;
line-height: 36rpx;
} }
.tip-describe { .tip-describe {
width: 434rpx;
height: 36rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400;
color: #15191F; color: #15191F;
line-height: 36rpx;
} }
.shop-operation { .shop-operation {
margin-top: 64rpx; margin-top: 64rpx;
}
.shop-operation .button {
width: 534rpx;
height: 96rpx;
background: #86C5E1;
border-radius: 2px;
overflow: hidden;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
} }
\ No newline at end of file
pages/shop-detail/shop-detail.js
...@@ -29,7 +29,7 @@ Page({ ...@@ -29,7 +29,7 @@ Page({
title: '元养水韵SPA馆', title: '元养水韵SPA馆',
date: '周一至周日 10:00 - 22:00', date: '周一至周日 10:00 - 22:00',
describe: '元养水韵SPA馆，是个女性私享的空间。遵循定制化服务理念，每一位芳疗师会根据你的需要针对性地提供面部、头部、身体的SPA服务，柔软中带有力度能最大化地释放你的疲惫。其中，以泰国皇室经典SPA、面部养颜护理摩纳哥-蒙特卡洛足浴、能量中泰式理疗SPA等服务最为出色。每一位芳疗师都采用最正宗的泰国王室御用手法，足不出国就能体现最正宗的SPA体验。', describe: '元养水韵SPA馆，是个女性私享的空间。遵循定制化服务理念，每一位芳疗师会根据你的需要针对性地提供面部、头部、身体的SPA服务，柔软中带有力度能最大化地释放你的疲惫。其中，以泰国皇室经典SPA、面部养颜护理摩纳哥-蒙特卡洛足浴、能量中泰式理疗SPA等服务最为出色。每一位芳疗师都采用最正宗的泰国王室御用手法，足不出国就能体现最正宗的SPA体验。',
contact: '13856782234' contact: '13316748039'
} }
this.setData({ this.setData({
banner: response.banner, banner: response.banner,
......
pages/shop-detail/shop-detail.json
{ {
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
pages/shop-detail/shop-detail.wxml
<navigation class="navigation" titleText="{{info.name}}" backIcon="/image/back.png"></navigation> <!-- 畅玩 - 商店详情 -->
<navigation class="navigation" titleText="{{info.name}}" color="#ffffff" backIcon="/image/back-w.png"></navigation>
<view class="container"> <view class="container">
<view id="banner" class="banner"> <view id="banner" class="banner">
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
</view> </view>
</view> </view>
<view class="contact"> <view class="operation">
<l-button size="long" bindtap="onContact">电话预约</l-button> <button class="button row con-c align-c" bindtap="onContact">电话预约</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/shop-detail/shop-detail.wxss
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
height: 42rpx; height: 42rpx;
margin-right: 32rpx; margin-right: 32rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: lighter; font-weight: 300;
color: #959DA9; color: #959DA9;
line-height: 42rpx; line-height: 42rpx;
} }
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
} }
/* 立即报名 */ /* 立即报名 */
.contact { .operation {
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
...@@ -117,4 +117,17 @@ ...@@ -117,4 +117,17 @@
padding: 32rpx 40rpx; padding: 32rpx 40rpx;
border-top: 1rpx #E2E7EF solid; border-top: 1rpx #E2E7EF solid;
background: #ffffff; background: #ffffff;
}
.operation .button {
width: 670rpx;
height: 96rpx;
margin-bottom: 40rpx;
background: #86C5E1;
border-radius: 2px;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
} }
\ No newline at end of file
pages/strategy/strategy.js
...@@ -43,7 +43,7 @@ Page({ ...@@ -43,7 +43,7 @@ Page({
}, },
], ],
navigationBackground: 'rgba(0, 0, 0, 0)', isNavigationWhite: false,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
...@@ -78,15 +78,23 @@ Page({ ...@@ -78,15 +78,23 @@ Page({
logicData.pageScrollLock = true logicData.pageScrollLock = true
if (funcEvent.scrollTop > 40 && this.data.navigationBackground !== 'rgba(255, 255, 255, 1)') { if (funcEvent.scrollTop > 40 && !this.data.isNavigationWhite) {
this.setData({ this.setData({
navigationBackground: 'rgba(255, 255, 255, 1)' isNavigationWhite: true
})
wx.setNavigationBarColor({
frontColor: '#000000',
backgroundColor: '#000000',
}) })
} }
if (funcEvent.scrollTop <= 40) { if (funcEvent.scrollTop <= 40) {
this.setData({ this.setData({
navigationBackground: 'rgba(0, 0, 0, 0)' isNavigationWhite: false
})
wx.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: '#ffffff',
}) })
} }
......
pages/strategy/strategy.wxml
<navigation class="navigation" titleText="攻略详情" background="{{navigationBackground}}" backIcon="/image/back.png"></navigation> <!-- 首页 - 游客攻略 -->
<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 class="container">
<view id="banner" class="banner"> <view id="banner" class="banner">
......
pages/strategy/strategy.wxss
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
height: 238rpx; height: 238rpx;
margin: 0 40rpx 104rpx 40rpx; margin: 0 40rpx 104rpx 40rpx;
background:rgba(245, 246, 248, 1); background:rgba(245, 246, 248, 1);
border-radius: 4rpx; border-radius: 2px;
} }
.relation-item > image { .relation-item > image {
......
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