From 0b2357a173a2bc52f3532bfcf93ff31daf226231 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 06 九月 2023 14:44:23 +0800
Subject: [PATCH] 导航栏退出登录

---
 pages/tabBar/notice/measures.vue |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/pages/tabBar/notice/measures.vue b/pages/tabBar/notice/measures.vue
index 0a6832b..7aee752 100644
--- a/pages/tabBar/notice/measures.vue
+++ b/pages/tabBar/notice/measures.vue
@@ -12,7 +12,7 @@
 		</view>
 		<view class="measureCard">
 			<view class="first">
-				<text style="font-size: 16px;margin-bottom: 20px;">基础措施</text>
+				<text style="font-size: 16px;margin-bottom: 20px;"><text style="color: red;">*</text>基础措施</text>
 				 <u-checkbox-group
 				            v-model="checkboxValue1"
 				            placement="column"
@@ -43,8 +43,11 @@
 						:maxCount="10"
 						style="margin-top: -10px;"
 					></u-upload>
-					<view class="pic" v-for="(item,index) in nameList" :key="index">
-						{{item.name}}
+					<view :class="{pic: nameList.length>0}">
+						<view class="picItem" v-for="(item,index) in nameList" :key="index">
+							<image src="../../../static/pic.png">
+							{{item.name}}
+						</view>
 					</view>
 			</view>
 		</view>
@@ -56,6 +59,7 @@
 
 <script>
 	import { measureList, submitMeasures, getMeasureDetail } from '@/api/notice.js'
+	import VUE_APP_BASE_URL from '../../../common/constant.js'
 	export default {
 		components:{
 			
@@ -73,7 +77,7 @@
 				autoHeight: true,
 				detailData : {},
 				measureIds : [],
-				baseUrl: '',
+				baseUrl: VUE_APP_BASE_URL,
 				list: [],
 				showBtn: false
 			}
@@ -86,18 +90,12 @@
 			this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
 			uni.hideTabBar();
 			this.getMeasureList();
-			console.log("huan",process.env.NODE_ENV)
-			if (process.env.NODE_ENV == 'development') {
-				this.baseUrl = 'http://192.168.0.41:8086'
-			}else {
-				this.baseUrl = 'http://121.239.169.30:13001'
-			}
 		},
 		methods: {
 			getMeasureList() {
 				const param = {
 					pageIndex: 1,
-					pageSize: 10000000,
+					pageSize: 10000,
 				}
 				measureList(param).then(res => {
 					if(res.code == 100){
@@ -119,6 +117,13 @@
 				console.log('change', this.measureIds);
 			},
 			submit() {
+				if(this.measureIds.length <0) {
+					uni.showToast({
+						icon: "none",
+						title: '请勾选基础措施'
+					});
+					return;
+				}
 				const param = {
 					id: this.detailData.id,
 					baseMeasures: this.measureIds,
@@ -131,6 +136,8 @@
 							title: '提交成功'
 						});
 						this.goBack();
+					}else{
+						 uni.$u.toast(res.msg)
 					}
 				})
 				
@@ -170,7 +177,7 @@
 			uploadFilePromise(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: this.baseUrl + '/attachment/uploadMeasureImage/key',
+						url: VUE_APP_BASE_URL + '/attachment/uploadMeasureImage/key',
 						filePath: url,
 						name: 'file',
 						header: {
@@ -240,7 +247,7 @@
 .second{
 	display: flex;
 	flex-direction: column;
-	margin-top: 50px;
+	margin-top: 30px;
 }
 .third{
 	display: flex;
@@ -255,10 +262,19 @@
 	display: flex;
 	flex-direction: column;
 	background-color: rgb(242,242,242);
+	padding: 5px 8px;
+}
+.picItem{
+	font-weight: 500;
 	margin-top: 5px;
 	font-size: 14px;
+	display: flex;
+	image{
+		width: 20px;
+		height: 20px;
+		margin-right:3px;
+	}
 }
-
 .measures{
 	margin-top: 50px 12px 0;
 	padding: 0 12px;

--
Gitblit v1.9.2