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 b2ab2a9..8515662 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -1,285 +1,439 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 产品类型
-
-
-
-
-
- 竣工日期
-
-
-
-
- 筛选
-
-
-
-
-
-
-
-
- 湖南工业大学化工学院会议室P2.5全彩LED显示屏
-
- 项目编号：20220108-1001
- 规格型号：DS-CK25FI/H
- 产品尺寸：3.94ｍ*2.02ｍ
- 安装位置：xxx综合楼2楼会议室
-
-
-
-
-
-
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
-
- 2022/01/08
-
-
- 质保到期
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+ 产品类型
+
+
+
+
+
+
+ 竣工日期
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ 项目编号：{{item.projectCode}}
+ 规格型号：{{item.model}}
+ 产品尺寸：{{item.size}}
+ 安装位置：{{item.installationSite}}
+
+
+
+
+
+
+
+
+ {{item.address}}
+
+
+ {{item.date}}
+
+ 质保中
+ 质保到期
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/repairsPage/repairsPage.vue b/pages/repairsPage/repairsPage.vue
index 36229a5..fcf10a1 100644
--- a/pages/repairsPage/repairsPage.vue
+++ b/pages/repairsPage/repairsPage.vue
@@ -1,67 +1,71 @@
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
- 请务必拍好故障照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
-
-
- 故障类型：
-
-
- {{item.title}}
-
-
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+ 请务必拍好故障照片或视频上传,便于技术工程师作为判断依据,带齐 相关维保设备。高效为您提供服务。
+
+
+ 故障类型：
+
+
+ {{item.title}}
+
+
-
-
-
-
- 请填写设备名称和型号或扫描二维码
-
-
-
-
- 请填写设备名称和型号
-
-
-
-
-
- 添加故障图片
-
-
+
+
+
+ 请填写设备名称和型号或扫描二维码
+
+
+
+
+
+
-
+
+
+
+ 添加故障图片
+
+
-
+
-
+
-
-
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -70,6 +74,15 @@
data() {
return {
single: "2021-04-3",
+
+ data:{
+ model:"",
+ condition:"",
+ address:"",
+ name:"",
+ tel:"",
+ date:""
+ },
navDataState: [{
title: "有设备",
@@ -115,27 +128,76 @@
]
}
},
+ onLoad(){
+ this.getType()
+ },
methods: {
+ getType(){
+ // /universal/api.order/fault_type
+ this.$requst.post('/universal/api.work_order/fault_type').then(res => {
+ // this.$toolAll.tools.showToast(res.msg);
+ if (res.code == 0) {
+ console.log(res)
+ } else {
+
+ }
+ })
+ },
change(e) {
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
- }
-
+ submitButton(){
+ // if()
+ },
+
+ mapFun() {
+ uni.getLocation({
+ type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+ success: function (res) {
+ const latitude = res.latitude;
+ const longitude = res.longitude;
+ console.log(latitude,longitude,78);
+ uni.chooseLocation({
+ success: function (res) {
+ console.log(res,81);
+ console.log('位置名称：' + res.name);
+ console.log('详细地址：' + res.address);
+ console.log('纬度：' + res.latitude);
+ console.log('经度：' + res.longitude);
+ }
+ });
+ // uni.openLocation({
+ // latitude: latitude,
+ // longitude: longitude,
+ // success: function () {
+ // console.log('success');
+ // }
+ // });
+ }
+ });
+ },
+ 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
+ },
+
}
}
@@ -156,7 +218,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 +282,7 @@
background-color: #FFFFFF;
font-size: 26rpx;
color: #5e5e5e;
+ box-sizing: border-box;
text-align: center;
line-height: 59rpx;
border-radius: 22rpx;
@@ -336,7 +399,8 @@
text-align: center;
font-size: 30rpx;
}
- .devicename .sm{
+
+ .devicename .sm {
width: 42rpx;
height: 36rpx;
}