Changes

app/admin/controller/borrow/BorrowApp.php

@@ -598,6 +598,8 @@ class BorrowApp extends Backend
                     $data['status'] = 2;
                 }else{
                     $data['status'] = 0;
+                    $data['annotation'] = '';
+                    $data['college_annotation'] = '';
                 }
                 //判断是否是科研类借取并判断是否需要领导审核
                 if ($data['purpose'] == 0) {

app/admin/controller/borrow/BorrowApply.php

@@ -237,11 +237,13 @@ class BorrowApply extends Backend
             }
             $data = $this->excludeFields($data);
             if($data['status'] != 8){
+                $data['status'] = 2;
                 $this->BorrowTools->checkRules($data);
                 $data = $this->BorrowTools->checkText($data);
                 $this->BorrowTools->checkAsset($data);
+            }else{
+                $data['status'] = 0;
             }
-            $data['status'] = 0;
             $this->model->startTrans();
             $result = false;
             try {

uniapp/components/swiper-list-item/swiper-list-item.vue

@@ -3,7 +3,7 @@
 	<view class="content">
 		<!--  :enable-back-to-top="currentIndex===tabIndex" 在微信小程序上可以多加这一句，因为默认是允许点击返回顶部的，但是这个页面有多个scroll-view，会全部返回顶部，所以需要控制是当前index才允许点击返回顶部 -->
 		<!-- 如果当前页已经加载过数据或者当前切换到的tab是当前页，才展示当前页数据（懒加载） -->
-		<z-paging v-if="firstLoaded || isCurrentPage" ref="paging" v-model="dataList" @query="queryList" :fixed="false">
+		<z-paging v-if="firstLoaded || isCurrentPage" ref="paging" v-model="dataList" @query="queryList" :fixed="true">
 			<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
 					<view class="" style="overflow-y: scroll !important;height: 94vh;">
 							<block v-for="(items, indexs) in dataList" :key="indexs" v-if="dataList">

uniapp/pages/index/detail.vue

@@ -31,6 +31,10 @@
 						<view class="detail_tou">申请时间:</view>{{datailData.create_time}}{{'&nbsp;'}}
 					</view>
 					<uv-line></uv-line>
+					<view class="">
+						<view class="detail_tou">预计归还时间:</view>{{datailData.expected_end_time}}{{'&nbsp;'}}
+					</view>
+					<uv-line></uv-line>
 					<uni-collapse accordion v-model="accordionVal" @change="change">
 						<block v-if="datailData.borrow_reason!=null">
 							<uni-collapse-item
@@ -56,7 +60,7 @@
 							</uni-collapse-item>
 							<block v-else>
 								<view class="">
-									<view class="detail_tou">借取人备注: {{datailData.remarks}}</view>
+									<view class="text">借取人备注: {{datailData.remarks}}</view>
 								</view>
 								<uv-line></uv-line>
 							</block>

web/src/views/frontend/index.vue

@@ -32,7 +32,7 @@
             <img src="~assets/header/footer.png" alt="">
         </div>
         <div class="footer_text">
-            Copyright @ 2023~{{ new Date().getFullYear() }} 壹斗米工作室{{ siteConfig.siteName }}
+            Copyright @ 2023~{{ new Date().getFullYear() }} 壹斗米公司{{ siteConfig.siteName }}
             {{ $t('Copyright') }}
             <a href="http://beian.miit.gov.cn/">{{ siteConfig.recordNumber }}</a>
         </div>