diff --git a/.gitignore b/.gitignore
index ffed323..ddaf27f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+unpackage/
 node_modules/
 dist/
 uploadfiles/
diff --git a/apis/modules/ly.js b/apis/modules/ly.js
index 5b7566a..3dca82d 100644
--- a/apis/modules/ly.js
+++ b/apis/modules/ly.js
@@ -1,6 +1,30 @@
 import request from '../../service/request.js'
 import utils from '../../service/utils.js'
-export default {
+export default {	
+	// 修改界桩
+	removeplie(data){
+		return request.put('/areBoundary/plie',data)
+	},
+	// 添加界桩
+	addplie(data){
+		return request.post('/areBoundary/plie',data)
+	},
+	// 获取地名类别
+	getregional(data){
+		return request.get('/arePlaceName/regional/list',data)
+	},
+	// 获取处理地名类别
+	gettreeselect(data){
+		return request.get('/arePlaceName/regional/treeselect',data)
+	},
+	// 添加国家地理
+	toponym(data){
+		return request.post('/arePlaceName/toponym',data)
+	},
+	// 获取国家地理
+	gettoponym(data){
+		return request.get('/arePlaceName/toponym/list',data)
+	},
 	// 申报巡检
 	addpatrol(data){
 		return request.post('/areBoundary/patrol',data)
diff --git a/pages.json b/pages.json
index be6a62a..0b67a98 100644
--- a/pages.json
+++ b/pages.json
@@ -140,12 +140,12 @@
 		}, {
 			"path": "pages/map1/map",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "地名查询服务"
 			}
 		}, {
 			"path": "pages/mapstakeline/mapstakeline",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "界桩界线管护"
 			}
 		}, {
 			"path": "pages/mapstakelinedetail/mapstakelinedetail",
@@ -427,6 +427,33 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/declaration/newDeclaration",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/declaration/newDeclarationdetail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/mapstakelinedetail/addmapstakelinedetail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/declaration/declaration.vue b/pages/declaration/declaration.vue
index 464647b..648e18b 100644
--- a/pages/declaration/declaration.vue
+++ b/pages/declaration/declaration.vue
@@ -19,7 +19,7 @@
 								<view class="serve-title">行政区划</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,3)" :value="index" :range="array3">
-										<view class="uni-input">{{community.adminArea?community.adminArea:'请选择'}}
+										<view :class="community.adminArea?'uni-input1':'uni-input2'">{{community.adminArea?community.adminArea:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -33,7 +33,7 @@
 								<view class="serve-title">地名类别</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,1)" :value="index" :range="array1">
-										<view class="uni-input">
+										<view :class="community.placeNameCategory?'uni-input1':'uni-input2'">
 											{{community.placeNameCategory?community.placeNameCategory:'请选择'}}
 										</view>
 									</picker>
@@ -48,7 +48,7 @@
 								<view class="serve-title">类型</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,2)" :value="index" :range="array2">
