diff --git a/manifest.json b/manifest.json
index ffc18f2..9ec7720 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,9 @@
         /* 5+App特有相关 */
         "modules" : {
             "Payment" : {},
-            "Share" : {}
+            "Share" : {},
+            "Maps" : {},
+            "Geolocation" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -40,7 +42,12 @@
             "ios" : {},
             /* ios打包配置 */
             "sdkConfigs" : {
-                "maps" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "",
+                        "appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
+                    }
+                },
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
@@ -49,7 +56,18 @@
                     }
                 },
                 "push" : {},
-                "geolocation" : {},
+                "geolocation" : {
+                    "baidu" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : "mDcZsWM7gGKb7MC1bC8Mo33FScjYEr0I"
+                    },
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : "57d6437544bb36bd3b5f4efb5b06ddbf"
+                    }
+                },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx2654bc27c419ada6",
diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue
index 3fc104b..3a32926 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -1,291 +1,435 @@
 <template>
-	<view class="content" :style="{paddingTop: statusHeight+25 + 'px'}">
-		<statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
-		<container-subgroup-two>
-		    <view slot="content" style="margin: -100rpx -30rpx 0rpx; ">
-                
-         <view class="project-list-input" :style="{top: statusHeight + 'px'}">
-         	<input type="text" class="int" value="" placeholder="请输入关键字" />
-             <view class="xian">
-                 
-             </view>
-         	<image class="search" src="../../static/iocn/ss.png" mode="aspectFill" lazy-load></image>
-         </view>
-         <view class="screen bbot mar-sx20">
-         	<picker @change="bindPickerChange" :value="index" :range="array">
-         		<view class="li">
-         			<view class="text">产品类型</view>
-         			<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
-         		</view>
-         	</picker>
-         	<picker mode="date" :value="date" @change="bindDateChange">
-         		<view class="li">
-         			<view class="text">竣工日期</view>
-         			<image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
-         		</view>
-         	</picker>
-         	<view class="li">
-         		<view class="text">筛选</view>
-         		<image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load></image>
-         	</view>
-         </view>
-         <view class="project-list">
-         	<view class="li" @click="projectDetailsFun()" v-for="(item,index) in 10" :key="index">
-         		<view class="message">
-         			<image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
-         			<view class="text disjb fc" style="height: 180rpx;">
-         				<view class="clips1 fon24 bold">湖南工业大学化工学院会议室P2.5全彩LED显示屏</view>
-         				<view class="disjb fc" style="margin-left: -20rpx;height: 80%;">
-         					<view class="serial-number scal09">项目编号：20220108-1001</view>
-         					<view class="specification scal09">规格型号：DS-CK25FI/H</view>
-         					<view class="specification scal09">产品尺寸：3.94ｍ*2.02ｍ</view>
-         					<view class="installation-site scal09">安装位置：xxx综合楼2楼会议室</view>
-         				</view>
-         			</view>
-         		</view>
-         		<view class="project-list-address col6 mar-s20 disjbac">
-         			<view class="address">
-         				<image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load></image>
-         				<view class="text  scal09" style="margin-left: -26rpx;">湖南省长沙市高新开发区谷园路109号像素大厦1205</view>
-         			</view>
-         			<view class="date scal09">2022/01/08</view>
-         		</view>
-                     <!-- <view class="icon iconBera">质保中</view> -->
-         		<view class="icon iconBer">质保到期</view>
-         	</view>
-         
-         </view>
-         
-                    
+    <view class="content" :style="{paddingTop: statusHeight+25 + 'px'}">
+        <statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
+        <container-subgroup-two>
+            <view slot="content" style="margin: -100rpx -30rpx 0rpx; ">
+                <view class="project-list-input" :style="{top: statusHeight + 'px'}">
+                    <input type="text" @keyup.enter="inquireProject()"  v-model="inputData" class="int" value="" placeholder="请输入关键字" />
+                    <view class="xian">
+                    </view>
+                    <image @click="" class="search" @click="inquireProject()" src="../../static/iocn/ss.png"
+                        mode="aspectFill" lazy-load></image>
                 </view>
