genglw / yxly-teacher · 提交

提交 345c6b401db03d79f5eff6b7af815bee80d9d147

作者 guomingshu
1 个父辈 aa884a06
构建： 未知

feat: 主题更换

内嵌 并排对比
正在显示 20 个修改的文件 包含 1938 行增加 和 1869 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 20 of 20+ 个文件。

... ... @@ -7,38 +7,38 @@
7 7 * @LastEditTime: 2022-02-18 14:06:28
8 8 -->
9 9 <template>
10   - <view :style="vuex_theme">
  10 + <view :style="vuex_theme">
11 11 <u-toast ref="uToast" />
12 12 </view>
13 13 </template>
14 14
15   -<script>
  15 +<script>
16 16 import {themeList} from './common/theme.js'
17 17 export default {
18 18 // 此处globalData为了演示其作用，不是uView框架的一部分
19 19 globalData: {
20 20 username: ''
21   - },
22   -
23   - data() {
24   - return {
25   - themeList,
26   - }
  21 + },
  22 +
  23 + data() {
  24 + return {
  25 + themeList,
  26 + }
27 27 },
28 28
29 29 onLaunch() {
30   - let colorObj = this.themeList[this.vuex_appId].value
31   - let styles = ''
32   - for (let i in colorObj) {
33   - styles += colorObj[i].name + ':' + colorObj[i].value + ';'
34   - }
35   -
36   - this.$u.vuex('vuex_theme', styles);
37   - this.$u.vuex('vuex_baseImgUrl', this.themeList[this.vuex_appId].imagePath);
38   - // console.log('vuex_theme----', this.vuex_theme)
39   -
40   - uni.setTabBarStyle({
41   - selectedColor: this.themeList[this.vuex_appId].mainColor,
  30 + let colorObj = this.themeList[this.vuex_appId].value
  31 + let styles = ''
  32 + for (let i in colorObj) {
  33 + styles += colorObj[i].name + ':' + colorObj[i].value + ';'
  34 + }
  35 +
  36 + this.$u.vuex('vuex_theme', styles);
  37 + this.$u.vuex('vuex_baseImgUrl', this.themeList[this.vuex_appId].imagePath);
  38 + // console.log('vuex_theme----', this.vuex_theme)
  39 +
  40 + uni.setTabBarStyle({
  41 + selectedColor: 'var(--primary-color)',
42 42 })
43 43 },
44 44
... ... @@ -57,4 +57,4 @@
57 57 /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
58 58 @import "@/uni_modules/uview-ui/index.scss";
59 59 @import '@/static/css/icon.css';
60   -</style>
  60 +</style>
... ...
1 1 const themeList = {
2   - // 优学乐业 - 教师
3   - 'wx6cd2152282abd34c': {
4   - value: [
  2 + // 优学乐业 - 教师
  3 + 'wx6cd2152282abd34c': {
  4 + value: [
5 5 {name:'--primary-color',value: '#0CB17A'},
6 6 {name:'--primary-color000',value: '#1CD9B2'},
7 7 {name:'--primary-color100',value: 'rgba(12, 177, 122, 1)'},
8 8 {name:'--primary-color02',value: 'rgba(12, 177, 122, 0.2)'},
9 9 {name:'--primary-color03',value: 'rgba(12, 177, 122, 0.3)'},
10 10 {name:'--primary-color003',value: 'rgba(12, 177, 122, 0.03)'},
11   - {name:'--primary-color006',value: 'rgba(12, 177, 122, 0.06)'},
  11 + {name:'--primary-color006',value: 'rgba(12, 177, 122, 0.06)'},
12 12 ],
13   - mainColor: '#0CB17A',
14   - imagePath: 'https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/new-teacher/wx6cd2152282abd34c/'
  13 + imagePath: 'https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/wx6cd2152282abd34c/'
15 14 },
16 15 // 新华网 - 教师
17   - 'wx123123': {
  16 + 'xhwttheme': {
18 17 value: [
19 18 {name:'--primary-color',value: '#005DAC'},
20 19 {name:'--primary-color000',value: '#005DAC'},
... ... @@ -24,11 +23,10 @@ const themeList = {
24 23 {name:'--primary-color003',value: 'rgba(0, 93, 172, 0.03)'},
25 24 {name:'--primary-color006',value: 'rgba(0, 93, 172, 0.06)'},
26 25 ],
27   - mainColor: '#005DAC',
28   - imagePath: 'https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/new-teacher/wx123123/'
29   - }
  26 + imagePath: 'https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/xhwttheme/'
  27 + }
30 28 }
31 29
32   -module.exports = {
33   - themeList
  30 +module.exports = {
  31 + themeList
34 32 }
\ No newline at end of file
... ...
  1 +<template>
  2 + <view>
  3 + <u-tabbar
  4 + :value="vuex_tabbar_index"
  5 + :fixed="true"
  6 + :safeAreaInsetBottom="true"
  7 + :placeholder="true"
  8 + :activeColor="vuex_active_color"
  9 + >
  10 + <u-tabbar-item
  11 + v-for="(tabbarItem, index) in vuex_tabbar"
  12 + :key="index"
  13 + :text="tabbarItem.text"
  14 + @click="switchTo()"
  15 + >
  16 + <image
  17 + class="image_class"
  18 + slot="active-icon"
  19 + :src="tabbarItem.selectedIconPath"
  20 + ></image>
  21 + <image
  22 + class="image_class"
  23 + slot="inactive-icon"
  24 + :src="tabbarItem.iconPath"
  25 + ></image>
  26 + </u-tabbar-item>
  27 + </u-tabbar>
  28 + </view>
  29 +</template>
  30 +
  31 +<script>
  32 +import { mapState } from "vuex";
  33 +export default {
  34 + name: "custom-tabbar",
  35 + data() {
  36 + return {
  37 + tabbar: [], // tabbar信息
  38 + };
  39 + },
  40 + // 自定义组件中属性
  41 + props: ["activeColor"],
  42 + created() {
  43 + // 模拟调用服务端接口,显示首页和我的页面
  44 + // if (this.tabbarState == 1) {
  45 + // const storeTabbar = this.vuex_tabbar;
  46 + // this.tabbar = this.tabbar.concat(storeTabbar[0]).concat(storeTabbar[2]);
  47 + // }
  48 + // // 模拟调用服务端接口,显示首页、消息和我的页面
  49 + // if (this.tabbarState == 2) {
  50 + // this.tabbar = this.vuex_tabbar;
  51 + // }
  52 + // this.tabbar = this.vuex_tabbar;
  53 + },
  54 + methods: {
  55 + // 页面跳转
  56 + switchTo(event) {
  57 + const _this = this
  58 + wx.switchTab({
  59 + url: this.vuex_tabbar[event].pagePath,
  60 + success: () => {
  61 + this.$u.vuex('vuex_tabbar_index', event);
  62 + },
  63 + });
  64 + },
  65 + },
  66 +};
  67 +</script>
  68 +
  69 +<style lang="scss">
  70 +.image_class {
  71 + width: 50rpx;
  72 + height: 50rpx;
  73 +}
  74 +</style>
... ...
... ... @@ -13,9 +13,9 @@
13 13 },
14 14 "pages": [{
15 15 "path": "pages/tabBar/home/home",
16   - "style": {
17   - "navigationStyle": "custom",
18   - "navigationBarTitleText": ""
  16 + "style": {
  17 + "navigationStyle": "custom",
  18 + "navigationBarTitleText": ""
19 19 }
20 20 },
21 21 {
... ... @@ -25,13 +25,13 @@
25 25 "navigationBarTextStyle": "black",
26 26 "enablePullDownRefresh": false
27 27 }
28   - },
29   - {
30   - "path": "pages/tabBar/message/message",
31   - "style": {
32   - "navigationBarTextStyle": "black",
33   - "navigationBarTitleText": "消息"
34   - }
  28 + },
  29 + {
  30 + "path": "pages/tabBar/message/message",
  31 + "style": {
  32 + "navigationBarTextStyle": "black",
  33 + "navigationBarTitleText": "消息"
  34 + }
35 35 },
36 36 {
37 37 "path": "pages/tabBar/my/my",
... ... @@ -127,53 +127,53 @@
127 127 "navigationBarTitleText": "成绩鉴定",
128 128 "enablePullDownRefresh": false
129 129 }
130   - },{
131   - "path": "asklist/asklist",
132   - "style": {
133   - "navigationBarTitleText": "请假审批",
134   - "enablePullDownRefresh": false
135   - }
136   -
137   - },{
138   - "path": "askdetail/askdetail",
139   - "style": {
140   - "navigationBarTitleText": "详情",
141   - "enablePullDownRefresh": false
142   - }
143   -
144   - }, {
145   - "path": "changelist/changelist",
146   - "style": {
147   - "navigationBarTitleText": "实习变更",
148   - "enablePullDownRefresh": false
149   - }
150   -
151   - }, {
152   - "path": "changedetail/changedetail",
153   - "style": {
154   - "navigationBarTitleText": "详情",
155   - "enablePullDownRefresh": false
156   - }
157   -
158   - }, {
159   - "path": "search/search",
160   - "style": {
161   - "navigationBarTitleText": "搜索",
162   - "enablePullDownRefresh": false
163   - }
164   -
165   - }, {
166   - "path": "interapply/interapply",
167   - "style": {
168   - "navigationBarTitleText": "实习申请",
169   - "enablePullDownRefresh": false
170   - }
171   - }, {
172   - "path": "interapplydetail/interapplydetail",
173   - "style": {
174   - "navigationBarTitleText": "实习申请",
175   - "enablePullDownRefresh": false
176   - }
  130 + },{
  131 + "path": "asklist/asklist",
  132 + "style": {
  133 + "navigationBarTitleText": "请假审批",
  134 + "enablePullDownRefresh": false
  135 + }
  136 +
  137 + },{
  138 + "path": "askdetail/askdetail",
  139 + "style": {
  140 + "navigationBarTitleText": "详情",
  141 + "enablePullDownRefresh": false
  142 + }
  143 +
  144 + }, {
  145 + "path": "changelist/changelist",
  146 + "style": {
  147 + "navigationBarTitleText": "实习变更",
  148 + "enablePullDownRefresh": false
  149 + }
  150 +
  151 + }, {
  152 + "path": "changedetail/changedetail",
  153 + "style": {
  154 + "navigationBarTitleText": "详情",
  155 + "enablePullDownRefresh": false
  156 + }
  157 +
  158 + }, {
  159 + "path": "search/search",
  160 + "style": {
  161 + "navigationBarTitleText": "搜索",
  162 + "enablePullDownRefresh": false
  163 + }
  164 +
  165 + }, {
  166 + "path": "interapply/interapply",
  167 + "style": {
  168 + "navigationBarTitleText": "实习申请",
  169 + "enablePullDownRefresh": false
  170 + }
  171 + }, {
  172 + "path": "interapplydetail/interapplydetail",
  173 + "style": {
  174 + "navigationBarTitleText": "实习申请",
  175 + "enablePullDownRefresh": false
  176 + }
177 177 }
178 178 ]
179 179 },
... ... @@ -195,85 +195,85 @@
195 195
196 196 } ,{
197 197 "path" : "agreementList/agreementList",
198   - "style" :
199   - {
200   - "navigationBarTitleText": "三方协议",
201   - "enablePullDownRefresh": false
202   - }
  198 + "style" :
  199 + {
  200 + "navigationBarTitleText": "三方协议",
  201 + "enablePullDownRefresh": false
  202 + }
203 203
204 204 }
205 205 ,{
206 206 "path" : "agreementDetail/agreementDetail",
207   - "style" :
208   - {
209   - "navigationBarTitleText": "协议详情",
210   - "enablePullDownRefresh": false
211   - }
  207 + "style" :
  208 + {
  209 + "navigationBarTitleText": "协议详情",
  210 + "enablePullDownRefresh": false
  211 + }
212 212
213 213 }
214 214 ,{
215 215 "path" : "signInList/signInList",
216   - "style" :
217   - {
218   - "navigationBarTitleText": "签到",
219   - "enablePullDownRefresh": false
220   - }
  216 + "style" :
  217 + {
  218 + "navigationBarTitleText": "签到",
  219 + "enablePullDownRefresh": false
  220 + }
221 221
222 222 }
223 223 ,{
224 224 "path" : "intershipInfo/intershipInfo",
225   - "style" :
226   - {
227   - "navigationBarTitleText": "实习单详情",
228   - "enablePullDownRefresh": false
229   - }
  225 + "style" :
  226 + {
  227 + "navigationBarTitleText": "实习单详情",
  228 + "enablePullDownRefresh": false
  229 + }
230 230
231 231 }
232 232 ,{
233 233 "path" : "achievementDetail/achievementDetail",
234   - "style" :
235   - {
236   - "navigationBarTitleText": "成绩详情",
237   - "enablePullDownRefresh": false
238   - }
  234 + "style" :
  235 + {
  236 + "navigationBarTitleText": "成绩详情",
  237 + "enablePullDownRefresh": false
  238 + }
239 239
240 240 }
241 241 ,{
242 242 "path" : "studentLogReview/studentLogReview",
243   - "style" :
244   - {
245   - "navigationBarTitleText": "",
246   - "enablePullDownRefresh": false
247   - }
  243 + "style" :
  244 + {
  245 + "navigationBarTitleText": "",
  246 + "enablePullDownRefresh": false
  247 + }
248 248
249   - },{
250   - "path" : "traineeInterList/traineeInterList",
251   - "style" :
252   - {
253   - "navigationBarTitleText": "实习信息",
254   - "enablePullDownRefresh": false
255   - }
  249 + },{
  250 + "path" : "traineeInterList/traineeInterList",
  251 + "style" :
  252 + {
  253 + "navigationBarTitleText": "实习信息",
  254 + "enablePullDownRefresh": false
  255 + }
256 256 }
257 257 ]
258   - },
259   - {
260   - "root": "pages/main/message",
261   - "pages": [{
262   - "path": "message-list/message-list",
263   - "style": {
264   - "navigationBarTitleText": "公告列表",
265   - "navigationBarTextStyle": "black",
266   - "enablePullDownRefresh": false
267   - }
268   - }, {
269   - "path": "message-detail/message-detail",
270   - "style": {
271   - "navigationBarTitleText": "公告详情",
272   - "navigationBarTextStyle": "black",
273   - "enablePullDownRefresh": false
274   - }
275   -
276   - }]
  258 + },
  259 + {
  260 + "root": "pages/main/message",
  261 + "pages": [{
  262 + "path": "message-list/message-list",
  263 + "style": {
  264 + "navigationBarTitleText": "公告列表",
  265 + "navigationBarTextStyle": "black",
  266 + "enablePullDownRefresh": false
  267 + }
  268 + }, {
  269 + "path": "message-detail/message-detail",
  270 + "style": {
  271 + "navigationBarTitleText": "公告详情",
  272 + "navigationBarTextStyle": "black",
  273 + "enablePullDownRefresh": false
  274 + }
  275 +
  276 + }]
277 277 },
278 278 {
279 279 "root": "pages/main/my",
... ... @@ -385,17 +385,17 @@
385 385
386 386 }
387 387 ]
388   - },
389   - {
390   - "root": "pages/common",
391   - "pages": [{
392   - "path": "webview/webview",
393   - "style": {
394   - "navigationBarTitleText": "",
395   - "enablePullDownRefresh": false
396   - }
397   - }
398   - ]
  388 + },
  389 + {
  390 + "root": "pages/common",
  391 + "pages": [{
  392 + "path": "webview/webview",
  393 + "style": {
  394 + "navigationBarTitleText": "",
  395 + "enablePullDownRefresh": false
  396 + }
  397 + }
  398 + ]
399 399 }
400 400 ],
401 401
... ... @@ -418,23 +418,24 @@
418 418 "borderStyle": "black",
419 419 "height": "100rpx",
420 420 "fontSize": "40rpx",
  421 + "custom": true,
421 422 "list": [{
422 423 "pagePath": "pages/tabBar/home/home",
423 424 "iconPath": "/static/img/icon/home.png",
424 425 "selectedIconPath": "/static/img/icon/homeHL.png",
425   - "text": "首页"
  426 + "text": "首2页"
426 427 },
427 428 {
428 429 "pagePath": "pages/tabBar/internship/internship",
429 430 "iconPath": "/static/img/icon/internship.png",
430 431 "selectedIconPath": "/static/img/icon/internshipHL.png",
431 432 "text": "实习生"
432   - },
433   - {
434   - "pagePath": "pages/tabBar/message/message",
435   - "iconPath": "/static/img/icon/icon_message.png",
436   - "selectedIconPath": "/static/img/icon/icon_messageHL.png",
437   - "text": "消息"
  433 + },
  434 + {
  435 + "pagePath": "pages/tabBar/message/message",
  436 + "iconPath": "/static/img/icon/message.png",
  437 + "selectedIconPath": "/static/img/icon/messageHL.png",
  438 + "text": "消息"
438 439 },
439 440 {
440 441 "pagePath": "pages/tabBar/my/my",
... ... @@ -444,4 +445,4 @@
444 445 }
445 446 ]
446 447 }
447   -}
  448 +}
