Skip to content

T
thinkApp
Commit 99e90a3d authored by youjie's avatar youjie
Browse files
Options

no message

parent 925edda2
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 41 deletions
src/pages/FriendsAndRelatives/index.vue
View file @ 99e90a3d
...@@ -222,7 +222,11 @@ ...@@ -222,7 +222,11 @@
}); });
const methods = { const methods = {
invite(){ invite(){
return {
title: "微信邀请",
query: "/pages/login/login",
imageUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1664163809000_838.png",
};
}, },
usernameInput(val) { usernameInput(val) {
data.Account = val.detail; data.Account = val.detail;
......
src/pages/MyChild/index.vue
View file @ 99e90a3d
...@@ -23,12 +23,13 @@ ...@@ -23,12 +23,13 @@
margin-left: 27rpx; margin-left: 27rpx;
} }
.dataList-content{ .dataList-content{
padding: 150rpx 50rpx 0 50rpx; padding: 150rpx 0rpx 0 0rpx;
} }
.title{ .title{
font-size: 34rpx; font-size: 34rpx;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
padding: 0 50rpx;
} }
.text{ .text{
margin-top: 20rpx; margin-top: 20rpx;
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
color: #BEBEBE; color: #BEBEBE;
padding: 0 50rpx;
} }
.dataList-box{ .dataList-box{
margin-bottom: 40rpx; margin-bottom: 40rpx;
...@@ -44,7 +46,7 @@ ...@@ -44,7 +46,7 @@
height: 204rpx; height: 204rpx;
flex-grow: 1; flex-grow: 1;
position: relative; position: relative;
padding: 31rpx 40rpx 0 22rpx; padding: 31rpx 0rpx 0 42rpx;
} }
.dataList-image{ .dataList-image{
width: 177rpx; width: 177rpx;
...@@ -53,7 +55,7 @@ ...@@ -53,7 +55,7 @@
background-size: 100% 100%; background-size: 100% 100%;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 50rpx;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -70,13 +72,12 @@ ...@@ -70,13 +72,12 @@
} }
.dataList-center{ .dataList-center{
background-color: #ffffff; background-color: #ffffff;
position: absolute; margin-top: 40rpx;
left: 177rpx;
bottom: 0;
right: 0;
border-radius: 0 50rpx 50rpx 0; border-radius: 0 50rpx 50rpx 0;
padding: 33rpx 48rpx; padding: 33rpx 48rpx 33rpx 157rpx;
box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09); box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
margin-left: 50rpx;
margin-right: 50rpx;
} }
.dataList-left{ .dataList-left{
flex-direction: column; flex-direction: column;
...@@ -109,12 +110,19 @@ ...@@ -109,12 +110,19 @@
.van-swipe-cell__left, .van-swipe-cell__left,
.van-swipe-cell__right { .van-swipe-cell__right {
position: absolute; position: absolute;
top: 0; right: 0rpx;
height: 100%; bottom: 0;
right: -0rpx; width: 78rpx;
width:199rpx; height: 166rpx;
line-height: 166rpx;
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
text-align: center;
}
/deep/.van-swipe-cell__left .van-button--danger,
/deep/.van-swipe-cell__right .van-button--danger{
background: rgba(0,0,0,0);
border: 0;
} }
</style> </style>
<template> <template>
...@@ -128,12 +136,11 @@ ...@@ -128,12 +136,11 @@
<view class="dataList-content"> <view class="dataList-content">
<view class="title">在读小孩列表</view> <view class="title">在读小孩列表</view>
<view class="text">左滑可删除小孩信息</view> <view class="text">左滑可删除小孩信息</view>
<view class="dataList-box" style="overflow: hidden;">
<van-swipe-cell <van-swipe-cell
id="swipe-cell" id="swipe-cell"
:right-width="116" :right-width="70"
async-close async-close
:disabled="true" :key="index"
@close="onClose"> @close="onClose">
<view class="dataList-form active"> <view class="dataList-form active">
<view class="dataList-image flex"> <view class="dataList-image flex">
...@@ -155,12 +162,11 @@ ...@@ -155,12 +162,11 @@
<text>学习中/休学</text> <text>学习中/休学</text>
</view> </view>
</view> </view>
<view slot="right" class="van-swipe-cell__right">
<van-icon name="cross" color="#BCBCBC"></van-icon>
</view> </view>
<view slot="right" class="van-swipe-cell__right">
<van-icon name="cross" color="#BCBCBC" size="20" @click.stop="DelData(item)" ></van-icon>
</view> </view>
</van-swipe-cell> </van-swipe-cell>
</view>
<van-empty description="暂无小孩" v-if="dataList.length === 0" /> <van-empty description="暂无小孩" v-if="dataList.length === 0" />
<view v-if="dataList.length > 0"> <view v-if="dataList.length > 0">
<Loadmore :state="pageState" /> <Loadmore :state="pageState" />
...@@ -226,6 +232,28 @@ ...@@ -226,6 +232,28 @@
instance.close(); instance.close();
break; break;
} }
},
// 删除接口
DelData(item){
uni.showModal({
title: '提示',
content: '将要删除数据,是否继续',
success: function (res) {
if (res.confirm) {
let Msg = {
ExamId: item.ExamId
}
} else if (res.cancel) {
uni.showToast({
title:'已取消',
icon:'none',
duration: 500
})
}
}
});
}, },
jumpPage(url) { jumpPage(url) {
uni.navigateTo({ uni.navigateTo({
...@@ -233,6 +261,7 @@ ...@@ -233,6 +261,7 @@
}); });
}, },
async getData() { async getData() {
return
let res = await GetOrderPage(data.msg); let res = await GetOrderPage(data.msg);
if (res) { if (res) {
if (data.timer) data.timer = null; if (data.timer) data.timer = null;
...@@ -259,9 +288,9 @@ ...@@ -259,9 +288,9 @@
onLoad(options) { onLoad(options) {
this.msg.OrderType = options.type this.msg.OrderType = options.type
this.getData(); this.getData();
uni.setNavigationBarTitle({ // uni.setNavigationBarTitle({
title: this.pageTitle // title: this.pageTitle
}); // });
}, },
onReachBottom() { onReachBottom() {
if (this.msg.pageIndex < this.pageCount) { if (this.msg.pageIndex < this.pageCount) {
......
src/pages/contract/orderList.vue
View file @ 99e90a3d
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
} }
.Order_Number { .Order_Number {
color: #0000ff; color: #DC3241;
font-size: 24rpx; font-size: 24rpx;
} }
.Order_Type{ .Order_Type{
......
src/pages/timetable/timeTable-item.vue
View file @ 99e90a3d
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</view> </view>
<view class="class-con class_status"> <view class="class-con class_status">
<view v-if="item.IsLeave === 1 && item.IsCheck == 2">状态：<text style="color:#E6A23C;">已请假</text></view> <view v-if="item.IsLeave === 1 && item.IsCheck == 2">状态：<text style="color:#E6A23C;">已请假</text></view>
<view v-if="item.IsLeave === 0 &&item.IsCheck === 0">状态：<text style="color:#0000FF">正常</text></view> <view v-if="item.IsLeave === 0 &&item.IsCheck === 0">状态：<text style="color:#DC3241">正常</text></view>
<view v-if="item.IsLeave === 0 &&item.IsCheck === 1">状态：<text style="color:#F56C6C">缺勤</text></view> <view v-if="item.IsLeave === 0 &&item.IsCheck === 1">状态：<text style="color:#F56C6C">缺勤</text></view>
</view> </view>
<view class="btn-box"> <view class="btn-box">
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
width: 12rpx; width: 12rpx;
height: 12rpx; height: 12rpx;
background-color: #ffffff; background-color: #ffffff;
border: 4rpx solid #0000ff; border: 4rpx solid #DC3241;
border-radius: 50%; border-radius: 50%;
margin-right: 20rpx; margin-right: 20rpx;
} }
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
/deep/.leave-btn { /deep/.leave-btn {
width: 142rpx; width: 142rpx;
height: 52rpx; height: 52rpx;
background-color: #0000ff; background-color: #DC3241;
border-radius: 8rpx; border-radius: 8rpx;
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
/deep/.already-leave-btn { /deep/.already-leave-btn {
width: 142rpx; width: 142rpx;
height: 52rpx; height: 52rpx;
background-color: #0000ff; background-color: #DC3241;
opacity: 0.5; opacity: 0.5;
border-radius: 8rpx; border-radius: 8rpx;
font-size: 26rpx; font-size: 26rpx;
......
src/pages/timetable/timeTable.vue
View file @ 99e90a3d
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<view class="openorclose flex flex_center_center"> <view class="openorclose flex flex_center_center">
<van-divider contentPosition="center" style="width: 90%" v-if="isShowAllDay"> <van-divider contentPosition="center" style="width: 90%" v-if="isShowAllDay">
<van-icon name="arrow-up" size="40rpx" color="#0000ff" @click="changeCalendar" /> <van-icon name="arrow-up" size="40rpx" color="#DC3241" @click="changeCalendar" />
</van-divider> </van-divider>
<van-divider contentPosition="center" style="width: 90%" v-if="!isShowAllDay"> <van-divider contentPosition="center" style="width: 90%" v-if="!isShowAllDay">
<van-icon name="arrow-down" size="40rpx" color="#0000ff" @click="changeCalendar" /> <van-icon name="arrow-down" size="40rpx" color="#DC3241" @click="changeCalendar" />
</van-divider> </van-divider>
</view> </view>
</view> </view>
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
.calendar-active { .calendar-active {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
background-color: rgba(0, 0, 255, 0.9) !important; background-color: rgba(220,50,65, 0.9) !important;
border-radius: 50%; border-radius: 50%;
color: #FFFFFF !important; color: #FFFFFF !important;
} }
......
src/utils/request.js
View file @ 99e90a3d
//请求教育接口 //请求教育接口
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
//host = 'http://localhost:5004/api' //host = 'https://jjswapi.oytour.com/api'
host = 'https://jjswapi.oytour.com/api'
//host = 'http://192.168.10.11:8082/api'
host = 'http://192.168.10.206:5004/api' host = 'http://192.168.10.206:5004/api'
// host = 'http://192.168.10.128:8900/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
......
src/utils/requestErp.js
View file @ 99e90a3d
//请求教育接口 //请求教育接口
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
//host = 'http://localhost:5004/api'
//host = 'https://jjswapi.oytour.com/api' //host = 'https://jjswapi.oytour.com/api'
host = 'http://192.168.10.206:5005/api' host = 'http://192.168.10.206:5005/api'
// host = 'http://192.168.10.36:8082/api' // host = 'http://192.168.10.128:8900/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
......
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