Merge branch 'master' into ldx

.env.development

@@ -16,6 +16,5 @@ VITE_APP_REDIRECT_URL = 'http://localhost:8085'
 # 积木报表服务地址
 VITE_APP_REPORT_URL = 'https://sfa-qa.wxl66.cn'
 
-
 # 模板表格
 VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF3.0.xlsx'
\ No newline at end of file

.env.production

@@ -7,7 +7,8 @@ VITE_APP_PUBLIC_PATH = './'
 
 # 基地址
 VITE_APP_BASE_API = '/api' # 小卤
-VITE_APP_PROMOTION = 'https://promotion.wxl66.cn' # 促销
+# VITE_APP_PROMOTION = 'https://promotion.wxl66.cn' # 促销
+VITE_APP_PROMOTION = '/promotion-api' # 促销
 
 # 飞书服务回调地址
 VITE_APP_REDIRECT_URL = 'https://sfa.wxl66.cn/link/'

src/mobile/views/promotion/plan/editing/index.vue

@@ -264,17 +264,21 @@ const confirmCalendar = (value) => {
 const planMinDate = computed(() => {
   // 如果当前是城市经理，只能创建下个月计划，否则是今日到下月末
   if (isCityManager.value) {
-    // 返回下个月 1 号的日期对象
     const date = new Date()
+
+    // 编辑：只能明天到当月月底
+    if (planId) {
+      date.setDate(date.getDate() + 1)
+      return date
+    }
+
+    // 新增：只能下个月一整月
     date.setMonth(date.getMonth() + 1)
     date.setDate(1)
     return date
   } else {
     // 如果是变更计划，则选择明天以后的日期
     const date = new Date()
-    if (planId) {
-      date.setDate(date.getDate() + 1)
-    }
     return date
   }
 })

src/views/promotion/plan/effectivePlan.vue

@@ -223,7 +223,7 @@
             <el-time-picker v-model="addOrEditPlanForm.inTime"
               placeholder="选择时间"
               format="HH:mm"
-              value-format="HH:mm:ss"/>
+              value-format="HH:mm:ss" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -319,7 +319,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { getPlanListAPI, uploadFileToOSSAPI, addPlanAPI, savePlanAPI, deletePlanAPI, addPlanByRoleAPI, getChargeListAPI, addPlanByWebAPI, updatePlanByWebAPI, getPlanStoreListAPI, updatePlanAPI, batchUpdatePlanAPI } from '@/api'
 import { checkPlanExpire, checkPlanChangeExpire } from '@/hooks'
 import userStore from '@/store/modules/user'
-import { PROMOTION_ACTIVITY_MODE_LIST,getPromotionActiveStatus } from '@/dicts'
+import { PROMOTION_ACTIVITY_MODE_LIST, getPromotionActiveStatus } from '@/dicts'
 import { parseTime } from '@/utils'
 
 const props = defineProps({
@@ -539,8 +539,17 @@ const remoteStoreMethod = (query) => {
 
 // 定义禁用日期的函数
 const disabledDateFn = (time) => {
-  // 城市经理只能新增下个月一整个月的
+  // 城市经理
   if (isCityManager) {
+    // 如果是变更状态，则只能修改次日到本月底最后一日
+    if (addOrEditPlanForm.value.id) {
+      const now = new Date();
+      const nextDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1)
+      const end = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+
+      return time.getTime() < nextDay.getTime() || time.getTime() > end.getTime()
+    }
+    // 如果是新增状态，只能新增下个月一整个月的
     const now = new Date();
     const start = new Date(now.getFullYear(), now.getMonth() + 1, 1);
     const end = new Date(now.getFullYear(), now.getMonth() + 2, 0);
@@ -1053,7 +1062,7 @@ defineExpose({
     }
 
     /* 工资和杂费输入框 */
-    .el-input-number{
+    .el-input-number {
       width: 170px;
     }
   }