... ...
... ... @@ -392,25 +392,25 @@
392 392 // _this.uploadInfos();
393 393 // } else {}
394 394 // console.log('_this.ossInit...', _this.ossInit)
395   - let formdata = {}
396   - if (this.ossInit.uploadType == 'minio') {
397   - formdata = {
398   - 'bucket': _this.ossInit.bucket,
399   - 'dir': _this.ossInit.dir,
400   - 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
401   - 'accessId': _this.ossInit.accessId,
402   - 'policy': _this.ossInit.policy
403   - }
404   - }else {
405   - formdata = {
406   - 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
407   - // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
408   - 'action': `${_this.ossInit.host}`,
409   - 'OSSAccessKeyId': _this.ossInit.accessId,
410   - 'policy': _this.ossInit.policy,
411   - 'signature': _this.ossInit.signature,
412   - 'callback': _this.ossInit.callback,
413   - }
  395 + let formdata = {}
  396 + if (this.ossInit.uploadType == 'minio') {
  397 + formdata = {
  398 + 'bucket': _this.ossInit.bucket,
  399 + 'dir': _this.ossInit.dir,
  400 + 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  401 + 'accessId': _this.ossInit.accessId,
  402 + 'policy': _this.ossInit.policy
  403 + }
  404 + }else {
  405 + formdata = {
  406 + 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  407 + // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
  408 + 'action': `${_this.ossInit.host}`,
  409 + 'OSSAccessKeyId': _this.ossInit.accessId,
  410 + 'policy': _this.ossInit.policy,
  411 + 'signature': _this.ossInit.signature,
  412 + 'callback': _this.ossInit.callback,
  413 + }
414 414 }
415 415 return new Promise((resolve, reject) => {
416 416 var gapLength = this.picList.length - this.attachments.length
... ... @@ -448,34 +448,34 @@
448 448
449 449 // }
450 450 // console.log("uploadFiles...", this.fileList, this.attachmentsFile)
451   - let formdata = {}
452   - if (this.ossInit.uploadType == 'minio') {
453   - formdata = {
454   - 'bucket': _this.ossInit.bucket,
455   - 'dir': _this.ossInit.dir,
456   - 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
457   - 'accessId': _this.ossInit.accessId,
458   - 'policy': _this.ossInit.policy
459   - }
460   - }else {
461   - formdata = {
462   - 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
463   - // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
464   - 'action': `${_this.ossInit.host}`,
465   - 'OSSAccessKeyId': _this.ossInit.accessId,
466   - 'policy': _this.ossInit.policy,
467   - 'signature': _this.ossInit.signature,
468   - 'callback': _this.ossInit.callback,
469   - }
470   - }
  451 + let formdata = {}
  452 + if (this.ossInit.uploadType == 'minio') {
  453 + formdata = {
  454 + 'bucket': _this.ossInit.bucket,
  455 + 'dir': _this.ossInit.dir,
  456 + 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  457 + 'accessId': _this.ossInit.accessId,
  458 + 'policy': _this.ossInit.policy
  459 + }
  460 + }else {
  461 + formdata = {
  462 + 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  463 + // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
  464 + 'action': `${_this.ossInit.host}`,
  465 + 'OSSAccessKeyId': _this.ossInit.accessId,
  466 + 'policy': _this.ossInit.policy,
  467 + 'signature': _this.ossInit.signature,
  468 + 'callback': _this.ossInit.callback,
  469 + }
  470 + }
471 471 return new Promise((resolve, reject) => {
472 472 var gapLength = this.fileList.length - this.attachmentsFile.length
473   - for (var i = 0; i < gapLength; i++) {
474   - let item = _this.fileList[_this.fileList.length - gapLength + i]
475   - if (this.ossInit.uploadType == 'minio') {
476   - formdata.fileName = `${_this.ossInit.dir}${new Date().getTime()}/` + item.name
477   - }else {
478   - formdata.key = `${_this.ossInit.dir}${new Date().getTime()}/` + item.name
  473 + for (var i = 0; i < gapLength; i++) {
  474 + let item = _this.fileList[_this.fileList.length - gapLength + i]
  475 + if (this.ossInit.uploadType == 'minio') {
  476 + formdata.fileName = `${_this.ossInit.dir}${new Date().getTime()}/` + item.name
  477 + }else {
  478 + formdata.key = `${_this.ossInit.dir}${new Date().getTime()}/` + item.name
479 479 }
480 480 uni.uploadFile({
481 481 url: _this.ossInit.host,
... ... @@ -809,4 +809,4 @@
809 809 }
810 810 }
811 811 }
812   -</style>
  812 +</style>
... ...
... ... @@ -37,11 +37,11 @@
37 37 <view class="t2 t2top14">
38 38 实习项目: {{item.form.projectName?item.form.projectName:'--'}}
39 39 </view>
40   - <view class="t2">
41   - 指导老师: {{item.form.teacherName?item.form.teacherName:'--'}}
42   - </view>
43   - <view class="t2">
44   - 变更次数: {{item.formChangeApplyCount}}
  40 + <view class="t2">
  41 + 指导老师: {{item.form.teacherName?item.form.teacherName:'--'}}
  42 + </view>
  43 + <view class="t2">
  44 + 变更次数: {{item.formChangeApplyCount}}
45 45 </view>
46 46 <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
47 47 待鉴定
... ... @@ -81,7 +81,7 @@
81 81 {{item.name}}
82 82 </view>
83 83 <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
84   - src="/static/img/home/popselect.png" mode=""></image>
  84 + :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
85 85 </view>
86 86 </view>
87 87 </scroll-view>
... ... @@ -192,7 +192,7 @@
192 192
193 193 handelDetail(record) {
194 194 this.$u.route({
195   - // url: `pages/main/home/achievementDetail/achievementDetail?&id=${record.id}`
  195 + // url: `pages/main/home/achievementDetail/achievementDetail?&id=${record.id}`
196 196 url: `pages/main/home/achievementMid/achievementMid?&id=${record.id}`
197 197 })
198 198 },
... ... @@ -378,7 +378,7 @@
378 378 color: rgba(38, 41, 47, 0.85);
379 379 }
380 380
381   - .t3 {
  381 + .t3 {
382 382 margin-top: 2px;
383 383 font-size: 12px;
384 384 font-family: PingFangSC-Light, PingFang SC;
... ... @@ -542,4 +542,4 @@
542 542
543 543 }
544 544 }
545   -</style>
  545 +</style>
... ...
1   -<template>
2   - <view class="page" :style="vuex_theme">
  1 +<template>
  2 + <view class="page" :style="vuex_theme">
3 3 <view class="item">
4 4 <view style="display: flex; align-items: baseline;">
5 5 <view class="t1">
... ... @@ -24,14 +24,14 @@
24 24 <view v-else class="status" style="color: var(--primary-color);">
25 25 已鉴定
26 26 </view>
27   - </view>
  27 + </view>
28 28 <view style="background-color: #fff; margin-top: 20rpx; padding-left: 10px;">
29 29 <u-tabs :list="menu_list" lineWidth="30rpx" lineHeight="4rpx" lineColor="var(--primary-color)"
30 30 :inactiveStyle="{fontSize:'32rpx', color:'#4A4A53'}"
31 31 :activeStyle="{fontSize:'32rpx', color:'var(--primary-color)'}" @click="click">
32   - </u-tabs>
33   - </view>
34   - <view v-if="current==0">
  32 + </u-tabs>
  33 + </view>
  34 + <view v-if="current==0">
35 35 <view class="current1">
36 36 <view class="content">
37 37 <view class="cj_left">
... ... @@ -90,13 +90,11 @@
90 90 <view class="list list_item_top">
91 91 <text class="item1">评语：</text>
92 92 <text class="item2">{{detailObj.studentComment}}</text>
93   - <!-- <text class="item2">12321312390128390218309809sda890asd809s0a9d8a90sd8a90asd809asd89asd890as8d9</text> -->
94 93 </view>
95 94 <view class="listflex list_item_top">
96 95 <text class="item1">附件：</text>
97 96 <view class="list_flex_right">
98 97 <view class="pdffj" v-for="(item,index) in stuattachmentsFile " @click="openLink(item)">
99   - <!-- <image class="img" src="/static/img/common/link.png"></image> -->
100 98 <text class="look">{{item.filename}}</text>
101 99 </view>
102 100 </view>
... ... @@ -130,7 +128,6 @@
130 128 <text class="item1">附件：</text>
131 129 <view class="list_flex_right">
132 130 <view class="pdffj" v-for="(item,index) in comattachmentsFile " @click="openLink(item)">
133   - <!-- <image class="img" src="/static/img/common/link.png"></image> -->
134 131 <text class="look">{{item.filename}}</text>
135 132 </view>
136 133 </view>
... ... @@ -156,7 +153,6 @@
156 153 <text class="item1">附件：</text>
157 154 <view class="list_flex_right">
158 155 <view class="pdffj" v-for="(item,index) in schattachmentsFile " @click="openLink(item)">
159   - <!-- <image class="img" src="/static/img/common/link.png"></image> -->
160 156 <text class="look">{{item.filename}}</text>
161 157 </view>
162 158 </view>
... ... @@ -168,8 +164,8 @@
168 164 <view v-if="detailObj.status == 'wait'" class="botBtnV_centralize">
169 165 <view class="botBtn" @click="submit()">成绩鉴定</view>
170 166 </view>
171   - </view>
172   - </view>
  167 + </view>
  168 + </view>
173 169 <view v-else>
174 170 <view class="current2">
175 171 <view v-if="list.length > 0" >
... ... @@ -198,68 +194,68 @@
198 194 </view>
199 195 <view v-else style="width: 100%; height: 100%;">
200 196 <view style="margin: 150px auto 0; width: 187px;height: 110px;">
201   - <image style="width: 187px;height: 110px;" :src="'/static/img/home/nodata.png'"></image>
  197 + <image style="width: 187px;height: 110px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}nodata.png`"></image>
202 198 </view>
203 199 <view style="width: 100%; margin-top: 10px; text-align: center; font-size: 13px; color: #121212;">暂无数据</view>
204 200 </view>
205   - </view>
206   - </view>
207   - </view>
208   -</template>
209   -
210   -<script>
211   - import {
212   - scoredetailUrl,
  201 + </view>
  202 + </view>
  203 + </view>
  204 +</template>
  205 +
  206 +<script>
  207 + import {
  208 + scoredetailUrl,
213 209 getImgUrlApi,
214   - scoreinternshipInfoUrl
  210 + scoreinternshipInfoUrl
215 211 } from '@/config/api.js';
216   - import listMixin from "@/common/mixins/list-mixin.js";
217   -
  212 + import listMixin from "@/common/mixins/list-mixin.js";
  213 +
218 214 export default {
219   - mixins: [listMixin],
220   - data() {
221   - return {
222   - id: '',
223   - detailObj: {},
224   - menu_list: [{
225   - name: '实习成绩'
226   - }, {
227   - name: '实习信息'
228   - }],
  215 + mixins: [listMixin],
  216 + data() {
  217 + return {
  218 + id: '',
  219 + detailObj: {},
  220 + menu_list: [{
  221 + name: '实习成绩'
  222 + }, {
  223 + name: '实习信息'
  224 + }],
229 225 current: 0,
230 226 stuattachmentsFile: [],
231 227 comattachmentsFile: [],
232 228 schattachmentsFile: [],
233   - list: []
234   - }
235   - },
236   -
237   - onLoad(e) {
238   - console.log(e)
  229 + list: []
  230 + }
  231 + },
  232 +
  233 + onLoad(e) {
  234 + console.log(e)
239 235 this.id = e.id
240 236
241 237 this.finished = false;
242 238 this.loading = "loadmore";
243 239 this.page = 0;
244 240 this.list = [];
245   - this._getList();
246   - },
247   -
248   - onShow() {
249   - this.loadData()
250   - },
251   -
252   - methods: {
253   - loadData() {
254   - scoredetailUrl(this.id).then(res => {
255   - if (res) {
  241 + this._getList();
  242 + },
  243 +
  244 + onShow() {
  245 + this.loadData()
  246 + },
  247 +
  248 + methods: {
  249 + loadData() {
  250 + scoredetailUrl(this.id).then(res => {
  251 + if (res) {
256 252 this.detailObj = res;
257 253 this.detailObj.form.endTime = this.timeFormat(this.detailObj.form.endTime,'yyyy-mm-dd')
258 254 this.stuhandleDataspdf()
259 255 this.comhandleDataspdf()
260   - this.schhandleDataspdf()
261   - }
262   - })
  256 + this.schhandleDataspdf()
  257 + }
  258 + })
263 259 },
264 260
265 261 timeFormat(timestamp, format = 'yyyy-mm-dd hh:MM') {
... ... @@ -429,21 +425,21 @@
429 425 }
430 426
431 427 uni.hideLoading();
432   - },
433   - }
434   - }
435   -</script>
436   -
437   -<style>
438   - page {
439   - background-color: #F7F7F7;
440   - }
441   -</style>
442   -
443   -<style lang="scss" scoped>
444   - .page {
445   - width: 100%;
446   -
  428 + },
  429 + }
  430 + }
  431 +</script>
  432 +
  433 +<style>
  434 + page {
  435 + background-color: #F7F7F7;
  436 + }
  437 +</style>
  438 +
  439 +<style lang="scss" scoped>
  440 + .page {
  441 + width: 100%;
  442 +
447 443 .item {
448 444 position: relative;
449 445 padding: 20px;
... ... @@ -484,7 +480,7 @@
484 480 font-family: PingFangSC-Regular, PingFang SC;
485 481 font-weight: 400;
486 482 }
487   - }
  483 + }
488 484
489 485 .current1 {
490 486 padding: 10px;
... ... @@ -721,6 +717,6 @@
721 717 color: var(--primary-color);
722 718 }
723 719 }
724   - }
725   - }
  720 + }
  721 + }
726 722 </style>
... ...
1 1 <template>
2 2 <view class="report_detail">
3 3 <view class="list_box" v-if="list.length > 0">
4   - <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
5   -
6   - <view class="bg_image" v-if="item.status == 'stay_examine'">
7   - <u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
8   - <text>待审核</text>
9   - </view>
10   -
11   - <view class="bg_image" v-else-if="item.status == 'adopt'">
12   - <u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
13   - <text>已通过</text>
14   - </view>
15   -
16   - <view class="bg_image" v-else>
17   - <u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
18   - <text>已退回</text>
  4 + <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
  5 +
  6 + <view class="bg_image" v-if="item.status == 'stay_examine'">
  7 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
  8 + <text>待审核</text>
  9 + </view>
  10 +
  11 + <view class="bg_image" v-else-if="item.status == 'adopt'">
  12 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
  13 + <text>已通过</text>
  14 + </view>
  15 +
  16 + <view class="bg_image" v-else>
  17 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
  18 + <text>已退回</text>