-            </container-subgroup-two>
-    
-		<footTabOne :current="1"></footTabOne>
-	</view>
+                <view class="screen bbot mar-sx20">
+                    <picker @change="bindPickerChange" :value="index" :range="array" :range-key="array">
+                        <view class="li">
+                            <view class="text">产品类型</view>
+                            <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
+                        </view>
+                    </picker>
+                    <picker mode="date" :value="date" @change="bindDateChange">
+                        <view class="li">
+                            <view class="text">竣工日期</view>
+                            <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
+                        </view>
+                    </picker>
+                    <view class="li">
+                        <view class="text">筛选</view>
+                        <image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load></image>
+                    </view>
+                </view>
+                <view class="project-list">
+                    <view class="li" @click="projectDetailsFun()" v-for="(item,index) in dataList.data" :key="index">
+                        <view class="message">
+                            <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
+                            <view class="text disjb fc" style="height: 180rpx;">
+                                <view class="clips1 fon24 bold">{{item.title}}</view>
+                                <view class="disjb fc" style="margin-left: -20rpx;height: 80%;">
+                                    <view class="serial-number scal09">项目编号：{{item.projectCode}}</view>
+                                    <view class="specification scal09">规格型号：{{item.model}}</view>
+                                    <view class="specification scal09">产品尺寸：{{item.size}}</view>
+                                    <view class="installation-site scal09">安装位置：{{item.installationSite}}</view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="project-list-address col6 mar-s20 disjbac">
+                            <view class="address">
+                                <image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load>
+                                </image>
+                                <view class="text  scal09" style="margin-left: -26rpx;">{{item.address}}</view>
+                            </view>
+                            <view class="date scal09">{{item.date}}</view>
+                        </view>
+                        <view v-if="item.state==1" class="icon iconBera">质保中</view>
+                        <view v-else class="icon iconBer">质保到期</view>
+                    </view>
+
+                </view>
+
+
+            </view>
+        </container-subgroup-two>
+
+        <footTabOne :current="1"></footTabOne>
+    </view>
 </template>
 
 <script>
-	import statusNav from '../../components/status-nav.vue';
-	import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
-     import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
-	export default {
-		components: {
-			footTabOne,
-			statusNav,
+    import statusNav from '../../components/status-nav.vue';
+    import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
+    import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+    export default {
+        components: {
+            footTabOne,
+            statusNav,
             containerSubgroupTwo
-		},
-		data() {
-			const currentDate = this.getDate({
-				format: true
-			})
-			return {
-                     statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
-				date: currentDate,
-				array: ['类型', '类型', '类型', '类型'],
-				index: 0,
-				statusHeight: uni.getSystemInfoSync().statusBarHeight + 40
-			}
-		},
-		methods: {
-			projectDetailsFun() {
-				uni.navigateTo({
-					url: "/pages/project/details"
-				})
-			},
-			bindPickerChange(data) {
-				console.log(data)
-			},
-			bindDateChange(date) {
-				console.log(date)
-			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
+        },
+        data() {
+            const currentDate = this.getDate({
+                format: true
+            })
+            return {
+                statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 40,
+                inputData: "",
+                date: currentDate,
+                array: [{
+                    title: "质保中",
+                    key: 1,
 
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				console.log(year, month, day)
-				return `${year}-${month}-${day}`;
-			}
-		}
-	}
+                }, {
+                    title: "质保到期",
+                    key: 0,
+
+                }, ],
+                index: 0,
+                statusHeight: uni.getSystemInfoSync().statusBarHeight + 40,
+                dataList: {
+                    list_rows: 10,
+                    page: 1,
+                    data: [{
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 0
+                        },
+                        {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 1
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 1
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 1
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 0
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 0
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 1
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 0
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 0
+                        }, {
+                            title: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+                            projectCode: "20220108-1001",
+                            model: "DS-CK25FI/H",
+                            installationSite: "xxx综合楼2楼会议室",
+                            address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+                            date: "2022/01/08",
+                            size: "3.94ｍ*2.02ｍ",
+                            state: 1
+                        },
+                    ]
+                }
+            }
+        },
+        onLoad() {
+            this.getData()
+            
+        },
+        methods: {
+            
+            getData() {
+                this.$requst.post('/universal/api.project/project_list', {
+                    list_rows: this.dataList.list_rows,
+                    page: this.dataList.page,
+                }).then(res => {
+                    // this.$toolAll.tools.showToast(res.msg);
+                    if (res.code == 0) {
+                        this.dataList = res.data.data
+                    } else {
+
+                    }
+                })
+            },
+            projectDetailsFun() {
+                uni.navigateTo({
+                    url: "/pages/project/details"
+                })
+            },
+            // 查询
+            inquireProject() {
+
+                this.$requst.post('/universal/api.project/project_list', {
+                    list_rows: this.dataList.list_rows,
+                    page: this.dataList.page,
+                    value: this.inputData,
+                }).then(res => {
+                    // this.$toolAll.tools.showToast(res.msg);
+                    if (res.code == 0) {
+                        console.log(res.data.data)
+                        this.dataList = res.data.data
+                    } else {
+
+                    }
+                })
+            },
+            bindPickerChange(data) {
+                console.log(data)
+            },
+            bindDateChange(date) {
+                console.log(date)
+            },
+            getDate(type) {
+                const date = new Date();
+                let year = date.getFullYear();
+                let month = date.getMonth() + 1;
+                let day = date.getDate();
+
+                if (type === 'start') {
+                    year = year - 60;
+                } else if (type === 'end') {
+                    year = year + 2;
+                }
+                month = month > 9 ? month : '0' + month;
+                day = day > 9 ? day : '0' + day;
+                console.log(year, month, day)
+                return `${year}-${month}-${day}`;
+            }
+        }
+    }
 </script>
 
 <style scoped>
