From 39c9c7dd5acf8471ae9bd4b27c00cbeaa10aa3ff Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 9 Feb 2022 11:51:58 +0800
Subject: [PATCH] map

---
 src/saas/AppConflictMediation/add.vue         | 37 ++-----------------
 .../AppConflictMediation/map.vue              | 36 +-----------------
 2 files changed, 5 insertions(+), 68 deletions(-)
 rename src/{sass => saas}/AppConflictMediation/map.vue (70%)

diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index eb4dcc69..23a792e9 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -80,8 +80,8 @@
           </div>
         </div>
         <div class="flow-option">
-          <div class="byself" :class="!form.opts? 'current': ''" @click="form.opts = 0">自己结办</div>
-          <div class="report" :class="form.opts? 'current': ''" @click="form.opts = 1">上报处理</div>
+          <div class="byself" :class="!form.opts? 'current': ''" @click="form.opts = 2">自己结办</div>
+          <div class="report" :class="form.opts? 'current': ''" @click="form.opts = 0">上报处理</div>
         </div>
       </div>
     </div>
@@ -142,7 +142,7 @@
           flag: false,
           result: '',
           resultFiles: [],
-          opts: 1,
+          opts: 0,
           name: ''
         },
         dictList: [],
@@ -165,36 +165,7 @@
 
     methods: {
       chooseAddress () {
-        uni.authorize({
-          scope: 'scope.userLocation',
-          success: () => {
-            uni.chooseLocation({
-              success: res => {
-                this.form.address = res.address
-                this.form.lat = res.latitude
-                this.form.lng = res.longitude
-              }
-            })
-          },
-          fail: () => {
-            this.$dialog.confirm({
-              content: '您未授权定位权限，无法选择位置'
-            }).then(() => {
-              wx.openSetting({
-                success: res => {
-                  if (!res.authSetting['scope.userLocation']) {
-                    this.$dialog.alert({
-                      content: '您未授权定位权限，无法选择位置'
-                    }).then(() => {
-                    })
-                  } else {
-                    console.log('设置定位权限')
-                  }
-                }
-              })
-            })
-          }
-        })
+        uni.navigateTo({ url: './map' })
       },
 
       confirmSelect(e) {
diff --git a/src/sass/AppConflictMediation/map.vue b/src/saas/AppConflictMediation/map.vue
similarity index 70%
rename from src/sass/AppConflictMediation/map.vue
rename to src/saas/AppConflictMediation/map.vue
index 97591ec5..a22ef5b4 100644
--- a/src/sass/AppConflictMediation/map.vue
+++ b/src/saas/AppConflictMediation/map.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="map">
     <div class="build-btn">
-      <img src="./components/img/model-icon.png" alt="" @click="toDetail"> 楼栋<br/>模型
+      <!-- <img src="./components/img/model-icon.png" alt="" @click="toDetail"> 楼栋<br/>模型 -->
     </div>
     <div class="build-btn locate">
       <img src="https://cdn.cunwuyun.cn/dvcp/h5/Location2.png" alt="" @click="getLocale"/>
@@ -14,40 +14,6 @@
     <div class="footer">
       <div class="btn" @click="confirm">确认定位</div>
     </div>
-    <!-- <u-popup v-model="show" mode="bottom" border-radius="14">
-      <div class="popup">
-        <div class="bg"></div>
-        <div class="title">恒大城西社区居委会</div>
-        <p class="address">山东省济南市历城区王舍人街道恒大商业广场蓝天新城</p>
-        <div class="info-flex">
-          <span class="label">所属社区</span>
-          <span class="value">后西一街袁集村</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">所属小区</span>
-          <span class="value">蓝天新城世纪花园</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">房屋类型</span>
-          <span class="value">单元(公寓)楼</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">所属网格</span>
-          <span class="value">蓝天新城基础网格一</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">网格管理员</span>
-          <span class="value">林珊珊</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">楼栋长</span>
-          <span class="value">林珊珊&nbsp;&nbsp;13782951281
-            <img :src="$cdn + 'common/phone.png'" alt="" @click="call(item)" class="phone-icon">
-          </span>
-        </div>
-      </div>
-      <div class="popup-btn">查看楼栋模型</div>
-    </u-popup> -->
   </div>
 </template>