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

api/danger.js

@@ -19,4 +19,6 @@ export default {
   deleteById: (dangerId) => request({url:`/danger/${dangerId}`,method: 'delete'}),  
   // 新增
   batchCreate: (data) => request({url:'/danger/batch/add',method: 'POST', data}),
+ //cat 
+  getCatByList: (data) => request({url:'/danger',data }),
 }

pages/danger/components/Create.vue

@@ -4,63 +4,81 @@
 			<uni-section :title="(type==='add'?'新增':'编辑') +'企业' " type="line"></uni-section>
 			<view class="form-wrap" >
 				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" :label-width="300">
-					<uni-forms-item label="企业名称" name="entName"  required>
-						<uni-easyinput v-model="form.entName" placeholder="请输入企业名称"  />
-					</uni-forms-item>	
-					<uni-forms-item label="隐患分类" name="entCatId" required>
-						<uni-data-select  v-model="form.entCatId" :localdata="entCats" placeholder="请选择企业分类" :clear="false"></uni-data-select>
-					</uni-forms-item>
-					<uni-forms-item label="隐患等级" name="dangerLevel" required>
-						<uni-data-select  v-model="form.dangerLevel" :localdata="dangerLevelOptions" placeholder="请选择隐患等级" :clear="false"></uni-data-select>
-					</uni-forms-item>
-					<uni-forms-item label="统一信用编码">
-						<uni-easyinput v-model="form.entUscc" placeholder="请输入统一信用编码"  />
-					</uni-forms-item>
-					<uni-forms-item label="法定代表人">
-						<uni-easyinput v-model="form.entLegalRepresentative" placeholder="请输入法定代表人"  />
-					</uni-forms-item>	
-					<uni-forms-item label="隐患描述">
-						<uni-easyinput type="textarea" :maxlength="300"
-						 v-model="form.dangerDesc" autoHeight 
-						placeholder="请输入隐患描述"></uni-easyinput>
-						<view class="word-limit">{{form.dangerDesc.length||0}}/300</view>
-					</uni-forms-item>									
-					<uni-forms-item label="生产经营地址">
-						<uni-easyinput v-model="form.entAddress" placeholder="请输入生产经营地址"  />
-					</uni-forms-item>								
-					<uni-forms-item label="负责人">
-						<uni-easyinput v-model="form.charger" placeholder="请输入负责人"  />
-					</uni-forms-item>													
-					<uni-forms-item label="负责人电话">
-						<uni-easyinput v-model="form.chargerPhone" type="number" placeholder="请输入负责人电话"  />
-					</uni-forms-item>														
-					<uni-forms-item label="安全负责人">
-						<uni-easyinput v-model="form.safetyManager" placeholder="请输入安全负责人"  />
-					</uni-forms-item>	
-					<uni-forms-item label="安全负责人电话">
-						<uni-easyinput v-model="form.safetyManagerPhone" type="number" placeholder="请输入安全负责人电话"  />
-					</uni-forms-item>																		
-					<uni-forms-item label="从业人员数量">
-						<uni-easyinput v-model="form.staffNum" type="number" placeholder="请输入从业人员数量"  />
-					</uni-forms-item>																						
-					<uni-forms-item label="特种作业人员数量">
-						<uni-easyinput v-model="form.staffSpecialNum" type="number" placeholder="请输入特种作业人员数量"  />
-					</uni-forms-item>	
-					<uni-forms-item label="专职安全生产管理人员数量">
-						<uni-easyinput v-model="form.staffSafetyNum" type="number" placeholder="请输入专职安全生产管理人员数量"  />
-					</uni-forms-item>																													
-					<uni-forms-item label="注册安全工程师人员数">
-						<uni-easyinput v-model="form.staffCertifiedEngineerNum" type="number" placeholder="请输入注册安全工程师人员数"  />
-					</uni-forms-item>																																																			
-					<uni-forms-item label="安全标准化等级">
-						<uni-data-select  v-model="form.safetyStandardLevel" :localdata="standardLevelOptions" placeholder="请选择企业分类" :clear="false"></uni-data-select>
-					</uni-forms-item>	
-					<uni-forms-item label="安全许可证号码">
-						<uni-easyinput v-model="form.staffSafetyNum" placeholder="请输入安全许可证号码"  />
-					</uni-forms-item>	
-					<uni-forms-item label="是否重点企业">
-						<uni-data-checkbox v-model="form.isMajor" :localdata="isMajors" />
-					</uni-forms-item>																																																																									
+					<uni-forms-item  label ="企业/单位名称" >
+						<uni-data-select  v-model="form.entId" :localdata="entCats" placeholder="请选择企业/单位名称" :clear="false"></uni-data-select>
+					</uni-forms-item>		
+					<uni-card padding="0" margin="5px 0">
+						<uni-forms-item  label ="隐患标题">
+							<uni-easyinput v-model="form.dangerTitle" placeholder="请输入隐患标题"  />
+						</uni-forms-item>	
+						<uni-forms-item  label ="隐患分类" >
+							<uni-data-select  v-model="form.dangerCatId" :localdata="dangerCats" placeholder="请选择隐患分类" :clear="false"></uni-data-select>
+						</uni-forms-item>	
+						<uni-forms-item  label ="隐患等级" >
+							<uni-data-select  v-model="form.dangerLevel" :localdata="dangerLevelOptions" placeholder="请选择隐患等级" :clear="false"></uni-data-select>
+						</uni-forms-item>																									
+						<uni-forms-item  label ="发生位置">
+							<uni-easyinput v-model="form.dangerLocation" placeholder="请输入发生位置"  />
+						</uni-forms-item>						
+						<uni-forms-item label="隐患描述">
+							<uni-easyinput type="textarea" :maxlength="300"
+							 v-model="form.dangerDesc" autoHeight 
+							placeholder="请输入隐患描述"></uni-easyinput>
+							<view class="word-limit">{{form.dangerDesc.length||0}}/300</view>
+						</uni-forms-item>	
+						<uni-forms-item label ="登记时间">
+							<uni-datetime-picker type="date" v-model="form.submitTime" placeholder="请选择登记时间"  />
+						</uni-forms-item>
+					</uni-card>
+					<uni-card padding="0" margin="5px 0">
+						<uni-forms-item label ="整改期限">
+							<uni-datetime-picker type="date" v-model="form.dangerDeadLine" placeholder="请选择整改期限"  />
+						</uni-forms-item>
+						<uni-forms-item label="整改类型">
+							<uni-data-checkbox 
+							v-model="form.rectifyCat" 
+							:localdata="[{ value: 1, text: '自行整改' },{ value: 2, text: '外协整改' }]"  />
+						</uni-forms-item>					
+						<uni-forms-item label="整改说明">
+							<uni-easyinput type="textarea" :maxlength="300"
+							 v-model="form.rectifyRemark" autoHeight 
+							placeholder="请输入整改说明"></uni-easyinput>
+							<view class="word-limit">{{form.rectifyRemark.length||0}}/300</view>
+						</uni-forms-item>																																																																									
+						<uni-forms-item label ="整改完成时间">
+							<uni-datetime-picker type="date" v-model="form.rectifyTime" placeholder="请选择整改完成时间"  />
+						</uni-forms-item>
+					</uni-card>
+					<uni-card padding="0" margin="5px 0">
+						<uni-forms-item label="验收说明">
+							<uni-easyinput type="textarea" :maxlength="300"
+							 v-model="form.acceptRemark" autoHeight 
+							placeholder="请输入验收说明"></uni-easyinput>
+							<view class="word-limit">{{form.acceptRemark.length||0}}/300</view>
+						</uni-forms-item>																																																																									
+						<uni-forms-item label ="验收完成时间">
+							<uni-datetime-picker type="date" v-model="form.acceptTime" placeholder="请选择验收完成时间"  />
+						</uni-forms-item>
+					</uni-card>																																							
+					<uni-forms-item label="附件">
+						<view class="attachbox">
+							<view class="attach"  v-for="(attach, index) in form.attachList" :key="index" 
+								@click="preview(form.attachList)" 
+								@longpress="delAttach(index)">
+								<image :src="attach.attachUrl"></image>
+							</view>
+							<view class="attach">
+								<view class="handle" @click="uploadAttach">
+									<uni-icons type="plusempty" size="40" color="#999999"></uni-icons>
+								</view>
+							</view>
+						</view>
+					</uni-forms-item>																					
+					<uni-forms-item label="是否关闭">
+						<uni-data-checkbox 
+						v-model="form.status" 
+						:localdata="[{ value: 0, text: '未整改' },{ value: 1, text: '已整改完成' }]"  />
+					</uni-forms-item>																																																																																																																																																																							
 				</uni-forms>
 				<view class="handle-container">
 					<button class="save" type="primary" @click="onSubmit">保存</button>