-	page {
-		background-color: #F7F7F7;
-	}
+    page {
+        background-color: #F7F7F7;
+    }
 
-	.project-list-input {
-		width: 100%;
-		height: 114rpx;
-		position: relative;
-		padding: 20rpx 16rpx;
+    .project-list-input {
+        width: 100%;
+        height: 114rpx;
+        position: relative;
+        padding: 20rpx 16rpx;
         position: fixed;
         z-index: 2;
-		box-sizing: border-box;
-		background-color: #FFFFFF
-	}
+        box-sizing: border-box;
+        background-color: #FFFFFF
+    }
 
-	.project-list-input .int {
-		width: 100%;
-		height: 100%;
-		background-color: #F7F7F7;
-		padding: 0 25rpx;
+    .project-list-input .int {
+        width: 100%;
+        height: 100%;
+        background-color: #F7F7F7;
+        padding: 0 25rpx;
         padding-right: 100rpx;
-        
-		box-sizing: border-box;
-		border-radius: 36rpx;
-	}
-	.project-list-input .xian {
-		width: 3rpx;
-		height: 35rpx;
-		position: absolute;
+
+        box-sizing: border-box;
+        border-radius: 36rpx;
+    }
+
+    .project-list-input .xian {
+        width: 3rpx;
+        height: 35rpx;
+        position: absolute;
         background-color: #EAEAEA;
-		right: 100rpx;
-		top: 50%;
-		margin-top: -14rpx;
-	}
-	.project-list-input .search {
-		width: 28rpx;
-		height: 28rpx;
-		position: absolute;
-		right: 43rpx;
-		top: 50%;
-		margin-top: -14rpx;
-	}
+        right: 100rpx;
+        top: 50%;
+        margin-top: -14rpx;
+    }
 
-	.screen {
-		display: flex;
-		justify-content: space-around;
-		padding: 26rpx 20rpx;
-		border-top: 1rpx solid #EEEEEE;
-	}
+    .project-list-input .search {
+        width: 28rpx;
+        height: 28rpx;
+        position: absolute;
+        right: 43rpx;
+        top: 50%;
+        margin-top: -14rpx;
+    }
 
-	.screen .li {
-		display: flex;
-		align-items: center;
+    .screen {
+        display: flex;
+        justify-content: space-around;
+        padding: 26rpx 20rpx;
+        border-top: 1rpx solid #EEEEEE;
+    }
 
-	}
+    .screen .li {
+        display: flex;
+        align-items: center;
 
-	.screen .li .text {
-		font-size: 26rpx;
-		color: #333333;
-		margin-right: 10rpx;
-	}
+    }
 
