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

BJYSYBZ_S/pom.xml

@@ -17,17 +17,62 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.3.33</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-core</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.3.33</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.3.33</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-core</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-web</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-core</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-web</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
         <dependency>
+
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/aliyun/OSSController.java

@@ -6,13 +6,11 @@ import com.zjugis.ysgzybz.controller.BaseRestController;
 import com.zjugis.ysgzybz.domain.entity.BaseFile;
 import com.zjugis.ysgzybz.service.IFileService;
 import com.zjugis.ysgzybz.service.YbzService;
-import com.zjugis.ysgzybz.utils.AliyunOSSUtils;
-import com.zjugis.ysgzybz.utils.GisUtils;
-import com.zjugis.ysgzybz.utils.GpsCoordinateUtils;
-import com.zjugis.ysgzybz.utils.UploadFileUtil;
+import com.zjugis.ysgzybz.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FileCopyUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -92,23 +90,22 @@ public class OSSController extends BaseRestController {
      */
     @GetMapping("/isWithinBufferRange")
     public Object isWithinBufferRange(String lat, String lng, String dksyh) {
-        String point = "{\"type\":\"Point\",\"coordinates\":[%s,%s]}";
-        double latitude = Double.parseDouble(lat);
-        double longitude = Double.parseDouble(lng);
-        double[] coordinte = GpsCoordinateUtils.calGCJ02toWGS84(latitude, longitude);
-        String pointGeojson = String.format(point, String.valueOf(coordinte[1]), String.valueOf(coordinte[0]));
-        System.out.println(pointGeojson);
+        if(StringUtils.isBlank(dksyh)){
+            return error("dksyh字段不能为空!", ErrorCode.DEFAULT);
+        }
+        if(StringUtils.isBlank(lat) || StringUtils.isBlank(lng)){
+            return error("[lat, lng]经纬度不符合规范", ErrorCode.DEFAULT);
+        }
+        String point = "srid=4326;POINT(%s %s)";
+        String pointGeojson = String.format(point, lng, lat);
         try {
-            String geometry = ybzService.getBjwkfly2000GeometryByDksyh(dksyh);
-//            String geometry = "MULTIPOLYGON(((120.18589236300011 30.150623136000036,120.18583063400001 30.15059016200007,120.1857584390001 30.150699298000063,120.1855325790001 30.150868505000062,120.18530672800011 30.151037711000072,120.18553140000006 30.151248200000055,120.18575609600009 30.151458690000027,120.18588377600008 30.15165099400008,120.18619358800004 30.151911057000063,120.18650339100009 30.15217111900006,120.18664522200004 30.152280673000064,120.18681967400005 30.152415447000067,120.18703906500002 30.15217801500006,120.18712198100002 30.15206293500006,120.18720537200011 30.151947179000047,120.18724193900005 30.15189643900004,120.18737169100007 30.15171636200006,120.18753799800004 30.151485526000045,120.18745627900012 30.15144271300005,120.18719562900003 30.151306113000032,120.18693497100003 30.151169522000032,120.18676066500007 30.151078174000077,120.18667432200004 30.15103293100003,120.18641366500003 30.150896330000023,120.18615301900002 30.150759738000033,120.18589236300011 30.150623136000036)))";
-            boolean isLocate = GisUtils.isPointLocate(pointGeojson, geometry);
+            Boolean isLocate = ybzService.getGeometryContains(dksyh, pointGeojson);
             return result(isLocate);
         } catch (Exception e) {
             e.printStackTrace();
             return error(e.getMessage(), ErrorCode.DEFAULT);
         }
     }
-
     /**
      * 删除文件
      *

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/YbzDao.java

@@ -132,4 +132,5 @@ public interface YbzDao {
 
     String getBjwkfly2000GeometryByDksyh(@Param("dksyh") String dksyh);
 
+    Boolean selectGeometryContains(@Param("dksyh") String dksyh, @Param("point") String point);
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/YbzService.java

@@ -1,5 +1,6 @@
 package com.zjugis.ysgzybz.service;
 
+import com.vividsolutions.jts.geom.Geometry;
 import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 
 import java.util.List;
@@ -102,4 +103,6 @@ public interface YbzService {
 
     String getBjwkfly2000GeometryByDksyh(String dksyh);
 
+    Boolean getGeometryContains(String dksyh, String point);
+
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/YbzServiceImpl.java

@@ -1,10 +1,12 @@
 package com.zjugis.ysgzybz.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vividsolutions.jts.geom.Geometry;
 import com.zjugis.ysgzybz.dao.YbzDao;
 import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 import com.zjugis.ysgzybz.service.YbzService;
 import com.zjugis.ysgzybz.utils.NamedThreadFactory;
+import com.zjugis.ysgzybz.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -82,6 +84,12 @@ public class YbzServiceImpl implements YbzService {
         return ybzDao.getBjwkfly2000GeometryByDksyh(dksyh);
     }
 
+    @Override
+    public Boolean getGeometryContains(String dksyh, String point) {
+        Boolean result = ybzDao.selectGeometryContains(dksyh, point);
+        return result;
+    }
+
     @Override
     public Map getHyTotal(String xzqdm) {
         Map map = new HashMap<>();

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/utils/GisUtils.java

@@ -75,6 +75,7 @@ public class GisUtils {
      * @throws IOException
      */
     public static boolean isPointLocate(String point, String polygon) throws ParseException, IOException {
+        System.out.println(point);
         if (StringUtils.isEmpty(point)) {
             return false;
         }
@@ -82,13 +83,15 @@ public class GisUtils {
             return false;
         }
         Geometry geometry = parseWkt(polygon);
-        Geometry transformGeoemtry = crsTransform(geometry, 4490, 4326);
-        double bufferDistance = 500d;//缓冲距离
-        double degree = bufferDistance / (2 * Math.PI * 6371004) * 360;//将meter转换为度
-        Geometry buffer = transformGeoemtry.buffer(degree);
+        Geometry transformGeoemtry = crsTransform(geometry, 4490, 4528);
+        double bufferDistance = 100d;//缓冲距离
+       // double degree = bufferDistance / (2 * Math.PI * 6371004) * 360;//将meter转换为度
+        Geometry buffer = transformGeoemtry.buffer(bufferDistance);
         System.out.println("buffer500:" + buffer.toText());
         Geometry pointGeo = parseGeojson(point);
-        return buffer.contains(pointGeo);
+        Geometry transPoint= crsTransform(pointGeo, 4326, 4528);
+        System.out.println(transPoint.toText());
+        return buffer.contains(transPoint);
     }
 
     /**

BJYSYBZ_S/src/main/resources/mapper/YbzMapper.xml

@@ -748,4 +748,20 @@
             sde.bjwkfly2000
         where dksyh = #{dksyh}
     </select>
+
+    <select id="selectGeometryContains" resultType="boolean">
+        SELECT
+            public.st_contains (
+              public.st_transform(
+                public.st_buffer(
+                  public.st_transform(shape,4528)
+                  ,500)
+                ,4490),
+                public.st_transform ( public.st_geomfromewkt ( #{point} ), 4490 )
+            )
+        FROM
+            bjwkfly2000
+        WHERE
+            dksyh = #{dksyh}
+    </select>
 </mapper>

BJYSYBZ_S/ysgzybz.iml

@@ -20,6 +20,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.2" level="project" />
@@ -39,11 +47,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.65" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.65" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.65" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.7.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.7.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.7.2" level="project" />
@@ -69,8 +72,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.5.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.2" level="project" />
@@ -78,7 +79,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.7.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.22" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.2" level="project" />

YSGZYBZ_WXAPP/pages/nocheckDetail/index.vue

@@ -1,411 +1,394 @@
 <template>
-  <view class="nocheckBox">
-    <navigation-bar :isBack="true" @toBack="toBackHandle"></navigation-bar>
-    <view class="container">
-      <view class="warningBox">
-        <text class="title">基本信息</text>
-        <view class="content">
-          <view class="item">
-            <text class="title">地块编号</text>
-            <text class="val">{{ objs.dkbh || '' }}</text>
-          </view>
-          <view class="item">
-            <text class="title">面积(亩)</text>
-            <text class="val">{{ objs.mj || ''}}</text>
-          </view>
-          <view class="item">
-            <text class="title">地块位置</text>
-            <text class="val">{{ objs.dkwz || ''}}</text>
-          </view>
-          <view class="item">
-            <text class="title">地块现状</text>
-            <text class="val">{{ objs.dkxz || '' }}</text>
-          </view>
-          <view class="item">
-            <text class="title">管地单位</text>
-            <text class="val">{{ objs.gddw || '' }}</text>
-          </view>
-          <view class="item">
-            <text class="title">联系人</text>
-            <text class="val">{{ objs.lxr || '' }}</text>
-          </view>
-          <view class="item itemAuto">
-            <text class="title">联系电话</text>
-            <text class="val">{{ objs.lxdh || '' }}</text>
-          </view>
-          <view class="item szfw">
-            <text class="title">四至范围</text>
-            <text class="val">
-              <text>{{ objs.szfw || '' }}</text>
-            </text>
-          </view>
-        </view>
-      </view>
-      <view class="checkResultBox">
-        <text class="title">巡查情况</text>
-        <view class="content">
-          <view class="formGroup">
-            <text class="label">现状描述：</text>
-            <view class="formInput">
-              <textarea
-                name=""
-                id=""
-                cols="30"
-                rows="10"
-                v-model="baseFormData.xzms"
-                placeholder="请输入现状描述"
-              ></textarea>
-            </view>
-          </view>
-          <view class="formGroup noBetween">
-            <text class="label">现场照片：</text>
-            <view class="formFile">
-              <uni-file-picker
-                @delete="deleteImage"
-                :value="fileImgList"
-                :del-icon="true"
-                :imageStyles="imageStyles"
-                auto-upload="false"
-                le-mediatype="image"
-                :sourceType="['camera']"
-                @select="selectFileChange"
-              >
-                <view class="icon_camera">
-                  <image src="../../static/images/images.png"></image>
-                </view>
-              </uni-file-picker>
-            </view>
-          </view>
-        </view>
-        <button class="btn" @tap="saveWarning">确认上报</button>
-        <button style="background: #ff9900;" class="btn" @tap="temporaryXcjl">暂存</button>
-      </view>
-    </view>
-  </view>
+	<view class="nocheckBox">
+		<navigation-bar :isBack="true" @toBack="toBackHandle"></navigation-bar>
+		<view class="container">
+			<view class="warningBox">
+				<text class="title">基本信息</text>
+				<view class="content">
+					<view class="item">
+						<text class="title">地块编号</text>
+						<text class="val">{{ objs.dkbh || '' }}</text>
+					</view>
+					<view class="item">
+						<text class="title">面积(亩)</text>
+						<text class="val">{{ objs.mj || ''}}</text>
+					</view>
+					<view class="item">
+						<text class="title">地块位置</text>
+						<text class="val">{{ objs.dkwz || ''}}</text>
+					</view>
+					<view class="item">
+						<text class="title">地块现状</text>
+						<text class="val">{{ objs.dkxz || '' }}</text>
+					</view>
+					<view class="item">
+						<text class="title">管地单位</text>
+						<text class="val">{{ objs.gddw || '' }}</text>
+					</view>
+					<view class="item">
+						<text class="title">联系人</text>
+						<text class="val">{{ objs.lxr || '' }}</text>
+					</view>
+					<view class="item itemAuto">
+						<text class="title">联系电话</text>
+						<text class="val">{{ objs.lxdh || '' }}</text>
+					</view>
+					<view class="item szfw">
+						<text class="title">四至范围</text>
+						<text class="val">
+							<text>{{ objs.szfw || '' }}</text>
+						</text>
+					</view>
+				</view>
+			</view>
+			<view class="checkResultBox">
+				<text class="title">巡查情况</text>
+				<view class="content">
+					<view class="formGroup">
+						<text class="label">现状描述：</text>
+						<view class="formInput">
+							<textarea name="" id="" cols="30" rows="10" v-model="baseFormData.xzms"
+								placeholder="请输入现状描述"></textarea>
+						</view>
+					</view>
+					<view class="formGroup noBetween">
+						<text class="label">现场照片：</text>
+						<view class="formFile">
+							<uni-file-picker @delete="deleteImage" :value="fileImgList" :del-icon="true"
+								:imageStyles="imageStyles" auto-upload="false" le-mediatype="image"
+								:sourceType="['camera']" @select="selectFileChange">
+								<view class="icon_camera">
+									<image src="../../static/images/images.png"></image>
+								</view>
+							</uni-file-picker>
+						</view>
+					</view>
+				</view>
+				<button class="btn" @tap="saveWarning">确认上报</button>
+				<button style="background: #ff9900;" class="btn" @tap="temporaryXcjl">暂存</button>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import navigationBar from '../../components/navigationBar/navigationBar.vue';
-import httpAjax from '@/utils/https.js';
-import CustomMixins from '@/mixins/CustomMixins.js';
-import config from '@/utils/config.js';
-const FormData = require('@/utils/formData/formData.js');
-
-export default {
-  mixins: [CustomMixins],
-  components: {
-    navigationBar,
-  },
-  data() {
-    return {
-      lat: '',
-      lat2: '',
-      long: '',
-      long2: '',
-      lat3: '',
-      long3: '',
-      queryParams: {
-        xcryId: '',
-        xzms: '',
-        xcryName: '',
-        xcryMobile: '',
-        dksyh: '',
-        imgList: [
-          {
-            fileId: '',
-            lng: '',
-            lat: '',
-          },
-        ],
-      },
-      objs: {},
-      fileList: [],
-      fileImgList: [],
-      imageStyles: {
-        width: 64,
-        height: 64,
-      },
-      baseFormData: {
-        xzms: ''
-      },
-    };
-  },
-  onReady() {
-    uni.showTabBar();
-  },
-  onLoad(option) {
-    const idStr = JSON.parse(option['obj']);
-    this.objs = idStr;
-	if(this.objs && this.objs.dksyh){
-		const tempXcjl = uni.getStorageSync(this.objs.dksyh)
-		if(tempXcjl){
-			this.fileList = tempXcjl['fileList']
-			this.fileImgList = tempXcjl['fileImgList']
-			this.baseFormData = tempXcjl['baseFormData']
-		}
-	}
-  },
-  beforeDestroy() {},
-  methods: {
-    // 取面对象 中心点
-    calculateCenter(lnglatarr) {
-      var total = lnglatarr.length;
-      var X = 0,
-        Y = 0,
-        Z = 0;
-      lnglatarr.forEach(function (lnglat) {
-        var lng = (lnglat.longitude * Math.PI) / 180;
-        var lat = (lnglat.latitude * Math.PI) / 180;
-        var x, y, z;
-        x = Math.cos(lat) * Math.cos(lng);
-        y = Math.cos(lat) * Math.sin(lng);
-        z = Math.sin(lat);
-        X += x;
-        Y += y;
-        Z += z;
-      });
-      X = X / total;
-      Y = Y / total;
-      Z = Z / total;
-
-      var Lng = Math.atan2(Y, X);
-      var Hyp = Math.sqrt(X * X + Y * Y);
-      var Lat = Math.atan2(Z, Hyp);
-      return { lng: (Lng * 180) / Math.PI, lat: (Lat * 180) / Math.PI };
-    },
-	saveWarning() {
-      //上报
-      if (this.baseFormData.xzms === '') {
-        uni.showToast({
-          title: '现状描述不能为空',
-          icon: 'none',
-          duration: 1500,
-        });
-        return;
-      }
-      if (!(this.fileList.length > 0)) {
-        uni.showToast({
-          title: '现场照片不能为空',
-          icon: 'none',
-          duration: 1500,
-        });
-        return;
-      }
-      this.relationFileById(this.fileList);
-    },
-    async getDistance(lat, lng) {
-	  return await httpAjax({
-		url: `api/oss/isWithinBufferRange?lat=${lat}&lng=${lng}&dksyh=${this.objs.dksyh}`,
-		method: 'GET'
-	  })
-    },
-
-    async relationFileById(fileObj) {
-      //文件上传
-      let _that = this;
-      let files = [];
-      let laycenterArr = [];
-      fileObj.forEach((item) => {
-        let obj = {
-          fileId: item.fileId,
-          lat: item.lat,
-          lng: item.lng,
-        };
-        files.push(obj);
-        let obj1 = {
-          lat: item.lat,
-          lng: item.lng,
-        };
-        laycenterArr.push(obj1);
-      });
+	import navigationBar from '../../components/navigationBar/navigationBar.vue';
+	import httpAjax from '@/utils/https.js';
+	import CustomMixins from '@/mixins/CustomMixins.js';
+	const FormData = require('@/utils/formData/formData.js');
 
+	export default {
+		mixins: [CustomMixins],
+		components: {
+			navigationBar,
+		},
+		data() {
+			return {
+				lat: '',
+				long: '',
+				queryParams: {
+					xcryId: '',
+					xzms: '',
+					xcryName: '',
+					xcryMobile: '',
+					dksyh: '',
+					imgList: [{
+						fileId: '',
+						lng: '',
+						lat: '',
+					}, ],
+				},
+				objs: {},
+				fileList: [],
+				fileImgList: [],
+				imageStyles: {
+					width: 64,
+					height: 64,
+				},
+				baseFormData: {
+					xzms: ''
+				},
+				isLocation: true
+			};
+		},
+		onReady() {
+			uni.showTabBar();
+		},
+		onLoad(option) {
+			this.checkAuthorize()
+			const idStr = JSON.parse(option['obj']);
+			this.objs = idStr;
+			this.queryIsLocation().then((result) => {
+				if (result && result['data']) {
+					this.isLocation = result['data']
+				}
+			})
+			if (this.objs && this.objs.dksyh) {
+				const tempXcjl = uni.getStorageSync(this.objs.dksyh)
+				if (tempXcjl) {
+					this.fileList = tempXcjl['fileList']
+					this.fileImgList = tempXcjl['fileImgList']
+					this.baseFormData = tempXcjl['baseFormData']
+				}
+			}
+		},
+		methods: {
+			checkAuthorize() {
+				const self = this;
+				this.getWxLocation().catch(res => {
+					if (res === 0) {
+						this.getWxSetting();
+					}
+				})
+			},
+			getWxLocation() {
+				return new Promise((resolve, reject) => {
+					wx.authorize({
+						scope: 'scope.userLocation',
+						success: (res) => {
+							wx.getLocation({
+								success: (res) => {
+									resolve(res)
+								},
+								fail: (err) => {
+									reject(-1)
+								},
+							});
+						},
+						fail: (err) => {
+							reject(0)
+						},
+					});
+				})
+			},
+			getWxSetting() {
+				uni.getSetting({
+					success: function(res) {
+						var statu = res.authSetting;
+						if (!statu['scope.userLocation']) {
+							uni.showModal({
+								title: '提示',
+								content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+								success: function(res) {
+									if (res.confirm) {
+										uni.openSetting();
+									}
+								}
+							});
+						}
+					},
+				});
+			},
+			async getDistance(lat, lng) {
+				return await httpAjax({
+					url: `api/oss/isWithinBufferRange?lat=${lat}&lng=${lng}&dksyh=${this.objs.dksyh}`,
+					method: 'GET'
+				})
+			},
+			async queryIsLocation(lat, lng) {
+				return await httpAjax({
+					url: 'api/oss/location',
+					method: 'GET'
+				})
+			},
+			saveWarning() {
+				//上报
+				if (this.baseFormData.xzms === '') {
+					uni.showToast({
+						title: '现状描述不能为空',
+						icon: 'none',
+						duration: 1500,
+					});
+					return;
+				}
+				if (!(this.fileList.length > 0)) {
+					uni.showToast({
+						title: '现场照片不能为空',
+						icon: 'none',
+						duration: 1500,
+					});
+					return;
+				}
+				this.relationFileById(this.fileList);
+			},
+			async relationFileById(fileObj) {
+				//文件上传
+				let _that = this;
+				let files = [];
+				let laycenterArr = [];
+				fileObj.forEach((item) => {
+					let obj = {
+						fileId: item.fileId,
+						lat: item.lat,
+						lng: item.lng,
+					};
+					files.push(obj);
+					let obj1 = {
+						lat: item.lat,
+						lng: item.lng,
+					};
+					laycenterArr.push(obj1);
+				});
 
-	  const locationResult = await httpAjax({
-		  url: 'api/oss/location',
-		  method: 'GET'
-		});
-	  let isLocation = false;
-	  if(locationResult && locationResult['data']){
-		  isLocation = true;
-	  }
-	  let isSubmit = true;
-      for (let i = 0; i < laycenterArr.length; i++) {
-		const resultData = await this.getDistance(
-          laycenterArr[i].lat,
-          laycenterArr[i].lng
-        );
-		console.log("resultData-----------------")
-		console.log(resultData['data'])
-		console.log(laycenterArr)
-        if (isLocation && !resultData['data']) {
-		  isSubmit = false;
-          uni.showModal({
-            title: '提示',
-            content: `超出地块拍摄范围`,
-            success: function (res) {
-              if (res.confirm) {
-              } else if (res.cancel) {
-              }
-            },
-          });
-          break;
-        }
-      }
-	  return;
-	  if(!isSubmit) return;
-	  this.addXcjlAjax(files).then((result)=>{
-		  if (result.data) {
-		  		uni.showModal({
-		  		  title: '提示',
-		  		  content: '上报成功，是否返回首页',
-		  		  success: function (res) {
-		  			if (res.confirm) {
-		  			  uni.navigateTo({
-		  				url: '/pages/main/index',
-		  			  });
-		  			} else if (res.cancel) {
-		  			  uni.navigateTo({
-		  				url: `/pages/receivedDetail/index?obj=${JSON.stringify(
+				let isSubmit = true;
+				if (this.isLocation) {
+					for (let i = 0; i < laycenterArr.length; i++) {
+						const resultData = await this.getDistance(
+							laycenterArr[i].lat,
+							laycenterArr[i].lng
+						);
+						if (!resultData['data']) {
+							isSubmit = false;
+							uni.showModal({
+								title: '提示',
+								content: `超出地块拍摄范围`
+							});
+							break;
+						}
+					}
+				}
+				if (!isSubmit) return;
+				this.addXcjlAjax(files).then((result) => {
+					if (result.data) {
+						uni.showModal({
+							title: '提示',
+							content: '上报成功，是否返回首页',
+							success: function(res) {
+								if (res.confirm) {
+									uni.navigateTo({
+										url: '/pages/main/index',
+									});
+								} else if (res.cancel) {
+									uni.navigateTo({
+										url: `/pages/receivedDetail/index?obj=${JSON.stringify(
 		  				  _that.objs,
 		  				)}`,
-		  			  });
-		  			}
-		  		  },
-		  		});
-			  if(_that.objs && _that.objs.dksyh){
-				   uni.removeStorageSync(_that.objs.dksyh)
-			  }
-		  }
-	  });
-    },
-	async addXcjlAjax(files = []){
-		const _that = this;
-		const sendData = {
-		  xcryId: uni.getStorageSync('userInfo').id,
-		  xzms: this.baseFormData.xzms,
-		  xcryName: uni.getStorageSync('userInfo').xcry,
-		  xcryMobile: uni.getStorageSync('userInfo').lxdh,
-		  dksyh: this.objs.dksyh,
-		  imgList: files
-		};
-		return await httpAjax({
-			url: 'app/xc/addXcjl',
-			method: 'POST',
-			data: sendData,
-		});
-	},
-	temporaryXcjl(){
-		if(this.objs && this.objs.dksyh){
-			const obj = {
-				fileImgList: this.fileImgList,
-				fileList: this.fileList,
-				baseFormData: this.baseFormData
-			}
-			uni.setStorageSync(this.objs.dksyh, obj);
-			uni.showToast({title: '暂存成功！'})
-		}
-	},
-    selectFileChange(file) {
-      console.log(file);
-      const that = this;
-      const tempFilePath = file.tempFilePaths[0];
-      uni.getImageInfo({
-        src: tempFilePath,
-        success: function (image) {
-          const fileName = file['tempFiles'][0]['name'];
-          that.fileUploadAjax(tempFilePath);
-        },
-      });
-    },
-    setFileImgList(name, url, path2) {
-      const extnames = name.match(/\.(jpg|jpeg|png|GIF|JPG|PNG)$/);
-      const extname = extnames[0];
-      this.fileImgList.push({
-        name,
-        url,
-		path2,
-        extname,
-      });
-    },
-	deleteImage(item){
-	  const that = this;
-	  httpAjax({
-		url: 'api/oss/delete?filePath='+item['tempFile']['path2'],
-		method: 'GET',
-	  }).then((result) => {
-		const data = result['data'];
-		if(data){
-			for(let i = 0; i < that.fileImgList.length; i++){
-				const imgItem = that.fileImgList[i];
-				if(imgItem['path2'] === item['tempFile']['path2']){
-					that.fileImgList.splice(i, 1);
-					break;
+									});
+								}
+							},
+						});
+						if (_that.objs && _that.objs.dksyh) {
+							uni.removeStorageSync(_that.objs.dksyh)
+						}
+					}
+				});
+			},
+			async addXcjlAjax(files = []) {
+				const _that = this;
+				const sendData = {
+					xcryId: uni.getStorageSync('userInfo').id,
+					xzms: this.baseFormData.xzms,
+					xcryName: uni.getStorageSync('userInfo').xcry,
+					xcryMobile: uni.getStorageSync('userInfo').lxdh,
+					dksyh: this.objs.dksyh,
+					imgList: files
+				};
+				return await httpAjax({
+					url: 'app/xc/addXcjl',
+					method: 'POST',
+					data: sendData,
+				});
+			},
+			temporaryXcjl() {
+				if (this.objs && this.objs.dksyh) {
+					const obj = {
+						fileImgList: this.fileImgList,
+						fileList: this.fileList,
+						baseFormData: this.baseFormData
+					}
+					uni.setStorageSync(this.objs.dksyh, obj);
+					uni.showToast({
+						title: '暂存成功！'
+					})
 				}
-			}
-			for(let i = 0; i < that.fileList.length; i++){
-				const fileItem = that.fileList[i];
-				if(fileItem['path'] === item['tempFile']['path2']){
-					that.fileList.splice(i, 1);
-					break;
-				}
-			}
-		}
-	  });
-	},
-    fileUploadAjax(tempFile) {
-      const formData = new FormData();
-      formData.appendFile('file', tempFile);
-      const sendData = formData.getData();
-      let header = {
-        'content-type': sendData.contentType,
-      };
-      const that = this;
-      httpAjax({
-        url: 'api/oss/upload',
-        method: 'POST',
-        header,
-        data: sendData.buffer,
-      }).then((result) => {
-        const data = result['data'];
-		that.setFileImgList(data['name'], tempFile, data['path']);
-        that.getLocationApi(data);
-      });
-    },
-    //拍摄时获取设备的经纬度
-    getLocationApi(data) {
-      let _that = this;
-      wx.authorize({
-        scope: 'scope.userLocation',
-        success: (res) => {
-          wx.getLocation({
-            success: (res) => {
-				console.log(res)
-              _that.lat = res.latitude;
-              _that.long = res.longitude;
-              data.lat = res.latitude;
-              data.lng = res.longitude;
-              data.fileId = data.id;
-              data.warningId = _that.warningId;
-              _that.fileList.push(data);
-            },
-            fail: (err) => {
-              console.log('获取当前初始位置失败', err);
-            },
-          });
-        },
-        fail: (err) => {
-          console.log('获取授权失败', err);
-          this.handleOpenSetting();
-        },
-      });
-    },
-    toBackHandle() {
-      uni.navigateBack();
-    },
-  },
-};
+			},
+			selectFileChange(file) {
+				console.log(file);
+				const that = this;
+				const tempFilePath = file.tempFilePaths[0];
+				uni.getImageInfo({
+					src: tempFilePath,
+					success: function(image) {
+						const fileName = file['tempFiles'][0]['name'];
+						that.fileUploadAjax(tempFilePath);
+					},
+				});
+			},
+			setFileImgList(name, url, path2) {
+				const extnames = name.match(/\.(jpg|jpeg|png|GIF|JPG|PNG)$/);
+				const extname = extnames[0];
+				this.fileImgList.push({
+					name,
+					url,
+					path2,
+					extname,
+				});
+			},
+			deleteImage(item) {
+				const that = this;
+				httpAjax({
+					url: 'api/oss/delete?filePath=' + item['tempFile']['path2'],
+					method: 'GET',
+				}).then((result) => {
+					const data = result['data'];
+					if (data) {
+						for (let i = 0; i < that.fileImgList.length; i++) {
+							const imgItem = that.fileImgList[i];
+							if (imgItem['path2'] === item['tempFile']['path2']) {
+								that.fileImgList.splice(i, 1);
+								break;
+							}
+						}
+						for (let i = 0; i < that.fileList.length; i++) {
+							const fileItem = that.fileList[i];
+							if (fileItem['path'] === item['tempFile']['path2']) {
+								that.fileList.splice(i, 1);
+								break;
+							}
+						}
+					}
+				});
+			},
+			fileUploadAjax(tempFile) {
+				const formData = new FormData();
+				formData.appendFile('file', tempFile);
+				const sendData = formData.getData();
+				let header = {
+					'content-type': sendData.contentType,
+				};
+				const that = this;
+				httpAjax({
+					url: 'api/oss/upload',
+					method: 'POST',
+					header,
+					data: sendData.buffer,
+				}).then((result) => {
+					const fileInfo = result['data'];
+					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;
+						fileInfo.lng = res.longitude;
+						fileInfo.fileId = fileInfo.id;
+						fileInfo.warningId = this.warningId;
+						this.fileList.push(fileInfo);
+					}).catch(res => {
+						if (res === 0) {
+							this.getWxSetting();
+						}
+					})
+				});
+			},
+			toBackHandle() {
+				uni.navigateBack();
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-@import './index.scss';
-</style>
+	@import './index.scss';
+</style>

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/main/index.js

@@ -145,12 +145,12 @@ exports.default = void 0;
 var _https = _interopRequireDefault(__webpack_require__(/*! @/utils/https.js */ 39));
 var navigationBar = function navigationBar() {
   __webpack_require__.e(/*! require.ensure | components/navigationBar/navigationBar */ "components/navigationBar/navigationBar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 78));
+    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 81));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var received = function received() {
   Promise.all(/*! require.ensure | pages/received/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("pages/received/index")]).then((function () {
-    return resolve(__webpack_require__(/*! ../received/index.vue */ 85));
+    return resolve(__webpack_require__(/*! ../received/index.vue */ 88));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 /**

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/pages/receivedDetail/index.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 92))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 95))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 99))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 102))
     },
   }
 } catch (e) {
@@ -173,7 +173,7 @@ var _CustomMixins = _interopRequireDefault(__webpack_require__(/*! @/mixins/Cust
 var _config = _interopRequireDefault(__webpack_require__(/*! @/utils/config */ 40));
 var navigationBar = function navigationBar() {
   __webpack_require__.e(/*! require.ensure | components/navigationBar/navigationBar */ "components/navigationBar/navigationBar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 78));
+    return resolve(__webpack_require__(/*! ../../components/navigationBar/navigationBar.vue */ 81));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var FormData = __webpack_require__(/*! @/utils/formData/formData.js */ 58);

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"],{
 
-/***/ 134:
+/***/ 137:
 /*!***********************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue ***!
   \***********************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 135);
-/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 137);
+/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 138);
+/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 140);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_file_picker_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 153);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 /***/ }),
 