@@ -72,7 +90,8 @@
 </template>
 
 <script>
-	import dangerApi from '@/api/industry.js'
+	import dangerApi from '@/api/danger.js'
+	import { upload } from '@/api/upload.js'	
 	export default{
 		name:"CreateDanger",
 		computed:{
@@ -81,11 +100,21 @@
 				if(!entCats)return []
 				return entCats.map(item=>{
 					return{
-						value:item.entCatId,
-						text:item.entCatTitle
+						value:item.entId,
+						text:item.entName
 					}
 				})
-			}						
+			},
+			dangerCats(){
+				let dangerCats=uni.getStorageSync('dangerCats')
+				if(!dangerCats)return []
+				return dangerCats.map(item=>{
+					return{
+						value:item.dangerCatId,
+						text:item.dangerCatTitle
+					}
+				})
+			},						
 		},
 		data(){
 			return{
@@ -118,12 +147,8 @@
 				  { value: 4, text: '较小' }
 				],
 				statusOptions:[
-				  { value: 0, text: '处理中' },
-				  { value: 1, text: '已整改' }
-				],
-				isMajors:[
-					{value:1,text:'是'},
-					{value:0,text:'否'},
+				  { value: 0, text: '未整改' },
+				  { value: 1, text: '已整改完成' }
 				],
 				form:{
 					entId: undefined,
@@ -195,11 +220,57 @@
 					})
 				})
 			},