-	.screen .li .img {
-		width: 14rpx;
-		height: 8rpx;
-	}
+    .screen .li .text {
+        font-size: 26rpx;
+        color: #333333;
+        margin-right: 10rpx;
+    }
 
-	.screen .li .imgA {
-		width: 24rpx;
-		height: 23rpx;
-	}
+    .screen .li .img {
+        width: 14rpx;
+        height: 8rpx;
+    }
 
-	.project-list .li {
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		margin: 0 20rpx;
-		border-radius: 10rpx;
-		margin-bottom: 20rpx;
-		padding: 40rpx 20rpx 20rpx 20rpx;
-	}
+    .screen .li .imgA {
+        width: 24rpx;
+        height: 23rpx;
+    }
 
-	.project-list .li .icon {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 135rpx;
-		height: 40rpx;
-		position: absolute;
-		font-size: 22rpx;
-		color: #FFFFFF;
-		right: 23rpx;
-		text-align: center;
-		background-size: 100% 100%;
-		top: -10rpx;
-	}
+    .project-list .li {
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        position: relative;
+        margin: 0 20rpx;
+        border-radius: 10rpx;
+        margin-bottom: 20rpx;
+        padding: 40rpx 20rpx 20rpx 20rpx;
+    }
 
-	.project-list .li .iconBer {
-		background-image: url(../../static/iocn/za.png);
-	}
+    .project-list .li .icon {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 135rpx;
+        height: 40rpx;
+        position: absolute;
+        font-size: 22rpx;
+        color: #FFFFFF;
+        right: 23rpx;
+        text-align: center;
+        background-size: 100% 100%;
+        top: -10rpx;
+    }
 
-	.project-list .li .iconBera {
-		background-image: url(../../static/iocn/zaa.png);
-	}
+    .project-list .li .iconBer {
+        background-image: url(../../static/iocn/za.png);
+    }
 
-	.project-list .li .message {
-		display: flex;
+    .project-list .li .iconBera {
+        background-image: url(../../static/iocn/zaa.png);
+    }
 
-	}
+    .project-list .li .message {
+        display: flex;
 
-	.project-list .li .message .img {
-		width: 230rpx;
-		margin-right: 11rpx;
-		height: 180rpx;
+    }
 
-	}
+    .project-list .li .message .img {
+        width: 230rpx;
+        margin-right: 11rpx;
+        height: 180rpx;
 
-	.project-list .li .message .text {
-		flex: 1;
-	}
-	.project-list .li .message .serial-number {
-		color: #ff8800;
-		font-size: 22rpx;
-		/* margin-bottom: 15rpx; */
-	}
+    }
 
-	.project-list .li .message .specification {
-		color: #00b1ff;
-		font-size: 22rpx;
-		/* margin-bottom: 15rpx; */
-	}
+    .project-list .li .message .text {
+        flex: 1;
+    }
 
-	.project-list .li .message .installation-site {
-		color: #6b6a6a;
-		font-size: 22rpx;
-		/* margin-bottom: 15rpx; */
-	}
+    .project-list .li .message .serial-number {
+        color: #ff8800;
+        font-size: 22rpx;
+        /* margin-bottom: 15rpx; */
+    }
 
-	.project-list-address {
-		display: flex;
-		/* justify-content: space-between; */
-	}
+    .project-list .li .message .specification {
+        color: #00b1ff;
+        font-size: 22rpx;
+        /* margin-bottom: 15rpx; */
+    }
 
-	.project-list-address .text {
-		font-size: 22rpx;
-	}
+    .project-list .li .message .installation-site {
+        color: #6b6a6a;
+        font-size: 22rpx;
+        /* margin-bottom: 15rpx; */
+    }
 
-	.project-list-address .date {
-		font-size: 22rpx;
-		text-align: right;
-		/* margin-left: 20rpx; */
-	}
+    .project-list-address {
+        display: flex;
+        /* justify-content: space-between; */
+    }
 
-	.project-list-address .img {
-		width: 20rpx;
-		height: 28rpx;
-		margin-right: 10rpx;
-	}
+    .project-list-address .text {
+        font-size: 22rpx;
+    }
 
