Skip to content

S
sedu-mobile-v2
Commit 7e8a4c98 by liuzhanxin
Options

fix

parent 48e8c6c7
Showing with 112 additions and 6 deletions
cloudTrain/components/lab-select/index.vue
......@@ -59,6 +59,13 @@
})
this.listData[index].selected = true
this.sel = this.listData[index]
uni.navigateBack({
})
console.log(this.sel)
setTimeout(()=>{
uni.$emit("labEntitySave",[this.sel]);
},200)
},
getData:function(id){
var conditions = [
......
cloudTrain/components/voice-recognition/recording.vue
......@@ -147,7 +147,7 @@
display: flex;
flex-direction: column;
justify-content: flex-end;
background: #E7E7E7;
background: #ffffff;
}
.recording-content {
......
cloudTrain/pages/Appointment/calendar.vue
<template>
<view style="width: 100%;height: 100%;background-color: #F7F7F7;display:flex;flex-direction: column;">
<view style="width: 100%;height: 100%;background-color: #F7F7F7;display:flex;flex-direction: column;padding:0">
<Calendar @on-click="onDateClick" @monthChange="onMonthChange" :signeddates="signeddates" />
<scroll-view style="height:400px;" :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
<scroll-view style="height:400px;padding:0;width:100%" :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
@scrolltolower="lower" @scroll="scroll">
<view v-if="currentCalendarData.length>0" class="infoContainer">
<image src="/static/lab-share/time.png" class="timeIcon" />
......@@ -51,6 +51,11 @@
<text>当日暂无可预约时间</text>
</view>
</scroll-view>
<view style="display: flex;justify-content: center;align-items: center;width: 100%;position: absolute;bottom:20rpx">
<view hover-class="submithover" @click="confirm" class="submit-button">
<text class="submittext" >确定</text>
</view>
</view>
<FormAlert v-if="submitShow" name="整改项提交" placeholder="确定提交所填的数据?" @confirm="onSubmitClick" @cancel="cancel"></FormAlert>
<PopUp ref="popup" :isdistance="true"></PopUp>
</view>
......@@ -238,6 +243,46 @@
uni.$emit("writeConfirmData", [this.settingData,this.currentCalendarData]);
},500)
},
confirm() {
var timetableUuids = [];
var flag = false
this.currentCalendarData.map((opt)=>{
if(opt.checked){
timetableUuids.push(opt.calendarId);
}
if(opt.date){
var curDate = this.GLOBALUTIL.moment().format("YYYY-MM-DD")
var dt = opt.date.split(" ")[0]
if(dt < curDate ){
flag = true
}
}
})
if(timetableUuids.length == 0){
this.$refs.popup.open({
type:'err',
content:'请选择预约选项',
timeout:1000,
isClick:false
});
return
}
if(flag){
this.$refs.popup.open({
type:'err',
content:'已过期的时间不可预约',
timeout:1000,
isClick:false
});
return
}
uni.navigateTo({
url:"./write-confirm",
})
setTimeout(()=>{
uni.$emit("writeConfirmData", [this.settingData,this.currentCalendarData]);
},500)
},
submit(){
var timetableUuids = [];
var flag = false
......@@ -329,7 +374,7 @@
<style>
.scroll-view-item {
height: 150upx;
height: 170upx;
background-color: #F5F5F5;
display: flex;
justify-content: center;
......@@ -388,6 +433,7 @@
background-color: #ffffff;
flex-direction: column;
justify-content: center;
margin-left:28rpx;
}
.dataTitle {
......@@ -402,5 +448,25 @@
}
.hover {
opacity: 0.7;
}
.submit-button {
display: flex;
width:600rpx;
height:60rpx;
align-items: center;
justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
border-radius: 15rpx;
margin-left: 0;
margin-right: 0;
margin-bottom: 40rpx;
}
.submittext {
font-size: 14px;
color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
.submithover{
opacity: 0.7;
}
</style>
cloudTrain/pages/Appointment/detail.vue
......@@ -3,6 +3,11 @@
<view class="detailtext" v-for="news in dataList" :key="news.title" >
<text class="titletext">{{news.title}}</text><text class="contenttext">{{news.value}}</text>
</view>
<view style="display: flex;justify-content: center;align-items: center;width: 100%;position: absolute;bottom:80rpx">
<view hover-class="submithover" @click="appointment" class="submit-button">
<text class="submittext" >预约</text>
</view>
</view>
</view>
</template>
......@@ -98,8 +103,16 @@
})
},
onNavigationBarButtonTap() {
uni.navigateTo({
url: "./calendar"
uni.navigateTo({
url: "./calendar"
})
setTimeout(()=>{
uni.$emit("calendarData", [this.settingData])
},500)
},
appointment(){
uni.navigateTo({
url: "./calendar"
})
setTimeout(()=>{
uni.$emit("calendarData", [this.settingData])
......@@ -212,5 +225,25 @@
width: 200rpx;
height: 200rpx;
padding: 0;
}
.submit-button {
display: flex;
width:600rpx;
height:60rpx;
align-items: center;
justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
border-radius: 15rpx;
margin-left: 0;
margin-right: 0;
margin-bottom: 40rpx;
}
.submittext {
font-size: 14px;
color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
.submithover{
opacity: 0.7;
}
</style>
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