genglw / yxly-teacher · 提交

提交 525086a3f0c712e1e77bb688c0fd8d3e54586a43

作者 wangws
1 个父辈 b89f1c33
构建： 未知

1

内嵌 并排对比
正在显示 4 个修改的文件 包含 18 行增加 和 9 行删除
@@ -5,13 +5,13 @@ module.exports = (vm) => { @@ -5,13 +5,13 @@ module.exports = (vm) => {
5 /* config 为默认全局配置*/ 5 /* config 为默认全局配置*/
6 6
7 // 测试环境 7 // 测试环境
8 - config.baseURL = "http://47.110.250.177:8000"; 8 + // config.baseURL = "http://47.110.250.177:8000";
9 9
10 // 预生产环境 10 // 预生产环境
11 // config.baseURL = "https://api-isxpre.workai.com.cn"; 11 // config.baseURL = "https://api-isxpre.workai.com.cn";
12 12
13 // 线上环境 13 // 线上环境
14 - // config.baseURL = "https://api-isx.workai.com.cn"; 14 + config.baseURL = "https://api-isx.workai.com.cn";
15 15
16 config.header = { 16 config.header = {
17 // 'content-type': 'xxx' 17 // 'content-type': 'xxx'
@@ -37,10 +37,10 @@ @@ -37,10 +37,10 @@
37 申请类型: {{getCategoryList(item.type)}} 37 申请类型: {{getCategoryList(item.type)}}
38 </view> 38 </view>
39 <view class="t2"> 39 <view class="t2">
40 - 开始时间: {{timeFormat(item.formStartTime, 'yyyy-mm-dd hh:MM')}} 40 + 开始时间: {{timeFormat(item.formStartTime, 'yyyy-mm-dd')}}
41 </view> 41 </view>
42 <view class="t2"> 42 <view class="t2">
43 - 结束时间: {{timeFormat(item.formEndTime, 'yyyy-mm-dd hh:MM')}} 43 + 结束时间: {{timeFormat(item.formEndTime, 'yyyy-mm-dd')}}
44 </view> 44 </view>
45 <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;"> 45 <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
46 待处理 46 待处理
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </view> 71 </view>
72 <view class="search"> 72 <view class="search">
73 <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx" 73 <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
74 - bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()"> 74 + bgColor="#F4F4F4" :showAction="true" :clearabled="false" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()" @clear="workSearch()">
75 </u-search> 75 </u-search>
76 </view> 76 </view>
77 <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;" 77 <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="page"> 2 <view class="page">
3 <view class="top"> 3 <view class="top">
4 <view class="title"> 4 <view class="title">
5 - {{detailObj.studentName}}提交的请假申请 5 + {{detailObj.studentName}}提交的实习申请
6 </view> 6 </view>
7 <view class="t1"> 7 <view class="t1">
8 {{detailObj.projectName}} 8 {{detailObj.projectName}}
@@ -33,10 +33,10 @@ @@ -33,10 +33,10 @@
33 </view> 33 </view>
34 <image class="timeline" src="/static/img/home/timeline.png"></image> 34 <image class="timeline" src="/static/img/home/timeline.png"></image>
35 <view class="start"> 35 <view class="start">
36 - {{timeFormat(detailObj.formStartTime,'yyyy-mm-dd hh:MM')}} 36 + {{timeFormat(detailObj.formStartTime,'yyyy-mm-dd')}}
37 </view> 37 </view>
38 <view class="end"> 38 <view class="end">
39 - {{timeFormat(detailObj.formEndTime,'yyyy-mm-dd hh:MM')}} 39 + {{timeFormat(detailObj.formEndTime,'yyyy-mm-dd')}}
40 </view> 40 </view>
41 </view> 41 </view>
42 <!-- <view class="c1" style="margin-top: 16rpx;"> 42 <!-- <view class="c1" style="margin-top: 16rpx;">
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 :show-action="false" v-model="search" focus=true @search="handelLink()"> 5 :show-action="false" v-model="search" focus=true @search="handelLink()">
6 </u-search> --> 6 </u-search> -->
7 <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx" 7 <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
8 - bgColor="#F4F4F4" :showAction="false" shape="round" v-model="search" @search="handelLink()"> 8 + bgColor="#F4F4F4" :showAction="false" shape="round" v-model="search" @search="handelLink()" @clear="clearInput()">
9 </u-search> 9 </u-search>
10 <view style="display: flex; justify-content: space-between; align-items: center; margin-top: 40rpx;"> 10 <view style="display: flex; justify-content: space-between; align-items: center; margin-top: 40rpx;">
11 <view class="title"> 11 <view class="title">
@@ -78,6 +78,15 @@ @@ -78,6 +78,15 @@
78 uni.navigateBack({ 78 uni.navigateBack({
79 delta: 1 79 delta: 1
80 }); 80 });
  81 + },
  82 +
  83 + clearInput() {
  84 + let pages = getCurrentPages();
  85 + let prevPage = pages[pages.length - 2];
  86 + prevPage.$vm.keyword = '';
  87 + uni.navigateBack({
  88 + delta: 1
  89 + });
81 }, 90 },
82 91
83 clear() { 92 clear() {
请 注册 或 登录 后发表评论