-	.project-list-address .address {
-		display: flex;
-		align-items: center;
+    .project-list-address .date {
+        font-size: 22rpx;
+        text-align: right;
+        /* margin-left: 20rpx; */
+    }
 
-	}
+    .project-list-address .img {
+        width: 20rpx;
+        height: 28rpx;
+        margin-right: 10rpx;
+    }
 
-	.pickerDate {
-		width: 300rpx;
-		height: 300rpx;
-	}
+    .project-list-address .address {
+        display: flex;
+        align-items: center;
+
+    }
+
+    .pickerDate {
+        width: 300rpx;
+        height: 300rpx;
+    }
 </style>
diff --git a/pages/repairsPage/repairsPage.vue b/pages/repairsPage/repairsPage.vue
index 36229a5..5be2eab 100644
--- a/pages/repairsPage/repairsPage.vue
+++ b/pages/repairsPage/repairsPage.vue
@@ -1,67 +1,71 @@
 <template>
     <view class="content">
-		<status-nav navBarTitle="添加报修"  returnColor="#c2c2c2"></status-nav>
-		<container-subgroup>
-			<view slot="content" style="margin: 0 -30rpx;">
-				<view class="repairs-nav" style="margin-top: -30rpx;">
-					<view class="li" @click="repairsNavFun(index)" :class="item.state?'on':''" v-for="(item,index) in navDataState">
-						{{item.title}}
-					</view>
-				</view>
-				<view class="repairs-hint padding">
-					<image class="icon" src="../../static/iocn/lp.png" mode="aspectFill"></image>
-					<view class="text">
-						请务必拍好故障照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
-					</view>
-				</view>
-				<view class="fault-type-title padding">故障类型：</view>
-				<view class="padding fault-type-content">
-					<view class="li" :class="item.state?'on':''" v-for="(item,index) in faultTypeData">
-						{{item.title}}
-					</view>
-				</view>
+        <status-nav navBarTitle="添加报修" returnColor="#c2c2c2"></status-nav>
+        <container-subgroup>
+            <view slot="content" style="margin: 0 -30rpx;">
+                <view class="repairs-nav" style="margin-top: -30rpx;">
+                    <view class="li" @click="repairsNavFun(index)" :class="item.state?'on':''"
+                        v-for="(item,index) in navDataState">
+                        {{item.title}}
+                    </view>
+                </view>
+                <view class="repairs-hint padding">
+                    <image class="icon" src="../../static/iocn/lp.png" mode="aspectFill"></image>
+                    <view class="text">
+                        请务必拍好故障照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
+                    </view>
+                </view>
+                <view class="fault-type-title padding">故障类型：</view>
+                <view class="padding fault-type-content">
+                    <view class="li" @click="repairsTypeFun(index)" :class="item.state?'on':''"
+                        v-for="(item,index) in faultTypeData">
+                        {{item.title}}
+                    </view>
+                </view>
 
-				<view class="padding">
-					<view class="devicename" v-if="navDataState[0].state">
-					
-						<view class="">
-							请填写设备名称和型号或扫描二维码
-						</view>
-						<image class="sm" src="../../static/iocn/sm.png" mode=""></image>
-					</view>
-					<view class="devicename" v-else>
-						请填写设备名称和型号
-					</view>
-			   
-					<view class="fault-pictures">
-						<image class="img" src="../../static/iocn/gz.png" mode="aspectFill"></image>
-						<view class="text">
-							添加故障图片
-						</view>
-					</view>
+                <view class="padding">
+                    <view class="devicename" @click="scanCodeFun()" v-if="navDataState[0].state">
+                        <view class="">
+                            请填写设备名称和型号或扫描二维码
+                        </view>
+                        <image class="sm" src="../../static/iocn/sm.png" mode=""></image>
+                    </view>
+                    <input class="devicename" placeholder="请填写设备名称和型号" v-else />
+                      
+                 
 
-					<textarea value="" class="fault-description" placeholder="故障情况描述"
-						placeholder-class="fault-description-text" />
+                    <view class="fault-pictures">
+                        <image class="img" src="../../static/iocn/gz.png" mode="aspectFill"></image>
+                        <view class="text">
+                            添加故障图片
+                        </view>
+                    </view>
 