+			preview(urls=[]){
+				if(urls.length>0){
+					urls=urls.map(item=>item.attachUrl);
+					uni.previewImage({
+						urls
+					})	
+				}
+			},
+			delAttach(idx){
+				const self=this;
+				uni.showModal({
+					title: '提示',
+					content: '是否确定删除',
+					success: function (res) {
+						if (res.confirm) {
+							self.form.attachList=self.form.attachList.filter((item,index)=>index!==idx);				
+						}
+					}
+				});				
+			},
+			uploadAttach(){
+				const self=this;
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album',"camera"], //从相册选择
+					success:(res)=>{
+						let filePath=res.tempFilePaths[0]
+						upload({filePath}).then((resq)=>{
+							var fileResq=JSON.parse(resq)							
+							let file={
+								"attachId": fileResq.data.fileId,
+								"attachName": fileResq.data.fileTitle,
+								"attachExt": fileResq.data.fileExt,
+								"attachUrl": fileResq.data.fileUrl,
+								"attachIcon": fileResq.data.fileIcon
+							}
+							self.form.attachList.push(file);
+						})
+					}
+				});	
+			},
 			show({type,item}){
 				this.resetForm()
-				this.form={...this.form,...item}
 				this.type=type
 				this.$refs.drawer.open()
+				if(type==='edit'){
+					dangerApi.getById(item.dangerId).then((res)=>{
+						this.form={...res.data}
+					})
+				}
 			},
 			close(){
 				this.$refs.drawer.close()
@@ -213,7 +284,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;
@@ -234,6 +305,28 @@
 				color: #999;
 				font-size: 26rpx;
 			}
+			.attachbox{
+				display: flex;
+				flex-wrap: wrap;
+				.attach{
+					padding: 16rpx 18rpx;
+					image,.handle{
+						display: block;
+						width: 100rpx;
+						height: 100rpx;
+						box-shadow: rgba(0,0,0,0.6);	
+						border: 1rpx solid #ccc;	
+						border-radius: 10px;
+						overflow: hidden;	
+						box-sizing: border-box;
+					}
+					.handle{
+						display: flex;
+						justify-content: center;
+						align-items: center;
+					}
+				}
+			}
 		}
 	}
 </style>