19 19 </view>
20 20
21 21 <view class="info">
22   - <u-image src="/static/img/home/approvalRecordBg.png" width="94rpx" height="94rpx" />
  22 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}approvalRecordBg.png`" width="94rpx" height="94rpx" />
23 23 <view class="title_name">
24 24 <view class="title">
25 25 {{item.title}}
26 26 </view>
27 27 <view class="time">
28   -
29   - <text>创建时间</text>
30   - <text>
31   - {{timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')}}
  28 +
  29 + <text>创建时间</text>
  30 + <text>
  31 + {{timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')}}
32 32 </text>
33 33 </view>
34 34 </view>
... ... @@ -77,16 +77,16 @@
77 77 })
78 78 },
79 79
80   - methods: {
81   -
82   - timeFormat(timestamp, format = 'yyyy-mm-dd') {
83   - return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
84   - },
85   -
86   - handelDetail(record) {
87   - this.$u.route({
88   - url: `pages/main/home/reportDetail/reportDetail?id=${record.id}&formId=${record.formId}`
89   - })
  80 + methods: {
  81 +
  82 + timeFormat(timestamp, format = 'yyyy-mm-dd') {
  83 + return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
  84 + },
  85 +
  86 + handelDetail(record) {
  87 + this.$u.route({
  88 + url: `pages/main/home/reportDetail/reportDetail?id=${record.id}&formId=${record.formId}`
  89 + })
90 90 },
91 91 }
92 92 }
... ... @@ -156,4 +156,4 @@
156 156 }
157 157 }
158 158 }
159   -</style>
  159 +</style>
... ...
... ... @@ -279,10 +279,10 @@
279 279 }
280 280 </script>
281 281
282   -<style>
283   - page {
284   - background-color: #F7F7F7;
285   - }
  282 +<style>
  283 + page {
  284 + background-color: #F7F7F7;
  285 + }
286 286 </style>
287 287
288 288 <style lang="scss" scoped>
... ...
... ... @@ -14,45 +14,45 @@
14 14 <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
15 15 bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
16 16 </u-search>
17   - </view> -->
18   - <view style="width: 148px;">
19   - <u-subsection :list="['待处理','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
20   - </view>
21   - <view style="display: flex; justify-content: space-between; align-items: center;">
22   - <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
23   - <view style="width: 16px;"></view>
24   - <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
  17 + </view> -->
  18 + <view style="width: 148px;">
  19 + <u-subsection :list="['待处理','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
  20 + </view>
  21 + <view style="display: flex; justify-content: space-between; align-items: center;">
  22 + <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
  23 + <view style="width: 16px;"></view>
  24 + <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
25 25 </view>
26 26 </view>
27 27
28 28 <view class="list_box" v-if="list.length > 0">
29 29 <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
30   - <view class="t1">
31   - {{item.studentName}}提交的请假申请
32   - </view>
33   - <view class="t3">
34   - {{item.projectName}}
35   - </view>
36   - <view class="t2 t2top14">
37   - 请假类型: {{getCategoryList(item.category)}}
38   - </view>
39   - <view class="t2">
40   - 开始时间: {{timeFormat(item.startTime, 'yyyy-mm-dd hh:MM')}}
41   - </view>
42   - <view class="t2">
43   - 结束时间: {{timeFormat(item.endTime, 'yyyy-mm-dd hh:MM')}}
44   - </view>
45   - <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
46   - 待处理
47   - </view>
48   - <view v-else-if="item.status == 'pass'" class="status" style="color: var(--primary-color);">
49   - 已通过
50   - </view>
51   - <view v-else-if="item.status == 'reject'" class="status" style="color: red;">
52   - 已驳回
53   - </view>
54   - <view class="time">
55   - {{timeFormat(item.createdTime, 'mm-dd')}}
  30 + <view class="t1">
  31 + {{item.studentName}}提交的请假申请
  32 + </view>
  33 + <view class="t3">
  34 + {{item.projectName}}
  35 + </view>
  36 + <view class="t2 t2top14">
  37 + 请假类型: {{getCategoryList(item.category)}}
  38 + </view>
  39 + <view class="t2">
  40 + 开始时间: {{timeFormat(item.startTime, 'yyyy-mm-dd hh:MM')}}
  41 + </view>
  42 + <view class="t2">
  43 + 结束时间: {{timeFormat(item.endTime, 'yyyy-mm-dd hh:MM')}}
  44 + </view>
  45 + <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
  46 + 待处理
  47 + </view>
  48 + <view v-else-if="item.status == 'pass'" class="status" style="color: var(--primary-color);">
  49 + 已通过
  50 + </view>
  51 + <view v-else-if="item.status == 'reject'" class="status" style="color: red;">
  52 + 已驳回
  53 + </view>
  54 + <view class="time">
  55 + {{timeFormat(item.createdTime, 'mm-dd')}}
56 56 </view>
57 57 </view>
58 58 <c-loading :loading="loading"></c-loading>
... ... @@ -60,38 +60,38 @@
60 60 <view v-else class="no_data">
61 61 <c-no-data></c-no-data>
62 62 </view>
63   -
64   - <u-popup :show="show" mode="bottom" @close="close" :round="22">
65   - <view class="popup">
66   - <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
67   - <view class="title">
68   - 项目筛选
69   - </view>
70   - <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
71   - </view>
72   - <view class="search">
73   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
74   - bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
75   - </u-search>
76   - </view>
77   - <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
78   - @scrolltolower="lower()">
79   - <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
80   - <view style="display: flex; align-items: center; justify-content: space-between;">
81   - <view class="item_title">
82   - {{item.name}}
83   - </view>
84   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
85   - </view>
86   - </view>
87   - </scroll-view>
88   - <view v-else class="no_data" @click="jumpVerified">
89   - <view class="text_black_28">
90   - 暂未搜索到该项目
91   - </view>
92   - </view>
93   - </view>
94   - </u-popup>
  63 +
  64 + <u-popup :show="show" mode="bottom" @close="close" :round="22">
  65 + <view class="popup">
  66 + <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
  67 + <view class="title">
  68 + 项目筛选
  69 + </view>
  70 + <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
  71 + </view>
  72 + <view class="search">
  73 + <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  74 + bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
  75 + </u-search>
  76 + </view>
  77 + <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
  78 + @scrolltolower="lower()">
  79 + <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
  80 + <view style="display: flex; align-items: center; justify-content: space-between;">
  81 + <view class="item_title">
  82 + {{item.name}}
  83 + </view>
  84 + <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  85 + </view>
  86 + </view>
  87 + </scroll-view>
  88 + <view v-else class="no_data" @click="jumpVerified">
  89 + <view class="text_black_28">
  90 + 暂未搜索到该项目
  91 + </view>
  92 + </view>
  93 + </view>
  94 + </u-popup>
95 95
96 96 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
97 97 <view class="popup_search">
... ... @@ -164,28 +164,28 @@
164 164
165 165 },
166 166 projectId: '',
167   - switchValue: false,
168   - categoryList: [{
169   - label: '事假',
170   - value: 'personal'
171   - },
172   - {
173   - label: '病假',
174   - value: "sick",
175   - },
176   - {
177   - label: '调休',
178   - value: "exchange",
179   - },
180   - {
181   - label: '其他',
182   - value: "other",
183   - }
184   - ],
185   - curNow: 1,
186   - sxsearch: '',
187   - works: [],
188   - workspage: 1,
  167 + switchValue: false,
  168 + categoryList: [{
  169 + label: '事假',
  170 + value: 'personal'
  171 + },
  172 + {
  173 + label: '病假',
  174 + value: "sick",
  175 + },
  176 + {
  177 + label: '调休',
  178 + value: "exchange",
  179 + },
  180 + {
  181 + label: '其他',
  182 + value: "other",
  183 + }
  184 + ],
  185 + curNow: 1,
  186 + sxsearch: '',
  187 + works: [],
  188 + workspage: 1,
189 189 workstotal: 0,
190 190 }
191 191 },
... ... @@ -194,14 +194,14 @@
194 194 console.log(option)
195 195 // this.$store.dispatch(`home/getProjectList`, {
196 196 // pageSize: -1,
197   - // })
198   -
  197 + // })
  198 +
199 199 this.worksloadData()
200 200
201 201 // this.search.keySearch = '';
202 202
203 203 if (option && option.status) {
204   - // this.search.status = 'wait';
  204 + // this.search.status = 'wait';
205 205 this.curNow = 0;
206 206 // this.checkboxValue = ['待处理'];
207 207 // this.switchValue = true;
... ... @@ -209,10 +209,10 @@
209 209
210 210 },
211 211
212   - onShow() {
213   - this.finished = false;
214   - this.loading = "loadmore";
215   - this.page = 0;
  212 + onShow() {
  213 + this.finished = false;
  214 + this.loading = "loadmore";
  215 + this.page = 0;
216 216 this.list = [];
217 217 this._getList();
218 218 },
... ... @@ -226,32 +226,32 @@
226 226
227 227 },
228 228
229   - methods: {
230   -
231   - searchCli() {
232   - this.$u.route('/pages/main/home/search/search?type=ask&searchkey=' + this.keyword);
233   - },
234   -
235   - sectionChange(index) {
236   - this.curNow = index;
237   -
238   - this.finished = false;
239   - this.loading = "loadmore";
240   - this.page = 0;
241   - this.list = [];
242   - this._getList();
243   - },
244   -
245   - getCategoryList(e) {
246   - for (var i = 0; i < this.categoryList.length; i++) {
247   - let item = this.categoryList[i]
248   - if (e == item.value) {
249   - return item.label
250   - }
251   - }
  229 + methods: {
  230 +
  231 + searchCli() {
  232 + this.$u.route('/pages/main/home/search/search?type=ask&searchkey=' + this.keyword);
  233 + },
  234 +
  235 + sectionChange(index) {
  236 + this.curNow = index;
  237 +
  238 + this.finished = false;
  239 + this.loading = "loadmore";
  240 + this.page = 0;
  241 + this.list = [];
  242 + this._getList();
  243 + },
  244 +
  245 + getCategoryList(e) {
  246 + for (var i = 0; i < this.categoryList.length; i++) {
  247 + let item = this.categoryList[i]
  248 + if (e == item.value) {
  249 + return item.label
  250 + }
  251 + }
252 252 },
253 253
254   - handelDetail(record) {
  254 + handelDetail(record) {
255 255 this.$u.route('/pages/main/home/askdetail/askdetail?id='+record.id);
256 256 },
257 257
... ... @@ -376,53 +376,53 @@
376 376 this._getList();
377 377
378 378 this.show = false;
379   - },
380   -
381   - workSearch() {
382   - uni.hideKeyboard();
383   - this.works = []
384   - this.worksloadData()
385   - },
386   -
387   - lower() {
388   - setTimeout(() => {
389   - this.worksloadData(true);
390   - }, 200)
391   - },
392   -
393   - worksloadData(e) {
394   - let params = {}
395   - // this.loading = 'loading'
396   -
397   - if (e) {
398   - if (this.total <= this.works.length) {
399   - // this.loading = 'nomore'
400   - return
401   - }
402   - this.workspage++
403   - } else {
404   - this.workspage = 1
405   - }
406   - params['pageNumber'] = this.workspage
407   - if (this.sxsearch) {
408   - params['keyWord'] = this.sxsearch
409   - }
410   - getProjectListApi(params).then(async res => {
411   - if (res) {
412   - this.total = res.total
413   - // this.loading = 'loadmore'
414   - this.works = this.works.concat(res.records)
415   - }
416   - })
417   - },
418   - popupSelItem(item) {
419   - this.show = false
420   - this.projectId = item.id;
421   - this.finished = false;
422   - this.loading = "loadmore";
423   - this.page = 0;
424   - this.list = [];
425   - this._getList();
  379 + },
  380 +
  381 + workSearch() {
  382 + uni.hideKeyboard();
  383 + this.works = []
  384 + this.worksloadData()
  385 + },
  386 +
  387 + lower() {
  388 + setTimeout(() => {
  389 + this.worksloadData(true);
  390 + }, 200)
  391 + },
  392 +
  393 + worksloadData(e) {
  394 + let params = {}
  395 + // this.loading = 'loading'
  396 +
  397 + if (e) {
  398 + if (this.total <= this.works.length) {
  399 + // this.loading = 'nomore'
  400 + return
  401 + }
  402 + this.workspage++
  403 + } else {
  404 + this.workspage = 1
  405 + }
  406 + params['pageNumber'] = this.workspage
  407 + if (this.sxsearch) {
  408 + params['keyWord'] = this.sxsearch
  409 + }
  410 + getProjectListApi(params).then(async res => {
  411 + if (res) {
  412 + this.total = res.total
  413 + // this.loading = 'loadmore'
  414 + this.works = this.works.concat(res.records)
  415 + }
  416 + })
  417 + },
  418 + popupSelItem(item) {
  419 + this.show = false
  420 + this.projectId = item.id;
  421 + this.finished = false;
  422 + this.loading = "loadmore";
  423 + this.page = 0;
  424 + this.list = [];
  425 + this._getList();
426 426 },
427 427
428 428 }
... ... @@ -461,51 +461,51 @@
461 461 padding: 20px 17px;
462 462 border-radius: 8rpx;
463 463 background-color: #FFFFFF;
464   -
465   - .t1 {
466   - font-size: 14px;
467   - font-family: PingFangSC-Medium, PingFang SC;
468   - font-weight: 500;
469   - color: #000000;
470   - }
471   -
472   - .t2 {
473   - margin-top: 6px;
474   - font-size: 12px;
475   - font-family: PingFangSC-Light, PingFang SC;
476   - font-weight: 300;
477   - color: rgba(38,41,47,0.85);
478   - }
479   -
480   - .t3 {
481   - margin-top: 2px;
482   - font-size: 12px;
483   - font-family: PingFangSC-Light, PingFang SC;
484   - font-weight: 300;
485   - color: #000000;
486   - }
487   -
488   - .t2top14 {
489   - margin-top: 14px;
490   - }
491   -
492   - .time {
493   - position: absolute;
494   - top: 17px;
495   - right: 17px;
496   - font-size: 12px;
497   - font-family: PingFangSC-Light, PingFang SC;
498   - font-weight: 300;
499   - color: rgba(0,0,0,0.85);
500   - }
501   -
502   - .status {
503   - position: absolute;
504   - bottom: 20px;
505   - right: 17px;
506   - font-size: 12px;
507   - font-family: PingFangSC-Regular, PingFang SC;
508   - font-weight: 400;
  464 +
  465 + .t1 {
  466 + font-size: 14px;
  467 + font-family: PingFangSC-Medium, PingFang SC;
  468 + font-weight: 500;
  469 + color: #000000;
  470 + }
  471 +
  472 + .t2 {
  473 + margin-top: 6px;
  474 + font-size: 12px;
  475 + font-family: PingFangSC-Light, PingFang SC;
  476 + font-weight: 300;
  477 + color: rgba(38,41,47,0.85);
  478 + }
  479 +
  480 + .t3 {
  481 + margin-top: 2px;
  482 + font-size: 12px;
  483 + font-family: PingFangSC-Light, PingFang SC;
  484 + font-weight: 300;
  485 + color: #000000;
  486 + }
  487 +
  488 + .t2top14 {
  489 + margin-top: 14px;
  490 + }
  491 +
  492 + .time {
  493 + position: absolute;
  494 + top: 17px;
  495 + right: 17px;
  496 + font-size: 12px;
  497 + font-family: PingFangSC-Light, PingFang SC;
  498 + font-weight: 300;
  499 + color: rgba(0,0,0,0.85);
  500 + }
  501 +
  502 + .status {
  503 + position: absolute;
  504 + bottom: 20px;
  505 + right: 17px;
  506 + font-size: 12px;
  507 + font-family: PingFangSC-Regular, PingFang SC;
  508 + font-weight: 400;
509 509 }
510 510 }
511 511 }
... ... @@ -529,25 +529,25 @@
529 529
530 530 .item {
531 531
532   - view {
533   - display: flex;
534   - flex-flow: row wrap;
535   - align-items: center;
536   - width: 500rpx;
537   - height: 74rpx;
538   - border-radius: 4rpx;
539   - border: 2rpx solid #C1C1C9;
540   - margin: 0 10rpx 20rpx;
541   - font-size: 24rpx;
542   - line-height: 32rpx;
543   - color: #C0C0C9;
544   - padding: 16rpx 20rpx;
545   - }
546   -
547   - .selectItem {
548   - background-color: var(--primary-color);
549   - color: #FFFFFF;
550   - border: 2rpx solid var(--primary-color);
  532 + view {
  533 + display: flex;
  534 + flex-flow: row wrap;
  535 + align-items: center;
  536 + width: 500rpx;
  537 + height: 74rpx;
  538 + border-radius: 4rpx;
  539 + border: 2rpx solid #C1C1C9;
  540 + margin: 0 10rpx 20rpx;
  541 + font-size: 24rpx;
  542 + line-height: 32rpx;
  543 + color: #C0C0C9;
  544 + padding: 16rpx 20rpx;
  545 + }
  546 +
  547 + .selectItem {
  548 + background-color: var(--primary-color);
  549 + color: #FFFFFF;
  550 + border: 2rpx solid var(--primary-color);
551 551 }
552 552 }
553 553 }
... ... @@ -592,53 +592,53 @@
592 592 width: 346rpx;
593 593 }
594 594 }
595   - }
596   -
597   - .popup {
598   - height: 500px;
599   - padding: 19px 16px;
600   -
601   - .title {
602   - font-size: 18px;
603   - font-family: PingFangSC-Medium, PingFang SC;
604   - font-weight: 500;
605   - color: #000000;
606   - }
607   -
608   - .close {
609   - width: 22px;
610   - height: 22px;
611   - }
612   -
613   - .item_box {
614   - border-radius: 4px;
615   - margin: 0 0 48rpx;
616   -
617   - .item_title {
618   - height: 20px;
619   - font-size: 14px;
620   - font-family: PingFangSC-Regular, PingFang SC;
621   - font-weight: 400;
622   - color: rgba(0, 0, 0, 0.65);
623   - line-height: 20px;
624   - }
625   -
626   - }
627   -
628   - .no_data {
629   - width: 100%;
630   - margin-top: 310rpx;
631   -
632   - .text_black_28 {
633   - font-size: 14px;
634   - font-family: PingFangSC-Light, PingFang SC;
635   - font-weight: 300;
636   - color: rgba(0,0,0,0.65);
637   - text-align: center;
638   - }
639   -
640   - }
641   -
  595 + }
  596 +
  597 + .popup {
  598 + height: 500px;
  599 + padding: 19px 16px;
  600 +
  601 + .title {
  602 + font-size: 18px;
  603 + font-family: PingFangSC-Medium, PingFang SC;
  604 + font-weight: 500;
  605 + color: #000000;
  606 + }
  607 +
  608 + .close {
  609 + width: 22px;
  610 + height: 22px;
  611 + }
  612 +
  613 + .item_box {
  614 + border-radius: 4px;
  615 + margin: 0 0 48rpx;
  616 +
  617 + .item_title {
  618 + height: 20px;
  619 + font-size: 14px;
  620 + font-family: PingFangSC-Regular, PingFang SC;
  621 + font-weight: 400;
  622 + color: rgba(0, 0, 0, 0.65);
  623 + line-height: 20px;
  624 + }
  625 +
  626 + }
  627 +
  628 + .no_data {
  629 + width: 100%;
  630 + margin-top: 310rpx;
  631 +
  632 + .text_black_28 {
  633 + font-size: 14px;
  634 + font-family: PingFangSC-Light, PingFang SC;
  635 + font-weight: 300;
  636 + color: rgba(0,0,0,0.65);
  637 + text-align: center;
  638 + }
  639 +
  640 + }
  641 +
642 642 }
643 643 }
644   -</style>
  644 +</style>
... ...
... ... @@ -123,7 +123,7 @@
123 123 </view>
124 124 <view v-else class="bczl">
125 125 <view class="no_data">
126   - <image class="img" src="/static/img/home/nodata.png"></image>
  126 + <image class="img" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}nodata.png`"></image>
127 127 <view style="
128 128 font-size: 16px;
129 129 color: #333333;
... ... @@ -818,4 +818,4 @@
818 818 }
819 819
820 820 }
821   -</style>
  821 +</style>