-					<view class="detailed-address inputCss">
+                    <textarea value="" class="fault-description" placeholder="故障情况描述"
+                        placeholder-class="fault-description-text" />
 
-						<input type="text" value="" placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" />
+                    <view class="detailed-address inputCss">
 
-						<image @click="mapFun()" src="../../static/iocn/map.png" class="map" mode="aspectFill"></image>
-					</view>
+                        <input type="text" value="" placeholder="请输入详细的上门服务地址" placeholder-class="inputCss-input" />
 
-					<input type="text" class="inputCss" placeholder="请填写您的姓名" placeholder-class="inputCss-input" value="" />
-					<input type="text" class="inputCss" placeholder="请填写联系电话" placeholder-class="inputCss-input" value="" />
-                    <picker mode="date" >
-                       <input type="text" class="inputCss" placeholder="请选择上门时间" placeholder-class="inputCss-input" value="" />
+                        <image @click="mapFun()" src="../../static/iocn/map.png" class="map" mode="aspectFill"></image>
+                    </view>
+
+                    <input type="text" class="inputCss" placeholder="请填写您的姓名" placeholder-class="inputCss-input"
+                        value="" />
+                    <input type="text" class="inputCss" placeholder="请填写联系电话" placeholder-class="inputCss-input"
+                        value="" />
+                    <picker mode="date">
+                        <input type="text" class="inputCss" placeholder="请选择上门时间" placeholder-class="inputCss-input"
+                            value="" />
                     </picker>
-			
 
-					<button class="submit-button" type="default">提交故障申报</button>
-				</view>
-			</view>
-		</container-subgroup>
-		
+
+                    <button class="submit-button" type="default">提交故障申报</button>
+                </view>
+            </view>
+        </container-subgroup>
+
     </view>
 </template>
 
@@ -120,22 +124,42 @@
                 this.single = e;
                 console.log("-change事件:", e);
             },
-            mapFun() {
-                uni.getLocation({
-                    type: 'wgs84',
+            scanCodeFun() {
+                uni.scanCode({
                     success: function(res) {
-                        console.log('当前位置的经度：' + res.longitude);
-                        console.log('当前位置的纬度：' + res.latitude);
+                        console.log('条码类型：' + res.scanType);
+                        console.log('条码内容：' + res.result);
                     }
                 });
             },
-            repairsNavFun(index){
-                 for (var i = 0; i < this.navDataState.length; i++) {
-                     this.navDataState[i].state=false
-                 }
-                   this.navDataState[index].state=true
-            }
-            
+
+            mapFun() {
+                // uni.getLocation({
+                //     type: 'wgs84',
+                //     geocode: true,
+                //     success: function(res) {
+                //         console.log(res.address);
+                //     }
+                // });
+                uni.chooseLocation({
+                    success: function (res) {
+             console.log(res)
+                    }
+                });
+            },
+            repairsNavFun(index) {
+                for (var i = 0; i < this.navDataState.length; i++) {
+                    this.navDataState[i].state = false
+                }
+                this.navDataState[index].state = true
+            },
+            repairsTypeFun(index) {
+                for (var i = 0; i < this.faultTypeData.length; i++) {
+                    this.faultTypeData[i].state = false
+                }
+                this.faultTypeData[index].state = true
+            },
+
         }
     }
 </script>
@@ -156,7 +180,7 @@
         justify-content: center;
         font-size: 28rpx;
         color: #343536;
-             border-bottom: 2rpx solid rgba(0,0,0,0);
+        border-bottom: 2rpx solid rgba(0, 0, 0, 0);
     }
 
     .repairs-nav .on {
@@ -220,6 +244,7 @@
         background-color: #FFFFFF;
         font-size: 26rpx;
         color: #5e5e5e;
+        box-sizing: border-box;
         text-align: center;
         line-height: 59rpx;
         border-radius: 22rpx;
@@ -336,7 +361,8 @@
         text-align: center;
         font-size: 30rpx;
     }
-    .devicename .sm{
+
+    .devicename .sm {
         width: 42rpx;
         height: 36rpx;
     }