-/***/ 135:
+/***/ 138:
 /*!******************************************************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \******************************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 136);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 139);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 136:
+/***/ 139:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -99,7 +99,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 137:
+/***/ 140:
 /*!************************************************************************************************************************************************!*\
   !*** E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************/
@@ -108,14 +108,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=script&lang=js& */ 138);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-file-picker.vue?vue&type=script&lang=js& */ 141);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 138:
+/***/ 141:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/WorkProject/BJYSYBZ/YSGZYBZ_WXAPP/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -130,10 +130,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 140));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 76));
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 142));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 78));
 var _chooseAndUploadFile = __webpack_require__(/*! ./choose-and-upload-file.js */ 151);
 var _utils = __webpack_require__(/*! ./utils.js */ 152);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -850,7 +850,7 @@ var _default2 = {
   }
 };
 exports.default = _default2;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 139)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 142)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),
 
@@ -889,7 +889,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component',
     {
         'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(134))
+            __webpack_require__('2')['createComponent'](__webpack_require__(137))
         })
     },
     [['uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component']]

YSGZYBZ_WXAPP/utils/config.js

@@ -1,6 +1,6 @@
 const config = {
   //发布线上需要吧login里面地址跟这里替换掉
-  // baseUrl: "http://10.10.9.71:7089/ysgzybz/",
+  // baseUrl: "http://localhost:7089/ysgzybz/",
   // webViewUrl: "http://10.10.9.58:8083/#/",