From f5d67b69142c78be1ee996f53b6bb8e4c954761c Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 15 十一月 2023 10:06:38 +0800
Subject: [PATCH] 页面跳转修改
---
pages/tabBar/notice/measures.vue | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/pages/tabBar/notice/measures.vue b/pages/tabBar/notice/measures.vue
index 0a6832b..9ed6f14 100644
--- a/pages/tabBar/notice/measures.vue
+++ b/pages/tabBar/notice/measures.vue
@@ -6,13 +6,13 @@
<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
<!-- 真正的导航栏内容 -->
<view class="navBar">
- <u-icon name="arrow-left" color="black" size="17" @click="goBack" />
+ <u-icon name="arrow-left" color="black" size="17" style="margin-left: 10px;" @click="goBack" />
<view class="barText">响应措施反馈</view>
</view>
</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,19 +43,23 @@
: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>
<view class="measures">
- <u-button class="measureBtn" type="primary" @click="submit">提交</u-button>
+ <u-button class="measureBtn" type="primary" @click="$noMoreClicks(submit)">提交</u-button>
</view>
</view>
</template>
<script>
import { measureList, submitMeasures, getMeasureDetail } from '@/api/notice.js'
+ import VUE_APP_BASE_URL from '../../../common/constant.js'
export default {
components:{
@@ -73,9 +77,10 @@
autoHeight: true,
detailData : {},
measureIds : [],
- baseUrl: '',
+ baseUrl: VUE_APP_BASE_URL,
list: [],
- showBtn: false
+ showBtn: false,
+ noClick:true,
}
},
onLoad(options) {
@@ -86,18 +91,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){
@@ -106,9 +105,9 @@
}).catch(err=>{})
},
goBack() {
- uni.navigateBack({
- url:'./detail/detail'
- });
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(uni.getStorageSync("fdetailData")))
+ })
},
checkboxChange(n) {
@@ -119,6 +118,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,
@@ -130,10 +136,13 @@
icon: "none",
title: '提交成功'
});
- this.goBack();
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(this.detailData))
+ })
+ }else{
+ uni.$u.toast(res.msg)
}
})
-
},
// 删除图片
deletePic(event) {
@@ -170,7 +179,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: {
@@ -200,7 +209,7 @@
height: 50px;
display: flex;
flex-direction: row;
- justify-content: center;
+ /* justify-content: center; */
align-items: center;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
@@ -240,7 +249,7 @@
.second{
display: flex;
flex-direction: column;
- margin-top: 50px;
+ margin-top: 30px;
}
.third{
display: flex;
@@ -255,10 +264,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