Skip to content

严立 / mini-shimao

Go to a project
Commit 9f2c4ffd by 严立
Options

LL - UI 问题修复

parents 5a0b4723 6f51cd7b
Expand all
Inline Side-by-side
Showing with 348 additions and 113 deletions
app.js
...@@ -5,7 +5,7 @@ App({ ...@@ -5,7 +5,7 @@ App({
refreshToken: '', refreshToken: '',
userInfo: null, userInfo: null,
baseUrl: 'https://sm-web.meiqicloud.com',//测试 baseUrl: 'https://sm-web.meiqicloud.com',//测试
// baseUrl: 'https://zmj.zhengmao.net',//生产 // baseUrl: 'https://smbhyh-web.meiqicloud.com',//生产
debug: true, debug: true,
}, },
......
component/picker/picker.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
component/picker/picker.wxml 0 → 100644
<!--picker/picker.wxml-->
<view class="full-box {{isOpen?'cur':''}}">
<!--<view class="modal" bindtap="tapModal"></view>-->
<view class="picker">
<view class="picker-header" style="{{pickerHeaderStyle}}">
<view bindtap="cancle" >
<text style="{{cancelStyle}}">{{cancelText}}</text>
</view>
<text style="{{titleStyle}}">{{titleText}}</text>
<view bindtap="sure">
<text style="{{sureStyle}}">{{sureText}}</text>
</view>
</view>
<picker-view
value="{{value}}"
class="picker-content"
bindpickstart="_bindpickstart"
bindchange="_bindChange"
bindpickend="_bindpickend"
indicator-style="{{indicatorStyle}}"
mask-style="{{maskStyle}}"
>
<picker-view-column wx:for="{{columnsData}}" wx:key="{{index}}">
<view wx:for="{{item}}" wx:for-item="itemIn" class="picker-line" wx:key="{{index}}">
<text class="line1" style="{{chooseItemTextStyle}}">{{isUseKeywordOfShow?itemIn[keyWordsOfShow]:itemIn}}</text>
</view>
</picker-view-column>
</picker-view>
</view>
</view>
component/picker/picker.wxss 0 → 100644
/* picker/picker.wxss */
.full-box{
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 9999;
opacity: 0;
background:rgba(0,0,0,.4);
transition:all .4s ease-in-out 0;
pointer-events:none;
}
.full-box.cur{
opacity:1;
pointer-events:auto
}
.modal{
position: absolute;
width: 100%;
height: 50%;
bottom:-50%;
left: 0;
background: transparent;
transition:all .4s ease-in-out 0;
}
.picker{
position: absolute;
width: 100%;
height: 235px;
bottom: -235px;
left: 0;
background: #fff;
display: flex;
flex-direction: column;
transition:all .4s ease-in-out 0;
}
.cur .picker{
bottom:0;
}
.cur .modal{
bottom:50%;
}
.picker-line{
display: flex;
justify-content: center;
align-items: center;
}
.picker-header {
height: 20%;
box-sizing: border-box;
padding: 0 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #eeeeee;
}
.picker-header view {
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.picker-header view text{
font-size: 36rpx;
}
.picker-content {
flex-grow: 1;
}
.line1{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
lines:1
}
\ No newline at end of file
component/picker/tool.js 0 → 100644
function _typeof(obj) {
return Object.prototype.toString.call(obj).slice(8, -1).toLowerCase();
}
function isString(obj) { //是否字符串
return _typeof(obj) === 'string'
}
function isPlainObject(obj) {
return _typeof(obj) === 'object';
}
module.exports = {
isString,
isPlainObject
}
pages/activity-entry/activity-entry.js
...@@ -18,6 +18,10 @@ Page({ ...@@ -18,6 +18,10 @@ Page({
activityTimes: [{beginTime:'',endTime:'', date:''}],// 活动场次 activityTimes: [{beginTime:'',endTime:'', date:''}],// 活动场次
activityIndex: 0, activityIndex: 0,
isShow: false,
listData: [],
errorName: '', errorName: '',
errorPhone: '', errorPhone: '',
errorSession: '', errorSession: '',
...@@ -102,10 +106,15 @@ Page({ ...@@ -102,10 +106,15 @@ Page({
}, },
onSelectionDate: function (event) { showPicker() {
console.log(event) this.setData({
isShow: true
})
},
sureCallBack: function (event) {
this.setData({ this.setData({
activityIndex: event.detail.value*1 activityIndex: event.detail.choosedIndexArr,
isShow: false
}) })
// 切换报名场次更新重置报名人数 // 切换报名场次更新重置报名人数
this.setData({ this.setData({
...@@ -129,6 +138,11 @@ Page({ ...@@ -129,6 +138,11 @@ Page({
} }
}, },
cancleCallBack() {
this.setData({
isShow: false
})
},
onServic: function () { onServic: function () {
wx.makePhoneCall({ wx.makePhoneCall({
...@@ -213,13 +227,16 @@ Page({ ...@@ -213,13 +227,16 @@ Page({
var response = res.data var response = res.data
if (response.activityTimes.length > 0) { if (response.activityTimes.length > 0) {
var activityTimes = [] var activityTimes = []
var pickerList = []
response.activityTimes.forEach(item => { response.activityTimes.forEach(item => {
var obj = item var obj = item
obj.date = item.beginTime + ' - ' + item.endTime obj.date = item.beginTime + ' - ' + item.endTime
activityTimes.push(obj) activityTimes.push(obj)
pickerList.push(obj.date)
}) })
that.setData({ that.setData({
activityTimes: activityTimes, activityTimes: activityTimes,
listData: [pickerList],
}) })
} }
......
pages/activity-entry/activity-entry.json
{ {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"usingComponents": {} "usingComponents": {
"picker":"../../component/picker/picker"
}
} }
\ No newline at end of file
pages/activity-entry/activity-entry.wxml
...@@ -63,10 +63,13 @@ ...@@ -63,10 +63,13 @@
<!-- <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">{{formInto.date}}</view>
</picker> --> </picker> -->
<picker class="input-picker" mode="selector" range-key="{{'date'}}" range="{{activityTimes}}" bindchange="onSelectionDate"> <!-- <picker class="input-picker" mode="selector" range-key="{{'date'}}" range="{{activityTimes}}" bindchange="onSelectionDate">
<!-- item.beginTime + ' - ' + item.endTime -->
<text class="picker">{{activityTimes[activityIndex].beginTime}}</text> <text class="picker">{{activityTimes[activityIndex].beginTime}}</text>
</picker> </picker>
<image class="input-icon" src="../../image/more.png"></image> -->
<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"></image>
</view> </view>
</view> </view>
...@@ -74,6 +77,19 @@ ...@@ -74,6 +77,19 @@
<text hidden="{{errorSession ? false : true}}">{{errorSession}}</text> <text hidden="{{errorSession ? false : true}}">{{errorSession}}</text>
</view> </view>
<picker
isShowPicker="{{isShow}}"
bindsure="sureCallBack"
bindcancle="cancleCallBack"
scrollType="normal"
listData="{{listData}}"
indicatorStyle="height:47rpx"
titleText=""
sureStyle="color:#26AB28"
cancelStyle="color:#888888"
chooseItemTextStyle="font-size: 24rpx;"
></picker>
<view class="row align-c"> <view class="row align-c">
<view class="input-label row align-c"> <view class="input-label row align-c">
<text space="ensp">报名人数</text> <text space="ensp">报名人数</text>
......
pages/activityDetail/activityDetail.wxss
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.fontsImg{ .fontsImg{
width: 250rpx; width: 250rpx;
height: 68rpx; height: 50rpx;
position: absolute; position: absolute;
top: 260rpx; top: 260rpx;
left: 40rpx; left: 40rpx;
...@@ -37,9 +37,10 @@ ...@@ -37,9 +37,10 @@
margin: auto; margin: auto;
} }
.title{ .title{
color: rgb(168, 168, 173); color:rgba(149,157,169,1);
font-size: 28rpx; font-size:30rpx;
letter-spacing: 1px; letter-spacing: 1px;
font-weight:400;
margin-bottom: 45rpx; margin-bottom: 45rpx;
} }
.item{ .item{
...@@ -60,13 +61,14 @@ ...@@ -60,13 +61,14 @@
width: 380rpx; width: 380rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: center;
} }
.my-activities-title{ .my-activities-title{
color:rgba(21,25,31,1); color:rgba(21,25,31,1);
font-weight: 500; font-weight: 500;
font-size: 30rpx; font-size: 30rpx;
letter-spacing: 1px; letter-spacing: 1px;
margin-bottom: 16rpx;
} }
.time{ .time{
font-size: 26rpx; font-size: 26rpx;
......
pages/customerService/customerService.js
...@@ -34,6 +34,53 @@ Page({ ...@@ -34,6 +34,53 @@ Page({
}) })
}, },
saveImage(e){
let url = e.currentTarget.dataset.url;
console.log(url);
//用户需要授权
wx.getSetting({
success: (res) => {
if (!res.authSetting['scope.writePhotosAlbum']) {
wx.authorize({
scope: 'scope.writePhotosAlbum',
success:()=> {
// 同意授权
this.saveImg1(url);
},
fail: (res) =>{
console.log(res);
}
})
}else{
// 已经授权了
this.saveImg1(url);
}
},
fail: (res) =>{
console.log(res);
}
})
},
saveImg1(url){
wx.getImageInfo({
src: url,
success:(res)=> {
let path = res.path;
wx.saveImageToPhotosAlbum({
filePath:path,
success:(res)=> {
console.log(res);
},
fail:(res)=>{
console.log(res);
}
})
},
fail:(res)=> {
console.log(res);
}
})
},
//失去焦点 //失去焦点
inputBlur(e) { inputBlur(e) {
this.setData({ this.setData({
......
pages/customerService/customerService.wxml
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<image class="logo" src="http://upload.miaomiao-bao.com/c83b1202008141006519147.svg"></image> <image class="logo" src="http://upload.miaomiao-bao.com/c83b1202008141006519147.svg"></image>
</view> </view>
<view class="er-code-div"> <view class="er-code-div">
<image class="er-code" src="http://upload.miaomiao-bao.com/8fe2e202008141039384300.png"></image> <image class="er-code" bindlongpress="saveImage" data-url="http://sm-web.meiqicloud.com/userfiles/appResources/mine/server/code.png" src="http://sm-web.meiqicloud.com/userfiles/appResources/mine/server/code.png"></image>
</view> </view>
<view class="title">添加客服微信</view> <view class="title">添加客服微信</view>
<view class="operation">保存图片 > 点击微信“扫一扫” >选择相册</view> <view class="operation">保存图片 > 点击微信“扫一扫” >选择相册</view>
......
pages/customerService/customerService.wxss
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
} }
.footer-nav{ .footer-nav{
position: fixed; position: fixed;
bottom: 0; bottom: 38rpx;
width: 750rpx; width: 750rpx;
height: 120rpx; height: 100rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
color: rgb(169, 171, 177); color: rgb(169, 171, 177);
} }
.nav-icon{ .nav-icon{
width: 60rpx; width: 48rpx;
height: 60rpx; height: 48rpx;
} }
.mask-content{ .mask-content{
width: 610rpx; width: 610rpx;
......
pages/hotelAccommodation/hotelAccommodation.js
...@@ -38,12 +38,13 @@ Page({ ...@@ -38,12 +38,13 @@ Page({
onLoad: function (options) { onLoad: function (options) {
console.log('.............', options.detail) console.log('.............', options.detail)
let detail=JSON.parse(options.detail); let detail=JSON.parse(options.detail);
console.log(detail);
this.setData({ this.setData({
type: detail.type, type: detail.type,
name: detail.name, name: detail.name,
mobile: detail.mobile, mobile: detail.mobile,
num: detail.num, num: detail.num,
time: detail.time.substring(0,10) + ((detail.type == 0) ? ' 20:00-24:00' : ''), time: detail.time.substring(5,11).replace('-','月').replace(' ','日') + ((detail.type == 0) ? ' 20:00-24:00' : ''),
}) })
}, },
......
pages/hotelAccommodation/hotelAccommodation.wxml
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
<view class="appiont-container"> <view class="appiont-container">
<image wx:if="{{type == 0}}" class="bgcImg" src="http://upload.miaomiao-bao.com/f8e92202008192102227949.jpg"></image> <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> <image wx:if="{{type == 1}}" class="bgcImg" src="http://upload.miaomiao-bao.com/11174202008192100431340.jpg"></image>
<image class="icon" src="../../image/logo-w.png"></image>
<view class="form"> <view class="form">
<image class="card" src="http://upload.miaomiao-bao.com/b6d15202008192102456807.png"></image> <image class="card" src="http://upload.miaomiao-bao.com/b6d15202008192102456807.png"></image>
<view wx:if="{{type == 0}}" class="title">夜间入园预约凭证</view> <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>
<view wx:if="{{type == 1}}" class="title">看房预约凭证</view> <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-content">
<view class="form-item"> <view class="form-item">
<view class="form-item-nav">姓名</view> <view class="form-item-nav">姓名</view>
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
</view> </view>
</view> </view>
<view class="thanks">THANK YOU FOR THE APPOINTMENT！</view> <image src="http://sm-web.meiqicloud.com/userfiles/appResources/appointment/night/ornament-1.png" class="thanks"></image>
</view> </view>
<view class="custom" bindtap="showHotline">客服咨询</view> <view class="custom" bindtap="showHotline">客服咨询</view>
</view> </view>
......
pages/hotelAccommodation/hotelAccommodation.wxss
...@@ -22,20 +22,19 @@ ...@@ -22,20 +22,19 @@
position: relative; position: relative;
height: 780rpx; height: 780rpx;
margin-top: -5rpx; margin-top: -5rpx;
overflow: hidden;
} }
.card{ .card{
width: 100%; width: 100%;
height: 780rpx; height: 1096rpx;
position: absolute; position: absolute;
z-index: -1; z-index: -1;
top:-316rpx;
} }
.title{ .title{
text-align: center; height: 50rpx;
padding-top: 55rpx; margin-top: 50rpx;
font-size: 50rpx; margin-bottom: 94rpx;
margin-bottom: 90rpx;
font-weight:600;
color:rgba(0,0,0,1);
} }
.form-content{ .form-content{
width: 494rpx; width: 494rpx;
...@@ -60,14 +59,11 @@ ...@@ -60,14 +59,11 @@
color:rgba(21,25,31,1); color:rgba(21,25,31,1);
} }
.thanks{ .thanks{
width: 100%; width: 462rpx;
text-align: center; height: 22rpx;
position: absolute; position: absolute;
bottom: 30rpx; bottom: 56rpx;
font-size:26rpx; left: 76rpx;
font-family:CormorantUnicase-Medium,CormorantUnicase;
font-weight:500;
color:rgba(0,0,0,1)
} }
.icon{ .icon{
width: 170rpx; width: 170rpx;
......
pages/login/login.wxml
...@@ -4,11 +4,8 @@ ...@@ -4,11 +4,8 @@
<view style="height:{{height}}px;overflow:hidden;"> <view style="height:{{height}}px;overflow:hidden;">
<image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image> <image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image>
<view class="imgContainer"> <view class="imgContainer">
<image class="titleImg" src="http://upload.miaomiao-bao.com/24614202008211016488542.png"></image> <image class="titleImg" src="./image/login1.png"></image>
<image style="width:356rpx;height:40rpx;margin-bottom:138rpx;" src="./image/The blue island@2x.png"></image> <image class="contentImg" src="./image/login.png"></image>
<image class="font" src="./image/zq@2x.png" style="width:456rpx"></image>
<image class="font" src="./image/xhslqj@2x.png" style="width:228rpx"></image>
<image class="font" src="./image/syrs@2x.png" style="width:228rpx"></image>
</view> </view>
......
pages/login/login.wxss
...@@ -15,17 +15,22 @@ ...@@ -15,17 +15,22 @@
.imgContainer{ .imgContainer{
width: 750rpx; width: 750rpx;
position: absolute; position: absolute;
top: 445rpx; top: 326rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.titleImg{ .titleImg{
width: 528rpx; width: 528rpx;
height: 158rpx; height: 230rpx;
left: 112rpx; left: 112rpx;
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
.contentImg{
width: 456rpx;
height: 190rpx;
margin-top: 132rpx;
}
.font{ .font{
height: 42rpx; height: 42rpx;
margin-bottom: 32rpx; margin-bottom: 32rpx;
...@@ -33,7 +38,7 @@ ...@@ -33,7 +38,7 @@
.btn-contanier{ .btn-contanier{
width:558rpx; width:558rpx;
position: absolute; position: absolute;
bottom: 0; bottom: 80rpx;
left: 96rpx; left: 96rpx;
/* margin-top: 176rpx; */ /* margin-top: 176rpx; */
} }
......
pages/mine/image/avatar.png
pages/mine/image/avatar.png

26.2 KB | W: | H:

pages/mine/image/avatar.png

3.47 KB | W: | H:

pages/mine/image/avatar.png
pages/mine/image/avatar.png
pages/mine/image/avatar.png
pages/mine/image/avatar.png
  • 2-up
  • Swipe
  • Onion skin
pages/mine/mine.js
...@@ -9,20 +9,14 @@ Page({ ...@@ -9,20 +9,14 @@ Page({
data: { data: {
mobile: '', mobile: '',
nickName: '', nickName: '',
avatarUrl: '', avatarUrl: '/pages/mine/image/avatar.png',
stateTest: '去认证',
mask:false, mask:false,
type:0, //判断是否是认证的了 type:0, //判断是否是认证的了
approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权'], approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权'],
activityList: [], activityList: [],
appointmentList: [], appointmentList: [],
tabIn: false, isRegister: false, // 是否注册
showIndex: 0,
},
//去认证
goApprove(){
wx.navigateTo({
url: '../ownerCertification/ownerCertification',
})
}, },
close(){ close(){
this.setData({ this.setData({
...@@ -51,10 +45,11 @@ Page({ ...@@ -51,10 +45,11 @@ Page({
let nickName = wx.getStorageSync('nickName') let nickName = wx.getStorageSync('nickName')
let avatarUrl = wx.getStorageSync('avatarUrl') let avatarUrl = wx.getStorageSync('avatarUrl')
if (mobile && nickName && avatarUrl) { if (mobile && nickName && avatarUrl) {
this.setData({ that.setData({
mobile: this.toHide(mobile), mobile: that.toHide(mobile),
nickName: nickName, nickName: nickName,
avatarUrl: avatarUrl, avatarUrl: avatarUrl,
isRegister: true,
}) })
app.login({ app.login({
...@@ -68,60 +63,60 @@ Page({ ...@@ -68,60 +63,60 @@ Page({
that.setData({ that.setData({
type: userType == 1 ? 1 : 0, type: userType == 1 ? 1 : 0,
}) })
} else if (this.data.showIndex == 0) { } else {
that.setData({ that.setData({
tabIn: false, isRegister: false,
showIndex: 1,
}) })
}
},
// 登录注册页
checkRegister() {
if (this.data.isRegister) {
return true
} else {
wx.navigateTo({ wx.navigateTo({
url: '../login/login', url: '../login/login',
}) })
} else if (this.data.showIndex == 1) { return false
that.setData({
tabIn: false,
showIndex: 0,
})
wx.switchTab({
url: '/pages/home/home',
})
} }
},
//去认证
goApprove(){
if (this.checkRegister()) {
wx.navigateTo({
url: '../ownerCertification/ownerCertification',
})
}
},
myActivity() {
if (this.checkRegister()) {
wx.navigateTo({
url: "../myActivity/myActivity",
})
}
},
myAppointment() {
if (this.checkRegister()) {
wx.navigateTo({
url: '../myAppointment/myAppointment',
})
}
}, },
/**
* 监听 TabBar 切换点击 customerService() {
*/ if (this.checkRegister()) {
onTabItemTap: function (item) { wx.navigateTo({
// console.log(item) url: "../customerService/customerService",
if (item.index == 3) { })
// this.setData({
// tabIn: true,
// })
// let that = this
// app.login({
// success: function(token) {
// let mobile = wx.getStorageSync('mobile')
// let nickName = wx.getStorageSync('nickName')
// let avatarUrl = wx.getStorageSync('avatarUrl')
// let userType = wx.getStorageSync('userType')
// if (mobile && nickName && avatarUrl) {
// that.setData({
// mobile: that.toHide(mobile),
// nickName: nickName,
// avatarUrl: avatarUrl,
// type: userType == 1 ? 1 : 0,
// })
// } else {
// wx.navigateTo({
// url: '../login/login',
// })
// }
// }
// })
} }
}, },
//我的活动详情
activityDetail(e){ activityDetail(e){
wx.navigateTo({ wx.navigateTo({
url: '../activityDetail/activityDetail?enrollid='+e.currentTarget.dataset.enrollid, url: '../activityDetail/activityDetail?enrollid='+e.currentTarget.dataset.enrollid,
...@@ -136,9 +131,11 @@ Page({ ...@@ -136,9 +131,11 @@ Page({
//点击前往修改页面 //点击前往修改页面
goMyInfo(){ goMyInfo(){
if (this.checkRegister()) {
wx.navigateTo({ wx.navigateTo({
url: '../myInfo/myInfo', url: '../myInfo/myInfo',
}) })
}
}, },
// 我的活动 // 我的活动
......
pages/mine/mine.wxml
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
<view class="mine" wx:if="{{type == 0}}"> <view class="mine" wx:if="{{type == 0}}">
<image class="background-image" src="./image/mine.png"></image> <image class="background-image" src="./image/mine.png"></image>
<view class="row align-c"> <view class="row align-c">
<view class="mine-avatar"> <view class="mine-avatar" bindtap="checkRegister">
<l-avatar size="112" src="{{avatarUrl}}"/> <l-avatar size="112" src="{{avatarUrl}}"/>
</view> </view>
<view class="mine-info col">
<view wx:if="{{isRegister}}" class="mine-info col">
<view class="row align-c"> <view class="row align-c">
<text>{{nickName}}</text> <text>{{nickName}}</text>
<image src="./image/inform.png" bindtap="goMyInfo"></image> <image src="./image/inform.png" bindtap="goMyInfo"></image>
...@@ -16,6 +17,12 @@ ...@@ -16,6 +17,12 @@
<text>{{mobile}}</text> <text>{{mobile}}</text>
</view> </view>
</view> </view>
<view wx:else class="mine-info col">
<view class="row align-c" bindtap="checkRegister">
<text style="color:#333333;font-weight:500;">登录/注册</text>
</view>
</view>
</view> </view>
</view> </view>
...@@ -55,7 +62,7 @@ ...@@ -55,7 +62,7 @@
</view> </view>
<view class="menu"> <view class="menu">
<l-list url="../myActivity/myActivity" l-content-class="menu-title" title="我的活动"></l-list> <l-list l-content-class="menu-title" l-class="listClass" title="我的活动" bind:lintap="myActivity"></l-list>
<!-- 我的活动 --> <!-- 我的活动 -->
<view class="my-activities" wx:if="{{activityList.length > 0}}"> <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"> <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">
...@@ -69,7 +76,7 @@ ...@@ -69,7 +76,7 @@
</view> </view>
<view class="my-activities-item"></view> <view class="my-activities-item"></view>
</view> </view>
<l-list l-content-class="menu-title" title="我的预约" url="../myAppointment/myAppointment"></l-list> <l-list l-content-class="menu-title" title="我的预约" l-class="listClass" bind:lintap="myAppointment"></l-list>
<!-- 我的预约 --> <!-- 我的预约 -->
<view class="my-activities" wx:if="{{appointmentList.length > 0}}"> <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"> <view class="my-activities-item" wx:for="{{appointmentList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
...@@ -86,7 +93,8 @@ ...@@ -86,7 +93,8 @@
</view> </view>
<view class="my-activities-item"></view> <view class="my-activities-item"></view>
</view> </view>
<l-list l-content-class="menu-title" title="客服中心" url="../customerService/customerService"></l-list>
<l-list l-content-class="menu-title" title="客服中心" l-class="listClass" bind:lintap="customerService"></l-list>
</view> </view>
</view> </view>
......
pages/mine/mine.wxss
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
.mine-info view:nth-child(2) { .mine-info view:nth-child(2) {
margin-top: 14rpx; margin-top: 0rpx;
} }
.mine-info view:nth-child(2) text { .mine-info view:nth-child(2) text {
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
.menu-title { .menu-title {
font-weight: bolder; font-weight: bolder;
font-size: 30rpx; font-size: 30rpx;
border-bottom: none;
}
.listClass{
border-bottom: none !important;
} }
.my-activities{ .my-activities{
width: 798rpx; width: 798rpx;
...@@ -131,11 +135,14 @@ ...@@ -131,11 +135,14 @@
padding-left:50rpx ; padding-left:50rpx ;
margin-top: 70rpx; margin-top: 70rpx;
line-height: 2; line-height: 2;
font-weight: bold; font-size:30rpx;
font-weight:500;
color:rgba(21,25,31,1);
} }
.my-activities-content{ .my-activities-content{
color: rgb(169, 174, 181);
font-size: 26rpx; font-size: 26rpx;
font-weight:400;
color:rgba(101,110,123,1);
padding-left:50rpx ; padding-left:50rpx ;
line-height: 2; line-height: 2;
white-space: nowrap; white-space: nowrap;
......
pages/myAppointment/myAppointment.js
...@@ -131,7 +131,7 @@ Page({ ...@@ -131,7 +131,7 @@ Page({
let obj = { let obj = {
title:title, title:title,
type: type, type: type,
time: item.subscribeDate.substring(0,10) + ((type == 0) ? ' 20:00-24:00' : ''), time: item.subscribeDate.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : ''),
num: item.subscribeNum, num: item.subscribeNum,
url: url, url: url,
id: item.id, id: item.id,
......
pages/myAppointment/myAppointment.wxss
...@@ -116,8 +116,7 @@ ...@@ -116,8 +116,7 @@
line-height: 70rpx; line-height: 70rpx;
text-align: center; text-align: center;
color: white; color: white;
background-color: rgb(186, 174, 135); background:rgba(255,255,255,0.53);
border-radius: 3px; border-radius: 3px;
font-size: 28rpx; font-size: 28rpx;
opacity: 0.87;
} }
\ No newline at end of file
pages/ownerCertification/ownerCertification.wxml
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
<view class="marginB"> <view class="marginB">
<view class="form-item"> <view class="form-item">
<view class="form-item-nav">姓名</view> <view class="form-item-nav">姓名</view>
<input maxlength="10" class="{{nameErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputName" bindblur="nameBlur" placeholder="请输入姓名" value="{{name}}"></input> <input placeholder-class="placeholder" maxlength="10" class="{{nameErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputName" bindblur="nameBlur" placeholder="请输入姓名" value="{{name}}"></input>
</view> </view>
<view class="error" hidden="{{!nameErr.length>0}}">{{nameErr}}</view> <view class="error" hidden="{{!nameErr.length>0}}">{{nameErr}}</view>
</view> </view>
<view class="marginB"> <view class="marginB">
<view class="form-item"> <view class="form-item">
<view class="form-item-nav">手机号</view> <view class="form-item-nav">手机号</view>
<input maxlength="11" type="number" class="{{phoneErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputPhone" bindblur="phoneBlur" placeholder="请输入手机号" value="{{phone}}"></input> <input placeholder-class="placeholder" maxlength="11" type="number" class="{{phoneErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputPhone" bindblur="phoneBlur" placeholder="请输入手机号" value="{{phone}}"></input>
</view> </view>
<view class="error" hidden="{{!(phoneErr.length>0)}}">{{phoneErr}}</view> <view class="error" hidden="{{!(phoneErr.length>0)}}">{{phoneErr}}</view>
</view> </view>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<view class="marginB"> <view class="marginB">
<view class="form-item"> <view class="form-item">
<view class="form-item-nav">身份证号</view> <view class="form-item-nav">身份证号</view>
<input maxlength="18" type="idcard" class="{{idCardErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputIdCard" bindblur="idCardBlur" placeholder="请输入身份证号" value="{{idCard}}"></input> <input placeholder-class="placeholder" maxlength="18" type="idcard" class="{{idCardErr.length>0 ? 'form-input-error' : 'form-input'}}" bindinput="inputIdCard" bindblur="idCardBlur" placeholder="请输入身份证号" value="{{idCard}}"></input>
</view> </view>
<view class="error" hidden="{{!idCardErr.length>0}}">{{idCardErr}}</view> <view class="error" hidden="{{!idCardErr.length>0}}">{{idCardErr}}</view>
</view> </view>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<view class="marginB"> <view class="marginB">
<view class="form-item"> <view class="form-item">
<view class="form-item-nav">房号</view> <view class="form-item-nav">房号</view>
<input 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>
<view class="error" hidden="{{!roomErr.length>0}}">{{roomErr}}</view> <view class="error" hidden="{{!roomErr.length>0}}">{{roomErr}}</view>
</view> </view>
......
pages/ownerCertification/ownerCertification.wxss
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
.yztq{ .yztq{
width: 320rpx; width: 320rpx;
height: 84rpx; height: 78rpx;
} }
.items{ .items{
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
font-weight:400; font-weight:400;
color:rgba(255,255,255,1); color:rgba(255,255,255,1);
font-size:22rpx; font-size:22rpx;
margin-left: 8rpx;
opacity: 0.4;
} }
.content{ .content{
...@@ -68,9 +70,15 @@ font-size:22rpx; ...@@ -68,9 +70,15 @@ font-size:22rpx;
} }
.form-item-nav{ .form-item-nav{
width: 120rpx; width: 120rpx;
text-align:justify;
text-align-last:justify ; text-align-last:justify ;
font-size:30rpx; font-size:30rpx;
} }
.form-item-nav::after{
content: " ";
display: inline-block;
width: 100%;
}
.form-input{ .form-input{
width:510rpx; width:510rpx;
height:80rpx; height:80rpx;
...@@ -108,7 +116,7 @@ color:rgba(21,25,31,1); ...@@ -108,7 +116,7 @@ color:rgba(21,25,31,1);
line-height:36rpx; line-height:36rpx;
} }
input::-webkit-input-placeholder { .placeholder {
/* WebKit browsers */ /* WebKit browsers */
color:rgba(194,199,207,1); color:rgba(194,199,207,1);
} }
......
project.config.json
...@@ -100,6 +100,13 @@ ...@@ -100,6 +100,13 @@
"id": -1, "id": -1,
"name": "pages/customerService/customerService", "name": "pages/customerService/customerService",
"pathName": "pages/customerService/customerService", "pathName": "pages/customerService/customerService",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/ownerCertification/ownerCertification",
"pathName": "pages/ownerCertification/ownerCertification",
"scene": null "scene": null
} }
] ]
......
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