wangtong il y a 1 an
Parent
commit
c8115b74f8
56 fichiers modifiés avec 170 ajouts et 117 suppressions
  1. 6 6
      api/common.js
  2. 4 2
      pages.json
  3. 1 1
      pages/index/index.vue
  4. 7 7
      pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue
  5. 10 10
      pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue
  6. 4 4
      pages/noLogin/WarningPileForm/WarningPileForm.vue
  7. 2 0
      pages/noLogin/WarningPileList.vue
  8. 3 2
      pages/noLogin/communitylist.vue
  9. 15 15
      pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue
  10. 11 3
      pages/noLogin/listProject.vue
  11. 2 2
      pages/noLogin/typeList.vue
  12. 10 3
      pages/notice/noticeList.vue
  13. BIN
      static/icon/home-on.png
  14. BIN
      static/icon/home.png
  15. BIN
      static/icon/jsz.png
  16. BIN
      static/icon/tywg.png
  17. BIN
      static/icon/work-on.png
  18. BIN
      static/icon/work.png
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/WarningPileList.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/communitylist.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/listProject.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/typeList.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/notice/noticeList.js.map
  30. 44 33
      unpackage/dist/dev/mp-weixin/common/vendor.js
  31. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  32. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.js
  33. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.wxml
  34. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.js
  35. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.wxml
  36. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js
  37. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.wxml
  38. 2 0
      unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileList.js
  39. 4 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/communitylist.js
  40. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/communitylist.wxml
  41. 2 2
      unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.js
  42. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.wxml
  43. 8 0
      unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.js
  44. 2 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.json
  45. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.wxml
  46. 1 1
      unpackage/dist/dev/mp-weixin/pages/noLogin/typeList.wxml
  47. 7 0
      unpackage/dist/dev/mp-weixin/pages/notice/noticeList.js
  48. 2 1
      unpackage/dist/dev/mp-weixin/pages/notice/noticeList.json
  49. 1 1
      unpackage/dist/dev/mp-weixin/pages/notice/noticeList.wxml
  50. 1 1
      unpackage/dist/dev/mp-weixin/project.config.json
  51. BIN
      unpackage/dist/dev/mp-weixin/static/icon/home-on.png
  52. BIN
      unpackage/dist/dev/mp-weixin/static/icon/home.png
  53. BIN
      unpackage/dist/dev/mp-weixin/static/icon/jsz.png
  54. BIN
      unpackage/dist/dev/mp-weixin/static/icon/tywg.png
  55. BIN
      unpackage/dist/dev/mp-weixin/static/icon/work-on.png
  56. BIN
      unpackage/dist/dev/mp-weixin/static/icon/work.png

+ 6 - 6
api/common.js