... ...
... ... @@ -36,22 +36,22 @@
36 36 </view>
37 37 <view class="t2 t2top14">
38 38 变更类型: {{item.changeType=="internal_transfer"?'内部转岗':'其他企业岗位'}}
39   - </view>
40   - <view v-if="item.changeType=='internal_transfer'">
41   - <view class="t2">
42   - 转岗日期: {{timeFormat(item.quitTime, 'yyyy-mm-dd hh:MM')}}
43   - </view>
44   - </view>
45   - <view v-else>
46   - <view class="t2">
47   - 离职日期: {{timeFormat(item.quitTime, 'yyyy-mm-dd hh:MM')}}
48   - </view>
49   - <view class="t2">
50   - 入职日期: {{timeFormat(item.entryTime, 'yyyy-mm-dd hh:MM')}}
51   - </view>
52   - <view class="t2">
53   - 岗位来源: {{getCategoryList(item.afterJobSource)}}
54   - </view>
  39 + </view>
  40 + <view v-if="item.changeType=='internal_transfer'">
  41 + <view class="t2">
  42 + 转岗日期: {{timeFormat(item.quitTime, 'yyyy-mm-dd hh:MM')}}
  43 + </view>
  44 + </view>
  45 + <view v-else>
  46 + <view class="t2">
  47 + 离职日期: {{timeFormat(item.quitTime, 'yyyy-mm-dd hh:MM')}}
  48 + </view>
  49 + <view class="t2">
  50 + 入职日期: {{timeFormat(item.entryTime, 'yyyy-mm-dd hh:MM')}}
  51 + </view>
  52 + <view class="t2">
  53 + 岗位来源: {{getCategoryList(item.afterJobSource)}}
  54 + </view>
55 55 </view>
56 56 <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
57 57 待处理
... ... @@ -93,7 +93,7 @@
93 93 {{item.name}}
94 94 </view>
95 95 <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
96   - src="/static/img/home/popselect.png" mode=""></image>
  96 + :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
97 97 </view>
98 98 </view>
99 99 </scroll-view>
... ... @@ -264,15 +264,15 @@
264 264 },
265 265
266 266 getCategoryList(e) {
267   - if (e == 'hro_platform') {
268   - return '平台岗位'
269   - }else if (e == 'hr_platform') {
270   - return '平台岗位'
271   - }else if (e == 'school') {
272   - return '学校创建'
273   - }else if (e == 'student') {
274   - return '自主添加'
275   - }
  267 + if (e == 'hro_platform') {
  268 + return '平台岗位'
  269 + }else if (e == 'hr_platform') {
  270 + return '平台岗位'
  271 + }else if (e == 'school') {
  272 + return '学校创建'
  273 + }else if (e == 'student') {
  274 + return '自主添加'
  275 + }
276 276 return ''
277 277 },
278 278
... ... @@ -498,7 +498,7 @@
498 498 color: rgba(38, 41, 47, 0.85);
499 499 }
500 500
501   - .t3 {
  501 + .t3 {
502 502 margin-top: 2px;
503 503 font-size: 12px;
504 504 font-family: PingFangSC-Light, PingFang SC;
... ... @@ -662,4 +662,4 @@
662 662
663 663 }
664 664 }
665   -</style>
  665 +</style>
... ...
... ... @@ -14,45 +14,45 @@
14 14 <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
15 15 bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
16 16 </u-search>
17   - </view> -->
18   - <view style="width: 148px;">
19   - <u-subsection :list="['待处理','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
20   - </view>
21   - <view style="display: flex; justify-content: space-between; align-items: center;">
22   - <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
23   - <view style="width: 16px;"></view>
24   - <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
  17 + </view> -->
  18 + <view style="width: 148px;">
  19 + <u-subsection :list="['待处理','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
  20 + </view>
  21 + <view style="display: flex; justify-content: space-between; align-items: center;">
  22 + <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
  23 + <view style="width: 16px;"></view>
  24 + <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
25 25 </view>
26 26 </view>
27 27
28 28 <view class="list_box" v-if="list.length > 0">
29 29 <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
30   - <view class="t1">
31   - {{item.studentName}}提交的实习申请
32   - </view>
33   - <view class="t3">
34   - {{item.projectName}}
35   - </view>
36   - <view class="t2 t2top14">
37   - 申请类型: {{getCategoryList(item.type)}}
38   - </view>
39   - <view class="t2">
40   - 开始时间: {{timeFormat(item.formStartTime, 'yyyy-mm-dd')}}
41   - </view>
42   - <view class="t2">
43   - 结束时间: {{timeFormat(item.formEndTime, 'yyyy-mm-dd')}}
44   - </view>
45   - <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
46   - 待处理
47   - </view>
48   - <view v-else-if="item.status == 'passed'" class="status" style="color: var(--primary-color);">
49   - 已通过
50   - </view>
51   - <view v-else-if="item.status == 'rejected'" class="status" style="color: red;">
52   - 已驳回
53   - </view>
54   - <view class="time">
55   - {{timeFormat(item.createdTime, 'mm-dd')}}
  30 + <view class="t1">
  31 + {{item.studentName}}提交的实习申请
  32 + </view>
  33 + <view class="t3">
  34 + {{item.projectName}}
  35 + </view>
  36 + <view class="t2 t2top14">
  37 + 申请类型: {{getCategoryList(item.type)}}
  38 + </view>
  39 + <view class="t2">
  40 + 开始时间: {{timeFormat(item.formStartTime, 'yyyy-mm-dd')}}
  41 + </view>
  42 + <view class="t2">
  43 + 结束时间: {{timeFormat(item.formEndTime, 'yyyy-mm-dd')}}
  44 + </view>
  45 + <view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
  46 + 待处理
  47 + </view>
  48 + <view v-else-if="item.status == 'passed'" class="status" style="color: var(--primary-color);">
  49 + 已通过
  50 + </view>
  51 + <view v-else-if="item.status == 'rejected'" class="status" style="color: red;">
  52 + 已驳回
  53 + </view>
  54 + <view class="time">
  55 + {{timeFormat(item.createdTime, 'mm-dd')}}
56 56 </view>
57 57 </view>
58 58 <c-loading :loading="loading"></c-loading>
... ... @@ -60,38 +60,38 @@
60 60 <view v-else class="no_data">
61 61 <c-no-data></c-no-data>
62 62 </view>
63   -
64   - <u-popup :show="show" mode="bottom" @close="close" :round="22">
65   - <view class="popup">
66   - <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
67   - <view class="title">
68   - 项目筛选
69   - </view>
70   - <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
71   - </view>
72   - <view class="search">
73   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
74   - bgColor="#F4F4F4" :showAction="true" :clearabled="false" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()" @clear="workSearch()">
75   - </u-search>
76   - </view>
77   - <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
78   - @scrolltolower="lower()">
79   - <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
80   - <view style="display: flex; align-items: center; justify-content: space-between;">
81   - <view class="item_title">
82   - {{item.name}}
83   - </view>
84   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
85   - </view>
86   - </view>
87   - </scroll-view>
88   - <view v-else class="no_data" @click="jumpVerified">
89   - <view class="text_black_28">
90   - 暂未搜索到该项目
91   - </view>
92   - </view>
93   - </view>
94   - </u-popup>
  63 +
  64 + <u-popup :show="show" mode="bottom" @close="close" :round="22">
  65 + <view class="popup">
  66 + <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
  67 + <view class="title">
  68 + 项目筛选
  69 + </view>
  70 + <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
  71 + </view>
  72 + <view class="search">
  73 + <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  74 + bgColor="#F4F4F4" :showAction="true" :clearabled="false" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()" @clear="workSearch()">
  75 + </u-search>
  76 + </view>
  77 + <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
  78 + @scrolltolower="lower()">
  79 + <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
  80 + <view style="display: flex; align-items: center; justify-content: space-between;">
  81 + <view class="item_title">
  82 + {{item.name}}
  83 + </view>
  84 + <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  85 + </view>
  86 + </view>
  87 + </scroll-view>
  88 + <view v-else class="no_data" @click="jumpVerified">
  89 + <view class="text_black_28">
  90 + 暂未搜索到该项目
  91 + </view>
  92 + </view>
  93 + </view>
  94 + </u-popup>
95 95
96 96 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
97 97 <view class="popup_search">
... ... @@ -164,20 +164,20 @@
164 164
165 165 },
166 166 projectId: '',
167   - switchValue: false,
168   - categoryList: [{
169   - label: '开始实习申请',
170   - value: 'start'
171   - },
172   - {
173   - label: '结束实习申请',
174   - value: "end",
175   - }
176   - ],
177   - curNow: 1,
178   - sxsearch: '',
179   - works: [],
180   - workspage: 1,
  167 + switchValue: false,
  168 + categoryList: [{
  169 + label: '开始实习申请',
  170 + value: 'start'
  171 + },
  172 + {
  173 + label: '结束实习申请',
  174 + value: "end",
  175 + }
  176 + ],
  177 + curNow: 1,
  178 + sxsearch: '',
  179 + works: [],
  180 + workspage: 1,
181 181 workstotal: 0,
182 182 }
183 183 },
... ... @@ -186,14 +186,14 @@
186 186 console.log(option)
187 187 // this.$store.dispatch(`home/getProjectList`, {
188 188 // pageSize: -1,
189   - // })
190   -
  189 + // })
  190 +
191 191 this.worksloadData()
192 192
193 193 // this.search.keySearch = '';
194 194
195 195 if (option && option.status) {
196   - // this.search.status = 'wait';
  196 + // this.search.status = 'wait';
197 197 this.curNow = 0;
198 198 // this.checkboxValue = ['待处理'];
199 199 // this.switchValue = true;
... ... @@ -201,10 +201,10 @@
201 201
202 202 },
203 203
204   - onShow() {
205   - this.finished = false;
206   - this.loading = "loadmore";
207   - this.page = 0;
  204 + onShow() {
  205 + this.finished = false;
  206 + this.loading = "loadmore";
  207 + this.page = 0;
208 208 this.list = [];
209 209 this._getList();
210 210 },
... ... @@ -218,32 +218,32 @@
218 218
219 219 },
220 220
221   - methods: {
222   -
223   - searchCli() {
224   - this.$u.route('/pages/main/home/search/search?type=ask&searchkey=' + this.keyword);
225   - },
226   -
227   - sectionChange(index) {
228   - this.curNow = index;
229   -
230   - this.finished = false;
231   - this.loading = "loadmore";
232   - this.page = 0;
233   - this.list = [];
234   - this._getList();
235   - },
236   -
237   - getCategoryList(e) {
238   - for (var i = 0; i < this.categoryList.length; i++) {
239   - let item = this.categoryList[i]
240   - if (e == item.value) {
241   - return item.label
242   - }
243   - }
  221 + methods: {
  222 +
  223 + searchCli() {
  224 + this.$u.route('/pages/main/home/search/search?type=ask&searchkey=' + this.keyword);
  225 + },
  226 +
  227 + sectionChange(index) {
  228 + this.curNow = index;
  229 +
  230 + this.finished = false;
  231 + this.loading = "loadmore";
  232 + this.page = 0;
  233 + this.list = [];
  234 + this._getList();
  235 + },
  236 +
  237 + getCategoryList(e) {
  238 + for (var i = 0; i < this.categoryList.length; i++) {
  239 + let item = this.categoryList[i]
  240 + if (e == item.value) {
  241 + return item.label
  242 + }
  243 + }
244 244 },
245 245
246   - handelDetail(record) {
  246 + handelDetail(record) {
247 247 this.$u.route('/pages/main/home/interapplydetail/interapplydetail?id='+record.id);
248 248 },
249 249
... ... @@ -368,53 +368,53 @@
368 368 this._getList();
369 369
370 370 this.show = false;
371   - },
372   -
373   - workSearch() {
374   - uni.hideKeyboard();
375   - this.works = []
376   - this.worksloadData()
377   - },
378   -
379   - lower() {
380   - setTimeout(() => {
381   - this.worksloadData(true);
382   - }, 200)
383   - },
384   -
385   - worksloadData(e) {
386   - let params = {}
387   - // this.loading = 'loading'
388   -
389   - if (e) {
390   - if (this.total <= this.works.length) {
391   - // this.loading = 'nomore'
392   - return
393   - }
394   - this.workspage++
395   - } else {
396   - this.workspage = 1
397   - }
398   - params['pageNumber'] = this.workspage
399   - if (this.sxsearch) {
400   - params['keyWord'] = this.sxsearch
401   - }
402   - getProjectListApi(params).then(async res => {
403   - if (res) {
404   - this.total = res.total
405   - // this.loading = 'loadmore'
406   - this.works = this.works.concat(res.records)
407   - }
408   - })
409   - },
410   - popupSelItem(item) {
411   - this.show = false
412   - this.projectId = item.id;
413   - this.finished = false;
414   - this.loading = "loadmore";
415   - this.page = 0;
416   - this.list = [];
417   - this._getList();
  371 + },
  372 +
  373 + workSearch() {
  374 + uni.hideKeyboard();
  375 + this.works = []
  376 + this.worksloadData()
  377 + },
  378 +
  379 + lower() {
  380 + setTimeout(() => {
  381 + this.worksloadData(true);
  382 + }, 200)
  383 + },
  384 +
  385 + worksloadData(e) {
  386 + let params = {}
  387 + // this.loading = 'loading'
  388 +
  389 + if (e) {
  390 + if (this.total <= this.works.length) {
  391 + // this.loading = 'nomore'
  392 + return
  393 + }
  394 + this.workspage++
  395 + } else {
  396 + this.workspage = 1
  397 + }
  398 + params['pageNumber'] = this.workspage
  399 + if (this.sxsearch) {
  400 + params['keyWord'] = this.sxsearch
  401 + }
  402 + getProjectListApi(params).then(async res => {
  403 + if (res) {
  404 + this.total = res.total
  405 + // this.loading = 'loadmore'
  406 + this.works = this.works.concat(res.records)
  407 + }
  408 + })
  409 + },
  410 + popupSelItem(item) {
  411 + this.show = false
  412 + this.projectId = item.id;
  413 + this.finished = false;
  414 + this.loading = "loadmore";
  415 + this.page = 0;
  416 + this.list = [];
  417 + this._getList();
418 418 },
419 419
420 420 }
... ... @@ -453,51 +453,51 @@
453 453 padding: 20px 17px;
454 454 border-radius: 8rpx;
455 455 background-color: #FFFFFF;
456   -
457   - .t1 {
458   - font-size: 14px;
459   - font-family: PingFangSC-Medium, PingFang SC;
460   - font-weight: 500;
461   - color: #000000;
462   - }
463   -
464   - .t2 {
465   - margin-top: 6px;
466   - font-size: 12px;
467   - font-family: PingFangSC-Light, PingFang SC;
468   - font-weight: 300;
469   - color: rgba(38,41,47,0.85);
470   - }
471   -
472   - .t3 {
473   - margin-top: 2px;
474   - font-size: 12px;
475   - font-family: PingFangSC-Light, PingFang SC;
476   - font-weight: 300;
477   - color: #000000;
478   - }
479   -
480   - .t2top14 {
481   - margin-top: 14px;
482   - }
483   -
484   - .time {
485   - position: absolute;
486   - top: 17px;
487   - right: 17px;
488   - font-size: 12px;
489   - font-family: PingFangSC-Light, PingFang SC;
490   - font-weight: 300;
491   - color: rgba(0,0,0,0.85);
492   - }
493   -
494   - .status {
495   - position: absolute;
496   - bottom: 20px;
497   - right: 17px;
498   - font-size: 12px;
499   - font-family: PingFangSC-Regular, PingFang SC;
500   - font-weight: 400;
  456 +
  457 + .t1 {
  458 + font-size: 14px;
  459 + font-family: PingFangSC-Medium, PingFang SC;
  460 + font-weight: 500;
  461 + color: #000000;
  462 + }
  463 +
  464 + .t2 {
  465 + margin-top: 6px;
  466 + font-size: 12px;
  467 + font-family: PingFangSC-Light, PingFang SC;
  468 + font-weight: 300;
  469 + color: rgba(38,41,47,0.85);
  470 + }
  471 +
  472 + .t3 {
  473 + margin-top: 2px;
  474 + font-size: 12px;
  475 + font-family: PingFangSC-Light, PingFang SC;
  476 + font-weight: 300;
  477 + color: #000000;
  478 + }
  479 +
  480 + .t2top14 {
  481 + margin-top: 14px;
  482 + }
  483 +
  484 + .time {
  485 + position: absolute;
  486 + top: 17px;
  487 + right: 17px;
  488 + font-size: 12px;
  489 + font-family: PingFangSC-Light, PingFang SC;
  490 + font-weight: 300;
  491 + color: rgba(0,0,0,0.85);
  492 + }
  493 +
  494 + .status {
  495 + position: absolute;
  496 + bottom: 20px;
  497 + right: 17px;
  498 + font-size: 12px;
  499 + font-family: PingFangSC-Regular, PingFang SC;
  500 + font-weight: 400;
501 501 }
502 502 }
503 503 }
... ... @@ -521,25 +521,25 @@
521 521
522 522 .item {
523 523
524   - view {
525   - display: flex;
526   - flex-flow: row wrap;
527   - align-items: center;
528   - width: 500rpx;
529   - height: 74rpx;
530   - border-radius: 4rpx;
531   - border: 2rpx solid #C1C1C9;
532   - margin: 0 10rpx 20rpx;
533   - font-size: 24rpx;
534   - line-height: 32rpx;
535   - color: #C0C0C9;
536   - padding: 16rpx 20rpx;
537   - }
538   -
539   - .selectItem {
540   - background-color: var(--primary-color);
541   - color: #FFFFFF;
542   - border: 2rpx solid var(--primary-color);
  524 + view {
  525 + display: flex;
  526 + flex-flow: row wrap;
  527 + align-items: center;
  528 + width: 500rpx;
  529 + height: 74rpx;
  530 + border-radius: 4rpx;
  531 + border: 2rpx solid #C1C1C9;
  532 + margin: 0 10rpx 20rpx;
  533 + font-size: 24rpx;
  534 + line-height: 32rpx;
  535 + color: #C0C0C9;
  536 + padding: 16rpx 20rpx;
  537 + }
  538 +
  539 + .selectItem {
  540 + background-color: var(--primary-color);
  541 + color: #FFFFFF;
  542 + border: 2rpx solid var(--primary-color);
543 543 }
544 544 }
545 545 }
... ... @@ -584,53 +584,53 @@
584 584 width: 346rpx;
585 585 }
586 586 }
587   - }
588   -
589   - .popup {
590   - height: 500px;
591   - padding: 19px 16px;
592   -
593   - .title {
594   - font-size: 18px;
595   - font-family: PingFangSC-Medium, PingFang SC;
596   - font-weight: 500;
597   - color: #000000;
598   - }
599   -
600   - .close {
601   - width: 22px;
602   - height: 22px;
603   - }
604   -
605   - .item_box {
606   - border-radius: 4px;
607   - margin: 0 0 48rpx;
608   -
609   - .item_title {
610   - height: 20px;
611   - font-size: 14px;
612   - font-family: PingFangSC-Regular, PingFang SC;
613   - font-weight: 400;
614   - color: rgba(0, 0, 0, 0.65);
615   - line-height: 20px;
616   - }
617   -
618   - }
619   -
620   - .no_data {
621   - width: 100%;
622   - margin-top: 310rpx;
623   -
624   - .text_black_28 {
625   - font-size: 14px;
626   - font-family: PingFangSC-Light, PingFang SC;
627   - font-weight: 300;
628   - color: rgba(0,0,0,0.65);
629   - text-align: center;
630   - }
631   -
632   - }
633   -
  587 + }
  588 +
  589 + .popup {
  590 + height: 500px;
  591 + padding: 19px 16px;
  592 +
  593 + .title {
  594 + font-size: 18px;
  595 + font-family: PingFangSC-Medium, PingFang SC;
  596 + font-weight: 500;
  597 + color: #000000;
  598 + }
  599 +
  600 + .close {
  601 + width: 22px;
  602 + height: 22px;
  603 + }
  604 +
  605 + .item_box {
  606 + border-radius: 4px;
  607 + margin: 0 0 48rpx;
  608 +
  609 + .item_title {
  610 + height: 20px;
  611 + font-size: 14px;
  612 + font-family: PingFangSC-Regular, PingFang SC;
  613 + font-weight: 400;
  614 + color: rgba(0, 0, 0, 0.65);
  615 + line-height: 20px;
  616 + }
  617 +
  618 + }
  619 +
  620 + .no_data {
  621 + width: 100%;
  622 + margin-top: 310rpx;
  623 +
  624 + .text_black_28 {
  625 + font-size: 14px;
  626 + font-family: PingFangSC-Light, PingFang SC;
  627 + font-weight: 300;
  628 + color: rgba(0,0,0,0.65);
  629 + text-align: center;
  630 + }
  631 +
  632 + }
  633 +
634 634 }
635 635 }
636   -</style>
  636 +</style>
