diff --git a/manifest.json b/manifest.json
index c9bdced..abe8838 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,11 +50,16 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "",
+ "appid" : "wxaf70a5cd03b06c19",
"setting" : {
"urlCheck" : false
},
- "usingComponents" : true
+ "usingComponents" : true,
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "展示坐标信息"
+ }
+ }
},
"mp-alipay" : {
"usingComponents" : true
@@ -72,6 +77,13 @@
"h5" : {
"router" : {
"base" : ""
+ },
+ "sdkConfigs" : {
+ "maps" : {
+ "qqmap" : {
+ "key" : "Z2IBZ-6BRKG-Z52QT-IU3J2-6P3QO-WIBII"
+ }
+ }
}
}
}
diff --git a/pages.json b/pages.json
index d5639f9..28e6b9f 100644
--- a/pages.json
+++ b/pages.json
@@ -6,7 +6,25 @@
"navigationBarTitleText": "坐标采集器"
}
}
- ],
+ ,{
+ "path" : "pages/index/pointPick/pointPick",
+ "style" :
+ {
+ "navigationBarTitleText": "点位拾取",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/index/lineDraw/lineDraw",
+ "style" :
+ {
+ "navigationBarTitleText": "线路绘制",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 701934d..f7e4529 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,50 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -52,163 +9,27 @@
export default {
data() {
return {
- control: true,
- columnType: 'other',
- maxCount: 6,
- compressSize: 0.2,
- imageSize: 2,
- compressQuality: 0.8,
- compressWidth: 375,
- sourceType: ['album'],
-
- uploadTask: null,
- media: [], //数据源
- // 校验表单数据
- valiFormData: {
- name: '',
- location: '',
- marsk: '',
- image: ''
- },
- // 校验规则
- rules: {
- name: {
- rules: [
- {
- required: true,
- errorMessage: '名称不能为空'
- }
- ]
- },
- location: {
- rules: [
- {
- required: true,
- errorMessage: '坐标不能为空'
- }
- ]
- }
}
- };
},
computed: {},
onLoad() {},
onReady() {},
methods: {
- //上传
- chooseFile(e) {
- this.uploadFileToServe(e);
- },
- //中断上传并删除
- mediaDelete(e) {
- this.uploadTask ? this.uploadTask.abort() : '';
- this.media.splice(e, 1);
- },
- //上传逻辑处理
- uploadFileToServe(urlList) {
- if (!urlList || urlList.length <= 0) {
- return;
- }
- //以七牛云为例
- uni.request({
- url: 'qiniu', //后端接口，仅为示例，并非真实接口地址。
- method: 'GET',
- success: (res) => {
- let token = res.data.data; //拿到必须的token
- urlList.forEach((item) => {
- this.uploadTask = uni.uploadFile({
- url: 'qiniu', //上传接口，仅为示例
- filePath: item.src,
- name: 'file',
- formData: {
- token: token
- },
- success: (res) => {
- let data = JSON.parse(res.data); //返回的数据
- if (!data.data.url) {
- item.status = 'error';
- item.progress = '上传失败';
- } else {
- item.status = 'success';
- item.progress = '上传成功';
- item.src = data.data.url;
- }
- }
- });
- this.uploadTask.onProgressUpdate((res) => {
- item.percent = res.progress;
- this.media.splice(item.index, 1, item);
- });
- });
- }
- });
- },
-
- submit(ref) {
- this.$refs[ref]
- .validate()
- .then((res) => {
- console.log('success', res);
- uni.showToast({
- title: `校验通过`
- });
+ pick(val){
+ if(val == 1){
+ uni.navigateTo({
+ url:'pointPick/pointPick'
})
- .catch((err) => {
- console.log('err', err);
- });
- },
- getLocation() {
- let this_ = this;
- uni.getLocation({
- type: 'wgs84',
- success: function (res) {
- console.log('当前位置的经度：' + res.longitude);
- console.log('当前位置的纬度：' + res.latitude);
- this_.valiFormData.location = '经度:' + res.longitude + ',纬度:' + res.latitude;
- }
- });
+ }else{
+ uni.navigateTo({
+ url:'lineDraw/lineDraw'
+ })
+ }
}
}
};
diff --git a/pages/index/lineDraw/lineDraw.vue b/pages/index/lineDraw/lineDraw.vue
new file mode 100644
index 0000000..f971d4c
--- /dev/null
+++ b/pages/index/lineDraw/lineDraw.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/pointPick/pointPick.vue b/pages/index/pointPick/pointPick.vue
new file mode 100644
index 0000000..65d9a74
--- /dev/null
+++ b/pages/index/pointPick/pointPick.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/jade-image-upload/components/jade-image-upload/jade-image-upload.vue b/uni_modules/jade-image-upload/components/jade-image-upload/jade-image-upload.vue
index 2d1ccb4..fb8c426 100644
--- a/uni_modules/jade-image-upload/components/jade-image-upload/jade-image-upload.vue
+++ b/uni_modules/jade-image-upload/components/jade-image-upload/jade-image-upload.vue
@@ -2,7 +2,7 @@
-
+
@@ -234,7 +234,7 @@
let getUrl = this.showList
let urls = []
getUrl.forEach(item => {
- urls.push(item.src)
+ urls.push('http://39.105.17.128:8199'+item.src)
})
uni.previewImage({
current: urls[eq],