From fdc1f7e3eb7a5f1073e66116a3634fb0079acc5d Mon Sep 17 00:00:00 2001
From: yangmf_0726 <13243152557@163.com>
Date: Wed, 24 Sep 2025 11:57:28 +0800
Subject: [PATCH] 11

---
 .env.local                                    |  4 +-
 .../expressTemplate/ExpressTemplateForm.vue   | 55 ++++---------------
 2 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/.env.local b/.env.local
index bf41f464..4bfc4d4f 100644
--- a/.env.local
+++ b/.env.local
@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='https://yffzpapi.zianxin.com'
+VITE_BASE_URL='https://yffzpapi.zianxin.com'
 
-VITE_BASE_URL='http://localhost:48088'
+#VITE_BASE_URL='http://localhost:48088'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
index a9aa665a..52e80f86 100644
--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
@@ -1,22 +1,13 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="1300px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="80px"
-      v-loading="formLoading"
-    >
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px" v-loading="formLoading">
       <el-form-item label="模板名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入模板名称" />
       </el-form-item>
       <el-form-item label="计费方式" prop="chargeMode">
         <el-radio-group v-model="formData.chargeMode" @change="changeChargeMode">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
-            :key="dict.value"
-            :value="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)" :key="dict.value"
+            :value="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
@@ -25,24 +16,11 @@
         <el-table border style="width: 100%" :data="formData.charges">
           <el-table-column align="center" label="区域" width="360">
             <template #default="{ row }">
-              <el-cascader
-                v-model="row.areaIds"
-                :options="areaTree"
-                :props="defaultProps2"
-                class="w-1/1"
-                clearable
-                placeholder="请选择地区"
-                filterable
-                collapse-tags
-              />
+              <el-cascader v-model="row.areaIds" :options="areaTree" :props="defaultProps2" class="w-1/1" clearable
+                placeholder="请选择地区" filterable collapse-tags />
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            :label="columnTitle.startCountTitle"
-            width="180"
-            prop="startCount"
-          >
+          <el-table-column align="center" :label="columnTitle.startCountTitle" width="180" prop="startCount">
             <template #default="{ row }">
               <el-input-number v-model="row.startCount" :min="1" />
             </template>
@@ -52,12 +30,7 @@
               <el-input-number v-model="row.startPrice" :min="1" />
             </template>
           </el-table-column>
-          <el-table-column
-            width="180"
-            align="center"
-            :label="columnTitle.extraCountTitle"
-            prop="extraCount"
-          >
+          <el-table-column width="180" align="center" :label="columnTitle.extraCountTitle" prop="extraCount">
             <template #default="{ row }">
               <el-input-number v-model="row.extraCount" :min="1" />
             </template>
@@ -85,21 +58,13 @@
         <el-table border style="width: 100%" :data="formData.frees">
           <el-table-column align="center" label="区域" width="360">
             <template #default="{ row }">
-              <el-cascader
-                v-model="row.areaIds"
-                :options="areaTree"
-                :props="defaultProps2"
-                class="w-1/1"
-                clearable
-                placeholder="请选择商品分类"
-                filterable
-                collapse-tags
-              />
+              <el-cascader v-model="row.areaIds" :options="areaTree" :props="defaultProps2" class="w-1/1" clearable
+                placeholder="请选择商品分类" filterable collapse-tags />
             </template>
           </el-table-column>
           <el-table-column align="center" :label="columnTitle.freeCountTitle" prop="freeCount">
             <template #default="{ row }">
-              <el-input-number v-model="row.freeCount" :min="1" />
+              <el-input-number v-model="row.freeCount" :min="0" />
             </template>
           </el-table-column>
           <el-table-column align="center" label="包邮金额（元）" prop="freePrice">