Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/attractFlowLink/landingPage/detail.vue

@@ -125,7 +125,7 @@ export default {
       this.btnLoading = true;
       guidePageEdit(this.form)
         .then(_ => {
-          this.$router.go(-1);
+          this.$router.push('ladingPageList');
           this.$message.success('保存成功');
         })
         .finally(_ => {
@@ -136,7 +136,7 @@ export default {
       this.btnLoading = true;
       guidePageSave(this.form)
         .then(_ => {
-          this.$router.go(-1);
+          this.$router.push('ladingPageList');
           this.$route.meta.refresh = true;
           this.$message.success('保存成功');
         })

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -39,7 +39,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-date-picker v-model="dateTime" @change="searchList" :editable="false" :value-format="'yyyy-MM-dd'" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
+        <el-date-picker v-model="dateTime" @change="searchList" :editable="false" :value-format="'yyyy-MM-dd'" type="daterange" align="right" :picker-options="pickerOptions" range-separator="至" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
       </el-form-item>
       <el-form-item class="frmbt20">
         <el-button @click="batchGoupEvent" v-if="$getButtonLimit($buttonCode.batchGroup)" :limit-code="$buttonCode.batchGroup">批量分组</el-button>
@@ -553,8 +553,10 @@ export default {
     getTableList() {
       this.loadingStatus = true;
       if (this.dateTime && this.dateTime.length) {
-        this.inFields.startTime = this.dateTime ? Date.parse(new Date(this.dateTime[0]).toString()) : '';
-        this.inFields.endTime = this.dateTime ? Date.parse(new Date(this.dateTime[1]).toString()) : '';
+        // this.inFields.startTime = this.dateTime ? Date.parse(new Date(this.dateTime[0]).toString()) : '';
+        // this.inFields.endTime = this.dateTime ? Date.parse(new Date(this.dateTime[1]).toString()) : '';
+        this.inFields.startTime = this.dateTime ? this.dateTime[0] + ' 00:00:00' : '';
+        this.inFields.endTime = this.dateTime ? this.dateTime[1] + ' 23:59:59' : '';
       }
       if (this.currentGroupId) {
         this.inFields.hmGroupId = this.currentGroupId;