pansl 1 年之前
父节点
当前提交
20f06b6113
共有 2 个文件被更改,包括 29 次插入28 次删除
  1. 24 23
      src/views/payBack/juliangAccount/tabs/logList/index.vue
  2. 5 5
      src/views/promotion/promotionList/index.vue

+ 24 - 23
src/views/payBack/juliangAccount/tabs/logList/index.vue

@@ -19,14 +19,14 @@
           <el-input v-model="query.adv_promotion_id" placeholder="请输入广告计划ID" clearable />
           <el-input v-model="query.adv_promotion_id" placeholder="请输入广告计划ID" clearable />
         </el-form-item>
         </el-form-item>
         <el-form-item label="注册时间">
         <el-form-item label="注册时间">
-          <el-date-picker unlink-panels clearable @change="timeChange($event, 'user')" format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD" v-model="query.userTime" type="daterange" :shortcuts="shortcuts"
-            range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" />
+          <el-date-picker unlink-panels clearable @change="userTimeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+            v-model="query.userTime" type="daterange" :shortcuts="shortcuts" range-separator="To" start-placeholder="开始时间"
+            end-placeholder="结束时间" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="充值时间">
         <el-form-item label="充值时间">
-          <el-date-picker unlink-panels clearable @change="timeChange($event, 'order')" format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD" v-model="query.orderTime" type="daterange" :shortcuts="shortcuts"
-            range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" />
+          <el-date-picker unlink-panels clearable @change="orderTimeChange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+            v-model="query.orderTime" type="daterange" :shortcuts="shortcuts" range-separator="To"
+            start-placeholder="开始时间" end-placeholder="结束时间" />
         </el-form-item>
         </el-form-item>
       </template>
       </template>
       <template v-slot:extra_button>
       <template v-slot:extra_button>
@@ -142,25 +142,26 @@ const backConfigData = ref({})
 const current = ref({})
 const current = ref({})
 const adNameOtion = ref([])
 const adNameOtion = ref([])
 
 
-const timeChange = (e: object, type: string) => {
-  console.log(e, type, 'timeChangetimeChangetimeChange');
-  if (query.value.userTime || query.value.orderTime) {
+const userTimeChange = (e: object) => {
+  console.log(e, query.value.userTime, 'timeChangetimeChangetimeChange');
+  if (query.value.userTime) {
     const timeArr = toRaw(e);
     const timeArr = toRaw(e);
-    if (type == 'user') {
-      query.value.user_ranse_start_at_begin_time = timeArr[0]
-      query.value.user_ranse_start_at_end_time = timeArr[1]
-    } else if (type == 'order') {
-      query.value.order_created_at_begin_time = timeArr[0]
-      query.value.order_created_at_end_time = timeArr[1]
-    }
+    query.value.user_ranse_start_at_begin_time = timeArr[0]
+    query.value.user_ranse_start_at_end_time = timeArr[1]
   } else {
   } else {
-    if (type == 'user') {
-      delete query.value.user_ranse_start_at_begin_time
-      delete query.value.user_ranse_start_at_end_time
-    } else if (type == 'order') {
-      delete query.value.order_created_at_begin_time
-      delete query.value.order_created_at_end_time
-    }
+    delete query.value.user_ranse_start_at_begin_time
+    delete query.value.user_ranse_start_at_end_time
+  }
+}
+const orderTimeChange = (e: object) => {
+  console.log(e, 'timeChangetimeChangetimeChange');
+  if (query.value.orderTime) {
+    const timeArr = toRaw(e);
+    query.value.order_created_at_begin_time = timeArr[0]
+    query.value.order_created_at_end_time = timeArr[1]
+  } else {
+    delete query.value.order_created_at_begin_time
+    delete query.value.order_created_at_end_time
   }
   }
 }
 }
 //补传
 //补传

+ 5 - 5
src/views/promotion/promotionList/index.vue

@@ -111,10 +111,10 @@
               <el-table-column label="操作">
               <el-table-column label="操作">
                 <template #default="scope">
                 <template #default="scope">
                   <el-button @click="openType('promotionVisible', scope.row)" link type="primary"
                   <el-button @click="openType('promotionVisible', scope.row)" link type="primary"
-                    v-action="'Promotion@Promotion@updateSeriesSequence'" size="small">编辑</el-button>
+                    v-action="'tuiguang.Promotion.updateSeriesSequence'" size="small">编辑</el-button>
                   <br />
                   <br />
                   <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
                   <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
-                    v-action="'Promotion@Promotion@delete'">删除</el-button>
+                    v-action="'tuiguang.Promotion.delete'">删除</el-button>
                   <br />
                   <br />
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
@@ -154,13 +154,13 @@
               <el-table-column label="操作">
               <el-table-column label="操作">
                 <template #default="scope">
                 <template #default="scope">
                   <el-button @click="openType('promotionVisible', scope.row)" link type="primary"
                   <el-button @click="openType('promotionVisible', scope.row)" link type="primary"
-                    v-action="'Promotion@Promotion@updateSeriesSequence'" size="small">编辑</el-button>
+                    v-action="'tuiguang.Promotion.updateSeriesSequence'" size="small">编辑</el-button>
                   <br />
                   <br />
                   <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
                   <el-button link type="primary" size="small" @click="deletePromotion(scope.row)"
-                    v-action="'Promotion@Promotion@delete'">删除</el-button>
+                    v-action="'tuiguang.Promotion.delete'">删除</el-button>
                   <br />
                   <br />
                   <el-button link type="primary" size="small" @click="openType('backConfigVisible', scope.row)"
                   <el-button link type="primary" size="small" @click="openType('backConfigVisible', scope.row)"
-                    v-action="'Promotion@Promotion@updateCallbackConfig'">回传配置</el-button>
+                    v-action="'tuiguang.Promotion.updateCallbackConfig'">回传配置</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>