... ...
... ... @@ -275,10 +275,10 @@
275 275 }
276 276 </script>
277 277
278   -<style>
279   - page {
280   - background-color: #F7F7F7;
281   - }
  278 +<style>
  279 + page {
  280 + background-color: #F7F7F7;
  281 + }
282 282 </style>
283 283
284 284 <style lang="scss" scoped>
... ...
... ... @@ -89,7 +89,7 @@
89 89 getLogDetailApi,
90 90 putLogReviewApi,
91 91 getLogReplyListApi,
92   - postLogReplyApi,
  92 + postLogReplyApi,
93 93 getImgUrlApi,
94 94 } from '@/config/api.js';
95 95 export default {
... ... @@ -241,22 +241,22 @@
241 241 console.log("data...", data)
242 242 if (e.mime_type.indexOf("image") != -1) {
243 243 _this.openImage(data.url)
244   - } else {
245   - uni.downloadFile({
246   - url: data.url,
247   - success: function(res) {
248   - var filePath = res.tempFilePath;
249   - uni.openDocument({
250   - filePath: filePath,
251   - showMenu: true,
252   - success: function(res) {
253   - console.log('打开文档成功');
254   - },
255   - complete: function() {
256   - uni.hideLoading();
257   - }
258   - });
259   - }
  244 + } else {
  245 + uni.downloadFile({
  246 + url: data.url,
  247 + success: function(res) {
  248 + var filePath = res.tempFilePath;
  249 + uni.openDocument({
  250 + filePath: filePath,
  251 + showMenu: true,
  252 + success: function(res) {
  253 + console.log('打开文档成功');
  254 + },
  255 + complete: function() {
  256 + uni.hideLoading();
  257 + }
  258 + });
  259 + }
260 260 });
261 261 }
262 262 })
... ... @@ -465,7 +465,7 @@
465 465 .footer {
466 466 // width: 100%;
467 467 height: 10%;
468   - background: #fff;
  468 + background: #fff;
469 469 padding: 20rpx;
470 470 // position: fixed;
471 471 // bottom: 0;
... ... @@ -480,4 +480,4 @@
480 480 padding: 0 20rpx;
481 481 }
482 482 }
483   -</style>
  483 +</style>
... ...
1 1 <template>
2 2 <view class="registration_review" :style="vuex_theme">
3   - <view class="search_box">
4   - <!-- <view class="check">
5   - <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
6   - <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
7   - v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
8   - activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
9   - </u-checkbox>
10   - </u-checkbox-group>
11   - </view> -->
12   -
13   - <!-- <view class="search">
14   - <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
15   - bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
16   - </u-search>
17   - </view> -->
18   - <view style="width: 148px;">
19   - <u-subsection :list="['未阅','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
20   - </view>
21   - <view style="display: flex; justify-content: space-between; align-items: center;">
22   - <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
23   - <view style="width: 16px;"></view>
24   - <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
25   - </view>
  3 + <view class="search_box">
  4 + <!-- <view class="check">
  5 + <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
  6 + <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
  7 + v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
  8 + activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
  9 + </u-checkbox>
  10 + </u-checkbox-group>
  11 + </view> -->
  12 +
  13 + <!-- <view class="search">
  14 + <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  15 + bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
  16 + </u-search>
  17 + </view> -->
  18 + <view style="width: 148px;">
  19 + <u-subsection :list="['未阅','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
  20 + </view>
  21 + <view style="display: flex; justify-content: space-between; align-items: center;">
  22 + <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
  23 + <view style="width: 16px;"></view>
  24 + <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
  25 + </view>
26 26 </view>
27 27
28 28 <u-sticky bgColor="#fff">
... ... @@ -36,7 +36,7 @@
36 36 <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
37 37
38 38 <view class="bg_image" v-if="item.status == 'unread'">
39   - <u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
  39 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
40 40 <text>未阅</text>
41 41 </view>
42 42
... ... @@ -51,8 +51,8 @@
51 51 <view class="name">{{overflowHide(item.title, 10)}}</view>
52 52 <view class="week">
53 53 <!-- <text>{{timeFormat(item.logTime, 'yyyy年')}}</text> -->
54   - <!-- <text>{{getWeek(item.logTime)}}</text> -->
55   - <text>{{getCreatedTime(item)}}</text>
  54 + <!-- <text>{{getWeek(item.logTime)}}</text> -->
  55 + <text>{{getCreatedTime(item)}}</text>
56 56
57 57 </view>
58 58 </view>
... ... @@ -74,38 +74,38 @@
74 74 <view v-else class="no_data">
75 75 <c-no-data></c-no-data>
76 76 </view>
77   -
78   - <u-popup :show="show" mode="bottom" @close="close" :round="22">
79   - <view class="popup">
80   - <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
81   - <view class="title">
82   - 项目筛选
83   - </view>
84   - <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
85   - </view>
86   - <view class="search">
87   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
88   - bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
89   - </u-search>
90   - </view>
91   - <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
92   - @scrolltolower="lower()">
93   - <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
94   - <view style="display: flex; align-items: center; justify-content: space-between;">
95   - <view class="item_title">
96   - {{item.name}}
97   - </view>
98   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
99   - </view>
100   - </view>
101   - </scroll-view>
102   - <view v-else class="no_data" @click="jumpVerified">
103   - <view class="text_black_28">
104   - 暂未搜索到该项目
105   - </view>
106   - </view>
107   - </view>
108   - </u-popup>
  77 +
  78 + <u-popup :show="show" mode="bottom" @close="close" :round="22">
  79 + <view class="popup">
  80 + <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
  81 + <view class="title">
  82 + 项目筛选
  83 + </view>
  84 + <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
  85 + </view>
  86 + <view class="search">
  87 + <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  88 + bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
  89 + </u-search>
  90 + </view>
  91 + <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
  92 + @scrolltolower="lower()">
  93 + <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
  94 + <view style="display: flex; align-items: center; justify-content: space-between;">
  95 + <view class="item_title">
  96 + {{item.name}}
  97 + </view>
  98 + <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  99 + </view>
  100 + </view>
  101 + </scroll-view>
  102 + <view v-else class="no_data" @click="jumpVerified">
  103 + <view class="text_black_28">
  104 + 暂未搜索到该项目
  105 + </view>
  106 + </view>
  107 + </view>
  108 + </u-popup>
