From 83b8185caf42a0bb008bb31b8b42a4d825ccbaff Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 08 七月 2024 12:00:16 +0800
Subject: [PATCH] 1
---
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 63 ++++++-------------------------
pages/retrievalPage/index.wxml | 2 -
packageBookService/pages/bookServices/detail/index.js | 3 +
pages/home/home.wxml | 2
packageBookService/pages/components/webView/index.json | 2
5 files changed, 17 insertions(+), 55 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index 0959ce7..4bff572 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -1,14 +1,6 @@
<view class="teach-btn" wx:if="{{false}}">
- <t-button
- theme="primary"
- style="width: 120px; height: 36px"
- class="btn-upload"
- wx:if="{{false}}"
- >
- <t-image
- src="/static/images/bookService/detail/upload.png"
- style="margin-top: 20rpx"
- ></t-image>
+ <t-button theme="primary" style="width: 120px; height: 36px" class="btn-upload" wx:if="{{false}}">
+ <t-image src="/static/images/bookService/detail/upload.png" style="margin-top: 20rpx"></t-image>
<text>涓婁紶璧勬簮</text>
</t-button>
<t-button theme="primary" style="width: 120px; height: 36px">
@@ -16,59 +8,28 @@
鎵归噺涓嬭浇
</t-button>
</view>
-<view
- class="applyResult {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}"
->
- <view wx:if="{{applyState == 'WaitAudit'}}"
- >璧勬簮涓嬭浇鐢宠姝ｅ湪瀹℃牳涓紝璇疯�愬績绛夊緟锛�</view
- >
+<view class="applyResult {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}">
+ <view wx:if="{{applyState == 'WaitAudit'}}">璧勬簮涓嬭浇鐢宠姝ｅ湪瀹℃牳涓紝璇疯�愬績绛夊緟锛�</view>
<view wx:if="{{applyState == 'Normal'}}">
<view>
- 璧勬簮涓嬭浇鐢宠宸查�氳繃<text wx:if="{{deadline}}"
- >锛屾湁鏁堟棩鏈熸埅鑷筹細{{ deadline }}</text
- ></view
- >
+ 璧勬簮涓嬭浇鐢宠宸查�氳繃<text wx:if="{{deadline}}">锛屾湁鏁堟棩鏈熸埅鑷筹細{{ deadline }}</text></view>
<view style="display: flex; align-items: center; margin-top: 10rpx">
- <text>涓嬭浇璧勬簮璇峰埌PC绔含甯圗璇�</text> <text bind:tap="copy" class="copy-text">澶嶅埗</text>
+ <text>涓嬭浇璧勬簮璇峰埌PC绔含甯堟櫤鏁�</text> <text bind:tap="copy" class="copy-text">澶嶅埗</text>
</view>
</view>
- <view wx:if="{{applyState == 'Reject'}}"
- >璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�</view
- >
+ <view wx:if="{{applyState == 'Reject'}}">璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�</view>
<view wx:if="{{applyState == 'none'}}">
璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�
</view>
<view class="btn-box">
- <t-button
- wx:if="{{applyState == 'Reject'}}"
- bind:tap="checkCause"
- style="height: 50rpx"
- class="rejectBtn"
- bind:tap="showDialog"
- >鏌ョ湅鍘熷洜</t-button
- >
- <t-button
- wx:if="{{applyState == 'none' || applyState == 'Reject'}}"
- theme="primary"
- bind:tap="applyResource"
- class="applyBtn"
- style="height: 50rpx"
- >鐢宠</t-button
- >
+ <t-button wx:if="{{applyState == 'Reject'}}" bind:tap="checkCause" style="height: 50rpx" class="rejectBtn" bind:tap="showDialog">鏌ョ湅鍘熷洜</t-button>
+ <t-button wx:if="{{applyState == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx">鐢宠</t-button>
</view>
</view>
<!-- 鏈�氳繃鍘熷洜 -->
-<t-dialog
- visible="{{showRejectDialog}}"
- title="鎻愮ず"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeDialog"
- class="notPassed"
->
+<t-dialog visible="{{showRejectDialog}}" title="鎻愮ず" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" class="notPassed">
<view slot="content">
- <text class="cause-title"
- >璧勬簮涓嬭浇鐢宠鏈�氳繃锛岃В鍐抽棶棰樺悗鍙偣鍑烩�滅敵璇封�濇寜閽噸鏂版彁浜ょ敵璇�</text
- >
+ <text class="cause-title">璧勬簮涓嬭浇鐢宠鏈�氳繃锛岃В鍐抽棶棰樺悗鍙偣鍑烩�滅敵璇封�濇寜閽噸鏂版彁浜ょ敵璇�</text>
<view class="cause-content">鍘熷洜:{{ rejectCause || '-'}}</view>
</view>
-</t-dialog>
+</t-dialog>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index e500b90..5a990bc 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -2211,7 +2211,10 @@
});
return false;
} else if (isApply.state == 'Normal') {
+ console.log(isApply.state, "isApply.state")
const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+ console.log(isApply.feedBack.endDate, new Date()
+ 'ooo')
if (flag) {
wx.showToast({
title: "璇ヤ功宸茬敵璇凤紒",
diff --git a/packageBookService/pages/components/webView/index.json b/packageBookService/pages/components/webView/index.json
index 18f244f..d0fd013 100644
--- a/packageBookService/pages/components/webView/index.json
+++ b/packageBookService/pages/components/webView/index.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "浜笀E璇�",
+ "navigationBarTitleText": "浜笀鏅烘暀",
"usingComponents": {
"t-loading": "tdesign-miniprogram/loading/loading"
}
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 064479c..b8cc110 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,7 +1,7 @@
<view class="container">
<t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" wx:if="{{!loading}}" bind:scroll="onScroll">
<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
- <text class="text">浜笀E璇�</text>
+ <text class="text">浜笀鏅烘暀</text>
</view>
<view class="home-page-header">
<view class="bg">
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index 3dd3d9e..2ae370f 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -92,7 +92,6 @@
</scroll-view>
</t-tab-panel>
<t-tab-panel label="涓撻({{seminarTotal}})" value="3">
-
<scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
<view class="listBox">
<view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox" data-item="{{item}}" bind:tap="underConstruction">
@@ -114,7 +113,6 @@
</view>
</view>
</view>
-
<view wx:if="{{seminarData.length != 0}}" class="bottom-box">
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
--
Gitblit v1.9.1