Merge remote-tracking branch 'origin/master'

src/views/mch/mch-pick-up/form.vue

@@ -0,0 +1,168 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入门店名称" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店logo" prop="logo">
+            <upload-img v-model:imageUrl="form.logo" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店联系手机号" prop="phone">
+            <el-input v-model="form.phone" placeholder="请输入门店联系手机号" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="营业时间" prop="businessHoursJson">
+            <BusinessHours v-model="form.businessHoursJson" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="合作商户" prop="mchIds">
+            <select-mch multiple v-model="form.mchIds" placeholder="请选择合作商户" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店位置" prop="location">
+            <MapSelect />
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店简介" prop="introduction">
+            <el-input v-model="form.introduction" placeholder="请输入门店简介" type="textarea" :autosize="{ minRows: 2 }" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="门店详细地址" prop="detailAddress">
+            <el-input v-model="form.detailAddress" placeholder="请输入门店详细地址" type="textarea" :autosize="{ minRows: 2 }" />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="MchPickUpDialog">
+import { useMessage } from "/@/hooks/message";
+import * as mchPickUpApi from '/@/api/wallet/mch-pick-up'
+import BusinessHours from '/@/components/BusinessHours/index.vue'
+
+// 定义营业时间接口
+interface BusinessHour {
+  id: string
+  title: string
+  startTime: string
+  endTime: string
+}
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  name: '',
+  logo: '',
+  introduction: '',
+  phone: '',
+  status: '',
+  latitude: '',
+  longitude: '',
+  detailAddress: '',
+  businessHoursJson: [] as BusinessHour[],
+  mchIds: [],
+});
+
+// 定义校验规则
+const dataRules = ref({
+  name: [{ required: true, message: "门店名称不能为空", trigger: "blur" }],
+})
+
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+  // 重置营业时间数据
+  form.businessHoursJson = []
+  // 获取mchPickUp信息
+  if (id) {
+    form.id = id
+    getmchPickUpData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+  try {
+    loading.value = true;
+    const _data: any = { ...form }
+    if (_data.businessHoursJson && _data.businessHoursJson.length) {
+      _data.businessHoursJson = JSON.stringify(_data.businessHoursJson)
+    }
+    form.id ? await mchPickUpApi.putObj(_data) : await mchPickUpApi.addObj(_data);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getmchPickUpData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  mchPickUpApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+    if (res.data.businessHoursJson) {
+      try {
+        form.businessHoursJson = JSON.parse(res.data.businessHoursJson)
+      } catch (error) {
+        console.warn('解析营业时间JSON失败:', error)
+        form.businessHoursJson = []
+      }
+    }
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/mch/mch-pick-up/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row>
+          <el-form-item style="width: 250px" label="门店名称" prop="name">
+            <el-input v-model="state.queryForm.name" placeholder="请输入" />
+          </el-form-item>
+          <el-form-item style="width: 250px" label="门店联系手机号" prop="phone">
+            <el-input v-model="state.queryForm.phone" placeholder="请输入" />
+          </el-form-item>
+          <el-form-item style="width: 250px" label="合作状态" prop="visibleMobile">
+            <dict-select v-model="state.queryForm.status" dict-code="mch_pick_up_status_enum" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">
+              {{ $t("common.queryBtn") }}
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'mch_mchPickUp_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'mch_mchPickUp_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'mch_mchPickUp_export'" @exportExcel="exportExcel"
+            class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="name" label="门店名称" show-overflow-tooltip />
+        <el-table-column prop="logo" label="门店logo">
+          <template #default="{ row }">
+            <preview-image v-if="row.logo" :src="row.logo" />
+            <div style="width: 50px;height: 50px;" v-else />
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone" label="门店手机" show-overflow-tooltip />
+        <el-table-column prop="status" label="门店状态" width="200">
+          <template #default="{ row }">
+            <el-switch active-value="20" inactive-value="10" active-text="正在合作" inactive-text="未合作" v-model="row.status"
+              @change="statusChange(row)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="detailAddress" label="门店详细地址" show-overflow-tooltip />
+        <el-table-column prop="businessHoursJson" label="营业时间">
+          <template #default="{ row }">
+            <div v-for="v in JSON.parse(row.businessHoursJson)" :key="v">
+              <span>{{ v.title }}</span>
+              <span>:</span>
+              <span>{{ v.startTime }}</span>
+              <span>-</span>
+              <span>{{ v.endTime }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'mch_mchPickUp_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'mch_mchPickUp_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemMchPickUp">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as mchPickUpApi from '/@/api/wallet/mch-pick-up'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { mch_pick_up_status_enum } = useDict("mch_pick_up_status_enum")
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: mchPickUpApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/mch/mch-pick-up/export', Object.assign(state.queryForm, { ids: selectObjs }), 'mchPickUp.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+const statusChange = async (row: any) => {
+  try {
+    await mchPickUpApi.putObj(row)
+    getDataList()
+    useMessage().success("操作成功")
+  } catch (e) {
+    useMessage().error("操作错误")
+  }
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await mchPickUpApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/panel/setting/components/nutrition-setting.vue

@@ -3,7 +3,7 @@
         v-loading="state.loading">
         <!-- **************************** start 喜爱菜品排行 start **************************** -->
         <el-divider class="my-12">喜爱菜品排行配置</el-divider>
-        <el-form-item prop="cleaningData.carGap">
+        <el-form-item prop="nutritionSetting.carGap">
             <template #label>
                 <div class="flex items-center gap-1">
                     <span>需要排除的菜品分类</span>
@@ -11,7 +11,36 @@
             </template>
             <select-ctcg v-model="form.nutritionSetting.topExcludeCategoryIds" multiple placeholder="请选择需要排除的菜品分类" />
         </el-form-item>
-        <!-- **************************** end 同步间隔配置 end **************************** -->
+        <!-- **************************** end 喜爱菜品排行 end **************************** -->
+
+
+        <!-- **************************** start 营养分析 start **************************** -->
+        <el-divider class="my-12">营养分析配置</el-divider>
+        <el-form-item prop="nutritionSetting.hcCategoryIds">
+            <template #label>
+                <div class="flex items-center gap-1">
+                    <span>荤菜菜品分类</span>
+                </div>
+            </template>
+            <select-ctcg v-model="form.nutritionSetting.hcCategoryIds" multiple placeholder="请选择荤菜菜品分类" />
+        </el-form-item>
+        <el-form-item prop="nutritionSetting.scCategoryIds">
+            <template #label>
+                <div class="flex items-center gap-1">
+                    <span>素菜菜品分类</span>
+                </div>
+            </template>
+            <select-ctcg v-model="form.nutritionSetting.scCategoryIds" multiple placeholder="请选择素菜菜品分类" />
+        </el-form-item>
+        <el-form-item prop="nutritionSetting.zsCategoryIds">
+            <template #label>
+                <div class="flex items-center gap-1">
+                    <span>主食菜品分类</span>
+                </div>
+            </template>
+            <select-ctcg v-model="form.nutritionSetting.zsCategoryIds" multiple placeholder="请选择主食菜品分类" />
+        </el-form-item>
+        <!-- **************************** end 营养分析 end **************************** -->
 
     </el-form>
 </template>
@@ -31,12 +60,21 @@ const form = reactive<any>({
     nutritionSetting: {
         // 喜爱菜品排行需要排除的菜品分类
         topExcludeCategoryIds: [],
+        // 荤菜菜品分类
+        hcCategoryIds: [],
+        // 素菜菜品分类
+        scCategoryIds: [],
+        // 主食菜品分类
+        zsCategoryIds: [],
     },
 })
 
 const dataRules = ref({
     // 车辆考勤配置
     "nutritionSetting.topExcludeCategoryIds": [{ required: true, message: '喜爱菜品排行需要排除的菜品分类不能为空', trigger: 'blur' }],
+    "nutritionSetting.hcCategoryIds": [{ required: true, message: '荤菜菜品分类不能为空', trigger: 'blur' }],
+    "nutritionSetting.scCategoryIds": [{ required: true, message: '素菜菜品分类不能为空', trigger: 'blur' }],
+    "nutritionSetting.zsCategoryIds": [{ required: true, message: '主食菜品分类不能为空', trigger: 'blur' }],
 })
 
 onMounted(() => {
@@ -50,6 +88,9 @@ async function getSetting() {
         if (!data.nutritionSetting) {
             data.nutritionSetting = {
                 topExcludeCategoryIds: [],
+                hcCategoryIds: [],
+                scCategoryIds: [],
+                zsCategoryIds: [],
             }
         }
         if (data) {

src/views/test-jsonp.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="test-jsonp-page">
+    <h2>JSONP 跨域测试页面</h2>
+    
+    <div class="test-section">
+      <h3>1. 逆地址解析测试</h3>
+      <el-button @click="testReverseGeocode" type="primary">
+        测试逆地址解析 (北京天安门)
+      </el-button>
+      <div v-if="reverseResult" class="result">
+        <p><strong>结果:</strong> {{ reverseResult }}</p>
+      </div>
+    </div>
+
+    <div class="test-section">
+      <h3>2. 地址搜索测试</h3>
+      <el-input 
+        v-model="searchKeyword" 
+        placeholder="输入搜索关键词"
+        style="width: 300px; margin-right: 10px;"
+      />
+      <el-button @click="testSearch" type="primary">搜索</el-button>
+      <div v-if="searchResults.length > 0" class="result">
+        <p><strong>搜索结果:</strong></p>
+        <ul>
+          <li v-for="(item, index) in searchResults" :key="index">
+            {{ item.title }} - {{ item.address }}
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="test-section">
+      <h3>3. 地图选择器组件测试</h3>
+      <map-select 
+        ref="mapSelectRef"
+        v-model="selectedLocation"
+        placeholder="点击选择位置"
+        style="width: 400px;"
+      />
+      <div v-if="selectedLocation" class="result">
+        <p><strong>选中位置:</strong></p>
+        <p>地址: {{ selectedLocation.address }}</p>
+        <p>坐标: {{ selectedLocation.coordinates }}</p>
+      </div>
+    </div>
+
+    <div class="logs">
+      <h3>日志信息</h3>
+      <div class="log-content">
+        <div v-for="(log, index) in logs" :key="index" class="log-item">
+          {{ log }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { ElButton, ElInput, ElMessage } from 'element-plus'
+import { TencentMapAPI } from '../utils/jsonp'
+import MapSelect from '../components/map/map-select.vue'
+
+// 创建腾讯地图API实例 (启用调试模式)
+const mapAPI = new TencentMapAPI('CGABZ-3MH66-6VGST-MEMS3-K6U3V-DGBKA', true)
+
+// 定义类型
+interface LocationData {
+  address: string
+  coordinates: string
+  location: {
+    lat: number
+    lng: number
+  }
+}
+
+// 响应式数据
+const reverseResult = ref('')
+const searchKeyword = ref('北京大学')
+const searchResults = ref<any[]>([])
+const selectedLocation = ref<LocationData | null>(null)
+const logs = ref<string[]>([])
+
+// 添加日志
+const addLog = (message: string) => {
+  const timestamp = new Date().toLocaleTimeString()
+  logs.value.unshift(`[${timestamp}] ${message}`)
+  if (logs.value.length > 10) {
+    logs.value.pop()
+  }
+}
+
+// 测试逆地址解析
+const testReverseGeocode = async () => {
+  addLog('开始测试逆地址解析...')
+  try {
+    // 北京天安门坐标
+    const data = await mapAPI.reverseGeocode(39.908823, 116.397470)
+    
+    if (data.status === 0) {
+      reverseResult.value = data.result.address
+      addLog(`逆地址解析成功: ${data.result.address}`)
+      ElMessage.success('逆地址解析成功')
+    } else {
+      addLog(`逆地址解析失败: ${data.message}`)
+      ElMessage.error('逆地址解析失败')
+    }
+  } catch (error) {
+    addLog(`逆地址解析错误: ${error}`)
+    ElMessage.error('逆地址解析错误')
+    console.error('逆地址解析错误:', error)
+  }
+}
+
+// 测试地址搜索
+const testSearch = async () => {
+  if (!searchKeyword.value.trim()) {
+    ElMessage.warning('请输入搜索关键词')
+    return
+  }
+
+  addLog(`开始搜索: ${searchKeyword.value}`)
+  try {
+    const data = await mapAPI.searchLocation(searchKeyword.value)
+    
+    if (data.status === 0) {
+      searchResults.value = data.data.map((item: any) => ({
+        title: item.title,
+        address: item.address,
+        location: item.location
+      }))
+      addLog(`搜索成功，找到 ${searchResults.value.length} 个结果`)
+      ElMessage.success(`搜索成功，找到 ${searchResults.value.length} 个结果`)
+    } else {
+      addLog(`搜索失败: ${data.message}`)
+      ElMessage.error('搜索失败')
+    }
+  } catch (error) {
+    addLog(`搜索错误: ${error}`)
+    ElMessage.error('搜索错误')
+    console.error('搜索错误:', error)
+  }
+}
+</script>
+
+<style scoped>
+.test-jsonp-page {
+  padding: 20px;
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+.test-section {
+  margin-bottom: 30px;
+  padding: 20px;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+.test-section h3 {
+  margin-top: 0;
+  color: #409eff;
+}
+
+.result {
+  margin-top: 15px;
+  padding: 10px;
+  background-color: #f0f9ff;
+  border: 1px solid #b3d8ff;
+  border-radius: 4px;
+}
+
+.result ul {
+  margin: 5px 0;
+  padding-left: 20px;
+}
+
+.logs {
+  margin-top: 30px;
+  padding: 20px;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  background-color: #f8f9fa;
+}
+
+.logs h3 {
+  margin-top: 0;
+  color: #67c23a;
+}
+
+.log-content {
+  max-height: 200px;
+  overflow-y: auto;
+  font-family: 'Courier New', monospace;
+  font-size: 12px;
+}
+
+.log-item {
+  padding: 2px 0;
+  border-bottom: 1px solid #eee;
+}
+
+.log-item:last-child {
+  border-bottom: none;
+}
+</style>