Commit 7a994ee8 by 陈玉桐

fix

parent 0b2b2f7c
{
"pages": [
"pages/index/index",
"pages/setting/setting",
"pages/user/user",
"pages/updatePlan/updatePlan",
"pages/plan/plan",
"pages/eyesight/eyesight",
"pages/childInfo/childInfo",
"pages/trainReport/trainReport",
"pages/historyDetail/historyDetail",
"pages/message/message",
"pages/eyesight/eyesight",
"pages/setting/setting",
"pages/childInfo/childInfo",
"pages/trainSort/trainSort",
"pages/updatePlan/updatePlan",
"pages/plan/plan",
"pages/user/user",
"pages/mine/mine",
"pages/idea/idea",
"pages/starSort/starSort",
......
......@@ -62,7 +62,7 @@ Page({
eyesightNext: function () {
let me = this;
console.log(me.data.luoData)
if(me.data.luoData.left=='-' || me.data.luoData.right=='-' || me.data.luoData.left=='' || me.data.luoData.right==''){
if((me.data.luoData.left=='-' && me.data.luoData.right=='-') || (me.data.luoData.left=='' && me.data.luoData.right=='')){
wx.showModal({
title: '提示',
showCancel: false,
......@@ -70,6 +70,14 @@ Page({
})
return
}
if(me.data.luoData.left=='-' || me.data.luoData.right=='-' || me.data.luoData.left=='' || me.data.luoData.right==''){
wx.showModal({
title: '提示',
showCancel: false,
content: '左眼或右眼裸眼视力未选择'
})
return
}
// 是否第一次点击下一步
if(me.data.first){
// 如果是有弱视斜视散光,弹窗
......
......@@ -36,7 +36,7 @@
</view>
<view id="eyesightLast" hidden="{{!show}}">
<view class="eyesightConItem">
<view class="eyesightConLeft">· 弱视程度</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 弱视程度</view>
<picker mode="multiSelector" class="selectorPicker" bindchange="ruoChange" value="{{ruoIndex}}" range="{{ruoArray}}">
<view class="eyesightConRight">
<view class="selItem">{{ruoArray[0][ruoIndex[0]]}}</view>
......@@ -45,7 +45,7 @@
</picker>
</view>
<view class="eyesightConItem">
<view class="eyesightConLeft">· 斜视情况</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 斜视情况</view>
<picker mode="multiSelector" class="selectorPicker" bindchange="xieChange" value="{{xieIndex}}" range="{{xieArray}}">
<view class="eyesightConRight">
<view class="selItem">{{xieArray[0][xieIndex[0]]}}</view>
......@@ -54,7 +54,7 @@
</picker>
</view>
<view class="eyesightConItem">
<view class="eyesightConLeft">· 散光度数</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 散光度数</view>
<picker mode="multiSelector" class="selectorPicker" bindchange="sanChange" value="{{sanIndex}}" range="{{sanArray}}">
<view class="eyesightConRight">
<view class="selItem">{{sanArray[0][sanIndex[0]]}}</view>
......@@ -71,7 +71,7 @@
</view>
<view hidden="{{isClass==0}}">
<view class="eyesightConItem">
<view class="eyesightConLeft">· 矫正视力</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 矫正视力</view>
<picker mode="multiSelector" class="selectorPicker" bindchange="jiaoChange" value="{{jiaoIndex}}" range="{{jiaoArray}}">
<view class="eyesightConRight">
<view class="selItem">{{jiaoArray[0][jiaoIndex[0]]}}</view>
......@@ -80,7 +80,7 @@
</picker>
</view>
<view class="eyesightConItem">
<view class="eyesightConLeft">· 眼镜度数</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 眼镜度数</view>
<picker mode="multiSelector" class="selectorPicker" bindchange="glassChange" value="{{glassIndex}}" range="{{glassArray}}">
<view class="eyesightConRight">
<view class="selItem">{{glassArray[0][glassIndex[0]]}}</view>
......@@ -89,7 +89,7 @@
</picker>
</view>
<view class="eyesightConItem eyesightConItemLast">
<view class="eyesightConLeft">· 配镜日期</view>
<view class="eyesightConLeft eyesightConLeftTitle">· 配镜日期</view>
<picker mode="date" value="{{date}}" start="1990-09-01" end="2025-09-01" class="selectorPicker" bindchange="bindDateChange">
<view class="eyesightConRight">
{{date}}
......
......@@ -66,6 +66,10 @@
.eyesightConLeft{
width:45%;
}
.eyesightConLeftTitle{
font-size: 30rpx;
color: #888;
}
.eyesightConRight{
display: flex;
justify-content: space-around;
......@@ -112,12 +116,13 @@ switch{
border-radius: 10rpx;
transform: translate(-50%, -50%);
overflow: hidden;
background: #555;
color: #fff;
background: #fff;
color: #888;
padding: 44rpx 58rpx;
}
#eyesightPopupTitle{
font-size: 32rpx;
font-size: 36rpx;
color: #000000;
text-align: center;
margin-bottom: 30rpx;
}
......@@ -127,7 +132,8 @@ switch{
}
#eyesightKnow{
font-size: 26rpx;
color: #555;
color: #fff;
background: #33D1C4;
width: 220rpx;
height: 60rpx;
line-height: 60rpx;
......
......@@ -179,7 +179,7 @@ function leftEyeInitChart(chart, dayList, leftVisionList, leftForecastVision) {
length: 0,
},
axisLabel:{
color: '#666',
color: '#888',
fontSize: 11
},
boundaryGap: true,
......@@ -200,15 +200,18 @@ function leftEyeInitChart(chart, dayList, leftVisionList, leftForecastVision) {
}
},
axisLabel: {
color: '#666',
color: '#888',
fontSize: 10,
showMinLabel: false //显示最小值
showMinLabel: false, //显示最小值
formatter: function (value, index) {
return value.toFixed(1);
},
},
min: function(value) {
return value.min - 0.2;
},
max: function(value) {
return value.max + 0.2;
return value.max + 0.1;
}
},
series: [
......@@ -275,7 +278,7 @@ function rightEyeInitChart(chart, dayList, rightVisionList, rightForecastVision)
length:0,
},
axisLabel:{
color: '#666',
color: '#888',
fontSize: 11
},
boundaryGap: true,
......@@ -295,15 +298,18 @@ function rightEyeInitChart(chart, dayList, rightVisionList, rightForecastVision)
}
},
axisLabel: {
color: '#333',
color: '#888',
fontSize: 10,
showMinLabel: false //显示最小值
showMinLabel: false, //显示最小值
formatter: function (value, index) {
return value.toFixed(1);
},
},
min: function(value) {
return value.min - 0.2;
},
max: function(value) {
return value.max + 0.2;
return value.max + 0.1;
}
},
series: [
......
......@@ -34,7 +34,7 @@
<view id="initial">
<text>当前视力</text>
<text class="initialIcon">R</text>
<text>{{rightEye}}</text>
<text class="initialIconR">{{rightEye}}</text>
<text class="initialIcon">L</text>
<text>{{leftEye}}</text>
</view>
......@@ -105,7 +105,7 @@
<view id="taskNocompleteDes">请坚持完成训练哦</view>
</view>
</view>
<view class="reprotChartTitle">上周({{beginDay}}~{{endDay}})共训练<text>{{weekDuration}}</text>分钟</view>
<view class="reprotChartTitle">上周<text class="reprotChartTitleDate">({{beginDay}}~{{endDay}})</text>共训练<text>{{weekDuration}}</text>分钟</view>
<view class="reprotChart">
<view class="reprotWeekChart">
<ec-canvas id="reprotWeekChart" ec="{{ weekChart }}"></ec-canvas>
......@@ -131,19 +131,21 @@
<text>训练成就</text>
<!-- <image src="../../assets/icon_more.png"></image> -->
</view>
<view class="achieveTime">累计训练<text>{{totalTrainingDays}}</text>天</view>
<view class="achieveChange">
视力从<text>{{lastVision}}</text>
<text wx:if="{{lastVision<nowVision}}">提升到</text><text wx:elif="{{lastVision==nowVision}}">保持在</text><text wx:else>降低到</text>
<text>{{nowVision}}</text>
<view class="achieveBox">
<view class="achieveTime">累计训练<text class="achieveChangeNumber">{{totalTrainingDays}}</text>天</view>
<view class="achieveChange">
,视力从<text class="achieveChangeNumber">{{lastVision}}</text>
<text wx:if="{{lastVision<nowVision}}">提升到</text><text wx:elif="{{lastVision==nowVision}}">保持在</text><text wx:else>降低到</text>
<text class="achieveChangeNumber">{{nowVision}}</text>
</view>
</view>
<view class="reprotChartSuggest">
<view class="reprotChartSuggestTitle">训练建议</view>
<view class="adviseItem" wx:for="{{visionAdvice}}" wx:key>
<image src="../../assets/advise.png" />
<text>{{item}}</text>
</view>
<view class="reprotChartSuggest">
<view class="reprotChartSuggestTitle">训练建议</view>
<view class="adviseItem" wx:for="{{visionAdvice}}" wx:key>
<image src="../../assets/advise.png" />
<text>{{item}}</text>
</view>
</view>
<view id="leftEyeChartBox">
<view class="eyeChartName">左眼视力</view>
<view class="legend_box">
......@@ -242,6 +244,7 @@
</view>
</view>
<view id="indexBottom"></view>
<view id="indexBottomText">底下没有了~</view>
<!-- 更新训练计划弹窗 -->
<view id="mustUpdate" catchtouchmove="preventTouchMove" hidden="{{mustUpdate}}">
......
......@@ -89,7 +89,7 @@
display: flex;
align-items: center;
}
.initialIcon{
#userDetail .initialIcon{
display: inline-block;
width: 22rpx;
height: 22rpx;
......@@ -97,14 +97,18 @@
text-align: center;
line-height: 22rpx;
border-radius: 50%;
background-color: #000;
background-color: #888;
color: #fff;
margin-right: 5rpx;
}
#userDetail .initialIconR{
margin-right: 30rpx;
}
#userBox{
display: flex;
position: relative;
padding: 10rpx 0 20rpx 50rpx;
padding: 10rpx 0 10rpx 50rpx;
border-bottom: 1rpx solid #dfdfdf;
}
#setBtn{
......@@ -279,7 +283,7 @@
padding: 25rpx 0 10rpx;
}
.reportTitleLeft,.trainSortTitleLeft,.resultSortTitleLeft{
font-size: 32rpx;
font-size: 36rpx;
display: flex;
align-items:center;
color: #111;
......@@ -348,6 +352,10 @@
font-size: 36rpx;
margin: 0 6rpx;
}
.reprotChartTitle .reprotChartTitleDate{
font-size: 28rpx;
margin: 0;
}
.reprotWeekChart {
width: 100%;
......@@ -448,6 +456,10 @@
background: #e6ece5;
}
.reportDes{
margin-top: 20rpx;
}
/* 训练成就 */
#achieve{
color: #555;
......@@ -456,7 +468,7 @@
.achieveTitle{
display: flex;
justify-content: space-between;
font-size: 32rpx;
font-size: 36rpx;
align-items:center;
color: #111;
padding: 25rpx 0;
......@@ -466,13 +478,17 @@
height: 36rpx;
display: block;
}
.achieveBox{
display: flex;
margin-bottom: 10rpx;
}
.achieveTime{
font-size: 34rpx;
font-size: 30rpx;
color: #111;
margin-bottom: 10rpx;
}
.achieveTime>text, .achieveChange>text{
font-size: 36rpx;
.achieveChangeNumber{
font-size: 42rpx;
margin: 0 10rpx;
}
#suggest{
......@@ -483,7 +499,7 @@
margin-bottom: 15rpx;
}
.achieveChange{
font-size: 34rpx;
font-size: 30rpx;
color: #111;
padding-bottom: 20rpx;
}
......@@ -543,24 +559,24 @@
font-size: 18rpx;
height: 22rpx;
line-height: 22rpx;
background: #888;
background: #999;
border-radius: 4rpx;
color: #fff;
padding: 0 5rpx;
position: absolute;
left: 10rpx;
left: 2rpx;
bottom: 52rpx;
}
#rightYear{
font-size: 18rpx;
height: 22rpx;
line-height: 22rpx;
background: #888;
background: #999;
border-radius: 4rpx;
padding: 0 5rpx;
color: #fff;
position: absolute;
left: 10rpx;
left: 2rpx;
bottom: 22rpx;
}
......@@ -658,3 +674,10 @@
width: 100%;
height: 416rpx;
}
#indexBottomText{
font-size: 28rpx;
color: rgba(139,136,120,0.7);
text-align: center;
background: #e6ece5;
}
......@@ -7,9 +7,9 @@
</view>
<view id="planInfoTime">
<view class="planConDes">本周<text>{{beginTime}}~{{endTime}}</text></view>
<view class="planInfoTimeDes">每天训练<text>{{trainingTimes}}</text>组</view>
<view class="planInfoTimeDes">训练总时长<text>{{totalDuration}}</text>分钟</view>
<view class="planInfoTimeDes" wx:for="{{trainingList}}" wx:key>·{{item.type}}<text>{{item.duration}}</text>分钟</view>
<view class="planInfoTimeDes planInfoTimeDesTitle">每天训练<text>{{trainingTimes}}</text>组</view>
<view class="planInfoTimeDes planInfoTimeDesTotal">训练总时长<text>{{totalDuration}}</text>分钟</view>
<view class="planInfoTimeDes planInfoTimeDesTotal planInfoTimeDesTotalItem" wx:for="{{trainingList}}" wx:key>·{{item.type}}<text>{{item.duration}}</text>分钟</view>
</view>
</view>
</view>
......
......@@ -37,7 +37,7 @@
.planConDes{
font-size: 32rpx;
color: #10D9B8;
padding-top: 20rpx;
/* padding-top: 20rpx; */
}
.planConDes>text{
font-size: 28rpx;
......@@ -47,11 +47,22 @@
font-size: 28rpx;
color: #666;
}
.planInfoTimeDesTitle text{
padding: 0 20rpx;
}
.planInfoTimeDes text{
font-weight: 300;
color: #111;
font-size: 48rpx;
padding: 0 20rpx;
/* padding: 0 20rpx; */
}
.planInfoTimeDesTotalItem{
padding-left: 15rpx;
}
.planInfoTimeDesTotal text{
display: inline-block;
width: 110rpx;
text-align: center;
}
......@@ -61,12 +72,16 @@
padding: 0 20rpx 30rpx;
}
#planList{
/* #planList{
background-color: #fff;
}
} */
.planListItem{
padding: 0 25rpx;
border-bottom: 1rpx solid #E5ECE5;
background-color: #fff;
}
.planListItem:first-child{
margin-bottom: 10rpx;
}
.planListItemTitle{
border-bottom: 1rpx solid #E5ECE5;
......
......@@ -24,6 +24,8 @@ Page({
constraintTipShow: false,
useLimitShow: false,
installAppTipShow: false,
weakDialog: false,
},
onLoad: function () {
// this.demopicker = this.selectComponent("#shieldpicker");
......@@ -141,7 +143,7 @@ Page({
wx.showModal({
title: '重要提示',
showCancel: false,
content: '视差训练仅适用于双眼视差大于0.2的情况'
content: '仅适用于双眼视差大于0.2的情况'
})
}
}else{
......@@ -182,10 +184,9 @@ Page({
weakIndex: weakStatus-1
})
if(weakStatus!=1){
wx.showModal({
title: '重要提示',
showCancel: false,
content: '如无弱视情况,请勿开启此训练!\r\n(原理:使用红灯闪烁的方式,激活黄斑区视觉细胞感光能力)'
// 弱视弹窗
me.setData({
weakDialog: true
})
}
}else{
......@@ -338,6 +339,13 @@ Page({
}
})
},
preventTouchMove() {},
// 开启弱视提醒
sure() {
this.setData({
weakDialog: false
})
},
// shieldTap: function (e) {
// this.demopicker.showPicker();
......
{
"navigationBarTitleText": "使用设置",
"navigationBarTitleText": "训练设置",
"usingComponents": {
}
}
\ No newline at end of file
......@@ -43,7 +43,7 @@
</view>
</picker>
</view>
<view class="useSetting parallaxBox">
<view class="useSetting">
<text class="useSettingTitle">弱视训练</text>
<picker bindchange="weakChange" value="{{weakIndex}}" range="{{weakArray}}">
<view class="useSettingBox">
......@@ -89,6 +89,21 @@
<view id="settingBtn">
<button id="settingDone" bindtap='settingDone'>保存</button>
</view>
<!-- 弱视提醒弹窗 -->
<view id="mustUpdate" catchtouchmove="preventTouchMove" hidden="{{!weakDialog}}">
<view id="mustUpdateBox">
<!-- 内容 -->
<view id="mustUpdateCon">
<view id="mustUpdateTitle">重要提示</view>
<view id="mustUpdateDes">如无弱视情况,请勿开启此训练!</view>
<view id="mustUpdateDesSecond">(以红光闪烁激活黄斑区视觉细胞感光能力)</view>
</view>
<!-- 按钮组 -->
<view id="mustUpdateBtn">
<text id="nowGoBtn" bindtap="sure">确定</text>
</view>
</view>
</view>
<view class="dialogBg" hidden="{{!useLimitShow}}" bindtap="closeUseLimit"></view>
<view class="dialogBg" hidden="{{!constraintTipShow}}" bindtap="closeConstraintTip"></view>
<view class="dialogBg" hidden="{{!installAppTipShow}}" bindtap="closeInstallAppTip"></view>
......
......@@ -8,7 +8,7 @@
align-items: center;
padding: 32rpx 25rpx;
background: #fff;
margin-bottom: 21rpx;
border-bottom: 1rpx solid #E5E5E5;
}
.useSettingTipIcon{
display: inline;
......@@ -52,9 +52,10 @@ switch{
padding: 4rpx 0 24rpx 25rpx;
}
.toWhiteList{
padding: 30rpx;
padding: 30rpx 30rpx 15rpx;
font-size: 34rpx;
color: #4F5051;
background-color: #EFEFF4;
}
#whiteListCon{
......@@ -121,8 +122,10 @@ switch{
line-height: 50rpx;
padding-left: 20rpx;
position: absolute;
background-color: #FFF0F5;
border: 1px solid #FFB5C5;
/* background-color: #FFF0F5;
border: 1px solid #FFB5C5; */
background-color: #fff;
border: 1px solid #ccc;
border-radius: 5px;
top: 50rpx;
left: -10rpx;
......@@ -136,23 +139,23 @@ switch{
top: -11rpx;
left: 20rpx;
transform: rotate(45deg);
background-color: #FFF0F5;
border: 1px #FFB5C5;
background-color: #fff;
border: 1px #ccc;
border-style: solid none none solid ;
}
.inviteSmall {
/* display: none; */
width: 300rpx;
width: 450rpx;
font-size: 25rpx;
/* height: 50rpx; */
line-height: 50rpx;
padding-left: 20rpx;
position: absolute;
background-color: #FFF0F5;
border: 1px solid #FFB5C5;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 5px;
top: 50rpx;
left: -10rpx;
left: -200rpx;
z-index: 2;
}
.inviteSmall:after {
......@@ -161,9 +164,67 @@ switch{
height: 20rpx;
position: absolute;
top: -11rpx;
left: 20rpx;
left: 207rpx;
transform: rotate(45deg);
background-color: #FFF0F5;
border: 1px #FFB5C5;
background-color: #fff;
border: 1px #ccc;
border-style: solid none none solid ;
}
/* 弹窗 */
#mustUpdate{
background: rgba(0,0,0,0.5);
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
#mustUpdateTitle{
font-size: 36rpx;
color: #000000;
padding: 50rpx 0 18rpx;
text-align: center;
}
#mustUpdateDes{
font-size: 30rpx;
color: #888888;
padding: 0 40rpx 5rpx;
text-align: center;
}
#mustUpdateDesSecond{
font-size: 26rpx;
color: #888888;
padding: 0 20rpx 30rpx;
text-align: center;
}
#mustUpdateBox{
width: 560rpx;
position: absolute;
left: 50%;
top: 45%;
border-radius: 8rpx;
transform: translate(-50%,-50%);
background: #fff;
}
/* 按钮 */
#mustUpdateBtn{
font-size: 36rpx;
color: #33D1C4;
display: flex;
justify-content: center;
align-items: center;
border-top: 2rpx solid #E5E5E5;
overflow: hidden;
}
#mustUpdateBtn>text{
text-align: center;
width: 49.2%;
padding: 25rpx 0;
}
#lastGoBtn{
border-right: 2rpx solid #E5E5E5;
}
......@@ -273,7 +273,7 @@ Page({
left: this.data.luoeyeArray[0][e.detail.value[0]],
right: this.data.luoeyeArray[1][e.detail.value[1]]
}
if(luoData.left=='-'||luoData.right=='-'){
if(luoData.left=='-' && luoData.right=='-'){
wx.showModal({
title: '提示',
showCancel: false,
......@@ -282,6 +282,17 @@ Page({
this.setData({
luoeyeIndex: [10,10]
})
return
}
if(luoData.left=='-'||luoData.right=='-'){
wx.showModal({
title: '提示',
showCancel: false,
content: '左眼或右眼裸眼视力未选择'
})
this.setData({
luoeyeIndex: [10,10]
})
}else{
this.setData({
luoeyeIndex: e.detail.value
......@@ -742,7 +753,8 @@ Page({
console.log(trainingData)
let newLeftEye = me.data.luoeyeArray[0][me.data.luoeyeIndex[0]]
let newRightEye = me.data.luoeyeArray[1][me.data.luoeyeIndex[1]]
if(newLeftEye=='-' || newRightEye=='-'){
console.log(newLeftEye,newRightEye)
if(newLeftEye=='-' && newRightEye=='-'){
wx.showModal({
title: '提示',
showCancel: false,
......@@ -753,6 +765,14 @@ Page({
})
return
}
if(newLeftEye=='-' || newRightEye=='-'){
wx.showModal({
title: '提示',
showCancel: false,
content: '左眼或右眼裸眼视力未选择'
})
return
}
// 请求前加Loading
wx.showLoading({
title: '加载中',
......@@ -772,8 +792,11 @@ Page({
wx.hideLoading();
if(res.data.errno==200){
// 跳转到训练计划
wx.redirectTo({
url: '/pages/plan/plan'
// wx.redirectTo({
// url: '/pages/plan/plan'
// })
wx.navigateBack({
delta: 1
})
}else{
wx.showModal({
......
......@@ -28,7 +28,7 @@
<view id="plan">
<view id="planTitle">更新训练计划</view>
<!-- 第一组 -->
<view class="train">
<view class="train trainSecond">
<view class="trainTitle">
<text>第一组</text>
<picker bindchange="firstTrainChange" value="{{firstTrainIndex}}" range="{{trainArray}}">
......@@ -96,7 +96,7 @@
</view>
<!-- 第二组 -->
<view class="train">
<view class="trainTitle trainSecond">
<view class="trainTitle">
<text>第二组</text>
<picker bindchange="secondTrainChange" value="{{secondTrainIndex}}" range="{{trainArray}}">
<view class="trainTitleSelect">
......
......@@ -25,7 +25,7 @@
display: flex;
}
.sightInfoLeft{
padding: 40rpx 0;
padding: 20rpx 0;
padding-right: 50rpx;
border-right: 1rpx solid #E5ECE5;
}
......@@ -36,9 +36,9 @@
}
#sightInfoRight .sightLeft{
padding: 40rpx 0;
padding: 20rpx 0;
}#sightInfoRight .sightRight{
padding: 40rpx 0;
padding: 20rpx 0;
}
.sightLeft{
margin-left: 80rpx;
......@@ -54,7 +54,7 @@
.selectorPicker{
width: 60%;
padding: 40rpx 0;
padding: 20rpx 0;
}
.eyesightConRight{
display: flex;
......@@ -75,6 +75,9 @@
padding: 0 30rpx;
background: #fff;
}
.trainSecond{
margin-bottom: 10rpx;
}
.trainTitle{
font-size: 32rpx;
color: #111111;
......@@ -83,9 +86,6 @@
padding: 40rpx 0;
border-bottom: 1rpx solid #E5ECE5;
}
.trainSecond{
border-top: 1rpx solid #E5ECE5;
}
.trainTitleSelect{
display: flex;
align-items: center;
......
......@@ -10,6 +10,7 @@ page{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 28rpx;
color: #4F5051;
margin-bottom: 10rpx;
......
......@@ -29,7 +29,7 @@
</view>
</view>
</view>
<view id="settingBtn">
<!-- <view id="settingBtn">
<button id="settingDone" bindtap='settingDone'>确定</button>
</view>
</view> -->
</view>
\ No newline at end of file
......@@ -45,6 +45,7 @@
#whiteList{
padding-left: 25rpx;
padding-bottom: 50rpx;
}
.whiteListItem{
display: flex;
......
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 to comment