Quellcode durchsuchen

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao vor 1 Jahr
Ursprung
Commit
1f876735c2

+ 2 - 2
config/index.js

@@ -1,7 +1,7 @@
 export default {
     base: {
-      // dev: 'http://1.15.92.205:7001',		
-      dev: 'https://api.xazhyc.com',
+      dev: 'http://1.15.92.205:7001',		
+      // dev: 'https://api.xazhyc.com',
 	  // dev: 'http://192.168.3.253:7001',	
       pro: 'https://api.xazhyc.com'
     },

+ 8 - 0
libs/request.js

@@ -4,12 +4,20 @@ import {
 	getToken
 } from '@/libs/auth.js';
 export async function request(params) {
+	
 	return new Promise(function(resolve, reject) {
 		try {
 			uni.showLoading({
 				title: '加载中',
 				mask: true
 			});
+			if(!getToken()&&params.url!=='/login'){
+				uni.clearStorageSync()
+				uni.reLaunch({
+					url: '/pages/login/index'
+				})
+				return
+			}
 			uni.request({
 				...formatRequestBody(params),
 				success(response) {

+ 35 - 7
pages/index/detail/detail.vue

@@ -10,7 +10,10 @@
 						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in items" :key="item.taskId" @click="handle('task',item)">
+						<view class="item" v-for="(item,taskIdx) in items" :key="item.taskId" @click="handle('task',item)">
+							<view class="index">
+								{{taskIdx+1}}
+							</view>							
 							<view class="title">
 								<view class="name">{{item.taskTitle}}</view>
 								<view class="state">{{taskStatus(item.status)}}</view>
@@ -42,7 +45,10 @@
 						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in items" :key="item.warnId" @click="handle('warn',item)">
+						<view class="item" v-for="(item,warnIdx) in items" :key="item.warnId" @click="handle('warn',item)">
+							<view class="index">
+								{{warnIdx+1}}
+							</view>
 							<view class="title">
 								<view class="name">{{item.warnTitle}}</view>
 								<view class="state">{{warningStatus(item.status)}}</view>
@@ -72,7 +78,10 @@
 						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in items" :key="item.alertId">
+						<view class="item" v-for="(item,alertIdx) in items" :key="item.alertId">
+							<view class="index">
+								{{alertIdx+1}}
+							</view>
 							<view class="title">
 								<view class="name">{{item.alertTitle}}</view>
 								<view class="state">{{alertStatus(item.status)}}</view>
@@ -104,7 +113,10 @@
 						<view class="tab-item" :class="activeTab===4?'active':''" @click="tabChange(-1,4)">我撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in items" :key="item.dangerId" @click="handle('danger',item)">
+						<view class="item" v-for="(item,dangerIdx) in items" :key="item.dangerId" @click="handle('danger',item)">
+							<view class="index">
+								{{dangerIdx+1}}
+							</view>
 							<view class="title">
 								<view class="name">{{item.dangerTitle}}</view>
 								<view class="state">{{dangerStatus(item.status)}}</view>
@@ -331,17 +343,33 @@
 							background-color: #fff;
 							border-radius: 12rpx;
 							margin-top: 16rpx;
-							padding: 24rpx 20rpx;
+							padding: 24rpx 20rpx 24rpx 55rpx;
+							position: relative;
+							.index{
+								width: 44rpx;
+								height: 44rpx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								border-radius: 50%;
+								color:#ea8259;
+								background-color:#fbf1ed;
+								font-size:18rpx;
+								position: absolute;
+								left: 4rpx;
+								top: 26rpx;
+								word-break: break-all;
+							}							
 							.title{
 								display: flex;
 								justify-content: space-between;
 								align-items: center;
 								.name{
-									font-size: 36rpx;
+									font-size: 32rpx;
 									color: rgba(0, 0, 0, 0.8);
 								}
 								.state{
-									font-size: 32rpx;
+									font-size: 30rpx;
 									color: rgba(250, 139, 55, 1);
 								}
 							}

+ 4 - 1
pages/index/handle/danger/index/index.vue

@@ -54,8 +54,11 @@
 				</view>
 			</uni-section>
 		</div>
-		<view class="button-container" @click="onSubmit" v-if="flowData.activityInsTitle">
+<!-- 		<view class="button-container" @click="onSubmit" v-if="flowData.activityInsTitle">
 			<text>{{flowData.activityInsTitle}}</text>
+		</view> -->
+		<view class="button-container" @click="onSubmit">
+			<text>提交</text>
 		</view>
 	</view>
 </template>

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-service.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/cache/wgt/__UNI__73F6024/app-view.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


BIN
unpackage/release/apk/__UNI__73F6024__20231215174505.apk → unpackage/release/apk/__UNI__73F6024__20231218102410.apk


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.