From 13269bdb4ddd931f60c8319393004b5fee6989dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Sun, 23 Feb 2025 13:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                               |  4 +--
 pages/{index.vue => index - 副本.vue} |  0
 pages/task.vue                          | 11 ++-----
 sub/enterprise/edit.vue                 | 41 ++++++++++++++++++++-----
 sub/task/locate.vue                     |  2 +-
 utils/ruoyi.js                          | 14 +++++++++
 6 files changed, 53 insertions(+), 19 deletions(-)
 rename pages/{index.vue => index - 副本.vue} (100%)

diff --git a/config.js b/config.js
index 3833042..adb9198 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'https://hb.jzce.com',
-	baseUrl: 'http://188.188.3.232:48080',
+	baseUrl: 'https://hb.jzce.com',
+	//baseUrl: 'http://188.188.3.232:48080',
 	baseApi: '/admin-api',
 	// 应用信息
 	appInfo: {
diff --git a/pages/index.vue b/pages/index - 副本.vue
similarity index 100%
rename from pages/index.vue
rename to pages/index - 副本.vue
diff --git a/pages/task.vue b/pages/task.vue
index d0247fe..aeedd4d 100644
--- a/pages/task.vue
+++ b/pages/task.vue
@@ -62,9 +62,7 @@
               size="56"
               type="2d"
               color="#17c653"
-              :layer-color="
-                task.status == '2' ? '#EAFFF1' : '#F1F1F4'
-              "
+              :layer-color="task.status == '2' ? '#EAFFF1' : '#F1F1F4'"
               :canvasId="`canvas-${task.id}`"
             >
               <template>
@@ -107,10 +105,7 @@
               </view>
               <view class="tag">
                 {{
-                  $dict.echoDicValue(
-                    dictMap.task_priority,
-                    task.priority
-                  )
+                  $dict.echoDicValue(dictMap.task_priority, task.priority)
                 }}
               </view>
               <view
@@ -222,7 +217,7 @@ export default {
         task_state: '按状态',
         select_week: '按周期'
       }
-      if (['zf_qy'].includes(key)) {
+      if (['zf_lx'].includes(key)) {
         return [
           ...this.dictMap[key].map(d => {
             return {
diff --git a/sub/enterprise/edit.vue b/sub/enterprise/edit.vue
index 43e6b3a..d362631 100644
--- a/sub/enterprise/edit.vue
+++ b/sub/enterprise/edit.vue
@@ -35,7 +35,13 @@
             <u-icon slot="right" name="arrow-right"></u-icon>
           </u-form-item>
           <!-- 企业地址 -->
-          <u-form-item label="地址" prop="address" borderBottom>
+          <u-form-item
+            label="地址"
+            prop="address"
+            borderBottom
+            @click="chooseView(detail)"
+          >
+            <u-icon name="map" size="14" color="#17C653"></u-icon>
             <u-input
               v-model="info.form.address"
               border="none"
@@ -281,7 +287,8 @@ export default {
           photo: [], // 企业照片
           contactName: '', // 环保负责人
           environmentalContactPhone: '', // 联系方式
-          establishmentDate: '' // 成立时间
+          establishmentDate: '', // 成立时间
+          gpsLocation: ''
         },
         rules: {
           enterprisesName: {
@@ -310,12 +317,17 @@ export default {
             message: '请输入联系方式',
             trigger: ['blur']
           },
-          photo: {
-            require: true,
-            min: 1,
-            message: '至少上传一张图片',
-            trigger: ['blur', 'change']
-          }
+          photo: [
+            {
+              validator: value => {
+                return (
+                  Array.isArray(this.info.form.photo) &&
+                  this.info.form.photo.length > 0
+                )
+              },
+              message: '照片数组至少需要有一个元素'
+            }
+          ]
         }
       },
       // 字典
@@ -374,12 +386,24 @@ export default {
     this.initProveList()
   },
   methods: {
+    async chooseView() {
+      uni.chooseLocation({
+        success: res => {
+          console.log(res)
+          console.log(this.info)
+          this.info.form.address = res.address
+          this.info.form.gpsLocation = res.latitude + ',' + res.longitude
+        }
+      })
+    },
+
     /**
      * 选择图片并上传
      * @param {Object} e
      */
     async addEnterprisePhoto(e) {
       this.info.form.photo = e.file.map(p => {
+        console.log(p.url)
         return {
           ...p,
           status: 'uploading',
@@ -398,6 +422,7 @@ export default {
         })
       ).then(res => {
         this.info.form.photo = res
+        console.log('pthoto3', this.info.form.photo)
       })
     },
     /**
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index 5e1985e..bfca260 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -155,7 +155,7 @@ export default {
       enterpriseGps: '',
       location: {},
       distance: 10000,
-      radius: 30, // 打卡范围
+      radius: 100, // 打卡范围
       showTip: false,
       list: [],
       loading: false,
diff --git a/utils/ruoyi.js b/utils/ruoyi.js
index dd6ca6f..4fa25a6 100644
--- a/utils/ruoyi.js
+++ b/utils/ruoyi.js
@@ -90,4 +90,18 @@ export function viewPosition({
 			console.log(err);
 		}
 	})
+}
+
+/**
+ * 打开地图获取位置
+ * @param {number} lat 经度
+ * @param {number} lng 纬度
+ * @param {string} name 地址名称
+ */
+export function choosePosition({
+	lat,
+	lng,
+	name = ''
+}) {
+
 }
\ No newline at end of file