-										<view class="uni-input">{{community.types?community.types:'请选择'}}
+										<view :class="community.types?'uni-input1':'uni-input2'">{{community.types?community.types:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -63,7 +63,7 @@
 								<view>
 									<input id="communityName" @input="oninput" v-module="community.communityName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -75,7 +75,7 @@
 								<view>
 									<input id="originalName" @input="oninput" v-module="community.originalName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -87,7 +87,7 @@
 								<view>
 									<input id="historyName" @input="oninput" v-module="community.historyName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -99,7 +99,7 @@
 								<view>
 									<input id="totalArea" @input="oninput" v-module="community.totalArea"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -111,7 +111,7 @@
 								<view>
 									<input id="villageCommunity" @input="oninput" v-module="community.villageCommunity"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -123,7 +123,7 @@
 								<view>
 									<input id="buildingCount" @input="oninput" v-module="community.buildingCount"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -133,7 +133,7 @@
 							<view class="serve">
 								<view class="serve-title">详细地址</view>
 								<view class="serve-right" @tap="openaddress(1)">
-									<view class="uni-input">{{community.address?community.address:'请选择'}}</view>
+									<view :class="community.address?'uni-input1':'uni-input2'">{{community.address?community.address:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -143,7 +143,7 @@
 							<view class="serve">
 								<view class="serve-title">有效起始时间</view>
 								<view class="serve-right" @tap="opentime(1)">
-									<view class="uni-input">{{community.validStartDate?community.validStartDate:'请选择'}}
+									<view :class="community.validStartDate?'uni-input1':'uni-input2'">{{community.validStartDate?community.validStartDate:'请选择'}}
 									</view>
 								</view>
 							</view>
@@ -154,7 +154,7 @@
 							<view class="serve">
 								<view class="serve-title">有效终止日期</view>
 								<view class="serve-right" @tap="opentime(2)">
-									<view class="uni-input">{{community.validEndDate?community.validEndDate:'请选择'}}
+									<view :class="community.validEndDate?'uni-input1':'uni-input2'">{{community.validEndDate?community.validEndDate:'请选择'}}
 									</view>
 								</view>
 							</view>
@@ -167,7 +167,7 @@
 								<view>
 									<input id="totalUnits" @input="oninput" v-module="community.totalUnits"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -179,7 +179,7 @@
 								<view>
 									<input id="developer" @input="oninput" v-module="community.developer"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -192,7 +192,7 @@
 									<input id="romanLettersSpell" @input="oninput"
 										v-module="community.romanLettersSpell" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -202,7 +202,7 @@
 							<view class="serve">
 								<view class="serve-title">设立时间</view>
 								<view class="serve-right" @tap="opentime(3)">
-									<view class="uni-input">{{community.establishTime?community.establishTime:'请选择'}}
+									<view :class="community.establishTime?'uni-input1':'uni-input2'">{{community.establishTime?community.establishTime:'请选择'}}
 									</view>
 								</view>
 							</view>
@@ -216,7 +216,7 @@
 									<input id="originOfPlaceNames" @input="oninput"
 										v-module="community.originOfPlaceNames" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -229,7 +229,7 @@
 									<input id="meaningOfPlaceNames" @input="oninput"
 										v-module="community.meaningOfPlaceNames" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -242,7 +242,7 @@
 									<input id="historicalEvolution" @input="oninput"
 										v-module="community.historicalEvolution" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -254,7 +254,7 @@
 								<view>
 									<input id="postalCode" @input="oninput" v-module="community.postalCode"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -267,7 +267,7 @@
 									<input id="administrativeRegion" @input="oninput"
 										v-module="community.administrativeRegion" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -281,7 +281,7 @@
 								<view class="serve-title">行政区划</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,4)" :value="index" :range="array3">
-										<view class="uni-input">{{street.adminArea?street.adminArea:'请选择'}}
+										<view :class="street.adminAre?'uni-input1':'uni-input2'">{{street.adminArea?street.adminArea:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -296,7 +296,7 @@
 								<view>
 									<input id="standardName" @input="oninput1" v-module="street.standardName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -308,7 +308,7 @@
 								<view>
 									<input id="originalName" @input="oninput1" v-module="street.originalName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -320,7 +320,7 @@
 								<view>
 									<input id="nameHistory" @input="oninput1" v-module="street.nameHistory"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -332,7 +332,7 @@
 								<view>
 									<input id="nameMeaning" @input="oninput1" v-module="street.nameMeaning"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -344,7 +344,7 @@
 								<view>
 									<input id="length" @input="oninput1" v-module="street.length" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -356,7 +356,7 @@
 								<view>
 									<input id="width" @input="oninput1" v-module="street.width" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -369,7 +369,7 @@
 									<input id="streetRegistration" @input="oninput1"
 										v-module="street.streetRegistration" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -379,7 +379,7 @@
 							<view class="serve">
 								<view class="serve-title">有效起始时间</view>
 								<view class="serve-right" @tap="opentime(4)">
-									<view class="uni-input">{{street.validStartDate?street.validStartDate:'请选择'}}</view>
+									<view :class="street.validStartDate?'uni-input1':'uni-input2'">{{street.validStartDate?street.validStartDate:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -389,7 +389,7 @@
 							<view class="serve">
 								<view class="serve-title">有效终止日期</view>
 								<view class="serve-right" @tap="opentime(5)">
-									<view class="uni-input">{{street.validEndDate?street.validEndDate:'请选择'}}</view>
+									<view :class="street.validEndDate?'uni-input1':'uni-input2'">{{street.validEndDate?street.validEndDate:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -399,7 +399,7 @@
 							<view class="serve">
 								<view class="serve-title">开始位置</view>
 								<view class="serve-right" @tap="openaddress(2)">
-									<view class="uni-input">{{street.startLocation?street.startLocation:'请选择'}}</view>
+									<view :class="street.startLocation?'uni-input1':'uni-input2'">{{street.startLocation?street.startLocation:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -409,7 +409,7 @@
 							<view class="serve">
 								<view class="serve-title">结束位置</view>
 								<view class="serve-right" @tap="openaddress(3)">
-									<view class="uni-input">{{street.endLocation?street.endLocation:'请选择'}}</view>
+									<view :class="street.endLocation?'uni-input1':'uni-input2'">{{street.endLocation?street.endLocation:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -422,7 +422,7 @@
 								<view class="serve-title">行政区划</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,5)" :value="index" :range="array3">
-										<view class="uni-input">{{build.adminArea?build.adminArea:'请选择'}}
+										<view :class="build.adminArea?'uni-input1':'uni-input2'">{{build.adminArea?build.adminArea:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -437,7 +437,7 @@
 								<view>
 									<input id="tallBuildName" @input="oninput2" v-module="build.tallBuildName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -449,7 +449,7 @@
 								<view>
 									<input id="originalName" @input="oninput2" v-module="build.originalName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -461,7 +461,7 @@
 								<view>
 									<input id="layerNumber" @input="oninput2" v-module="build.layerNumber"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -473,7 +473,7 @@
 								<view>
 									<input id="occupiesArea" @input="oninput2" v-module="build.occupiesArea"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -483,7 +483,7 @@
 							<view class="serve">
 								<view class="serve-title">详细地址</view>
 								<view class="serve-right" @tap="openaddress(4)">
-									<view class="uni-input">{{build.locationPoint?build.locationPoint:'请选择'}}</view>
+									<view :class="build.locationPoint?'uni-input1':'uni-input2'">{{build.locationPoint?build.locationPoint:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -493,7 +493,7 @@
 							<view class="serve">
 								<view class="serve-title">有效起始时间</view>
 								<view class="serve-right" @tap="opentime(6)">
-									<view class="uni-input">{{build.validStartDate?build.validStartDate:'请选择'}}</view>
+									<view :class="build.validStartDate?'uni-input1':'uni-input2'">{{build.validStartDate?build.validStartDate:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -503,7 +503,7 @@
 							<view class="serve">
 								<view class="serve-title">有效终止日期</view>
 								<view class="serve-right" @tap="opentime(7)">
-									<view class="uni-input">{{build.validEndDate?build.validEndDate:'请选择'}}</view>
+									<view :class="build.validEndDate?'uni-input1':'uni-input2'">{{build.validEndDate?build.validEndDate:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -515,7 +515,7 @@
 								<view>
 									<input id="developer" @input="oninput2" v-module="build.developer" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -527,7 +527,7 @@
 								<view>
 									<input id="describeContent" @input="oninput2" v-module="build.describeContent"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -542,7 +542,7 @@
 								<view>
 									<input id="addressName" @input="oninput3" v-module="applicatio.addressName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -554,7 +554,7 @@
 								<view>
 									<input id="applicationName" @input="oninput3" v-module="applicatio.applicationName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -567,7 +567,7 @@
 									<input id="applicationPhone" @input="oninput3"
 										v-module="applicatio.applicationPhone" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -578,7 +578,7 @@
 							<view class="serve">
 								<view class="serve-title">详细地址</view>
 								<view class="serve-right" @tap="openaddress(5)">
-									<view class="uni-input">{{applicatio.address?applicatio.address:'请选择'}}</view>
+									<view :class="applicatio.address?'uni-input1':'uni-input2'">{{applicatio.address?applicatio.address:'请选择'}}</view>
 								</view>
 							</view>
 						</view>
@@ -590,7 +590,7 @@
 								<view>
 									<input id="remark" @input="oninput3" v-module="applicatio.remark" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -600,11 +600,39 @@
 					<view class="info-box">
 						<view class="info-box-list">
 							<view class="serve">
+								<view class="serve-title">申报类型</view>
+								<view class="serve-right">
+									<picker @change="e=> bindPickerChange1(e,6)" :value="index" :range="array4">
+										<view :class="array4type?'uni-input1':'uni-input2'">{{array4type?array4type:'请选择'}}
+										</view>
+									</picker>
+									<image src="../../static/down3.png"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="info-box" v-if="array4type == '单个申报'">
+						<view class="info-box-list">
+							<view class="serve">
+								<view class="serve-title">类型</view>
+								<view class="serve-right">
+									<picker @change="e=> bindPickerChange1(e,7)" :value="index" :range="array5">
+										<view :class="doorplate.cellType?'uni-input1':'uni-input2'">{{doorplate.cellType?doorplate.cellType:'请选择'}}
+										</view>
+									</picker>
+									<image src="../../static/down3.png"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="serve">
 								<view class="serve-title">小区名称</view>
 								<view>
 									<input id="communityName" @input="oninput4" v-module="doorplate.communityName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -616,7 +644,7 @@
 								<view>
 									<input id="formerName" @input="oninput4" v-module="doorplate.formerName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -629,13 +657,13 @@
 									<input id="historicalPlaceNames" @input="oninput4"
 										v-module="doorplate.historicalPlaceNames" placeholder="请输入"
 										style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view v-if="OrderType==5" class="message-list">
+				<view v-if="OrderType==5 && array4type == '批量申报'" class="message-list">
 					<view class="info-box">
 						<view class="info-box-list">
 							<view class="info-box-width" style="width: 100%;">
@@ -648,6 +676,19 @@
 						</view>
 					</view>
 				</view>
+				<view v-if="OrderType==3" class="message-list">
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-small">资料附件（建筑物平面dwg格式、国土地）</view>
+								<view style="margin-top: 20rpx;width: 100%;">
+									<sczl @onchangfileJsonfile="onchangfileJsonfile"></sczl>
+								</view>
+								<!-- <view class="info-box-list-img"><image src="../../static/img.png"></image></view> -->
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="page-footer">
 					<view class="footer-buy">
 						<view class="cart-add" @click="mapdoorplatesuccess">
@@ -686,6 +727,7 @@
 					applyId: uni.getStorageSync('USERS_KEY').userId,
 					createdUser: uni.getStorageSync('USERS_KEY').userId,
 					communityName: null, //小区名称
+					cellType:null,//门牌类型
 					formerName: null, //曾用名
 					historicalPlaceNames: null, //历史地名
 					doorNumberFile: null, //门牌文件
@@ -716,6 +758,7 @@
 					validEndDate: null, //有效终止日期					
 					locationPoint: null, //地理位置
 					status: '待审核', //审核状态
+					imageData:null
 				},
 				street: {
 					applyId: uni.getStorageSync('USERS_KEY').userId,
@@ -775,6 +818,9 @@
 				array1: ['农村牧场点', '工矿点', '农村居民点', '城镇居民点'],
 				array2: ['农林牧场', '工矿点', '农村', '城镇'],
 				array3: getApp().globalData.list1,
+				array4: ['单个申报','批量申报'],
+				array5: ['临街门牌', '大门牌', '楼栋牌', '单元牌', '户牌'],
+				array4type:null,
 			};
 		},
 		onPageScroll(e) {
@@ -793,11 +839,11 @@
 			} else if (this.OrderType == 2) {
 				this.nvConfig.title = '街路巷申报'
 			} else if (this.OrderType == 3) {
-				this.nvConfig.title = '高层建筑申报'
+				this.nvConfig.title = '建筑名称备案'
 			} else if (this.OrderType == 4) {
-				this.nvConfig.title = '地名申报'
+				this.nvConfig.title = '地名命名申报'
 			} else if (this.OrderType == 5) {
-				this.nvConfig.title = '开发商小区门牌号申报'
+				this.nvConfig.title = '门楼牌需求申报'
 			}
 		},
 		methods: {
@@ -887,8 +933,11 @@
 					this.street.adminArea = this.array3[e.detail.value]
 				} else if (e1 == 5) {
 					this.build.adminArea = this.array3[e.detail.value]
+				}else if (e1 == 6) {
+					this.array4type = this.array4[e.detail.value]
+				}else if (e1 == 7) {
+					this.doorplate.cellType = this.array5[e.detail.value]
 				}
-				console.log(this.community)
 			},
 			mapdoorplatesuccess() {
 				if (this.OrderType == 1) {
@@ -930,6 +979,18 @@
 					})
 					return
 				} else if (this.OrderType == 3) {
+					console.log('this.filelist', this.filelist)
+					let box1 = ''
+					for (let i = 0; i < this.filelist.length; i++) {
+						console.log('this.filelist[i]',this.filelist[i])
+						if(i == 0) {
+							box1 = this.filelist[i].url
+						} else {
+							box1 =box1+','+ this.filelist[i].url
+						}
+					}
+					console.log('box1',box1)
+					this.build.imageData = box1
 					console.log('this.build', this.build)
 					// return
 					this.API.addbuild(this.build).then(res => {
@@ -968,18 +1029,22 @@
 					})
 					return
 				} else if (this.OrderType == 5) {
-					console.log('this.filelist', this.filelist)
-					let box1 = ''
-					for (let i = 0; i < this.filelist.length; i++) {
-						console.log('this.filelist[i]',this.filelist[i])
-						if(i == 0) {
-							box1 = this.filelist[i].url
-						} else {
-							box1 =box1+','+ this.filelist[i].url
+					
+					if(this.array4type == '批量申报') {
+						console.log('this.filelist', this.filelist)
+						let box1 = ''
+						for (let i = 0; i < this.filelist.length; i++) {
+							console.log('this.filelist[i]',this.filelist[i])
+							if(i == 0) {
+								box1 = this.filelist[i].url
+							} else {
+								box1 =box1+','+ this.filelist[i].url
+							}
 						}
+						console.log('box1',box1)
+						this.doorplate.doorNumberFile = box1
 					}
-					console.log('box1',box1)
-					this.doorplate.doorNumberFile = box1
+
 					// return
 					this.API.adddoorplate(this.doorplate).then(res => {
 						console.log(res);
@@ -1033,6 +1098,19 @@
 </script>
 
 <style scoped lang="scss">
+	.uni-input1 {
+		color:#3d3d3d;
+		// font-weight: bold;
+	
+	}
+	.uni-input2 {
+		color: #909090;
+	
+	}
+	input {
+		color: #3d3d3d;
+		font-size: 26rpx;
+	}
 	.listBox {
 		position: relative;
 		z-index: 1;
@@ -1177,13 +1255,13 @@
 					width: 100%;
 
 					.serve-title {
-						font-size: 25rpx;
+						font-size: 26rpx;
 						color: #909090;
 					}
 
 					.serve-right {
-						font-size: 25rpx;
-						font-weight: bold;
+						font-size: 26rpx;
+						// font-weight: bold;
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
diff --git a/pages/declaration/declaration1.vue b/pages/declaration/declaration1.vue
index a0c3e6b..ca49b1c 100644
--- a/pages/declaration/declaration1.vue
+++ b/pages/declaration/declaration1.vue
@@ -23,7 +23,7 @@
 										placeholder-style="color:#3d3d3d;font-weight: bold;" />
 								</view> -->
 								<view class="serve-right">
-									<view class="uni-input">{{from.pileId?from.pileId:'-'}}
+									<view :class="from.pileId?'uni-input1':'uni-input2'">{{from.pileId?from.pileId:'-'}}
 									</view>
 								</view>
 							</view>
@@ -35,7 +35,7 @@
 								<view class="serve-title">巡检状态</view>
 								<view class="serve-right">
 									<picker @change="e=> bindPickerChange1(e,3)" :value="index" :range="array1">
-										<view class="uni-input">{{from.patrolStatus?from.patrolStatus:'请选择'}}
+										<view :class="from.patrolStatus?'uni-input1':'uni-input2'">{{from.patrolStatus?from.patrolStatus:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -52,7 +52,7 @@
 								<view>
 									<input id="patrolContent" @input="oninput" v-module="from.patrolContent"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -257,6 +257,19 @@
 </script>
 
 <style scoped lang="scss">
+	.uni-input1 {
+		color:#3d3d3d;
+		// font-weight: bold;
+	
+	}
+	.uni-input2 {
+		color: #909090;
+	
+	}
+	input {
+		color: #3d3d3d;
+		font-size: 26rpx;
+	}
 	.listBox {
 		position: relative;
 		z-index: 1;
@@ -401,13 +414,13 @@
 					width: 100%;
 
 					.serve-title {
-						font-size: 25rpx;
+						font-size: 26rpx;
 						color: #909090;
 					}
 
 					.serve-right {
-						font-size: 25rpx;
-						font-weight: bold;
+						font-size: 26rpx;
+						// font-weight: bold;
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
diff --git a/pages/declaration/declarationList.vue b/pages/declaration/declarationList.vue
index bd4036c..d036df1 100644
--- a/pages/declaration/declarationList.vue
+++ b/pages/declaration/declarationList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view v-if="list.length>0">
-			<view  class="top-box" v-for="(item,index) in list" :key="index" @click="gopath('/pages/declaration/declarationListdetail?type= '+type+'&cent='+JSON.stringify(item))">
+			<view  class="top-box" v-for="(item,index) in list" :key="index" @click="gopath(type == '7'?'/pages/declaration/newDeclarationdetail?cent='+JSON.stringify(item):'/pages/declaration/declarationListdetail?type= '+type+'&cent='+JSON.stringify(item))">
 				<view>{{item.name}}<span style="margin-left: 20rpx;"  :style="item.status=='已通过'?'color: #00D970;':item.status=='未通过'?'color: #FC4444;':'color: #547DFF;'">{{item.status?item.status:'待审核'}}</span></view>
 				<view class="top-box-img">
 					<image src="../../static/right2.png" mode="widthFix"></image>
@@ -82,6 +82,14 @@
 						console.log(res);
 						this.list = res.rows
 					})
+				}else if(this.type == '7') {
+					this.API.gettoponym(this.from).then(res=>{
+						console.log(res);
+						for (let i = 0; i < res.rows.length; i++) {
+							res.rows[i].name = res.rows[i].standardName
+						}
+						this.list = res.rows
+					})
 				}
 
 			},
diff --git a/pages/declaration/declarationListdetail.vue b/pages/declaration/declarationListdetail.vue
index 80085cf..05a4e3a 100644
--- a/pages/declaration/declarationListdetail.vue
+++ b/pages/declaration/declarationListdetail.vue
@@ -271,8 +271,23 @@
 								<view class="info-box-small">描述</view>
 							</view>
 						</view>
-
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view>资料附件</view>
+								<view style="margin-top: 20rpx;">
+									<view v-for="(item,index) in info.imageData"
+										:key="index"
+										style="background-color: #F9FAFF;border: 1px solid #EAEDF5;border-radius: 10rpx;display: flex;justify-content: space-between;padding: 15rpx;margin-bottom: 15rpx;font-size: 25rpx;">
+										<view
+											style="width:80%;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;">
+											资料附件{{index+1}}</view>
+									</view>
+						
+								</view>
+							</view>
+						</view>
 					</view>
+					
 				</view>
 			</view>
 			<view class="content" v-else-if="type == 4">
@@ -348,9 +363,13 @@
 									{{info.historicalPlaceNames?info.historicalPlaceNames:'-'}}</view>
 								<view class="info-box-small">历史地名</view>
 							</view>
-
+							<view class="info-box-width" style="width: 100%;" v-if="info.cellType">
+								<view class="info-box-overflow">
+									{{info.cellType?info.cellType:'-'}}</view>
+								<view class="info-box-small">类型</view>
+							</view>
 						</view>
-						<view class="info-box-list">
+						<view class="info-box-list" v-if="info.doorNumberFile">
 							<view class="info-box-width" style="width: 100%;">
 								<view>门牌文件</view>
 								<view style="margin-top: 20rpx;">
@@ -496,7 +515,9 @@
 			if (this.type == 5) {
 				this.info.doorNumberFile = this.info.doorNumberFile.split(',')
 			}
-
+			if (this.type == 3) {
+				this.info.imageData = this.info.imageData.split(',')
+			}
 		},
 		methods: {
 			downfile(e) {
diff --git a/pages/declaration/list - 副本.vue b/pages/declaration/list - 副本.vue
new file mode 100644
index 0000000..090109a
--- /dev/null
+++ b/pages/declaration/list - 副本.vue
@@ -0,0 +1,151 @@
+<template>
+	<view>
+		<view class="bg"><image src="../../static/bg.jpg" mode="widthFix"></image></view>
+		<view style="display: flex;padding: 30rpx;width: 100%;box-sizing: border-box;flex-wrap: wrap;justify-content: space-between;">
+			<view @click="gopath('/pages/declaration/declaration?type=1')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image7.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					居民小区申报
+				</view>
+			</view>
+			<view @click="gopath('/pages/declaration/declaration?type=2')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image8.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					街路巷申报
+				</view>
+			</view>
+			<view @click="gopath('/pages/declaration/declaration?type=3')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image5.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					建筑名称备案
+				</view>
+			</view>
+			<view @click="gopath('/pages/declaration/newDeclaration')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+				<view style="width: 50%;margin: 0 auto;">
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
+				</view>
+				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
+					地名命名申报
+				</view>
+			</view>
+			
+		</view>
+		<view style="padding: 30rpx;width: 100%;box-sizing: border-box;">
+			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 100%;background: rgba(255,255,255,0.63);border-radius: 30rpx;padding: 20rpx 0;">
+				<view style="width: 60%;margin: 0 auto;display: flex;align-items: center;">
+					<view style="width: 30%;margin: 0 auto;">
+						<image style="height: 120rpx;width: 100%;" src="../../static/ly/image11.png" mode="aspectFit"></image>
+					</view>
+					<view style="color: #3D3D3D;text-align: center;font-size: 25rpx;">
+						开发商小区门牌号申报
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="bottom">
+			<view class="bottom-two">
+				<view class="bottom-two-list" @click="gopath('/pages/mapstakeline/mapstakeline')">
+					<view class="bottom-two-list-img"><image src="../../static/map1.png"></image></view>
+					<view class="bottom-two-list-text">界桩界线管护</view>
+				</view>
+				<view class="bottom-two-list" @click="gopath('/pages/mapdoorplate/mapdoorplate')">
+					<view class="bottom-two-list-img"><image src="../../static/map2.png"></image></view>
+					<view class="bottom-two-list-text">路门牌上报</view>
+				</view>
+			</view>
+			<view class="bottom-my" style="margin-top: 20rpx;" @click="gopath('/pages/maptask/maptask')">
+				<view class="bottom-my-img"><image src="../../static/map3.png"></image></view>
+				<view class="bottom-my-text">我的任务</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			
+			}
+		},
+		methods: {
+			gopath(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.bg {
+	width: 100%;
+	height: 100vh;
+	position: fixed;
+	z-index: -1;
+	image {
+		width: 100%;
+		height: 100vh;
+	}
+}
+.bottom {
+	padding: 20rpx 20rpx;
+	margin: 20rpx 30rpx;
+	width: 94%;
+	position: fixed;
+	bottom: 30rpx;
+	background: rgba(255,255,255,0.63);
+	border-radius: 30rpx;
+	.bottom-two {
+		display: flex;
+		justify-content: space-between;
+		
+		.bottom-two-list {
+			position: relative;
+			.bottom-two-list-img {
+				image {
+					width: 320rpx;
+					height: 69rpx;
+					box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+					border-radius: 100rpx;
+				}
+			}
+			.bottom-two-list-text {
+				position: absolute;
+				top: 33%;
+				left: 25%;
+				transform: translate(-33%, -25%);
+				color: #fff;
+				font-size: 28rpx;
+			}
+		}
+	}
+	.bottom-my {
+		position: relative;
+		.bottom-my-img {
+			image {
+				width: 710rpx;
+				height: 69rpx;
+				box-shadow: 5rpx 10rpx 20rpx 0 #b5f4d5;
+				border-radius: 100rpx;
+			}
+		}
+		.bottom-my-text {
+			position: absolute;
+			top: 25%;
+			left: 8%;
+			transform: translate(-25%, -8%);
+			color: #fff;
+			font-size: 28rpx;
+		}
+	}
+}
+</style>
diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue
index fced1e3..ef94042 100644
--- a/pages/declaration/list.vue
+++ b/pages/declaration/list.vue
@@ -2,20 +2,21 @@
 	<view>
 		<view class="bg"><image src="../../static/bg.jpg" mode="widthFix"></image></view>
 		<view style="display: flex;padding: 30rpx;width: 100%;box-sizing: border-box;flex-wrap: wrap;justify-content: space-between;">
-			<view @click="gopath('/pages/declaration/declaration?type=1')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
+			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
 				<view style="width: 50%;margin: 0 auto;">
-					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image7.png" mode="aspectFit"></image>
+					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image11.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					居民小区申报
+					<!-- 地名标志牌需求申报 -->
+					门楼牌需求申报
 				</view>
 			</view>
-			<view @click="gopath('/pages/declaration/declaration?type=2')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
+			<view @click="gopath('/pages/mapdoorplate/mapdoorplate')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;">
 				<view style="width: 50%;margin: 0 auto;">
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image8.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					街路巷申报
+					地名标志牌需求申报
 				</view>
 			</view>
 			<view @click="gopath('/pages/declaration/declaration?type=3')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
@@ -23,41 +24,41 @@
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image5.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					高层建筑申报
+					建筑名称备案
 				</view>
 			</view>
-			<view @click="gopath('/pages/declaration/declaration?type=4')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
+			<view @click="gopath('/pages/declaration/newDeclaration')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
 				<view style="width: 50%;margin: 0 auto;">
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名申报
+					地名命名申报
 				</view>
 			</view>
 			
 		</view>
-		<view style="padding: 30rpx;width: 100%;box-sizing: border-box;">
+<!-- 		<view style="padding: 30rpx;width: 100%;box-sizing: border-box;">
 			<view @click="gopath('/pages/declaration/declaration?type=5')" style="width: 100%;background: rgba(255,255,255,0.63);border-radius: 30rpx;padding: 20rpx 0;">
 				<view style="width: 60%;margin: 0 auto;display: flex;align-items: center;">
 					<view style="width: 30%;margin: 0 auto;">
 						<image style="height: 120rpx;width: 100%;" src="../../static/ly/image11.png" mode="aspectFit"></image>
 					</view>
 					<view style="color: #3D3D3D;text-align: center;font-size: 25rpx;">
-						开发商小区门牌号申报
+						门楼牌需求申报
 					</view>
 				</view>
 			</view>
 			
-		</view>
+		</view> -->
 		<view class="bottom">
 			<view class="bottom-two">
 				<view class="bottom-two-list" @click="gopath('/pages/mapstakeline/mapstakeline')">
 					<view class="bottom-two-list-img"><image src="../../static/map1.png"></image></view>
 					<view class="bottom-two-list-text">界桩界线管护</view>
 				</view>
-				<view class="bottom-two-list" @click="gopath('/pages/mapdoorplate/mapdoorplate')">
+				<view class="bottom-two-list" @click="gopath('/pages/map1/map')">
 					<view class="bottom-two-list-img"><image src="../../static/map2.png"></image></view>
-					<view class="bottom-two-list-text">路门牌上报</view>
+					<view class="bottom-two-list-text">地名查询服务</view>
 				</view>
 			</view>
 			<view class="bottom-my" style="margin-top: 20rpx;" @click="gopath('/pages/maptask/maptask')">
diff --git a/pages/declaration/newDeclaration.vue b/pages/declaration/newDeclaration.vue
new file mode 100644
index 0000000..090aa29
--- /dev/null
+++ b/pages/declaration/newDeclaration.vue
@@ -0,0 +1,1031 @@
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+			<view class="content">
+				<view class="top-box" @click="gopath('/pages/declaration/declarationList?type='+7)">
+					<view>上报历史</view>
+					<view class="top-box-img">
+						<image src="../../static/right2.png"></image>
+					</view>
+				</view>
+				<view class="titleall-left">
+					<view class="titleall-left-line"></view>我要上报
+				</view>
+				<view class="message-list">
+					<view v-for="(item,index) in textlist" :key="index">
+						<view class="info-box" v-if="item.type == '7'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker range-key="name" mode="multiSelector" @columnchange="columnChange"
+											@change="e=> bindPickerChange2(e,index)" :range="array1" :value="idx">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '1'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view>
+										<u-input placeholder="请输入" border="none" v-model="item.cent"
+											inputAlign="right" fontSize="13px" color="#3d3d3d"  placeholderStyle="color: #909090;font-size: 26rpx;"></u-input>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '2'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array3')" :range="array3">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view v-else-if="item.type == '3'">
+							<view class="info-box" >
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.latitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">纬度<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.latitude?'uni-input1':'uni-input2'">{{item.latitude?item.latitude:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.longitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">经度<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.longitude?'uni-input1':'uni-input2'">{{item.longitude?item.longitude:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="info-box" v-else-if="item.type == '4'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right" @tap="opentime(index)">
+										<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+										</view>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '5'">
+							<view class="info-box-list">
+								<view class="info-box-width" style="width: 100%;">
+									<view class="info-box-small">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view style="margin-top: 20rpx;">
+										<textarea style="border: solid 1px #eee;border-radius: 18rpx;padding: 20rpx;font-weight: 500;font-size: 26rpx;" placeholder-style="color: #909090;font-size: 26rpx;font-weight: 100;" placeholder="请输入" :class="item.cent?'uni-input1':'uni-input2'" v-model="item.cent"></textarea>
+										<!-- <u-textarea count :value="item.cent" placeholder="请输入" placeholderStyle="color: #909090;font-size: 26rpx;font-weight: 500;"></u-textarea> -->
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '6'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array2')" :range="array2">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '8'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array4')" :range="array4">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-for="(item,index) in newtextlist" :key="index">
+						<view class="info-box" v-if="item.type == '7'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker range-key="name" mode="multiSelector" @columnchange="columnChange"
+											@change="e=> bindPickerChange2(e,index)" :range="array1" :value="idx">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '1'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view>
+										<u-input placeholder="请输入" border="none" v-model="item.cent"
+											inputAlign="right" fontSize="13px" color="#3d3d3d"  placeholderStyle="color: #909090;font-size: 26rpx;"></u-input>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '2'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array3')" :range="array3">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view v-else-if="item.type == '3'">
+							<view class="info-box" >
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.latitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">纬度<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.latitude?'uni-input1':'uni-input2'">{{item.latitude?item.latitude:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.longitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">经度<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.longitude?'uni-input1':'uni-input2'">{{item.longitude?item.longitude:'请选择'}}</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					
+						<view class="info-box" v-else-if="item.type == '4'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right" @tap="opentime(index)">
+										<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+										</view>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '5'">
+							<view class="info-box-list">
+								<view class="info-box-width" style="width: 100%;">
+									<view class="info-box-small">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view style="margin-top: 20rpx;">
+										<textarea style="border: solid 1px #eee;border-radius: 18rpx;padding: 20rpx;font-weight: 500;font-size: 26rpx;" placeholder-style="color: #909090;font-size: 26rpx;font-weight: 100;" placeholder="请输入" :class="item.cent?'uni-input1':'uni-input2'" v-model="item.cent"></textarea>
+										<!-- <u-textarea count :value="item.cent" placeholder="请输入" placeholderStyle="color: #909090;font-size: 26rpx;font-weight: 500;"></u-textarea> -->
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '6'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array2')" :range="array2">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '8'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx" style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange3(e,index,'array5')" :range="array5">
+											<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+<!-- 				<view class="message-list">
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-small">多媒体信息</view>
+								<view style="margin-top: 20rpx;width: 100%;">
+									<sczl :imagelist="mtbox.imgcent"  :wjlist="mtbox.filecent" @onchangfileJsonimg="e=>{onchangfileJsonimg(e)}" @onchangfileJsonfile="e=>{onchangfileJsonfile(e)}"></sczl>
+									
+				
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> -->
+				<view class="page-footer">
+					<view class="footer-buy">
+						<view class="cart-add" @click="mapdoorplatesuccess">
+							<image src="../../static/btn5.png"></image>
+							<text>立即上报</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
+	</view>
+</template>
+
+<script>
+	import service from '@/service/service.js'
+	import BASE_URL from "@/common/config.js"
+	import sczl from "@/components/sczl.vue"
+	export default {
+		data() {
+			return {
+				newtextlist:[],
+				mtbox:{
+					imgcent:[],
+					filecent:[],
+				},
+				idx: [0,0,0,0],
+				array1: [],
+				array2: ['可公开', '不宜公开','大洋怪重', '不属于地名'],
+				array4: ['现今地名', '历史地名','本地名删除'],
+				array5: ['冷泉', '热泉'],
+				time: null,
+				array3: getApp().globalData.list1,
+				BASE_URL,
+				nvConfig: {
+					title: "地名命名申报",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
+					},
+				},
+				lbbox:[],
+				textlist: [{
+						name: '行政区划',
+						type: '2',
+						isbx:true,
+						cent: '',
+						from:'adminArea'
+					},
+					{
+						name: '地名类别',
+						type: '7',
+						isbx:true,
+						cent: '',
+						from:'placeNameCategory'
+					},
+					{
+						name: '标准名称',
+						type: '1',
+						isbx:true,
+						cent: '',
+						from:'standardName'
+					},
+					{
+						name: '地名代码',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'toponymicCode'
+					},
+					{
+						name: '是否可公开',
+						type: '6',
+						isbx:false,
+						cent: '',
+						from:'whetherPublic'
+					},
+					{
+						name: '罗马字母拼写',
+						type: '1',
+						isbx:true,
+						cent: '',
+						from:'romanLettersSpell'
+					},
+					{
+						name: '通名罗马字母拼写',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'commonRomanAlphabetSpelling'
+					},
+					{
+						name: '少数民族语拼写',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'minoritySpelling'
+					},
+					{
+						name: '地名语种',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'language'
+					},
+					{
+						name: '别名',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'alias'
+					},
+					{
+						name: '简称',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'abbreviation'
+					},
+					{
+						name: '使用时间',
+						type: '8',
+						isbx:true,
+						cent: '',
+						from:'usageTime'
+					},
+					{
+						name: '曾用名',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'formerName'
+					},
+					{
+						name: '设立时间',
+						type: '4',
+						isbx:true,
+						cent: '',
+						from:'establishTime'
+					},
+					{
+						name: '废止时间',
+						type: '4',
+						isbx:false,
+						cent: '',
+						from:'annulmentTime'
+					},
+					{
+						name: '地理位置',
+						type: '3',
+						isbx:true,
+						cent: '',
+						from:'mapCoordinates'
+					},
+					{
+						name: '地名来历',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'originOfPlaceNames'
+					},
+					{
+						name: '地名含义',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'meaningOfPlaceNames'
+					},
+					{
+						name: '历史沿革',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'historicalEvolution'
+					},
+					{
+						name: '备注',
+						type: '5',
+						isbx:false,
+						cent: '',
+						from:'remark'
+					},
+				]
+			};
+		},
+		components: {
+			sczl
+		},
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
+		},
+		onLoad(e) {
+			this.gain()
+			
+
+		},
+		methods: {
+			gain() {
+				this.API.gettreeselect().then(res => {
+					console.log(res.data[0].children);
+					
+					let box1 = []
+					let box2 = []
+					let box3 = []
+					let box4 = []
+					for (let i = 0; i < res.data[0].children.length; i++) {
+						let list1 = res.data[0].children[i]
+						
+						let cent1 = {
+							id: list1.id,
+							name: list1.label
+						}
+						box1.push(cent1)
+						if(list1.children) {
+							for (let n = 0; n < list1.children.length; n++) {
+								let list2 = list1.children[n]
+								let cent2 = {
+									id: list2.id,
+									name: list2.label,
+									pid: list1.id,
+								}
+								box2.push(cent2)
+								if(list2.children) {
+									for (let x = 0; x < list2.children.length; x++) {
+										let list3 = list2.children[x]
+										let cent3 = {
+											id: list3.id,
+											name: list3.label,
+											pid: list2.id,
+										}
+										box3.push(cent3)
+										if(list3.children) {
+											for (let y = 0; y < list3.children.length; y++) {
+												let list4 = list3.children[y]
+												let cent4 = {
+													id: list4.id,
+													name: list4.label,
+													pid: list3.id,
+												}
+												box4.push(cent4)
+											}
+										}
+									}
+								}
+							}
+						} else {
+							
+						}
+					}
+					this.lbbox = [box1,box2,box3,box4]
+					console.log(this.lbbox);
+					this.updatelist(0,0)
+				})
+				// this.API.getregional().then(res => {
+				// 	console.log(res);
+				// })
+			},
+			gopath(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			onchangfileJsonimg(e,){
+				console.log(e);
+				this.mtbox.imgcent = e
+			},
+			onchangfileJsonfile(e) {
+				console.log(e);
+				this.mtbox.filecent = e
+			},
+			confirm(e) {
+				this.textlist[this.time].cent = e.fulldate
+			},
+			opentime(e) {
+				this.$refs.calendar.open();
+				this.time = e
+			},
+			mapdoorplatesuccess() {
+				console.log(this.textlist,this.textlist.length)
+				let from = {}
+				// for (let i = 0; i < this.textlist.length; i++) {
+				// 	if(this.textlist[i].isbx) {
+				// 		if(this.textlist[i].cent) {
+							
+				// 		} else {
+				// 			uni.showToast({
+				// 				icon:'none',
+				// 				title:'请填写' + this.textlist[i].name 
+				// 			})
+				// 			return
+				// 		}
+				// 	} else {
+						
+				// 	}
+				// }
+				// for (let i = 0; i < this.newtextlist.length; i++) {
+				// 	if(this.newtextlist[i].isbx) {
+				// 		if(this.newtextlist[i].cent) {
+							
+				// 		} else {
+				// 			uni.showToast({
+				// 				icon:'none',
+				// 				title:'请填写' + this.newtextlist[i].name 
+				// 			})
+				// 			return
+				// 		}
+				// 	} else {
+						
+				// 	}
+				// }
+				for (let i = 0; i < this.textlist.length; i++) {
+
+					if(this.textlist[i].from == 'mapCoordinates') {
+						from[this.textlist[i].from] = this.textlist[i].cent
+						from.eastLongitude = this.textlist[i].longitude
+						from.northLatitude = this.textlist[i].latitude
+					} else {
+						from[this.textlist[i].from] = this.textlist[i].cent
+					}
+				}
+				console.log(from,from.length)
+				from.createdUser=uni.getStorageSync('USERS_KEY').userId
+				from.status='待审核'
+				from.remarksField5 = JSON.stringify(this.newtextlist)
+				this.API.toponym(from).then(res => {
+					console.log(res);
+					if (res.code == 200) {
+						uni.showToast({
+							icon: 'success',
+							title: "添加成功",
+						})
+						setTimeout(() => {
+							uni.redirectTo({
+								url: '/pages/mapdoorplatesuccess/mapdoorplatesuccess',
+							})
+						}, 800)
+				
+					}
+				})
+			},
+			bindPickerChange2: function(e, e1) {
+				console.log('picker发送选择改变，携带值为', e, e1,this.array1)
+				let box1 = this.array1[0]
+				let box2 = this.array1[1]
+				let box3 = this.array1[2]
+				let box4 = this.array1[3]
+				this.textlist[e1].cent = box4[e.detail.value[3]]?box4[e.detail.value[3]].name:box3[e.detail.value[2]]?box3[e.detail.value[2]].name:box2[e.detail.value[1]]?box2[e.detail.value[1]].name:box1[e.detail.value[0]].name
+				if(this.textlist[e1].cent == '泉') {
+					this.array5 = ['冷泉', '热泉']
+					this.newtextlist = [
+						{
+							name: '类型',
+							type: '8',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '最高水位(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name1'
+						},
+						{
+							name: '最低水位(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name2'
+						},
+						{
+							name: '最大输出量(立方米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name3'
+						},
+						{
+							name: '日出水量(立方米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name4'
+						},
+						{
+							name: '涌水高度(米)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name5'
+						},
+						{
+							name: '年均水温(摄氏度)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name6'
+						},
+					]
+				} else if(this.textlist[e1].cent == '瀑布') {
+					this.newtextlist = [
+						{
+							name: '最大落差(米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '最大宽度(米)',
+							type: '1',
+							isbx:true,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '流量(立方米/秒)',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+						{
+							name: '上游水源',
+							type: '1',
+							isbx:false,
+							cent: '',
+							from:'name0'
+						},
+					]
+				}else if(this.textlist[e1].cent == '') {
+					
+				}else if(this.textlist[e1].cent == '') {
+					
+				}
+				
+				this.newtextlist.push(
+					{
+						name: '所在(跨) 行政区',
+						type: '1',
+						isbx:true,
+						cent: '',
+						from:'name'+this.newtextlist.length
+					},
+				)
+				this.newtextlist.push(
+					{
+						name: '其他信息',
+						type: '5',
+						isbx:false,
+						cent: '',
+						from:'name'+this.newtextlist.length
+					},
+				)
+				console.log(this.newtextlist)
+			},
+			bindPickerChange1: function(e, e1,e2) {
+				console.log('picker发送选择改变，携带值为', e, e1,e2)
+				this.textlist[e1].cent = this[e2][e.detail.value]
+			},
+			bindPickerChange3: function(e, e1,e2) {
+				console.log('picker发送选择改变，携带值为', e, e1,e2)
+				this.newtextlist[e1].cent = this[e2][e.detail.value]
+			},
+			openaddress(e) {
+				let that = this
+				// 用户已经同意小程序使用录音功能，后续调用 wx.startRecord 接口不会弹窗询问
+				wx.chooseLocation({
+					success: function(res) {
+						that.textlist[e].cent = res.address
+						that.textlist[e].latitude = res.latitude
+						that.textlist[e].longitude = res.longitude
+						console.log(res)
+					},
+					fail(err) {
+						console.log(err)
+					}
+				});
+			},
+			// picker的列发生变化时
+			columnChange(e) {
+				// column列索引（0-第一列）  value是列中数组索引
+				this.updatelist(parseInt(e.target.column), parseInt(e.target.value))
+			},
+			updatelist(col, idx) {
+				console.log(col,idx)
+				let data = this.lbbox
+				let list = this.array1 // 视图渲染
+				list[0] = data[0] // picker的第一列数据
+				// 当第一列变化时
+				if (col == 0) {
+					// 更新第二列的数据
+					list[1] = list[0][idx]?data[1].filter(ele => ele.pid == list[0][idx].id):[]
+					// 更新第三列的数据
+					list[2] = list[1][0]?data[2].filter(ele => ele.pid == list[1][0].id):[]
+					list[3] = list[2][0]?data[3].filter(ele => ele.pid == list[2][0].id):[]
+					this.idx = [idx, 0, 0,0]
+				}
+				// 当第二列变化时
+				if (col == 1) {
+					// 只用更新第三列数据
+					list[2] = list[1][idx]?data[2].filter(ele => ele.pid == list[1][idx].id):[]
+					list[3] = list[2][0]?data[3].filter(ele => ele.pid == list[2][0].id):[]
+					this.idx = [this.idx[0], idx, 0,0]
+				}
+				// 当第三列变化时
+				if (col == 2) {
+					// 只用更新第三列数据
+					list[3] = list[2][idx]?data[3].filter(ele => ele.pid == list[2][idx].id):[]
+					this.idx = [this.idx[0],this.idx[1],idx,0]
+				}
+				// 更新list，更新picker视图
+				this.array1 = list
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.uni-input1 {
+		color:#3d3d3d;
+		// font-weight: bold;
+
+	}
+	.uni-input2 {
+		color: #909090;
+
+	}
+	.listBox {
+		position: relative;
+		z-index: 1;
+	}
+
+	.content {
+		width: 100%;
+		padding-bottom: 120rpx;
+	}
+
+	.titleall-left {
+		font-size: 28rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		margin: 30rpx;
+
+		.titleall-left-line {
+			width: 10rpx;
+			height: 25rpx;
+			border-radius: 18rpx;
+			background-color: #547DFF;
+			margin-right: 20rpx;
+			box-shadow: inset 0rpx 4rpx 9rpx 0rpx rgba(255, 255, 255, 0.34), 5rpx 7rpx 9rpx 0rpx rgba(80, 161, 255, 0.33);
+		}
+	}
+
+	.top-box {
+		display: flex;
+		justify-content: space-between;
+		margin: 30rpx;
+		font-size: 28rpx;
+		font-weight: bold;
+		background-color: #fff;
+		border-radius: 21rpx;
+		padding: 30rpx;
+
+		.top-box-img {
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	.titleall-box {
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 20rpx 20rpx 0;
+
+		.titleall-left {
+			font-size: 32rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+
+			.titleall-left-line {
+				width: 14rpx;
+				height: 36rpx;
+				border-radius: 0 10rpx 10rpx 0;
+				background-color: #667FFF;
+				box-shadow: 0 0 10rpx 5rpx #d1d9ff;
+				margin-right: 20rpx;
+			}
+
+			text {
+				font-size: 28rpx;
+				color: #999999;
+			}
+		}
+	}
+
+	.message-list {
+		// background-color: #FFFFFF;
+		// border-radius: 20rpx;
+		font-size: 25rpx;
+		margin: 25rpx;
+
+		.info-box {
+			padding: 0 40rpx;
+			background: #FFFFFF;
+			border-radius: 21rpx;
+			margin-bottom: 15rpx;
+
+			.info-box-list {
+				display: flex;
+				align-items: center;
+				border-bottom: 2rpx solid #ececec;
+				padding-top: 20rpx;
+				padding-bottom: 20rpx;
+
+				.width100 {
+					width: 100% !important;
+				}
+
+				.info-box-width {
+					width: 50%;
+					font-size: 30rpx;
+					font-weight: bold;
+
+					.info-box-small {
+						font-size: 26rpx;
+						color: #a8a8a8;
+						font-weight: 500;
+						margin-top: 10rpx;
+					}
+
+					.info-box-list-img {
+						margin-top: 30rpx;
+
+						image {
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.input-text {
+						font-size: 30rpx;
+					}
+
+					.inputtext {
+						color: #3d3d3d;
+					}
+
+					.textarea {
+						background-color: #F7F7F7;
+						border-radius: 20rpx;
+						width: 100%;
+						margin-top: 20rpx;
+						padding: 20rpx;
+						font-size: 28rpx;
+						font-weight: normal;
+						min-height: 80rpx;
+					}
+				}
+
+				.serve {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 100%;
+
+					.serve-title {
+						font-size: 26rpx;
+						color: #909090;
+					}
+
+					.serve-right {
+						font-size: 26rpx;
+						// font-weight: bold;
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						text {
+							color: #FC4444;
+						}
+
+						image {
+							width: 20rpx;
+							height: 20rpx;
+							margin-left: 10rpx;
+						}
+					}
+				}
+			}
+
+			.info-box-list:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+
+	/* 底部 */
+	.page-footer {
+		margin: 30rpx;
+		display: flex;
+		height: 100rpx;
+
+		.footer-buy {
+			height: 100%;
+			width: 100%;
+
+			.cart-add {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 60rpx;
+
+				image {
+					position: absolute;
+					z-index: 0;
+					width: 95%;
+					height: 83rpx;
+					box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+					border-radius: 100rpx;
+				}
+
+				text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #fff;
+					position: absolute;
+					z-index: 1;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/declaration/newDeclarationdetail.vue b/pages/declaration/newDeclarationdetail.vue
new file mode 100644
index 0000000..ea5931c
--- /dev/null
+++ b/pages/declaration/newDeclarationdetail.vue
@@ -0,0 +1,606 @@
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+			<view class="content" >
+				<view class="message-list">
+					<view class="titleall-box">
+						<view class="titleall-left">
+							<view class="titleall-left-line"></view>基本信息
+						</view>
+					</view>
+					<view class="newinfo-box">
+						<view class="info-box-list">
+							<view :class="item.type=='5'?'width100 info-box-width':'info-box-width'" v-for="(item,index) in textlist" :key="index">
+								<view class="info-box-overflow">{{item.cent?item.cent:'-'}}</view>
+								<view class="info-box-small">{{item.name}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<view class="content" v-if="newtextlist.length>0">
+				<view class="message-list">
+					<view class="titleall-box">
+						<view class="titleall-left">
+							<view class="titleall-left-line"></view>基本信息
+						</view>
+					</view>
+					<view class="newinfo-box">
+						<view class="info-box-list">
+							<view :class="item.type=='5'?'width100 info-box-width':'info-box-width'" v-for="(item,index) in newtextlist" :key="index">
+								<view class="info-box-overflow">{{item.cent?item.cent:'-'}}</view>
+								<view class="info-box-small">{{item.name}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			
+			</view>
+			<view class="content" v-if="info.remarksField1">
+				<view class="message-list">
+					<view class="titleall-box">
+						<view class="titleall-left">
+							<view class="titleall-left-line"></view>驳回原因
+						</view>
+					</view>
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-overflow">
+									{{info.remarksField1?info.remarksField1:'-'}}</view>
+							
+							</view>
+			
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-if="info.remarksField2">
+				<view class="message-list">
+					<view class="titleall-box">
+						<view class="titleall-left">
+							<view class="titleall-left-line"></view>处理结果
+						</view>
+					</view>
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-overflow">
+									{{info.remarksField2?info.remarksField2:'-'}}</view>
+							
+							</view>
+			
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="skip-btn" v-if="info.filePath">
+				<view class="buy-at" @click="downfile(info.filePath)">
+					<image src="../../static/btn7.png"></image>
+					<text>批复文件下载</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import BASE_URL from "@/common/config.js"
+	export default {
+		data() {
+			return {
+				textlist: [{
+						name: '行政区划',
+						type: '2',
+						isbx:true,
+						cent: '',
+						from:'adminArea'
+					},
+					{
+						name: '地名类别',
+						type: '7',
+						isbx:true,
+						cent: '',
+						from:'placeNameCategory'
+					},
+					{
+						name: '标准名称',
+						type: '1',
+						isbx:true,
+						cent: '',
+						from:'standardName'
+					},
+					{
+						name: '地名代码',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'toponymicCode'
+					},
+					{
+						name: '是否可公开',
+						type: '6',
+						isbx:false,
+						cent: '',
+						from:'whetherPublic'
+					},
+					{
+						name: '罗马字母拼写',
+						type: '1',
+						isbx:true,
+						cent: '',
+						from:'romanLettersSpell'
+					},
+					{
+						name: '通名罗马字母拼写',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'commonRomanAlphabetSpelling'
+					},
+					{
+						name: '少数民族语拼写',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'minoritySpelling'
+					},
+					{
+						name: '地名语种',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'language'
+					},
+					{
+						name: '别名',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'alias'
+					},
+					{
+						name: '简称',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'abbreviation'
+					},
+					{
+						name: '使用时间',
+						type: '8',
+						isbx:true,
+						cent: '',
+						from:'usageTime'
+					},
+					{
+						name: '曾用名',
+						type: '1',
+						isbx:false,
+						cent: '',
+						from:'formerName'
+					},
+					{
+						name: '设立时间',
+						type: '4',
+						isbx:true,
+						cent: '',
+						from:'establishTime'
+					},
+					{
+						name: '废止时间',
+						type: '4',
+						isbx:false,
+						cent: '',
+						from:'annulmentTime'
+					},
+					{
+						name: '地理位置',
+						type: '3',
+						isbx:true,
+						cent: '',
+						from:'mapCoordinates'
+					},
+					{
+						name: '地名来历',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'originOfPlaceNames'
+					},
+					{
+						name: '地名含义',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'meaningOfPlaceNames'
+					},
+					{
+						name: '历史沿革',
+						type: '5',
+						isbx:true,
+						cent: '',
+						from:'historicalEvolution'
+					},
+					{
+						name: '备注',
+						type: '5',
+						isbx:false,
+						cent: '',
+						from:'remark'
+					},
+				],
+				type: null,
+				BASE_URL,
+				info: {},
+				nvConfig: {
+					title: "HC52454【单立桩】",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
+					},
+				},
+				markers: [],
+				address: {
+					// 纬度
+					latitude: 29.99599,
+					// 经度
+					longitude: 104.13412
+				},
+				newtextlist:[]
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.nv.pageScroll(e)
+		},
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
+		},
+		onLoad(params) {
+			this.info = JSON.parse(params.cent)
+			this.nvConfig.title = this.info.name
+			let from = params.cent?JSON.parse(params.cent):''
+			console.log(from)
+			if(from) {
+				for (let i = 0; i < this.textlist.length; i++) {
+					if(this.textlist[i].from == 'mapCoordinates') {
+						this.textlist[i].cent =from[this.textlist[i].from] 
+						 this.textlist[i].longitude = from.eastLongitude 
+						this.textlist[i].latitude = from.northLatitude 
+					} else {
+						this.textlist[i].cent = from[this.textlist[i].from]
+					}
+				}
+				if(from.remarksField5) {
+					this.newtextlist = JSON.parse(from.remarksField5)
+				}
+				
+			}
+		},
+		methods: {
+			downfile(e) {
+				
+				let that = this
+				console.log(that.BASE_URL + e)
+				let c1 = e.split('.')
+				console.log(c1)
+				uni.downloadFile({
+					url: that.BASE_URL+e,
+					header: {
+						'content-type': "application/json",
+					},
+					// filePath: wx.env.USER_DATA_PATH + e,
+					success: (res) => {
+						console.log(res)
+						if (res.statusCode === 200) {
+							const savedFilePath = res.tempFilePath
+							uni.openDocument({
+								filePath: savedFilePath,
+								fileType: c1[1], //注意：文件为pdf，类型为pdf
+								showMenu: true,
+								success: (response) => {
+									console.log(response)
+								},
+								fail: (err) => {
+									console.log(err)
+									wx.hideLoading()
+								}
+							})
+						} else {
+							wx.hideLoading()
+						}
+					},
+					fail: (err) => {
+						console.log(err)
+						wx.hideLoading()
+						
+					},
+					complete: () => {
+						wx.hideLoading()
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.newinfo-box {
+		padding: 0 40rpx;
+		border-radius: 20rpx;
+		margin-bottom: 30rpx;
+		.width100 {
+			width: 100% !important;
+		}
+		.info-box-list {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			flex-wrap: wrap;
+			.info-box-width {
+				width: 45%;
+				font-size: 30rpx;
+				font-weight: bold;
+				border-bottom: 2rpx solid #ececec;
+				padding-top: 30rpx;
+				padding-bottom: 30rpx;
+				.info-box-overflow {
+					width: 95%;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
+				}
+				
+				.info-box-small {
+					font-size: 26rpx;
+					color: #a8a8a8;
+					font-weight: 500;
+					margin-top: 10rpx;
+				}
+				
+				.info-box-list-img {
+					margin-top: 30rpx;
+				
+					image {
+						width: 180rpx;
+						height: 180rpx;
+						border-radius: 20rpx;
+					}
+				}
+				
+				.info-box-list-sm {
+					background-color: #F7F7F7;
+					border-radius: 20rpx;
+					font-size: 28rpx;
+					color: #909090;
+					font-weight: 500;
+					width: 100%;
+					padding: 20rpx;
+					margin-top: 20rpx;
+				}
+				
+				.green {
+					color: #00D970;
+				}
+			}
+				
+			.serve {
+				display: flex;
+				justify-content: space-between;
+				width: 100%;
+				
+				.serve-title {
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+				
+				.serve-right {
+					font-size: 28rpx;
+					text-align: right;
+					color: #909090;
+				
+					.serve-right-top {
+						margin-bottom: 20rpx;
+					}
+				}
+			}
+		}
+	}
+	.listBox {
+		position: relative;
+		z-index: 1;
+	}
+
+	.content {
+		width: 100%;
+		// padding-bottom: 120rpx;
+	}
+
+	.topimg {
+		margin: 25rpx;
+
+		image {
+			width: 100%;
+			border-radius: 20rpx;
+		}
+	}
+
+	.titleall-box {
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 20rpx 20rpx 0;
+
+		.titleall-left {
+			font-size: 32rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+
+			.titleall-left-line {
+				width: 14rpx;
+				height: 36rpx;
+				border-radius: 0 10rpx 10rpx 0;
+				background-color: #667FFF;
+				box-shadow: 0 0 10rpx 5rpx #d1d9ff;
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.message-list {
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		font-size: 26rpx;
+		margin: 25rpx;
+
+		.info-box {
+			padding: 0 40rpx;
+			border-radius: 20rpx;
+			margin-bottom: 30rpx;
+
+			.info-box-list {
+				display: flex;
+				align-items: center;
+				border-bottom: 2rpx solid #ececec;
+				padding-top: 30rpx;
+				padding-bottom: 30rpx;
+
+				.width100 {
+					width: 100% !important;
+				}
+
+				.info-box-width {
+					width: 50%;
+					font-size: 30rpx;
+					font-weight: bold;
+
+					.info-box-overflow {
+						width: 95%;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 1;
+						overflow: hidden;
+					}
+
+					.info-box-small {
+						font-size: 26rpx;
+						color: #a8a8a8;
+						font-weight: 500;
+						margin-top: 10rpx;
+					}
+
+					.info-box-list-img {
+						margin-top: 30rpx;
+
+						image {
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.info-box-list-sm {
+						background-color: #F7F7F7;
+						border-radius: 20rpx;
+						font-size: 28rpx;
+						color: #909090;
+						font-weight: 500;
+						width: 100%;
+						padding: 20rpx;
+						margin-top: 20rpx;
+					}
+
+					.green {
+						color: #00D970;
+					}
+				}
+
+				.serve {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+
+					.serve-title {
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+
+					.serve-right {
+						font-size: 28rpx;
+						text-align: right;
+						color: #909090;
+
+						.serve-right-top {
+							margin-bottom: 20rpx;
+						}
+					}
+				}
+			}
+
+			.info-box-list:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+
+	.skip-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100rpx;
+		margin-top: 70rpx;
+		position: fixed;
+		bottom: 30rpx;
+
+		.cart-add {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 38%;
+
+			image {
+				width: 253rpx;
+				height: 80rpx;
+				box-shadow: 5rpx 10rpx 20rpx 0 #efefef;
+				border-radius: 100rpx;
+			}
+
+			text {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #262626;
+				position: absolute;
+				z-index: 1;
+			}
+		}
+
+		.buy-at {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 58%;
+
+			image {
+				width: 415rpx;
+				height: 80rpx;
+				box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+				border-radius: 100rpx;
+			}
+
+			text {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+				position: absolute;
+				z-index: 1;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2b7ebd8..ea878f4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,14 +31,14 @@
 							<view><image src="/static/new/4.png" mode="heightFix"></image></view>
 							<view class="text">殡葬服务</view>
 						</view>
-						<view class="list" @click="lmpsb">
+						<view class="list" @click="toponym">
 							<view><image src="/static/new/image 1.png" mode="heightFix"></image></view>
-							<view class="text">路门牌上报</view>
+							<view class="text">地名申报</view>
 							<!-- <view class="text">个案接报登记</view> -->
 						</view>
-						<view class="list" @click="toponym">
+						<view class="list" @click="lmpsb">
 							<view><image src="/static/new/image 2.png" mode="heightFix"></image></view>
-							<view class="text">地名申报</view>
+							<view class="text">地名查询</view>
 						</view>
 						<view class="list" @click="gopath('/pages/policy/policy')">
 							<view><image src="/static/new/image 3.png" mode="heightFix"></image></view>
@@ -128,7 +128,7 @@
 			},
 			toponym() {
 				uni.navigateTo({
-					url:"/pages/declaration/declaration?type=4"
+					url:"/pages/declaration/newDeclaration"
 				})
 			},
 			tzyl(){
@@ -139,7 +139,8 @@
 			},
 			lmpsb(){
 				uni.navigateTo({
-					url:'/pages/mapdoorplate/mapdoorplate'
+					// url:'/pages/mapdoorplate/mapdoorplate'
+					url:'/pages/map1/map'
 					// url: '/pages/receiptRegistration/receiptRegistration'
 				})
 			},
diff --git a/pages/map1/home.scss b/pages/map1/home.scss
new file mode 100644
index 0000000..d615498
--- /dev/null
+++ b/pages/map1/home.scss
@@ -0,0 +1,45 @@
+.page{
+	position: relative;
+	width: 100%;
+	overflow: hidden;
+}
+
+.cent {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	.list {
+		flex-wrap: wrap;
+		.on {
+			border:  2rpx solid sandybrown;
+			border-radius: 18rpx;
+		}
+		.item {
+			width: 20%;
+			height: 100rpx;
+			text-align: center;
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #676767;
+			background: #FFFFFF;
+			// box-sizing: border-box;
+			padding: 20rpx 0rpx;
+			margin-left: 4%;
+			margin-bottom: 20rpx;
+			border-radius: 18rpx;
+		}
+	}
+	.list1 {
+		background: #FFFFFF;
+		padding: 0 30rpx;
+		.item {
+			width: 100%;
+			align-items: center;
+			padding: 20rpx 0;
+			border-top: 2rpx solid #EEEEEE;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #676767;
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/map1/map - 副本.vue b/pages/map1/map - 副本.vue
new file mode 100644
index 0000000..acf68e4
--- /dev/null
+++ b/pages/map1/map - 副本.vue
@@ -0,0 +1,266 @@
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+		<view class="content">
+		<!-- <view class="bg"><image src="../../static/img/1.png" mode="widthFix"></image></view> -->
+			<view class="map-content">
+				<view v-if="isshow1">
+					<view class="map-list">
+						<view class="map-list-title">区域</view>
+						<view class="map-list-icon">
+						<view class="map-icon-bg map-icon-bg-all active">全部</view>
+						<view class="map-icon-bg">老城区</view>
+						<view class="map-icon-bg">城南新区</view>
+						<view class="map-icon-bg">城北新区</view>
+						</view>
+					</view>
+					<view class="map-list">
+						<view class="map-list-title">街道</view>
+						<view class="map-list-icon">
+						<view class="map-icon-bg-all active">全部</view>
+						<view class="map-icon-bg">文林街道</view>
+						<view class="map-icon-bg">普宁街道</view>
+						<view class="map-icon-bg">怀仁街道</view>
+						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
+						</view>
+					</view>
+					<view class="map-list">
+						<view class="map-list-title">镇</view>
+						<view class="map-list-icon">
+						<view class="map-icon-bg-all active">全部</view>
+						<view class="map-icon-bg">文宫镇</view>
+						<view class="map-icon-bg">禾加镇</view>
+						<view class="map-icon-bg">龙马镇</view>
+						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
+						</view>
+					</view>
+					<view class="map-list">
+						<view class="map-list-title">乡</view>
+						<view class="map-list-icon">
+						<view class="map-icon-bg-all active">全部</view>
+						<view class="map-icon-bg">青岗乡</view>
+						<view class="map-icon-bg">谢安乡</view>
+						<view class="map-icon-bg">贵平乡</view>
+						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
+						</view>
+					</view>
+				</view>
+				<view class="search">
+					<view class="search-icon"><image src="../../static/search.png"></image><text>|</text></view>
+			<!-- 		<view class="search-text">
+						<text>单位信息</text><image src="../../static/down2.png"></image>
+					</view> -->
+					<view class="search-input"><input type="text" placeholder="请输入关键词查询" v-model="query.unitName" placeholder-class="inputtext" /></view>
+					<view class="search-btn" @click="getlist"><image src="../../static/search1.png"></image></view>
+				</view>
+			</view>
+			<view class="map" style="width: 100%;height: 100%;">
+				<map :min-scale="9"  id="customMap" :scale="15" :style="'width: 100%;'+ 'height:'+screenHeight"  :markers="markers" layer-style="1" subkey="PTOBZ-QDQEG-DK3QM-QMYWN-I5WDZ-CCB6S"
+					:latitude="address.latitude" :longitude="address.longitude">
+				</map>
+			</view>
+		
+	</view>
+</view>
+</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				markers:[],
+				isshow1:false,
+				address: {
+					// 纬度
+					latitude: 29.99599,
+					// 经度
+					longitude: 104.13412
+				},
+				nvConfig:{
+					title:"单位查询",
+					bgColor:"#ffffff",
+					color:"#000000",
+					fixedAssist:{
+						hide:true,
+					},
+					transparent:{
+						initColor:"#000",
+					},
+				},
+				screenHeight:'',
+				list:[],
+				query:{
+					unitName:''
+				}
+			}
+		},
+		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+		computed:{
+			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		},
+		onReady() {
+			uni.hideTabBar();
+		},
+		onLoad() {
+			var that = this;
+			uni.getSystemInfo({
+				success: function(res) {
+					that.screenHeight = res.safeArea.height + 'px'
+				}
+			})
+			this.GetLocation()
+			
+		},
+		methods:{
+			// 添加门店标记
+			addMarkers(list) {
+				const positions = []
+				list.forEach((item, index) => {
+					let box = item.locationPoint.split(',')
+					positions.push({
+						latitude: box[1],
+						longitude: box[0],
+						title: item.unitName,
+					})
+				})
+				const newMarkers = []
+				positions.forEach((p, i) => {
+					// console.log(i)
+					newMarkers.push(
+						Object.assign({}, {
+							id: i + 1,
+					
+							joinCluster: false, // 指定了该参数才会参与聚合  
+							label: {
+								padding: 10,
+								height: 30,
+								borderRadius: 10,
+								bgColor: '#0098ae',
+								color:'#fff',
+								content: `${p.title}`
+							}
+						}, p)
+					)
+				})
+				this.markers = newMarkers
+				const markers = newMarkers
+				this._mapContext.addMarkers({
+					markers,
+					clear: false,
+					complete(res) {
+						console.log('addMarkers', res)
+					}
+				})
+			},
+			// 获取单位列表
+			getlist(){
+				this.API.getunitlist(this.query).then(res=>{
+					console.log("单位列表",res);
+					this.addMarkers(res.rows)
+				})
+			},
+			//获取定位
+			GetLocation () {
+				let that = this
+				// 获取用户是否开启 授权获取当前的地理位置、速度的权限。
+				uni.getSetting({
+					success (res) {
+						console.log(res)
+						// 如果没有授权
+						if (!res.authSetting['scope.userLocation']) {
+						// 则拉起授权窗口
+							uni.authorize({
+								scope: 'scope.userLocation',
+								success () {
+								//点击允许后--就一直会进入成功授权的回调 就可以使用获取的方法了
+									uni.getLocation({
+										type: 'wgs84',
+										success: function (e) {
+											console.log('这是当前位置信息', e)
+											that.address.latitude = e.latitude;
+											that.address.longitude = e.longitude;
+										}
+									})
+								},
+								fail (error) {
+									//点击了拒绝授权后--就一直会进入失败回调函数--此时就可以在这里重新拉起授权窗口
+									console.log('拒绝授权', error)
+			
+									uni.showModal({
+										title: '提示',
+										content: '若点击不授权，将无法使用位置功能',
+										cancelText: '不授权',
+										cancelColor: '#999',
+										confirmText: '授权',
+										confirmColor: '#f94218',
+										success (res) {
+											console.log(res)
+											if (res.confirm) {
+												// 选择弹框内授权
+												uni.openSetting({
+													success (res) {
+														console.log(res.authSetting,'12121')
+														uni.getLocation({
+															type: 'wgs84',
+															success: function (e) {
+																console.log('777', error)
+																that.address.latitude = e.latitude;
+																that.address.longitude = e.longitude;
+															}, 
+															fail (error) {
+																console.log('失败', error)
+															}
+														})
+													}
+												})
+											} else if (res.cancel) {
+												console.log('用户点击不授权')
+											}
+										}
+									})
+								}
+							})
+						} else {
+							uni.getLocation({
+								type: 'wgs84',
+								success: function (e) {
+									console.log('这是当前位置信息', e)
+									that.address.latitude = e.latitude;
+									that.address.longitude = e.longitude;
+								}, 
+								fail (error) {
+									console.log('失败', error)
+								}
+							})
+						}
+					},
+					complete(re) {
+						console.log('获取数据', re)
+						that.getlist()
+					}
+				})
+			},
+			mapstakeline() {
+				uni.navigateTo({
+					url: '/pages/mapstakeline/mapstakeline'
+				})
+			},
+			maptask() {
+				uni.navigateTo({
+					url: '/pages/maptask/maptask'
+				})
+			},
+			mapdoorplate() {
+				uni.navigateTo({
+					url: '/pages/mapdoorplate/mapdoorplate'
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'map.scss';
+</style>
diff --git a/pages/map1/map.vue b/pages/map1/map.vue
index f4c7233..5c6c926 100644
--- a/pages/map1/map.vue
+++ b/pages/map1/map.vue
@@ -1,266 +1,355 @@
-<template>
+<template>
 	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-		<view class="content">
-		<!-- <view class="bg"><image src="../../static/img/1.png" mode="widthFix"></image></view> -->
-			<view class="map-content">
-				<view v-if="isshow1">
-					<view class="map-list">
-						<view class="map-list-title">区域</view>
-						<view class="map-list-icon">
-						<view class="map-icon-bg map-icon-bg-all active">全部</view>
-						<view class="map-icon-bg">老城区</view>
-						<view class="map-icon-bg">城南新区</view>
-						<view class="map-icon-bg">城北新区</view>
-						</view>
-					</view>
-					<view class="map-list">
-						<view class="map-list-title">街道</view>
-						<view class="map-list-icon">
-						<view class="map-icon-bg-all active">全部</view>
-						<view class="map-icon-bg">文林街道</view>
-						<view class="map-icon-bg">普宁街道</view>
-						<view class="map-icon-bg">怀仁街道</view>
-						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
-						</view>
+		<view class="main">
+			<view class="map" style="width: 100%;height: 100%;">
+				<map   id="customMap" :scale="scaleNum" :style="'width: 100%;'+ 'height:'+screenHeight"  :markers="markers" layer-style="1" subkey="PTOBZ-QDQEG-DK3QM-QMYWN-I5WDZ-CCB6S"
+					:latitude="address.latitude" :longitude="address.longitude" @regionchange="mapTouchEnd" @labeltap="mapMarkerChange" ></map>
+			</view>
+		</view>
+		<view class="cent" >
+			<view class=" list" style="display: flex;">
+				<view v-for="(item,index) in icon" :key='index' class="item" :class="type==item.text?'on':''" @click="changmap(item)">
+					<view style="height: 60%;">
+						<image style="height: 100%;" :src="item.icon" mode="heightFix"></image>
+						<!-- <image src="../../static/imgs/index/icon23.png" mode="heightFix"></image> -->
 					</view>
-					<view class="map-list">
-						<view class="map-list-title">镇</view>
-						<view class="map-list-icon">
-						<view class="map-icon-bg-all active">全部</view>
-						<view class="map-icon-bg">文宫镇</view>
-						<view class="map-icon-bg">禾加镇</view>
-						<view class="map-icon-bg">龙马镇</view>
-						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
+					<view style="height: 10%;"></view>
+					<view>{{item.text}}</view>
+				</view>
+			</view>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+				@scrolltolower="lower" @scroll="scroll">
+				<view class="list1">
+					<view v-for="(item,index) in list" :key='index' class="item" style="display: flex;justify-content: space-between;">
+						<view style="width: 75%;">
+							<view style="font-weight: bold;font-size: 26rpx;margin-bottom: 10rpx;">{{item.title}}</view>
+							<view>{{item.address}}</view>
 						</view>
-					</view>
-					<view class="map-list">
-						<view class="map-list-title">乡</view>
-						<view class="map-list-icon">
-						<view class="map-icon-bg-all active">全部</view>
-						<view class="map-icon-bg">青岗乡</view>
-						<view class="map-icon-bg">谢安乡</view>
-						<view class="map-icon-bg">贵平乡</view>
-						<view class="map-icon-more">展开<image src="../../static/down1.png"></image></view>
+						<view @click="NavigationMap(item)">
+							<u-icon name="map-fill" color="#2979ff" size="20"></u-icon>
+							<!-- <uni-icons type="paperplane-filled" size="20" color="sandybrown"></uni-icons> -->
 						</view>
 					</view>
 				</view>
-				<view class="search">
-					<view class="search-icon"><image src="../../static/search.png"></image><text>|</text></view>
-			<!-- 		<view class="search-text">
-						<text>单位信息</text><image src="../../static/down2.png"></image>
-					</view> -->
-					<view class="search-input"><input type="text" placeholder="请输入关键词查询" v-model="query.unitName" placeholder-class="inputtext" /></view>
-					<view class="search-btn" @click="getlist"><image src="../../static/search1.png"></image></view>
-				</view>
-			</view>
-			<view class="map" style="width: 100%;height: 100%;">
-				<map :min-scale="9"  id="customMap" :scale="15" :style="'width: 100%;'+ 'height:'+screenHeight"  :markers="markers" layer-style="1" subkey="PTOBZ-QDQEG-DK3QM-QMYWN-I5WDZ-CCB6S"
-					:latitude="address.latitude" :longitude="address.longitude">
-				</map>
-			</view>
-		
+			</scroll-view>
+		</view>
 	</view>
-</view>
-</view>
-</template>
-
-<script>
-	export default {
-		data() {
+</template>
+
+<script>
+	import utils from '../../service/utils.js'
+	import service from '../../service/service.js'
+	export default {
+
+		data() {
 			return {
-				markers:[],
-				isshow1:false,
+				icon:[
+					// {
+					// 	text:'商业街区',
+					// 	icon:'../../static/imgs/index/icon23.png',
+					// },
+					{
+						text:'加油站',
+						icon:'../../static/imgs/index/icon24.png',
+					},
+					{
+						text:'停车场',
+						icon:'../../static/imgs/index/icon25.png',
+					},
+					{
+						text:'洗车场',
+						icon:'../../static/imgs/index/icon26.png',
+					},
+					{
+						text:'充电站',
+						icon:'../../static/imgs/index/icon27.png',
+					},
+					{
+						text:'医院',
+						icon:'../../static/imgs/index/icon28.png',
+					},
+					{
+						text:'体育场',
+						icon:'../../static/imgs/index/icon29.png',
+					},
+					{
+						text:'厕所',
+						icon:'../../static/imgs/index/icon30.png',
+					},
+					// {
+					// 	text:'文化馆',
+					// 	icon:'../../static/imgs/index/icon32.png',
+					// },
+					// {
+					// 	text:'图书馆',
+					// 	icon:'../../static/imgs/index/icon33.png',
+					// },
+					// {
+					// 	text:'博物馆',
+					// 	icon:'../../static/imgs/index/icon34.png',
+					// },
+				],
+				screenHeight:'',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
 				address: {
 					// 纬度
 					latitude: 29.99599,
 					// 经度
 					longitude: 104.13412
 				},
-				nvConfig:{
-					title:"单位查询",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
-					},
-					transparent:{
-						initColor:"#000",
-					},
-				},
-				screenHeight:'',
-				list:[],
-				query:{
-					unitName:''
-				}
-			}
-		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+				_mapContext: undefined,
+				markers: [],
+				list: [],
+				// 缩放比例
+				scaleNum: 14,
+				mescroll: null, // mescroll实例对象 (此行可删,mixins已默认)
+				type:'商业街区'
+			}
 		},
 		onReady() {
-			uni.hideTabBar();
+			// 获取地图实例
+			this.markers = []
+			this._mapContext = uni.createMapContext("customMap", this);
+			console.log('这是地图实力信息', this._mapContext)
+			// this.GetLocation()
+			
 		},
-		onLoad() {
-			var that = this;
+		onLoad(e) {
+			console.log(e.type)
+			
+			if(e.type) {
+				this.GetStoreData(e.type)
+				this.type = e.type
+			} else {
+				this.type = '加油站'
+				this.GetStoreData('加油站')
+			}
+			let that = this
 			uni.getSystemInfo({
 				success: function(res) {
+					console.log('App Launch1111')
+					console.log(res.safeArea.height)
 					that.screenHeight = res.safeArea.height + 'px'
-				}
-			})
-			this.GetLocation()
+				},
 			
+			})
 		},
-		methods:{
-			// 添加门店标记
+		methods: {
+			NavigationMap(e) {
+				console.log(e)
+				uni.openLocation({
+					longitude: parseFloat(e.location.lng),
+					latitude: parseFloat(e.location.lat),
+					success(e) {
+						console.log('拉起导航成功', e)
+					},
+					fail(error) {
+						uni.showToast({
+							title: error,
+							icon: 'none'
+						})
+					},
+					complete(com) {
+						console.log('拉起导航complete', com)
+					}
+				})
+			},
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			changmap(e) {
+				this.type = e.text
+				this.markers = []
+				this.list = []
+				this._mapContext.addMarkers({
+					clear: true,
+					markers: [],
+					success: (res) => {
+					   console.log('removeMarkers', res)
+					},
+				})
+				this.GetStoreData(e.text)
+			},
+			mapTouchEnd(e) {
+				console.log('回调参数', e)
+			},
+
+			async mapMarkerChange(e) {
+				console.log('标记点', e)
+			},
 			addMarkers(list) {
 				const positions = []
 				list.forEach((item, index) => {
-					let box = item.locationPoint.split(',')
 					positions.push({
-						latitude: box[1],
-						longitude: box[0],
-						title: item.unitName,
+						latitude: item.location.lat,
+						longitude: item.location.lng,
+						title: item.title,
+						// distance: item.distance,
+						// type:item.type==1?'整租':item.type==2?'合租':''
 					})
 				})
 				const newMarkers = []
 				positions.forEach((p, i) => {
-					// console.log(i)
 					newMarkers.push(
 						Object.assign({}, {
-							id: i + 1,
-					
+							id: i,
+							// iconPath: this.IMG_URL + '/imgs/marks.png',
+							width: 20,
+							height: 30,
 							joinCluster: false, // 指定了该参数才会参与聚合  
-							label: {
-								padding: 10,
-								height: 30,
-								borderRadius: 10,
-								bgColor: '#0098ae',
-								color:'#fff',
-								content: `${p.title}`
-							}
+							// label: {
+							// 	padding: 10,
+							// 	height: 30,
+							// 	borderWidth: 1,
+							// 	borderRadius: 10,
+							// 	bgColor: '#ffffff',
+							// 	color:'#3d3d3d',
+							// 	content: `${p.title}`
+							// }
 						}, p)
 					)
 				})
-				this.markers = newMarkers
-				const markers = newMarkers
+				this.markers = [...this.markers ,...newMarkers]
+				const markers = [...this.markers ,...newMarkers]
+				
+				this.$forceUpdate()
+				
 				this._mapContext.addMarkers({
 					markers,
 					clear: false,
 					complete(res) {
-						console.log('addMarkers', res)
+						// console.log('addMarkers', res)
 					}
 				})
 			},
-			// 获取单位列表
-			getlist(){
-				this.API.getunitlist(this.query).then(res=>{
-					console.log("单位列表",res);
-					this.addMarkers(res.rows)
-				})
-			},
-			//获取定位
-			GetLocation () {
-				let that = this
-				// 获取用户是否开启 授权获取当前的地理位置、速度的权限。
-				uni.getSetting({
-					success (res) {
-						console.log(res)
-						// 如果没有授权
-						if (!res.authSetting['scope.userLocation']) {
-						// 则拉起授权窗口
-							uni.authorize({
-								scope: 'scope.userLocation',
-								success () {
-								//点击允许后--就一直会进入成功授权的回调 就可以使用获取的方法了
-									uni.getLocation({
-										type: 'wgs84',
-										success: function (e) {
-											console.log('这是当前位置信息', e)
-											that.address.latitude = e.latitude;
-											that.address.longitude = e.longitude;
-										}
-									})
-								},
-								fail (error) {
-									//点击了拒绝授权后--就一直会进入失败回调函数--此时就可以在这里重新拉起授权窗口
-									console.log('拒绝授权', error)
-			
-									uni.showModal({
-										title: '提示',
-										content: '若点击不授权，将无法使用位置功能',
-										cancelText: '不授权',
-										cancelColor: '#999',
-										confirmText: '授权',
-										confirmColor: '#f94218',
-										success (res) {
-											console.log(res)
-											if (res.confirm) {
-												// 选择弹框内授权
-												uni.openSetting({
-													success (res) {
-														console.log(res.authSetting,'12121')
-														uni.getLocation({
-															type: 'wgs84',
-															success: function (e) {
-																console.log('777', error)
-																that.address.latitude = e.latitude;
-																that.address.longitude = e.longitude;
-															}, 
-															fail (error) {
-																console.log('失败', error)
-															}
-														})
-													}
-												})
-											} else if (res.cancel) {
-												console.log('用户点击不授权')
-											}
-										}
+
+			// 获取门店列表
+			async GetStoreData(e) {
+				let that  =  this
+				wx.request({
+				  //地图WebserviceAPI地点搜索接口请求路径及参数（具体使用方法请参考开发文档）
+					url: 'https://apis.map.qq.com/ws/place/v1/search?page_index=1&page_size=20&boundary=region(仁寿县,0)&key=JSMBZ-IH4WB-AHOU5-JIQ4B-RONK3-FRBL4&keyword='+e,
+					success(res){
+						// console.log(res.data.data)
+						that.addMarkers(res.data.data)
+						that.list = res.data.data
+						// console.log(res.data.count)
+						if(res.data.count > 20) {
+							// console.log(res.data.count/20)
+							// console.log(Math.ceil(res.data.count/20))
+							let c1 = Math.ceil(res.data.count/20)
+							for (let i = 1; i <= c1; i++) {
+								// console.log(i)
+								if(i == 1) {
+									
+								} else if(i == 2) {
+									wx.request({
+									  //地图WebserviceAPI地点搜索接口请求路径及参数（具体使用方法请参考开发文档）
+										url: 'https://apis.map.qq.com/ws/place/v1/search?page_size=20&boundary=region(资中县,0)&key=JSMBZ-IH4WB-AHOU5-JIQ4B-RONK3-FRBL4&keyword=' + e + '&page_index=' + i,
+										success(res){
+											// console.log(res.data.data)
+											that.addMarkers(res.data.data)
+											that.list =[...that.list,...res.data.data] 
+										}	
 									})
+								} else {
+									
 								}
-							})
+							}
+
 						} else {
-							uni.getLocation({
-								type: 'wgs84',
-								success: function (e) {
-									console.log('这是当前位置信息', e)
-									that.address.latitude = e.latitude;
-									that.address.longitude = e.longitude;
-								}, 
-								fail (error) {
-									console.log('失败', error)
-								}
-							})
+							console.log('不够')
 						}
-					},
-					complete(re) {
-						console.log('获取数据', re)
-						that.getlist()
-					}
+					}	
 				})
+				// this.API.GetArticleList({...this.model,...this.addressqq}).then(res => {
+				// 	console.log('获取门店列表', res)	
+				// 	for (let i = 0; i < res.data.list.length; i++) {
+				// 		console.log(res.data.list[i].distance )
+				// 		res.data.list[i].distance = this.WAY.kmUnit(res.data.list[i].distance)
+				// 		console.log(res.data.list[i].distance )
+				// 	}
+				// 	this.addMarkers(res.data.list)
+				// 	this.list = res.data.list
+				// })
 			},
-			mapstakeline() {
-				uni.navigateTo({
-					url: '/pages/mapstakeline/mapstakeline'
-				})
+			downCallback() {
+				this.mescroll.endSuccess();
 			},
-			maptask() {
-				uni.navigateTo({
-					url: '/pages/maptask/maptask'
-				})
+			upCallback(page) {
+				setTimeout(() => {
+					this.mescroll.endByPage(10, 20);
+				}, 2000)
 			},
-			mapdoorplate() {
+			ConfirmOrder(e) {
 				uni.navigateTo({
-					url: '/pages/mapdoorplate/mapdoorplate'
+					url: '/pages/houseCent/houseCent?id='+ e
 				})
 			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'map.scss';
-</style>
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import 'home.scss';
+		.scroll-Y {
+			height: 400rpx;
+			background: #ffffff;
+		}
+	.manpCenter {
+		width: 60rpx;
+		height: 60rpx;
+		position: absolute;
+		// z-index: 111 !important;
+		left: calc(50% - 24rpx);
+		top: calc(50% - 77rpx); // 按道理是-38.5rpx，但是会比实际偏上一点，设置-77rpx视觉上比较符合实际
+	}
+
+	.titleSetting {
+		box-shadow: 2px 2px 10px #e0e0e0;
+		text-align: center;
+		font-size: 20rpx;
+		color: black;
+		line-height: 28rpx;
+		background-color: white;
+		height: 28rpx;
+		padding: 10rpx 15rpx 10rpx 15rpx;
+		position: absolute;
+		// z-index: 111 !important;
+		left: calc(50% - 80rpx);
+		top: calc(50% - 130rpx); // 按道理是-38.5rpx，但是会比实际偏上一点，设置-77rpx视觉上比较符合实际
+	}
+
+	.centerview1 {
+
+		margin: 0 auto;
+		width: 100%;
+		border: 1px solid #f2e2ac;
+		border-radius: 10px;
+		background: linear-gradient(270deg, #878787 0%, #282828 100%);
+		text-align: center;
+		z-index: 99999999999;
+		height: 40px;
+		line-height: 40px;
+		color: white;
+		animation: scaleDrawC 2s;
+		transform-origin: 50% 50%;
+		-webkit-animation-name: scaleDrawC !important;
+		/*关键帧名称*/
+		-webkit-animation-timing-function: ease-in-out;
+		/*动画的速度曲线*/
+		-webkit-animation-iteration-count: infinite;
+		/*动画播放的次数*/
+		-webkit-animation-duration: 2s;
+	}
+</style>
diff --git a/pages/mapdoorplate/mapdoorplate.vue b/pages/mapdoorplate/mapdoorplate.vue
index 57414e1..d7215e3 100644
--- a/pages/mapdoorplate/mapdoorplate.vue
+++ b/pages/mapdoorplate/mapdoorplate.vue
@@ -19,7 +19,7 @@
 								<view class="serve-title">路门牌情况</view>
 								<view class="serve-right">
 									<picker @change="bindPickerChange" :value="index" :range="array">
-										<view class="uni-input">{{sign.roadStatus?sign.roadStatus:'请选择'}}
+										<view :class="sign.roadStatus?'uni-input1':'uni-input2'">{{sign.roadStatus?sign.roadStatus:'请选择'}}
 										</view>
 									</picker>
 									<image src="../../static/down3.png"></image>
@@ -34,7 +34,7 @@
 								<view>
 									<input id="name" @input="oninput" v-module="sign.name"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -46,7 +46,7 @@
 								<view>
 									<input id="contactName" @input="oninput" v-module="sign.contactName"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -58,7 +58,7 @@
 								<view>
 									<input id="phone" @input="oninput" v-module="sign.phone"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -68,7 +68,8 @@
 							<view class="serve">
 								<view class="serve-title">详细地址</view>
 								<view class="serve-right" @tap="openaddress">
-									<view class="uni-input">{{sign.address?sign.address:'请选择'}}</view>
+									<view :class="sign.roadStatus?'uni-input1':'uni-input2'">{{sign.address?sign.address:'请选择'}}</view>
+									<image src="../../static/down3.png"></image>
 								</view>
 							</view>
 						</view>
@@ -80,7 +81,7 @@
 								<view>
 									<input id="remark" @input="oninput" v-module="sign.remark"
 										placeholder="请输入" style="text-align: right;"
-										placeholder-style="color:#3d3d3d;font-weight: bold;" />
+										 placeholder-style="color: #909090;font-size: 26rpx;" />
 								</view>
 							</view>
 						</view>
@@ -126,7 +127,7 @@
 				fileList: [],
 				OrderType: 0,
 				nvConfig: {
-					title: "路门牌上报",
+					title: "地名标志牌需求申报",
 					bgColor: "#ffffff",
 					color: "#000000",
 					fixedAssist: {
@@ -138,7 +139,7 @@
 					applyId: uni.getStorageSync('USERS_KEY').userId,
 					createdUser: uni.getStorageSync('USERS_KEY').userId,
 					roadStatus: null, //请选择路门牌情况
-					status: '待审核', //审核状态
+					status: '待处理', //审核状态
 					name: null, //名称
 					phone: null, //联系电话
 					address: null, //详细地址
@@ -149,7 +150,7 @@
 					inspectionImage:null,//图片
 				},
 
-				array:['正常','需维修', '需更换'] ,
+				array:['新申报','报修', '查询'] ,
 
 			};
 		},
@@ -251,6 +252,19 @@
 </script>
 
 <style scoped lang="scss">
+	.uni-input1 {
+		color:#3d3d3d;
+		// font-weight: bold;
+	
+	}
+	.uni-input2 {
+		color: #909090;
+	
+	}
+	input {
+		color: #3d3d3d;
+		font-size: 26rpx;
+	}
 	.listBox {
 		position: relative;
 		z-index: 1;
@@ -395,13 +409,13 @@
 					width: 100%;
 
 					.serve-title {
-						font-size: 25rpx;
+						font-size: 26rpx;
 						color: #909090;
 					}
 
 					.serve-right {
-						font-size: 25rpx;
-						font-weight: bold;
+						font-size: 26rpx;
+						// font-weight: bold;
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
diff --git a/pages/mapstakeline/mapstakeline.scss b/pages/mapstakeline/mapstakeline.scss
index 8198be0..af2e468 100644
--- a/pages/mapstakeline/mapstakeline.scss
+++ b/pages/mapstakeline/mapstakeline.scss
@@ -1,10 +1,58 @@
+.skip-btn{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100rpx;
+	margin-top: 70rpx;
+	position: fixed;
+	bottom: 30rpx;
+	.cart-add{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 38%;
+		image {
+			width: 253rpx;
+			height: 80rpx;
+			box-shadow: 5rpx 10rpx 20rpx 0 #efefef;
+			border-radius: 100rpx;
+		}
+		text{
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #262626;
+			position: absolute;
+			z-index: 1;
+		}
+	}
+	.buy-at{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 58%;
+		image {
+			width: 415rpx;
+			height: 80rpx;
+			box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+			border-radius: 100rpx;
+		}
+		text{
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			position: absolute;
+			z-index: 1;
+		}
+	}
+}
 .listBox{
 	position: relative;
 	z-index: 1;
 }
 .content {
 	width: 100%;
-	padding-top: 100rpx;
+	// padding-top: 100rpx;
 }
 .coupon-tab {
 	position: fixed;
@@ -51,13 +99,14 @@
 .topimg {
 	margin-bottom: 25rpx;
 	width: 100%;
+	background: #fff;
 	image {
 		width: 100%;
 		border-radius: 20rpx;
 	}
 }
 .user-list{
-	padding: 25rpx;
+	
 	.list{
 		position: relative;
 		display: flex;
diff --git a/pages/mapstakeline/mapstakeline.vue b/pages/mapstakeline/mapstakeline.vue
index 478e5f7..d76dca4 100644
--- a/pages/mapstakeline/mapstakeline.vue
+++ b/pages/mapstakeline/mapstakeline.vue
@@ -1,7 +1,7 @@
-<template>
+<template>
 	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-<!-- 		<view class="coupon-tab" :style="{'padding-top':(pageTop+'px')}">
+		<!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> -->
+		<!-- 		<view class="coupon-tab" :style="{'padding-top':(pageTop+'px')}">
 			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)">
 				<text>全部</text>
 				<text class="line"></text>
@@ -20,34 +20,58 @@
 			</view>
 		</view> -->
 		<!-- <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> -->
-		<view class="content">
-		<!-- 列表 -->
-		<view class="user-list">
-			<view class="topimg">
-				<map style="width: 100%;" :min-scale="9"  id="customMap" :scale="15"   :markers="markers" layer-style="1" subkey="PTOBZ-QDQEG-DK3QM-QMYWN-I5WDZ-CCB6S"
+		<view class="content">
+			<!-- 列表 -->
+			<view class="user-list">
+				<view class="topimg" style="padding: 25rpx;">
+					<u-input placeholder="请输入" v-model="text">
+						<template slot="suffix">
+							<u-button @tap="getCode" text="搜索" type="primary" size="mini" ></u-button>
+						</template>
+
+					</u-input>
+
+					<!-- <map style="width: 100%;" :min-scale="9"  id="customMap" :scale="15"   :markers="markers" layer-style="1" subkey="PTOBZ-QDQEG-DK3QM-QMYWN-I5WDZ-CCB6S"
 					:latitude="address.latitude" :longitude="address.longitude">
-				</map>
-			</view>
-			<view class="list" @click="mapstakelinedetail(item)" v-for="(item,index) in list" :key="index">
-				<view class="title">
-					<view>{{item.markerNumber}}【{{item.markerType}}】</view>
-					<text>位置：{{item.location}}</text>
+				</map> -->
+				</view>
+				<view style="padding: 0 25rpx;">
+					<view class="list" @click="mapstakelinedetail(item)" v-for="(item,index) in list" :key="index">
+						<view class="title">
+							<view>{{item.markerNumber}}【{{item.markerSpecification||'-'}}】</view>
+							<text>位置：{{item.location}}</text>
+						</view>
+						<!-- 		<view class="more-content">
+						<view class="more-content-img"><text class="more-content-text">正常</text><image src="../../static/right.png"></image></view>
+					</view> -->
+					</view>
 				</view>
-		<!-- 		<view class="more-content">
-					<view class="more-content-img"><text class="more-content-text">正常</text><image src="../../static/right.png"></image></view>
-				</view> -->
 			</view>
 		</view>
-		</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+<!-- 		<view class="page-footer">
+			<view class="footer-buy">
+				<view class="cart-add" @click="mapdoorplatesuccess">
+					<image src="../../static/btn5.png"></image>
+					<text>添加界桩</text>
+				</view>
+			</view>
+		</view> -->
+<!-- 		<view class="skip-btn">
+			<view class="cart-add" @click="gopath('/pages/mapstakelinedetail/addmapstakelinedetail')">
+				<image src="../../static/btn3.png"></image>
+				<text>添加界桩</text>
+			</view>
+		</view> -->
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
-				markers:[],
+				text:'',
+				markers: [],
 				address: {
 					// 纬度
 					latitude: 29.99599,
@@ -55,36 +79,51 @@
 					longitude: 104.13412
 				},
 				TabShow: 0,
-				nvConfig:{
-					title:"界桩界线管护",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
+				nvConfig: {
+					title: "界桩界线管护",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
 					},
 				},
-				list:[],
-				pages:{
-					pageNum:1,
-					pageSize:10
-				}
-			}
+				list: [],
+				pages: {
+					pageNum: 1,
+					pageSize: 10,
+					markerNumber:''
+				}
+			}
+		},
+		onPageScroll(e) {
+			// this.$refs.nv.pageScroll(e)
 		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
 		},
-		onLoad() {
+		onShow() {
 			this.getlist();
 		},
-		methods:{
+		methods: {
+			gopath(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			getCode(e) {
+				console.log(this.text)
+				this.pages.markerNumber = this.text
+				this.getlist();
+			},
 			addMarkers(list) {
 				const positions = []
 				list.forEach((item, index) => {
-				
+
 					positions.push({
 						latitude: item.latitude,
-						longitude:item.longitude,
+						longitude: item.longitude,
 						title: item.markerNumber,
 					})
 				})
@@ -94,14 +133,14 @@
 					newMarkers.push(
 						Object.assign({}, {
 							id: i,
-					
+
 							joinCluster: false, // 指定了该参数才会参与聚合  
 							label: {
 								padding: 10,
 								height: 30,
 								borderRadius: 10,
 								bgColor: '#0098ae',
-								color:'#fff',
+								color: '#fff',
 								content: `${p.title}`
 							}
 						}, p)
@@ -118,25 +157,64 @@
 				})
 			},
 			// 获取我的任务的列表
-			getlist(){
-				this.API.getplie(this.pages).then(res=>{
-					console.log("界桩",res);
+			getlist() {
+				this.API.getplie(this.pages).then(res => {
+					console.log("界桩", res);
 					this.list = res.rows
-					this.addMarkers(this.list)
+					// this.addMarkers(this.list)
 				})
 			},
-			onCouponTab(type){
+			onCouponTab(type) {
 				this.TabShow = type;
 			},
 			mapstakelinedetail(e) {
 				uni.navigateTo({
-					url: '/pages/mapstakelinedetail/mapstakelinedetail?cent='+JSON.stringify(e)
+					url: '/pages/mapstakelinedetail/mapstakelinedetail?cent=' + JSON.stringify(e)
 				})
 			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'mapstakeline.scss';
-</style>
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'mapstakeline.scss';
+
+	/* 底部 */
+	.page-footer {
+		position: fixed;
+		bottom: 40rpx;
+		// margin: 30rpx;
+		display: flex;
+		height: 100rpx;
+		width: 100%;
+
+		.footer-buy {
+			height: 100%;
+			width: 100%;
+
+			.cart-add {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 60rpx;
+
+				image {
+					position: absolute;
+					z-index: 0;
+					width: 95%;
+					height: 83rpx;
+					box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+					border-radius: 100rpx;
+				}
+
+				text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #fff;
+					position: absolute;
+					z-index: 1;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mapstakelinedetail/addmapstakelinedetail.vue b/pages/mapstakelinedetail/addmapstakelinedetail.vue
new file mode 100644
index 0000000..06c3fb8
--- /dev/null
+++ b/pages/mapstakelinedetail/addmapstakelinedetail.vue
@@ -0,0 +1,693 @@
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+			<view class="content">
+				<view class="message-list">
+					<view v-for="(item,index) in textlist" :key="index">
+						<view class="info-box" v-if="item.type == '7'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker range-key="name" mode="multiSelector" @columnchange="columnChange"
+											@change="e=> bindPickerChange2(e,index)" :range="array1" :value="idx">
+											<view :class="item.cent?'uni-input1':'uni-input2'">
+												{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '1'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view>
+										<u-input placeholder="请输入" border="none" v-model="item.cent" inputAlign="right"
+											fontSize="13px" color="#3d3d3d"
+											placeholderStyle="color: #909090;font-size: 26rpx;"></u-input>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '2'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'array3')" :range="array3">
+											<view :class="item.cent?'uni-input1':'uni-input2'">
+												{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view v-else-if="item.type == '3'">
+							<view class="info-box">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+												style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.cent?'uni-input1':'uni-input2'">
+												{{item.cent?item.cent:'请选择'}}
+											</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.latitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">纬度<span v-if="item.isbx"
+												style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.latitude?'uni-input1':'uni-input2'">
+												{{item.latitude?item.latitude:'请选择'}}
+											</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="info-box" v-if="item.longitude">
+								<view class="info-box-list">
+									<view class="serve">
+										<view class="serve-title">经度<span v-if="item.isbx"
+												style="color: red;margin-left: 6rpx;">*</span></view>
+										<view class="serve-right" @tap="openaddress(index)">
+											<view :class="item.longitude?'uni-input1':'uni-input2'">
+												{{item.longitude?item.longitude:'请选择'}}
+											</view>
+											<image src="../../static/down3.png"></image>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="info-box" v-else-if="item.type == '4'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right" @tap="opentime(index)">
+										<view :class="item.cent?'uni-input1':'uni-input2'">{{item.cent?item.cent:'请选择'}}
+										</view>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '5'">
+							<view class="info-box-list">
+								<view class="info-box-width" style="width: 100%;">
+									<view class="info-box-small">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view style="margin-top: 20rpx;">
+										<textarea
+											style="border: solid 1px #eee;border-radius: 18rpx;padding: 20rpx;font-weight: 500;font-size: 26rpx;"
+											placeholder-style="color: #909090;font-size: 26rpx;font-weight: 100;"
+											placeholder="请输入" :class="item.cent?'uni-input1':'uni-input2'"
+											v-model="item.cent"></textarea>
+										<!-- <u-textarea count :value="item.cent" placeholder="请输入" placeholderStyle="color: #909090;font-size: 26rpx;font-weight: 500;"></u-textarea> -->
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '6'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'markerTypelist2')" :range="markerTypelist2">
+											<view :class="item.cent?'uni-input1':'uni-input2'">
+												{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="info-box" v-else-if="item.type == '8'">
+							<view class="info-box-list">
+								<view class="serve">
+									<view class="serve-title">{{item.name}}<span v-if="item.isbx"
+											style="color: red;margin-left: 6rpx;">*</span></view>
+									<view class="serve-right">
+										<picker @change="e=> bindPickerChange1(e,index,'markerTypelist1')"
+											:range="markerTypelist1">
+											<view :class="item.cent?'uni-input1':'uni-input2'">
+												{{item.cent?item.cent:'请选择'}}
+											</view>
+										</picker>
+										<image src="../../static/down3.png"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="message-list">
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-small">图片</view>
+								<view style="margin-top: 20rpx;width: 100%;">
+									<u-upload name="1" multiple :fileList="fileList" @delete="deletePic"
+										@afterRead="afterRead" :previewFullImage="true" :maxCount="1"></u-upload>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 				<view class="message-list">
+					<view class="info-box">
+						<view class="info-box-list">
+							<view class="info-box-width" style="width: 100%;">
+								<view class="info-box-small">多媒体信息</view>
+								<view style="margin-top: 20rpx;width: 100%;">
+									<sczl :imagelist="mtbox.imgcent"  :wjlist="mtbox.filecent" @onchangfileJsonimg="e=>{onchangfileJsonimg(e)}" @onchangfileJsonfile="e=>{onchangfileJsonfile(e)}"></sczl>
+									
+				
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> -->
+				<view class="page-footer">
+					<view class="footer-buy">
+						<view class="cart-add" @click="mapdoorplatesuccess">
+							<image src="../../static/btn5.png"></image>
+							<text>保存</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
+	</view>
+</template>
+
+<script>
+	import service from '@/service/service.js'
+	import BASE_URL from "@/common/config.js"
+	import sczl from "@/components/sczl.vue"
+	export default {
+		data() {
+			return {
+				fileList: [],
+				markerTypelist1: ['石材','钢材'],
+				markerTypelist2: ['小型', '中型', '大型'],
+				mtbox: {
+					imgcent: [],
+					filecent: [],
+				},
+				idx: [0, 0, 0, 0],
+				array1: [],
+				array2: ['可公开', '不宜公开', '大洋怪重', '不属于地名'],
+				array4: ['现今地名', '历史地名', '本地名删除'],
+				time: null,
+				array3: getApp().globalData.list1,
+				BASE_URL,
+				nvConfig: {
+					title: "修改界桩",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
+					},
+				},
+				lbbox: [],
+				textlist: [{
+						name: '界线名称',
+						type: '1',
+						isbx: false,
+						cent: '',
+						from: 'boundaryName'
+					},
+					{
+						name: '界桩编号',
+						type: '1',
+						isbx: false,
+						cent: '',
+						from: 'markerNumber'
+					},
+					{
+						name: '界桩规格',
+						type: '6',
+						isbx: false,
+						cent: '',
+						from: 'markerSpecification'
+					},
+					{
+						name: '界桩材质',
+						type: '8',
+						isbx: false,
+						cent: '',
+						from: 'unit'
+					},
+					{
+						name: '高程',
+						type: '1',
+						isbx: false,
+						cent: '',
+						from: 'elevation'
+					},
+					{
+						name: '所在地',
+						type: '3',
+						isbx: false,
+						cent: '',
+						from: 'location'
+					},
+					{
+						name: '录入时间',
+						type: '4',
+						isbx: false,
+						cent: '',
+						from: 'enteredTime'
+					},
+					{
+						name: '录入人姓名',
+						type: '1',
+						isbx: false,
+						cent: '',
+						from: 'enteredUser'
+					},
+				]
+			};
+		},
+		components: {
+			sczl
+		},
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
+		},
+		onLoad(params) {
+			let from = params.cent?JSON.parse(params.cent):''
+			console.log(from)
+			this.from = params.cent?JSON.parse(params.cent):''
+			if(from) {
+				for (let i = 0; i < this.textlist.length; i++) {
+					if(this.textlist[i].from == 'location') {
+						this.textlist[i].cent =from[this.textlist[i].from] 
+						 this.textlist[i].longitude = from.longitude 
+						this.textlist[i].latitude = from.latitude 
+					} else {
+						this.textlist[i].cent = from[this.textlist[i].from]
+					}
+				}
+				this.fileList.push({
+					name: from.imageInfo,
+					fileId: from.imageInfo,
+					url: this.BASE_URL + from.imageInfo
+				})
+			}
+		},
+		methods: {
+			async afterRead(event) {
+				for (let i = 0; i < event.file.length; i++) {
+					var res = await this.uploadImg(event.file[i].url)
+					// console.log(res)
+					res = JSON.parse(res.data)
+					this.fileList.push({
+						name: res.fileName,
+						fileId: res.newFileName,
+						url: this.BASE_URL + res.fileName
+					})
+				}
+			},
+			uploadImg(url) {
+				return new Promise((r, e) => {
+					uni.uploadFile({
+						url: this.BASE_URL + "/common/upload",
+						filePath: url,
+						name: "file",
+						success: (d) => r(d)
+					})
+				})
+			},
+			deletePic(event) {
+				this.fileList.splice(event.index, 1)
+			},
+			gopath(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			onchangfileJsonimg(e, ) {
+				console.log(e);
+				this.mtbox.imgcent = e
+			},
+			onchangfileJsonfile(e) {
+				console.log(e);
+				this.mtbox.filecent = e
+			},
+			confirm(e) {
+				this.textlist[this.time].cent = e.fulldate
+			},
+			opentime(e) {
+				this.$refs.calendar.open();
+				this.time = e
+			},
+			mapdoorplatesuccess() {
+				console.log(this.from)
+				for (let i = 0; i < this.textlist.length; i++) {
+					if(this.textlist[i].from == 'location') {
+						this.from[this.textlist[i].from] = this.textlist[i].cent
+						this.from.longitude = this.textlist[i].longitude
+						this.from.latitude = this.textlist[i].latitude
+					} else {
+						this.from[this.textlist[i].from] = this.textlist[i].cent
+					}
+				}
+				if(this.fileList.length>0) {
+					this.from.imageInfo = this.fileList[0].name
+				}
+				console.log(this.from)
+				// return
+				this.API.removeplie(this.from).then(res => {
+					console.log(res);
+					if (res.code == 200) {
+						uni.showToast({
+							icon: 'success',
+							title: "修改成功",
+						})
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/mapstakelinedetail/mapstakelinedetail?cent=' + JSON.stringify(this.from)
+							})
+							// uni.navigateBack({
+							// 	delta: 2
+							// });
+						}, 800)
+
+					}
+				})
+			},
+			bindPickerChange2: function(e, e1) {
+				console.log('picker发送选择改变，携带值为', e, e1, this.array1)
+				let box1 = this.array1[0]
+				let box2 = this.array1[1]
+				let box3 = this.array1[2]
+				let box4 = this.array1[3]
+				this.textlist[e1].cent = box4[e.detail.value[3]] ? box4[e.detail.value[3]].name : box3[e.detail.value[
+						2]] ? box3[e.detail.value[2]].name : box2[e.detail.value[1]] ? box2[e.detail.value[1]].name :
+					box1[e.detail.value[0]].name
+			},
+			bindPickerChange1: function(e, e1, e2) {
+				console.log('picker发送选择改变，携带值为', e, e1, e2)
+				this.textlist[e1].cent = this[e2][e.detail.value]
+			},
+			openaddress(e) {
+				let that = this
+				// 用户已经同意小程序使用录音功能，后续调用 wx.startRecord 接口不会弹窗询问
+				wx.chooseLocation({
+					success: function(res) {
+						that.textlist[e].cent = res.address
+						that.textlist[e].latitude = res.latitude
+						that.textlist[e].longitude = res.longitude
+						console.log(res)
+					},
+					fail(err) {
+						console.log(err)
+					}
+				});
+			},
+			// picker的列发生变化时
+			columnChange(e) {
+				// column列索引（0-第一列）  value是列中数组索引
+				this.updatelist(parseInt(e.target.column), parseInt(e.target.value))
+			},
+			updatelist(col, idx) {
+				console.log(col, idx)
+				let data = this.lbbox
+				let list = this.array1 // 视图渲染
+				list[0] = data[0] // picker的第一列数据
+				// 当第一列变化时
+				if (col == 0) {
+					// 更新第二列的数据
+					list[1] = list[0][idx] ? data[1].filter(ele => ele.pid == list[0][idx].id) : []
+					// 更新第三列的数据
+					list[2] = list[1][0] ? data[2].filter(ele => ele.pid == list[1][0].id) : []
+					list[3] = list[2][0] ? data[3].filter(ele => ele.pid == list[2][0].id) : []
+					this.idx = [idx, 0, 0, 0]
+				}
+				// 当第二列变化时
+				if (col == 1) {
+					// 只用更新第三列数据
+					list[2] = list[1][idx] ? data[2].filter(ele => ele.pid == list[1][idx].id) : []
+					list[3] = list[2][0] ? data[3].filter(ele => ele.pid == list[2][0].id) : []
+					this.idx = [this.idx[0], idx, 0, 0]
+				}
+				// 当第三列变化时
+				if (col == 2) {
+					// 只用更新第三列数据
+					list[3] = list[2][idx] ? data[3].filter(ele => ele.pid == list[2][idx].id) : []
+					this.idx = [this.idx[0], this.idx[1], idx, 0]
+				}
+				// 更新list，更新picker视图
+				this.array1 = list
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.uni-input1 {
+		color: #3d3d3d;
+		// font-weight: bold;
+
+	}
+
+	.uni-input2 {
+		color: #909090;
+
+	}
+
+	.listBox {
+		position: relative;
+		z-index: 1;
+	}
+
+	.content {
+		width: 100%;
+		padding-bottom: 120rpx;
+	}
+
+	.titleall-left {
+		font-size: 28rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		margin: 30rpx;
+
+		.titleall-left-line {
+			width: 10rpx;
+			height: 25rpx;
+			border-radius: 18rpx;
+			background-color: #547DFF;
+			margin-right: 20rpx;
+			box-shadow: inset 0rpx 4rpx 9rpx 0rpx rgba(255, 255, 255, 0.34), 5rpx 7rpx 9rpx 0rpx rgba(80, 161, 255, 0.33);
+		}
+	}
+
+	.top-box {
+		display: flex;
+		justify-content: space-between;
+		margin: 30rpx;
+		font-size: 28rpx;
+		font-weight: bold;
+		background-color: #fff;
+		border-radius: 21rpx;
+		padding: 30rpx;
+
+		.top-box-img {
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	.titleall-box {
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 20rpx 20rpx 0;
+
+		.titleall-left {
+			font-size: 32rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+
+			.titleall-left-line {
+				width: 14rpx;
+				height: 36rpx;
+				border-radius: 0 10rpx 10rpx 0;
+				background-color: #667FFF;
+				box-shadow: 0 0 10rpx 5rpx #d1d9ff;
+				margin-right: 20rpx;
+			}
+
+			text {
+				font-size: 28rpx;
+				color: #999999;
+			}
+		}
+	}
+
+	.message-list {
+		// background-color: #FFFFFF;
+		// border-radius: 20rpx;
+		font-size: 25rpx;
+		margin: 25rpx;
+
+		.info-box {
+			padding: 0 40rpx;
+			background: #FFFFFF;
+			border-radius: 21rpx;
+			margin-bottom: 15rpx;
+
+			.info-box-list {
+				display: flex;
+				align-items: center;
+				border-bottom: 2rpx solid #ececec;
+				padding-top: 20rpx;
+				padding-bottom: 20rpx;
+
+				.width100 {
+					width: 100% !important;
+				}
+
+				.info-box-width {
+					width: 50%;
+					font-size: 30rpx;
+					font-weight: bold;
+
+					.info-box-small {
+						font-size: 26rpx;
+						color: #a8a8a8;
+						font-weight: 500;
+						margin-top: 10rpx;
+					}
+
+					.info-box-list-img {
+						margin-top: 30rpx;
+
+						image {
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.input-text {
+						font-size: 30rpx;
+					}
+
+					.inputtext {
+						color: #3d3d3d;
+					}
+
+					.textarea {
+						background-color: #F7F7F7;
+						border-radius: 20rpx;
+						width: 100%;
+						margin-top: 20rpx;
+						padding: 20rpx;
+						font-size: 28rpx;
+						font-weight: normal;
+						min-height: 80rpx;
+					}
+				}
+
+				.serve {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 100%;
+
+					.serve-title {
+						font-size: 26rpx;
+						color: #909090;
+					}
+
+					.serve-right {
+						font-size: 26rpx;
+						// font-weight: bold;
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+
+						text {
+							color: #FC4444;
+						}
+
+						image {
+							width: 20rpx;
+							height: 20rpx;
+							margin-left: 10rpx;
+						}
+					}
+				}
+			}
+
+			.info-box-list:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+
+	/* 底部 */
+	.page-footer {
+		margin: 30rpx;
+		display: flex;
+		height: 100rpx;
+
+		.footer-buy {
+			height: 100%;
+			width: 100%;
+
+			.cart-add {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 60rpx;
+
+				image {
+					position: absolute;
+					z-index: 0;
+					width: 95%;
+					height: 83rpx;
+					box-shadow: 5rpx 10rpx 20rpx 0 #b7c8ff;
+					border-radius: 100rpx;
+				}
+
+				text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #fff;
+					position: absolute;
+					z-index: 1;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mapstakelinedetail/mapstakelinedetail.vue b/pages/mapstakelinedetail/mapstakelinedetail.vue
index 55ec3b7..2639221 100644
--- a/pages/mapstakelinedetail/mapstakelinedetail.vue
+++ b/pages/mapstakelinedetail/mapstakelinedetail.vue
@@ -20,13 +20,17 @@
 					<view class="info-box">
 						<view class="info-box-list">
 							<view class="info-box-width">
-								<view>{{info.markerNumber}}</view>
+								<view>{{info.markerNumber || '-'}}</view>
 								<view class="info-box-small">界桩编号</view>
 							</view>
 							<view class="info-box-width">
+								<view>{{info.boundaryName || '-'}}</view>
+								<view class="info-box-small">界线名称</view>
+							</view>
+				<!-- 			<view class="info-box-width">
 								<view>北纬{{info.latitude}}，东经{{info.longitude}}</view>
 								<view class="info-box-small">经纬度</view>
-							</view>
+							</view> -->
 						</view>
 						<view class="info-box-list">
 							<view class="info-box-width">
@@ -34,14 +38,24 @@
 								<view class="info-box-small">高程</view>
 							</view>
 							<view class="info-box-width">
-								<view>{{info.location}}</view>
+								<view>{{info.location || '-'}}</view>
 								<view class="info-box-small">位置</view>
 							</view>
 						</view>
 						<view class="info-box-list">
 							<view class="info-box-width">
-								<view>{{info.markerType}}</view>
-								<view class="info-box-small">类型</view>
+								<view>{{info.longitude?info.longitude:'-'}}</view>
+								<view class="info-box-small">东经</view>
+							</view>
+							<view class="info-box-width">
+								<view>{{info.latitude?info.latitude:'-'}}</view>
+								<view class="info-box-small">北纬</view>
+							</view>
+						</view>
+						<view class="info-box-list">
+							<view class="info-box-width">
+								<view>{{info.markerSpecification?info.markerSpecification:'-'}}</view>
+								<view class="info-box-small">规格</view>
 							</view>
 							<view class="info-box-width">
 								<view>{{info.unit?info.unit:'-'}}</view>
@@ -54,8 +68,8 @@
 								<view class="info-box-small">设立时间</view>
 							</view>
 							<view class="info-box-width">
-								<view>{{info.updatedTime?info.updatedTime:'-'}}</view>
-								<view class="info-box-small">最近更新时间</view>
+								<view>{{info.enteredUser?info.enteredUser:'-'}}</view>
+								<view class="info-box-small">录入人姓名</view>
 							</view>
 						</view>
 						<view class="info-box-list" v-if="info.imageInfo">
@@ -133,16 +147,16 @@
 					
 				</view>
 
-<!-- 				<view class="skip-btn">
-					<view class="cart-add">
+				<view class="skip-btn">
+					<view class="cart-add" @click="gopath('/pages/mapstakelinedetail/addmapstakelinedetail?cent='+JSON.stringify(info))">
 						<image src="../../static/btn3.png"></image>
 						<text>资料修改</text>
 					</view>
-					<view class="buy-at">
+			<!-- 		<view class="buy-at">
 						<image src="../../static/btn1.png"></image>
 						<text>界桩巡检情况上报</text>
-					</view>
-				</view> -->
+					</view> -->
+				</view>
 
 			</view>
 		</view>
@@ -199,6 +213,11 @@
 		
 		},
 		methods: {
+			gopath(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
 			getlist() {
 				this.API.getpatrol(this.pages).then(res=>{
 					console.log("巡检",res);
diff --git a/static/imgs/index/icon23.png b/static/imgs/index/icon23.png
new file mode 100644
index 0000000..3bb4580
--- /dev/null
+++ b/static/imgs/index/icon23.png
diff --git a/static/imgs/index/icon24.png b/static/imgs/index/icon24.png
new file mode 100644
index 0000000..8464a6a
--- /dev/null
+++ b/static/imgs/index/icon24.png
diff --git a/static/imgs/index/icon25.png b/static/imgs/index/icon25.png
new file mode 100644
index 0000000..d1e9f3e
--- /dev/null
+++ b/static/imgs/index/icon25.png
diff --git a/static/imgs/index/icon26.png b/static/imgs/index/icon26.png
new file mode 100644
index 0000000..f0e9648
--- /dev/null
+++ b/static/imgs/index/icon26.png
diff --git a/static/imgs/index/icon27.png b/static/imgs/index/icon27.png
new file mode 100644
index 0000000..3d7328b
--- /dev/null
+++ b/static/imgs/index/icon27.png
diff --git a/static/imgs/index/icon28.png b/static/imgs/index/icon28.png
new file mode 100644
index 0000000..2dc273f
--- /dev/null
+++ b/static/imgs/index/icon28.png
diff --git a/static/imgs/index/icon29.png b/static/imgs/index/icon29.png
new file mode 100644
index 0000000..471c529
--- /dev/null
+++ b/static/imgs/index/icon29.png
diff --git a/static/imgs/index/icon30.png b/static/imgs/index/icon30.png
new file mode 100644
index 0000000..8670d36
--- /dev/null
+++ b/static/imgs/index/icon30.png
diff --git a/static/imgs/index/icon31.png b/static/imgs/index/icon31.png
new file mode 100644
index 0000000..8c60fad
--- /dev/null
+++ b/static/imgs/index/icon31.png
diff --git a/static/imgs/index/icon32.png b/static/imgs/index/icon32.png
new file mode 100644
index 0000000..cdbfdae
--- /dev/null
+++ b/static/imgs/index/icon32.png
diff --git a/static/imgs/index/icon33.png b/static/imgs/index/icon33.png
new file mode 100644
index 0000000..3d9ce7b
--- /dev/null
+++ b/static/imgs/index/icon33.png
diff --git a/static/imgs/index/icon34.png b/static/imgs/index/icon34.png
new file mode 100644
index 0000000..69f0328
--- /dev/null
+++ b/static/imgs/index/icon34.png
diff --git a/static/xj.png b/static/xj.png
new file mode 100644
index 0000000..7798b3c
--- /dev/null
+++ b/static/xj.png