pages/danger/components/Detail.vue

@@ -10,16 +10,17 @@
 				<uni-list-item :rightText="viewData.groupName" title ="监管单位" ></uni-list-item>						
 				<uni-list-item :rightText="viewData.entName" title ="企业单位" ></uni-list-item>
 				<uni-list-item :rightText="viewData.dangerTitle" title ="隐患名称"></uni-list-item>		
-				<uni-list-item :rightText="viewData.dangerCatTitle" title ="分类"></uni-list-item>						
+				<uni-list-item :rightText="viewData.dangerCatTitle" title ="分类" ></uni-list-item>						
 				<uni-list-item :rightText="formatDangerLevel(viewData.dangerLevel)" title ="经营范围"></uni-list-item>													
-				<uni-list-item :rightText="viewData.dangerLocation" title ="发现位置"></uni-list-item>													
-				<uni-list-item  title ="现场照片" v-if="viewData.attachList&&viewData.attachList.length>0">
+				<uni-list-item :rightText="viewData.dangerLocation" title ="发现位置" v-if="viewData.dangerLocation"></uni-list-item>													
+				<view class="attach-list-item" v-if="viewData.attachList&&viewData.attachList.length>0">
+					<view class="title">现场照片</view>
 					<view class="attachbox">
 						<view class="attach"  v-for="(attach, index) in viewData.attachList" :key="index" @click="preview(viewData.attachList)">
 							<image :src="attach.attachUrl"></image>
 						</view>
 					</view>
-				</uni-list-item>																		
+				</view>
 				<uni-list-item :note="viewData.dangerDesc" title ="隐患描述" v-if="viewData.dangerDesc"></uni-list-item>																			
 				<uni-list-item :note="viewData.submitRemark" title ="登记说明" v-if="viewData.submitRemark"></uni-list-item>						
 				<uni-list-item :rightText="viewData.dangerDeadLine" title ="整改期限" v-if="viewData.dangerDeadLine"></uni-list-item>																																	
@@ -36,6 +37,7 @@
 </template>
 
 <script>
