Sfoglia il codice sorgente

Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/BJYSYBZ

liutao 11 mesi fa
parent
commit
0ee16c695e
19 ha cambiato i file con 9 aggiunte e 5 eliminazioni
  1. 1 1
      BJYSYBZ_C/public/index.html
  2. 6 0
      BJYSYBZ_C/src/views/BjWlydManageView/index.vue
  3. 1 2
      YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue
  4. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  6. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map
  7. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map
  8. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  9. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map
  10. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map
  11. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map
  12. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map
  13. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  14. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  15. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
  16. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
  17. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
  18. 0 0
      YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  19. 1 2
      YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js

+ 1 - 1
BJYSYBZ_C/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>滨江区地块管理</title>
+    <title>要素"一本帐"</title>
     <script src="config.js"></script>
   </head>
   <body>

+ 6 - 0
BJYSYBZ_C/src/views/BjWlydManageView/index.vue

@@ -37,6 +37,12 @@ export default {
       id: "",
     };
   },
+  created () {
+    document.title='滨江区地块管理'
+  },
+  beforeDestroy () {
+    document.title='要素"一本帐"'
+  },
   mounted() {
     let users = JSON.parse(localStorage.getItem("userInfo"));
     if (users) {

+ 1 - 2
YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -168,7 +168,7 @@
 						if (!statu['scope.userLocation']) {
 							uni.showModal({
 								title: '提示',
-								content: '需要获取您的地理位置,请确认授权,否则地图功能将无法使用',
+								content: '需要获取您的地理位置,请确认授权,否则拍照功能将无法使用',
 								success: function(res) {
 									if (res.confirm) {
 										uni.openSetting();
@@ -367,7 +367,6 @@
 					that.setFileImgList(fileInfo['name'], tempFile, fileInfo['path']);
 					//文件上传成功后获取经纬度给图片信息
 					this.getWxLocation().then(res => {
-						console.log("获取经纬度:" + JSON.stringify(res))
 						this.lat = res.latitude;
 						this.long = res.longitude;
 						fileInfo.lat = res.latitude;

File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/SlideCard/SlideCard.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/components/navigationBar/navigationBar.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/main/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/nocheckDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/received/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/pages/receivedDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map


File diff suppressed because it is too large
+ 0 - 0
YSGZYBZ_WXAPP/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


+ 1 - 2
YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/nocheckDetail/index.js

@@ -268,7 +268,7 @@ var _default = {
           if (!statu['scope.userLocation']) {
             uni.showModal({
               title: '提示',
-              content: '需要获取您的地理位置,请确认授权,否则地图功能将无法使用',
+              content: '需要获取您的地理位置,请确认授权,否则拍照功能将无法使用',
               success: function success(res) {
                 if (res.confirm) {
                   uni.openSetting();
@@ -547,7 +547,6 @@ var _default = {
         that.setFileImgList(fileInfo['name'], tempFile, fileInfo['path']);
         //文件上传成功后获取经纬度给图片信息
         _this6.getWxLocation().then(function (res) {
-          console.log("获取经纬度:" + JSON.stringify(res));
           _this6.lat = res.latitude;
           _this6.long = res.longitude;
           fileInfo.lat = res.latitude;

Some files were not shown because too many files changed in this diff