1. 新增

src/views/tourism/commodityManagement/commodityClass.vue

@@ -103,7 +103,7 @@
         },
         configUrl: {
           list: '/goods/goodsClassify/treeList', // 列表地址
-          delect: '/merchant/merchantShop/deleteById', // 删除地址
+          delect: '/goods/goodsClassify/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址

src/views/tourism/commodityManagement/formBox/commodityListForm.vue

@@ -252,24 +252,26 @@ export default {
           ...row,
           goodsImage: [],
           daySaleRadio: '-1',
-          backStatus: 0
+          backStatus: 0,
+          status: 1
         })
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
           goodsImage: [],
+          status: 1
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
         await this.getTableDeatilsFun(row)
       }
-      this.radioInputs(this.form.daySaleRadio)
       this.loading = false
       this.$nextTick(()=>{
         if(this.$refs["form"]) {
           this.$refs["form"].clearValidate();
+          this.radioInputs(this.form.daySaleRadio)
         }
       })
     },

src/views/tourism/orderManagement/productOrders/productOrders.vue

@@ -134,7 +134,7 @@
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-edit"
+                  icon="el-icon-document"
                   @click="handleDetails(scope.row)"
                   v-hasPermi="configPermi.editBase"
                 >详情</el-button>
@@ -143,8 +143,9 @@
                   type="text"
                   icon="el-icon-position"
                   @click="releaseFormFun(scope.row)"
+                  v-if="scope.row.status == 3"
                   v-hasPermi="configPermi.editBase"
-                >发布</el-button>
+                >发货</el-button>
               </template>
             </el-table-column>
           </el-table>

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/imageContainer.vue

@@ -0,0 +1,128 @@
+<template>
+    <div id="container" @mousedown="startDrag" @mousemove="doDrag" @mouseup="stopDrag">
+      <div id="preview" @wheel="wheelFun" @click="previewOnclick" :style="styleObject">
+        <img :src="imageUrl" id="image" />
+        <span :style="spanStyle"></span>
+      </div>
+    </div>
+  </template>
+   
+  <script>
+  export default {
+    data() {
+      return {
+        preview: null,
+        container: null,
+        image: null,
+        factor: {
+            scale: 1,
+        },
+        spanStyle: {
+          width: '10px',
+          height: '10px',
+          borderRadius: '5px',
+          background: 'red',
+          position: 'absolute',
+          left: '-10px',
+          top: '-10px',
+          transform: 'translate(-50%, -50%)'
+        },
+        imageUrl: null,
+        dragging: false,
+        offset: { x: 0, y: 0 },
+        styleObject: {
+          position: 'absolute',
+          top: '0',
+          left: '0'
+        }
+      };
+    },
+    mounted() {
+        this.preview = document.querySelector("#preview");
+        this.container = document.getElementById("container");
+        this.image = document.getElementById("image");
+    },
+    methods: {
+      initData(url){
+        this.imageUrl = url
+        let image = new Image();
+        image.src = url;
+        console.log("url====",url)
+        // 方式二、加载事件中获取
+        image.onload = () => {
+          console.log("sdfdsafds====",image.width)
+          this.image.style.width = image.width + 'px'
+          this.image.style.height = image.height + 'px'
+        };
+      },
+        previewOnclick(e) {
+            const needWidth =
+                e.offsetX / (this.container.clientWidth / this.image.naturalWidth);
+            const needHeight =
+                e.offsetY / (this.container.clientHeight / this.image.naturalHeight);
+
+            const left = needWidth * (this.container.clientWidth / this.image.naturalWidth);
+            const top = needHeight * (this.container.clientHeight / this.image.naturalHeight);
+            this.spanStyle.left = left + "px"
+            this.spanStyle.top = top + "px"
+        },
+        wheelFun(event) {
+            //event.preventDefault();
+
+            const scaleDelta = event.deltaY * -1; // 可根据实际需求调整缩放速度
+            const offsetX = event.offsetX / preview.clientWidth;
+            const offsetY = event.offsetY / preview.clientHeight;
+
+            const scaleVal = scaleDelta > 0 ? 0.2 : -0.2;
+            this.factor.scale += scaleVal;
+            if (this.factor.scale < 1) {
+                this.factor = {
+                    scale: 1,
+                };
+            }
+
+            this.preview.style.transformOrigin = `${offsetX * 100}% ${offsetY * 100}%`;
+            this.preview.style.transform = `scale(${this.factor.scale})`;
+        },
+        startDrag(e) {
+          this.dragging = true;
+          this.offset.x = e.clientX - Number(this.styleObject.left.replace('px',''));
+          this.offset.y = e.clientY - Number(this.styleObject.top.replace('px',''));
+        },
+        doDrag(e) {
+          if (this.dragging) {
+            this.$set(this.styleObject,'left',e.clientX - this.offset.x + 'px')
+            this.$set(this.styleObject,'top',e.clientY - this.offset.y + 'px')
+          }
+        },
+        stopDrag() {
+          this.dragging = false;
+        }
+    }
+  };
+  </script>
+   
+  <style>
+  #container {
+        width: 100%;
+        height: 500px;
+        position: relative;
+        overflow: hidden;
+        border: 1px solid #ccc;
+      }
+
+      #preview {
+        width: 500px;
+        height: 500px;
+        background: linear-gradient(to right, red , blue);
+        /* cursor: move;
+        user-select: none; */
+      }
+
+      #image {
+        width: 100%;
+        height: 100%;
+        transition: transform 0.2s;
+        transform-origin: 0 0;
+      }
+  </style>

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideForm.vue