+	import dangerApi from '@/api/danger.js'	
 	export default{
 		name:"DisasteDetail",
 		props:{
@@ -81,8 +83,10 @@
 				return dangerLevelOptions[val]
 			},
 			show(item){
-				this.$refs.popup.open('bottom')
-				this.viewData={...item}
+				this.$refs.popup.open('bottom')			
+				dangerApi.getById(item.dangerId).then((res)=>{
+					this.viewData={...res.data}
+				})
 			},
 			preview(urls=[]){
 				if(urls.length>0){
@@ -105,21 +109,32 @@
 			max-height: 80vh;
 			overflow-y: auto;
 		}
-		.attachbox{
-			display: flex;
-			flex-wrap: wrap;
-			.attach{
-				border: 1rpx solid #ccc;
-				padding: 20rpx;
-				box-shadow: rgba(0,0,0,0.6);
-				border-radius: 10px;
+		.attach-list-item{
+			padding: 13px 20rpx;
+			.title{
+				font-size: 14px;
+				color: #3b4144;
 				overflow: hidden;
-				image{
-					display: block;
-					width: 200rpx;
-					height: 200rpx;
+				line-height: 1;
+				padding-bottom: 20rpx;
+			}
+			.attachbox{
+				display: flex;
+				flex-wrap: wrap;
+				.attach{
+					padding: 20rpx;
+					image{
+						display: block;
+						width: 100rpx;
+						height: 100rpx;
+						box-shadow: rgba(0,0,0,0.6);	
+						border: 1rpx solid #ccc;	
+						border-radius: 10px;
+						overflow: hidden;											
+					}
 				}
 			}
 		}
+
 	}
 </style>

pages/danger/index.vue

@@ -24,14 +24,14 @@
 							</view>
 							<view class="item-row space-between">
 								<uni-tag :text="item.dangerCatTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
-								<uni-tag :text="formatDangerLevel(item.dangerLevel)" type="success"></uni-tag>
+								<uni-tag :inverted="true" :text="formatDangerLevel(item.dangerLevel)" type="success"></uni-tag>
 							</view>						
 							<view class="item-row space-between">
 								<view class="icon-item">
 									<uni-icons type="location-filled" size="16" color="#999"></uni-icons>
 									<text class="word">{{item.dangerLocation||'--'}}</text>
 								</view>
-								<uni-tag :inverted="true" :text="formatDangerStatus(item.status)" :type="item.status>0?'error':'warning'"></uni-tag>
+								<uni-tag :text="formatDangerStatus(item.status)" :type="item.status>0?'primary':'warning'"></uni-tag>
 							</view>
 							<view class="bottom">
 								<view class="icon-item">
@@ -58,6 +58,7 @@
 </template>
 
 <script>
+	import industryApi from '@/api/industry.js'
 	import dangerApi from '@/api/danger.js'
 	import Create from './components/Create.vue'
 	import Detail from './components/Detail.vue'				
@@ -81,11 +82,14 @@
 		},
 		methods: {
 			init(){		
-				// if(!uni.getStorageSync('entCats')){
-				// 	dangerApi.getCatByList().then((res)=>{
-				// 		uni.setStorageSync('entCats',res.data)
-				// 	})
-				// }
+				if(!uni.getStorageSync('dangerCats')){
+					industryApi.getByList().then((res)=>{
+						uni.setStorageSync('entCats',res.data)
+					})
+					dangerApi.getCatByList().then((res)=>{
+						uni.setStorageSync('dangerCats',res.data)
+					})					
+				}
 			},
 			search(){
 				this.resetFilter();
@@ -110,7 +114,7 @@
 						content: '是否确定删除',
 						success: function (res) {
 							if (res.confirm) {
-								industryApi.deleteById(item.entId).then(()=>{
+								dangerApi.deleteById(item.dangerId).then(()=>{
 									uni.showToast({
 										title:'删除成功！',
 										icon:'none'
@@ -121,7 +125,7 @@
 						}
 					});					
 				}else{
-					this.$refs.industry.show({type,item})										
+					this.$refs.danger.show({type,item})										
 				}
 			},
 			formatDangerLevel(val){

pages/disaster/components/CreateDisaster.vue

@@ -158,7 +158,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/disaster/components/CreateReservoir.vue

@@ -148,7 +148,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/duty/components/AddForm.vue

@@ -177,7 +177,7 @@
 			}
 		}
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/goods/components/CreateBound.vue

@@ -283,7 +283,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/goods/components/RecordEdit.vue

@@ -284,7 +284,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/industry/components/Create.vue

@@ -217,7 +217,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

pages/team/components/MemberForm.vue

@@ -198,7 +198,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.row{
 				display: flex;
 				align-items: flex-end;

pages/team/components/TeamForm.vue

@@ -134,7 +134,7 @@
 		padding: 20rpx;
 		box-sizing: border-box;
 		.form-wrap{
-			padding:40rpx;
+			padding:40rpx 20rpx;
 			.handle-container{
 				display: flex;
 				justify-content: center;

unpackage/dist/dev/mp-weixin/pages/danger/components/Create.json

@@ -1,12 +1,15 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
-  },
-  "component": true
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/danger/components/Create.wxss

@@ -30,7 +30,7 @@
   box-sizing: border-box;
 }
 .scroll-view .form-wrap.data-v-0c869c42 {
-  padding: 40rpx;
+  padding: 40rpx 20rpx;
 }
 .scroll-view .form-wrap .handle-container.data-v-0c869c42 {
   display: flex;
@@ -52,4 +52,26 @@
   color: #999;
   font-size: 26rpx;
 }
+.scroll-view .form-wrap .attachbox.data-v-0c869c42 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.scroll-view .form-wrap .attachbox .attach.data-v-0c869c42 {
+  padding: 16rpx 18rpx;
+}
+.scroll-view .form-wrap .attachbox .attach image.data-v-0c869c42, .scroll-view .form-wrap .attachbox .attach .handle.data-v-0c869c42 {
+  display: block;
+  width: 100rpx;
+  height: 100rpx;
+  box-shadow: rgba(0, 0, 0, 0.6);
+  border: 1rpx solid #ccc;
+  border-radius: 10px;
+  overflow: hidden;
+  box-sizing: border-box;
+}
+.scroll-view .form-wrap .attachbox .attach .handle.data-v-0c869c42 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 

unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.wxss

@@ -28,20 +28,30 @@
   max-height: 80vh;
   overflow-y: auto;
 }
-.detail-cont .attachbox.data-v-7d256117 {
+.detail-cont .attach-list-item.data-v-7d256117 {
+  padding: 13px 20rpx;
+}
+.detail-cont .attach-list-item .title.data-v-7d256117 {
+  font-size: 14px;
+  color: #3b4144;
+  overflow: hidden;
+  line-height: 1;
+  padding-bottom: 20rpx;
+}
+.detail-cont .attach-list-item .attachbox.data-v-7d256117 {
   display: flex;
   flex-wrap: wrap;
 }
-.detail-cont .attachbox .attach.data-v-7d256117 {
-  border: 1rpx solid #ccc;
+.detail-cont .attach-list-item .attachbox .attach.data-v-7d256117 {
   padding: 20rpx;
+}
+.detail-cont .attach-list-item .attachbox .attach image.data-v-7d256117 {
+  display: block;
+  width: 100rpx;
+  height: 100rpx;
   box-shadow: rgba(0, 0, 0, 0.6);
+  border: 1rpx solid #ccc;
   border-radius: 10px;
   overflow: hidden;
 }
-.detail-cont .attachbox .attach image.data-v-7d256117 {
-  display: block;
-  width: 200rpx;
-  height: 200rpx;
-}
 

unpackage/dist/dev/mp-weixin/pages/disaster/components/Create.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/pages/disaster/components/Create.json

@@ -1,11 +0,0 @@
-{
-  "usingComponents": {
-    "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
-    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
-    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
-    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
-  },
-  "component": true
-}

unpackage/dist/dev/mp-weixin/pages/disaster/components/Create.wxss

@@ -1,55 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.scroll-view.data-v-65dda240 {
-  height: 100%;
-  padding: 20rpx;
-  box-sizing: border-box;
-}
-.scroll-view .form-wrap.data-v-65dda240 {
-  padding: 40rpx;
-}
-.scroll-view .form-wrap .handle-container.data-v-65dda240 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.scroll-view .form-wrap .handle-container button.data-v-65dda240 {
-  width: 160rpx;
-  padding: 20rpx 16rpx;
-  line-height: 1;
-  font-size: 28rpx;
-}
-.scroll-view .form-wrap .handle-container button.save.data-v-65dda240 {
-  background-color: #007aff;
-}
-.scroll-view .form-wrap .word-limit.data-v-65dda240 {
-  text-align: right;
-  padding: 10rpx 0;
-  color: #999;
-  font-size: 26rpx;
-}
-

unpackage/dist/dev/mp-weixin/pages/disaster/components/CreateDisaster.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
@@ -6,6 +7,5 @@
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/disaster/components/CreateDisaster.wxss

@@ -30,7 +30,7 @@
   box-sizing: border-box;
 }
 .scroll-view .form-wrap.data-v-652aee7e {
-  padding: 40rpx;
+  padding: 40rpx 20rpx;
 }
 .scroll-view .form-wrap .handle-container.data-v-652aee7e {
   display: flex;

unpackage/dist/dev/mp-weixin/pages/disaster/components/CreateReservoir.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/disaster/components/CreateReservoir.wxss

@@ -30,7 +30,7 @@
   box-sizing: border-box;
 }
 .scroll-view .form-wrap.data-v-43a37e82 {
-  padding: 40rpx;
+  padding: 40rpx 20rpx;
 }
 .scroll-view .form-wrap .handle-container.data-v-43a37e82 {
   display: flex;

unpackage/dist/dev/mp-weixin/pages/disaster/components/Detail.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/duty/components/AddForm.json

@@ -1,10 +1,10 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
-  },
-  "component": true
+  }
 }