109 109
110 110 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
111 111 <view class="popup_search">
... ... @@ -159,7 +159,7 @@
159 159 export default {
160 160 mixins: [listMixin],
161 161 data() {
162   - return {
  162 + return {
163 163 studentId: '',
164 164 checkboxValue: [],
165 165 checkboxList: [{
... ... @@ -189,27 +189,27 @@
189 189 projectId: '',
190 190 showTime: false,
191 191 timeValue: '',
192   - switchValue: false,
  192 + switchValue: false,
193 193
194   - curNow: 1,
195   - sxsearch: '',
196   - works: [],
197   - workspage: 1,
  194 + curNow: 1,
  195 + sxsearch: '',
  196 + works: [],
  197 + workspage: 1,
198 198 workstotal: 0,
199 199 }
200 200 },
201 201
202 202 onLoad(option) {
203   - console.log(option)
204   - this.studentId = option.studentId;
  203 + console.log(option)
  204 + this.studentId = option.studentId;
205 205 this.projectId = option.projectId;
206 206
207 207 // this.$store.dispatch(`home/getProjectList`, {
208 208 // pageSize: -1,
209 209 // })
210 210
211   - // this.search.keySearch = '';
212   -
  211 + // this.search.keySearch = '';
  212 +
213 213 this.worksloadData()
214 214
215 215 if (option && option.category) {
... ... @@ -219,19 +219,19 @@
219 219 option.category == 'weekly' ? 1 :
220 220 option.category == 'monthly' ? 2 :
221 221 '';
222   - }
223   -
224   - // if (option && option.status) {
225   - // this.search.status = 'unread';
226   - // this.checkboxValue = ['未阅'];
227   - // this.switchValue = true;
228   - // }
229   -
230   - if (option && option.status) {
231   - // this.search.status = 'wait';
232   - this.curNow = 0;
233   - // this.checkboxValue = ['待处理'];
234   - // this.switchValue = true;
  222 + }
  223 +
  224 + // if (option && option.status) {
  225 + // this.search.status = 'unread';
  226 + // this.checkboxValue = ['未阅'];
  227 + // this.switchValue = true;
  228 + // }
  229 +
  230 + if (option && option.status) {
  231 + // this.search.status = 'wait';
  232 + this.curNow = 0;
  233 + // this.checkboxValue = ['待处理'];
  234 + // this.switchValue = true;
235 235 }
236 236
237 237 this.finished = false;
... ... @@ -241,10 +241,10 @@
241 241 },
242 242
243 243 onShow() {
244   - this.finished = false;
245   - this.loading = "loadmore";
246   - this.page = 0;
247   - this.list = [];
  244 + this.finished = false;
  245 + this.loading = "loadmore";
  246 + this.page = 0;
  247 + this.list = [];
248 248 this._getList();
249 249 },
250 250
... ... @@ -255,30 +255,30 @@
255 255 }),
256 256 },
257 257
258   - methods: {
259   -
260   - searchCli() {
261   - this.$u.route('/pages/main/home/search/search?type=log&searchkey=' + this.keyword);
262   - },
263   -
264   - sectionChange(index) {
265   - this.curNow = index;
266   -
267   - this.finished = false;
268   - this.loading = "loadmore";
269   - this.page = 0;
270   - this.list = [];
271   - this._getList();
272   - },
273   -
274   - getCreatedTime(e) {
275   - let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
276   - if (e.category == "weekly") {
277   - time = new Date(e.logTime).getFullYear() + "年第" + (this.getWeek(e.logTime) + 1) + "周";
278   - } else if (e.category == "monthly") {
279   - time = this.$u.timeFormat(e.logTime / 1000, 'yyyy年mm月');
280   - }
281   - return time
  258 + methods: {
  259 +
  260 + searchCli() {
  261 + this.$u.route('/pages/main/home/search/search?type=log&searchkey=' + this.keyword);
  262 + },
  263 +
  264 + sectionChange(index) {
  265 + this.curNow = index;
  266 +
  267 + this.finished = false;
  268 + this.loading = "loadmore";
  269 + this.page = 0;
  270 + this.list = [];
  271 + this._getList();
  272 + },
  273 +
  274 + getCreatedTime(e) {
  275 + let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
  276 + if (e.category == "weekly") {
  277 + time = new Date(e.logTime).getFullYear() + "年第" + (this.getWeek(e.logTime) + 1) + "周";
  278 + } else if (e.category == "monthly") {
  279 + time = this.$u.timeFormat(e.logTime / 1000, 'yyyy年mm月');
  280 + }
  281 + return time
282 282 },
283 283
284 284 getWeek(dt) {
... ... @@ -385,10 +385,10 @@
385 385
386 386 // if (search.status) {
387 387 // params.status = search.status;
388   - // }
389   -
390   - if (this.curNow == 0) {
391   - params.status = 'unread';
  388 + // }
  389 +
  390 + if (this.curNow == 0) {
  391 + params.status = 'unread';
392 392 }
393 393
394 394 if (search.category) {
... ... @@ -397,10 +397,10 @@
397 397
398 398 if (this.keyword) {
399 399 params.keySearch = this.keyword
400   - }
401   -
402   - if (this.studentId) {
403   - params.studentId = this.studentId
  400 + }
  401 +
  402 + if (this.studentId) {
  403 + params.studentId = this.studentId
404 404 }
405 405
406 406 if (this.projectId) {
... ... @@ -430,14 +430,14 @@
430 430 this.shownoData = true
431 431 }
432 432
433   - this.list = this.list.concat(result.records)
434   -
435   - // 判断是否全部加载完成
436   - if (this.total == this.list.length) {
437   - this.finished = true;
438   - this.loading = 'nomore';
439   - } else {
440   - this.loading = 'loadmore';
  433 + this.list = this.list.concat(result.records)
  434 +
  435 + // 判断是否全部加载完成
  436 + if (this.total == this.list.length) {
  437 + this.finished = true;
  438 + this.loading = 'nomore';
  439 + } else {
  440 + this.loading = 'loadmore';
441 441 }
442 442 },
443 443
... ... @@ -465,52 +465,52 @@
465 465
466 466 this.show = false;
467 467 },
468   -
469   - workSearch() {
470   - uni.hideKeyboard();
471   - this.works = []
472   - this.worksloadData()
473   - },
474   -
475   - lower() {
476   - setTimeout(() => {
477   - this.worksloadData(true);
478   - }, 200)
479   - },
480   -
481   - worksloadData(e) {
482   - let params = {}
483   - // this.loading = 'loading'
484   -
485   - if (e) {
486   - if (this.total <= this.works.length) {
487   - // this.loading = 'nomore'
488   - return
489   - }
490   - this.workspage++
491   - } else {
492   - this.workspage = 1
493   - }
494   - params['pageNumber'] = this.workspage
495   - if (this.sxsearch) {
496   - params['keyWord'] = this.sxsearch
497   - }
498   - getProjectListApi(params).then(async res => {
499   - if (res) {
500   - this.total = res.total
501   - // this.loading = 'loadmore'
502   - this.works = this.works.concat(res.records)
503   - }
504   - })
505   - },
506   - popupSelItem(item) {
507   - this.show = false
508   - this.projectId = item.id;
509   - this.finished = false;
510   - this.loading = "loadmore";
511   - this.page = 0;
512   - this.list = [];
513   - this._getList();
  468 +
  469 + workSearch() {
  470 + uni.hideKeyboard();
  471 + this.works = []
  472 + this.worksloadData()
  473 + },
  474 +
  475 + lower() {
  476 + setTimeout(() => {
  477 + this.worksloadData(true);
  478 + }, 200)
  479 + },
  480 +
  481 + worksloadData(e) {
  482 + let params = {}
  483 + // this.loading = 'loading'
  484 +
  485 + if (e) {
  486 + if (this.total <= this.works.length) {
  487 + // this.loading = 'nomore'
  488 + return
  489 + }
  490 + this.workspage++
  491 + } else {
  492 + this.workspage = 1
  493 + }
  494 + params['pageNumber'] = this.workspage
  495 + if (this.sxsearch) {
  496 + params['keyWord'] = this.sxsearch
  497 + }
  498 + getProjectListApi(params).then(async res => {
  499 + if (res) {
  500 + this.total = res.total
  501 + // this.loading = 'loadmore'
  502 + this.works = this.works.concat(res.records)
  503 + }
  504 + })
  505 + },
  506 + popupSelItem(item) {
  507 + this.show = false
  508 + this.projectId = item.id;
  509 + this.finished = false;
  510 + this.loading = "loadmore";
  511 + this.page = 0;
  512 + this.list = [];
  513 + this._getList();
514 514 },
515 515 }
516 516 }
... ... @@ -609,8 +609,8 @@
609 609 font-size: 24rpx;
610 610 line-height: 32rpx;
611 611 color: #909097;
612   - margin: 32rpx 0 30rpx 0;
613   - max-height: 100rpx;
  612 + margin: 32rpx 0 30rpx 0;
  613 + max-height: 100rpx;
614 614 overflow: hidden;
615 615 }
616 616
... ... @@ -658,32 +658,32 @@
658 658 color: #202131;
659 659 }
660 660
661   - .scroll {
662   - max-height: 60vh;
663   -
664   - .item {
665   -
666   - view {
667   - display: flex;
668   - flex-flow: row wrap;
669   - align-items: center;
670   - width: 500rpx;
671   - height: 74rpx;
672   - border-radius: 4rpx;
673   - border: 2rpx solid #C1C1C9;
674   - margin: 0 10rpx 20rpx;
675   - font-size: 24rpx;
676   - line-height: 32rpx;
677   - color: #C0C0C9;
678   - padding: 16rpx 20rpx;
679   - }
680   -
681   - .selectItem {
682   - background-color: var(--primary-color);
683   - color: #FFFFFF;
684   - border: 2rpx solid var(--primary-color);
685   - }
686   - }
  661 + .scroll {
  662 + max-height: 60vh;
  663 +
  664 + .item {
  665 +
  666 + view {
  667 + display: flex;
  668 + flex-flow: row wrap;
  669 + align-items: center;
  670 + width: 500rpx;
  671 + height: 74rpx;
  672 + border-radius: 4rpx;
  673 + border: 2rpx solid #C1C1C9;
  674 + margin: 0 10rpx 20rpx;
  675 + font-size: 24rpx;
  676 + line-height: 32rpx;
  677 + color: #C0C0C9;
  678 + padding: 16rpx 20rpx;
  679 + }
  680 +
  681 + .selectItem {
  682 + background-color: var(--primary-color);
  683 + color: #FFFFFF;
  684 + border: 2rpx solid var(--primary-color);
  685 + }
  686 + }
687 687 }
688 688
689 689 .time {
... ... @@ -730,53 +730,53 @@
730 730 width: 346rpx;
731 731 }
732 732 }
733   - }
734   -
735   - .popup {
736   - height: 500px;
737   - padding: 19px 16px;
738   -
739   - .title {
740   - font-size: 18px;
741   - font-family: PingFangSC-Medium, PingFang SC;
742   - font-weight: 500;
743   - color: #000000;
744   - }
745   -
746   - .close {
747   - width: 22px;
748   - height: 22px;
749   - }
750   -
751   - .item_box {
752   - border-radius: 4px;
753   - margin: 0 0 48rpx;
754   -
755   - .item_title {
756   - height: 20px;
757   - font-size: 14px;
758   - font-family: PingFangSC-Regular, PingFang SC;
759   - font-weight: 400;
760   - color: rgba(0, 0, 0, 0.65);
761   - line-height: 20px;
762   - }
763   -
764   - }
765   -
766   - .no_data {
767   - width: 100%;
768   - margin-top: 310rpx;
769   -
770   - .text_black_28 {
771   - font-size: 14px;
772   - font-family: PingFangSC-Light, PingFang SC;
773   - font-weight: 300;
774   - color: rgba(0,0,0,0.65);
775   - text-align: center;
776   - }
777   -
778   - }
779   -
  733 + }
  734 +
  735 + .popup {
  736 + height: 500px;
  737 + padding: 19px 16px;
  738 +
  739 + .title {
  740 + font-size: 18px;
  741 + font-family: PingFangSC-Medium, PingFang SC;
  742 + font-weight: 500;
  743 + color: #000000;
  744 + }
  745 +
  746 + .close {
  747 + width: 22px;
  748 + height: 22px;
  749 + }
  750 +
  751 + .item_box {
  752 + border-radius: 4px;
  753 + margin: 0 0 48rpx;
  754 +
  755 + .item_title {
  756 + height: 20px;
  757 + font-size: 14px;
  758 + font-family: PingFangSC-Regular, PingFang SC;
  759 + font-weight: 400;
  760 + color: rgba(0, 0, 0, 0.65);
  761 + line-height: 20px;
  762 + }
  763 +
  764 + }
  765 +
  766 + .no_data {
  767 + width: 100%;
  768 + margin-top: 310rpx;
  769 +
  770 + .text_black_28 {
  771 + font-size: 14px;
  772 + font-family: PingFangSC-Light, PingFang SC;
  773 + font-weight: 300;
  774 + color: rgba(0,0,0,0.65);
  775 + text-align: center;
  776 + }
  777 +
  778 + }
  779 +
780 780 }
781 781 }
782   -</style>
  782 +</style>
... ...
... ... @@ -22,7 +22,7 @@
22 22
23 23 <view class="icon_item">
24 24 <u-icon size="32rpx" label="实习项目" labelSize="28rpx" labelColor="#909097"
25   - name="/static/img/home/internshipProgramIcon.png"></u-icon>
  25 + :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipProgramIcon.png`"></u-icon>
26 26 <text>{{registrationDetail.projectName}}</text>
27 27 </view>
28 28
... ... @@ -36,12 +36,12 @@
36 36 <view class="title">单位信息</view>
37 37 <view class="icon_item">
38 38 <u-icon size="32rpx" label="实习单位" labelSize="28rpx" labelColor="#909097"
39   - name="/static/img/home/internshipUnitIcon.png"></u-icon>
  39 + :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipUnitIcon.png`"></u-icon>
40 40 <text>{{registrationDetail.companyName}}</text>
41 41 </view>
42 42 <view class="icon_item">
43 43 <u-icon size="32rpx" label="实习岗位" labelSize="28rpx" labelColor="#909097"
44   - name="/static/img/home/internshipJobIcon.png"></u-icon>
  44 + :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipJobIcon.png`"></u-icon>
45 45 <text>{{registrationDetail.jobName}}</text>
46 46 </view>
47 47 <view class="border_top item">
... ... @@ -61,26 +61,26 @@
61 61 <text>{{jobDetail.workSite}}</text>
62 62 </view>
63 63 </view>
64   -
65   - <view v-if="registrationDetail.entryAttachments" class="box">
66   - <view class="title">报名材料</view>
67   - <view class="time">
68   - {{timeFormat(registrationDetail.entryAttachments.createdTime, 'yyyy-mm-dd hh:MM')}} 上传
69   - </view>
70   - <view class="marks">
71   - {{registrationDetail.entryAttachments.remarks}}
72   - </view>
73   - <view class="cl">
74   - <view v-if="attachments&&attachments.length>0" class="fj">
75   - <view v-for="(item,index) in attachments " @click="openLink(item)">
76   - <view class="fj_item">
77   - <image class="img" src="/static/img/internship/link.png"></image>
78   - <text class="look">{{item.filename}}</text>
79   - </view>
80   - </view>
81   - </view>
82   - </view>
83   - </view>
  64 +
  65 + <view v-if="registrationDetail.entryAttachments" class="box">
  66 + <view class="title">报名材料</view>
  67 + <view class="time">
  68 + {{timeFormat(registrationDetail.entryAttachments.createdTime, 'yyyy-mm-dd hh:MM')}} 上传
  69 + </view>
  70 + <view class="marks">
  71 + {{registrationDetail.entryAttachments.remarks}}
  72 + </view>
  73 + <view class="cl">
  74 + <view v-if="attachments&&attachments.length>0" class="fj">
  75 + <view v-for="(item,index) in attachments " @click="openLink(item)">
  76 + <view class="fj_item">
  77 + <image class="img" src="/static/img/internship/link.png"></image>
  78 + <text class="look">{{item.filename}}</text>
  79 + </view>
  80 + </view>
  81 + </view>
  82 + </view>
  83 + </view>
84 84
85 85 <view class="box status">
86 86 <view class="title">状态</view>
... ... @@ -114,15 +114,15 @@
114 114 <script>
115 115 import {
116 116 getRegistrationDetailApi,
117   - putRegistrationReviewApi,
  117 + putRegistrationReviewApi,
118 118 getImgUrlApi,
119 119 } from '@/config/api.js';
120 120
121 121 export default {
122 122 data() {
123 123 return {
124   - registrationDetail: {},
125   - attachments: [],
  124 + registrationDetail: {},
  125 + attachments: [],
126 126 attachmentsFile: [],
127 127 }
128 128 },
... ... @@ -131,8 +131,8 @@
131 131 getRegistrationDetailApi(option.id).then(data => {
132 132 if (data) {
133 133 console.log(data)
134   - this.registrationDetail = data
135   -
  134 + this.registrationDetail = data
  135 +
136 136 this.handleAttachments()
137 137 }
138 138 })
... ... @@ -172,19 +172,19 @@
172 172 },
173 173 },
174 174
175   - methods: {
176   - handleAttachments() {
177   - if (this.registrationDetail.entryAttachments) {
178   - if (this.registrationDetail.entryAttachments.attachments) {
179   - this.attachments = JSON.parse(this.registrationDetail.entryAttachments.attachments)
180   - }
181   - if (this.registrationDetail.entryAttachments.attachmentsFile) {
182   - this.attachmentsFile = JSON.parse(this.registrationDetail.entryAttachments.attachmentsFile)
183   - }
184   - this.attachments = this.attachments.concat(this.attachmentsFile)
185   - console.log(this.attachments)
186   - }
187   - },
  175 + methods: {
  176 + handleAttachments() {
  177 + if (this.registrationDetail.entryAttachments) {
  178 + if (this.registrationDetail.entryAttachments.attachments) {
  179 + this.attachments = JSON.parse(this.registrationDetail.entryAttachments.attachments)
  180 + }
  181 + if (this.registrationDetail.entryAttachments.attachmentsFile) {
  182 + this.attachmentsFile = JSON.parse(this.registrationDetail.entryAttachments.attachmentsFile)
  183 + }
  184 + this.attachments = this.attachments.concat(this.attachmentsFile)
  185 + console.log(this.attachments)
  186 + }
  187 + },
188 188
189 189 timeFormat(timestamp, format = 'yyyy-mm-dd') {
190 190 return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
... ... @@ -196,8 +196,8 @@
196 196 status: 'reject',
197 197 }).then(data => {
198 198 if (data) {
199   - uni.navigateBack({
200   - delta: 1
  199 + uni.navigateBack({
  200 + delta: 1
201 201 });
202 202 }
203 203 })
... ... @@ -209,61 +209,61 @@
209 209 status: 'pass',
210 210 }).then(data => {
211 211 if (data) {
212   - uni.navigateBack({
213   - delta: 1
  212 + uni.navigateBack({
  213 + delta: 1
214 214 });
215 215 }
216 216 })
217   - },
218   -
219   - openLink(e) {
220   - var _this = this
221   -
222   - uni.showLoading({
223   - title: '努力加载中~',
224   - mask: true
225   - })
226   -
227   - getImgUrlApi({
228   - bucket: e.bucket,
229   - filePath: e.object
230   - }).then(data => {
231   - console.log("data...", data)
232   - if (e.mime_type.indexOf("image") != -1) {
233   - _this.openImage(data.url)
234   - } else {
235   - uni.downloadFile({
236   - url: data.url,
237   - success: function(res) {
238   - var filePath = res.tempFilePath;
239   - uni.openDocument({
240   - filePath: filePath,
241   - showMenu: true,
242   - success: function(res) {
243   - console.log('打开文档成功');
244   - },
245   - complete: function() {
246   - uni.hideLoading();
247   - }
248   - });
249   - }
250   - });
251   - }
252   - })
253   - },
254   - openImage(imgPath) {
255   - let array = new Array(1).fill(imgPath);
256   - uni.previewImage({
257   - urls: array,
258   - success(res) {
259   - uni.hideLoading();
260   - console.log('openImage success');
261   - },
262   - fail(res) {
263   - uni.hideLoading();
264   - console.log('openImage fail:', res);
265   - }
266   - });
  217 + },
  218 +
  219 + openLink(e) {
  220 + var _this = this
  221 +
  222 + uni.showLoading({
  223 + title: '努力加载中~',
  224 + mask: true
  225 + })
  226 +
  227 + getImgUrlApi({
  228 + bucket: e.bucket,
  229 + filePath: e.object
  230 + }).then(data => {
  231 + console.log("data...", data)
  232 + if (e.mime_type.indexOf("image") != -1) {
  233 + _this.openImage(data.url)
  234 + } else {
  235 + uni.downloadFile({
  236 + url: data.url,
  237 + success: function(res) {
  238 + var filePath = res.tempFilePath;
  239 + uni.openDocument({
  240 + filePath: filePath,
  241 + showMenu: true,
  242 + success: function(res) {
  243 + console.log('打开文档成功');
  244 + },
  245 + complete: function() {
  246 + uni.hideLoading();
  247 + }
  248 + });
  249 + }
  250 + });
  251 + }
  252 + })
  253 + },
  254 + openImage(imgPath) {
  255 + let array = new Array(1).fill(imgPath);
  256 + uni.previewImage({
  257 + urls: array,
  258 + success(res) {
  259 + uni.hideLoading();
  260 + console.log('openImage success');
  261 + },
  262 + fail(res) {
  263 + uni.hideLoading();
  264 + console.log('openImage fail:', res);
  265 + }
  266 + });
267 267 },
268 268 }
269 269 }
... ... @@ -345,49 +345,49 @@
345 345 .border_top {
346 346 border-top: 2rpx solid #E2E2E8;
347 347 padding: 28rpx 0 0 0;
348   - }
349   -
350   - .time {
351   - margin-top: 10rpx;
352   - font-size: 26rpx;
353   - }
354   -
355   - .marks {
356   - margin-top: 16rpx;
357   - font-size: 30rpx;
358   - }
359   -
360   - .fj {
361   - margin-top: 16rpx;
362   - // padding: 24rpx 32rpx 20rpx;
363   - background-color: #fff;
364   -
365   - .fj_item {
366   - display: flex;
367   - align-items: center;
368   - margin-bottom: 20rpx;
369   - }
370   -
371   - .img {
372   - width: 24rpx;
373   - height: 24rpx;
374   - }
375   -
376   - .look {
377   - width: 90%;
378   - display: -webkit-box;
379   - -webkit-box-orient: vertical;
380   - -webkit-line-clamp: 2;
381   - overflow: hidden;
382   - white-space: normal;
383   - word-break: break-all;
384   - word-wrap: break-word;
385   - font-size: 28rpx;
386   - font-family: PingFangSC-Regular, PingFang SC;
387   - font-weight: 400;
388   - color: var(--primary-color);
389   - padding-left: 15rpx;
390   - }
  348 + }
  349 +
  350 + .time {
  351 + margin-top: 10rpx;
  352 + font-size: 26rpx;
  353 + }
  354 +
  355 + .marks {
  356 + margin-top: 16rpx;
  357 + font-size: 30rpx;
  358 + }
  359 +
  360 + .fj {
  361 + margin-top: 16rpx;
  362 + // padding: 24rpx 32rpx 20rpx;
  363 + background-color: #fff;
  364 +
  365 + .fj_item {
  366 + display: flex;
  367 + align-items: center;
  368 + margin-bottom: 20rpx;
  369 + }
  370 +
  371 + .img {
  372 + width: 24rpx;
  373 + height: 24rpx;
  374 + }
  375 +
  376 + .look {
  377 + width: 90%;
  378 + display: -webkit-box;
  379 + -webkit-box-orient: vertical;
  380 + -webkit-line-clamp: 2;
  381 + overflow: hidden;
  382 + white-space: normal;
  383 + word-break: break-all;
  384 + word-wrap: break-word;
  385 + font-size: 28rpx;
  386 + font-family: PingFangSC-Regular, PingFang SC;
  387 + font-weight: 400;
  388 + color: var(--primary-color);
  389 + padding-left: 15rpx;
  390 + }
391 391 }
392 392 }
393 393
... ... @@ -417,4 +417,4 @@
417 417 }
418 418
419 419 }
420   -</style>
  420 +</style>
... ...
1 1 <template>
2 2 <view class="registration_review" :style="vuex_theme">
3   - <view class="search_box">
4   - <!-- <view class="check">
5   - <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
6   - <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
7   - v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
8   - activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
9   - </u-checkbox>
10   - </u-checkbox-group>
11   - </view> -->
12   -
13   - <!-- <view class="search">
14   - <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
15   - bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
16   - </u-search>
17   - </view> -->
18   - <view style="width: 148px;">
19   - <u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
20   - </view>
21   - <view style="display: flex; justify-content: space-between; align-items: center;">
22   - <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
23   - <view style="width: 16px;"></view>
24   - <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
25   - </view>
  3 + <view class="search_box">
  4 + <!-- <view class="check">
  5 + <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
  6 + <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
  7 + v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
  8 + activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
  9 + </u-checkbox>
  10 + </u-checkbox-group>
  11 + </view> -->
  12 +
  13 + <!-- <view class="search">
  14 + <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  15 + bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
  16 + </u-search>
  17 + </view> -->
  18 + <view style="width: 148px;">
  19 + <u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
  20 + </view>
  21 + <view style="display: flex; justify-content: space-between; align-items: center;">
  22 + <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
  23 + <view style="width: 16px;"></view>
  24 + <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
  25 + </view>
26 26 </view>
27 27
28 28 <view class="list_box" v-if="list.length > 0">
29 29 <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
30 30
31 31 <view class="bg_image" v-if="item.status == 'wait'">
32   - <u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
  32 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
33 33 <text>待审核</text>
34 34 </view>
35 35
... ... @@ -45,12 +45,12 @@
45 45
46 46 <view class="name">{{item.studentName}}</view>
47 47 <view class="company">
48   - <u-icon size="32rpx" name="/static/img/home/internshipUnitIcon.png"></u-icon>
  48 + <u-icon size="32rpx" :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipUnitIcon.png`"></u-icon>
49 49 <text>实习单位</text>
50 50 <text>{{item.companyName || '--'}}</text>
51 51 </view>
52 52 <view class="company position">
53   - <u-icon size="32rpx" name="/static/img/home/internshipJobIcon.png"></u-icon>
  53 + <u-icon size="32rpx" :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipJobIcon.png`"></u-icon>
54 54 <text>实习岗位</text>
55 55 <text>{{item.jobName|| '--'}}</text>
56 56 </view>
... ... @@ -65,38 +65,38 @@
65 65 </view>
66 66 <view v-else class="no_data">
67 67 <c-no-data></c-no-data>
68   - </view>
69   -
70   - <u-popup :show="show" mode="bottom" @close="close" :round="22">
71   - <view class="popup">
72   - <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
73   - <view class="title">
74   - 项目筛选
75   - </view>
76   - <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
77   - </view>
78   - <view class="search">
79   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
80   - bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
81   - </u-search>
82   - </view>
83   - <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
84   - @scrolltolower="lower()">
85   - <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
86   - <view style="display: flex; align-items: center; justify-content: space-between;">
87   - <view class="item_title">
88   - {{item.name}}
89   - </view>
90   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
91   - </view>
92   - </view>
93   - </scroll-view>
94   - <view v-else class="no_data" @click="jumpVerified">
95   - <view class="text_black_28">
96   - 暂未搜索到该项目
97   - </view>
98   - </view>
99   - </view>
  68 + </view>
  69 +
  70 + <u-popup :show="show" mode="bottom" @close="close" :round="22">
  71 + <view class="popup">
  72 + <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
  73 + <view class="title">
  74 + 项目筛选
  75 + </view>
  76 + <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
  77 + </view>
  78 + <view class="search">
  79 + <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  80 + bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
  81 + </u-search>
  82 + </view>
  83 + <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
  84 + @scrolltolower="lower()">
  85 + <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
  86 + <view style="display: flex; align-items: center; justify-content: space-between;">
  87 + <view class="item_title">
  88 + {{item.name}}
  89 + </view>
  90 + <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  91 + </view>
  92 + </view>
  93 + </scroll-view>
  94 + <view v-else class="no_data" @click="jumpVerified">
  95 + <view class="text_black_28">
  96 + 暂未搜索到该项目
  97 + </view>
  98 + </view>
  99 + </view>
100 100 </u-popup>
101 101
102 102 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
... ... @@ -170,11 +170,11 @@
170 170
171 171 },
172 172 projectId: '',
173   - switchValue: false,
174   - curNow: 1,
175   - sxsearch: '',
176   - works: [],
177   - workspage: 1,
  173 + switchValue: false,
  174 + curNow: 1,
  175 + sxsearch: '',
  176 + works: [],
  177 + workspage: 1,
178 178 workstotal: 0,
179 179 }
180 180 },
... ... @@ -186,13 +186,13 @@
186 186 // })
187 187
188 188 // this.search.keySearch = '';
189   -
190   - this.worksloadData()
  189 +
  190 + this.worksloadData()
191 191
192 192 if (option && option.status) {
193 193 // this.search.status = 'wait';
194 194 // this.checkboxValue = ['待审核'];
195   - // this.switchValue = true;
  195 + // this.switchValue = true;
196 196 this.curNow = 0;
197 197 }
198 198
... ... @@ -204,10 +204,10 @@
204 204 },
205 205
206 206 onShow() {
207   - this.finished = false;
208   - this.loading = "loadmore";
209   - this.page = 0;
210   - this.list = [];
  207 + this.finished = false;
  208 + this.loading = "loadmore";
  209 + this.page = 0;
  210 + this.list = [];
211 211 this._getList();
212 212 },
213 213
... ... @@ -220,20 +220,20 @@
220 220
221 221 },
222 222
223   - methods: {
224   -
225   - searchCli() {
226   - this.$u.route('/pages/main/home/search/search?type=reg&searchkey=' + this.keyword);
227   - },
228   -
229   - sectionChange(index) {
230   - this.curNow = index;
231   -
232   - this.finished = false;
233   - this.loading = "loadmore";
234   - this.page = 0;
235   - this.list = [];
236   - this._getList();
  223 + methods: {
  224 +
  225 + searchCli() {
  226 + this.$u.route('/pages/main/home/search/search?type=reg&searchkey=' + this.keyword);
  227 + },
  228 +
  229 + sectionChange(index) {
  230 + this.curNow = index;
  231 +
  232 + this.finished = false;
  233 + this.loading = "loadmore";
  234 + this.page = 0;
  235 + this.list = [];
  236 + this._getList();
237 237 },
238 238
239 239 handelDetail(record) {
... ... @@ -294,12 +294,12 @@
294 294
295 295 // if (search.status) {
296 296 // params.status = search.status;
297   - // }
298   -
299   - if (this.curNow == 0) {
300   - params.status = 'wait';
301   - }else {
302   - params.status = 'wait,pass,reject';
  297 + // }
  298 +
  299 + if (this.curNow == 0) {
  300 + params.status = 'wait';
  301 + }else {
  302 + params.status = 'wait,pass,reject';
303 303 }
304 304
305 305 if (this.keyword) {
... ... @@ -370,52 +370,52 @@
370 370
371 371 this.show = false;
372 372 },
373   -
374   - workSearch() {
375   - uni.hideKeyboard();
376   - this.works = []
377   - this.worksloadData()
378   - },
379   -
380   - lower() {
381   - setTimeout(() => {
382   - this.worksloadData(true);
383   - }, 200)
384   - },
385   -
386   - worksloadData(e) {
387   - let params = {}
388   - // this.loading = 'loading'
389   -
390   - if (e) {
391   - if (this.total <= this.works.length) {
392   - // this.loading = 'nomore'
393   - return
394   - }
395   - this.workspage++
396   - } else {
397   - this.workspage = 1
398   - }
399   - params['pageNumber'] = this.workspage
400   - if (this.sxsearch) {
401   - params['keyWord'] = this.sxsearch
402   - }
403   - getProjectListApi(params).then(async res => {
404   - if (res) {
405   - this.total = res.total
406   - // this.loading = 'loadmore'
407   - this.works = this.works.concat(res.records)
408   - }
409   - })
410   - },
411   - popupSelItem(item) {
412   - this.show = false
413   - this.projectId = item.id;
414   - this.finished = false;
415   - this.loading = "loadmore";
416   - this.page = 0;
417   - this.list = [];
418   - this._getList();
  373 +
  374 + workSearch() {
  375 + uni.hideKeyboard();
  376 + this.works = []
  377 + this.worksloadData()
  378 + },
  379 +
  380 + lower() {
  381 + setTimeout(() => {
  382 + this.worksloadData(true);
  383 + }, 200)
  384 + },
  385 +
  386 + worksloadData(e) {
  387 + let params = {}
  388 + // this.loading = 'loading'
  389 +
  390 + if (e) {
  391 + if (this.total <= this.works.length) {
  392 + // this.loading = 'nomore'
  393 + return
  394 + }
  395 + this.workspage++
  396 + } else {
  397 + this.workspage = 1
  398 + }
  399 + params['pageNumber'] = this.workspage
  400 + if (this.sxsearch) {
  401 + params['keyWord'] = this.sxsearch
  402 + }
  403 + getProjectListApi(params).then(async res => {
  404 + if (res) {
  405 + this.total = res.total
  406 + // this.loading = 'loadmore'
  407 + this.works = this.works.concat(res.records)
  408 + }
  409 + })
  410 + },
  411 + popupSelItem(item) {
  412 + this.show = false
  413 + this.projectId = item.id;
  414 + this.finished = false;
  415 + this.loading = "loadmore";
  416 + this.page = 0;
  417 + this.list = [];
  418 + this._getList();
419 419 },
420 420 }
421 421 }
... ... @@ -533,25 +533,25 @@
533 533
534 534 .item {
535 535
536   - view {
537   - display: flex;
538   - flex-flow: row wrap;
539   - align-items: center;
540   - width: 500rpx;
541   - height: 74rpx;
542   - border-radius: 4rpx;
543   - border: 2rpx solid #C1C1C9;
544   - margin: 0 10rpx 20rpx;
545   - font-size: 24rpx;
546   - line-height: 32rpx;
547   - color: #C0C0C9;
548   - padding: 16rpx 20rpx;
549   - }
550   -
551   - .selectItem {
552   - background-color: var(--primary-color);
553   - color: #FFFFFF;
554   - border: 2rpx solid var(--primary-color);
  536 + view {
  537 + display: flex;
  538 + flex-flow: row wrap;
  539 + align-items: center;
  540 + width: 500rpx;
  541 + height: 74rpx;
  542 + border-radius: 4rpx;
  543 + border: 2rpx solid #C1C1C9;
  544 + margin: 0 10rpx 20rpx;
  545 + font-size: 24rpx;
  546 + line-height: 32rpx;
  547 + color: #C0C0C9;
  548 + padding: 16rpx 20rpx;
  549 + }
  550 +
  551 + .selectItem {
  552 + background-color: var(--primary-color);
  553 + color: #FFFFFF;
  554 + border: 2rpx solid var(--primary-color);
555 555 }
556 556 }
557 557 }
... ... @@ -596,53 +596,53 @@
596 596 width: 346rpx;
597 597 }
598 598 }
599   - }
600   -
601   - .popup {
602   - height: 500px;
603   - padding: 19px 16px;
604   -
605   - .title {
606   - font-size: 18px;
607   - font-family: PingFangSC-Medium, PingFang SC;
608   - font-weight: 500;
609   - color: #000000;
610   - }
611   -
612   - .close {
613   - width: 22px;
614   - height: 22px;
615   - }
616   -
617   - .item_box {
618   - border-radius: 4px;
619   - margin: 0 0 48rpx;
620   -
621   - .item_title {
622   - height: 20px;
623   - font-size: 14px;
624   - font-family: PingFangSC-Regular, PingFang SC;
625   - font-weight: 400;
626   - color: rgba(0, 0, 0, 0.65);
627   - line-height: 20px;
628   - }
629   -
630   - }
631   -
632   - .no_data {
633   - width: 100%;
634   - margin-top: 310rpx;
635   -
636   - .text_black_28 {
637   - font-size: 14px;
638   - font-family: PingFangSC-Light, PingFang SC;
639   - font-weight: 300;
640   - color: rgba(0, 0, 0, 0.65);
641   - text-align: center;
642   - }
643   -
644   - }
645   -
  599 + }
  600 +
  601 + .popup {
  602 + height: 500px;
  603 + padding: 19px 16px;
  604 +
  605 + .title {
  606 + font-size: 18px;
  607 + font-family: PingFangSC-Medium, PingFang SC;
  608 + font-weight: 500;
  609 + color: #000000;
  610 + }
  611 +
  612 + .close {
  613 + width: 22px;
  614 + height: 22px;
  615 + }
  616 +
  617 + .item_box {
  618 + border-radius: 4px;
  619 + margin: 0 0 48rpx;
  620 +
  621 + .item_title {
  622 + height: 20px;
  623 + font-size: 14px;
  624 + font-family: PingFangSC-Regular, PingFang SC;
  625 + font-weight: 400;
  626 + color: rgba(0, 0, 0, 0.65);
  627 + line-height: 20px;
  628 + }
  629 +
  630 + }
  631 +
  632 + .no_data {
  633 + width: 100%;
  634 + margin-top: 310rpx;
  635 +
  636 + .text_black_28 {
  637 + font-size: 14px;
  638 + font-family: PingFangSC-Light, PingFang SC;
  639 + font-weight: 300;
  640 + color: rgba(0, 0, 0, 0.65);
  641 + text-align: center;
  642 + }
  643 +
  644 + }
  645 +
646 646 }
647 647 }
648   -</style>
  648 +</style>
... ...
... ... @@ -4,7 +4,7 @@
4 4 <view class="report_info">
5 5
6 6 <view class="bg_image" v-if="detail.status == 'stay_examine'">
7   - <u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
  7 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
8 8 <text>待审核</text>
9 9 </view>
10 10
... ... @@ -216,54 +216,54 @@
216 216 })
217 217 },
218 218
219   - openLink(e) {
220   - var _this = this
221   -
222   - uni.showLoading({
223   - title: '努力加载中~',
224   - mask: true
225   - })
226   -
227   - getImgUrlApi({
228   - bucket: e.bucket,
229   - filePath: e.object
230   - }).then(data => {
231   - console.log("data...", data)
232   - if (e.mime_type.indexOf("image") != -1) {
233   - _this.openImage(data.url)
234   - } else {
235   - uni.downloadFile({
236   - url: data.url,
237   - success: function(res) {
238   - var filePath = res.tempFilePath;
239   - uni.openDocument({
240   - filePath: filePath,
241   - showMenu: true,
242   - success: function(res) {
243   - console.log('打开文档成功');
244   - },
245   - complete: function() {
246   - uni.hideLoading();
247   - }
248   - });
249   - }
250   - });
251   - }
252   - })
253   - },
254   - openImage(imgPath) {
255   - let array = new Array(1).fill(imgPath);
256   - uni.previewImage({
257   - urls: array,
258   - success(res) {
259   - uni.hideLoading();
260   - console.log('openImage success');
261   - },
262   - fail(res) {
263   - uni.hideLoading();
264   - console.log('openImage fail:', res);
265   - }
266   - });
  219 + openLink(e) {
  220 + var _this = this
  221 +
  222 + uni.showLoading({
  223 + title: '努力加载中~',
  224 + mask: true
  225 + })
  226 +
  227 + getImgUrlApi({
  228 + bucket: e.bucket,
  229 + filePath: e.object
  230 + }).then(data => {
  231 + console.log("data...", data)
  232 + if (e.mime_type.indexOf("image") != -1) {
  233 + _this.openImage(data.url)
  234 + } else {
  235 + uni.downloadFile({
  236 + url: data.url,
  237 + success: function(res) {
  238 + var filePath = res.tempFilePath;
  239 + uni.openDocument({
  240 + filePath: filePath,
  241 + showMenu: true,
  242 + success: function(res) {
  243 + console.log('打开文档成功');
  244 + },
  245 + complete: function() {
  246 + uni.hideLoading();
  247 + }
  248 + });
  249 + }
  250 + });
  251 + }
  252 + })
  253 + },
  254 + openImage(imgPath) {
  255 + let array = new Array(1).fill(imgPath);
  256 + uni.previewImage({
  257 + urls: array,
  258 + success(res) {
  259 + uni.hideLoading();
  260 + console.log('openImage success');
  261 + },
  262 + fail(res) {
  263 + uni.hideLoading();
  264 + console.log('openImage fail:', res);
  265 + }
  266 + });
267 267 },
268 268
269 269 deletePic(index) {
... ... @@ -272,26 +272,26 @@
272 272
273 273 handelFile() {
274 274 let _this = this;
275   -
276   - let formdata = {}
277   - if (this.ossInit.uploadType == 'minio') {
278   - formdata = {
279   - 'bucket': _this.ossInit.bucket,
280   - 'dir': _this.ossInit.dir,
281   - 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
282   - 'accessId': _this.ossInit.accessId,
283   - 'policy': _this.ossInit.policy
284   - }
285   - }else {
286   - formdata = {
287   - 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
288   - // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
289   - 'action': `${_this.ossInit.host}`,
290   - 'OSSAccessKeyId': _this.ossInit.accessId,
291   - 'policy': _this.ossInit.policy,
292   - 'signature': _this.ossInit.signature,
293   - 'callback': _this.ossInit.callback,
294   - }
  275 +
  276 + let formdata = {}
  277 + if (this.ossInit.uploadType == 'minio') {
  278 + formdata = {
  279 + 'bucket': _this.ossInit.bucket,
  280 + 'dir': _this.ossInit.dir,
  281 + 'fileName': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  282 + 'accessId': _this.ossInit.accessId,
  283 + 'policy': _this.ossInit.policy
  284 + }
  285 + }else {
  286 + formdata = {
  287 + 'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
  288 + // 'key': `${_this.ossInit.dir}${new Date().getTime()}`,
  289 + 'action': `${_this.ossInit.host}`,
  290 + 'OSSAccessKeyId': _this.ossInit.accessId,
  291 + 'policy': _this.ossInit.policy,
  292 + 'signature': _this.ossInit.signature,
  293 + 'callback': _this.ossInit.callback,
  294 + }
295 295 }
296 296 wx.chooseMessageFile({
297 297 count: 9,
... ... @@ -339,38 +339,38 @@
339 339
340 340 hancelSubmit() {
341 341 this.beginshow = true
342   - },
343   -
344   - bconfirm() {
345   - if (!this.pf) {
346   - uni.showToast({
347   - title: '请输入评分',
348   - icon: 'none',
349   - duration: 1500
350   - });
351   - return
352   - }
353   - if (Number(this.pf) < 0 || Number(this.pf) > 100) {
354   - uni.showToast({
355   - title: '评分范围1~100分',
356   - icon: 'none',
357   - duration: 1500
358   - });
359   - return
360   - }
361   - this.beginshow = false
362   - putReportReviewApi(this.id, {
363   - status: 'adopt',
364   - reviewAttachments: JSON.stringify(this.attachments),
365   - review: this.textarea,
366   - score: this.pf
367   - }).then(data => {
368   - if (data) {
369   - uni.navigateBack({
370   - delta: 1
371   - });
372   - }
373   - })
  342 + },
  343 +
  344 + bconfirm() {
  345 + if (!this.pf) {
  346 + uni.showToast({
  347 + title: '请输入评分',
  348 + icon: 'none',
  349 + duration: 1500
  350 + });
  351 + return
  352 + }
  353 + if (Number(this.pf) < 0 || Number(this.pf) > 100) {
  354 + uni.showToast({
  355 + title: '评分范围1~100分',
  356 + icon: 'none',
  357 + duration: 1500
  358 + });
  359 + return
  360 + }
  361 + this.beginshow = false
  362 + putReportReviewApi(this.id, {
  363 + status: 'adopt',
  364 + reviewAttachments: JSON.stringify(this.attachments),
  365 + review: this.textarea,
  366 + score: this.pf
  367 + }).then(data => {
  368 + if (data) {
  369 + uni.navigateBack({
  370 + delta: 1
  371 + });
  372 + }
  373 + })
374 374 },
375 375
376 376 close() {
... ... @@ -587,15 +587,15 @@
587 587 font-family: PingFangSC-Light, PingFang SC;
588 588 font-weight: 300;
589 589 color: #FF8200;
590   - }
591   -
592   - .input {
593   - width: 100%;
594   - height: 73px;
595   - margin: 30px 0;
596   - display: flex;
597   - justify-content: space-between;
598   - align-items: center;
  590 + }
  591 +
  592 + .input {
  593 + width: 100%;
  594 + height: 73px;
  595 + margin: 30px 0;
  596 + display: flex;
  597 + justify-content: space-between;
  598 + align-items: center;
599 599 }
600 600
601 601 .btm {
... ... @@ -655,4 +655,4 @@
655 655 }
656 656 }
657 657 }
658   -</style>
  658 +</style>
... ...
1 1 <template>
2 2 <view class="registration_review" :style="vuex_theme">
3   - <view class="search_box">
4   - <!-- <view class="check">
5   - <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
6   - <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
7   - v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
8   - activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
9   - </u-checkbox>
10   - </u-checkbox-group>
11   - </view> -->
12   -
13   - <!-- <view class="search">
14   - <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
15   - bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
16   - </u-search>
17   - </view> -->
18   - <view style="width: 148px;">
19   - <u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'"
20   - @change="sectionChange"></u-subsection>
21   - </view>
22   - <view style="display: flex; justify-content: space-between; align-items: center;">
23   - <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
24   - <view style="width: 16px;"></view>
25   - <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
26   - </view>
  3 + <view class="search_box">
  4 + <!-- <view class="check">
  5 + <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
  6 + <u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
  7 + v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
  8 + activeColor="var(--primary-color)" size="28rpx" labelSize="28rpx" labelColor="#202131">
  9 + </u-checkbox>
  10 + </u-checkbox-group>
  11 + </view> -->
  12 +
  13 + <!-- <view class="search">
  14 + <u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  15 + bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
  16 + </u-search>
  17 + </view> -->
  18 + <view style="width: 148px;">
  19 + <u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'"
  20 + @change="sectionChange"></u-subsection>
  21 + </view>
  22 + <view style="display: flex; justify-content: space-between; align-items: center;">
  23 + <u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
  24 + <view style="width: 16px;"></view>
  25 + <u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
  26 + </view>
27 27 </view>
28 28
29 29 <view class="list_box" v-if="list.length > 0">
30 30 <view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
31 31
32 32 <view class="bg_image" v-if="item.status == 'stay_examine'">
33   - <u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
  33 + <u-image :src="vuex_baseImgUrl && `${vuex_baseImgUrl}labelBgGreen.png`" width="142rpx" height="48rpx"></u-image>
34 34 <text>待审核</text>
35 35 </view>
36 36
... ... @@ -65,39 +65,39 @@
65 65 <view v-else class="no_data">
66 66 <c-no-data></c-no-data>
67 67 </view>
68   -
69   - <u-popup :show="show" mode="bottom" @close="close" :round="22">
70   - <view class="popup">
71   - <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
72   - <view class="title">
73   - 项目筛选
74   - </view>
75   - <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
76   - </view>
77   - <view class="search">
78   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
79   - bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
80   - </u-search>
81   - </view>
82   - <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
83   - @scrolltolower="lower()">
84   - <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
85   - <view style="display: flex; align-items: center; justify-content: space-between;">
86   - <view class="item_title">
87   - {{item.name}}
88   - </view>
89   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
90   - src="/static/img/home/popselect.png" mode=""></image>
91   - </view>
92   - </view>
93   - </scroll-view>
94   - <view v-else class="no_data" @click="jumpVerified">
95   - <view class="text_black_28">
96   - 暂未搜索到该项目
97   - </view>
98   - </view>
99   - </view>
100   - </u-popup>
  68 +
  69 + <u-popup :show="show" mode="bottom" @close="close" :round="22">
  70 + <view class="popup">
  71 + <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
  72 + <view class="title">
  73 + 项目筛选
  74 + </view>
  75 + <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
  76 + </view>
  77 + <view class="search">
  78 + <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  79 + bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
  80 + </u-search>
  81 + </view>
  82 + <scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
  83 + @scrolltolower="lower()">
  84 + <view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
  85 + <view style="display: flex; align-items: center; justify-content: space-between;">
  86 + <view class="item_title">
  87 + {{item.name}}
  88 + </view>
  89 + <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  90 + :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  91 + </view>
  92 + </view>
  93 + </scroll-view>
  94 + <view v-else class="no_data" @click="jumpVerified">
  95 + <view class="text_black_28">
  96 + 暂未搜索到该项目
  97 + </view>
  98 + </view>
  99 + </view>
  100 + </u-popup>
101 101
102 102 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
103 103 <view class="popup_search">
... ... @@ -182,32 +182,32 @@
182 182 list: [], //列表必须为key list的数组
183 183 projectId: '',
184 184 switchValue: false,
185   - curNow: 1,
186   - sxsearch: '',
187   - works: [],
188   - workspage: 1,
  185 + curNow: 1,
  186 + sxsearch: '',
  187 + works: [],
  188 + workspage: 1,
189 189 workstotal: 0,
190 190 }
191 191 },
192 192
193   - onLoad(option) {
  193 + onLoad(option) {
194 194 console.log(option)
195 195 this.studentId = option.studentId;
196 196 this.projectId = option.projectId;
197 197
198 198 // this.$store.dispatch(`home/getProjectList`, {
199 199 // pageSize: -1,
200   - // })
201   -
  200 + // })
  201 +
202 202 this.worksloadData()
203 203
204   - // this.search.keySearch = '';
205   -
206   - if (option && option.status) {
207   - // this.search.status = 'stay_examine';
208   - // this.checkboxValue = ['待批阅'];
209   - // this.switchValue = true;
210   - this.curNow = 0;
  204 + // this.search.keySearch = '';
  205 +
  206 + if (option && option.status) {
  207 + // this.search.status = 'stay_examine';
  208 + // this.checkboxValue = ['待批阅'];
  209 + // this.switchValue = true;
  210 + this.curNow = 0;
211 211 }
212 212
213 213 this.finished = false;
... ... @@ -217,10 +217,10 @@
217 217 },
218 218
219 219 onShow() {
220   - this.finished = false;
221   - this.loading = "loadmore";
222   - this.page = 0;
223   - this.list = [];
  220 + this.finished = false;
  221 + this.loading = "loadmore";
  222 + this.page = 0;
  223 + this.list = [];
224 224 this._getList();
225 225 },
226 226
... ... @@ -233,21 +233,21 @@
233 233
234 234 },
235 235
236   - methods: {
237   -
238   - searchCli() {
239   - this.$u.route('/pages/main/home/search/search?type=report&searchkey=' + this.keyword);
240   - },
241   -
242   - sectionChange(index) {
243   - this.curNow = index;
244   -
245   - this.finished = false;
246   - this.loading = "loadmore";
247   - this.page = 0;
248   - this.list = [];
249   - this._getList();
250   - },
  236 + methods: {
  237 +
  238 + searchCli() {
  239 + this.$u.route('/pages/main/home/search/search?type=report&searchkey=' + this.keyword);
  240 + },
  241 +
  242 + sectionChange(index) {
  243 + this.curNow = index;
  244 +
  245 + this.finished = false;
  246 + this.loading = "loadmore";
  247 + this.page = 0;
  248 + this.list = [];
  249 + this._getList();
  250 + },
251 251
252 252 getNameLastTwo(value) {
253 253 if (value && value.length > 3) {
... ... @@ -328,18 +328,18 @@
328 328
329 329 // if (search.status) {
330 330 // params.status = search.status;
331   - // }
332   -
333   - if (this.curNow == 0) {
334   - params.status = 'stay_examine';
  331 + // }
  332 +
  333 + if (this.curNow == 0) {
  334 + params.status = 'stay_examine';
335 335 }
336 336
337 337 if (this.keyword) {
338 338 params.keySearch = this.keyword
339   - }
340   -
341   - if (this.studentId) {
342   - params.studentId = this.studentId
  339 + }
  340 +
  341 + if (this.studentId) {
  342 + params.studentId = this.studentId
343 343 }
344 344
345 345 if (this.projectId) {
... ... @@ -369,14 +369,14 @@
369 369 this.shownoData = true
370 370 }
371 371
372   - this.list = this.list.concat(result.records)
373   -
374   - // 判断是否全部加载完成
375   - if (this.total == this.list.length) {
376   - this.finished = true;
377   - this.loading = 'nomore';
378   - } else {
379   - this.loading = 'loadmore';
  372 + this.list = this.list.concat(result.records)
  373 +
  374 + // 判断是否全部加载完成
  375 + if (this.total == this.list.length) {
  376 + this.finished = true;
  377 + this.loading = 'nomore';
  378 + } else {
  379 + this.loading = 'loadmore';
380 380 }
381 381 },
382 382
... ... @@ -406,52 +406,52 @@
406 406
407 407 this.show = false;
408 408 },
409   -
410   - workSearch() {
411   - uni.hideKeyboard();
412   - this.works = []
413   - this.worksloadData()
414   - },
415   -
416   - lower() {
417   - setTimeout(() => {
418   - this.worksloadData(true);
419   - }, 200)
420   - },
421   -
422   - worksloadData(e) {
423   - let params = {}
424   - // this.loading = 'loading'
425   -
426   - if (e) {
427   - if (this.total <= this.works.length) {
428   - // this.loading = 'nomore'
429   - return
430   - }
431   - this.workspage++
432   - } else {
433   - this.workspage = 1
434   - }
435   - params['pageNumber'] = this.workspage
436   - if (this.sxsearch) {
437   - params['keyWord'] = this.sxsearch
438   - }
439   - getProjectListApi(params).then(async res => {
440   - if (res) {
441   - this.total = res.total
442   - // this.loading = 'loadmore'
443   - this.works = this.works.concat(res.records)
444   - }
445   - })
446   - },
447   - popupSelItem(item) {
448   - this.show = false
449   - this.projectId = item.id;
450   - this.finished = false;
451   - this.loading = "loadmore";
452   - this.page = 0;
453   - this.list = [];
454   - this._getList();
  409 +
  410 + workSearch() {
  411 + uni.hideKeyboard();
  412 + this.works = []
  413 + this.worksloadData()
  414 + },
  415 +
  416 + lower() {
  417 + setTimeout(() => {
  418 + this.worksloadData(true);
  419 + }, 200)
  420 + },
  421 +
  422 + worksloadData(e) {
  423 + let params = {}
  424 + // this.loading = 'loading'
  425 +
  426 + if (e) {
  427 + if (this.total <= this.works.length) {
  428 + // this.loading = 'nomore'
  429 + return
  430 + }
  431 + this.workspage++
  432 + } else {
  433 + this.workspage = 1
  434 + }
  435 + params['pageNumber'] = this.workspage
  436 + if (this.sxsearch) {
  437 + params['keyWord'] = this.sxsearch
  438 + }
  439 + getProjectListApi(params).then(async res => {
  440 + if (res) {
  441 + this.total = res.total
  442 + // this.loading = 'loadmore'
  443 + this.works = this.works.concat(res.records)
  444 + }
  445 + })
  446 + },
  447 + popupSelItem(item) {
  448 + this.show = false
  449 + this.projectId = item.id;
  450 + this.finished = false;
  451 + this.loading = "loadmore";
  452 + this.page = 0;
  453 + this.list = [];
  454 + this._getList();
455 455 },
456 456 }
457 457 }
... ... @@ -464,20 +464,20 @@
464 464 height: auto;
465 465 background-color: #F7F7F7;
466 466
467   - .search_box {
468   - padding: 36rpx 30rpx 12rpx;
469   - background-color: #FFFFFF;
470   - display: flex;
471   - flex-flow: row nowrap;
472   - justify-content: space-between;
473   -
474   - .check {
475   - padding: 20rpx 0 0 0;
476   - }
477   -
478   - .search {
479   - width: 468rpx;
480   - }
  467 + .search_box {
  468 + padding: 36rpx 30rpx 12rpx;
  469 + background-color: #FFFFFF;
  470 + display: flex;
  471 + flex-flow: row nowrap;
  472 + justify-content: space-between;
  473 +
  474 + .check {
  475 + padding: 20rpx 0 0 0;
  476 + }
  477 +
  478 + .search {
  479 + width: 468rpx;
  480 + }
481 481 }
482 482
483 483 .list_box {
... ... @@ -575,32 +575,32 @@
575 575 color: #202131;
576 576 }
577 577
578   - .scroll {
579   - max-height: 60vh;
580   -
581   - .item {
582   -
583   - view {
584   - display: flex;
585   - flex-flow: row wrap;
586   - align-items: center;
587   - width: 500rpx;
588   - height: 74rpx;
589   - border-radius: 4rpx;
590   - border: 2rpx solid #C1C1C9;
591   - margin: 0 10rpx 20rpx;
592   - font-size: 24rpx;
593   - line-height: 32rpx;
594   - color: #C0C0C9;
595   - padding: 16rpx 20rpx;
596   - }
597   -
598   - .selectItem {
599   - background-color: var(--primary-color);
600   - color: #FFFFFF;
601   - border: 2rpx solid var(--primary-color);
602   - }
603   - }
  578 + .scroll {
  579 + max-height: 60vh;
  580 +
  581 + .item {
  582 +
  583 + view {
  584 + display: flex;
  585 + flex-flow: row wrap;
  586 + align-items: center;
  587 + width: 500rpx;
  588 + height: 74rpx;
  589 + border-radius: 4rpx;
  590 + border: 2rpx solid #C1C1C9;
  591 + margin: 0 10rpx 20rpx;
  592 + font-size: 24rpx;
  593 + line-height: 32rpx;
  594 + color: #C0C0C9;
  595 + padding: 16rpx 20rpx;
  596 + }
  597 +
  598 + .selectItem {
  599 + background-color: var(--primary-color);
  600 + color: #FFFFFF;
  601 + border: 2rpx solid var(--primary-color);
  602 + }
  603 + }
604 604 }
605 605
606 606 .time {
... ... @@ -647,53 +647,53 @@
647 647 width: 346rpx;
648 648 }
649 649 }
650   - }
651   -
652   - .popup {
653   - height: 500px;
654   - padding: 19px 16px;
655   -
656   - .title {
657   - font-size: 18px;
658   - font-family: PingFangSC-Medium, PingFang SC;
659   - font-weight: 500;
660   - color: #000000;
661   - }
662   -
663   - .close {
664   - width: 22px;
665   - height: 22px;
666   - }
667   -
668   - .item_box {
669   - border-radius: 4px;
670   - margin: 0 0 48rpx;
671   -
672   - .item_title {
673   - height: 20px;
674   - font-size: 14px;
675   - font-family: PingFangSC-Regular, PingFang SC;
676   - font-weight: 400;
677   - color: rgba(0, 0, 0, 0.65);
678   - line-height: 20px;
679   - }
680   -
681   - }
682   -
683   - .no_data {
684   - width: 100%;
685   - margin-top: 310rpx;
686   -
687   - .text_black_28 {
688   - font-size: 14px;
689   - font-family: PingFangSC-Light, PingFang SC;
690   - font-weight: 300;
691   - color: rgba(0, 0, 0, 0.65);
692   - text-align: center;
693   - }
694   -
695   - }
696   -
  650 + }
  651 +
  652 + .popup {
  653 + height: 500px;
  654 + padding: 19px 16px;
  655 +
  656 + .title {
  657 + font-size: 18px;
  658 + font-family: PingFangSC-Medium, PingFang SC;
  659 + font-weight: 500;
  660 + color: #000000;
  661 + }
  662 +
  663 + .close {
  664 + width: 22px;
  665 + height: 22px;
  666 + }
  667 +
  668 + .item_box {
  669 + border-radius: 4px;
  670 + margin: 0 0 48rpx;
  671 +
  672 + .item_title {
  673 + height: 20px;
  674 + font-size: 14px;
  675 + font-family: PingFangSC-Regular, PingFang SC;
  676 + font-weight: 400;
  677 + color: rgba(0, 0, 0, 0.65);
  678 + line-height: 20px;
  679 + }
  680 +
  681 + }
  682 +
  683 + .no_data {
  684 + width: 100%;
  685 + margin-top: 310rpx;
  686 +
  687 + .text_black_28 {
  688 + font-size: 14px;
  689 + font-family: PingFangSC-Light, PingFang SC;
  690 + font-weight: 300;
  691 + color: rgba(0, 0, 0, 0.65);
  692 + text-align: center;
  693 + }
  694 +
  695 + }
  696 +
697 697 }
698 698 }
699   -</style>
  699 +</style>
... ...
请 注册 或 登录 后发表评论