@@ -93,6 +93,11 @@
         <div style="width: 100%;height: 300px;">
           <qqMapBox ref="qqMapBox" @setDot="setDot" />
         </div>
+        <!--  手绘图的位置  -->
+        <el-form-item label="手绘图定位：" prop="address"></el-form-item>
+        <div style="width: 100%;height: 600px;">
+          <imageContainer ref="imageContainer"></imageContainer>
+        </div>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer" v-if="formStatus==1">
@@ -120,10 +125,11 @@ import {
   listTableApi
  } from '@/api/CURD'
  import qqMapBox from '@/myComponents/qqMap.vue'
+ import imageContainer from './imageContainer.vue';
 export default {
   name: "addAndEdit",
   dicts: [],
-  components: {qqMapBox},
+  components: {qqMapBox,imageContainer},
   data() {
     return {
       title: "",
@@ -136,7 +142,8 @@ export default {
         add: '/merchant/merchantMapMark/insertOrUpdate', // 新增地址
         details: '', // 详情地址
         edit: '/merchant/merchantMapMark/insertOrUpdate', // 编辑地址
-        pointTypeList: '/merchant/merchantMapMarkType/list'
+        pointTypeList: '/merchant/merchantMapMarkType/list',
+        imageUrl: '/merchant/merchantMap/info'
       },
       form: {
         id: undefined,
@@ -187,6 +194,15 @@ export default {
           ...row,
           imgUrl: row.imgUrl?row.imgUrl.split(','):[]
         }
+        let res1 = await getTableDeatilsByIdApi(this.configUrl.imageUrl)
+        if(res1.code == 200){
+          this.$refs.imageContainer.initData(res1.data.imgUrl)
+        }else {
+          this.$message.error('获取手绘图失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
         this.$set(this,'form',obj)
         this.formStatus = 1
         this.$nextTick(()=>{
@@ -214,6 +230,7 @@ export default {
       this.loading = true
       try {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        
         if(res.code == 200) {
           let obj = {
             ...res.data,
@@ -237,6 +254,14 @@ export default {
           this.loading = false
           this.open = false;
         }
+        if(res1.code == 200){
+          this.$refs.imageContainer.initData(res1.data.url)
+        }else {
+          this.$message.error('获取手绘图失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
         this.loading = false
       } catch (error) {
         console.error('获取详情失败!!!!',error)

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideImageForm.vue

@@ -41,7 +41,7 @@
           </div>
           <span>支持扩展名：jpg、png,大小限定≤3MB图片</span>
         </el-form-item>
-        <el-form-item label="定位">
+        <!-- <el-form-item label="定位">
           <el-form-item label="左下角" label-width="100px">
             <div style="display: flex;">
               <el-form-item label="经度" label-width="80px" prop="leftLongitude">
@@ -63,7 +63,7 @@
               </el-form-item>
             </div>
           </el-form-item>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="可见级别" >
           <div style="display: flex;">
             <el-form-item label="最小" prop="minNum" label-width="180px">

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -43,7 +43,9 @@
           <el-table-column type="index" label="序号" align="center"  />
           <el-table-column label="点位名称" align="center" key="name" prop="name" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="类型" align="center" key="typeName" prop="typeName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="打卡距离(米)" align="center" key="checkinDistance" prop="checkinDistance" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+         
+          <!-- <el-table-column label="打卡距离(米)" align="center" key="checkinDistance" prop="checkinDistance" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+           -->
           <el-table-column label="可用状态" align="center" key="status" v-if="columns[3].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <switchBox 
@@ -86,12 +88,12 @@
                 @click="handleDelete(scope.row)"
                 v-hasPermi="configPermi.delect"
               >删除</el-button>
-              <el-button
+              <!-- <el-button
                 type="text"
                 size="mini"
                 @click="handleAddDistance(scope.row)"
                 v-hasPermi="configPermi.distance"
-              >打卡距离设置</el-button>
+              >打卡距离设置</el-button> -->
             </template>
           </el-table-column>
         </el-table>