Merge branch 'qa2' into dev

src/hooks/promotion/index.js

@@ -22,7 +22,6 @@ export const checkPlanExpire = (row) => {
 export const checkPlanChangeExpire = (row) => {
   const date = new Date()
   const rowDate = new Date(row.date)
-  console.log(date, row)
   return !(rowDate <= date)
 }
 

src/utils/index.js

@@ -190,7 +190,6 @@ export function debounce(func, wait = 500, immediate) {
     // 如果延时不存在，重新设定延时
     if (!timeout) timeout = setTimeout(later, wait)
     if (callNow) {
-      console.log(args, 'args')
       result = func.apply(context, args)
       context = args = null
     }

src/views/login.vue

@@ -145,7 +145,6 @@ async function checkAutoLogin() {
 
   const state = getQueryString('state')
   const code = getQueryString('code')
-  console.log(state, code)
   if (state) {
     // 有 state 代表网页回调-自动登录
     autoLoginLoading.value = true

src/views/promotion/plan/effectivePlan.vue

@@ -407,13 +407,13 @@ const uploadChangeFile = async (file) => {
 // 单条
 const editFn = (row) => {
   proxy.resetForm("addOrEditPlanRef");
-  console.log(new Date(row.date))
   addOrEditPlanForm.value = {
     ...row,
     inTime: parseTime(row.clockInTime, "{h}:{i}:{s}"),
     outTime: parseTime(row.clockOutTime, "{h}:{i}:{s}")
   }
   editDealerId.value = row.dealerId
+  getStoreList()
   addOrEditPlanVisible.value = true
 }