@@ -4,10 +4,10 @@ export default {
 	getDistrict(data) {
 		return utils.requestFn(`/system/dict/data/type/district`, data)
 	},
-	//选择小区
-	getArea(data) {
-		return utils.requestEn(`/mobile/area/getArea`, data)
-	},
+	// //选择小区
+	// getArea(data) {
+	// 	return utils.requestEn(`/mobile/area/getArea`, data)
+	// },
 	//选择单元
 	getUnit(data) {
 		return utils.requestEn(`/mobile/unit/getUnit`, data)
@@ -163,8 +163,8 @@ export default {
 	getBuildingList(data) {
 		return utils.requestEn(`/mobile/building/getBuilding`, data)
 	},
-	getArea() {
-		return utils.requestEn(`/mobile/area/getArea`)
+	getArea(data) {
+		return utils.requestEn(`/mobile/area/getArea`,data)
 	},
 	getDictInfoList(data) {
 		return utils.requestEn(`/mobile/sysInfo/dictlist`, data, 'POST')

+ 4 - 2
pages.json

@@ -99,7 +99,8 @@
 			//历史施工(详情页)
 			"path": "pages/noLogin/listProject", 
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText":"历史记录",
+				"enablePullDownRefresh":true//开启下拉刷新
 			}
 		},
 		{
@@ -143,7 +144,8 @@
 			//公告列表
 			"path": "pages/notice/noticeList",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText":"公告列表",
+				"enablePullDownRefresh":true//开启下拉刷新
 			}
 		},
 		{

+ 1 - 1
pages/index/index.vue

@@ -7,7 +7,7 @@
 			<view class="align-items" style="position: absolute; top: 66rpx;left: 40rpx;">
 				<image src="/static/icon/sgglpt.png" mode="" class="header-title"></image>
 			</view>
-		<view class="align-items" style="position: absolute; top: 140rpx; left: 300rpx; font-size: 10pt;font-size: 36rpx; color: #fff;">
+		<view class="align-items" style="position: absolute; top: 180rpx; left: 300rpx; font-size: 10pt;font-size: 36rpx; color: #fff;">
 			{{name}} !欢迎你登录本应用
 			</view>
 		<!-- <view class="align-items" style="position: absolute; top: 90rpx; left: 0;" @click="gotopage('/pages/noLogin/typeList')">

+ 7 - 7
pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue

@@ -4,23 +4,23 @@
 		<view  class="project-content">
 		<u-form :model="form" :rules="rules" ref="form" >
 			<u-form-item label="楼栋" borderBottom ref="item1" labelWidth="140">
-				<u-input v-model="buildingName" disabled borderBottom @click=" showbuilding= true&&type!=1"></u-input>
+				<u-input v-model="buildingName" disabled borderBottom @click=" showbuilding= true&&type!=1" placeholder="请选择楼栋"></u-input>
 				<u-select v-model="showbuilding" :list="buildingList" label-name="name" value-name="id" @confirm="buildingconfirm()"> </u-select>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 			<u-form-item label="单元" labelWidth="140" borderBottom ref="item1">
-				<u-input v-model="unitName" disabled borderBottom  @click=" showunit= true&&type!=1"></u-input>
+				<u-input v-model="unitName" disabled borderBottom  @click=" showunit= true&&type!=1" placeholder="请选择单元"></u-input>
 				<u-select v-model="showunit" :list="unitList" label-name="name" value-name="id" @confirm="unitconfirm()"> </u-select>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 			<u-form-item label="发现问题" labelWidth="140" borderBottom ref="item1">
-				<u-input v-model="causesOfFamageLabel" disabled @click=" showrepairType= true&&type!=1" borderBottom></u-input>
+				<u-input v-model="causesOfFamageLabel" disabled @click=" showrepairType= true&&type!=1" borderBottom placeholder="请输入发现问题"></u-input>
 				<u-select v-model="showrepairType" :list="typelist.find_problem" label-name="dictLabel" value-name="dictValue" @confirm="confirm()"> </u-select>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 			<u-form-item borderBottom ref="item1">
 				<view>备注</view>
-				<u-input v-model="form.remarks"  type="textarea" placeholder="请输入有关庭院网管巡检问题描述" :disabled="type==1" ></u-input>
+				<u-input v-model="form.remarks"  type="textarea" placeholder="请输入备注" :disabled="type==1" ></u-input>
 			</u-form-item>
 			<u-form-item borderBottom ref="item1">
 				<view>巡检照片</view>
@@ -38,8 +38,8 @@
 							<video :src="item"
 								style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-							<u-icon name="close" color="#FFFFFF" size="35" ></u-icon> 
+						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;" >
+							<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1" ></u-icon> 
 						</view>
 					</view>
 				</view>
@@ -225,7 +225,7 @@
 				console.log('图片')
 				let _this = this;
 				uni.chooseImage({
-					sizeType: ['album', 'camera'],
+					sourceType: ['camera'],
 					success(resp) {
 						console.log('res--uni.chooseMedia', resp);
 						resp.tempFiles.forEach((item, index) => {

+ 10 - 10
pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -109,7 +109,7 @@
 				<u-row class="un-row" gutter="12" style="text-align:left;">
 					<u-col span="10">
 						<u-form-item label="入口压力" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-input v-model="form.inletPressure" length='20px' placeholder="请输入管理所名称" :disabled="type==1"></u-input>
+							<u-input v-model="form.inletPressure" length='20px' placeholder="请输入入口压力" :disabled="type==1"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -157,7 +157,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="伴热带" labelWidth="140" borderBottom ref="item1">
-							<u-input v-model="xtvLabel" disabled @click="showxtv= true&&type!=1" borderBottom></u-input>
+							<u-input v-model="xtvLabel" disabled @click="showxtv= true&&type!=1" borderBottom placeholder="请选择伴热带" ></u-input>
 							<u-select v-model="showxtv" :list="typelist.xtv" @confirm="xtv()" :show="showxtv"
 								label-name="dictLabel" value-name="dictValue"> </u-select>
 							<u-icon slot="right" name="arrow-right"></u-icon>
@@ -205,7 +205,7 @@
 					<u-col span="3">
 						<u-form-item label="副路" borderBottom ref="item1" placeholder="" labelWidth="80">
 							<u-input v-model="form.cutOffPressureAccessory" length='20px'
-								placeholder="请输入管理所名称" :disabled="type==1"></u-input>
+								placeholder="请输入副路" :disabled="type==1"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1">
@@ -214,8 +214,8 @@
 				</u-row>
 				<u-row gutter="12" style="text-align: center;">
 					<u-col span="10">
-						<u-form-item label="放散压力" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-input v-model="form.releasePressure" length='20px' placeholder="请输入管理所名称" :disabled="type==1"></u-input>
+						<u-form-item label="放散压力" borderBottom ref="item1" placeholder="请输入放散压力" labelWidth="140">
+							<u-input v-model="form.releasePressure" length='20px' placeholder="请输入放散压力" :disabled="type==1"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -244,7 +244,7 @@
 					<u-col span="12">
 						<u-form-item label="操作结果主副路已交替完毕,现" borderBottom ref="item1" placeholder="请输入编号"
 							labelWidth="420">
-							<u-input v-model="form.mainRoad" length='20px' placeholder="请输入管理所名称" :disabled="type==1"></u-input>
+							<u-input v-model="form.mainRoad" length='20px' placeholder="请输入" :disabled="type==1"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="12">
@@ -302,7 +302,7 @@
 					<u-col>
 						<u-form-item label="阀井情况" labelWidth="140" borderBottom ref="item1">
 							<u-input v-model="valveWellConditioLabel" disabled @click=" showvalveWellCondition= true&& type!=1"
-								borderBottom></u-input>
+								borderBottom  placeholder="请选择阀井情况" ></u-input>
 							<u-select v-model="showvalveWellCondition" :list="typelist.valve_well_condition"
 								@confirm="valveWellCondition()" label-name="dictLabel" value-name="dictValue"> </u-select>
 							<u-icon slot="right" name="arrow-right"></u-icon>
@@ -331,9 +331,9 @@
 									<view v-else>
 										<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 									</view>
-									<view @click="remove(index)"
+									<view @click="remove(index)" v-if="type!=1"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-										<u-icon name="close" color="#FFFFFF" size="35"></u-icon>
+										<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
 									</view>
 								</view>
 							</view>
@@ -759,7 +759,7 @@
 				console.log('图片')
 				let _this = this;
 				uni.chooseImage({
-					sizeType: ['camera'],
+					sourceType: ['camera'],
 					success(resp) {
 						console.log('res--uni.chooseMedia', resp);
 						resp.tempFiles.forEach((item, index) => {

+ 4 - 4
pages/noLogin/WarningPileForm/WarningPileForm.vue

@@ -5,7 +5,7 @@
 		<u-form :model="form" :rules="rules" ref="form" >
 			<u-form-item borderBottom ref="item1">
 				<view>警示柱信息</view>
-				<u-input v-model="form.warningPileInfo"  :disabled="type==1" type="textarea" ></u-input>
+				<u-input v-model="form.warningPileInfo"  :disabled="type==1" type="textarea" placeholder="请输入警示柱信息" ></u-input>
 			</u-form-item>
 			<u-form-item borderBottom ref="item1">
 				<view>警示柱照片</view>
@@ -22,8 +22,8 @@
 							<video :src="item"
 								style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 						</view>
-						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-							<u-icon name="close" color="#FFFFFF" size="35" ></u-icon> 
+						<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;" >
+							<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1" ></u-icon> 
 						</view>
 					</view>
 				</view>
@@ -156,7 +156,7 @@ import service from '@/api/index.js'
 				console.log('图片')
 				let _this = this;
 				uni.chooseImage({
-					sizeType: [ 'camera'],
+					sourceType: ['camera'],
 					success(resp) {
 						console.log('res--uni.chooseMedia', resp);
 						resp.tempFiles.forEach((item, index) => {

+ 2 - 0
pages/noLogin/WarningPileList.vue

@@ -69,6 +69,7 @@
 			{
 				this.userName=e[0].label
 				this.userId=e[0].value
+				this.getProjectList()
 			},
 			cancelWorker()
 			{
@@ -91,6 +92,7 @@
 				})
 			},
 			getProjectList() {
+				this.list=[]
 				service.getwarningPileList({name:this.name,userId:this.userId}).then(res => {
 					console.log('getwarningPileList', res)
 					if (res.length == 0) {

+ 3 - 2
pages/noLogin/communitylist.vue

@@ -2,7 +2,7 @@
 <template>
 	<view>
 		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view style="padding-top: 120rpx;">
+		<view style="padding-top: 40rpx;">
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入小区名称" v-model="nameValue"  :action-style="{'font-size':'40rpx'}" :show-action="false" @search="getProjectList()"></u-search>
 			</view>
@@ -69,7 +69,8 @@
 				})
 			},
 			getProjectList() {
-				service.getArea().then(res=>{
+				this.list=[]
+				service.getArea({name:this.nameValue}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
 						this.$UTILS.showPrompt('暂无项目!')

+ 15 - 15
pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -4,14 +4,14 @@
 		<view class="project-content">
 			<u-form labelPosition="left" :model="form" :rules="rules" ref="form">
 				<u-form-item label="接警时间" borderBottom ref="item1" labelWidth="150">
-					<u-input v-model="form.repairTime" borderBottom disabled @click="showtime=true&&type!=1" ></u-input>
+					<u-input v-model="form.repairTime" borderBottom  placeholder="请选择接警时间" disabled @click="showtime=true&&type!=1" ></u-input>
 					<u-picker v-model="showtime" mode="time" :params="params" @confirm="time()"></u-picker>
 				</u-form-item>
 				<u-form-item label="报修人" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.repairName" borderBottom :disabled="type==1"></u-input>
+					<u-input v-model="form.repairName" borderBottom  placeholder="请输入报修人" :disabled="type==1"></u-input>
 				</u-form-item>
 				<u-form-item label="联系电话" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.repairPhone" borderBottom  :disabled="type==1"></u-input>
+					<u-input v-model="form.repairPhone" borderBottom  placeholder="请输入联系电话" :disabled="type==1"></u-input>
 				</u-form-item>
 				<u-form-item label="报修类型" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="repairTypeLabel" disabled @click=" showrepairType= true;" borderBottom
@@ -24,18 +24,18 @@
 				</u-form-item>
 				<u-form-item borderBottom ref="item1">
 					<view>报修内容</view>
-					<u-input v-model="form.repairContent" type="textarea" showWordLimit='255' borderBottom :disabled="type==1"></u-input>
+					<u-input v-model="form.repairContent" type="textarea" showWordLimit='255' borderBottom :disabled="type==1" placeholder="请输入报修内容" ></u-input>
 				</u-form-item>
 				<u-form-item label="损坏原因" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="causesOfFamageLabel" disabled @click=" causesOfFamageType = true;" v-if="type!=1"
-						borderBottom></u-input>
+						borderBottom placeholder="请选择损坏原因"  ></u-input>
 						<u-input v-model="labelList.causes_of_damage" disabled v-if="type==1"
-							borderBottom></u-input>
+							borderBottom placeholder="请选择损坏原因"  ></u-input>
 					<u-select v-model="causesOfFamageType" :list="typelist.causes_of_damage" label-name="dictLabel" value-name="dictValue" @confirm="causesOfFamage()" :value="form.causesOfFamage"></u-select>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="管线压力" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="pipelinePressureLabel" disabled @click=" pipelinePressureType= true;" v-if="type!=1"
+					<u-input v-model="pipelinePressureLabel" disabled @click=" pipelinePressureType= true;" v-if="type!=1"  placeholder="请输入管线压力"
 						borderBottom></u-input>
 						<u-input v-model="labelList.pipeline_pressure" disabled 
 							borderBottom v-if="type==1"></u-input>
@@ -43,16 +43,16 @@
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="停气方式" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.stopGasMethod" borderBottom :disabled="type==1"></u-input>
+					<u-input v-model="form.stopGasMethod" borderBottom :disabled="type==1"  placeholder="请输入停气方式" ></u-input>
 				</u-form-item>
 				<u-form-item label="使用材料" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.usingMaterials" borderBottom :disabled="type==1"></u-input>
+					<u-input v-model="form.usingMaterials" borderBottom :disabled="type==1"  placeholder="请输入使用材料"></u-input>
 				</u-form-item>
 				<u-form-item label="维修人" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.maintenanceName" borderBottom :disabled="type==1"></u-input>
+					<u-input v-model="form.maintenanceName" borderBottom :disabled="type==1" placeholder="请输入维修人"></u-input>
 				</u-form-item>
 				<u-form-item label="完成时间" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.maintenanceTime" borderBottom disabled @click="showtime2=true&&type!=1" :disabled="type==1"></u-input>
+					<u-input v-model="form.maintenanceTime" borderBottom disabled @click="showtime2=true&&type!=1"></u-input>
 					<u-picker v-model="showtime2" mode="time" :params="params" @confirm="time2()"></u-picker>
 				</u-form-item>
 				<u-form-item label="维修照片" labelWidth="150" borderBottom ref="item1">
@@ -68,9 +68,9 @@
 							<view v-else>
 								<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 							</view>
-							<view @click="remove(index)"
+							<view @click="remove(index)" 
 								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-								<u-icon name="close" color="#FFFFFF" size="35"></u-icon>
+								<u-icon name="close" color="#FFFFFF" size="25" v-if="type!=1"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -177,7 +177,7 @@
 								list2.forEach((item)=>{
 									if(item.dictValue==res.causesOfDamage)
 									{
-										_this.labelList.causesOfDamage=item.dictLabel
+										_this.labelList.causes_of_damage=item.dictLabel
 									}
 								})
 								let list3 =[]
@@ -305,7 +305,7 @@
 				console.log('图片')
 				let _this = this;
 				uni.chooseImage({
-					sizeType: ['album', 'camera'],
+					sourceType: ['camera'],
 					success(resp) {
 						console.log('res--uni.chooseMedia', resp);
 						resp.tempFiles.forEach((item, index) => {

+ 11 - 3
pages/noLogin/listProject.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view class="" style="padding-top: 90rpx;">
-			<back></back>
+		<view class="" style="padding-top: 0rpx;">
+			<!-- <back></back> -->
 		</view>
-		<view style="padding-top: 60rpx;">
+		<view style="padding-top: 40rpx;">
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入搜索内容" v-model="nameValue"   :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search>
 			</view>
@@ -40,6 +40,13 @@
 			this.nameValue = e.nameValue
 			this.getProjectList();
 			this.getUserName();
+			uni.setNavigationBarTitle({
+					title: '历史记录',
+			});
+			uni.setNavigationBarColor({
+			    frontColor: '#ffffff',
+			    backgroundColor: '#2d95f4',
+			})
 		},
 		methods: {
 			gotoindex(item){
@@ -78,6 +85,7 @@
 				})
 			},
 			getProjectList() {
+				this.list=[]
 				service.getSearch({value:this.nameValue}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){

+ 2 - 2
pages/noLogin/typeList.vue

@@ -7,11 +7,11 @@
 			<view class="align-items" style="position: absolute; top: 110rpx; left: 50rpx;">
 				<image src="/static/icon/sgglpt.png" mode="" class="header-title" style="width: 300rpx;height: 36rpx;"></image>
 			</view>
-			<view class="align-items" style="position: absolute;top: 70px;left: 190px;font-size: 28rpx;color: #fff;">
+			<view class="align-items" style="position: absolute;top: 100px;left: 150px;font-size: 36rpx;color: #fff;">
 				{{name}} !欢迎你登录本应用
 			</view>
 		</view>
-		<view style="padding-top: 120rpx;" v-if="!visable">
+		<view style="padding-top: 170rpx;" v-if="!visable">
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入搜索内容" v-model="nameValue"  :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search>
 			</view>

+ 10 - 3
pages/notice/noticeList.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="notice-list">
 		<image src="/static/icon/pagebj.png" mode="" class="listbj"></image>
-		<view class="align-items" style="padding: 42rpx 0 0 0;">
-			<back></back>
+		 <view class="align-items" style="padding: 42rpx 0 0 0;">
+			<!-- <back></back>
 			<view class="title-text">
 				公告列表
-			</view>
+			</view> -->
 		</view>
 		<view class="notice" v-for="(item,index) in list" :key="index" >
 			<view>
@@ -36,6 +36,13 @@
 		},
 		onLoad() {
 			this.lists()
+			uni.setNavigationBarTitle({
+					title: '公告列表',
+			});
+			uni.setNavigationBarColor({
+			    frontColor: '#ffffff',
+			    backgroundColor: '#2d95f4',
+			})
 		},
 		methods: {
 			toDetail(url){

BIN
static/icon/home-on.png


BIN
static/icon/home.png


BIN
static/icon/jsz.png


BIN
static/icon/tywg.png


BIN
static/icon/work-on.png


BIN
static/icon/work.png


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/WarningPileList.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/communitylist.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/listProject.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noLogin/typeList.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/notice/noticeList.js.map


+ 44 - 33
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9561,16 +9561,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _request = _interopRequireDefault(__webpack_require__(/*! ../common/request.js */ 35));
-var _getDistrict$getArea$;
-var _default = (_getDistrict$getArea$ = {
+var _getDistrict$getUnit$;
+var _default = (_getDistrict$getUnit$ = {
   //选择行政区
   getDistrict: function getDistrict(data) {
     return _request.default.requestFn("/system/dict/data/type/district", data);
   },
-  //选择小区
-  getArea: function getArea(data) {
-    return _request.default.requestEn("/mobile/area/getArea", data);
-  },
+  // //选择小区
+  // getArea(data) {
+  // 	return utils.requestEn(`/mobile/area/getArea`, data)
+  // },
   //选择单元
   getUnit: function getUnit(data) {
     return _request.default.requestEn("/mobile/unit/getUnit", data);
@@ -9723,38 +9723,47 @@ var _default = (_getDistrict$getArea$ = {
   },
   getBuildingList: function getBuildingList(data) {
     return _request.default.requestEn("/mobile/building/getBuilding", data);
+  },
+  getArea: function getArea(data) {
+    return _request.default.requestEn("/mobile/area/getArea", data);
+  },
+  getDictInfoList: function getDictInfoList(data) {
+    return _request.default.requestEn("/mobile/sysInfo/dictlist", data, 'POST');
+  },
+  setregulatorBox: function setregulatorBox(data) {
+    return _request.default.requestEn("/mobile/regulatorBox", data, 'POST');
+  },
+  setwarningPile: function setwarningPile(data) {
+    return _request.default.requestEn("/mobile/warningPile", data, 'Put');
+  },
+  getwarningPileList: function getwarningPileList(data) {
+    return _request.default.requestEn("/mobile/warningPile/getList", data);
+  },
+  getwarningPileInfo: function getwarningPileInfo(data) {
+    return _request.default.requestEn("/mobile/warningPile/".concat(data));
+  },
+  setcourtyardNetworkManagement: function setcourtyardNetworkManagement(data) {
+    return _request.default.requestEn("/mobile/courtyardNetworkManagement", data, 'POST');
+  },
+  setemergencyRepair: function setemergencyRepair(data) {
+    return _request.default.requestEn("/mobile/emergencyRepair", data, 'POST');
+  },
+  getOne: function getOne() {
+    return _request.default.requestEn("/mobile/explain/getOne");
   }
-}, (0, _defineProperty2.default)(_getDistrict$getArea$, "getArea", function getArea() {
-  return _request.default.requestEn("/mobile/area/getArea");
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getDictInfoList", function getDictInfoList(data) {
-  return _request.default.requestEn("/mobile/sysInfo/dictlist", data, 'POST');
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "setregulatorBox", function setregulatorBox(data) {
-  return _request.default.requestEn("/mobile/regulatorBox", data, 'POST');
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "setwarningPile", function setwarningPile(data) {
-  return _request.default.requestEn("/mobile/warningPile", data, 'Put');
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getwarningPileList", function getwarningPileList(data) {
-  return _request.default.requestEn("/mobile/warningPile/getList", data);
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getwarningPileInfo", function getwarningPileInfo(data) {
-  return _request.default.requestEn("/mobile/warningPile/".concat(data));
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "setcourtyardNetworkManagement", function setcourtyardNetworkManagement(data) {
-  return _request.default.requestEn("/mobile/courtyardNetworkManagement", data, 'POST');
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "setemergencyRepair", function setemergencyRepair(data) {
-  return _request.default.requestEn("/mobile/emergencyRepair", data, 'POST');
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getOne", function getOne() {
-  return _request.default.requestEn("/mobile/explain/getOne");
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getWorker", function getWorker() {
+}, (0, _defineProperty2.default)(_getDistrict$getUnit$, "getWorker", function getWorker() {
   return _request.default.requestEn("/mobile/user/getWorker");
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getSearch", function getSearch(data) {
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getSearch", function getSearch(data) {
   return _request.default.requestEn("/mobile/sysInfo/search", data);
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getcourtyardNetworkManagement", function getcourtyardNetworkManagement(data) {
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getcourtyardNetworkManagement", function getcourtyardNetworkManagement(data) {
   return _request.default.requestEn("/mobile/courtyardNetworkManagement/".concat(data));
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getemergencyRepair", function getemergencyRepair(data) {
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getemergencyRepair", function getemergencyRepair(data) {
   return _request.default.requestEn("/mobile/emergencyRepair/".concat(data));
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getregulatorBox", function getregulatorBox(data) {
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getregulatorBox", function getregulatorBox(data) {
   return _request.default.requestEn("/mobile/regulatorBox/".concat(data));
-}), (0, _defineProperty2.default)(_getDistrict$getArea$, "getwarningPile", function getwarningPile(data) {
+}), (0, _defineProperty2.default)(_getDistrict$getUnit$, "getwarningPile", function getwarningPile(data) {
   return _request.default.requestEn("/mobile/warningPile/".concat(data));
-}), _getDistrict$getArea$);
+}), _getDistrict$getUnit$);
 exports.default = _default;
 
 /***/ }),
@@ -35076,7 +35085,8 @@ var _default = {
   }, {
     "path": "pages/noLogin/listProject",
     "style": {
-      "navigationStyle": "custom"
+      "navigationBarTitleText": "历史记录",
+      "enablePullDownRefresh": true
     }
   }, {
     "path": "pages/historyConstruction/updateInfo",
@@ -35107,7 +35117,8 @@ var _default = {
   }, {
     "path": "pages/notice/noticeList",
     "style": {
-      "navigationStyle": "custom"
+      "navigationBarTitleText": "公告列表",
+      "enablePullDownRefresh": true
     }
   }, {
     "path": "pages/cityConstrution/cityConstrution",

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.js

@@ -417,7 +417,7 @@ var _default = {
       console.log('图片');
       var _this = this;
       uni.chooseImage({
-        sizeType: ['album', 'camera'],
+        sourceType: ['camera'],
         success: function success(resp) {
           var _this5 = this;
           console.log('res--uni.chooseMedia', resp);

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.js

@@ -941,7 +941,7 @@ var _default = {
       console.log('图片');
       var _this = this;
       uni.chooseImage({
-        sizeType: ['camera'],
+        sourceType: ['camera'],
         success: function success(resp) {
           var _this4 = this;
           console.log('res--uni.chooseMedia', resp);

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js

@@ -328,7 +328,7 @@ var _default = {
       console.log('图片');
       var _this = this;
       uni.chooseImage({
-        sizeType: ['camera'],
+        sourceType: ['camera'],
         success: function success(resp) {
           var _this5 = this;
           console.log('res--uni.chooseMedia', resp);

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.wxml


+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileList.js

@@ -255,6 +255,7 @@ var _default = {
     worker: function worker(e) {
       this.userName = e[0].label;
       this.userId = e[0].value;
+      this.getProjectList();
     },
     cancelWorker: function cancelWorker() {
       this.userName = '';
@@ -276,6 +277,7 @@ var _default = {
     },
     getProjectList: function getProjectList() {
       var _this2 = this;
+      this.list = [];
       _index.default.getwarningPileList({
         name: this.name,
         userId: this.userId

+ 4 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/communitylist.js

@@ -246,7 +246,10 @@ var _default = {
     },
     getProjectList: function getProjectList() {
       var _this = this;
-      _index.default.getArea().then(function (res) {
+      this.list = [];
+      _index.default.getArea({
+        name: this.nameValue
+      }).then(function (res) {
         console.log('getProjectType', res);
         if (res.length == 0) {
           _this.$UTILS.showPrompt('暂无项目!');

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/communitylist.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.js

@@ -369,7 +369,7 @@ var _default = {
             list2 = _this3.typelist.causes_of_damage;
             list2.forEach(function (item) {
               if (item.dictValue == res.causesOfDamage) {
-                _this3.labelList.causesOfDamage = item.dictLabel;
+                _this3.labelList.causes_of_damage = item.dictLabel;
               }
             });
             var list3 = [];
@@ -480,7 +480,7 @@ var _default = {
       console.log('图片');
       var _this = this;
       uni.chooseImage({
-        sizeType: ['album', 'camera'],
+        sourceType: ['camera'],
         success: function success(resp) {
           var _this5 = this;
           console.log('res--uni.chooseMedia', resp);

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.wxml


+ 8 - 0
unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.js

@@ -217,6 +217,13 @@ var _default = {
     this.nameValue = e.nameValue;
     this.getProjectList();
     this.getUserName();
+    uni.setNavigationBarTitle({
+      title: '历史记录'
+    });
+    uni.setNavigationBarColor({
+      frontColor: '#ffffff',
+      backgroundColor: '#2d95f4'
+    });
   },
   methods: {
     gotoindex: function gotoindex(item) {
@@ -256,6 +263,7 @@ var _default = {
     },
     getProjectList: function getProjectList() {
       var _this = this;
+      this.list = [];
       _index.default.getSearch({
         value: this.nameValue
       }).then(function (res) {

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.json

@@ -1,5 +1,6 @@
 {
-  "navigationStyle": "custom",
+  "navigationBarTitleText": "历史记录",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "u-search": "/uview-ui/components/u-search/u-search"
   }

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.wxml


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/noLogin/typeList.wxml


+ 7 - 0
unpackage/dist/dev/mp-weixin/pages/notice/noticeList.js

@@ -179,6 +179,13 @@ var _default = {
   },
   onLoad: function onLoad() {
     this.lists();
+    uni.setNavigationBarTitle({
+      title: '公告列表'
+    });
+    uni.setNavigationBarColor({
+      frontColor: '#ffffff',
+      backgroundColor: '#2d95f4'
+    });
   },
   methods: {
     toDetail: function toDetail(url) {

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/notice/noticeList.json

@@ -1,4 +1,5 @@
 {
-  "navigationStyle": "custom",
+  "navigationBarTitleText": "公告列表",
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/notice/noticeList.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "3.1.5",
-  "appid": "wx9efdc4932f07063d",
+  "appid": "wxa537100824cd1a15",
   "projectname": "贞达市政工程",
   "condition": {},
   "editorSetting": {

BIN
unpackage/dist/dev/mp-weixin/static/icon/home-on.png


BIN
unpackage/dist/dev/mp-weixin/static/icon/home.png


BIN
unpackage/dist/dev/mp-weixin/static/icon/jsz.png


BIN
unpackage/dist/dev/mp-weixin/static/icon/tywg.png


BIN
unpackage/dist/dev/mp-weixin/static/icon/work-on.png


BIN
unpackage/dist/dev/mp-weixin/static/icon/work.png