修改

src/api/channel.js

@@ -58,7 +58,7 @@ export function ListChannel(pram) {
 export function ListChannels(pram) {
   const data = {
     channelId: pram.channelId,
-    
+    dateLimit:pram.dateLimit,
     page: pram.page,
     limit: pram.limit,
   };

src/layout/components/Sidebar/SidebarItem.vue

@@ -62,7 +62,7 @@ export default {
     return {};
   },
   mounted(){
-    console.log(this.item,'itemitem');
+    // console.log(this.item,'itemitem');
   },
   methods: {
     hasOneShowingChild(child = [], parent) {

src/libs/public.js

@@ -46,11 +46,11 @@ export function isLogin() {
  * @description 核销员列表
  */
 export function getStoreStaff() {
-  return new Promise((resolve, reject) => {
+  // return new Promise((resolve, reject) => {
-    storeStaffListApi({ page: 1, limit: 9999 }).then(async (res) => {
+  //   storeStaffListApi({ page: 1, limit: 9999 }).then(async (res) => {
-      localStorage.setItem('storeStaffList', res.list ? JSON.stringify(res.list) : []);
+  //     localStorage.setItem('storeStaffList', res.list ? JSON.stringify(res.list) : []);
-    });
+  //   });
-  });
+  // });
 }
 
 /**

src/store/modules/user.js

@@ -89,6 +89,7 @@ const actions = {
     return new Promise((resolve, reject) => {
       getInfo(state.token)
         .then((data) => {
+          localStorage.setItem('userInfo', JSON.stringify(data));
           if (!data) {
             reject('Verification failed, please Login again.');
           }

src/views/channel/creatChannel.vue

@@ -98,24 +98,26 @@ export default {
         return (value * 100).toFixed(2) + '%';
       }
     },
-    // info(id) {
+    info(id) {
-    //   this.loading = true;
+      this.loading = true;
-    //   levelInfoApi({ id: id })
+      levelInfoApi({ id: id })
-    //     .then((res) => {
+        .then((res) => {
-    //       this.formValidate = res;
+          this.formValidate = res;
-    //       this.loading = false;
+          this.loading = false;
-    //     })
+        })
-    //     .catch(() => {
+        .catch(() => {
-    //       this.loading = false;
+          this.loading = false;
-    //     });
+        });
-    // },
+    },
     handleClose() {
       this.dialogVisible = false;
       // this.user = Object.assign({}, '')
     },
     submitForm: Debounce(function (formName) {
       this.$refs.channelInfo.validate((valid) => {
+        console.log(valid,'validvalid');
         if (valid) {
+          console.log('进入了判断1');
           this.loading = true;
           // debugger
            // this.channelInfo.amountComesUp = (this.channelInfo.amountComesUpStr)/100;
@@ -158,7 +160,20 @@ export default {
                   this.formValidate = Object.assign({}, obj);
                 });
         } else {
-          return false;
+          // return false;
+          AddChannel(this.channelInfo)
+                .then((res) => {
+                  this.$message.success('添加成功');
+                  this.loading = false;
+                  this.handleClose();
+                  this.formValidate = Object.assign({}, obj);
+                  this.$parent.getList();
+                  clog
+                })
+                .catch(() => {
+                  this.loading = false;
+                  this.formValidate = Object.assign({}, obj);
+                });
         }
       });
     }),

src/views/channel/index.vue

@@ -87,7 +87,7 @@
                 <div class="li"> 总转化率：{{ chooselist.totalConversionRatio }} </div>
                 <div class="li"> 回款率：{{ chooselist.totalReturnRate }}</div>
               </div>
-              <div class="infoli">
+              <div class="infoli" >
                 <div class="li">总注册：{{ chooselist.totalRegisterNum }}</div>
                 <div class="li"> 总订单金额：{{ chooselist.totalAmount }}</div>
                 <div class="li">总订单数量：{{ chooselist.totalOrderNum }} </div>
@@ -96,6 +96,10 @@
                 <div class="li" style="width: 100%;">渠道链接：{{ chooselist.url }}</div>
 
               </div>
+              <div class="infoli" style="justify-content: start;" v-if="chooselist.account">
+                <div class="li"  style="width: 33%;">渠道账号：{{ chooselist.account  }}</div>
+                <div class="li" style="width: 30%;">渠道密码：初始密码为123456</div>
+              </div>
             </div>
             <div class="mintit">日统计报表 </div>
             <el-table :data="todaydata.list" stripe style="width: 100%">
@@ -269,18 +273,22 @@ export default {
     },
     copyurl(url){
       console.log(url);
-      navigator.clipboard.writeText(url)
+      const textarea = document.createElement('textarea');
-    .then(() => {
+      textarea.value = url;
-      console.log('URL已成功复制到剪贴板');
+      document.body.appendChild(textarea);
-      this.$message({
+      textarea.select();
-          message: '复制成功',
+      document.execCommand('copy');
-          type: 'success',
+      document.body.removeChild(textarea);
-          center:true
+      // alert('文本已复制到剪贴板！');
-        });
+      this.$message.success('复制成功');
-    })
+    //   navigator.clipboard.writeText(url)
-    .catch(err => {
+    // .then(() => {
-      console.error('无法复制URL到剪贴板:', err);
+    //   console.log('URL已成功复制到剪贴板');
-    });
+    //   this.$message.success('复制成功');
+    // })
+    // .catch(err => {
+    //   console.error('无法复制URL到剪贴板:', err);
+    // });
     },
     getuserlist(){
       Listuser(this.userPrams)
@@ -435,13 +443,13 @@ export default {
     font-family: Source Han Sans;
     font-size: 20px;
     font-weight: bold;
-    line-height: 70px;
+    line-height:30px;
     letter-spacing: 0px;
   }
 
   .infobox {
     width: 90%;
-    margin: 20px auto;
+    margin: 5px auto;
     display: flex;
     flex-wrap: wrap;
 
@@ -454,9 +462,9 @@ export default {
 
       .li {
         width: 33%;
-        font-size: 20px;
+        font-size: 16px;
         font-weight: normal;
-        line-height: 70px;
+        line-height: 40px;
         letter-spacing: 0px;
         align-self: flex-start; // 使每个 .li 在顶部对齐
       }

src/views/login/index.vue

@@ -156,8 +156,8 @@ export default {
         },
       },
       loginForm: {
-        account: 'admin',
+        account: '',
-        pwd: '123456',
+        pwd: '',
         key: '',
         code: '',
         captcha: {

src/views/statistic/channel/components/channel.vue

@@ -6,7 +6,7 @@
         <div class="acea-row">
           <div class="mr-20">
             <label class="channel">渠道：</label>
-            <el-select v-model="channelId" placeholder="请选择" class="channel selWidth" clearable filterable>
+            <el-select v-model="channelId" placeholder="请选择" class="channel selWidth" clearable filterable @change="idchange()">
               <el-option :value="item.id" v-for="(item, index) in channelList" :key="index" :label="item.name"></el-option>
             </el-select>
             <el-radio-group
@@ -79,6 +79,7 @@
 
 <script>
 import { channelOverviewApi, channelTrendApi } from '@/api/statistic';
+import { ListChannel,ListChannels,Listuser, AddChannel, UpdateChannel, InfoChannel, DelChannel } from '@/api/channel';
 import echartsNew from '@/components/echartsNew/index';
 import exportExcel from '@/utils/newToExcel.js'; //表格导出方法
 import { checkPermi } from '@/utils/permission'; // 权限判断函数
@@ -99,18 +100,36 @@ export default {
       options: this.$timeOptions,
       name: '近30天',
       timeVal: [],
-      fromList: this.$constants.timeList,
+      // fromList: this.$constants.timeList,
-      dateLimit: '',
+      fromList:{
-      dateLimitPram: {},
+        custom:true,
+        title:'选择时间',
+        fromTxt:[
+          {text:'全部',val:'all'},
+          {text:'昨天',val:'yesterday'},
+          {text:'最近7天',val:'lately7'},
+          {text:'最近30天',val:"lately30"},
+        ]
+
+      },
+
+      dateLimit: 'lately7',
+      dateLimitPram: 'lately7',
       list: [],
       optionData: {},
       channelId: '',
       channelList:[
-        {name:"百度",id: 1},
+       
-        {name:"头条",id: 2},
       ],
+      listPram: {
+        productId: 1,
+        productName: null,
+        page: 1,
+        limit: this.$constants.page.limit[0],
+      },
       style: { height: '400px' },
       pickerOptions: this.$timeOptions,
+      userInfo:{}
     };
   },
   created() {
@@ -120,10 +139,21 @@ export default {
     this.timeVal = [start, end];
   },
   mounted() {
-    this.dateLimit = 'lately7';
+    console.log(this.fromList,'this.fromListthis.fromList');
-    this.dateLimitPram = 'lately7';
+// 获取存储的用户信息
-    this.getStatistics();
+const userInfoString = localStorage.getItem('userInfo');
-    this.getTrend();
+
+// 将 JSON 字符串解析为 JavaScript 对象
+this. userInfo = JSON.parse(userInfoString);
+
+// 现在 userInfo 变量中存储了之前存储在本地存储中的用户信息
+
+    // this.dateLimit = 'all';
+    // this.dateLimitPram = 'all';
+    this.getList()
+   
+    // this.getTrend();
+    
   },
   methods: {
     checkPermi,
@@ -132,7 +162,39 @@ export default {
       this.timeVal = e;
       this.$set(this, 'dateLimitPram', e ? this.timeVal.join(',') : '');
     },
+    getList() {
+  ListChannel(this.listPram)
+    .then((res) => {
+      // 如果用户是 admin，则直接处理接口返回的数据
+      if (this.userInfo.account=='admin') {
+        this.channelList = res.list;
+        this.channelId = this.channelList[0].id;
+        this.getStatistics();
+        this.$parent.getlist(this.channelId, this.dateLimitPram);
+      } else {
+        // 如果用户不是 admin，则根据用户账号过滤接口返回的数据
+        const userAccount = this.userInfo ? this.userInfo.account : null;
+        if (userAccount) {
+          this.channelList = res.list.filter(item => item.account === userAccount);
+          if (this.channelList.length > 0) {
+            this.channelId = this.channelList[0].id;
+            this.getStatistics();
+            this.$parent.getlist(this.channelId, this.dateLimitPram);
+          }
+        }
+      }
+      console.log(res);
+    })
+    .catch(() => {
+      // 处理错误
+    });
+},
+    idchange(){
+      this.$parent.getlist( this.channelId,this.dateLimitPram)
+      this.getStatistics();
+    },
     selectChange(limit) {
+      console.log(limit,'limitlimit');
       if (limit == '') {
         //昨天的时间
         let day1 = new Date();
@@ -142,17 +204,18 @@ export default {
         let s1 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate();
         let s2 = day2.getFullYear() + '-' + (day2.getMonth() + 1) + '-' + day2.getDate();
         this.dateLimitPram = `${s1},${s2}`;
-        this.getTrend();
+        // this.getTrend();
         this.getStatistics();
       } else {
         this.dateLimitPram = limit;
-        this.getTrend();
+        // this.getTrend();
         this.getStatistics();
       }
+      // this.$parent.getlist( this.channelId,this.dateLimitPram)
     },
     onSeach() {
       this.getStatistics();
-      this.getTrend();
+      // this.getTrend();
     },
     async exports() {
       let [th, filekey, data, fileName] = [[], [], [], ''];

src/views/statistic/channel/components/newtoday.vue

@@ -0,0 +1,385 @@
+<template>
+   <div class="divBox" style="padding-bottom: 10">
+    <el-card class="box-card">
+        <div class="mintit">日统计报表 </div>
+            <el-table :data="todaydata.list" stripe style="width: 100%">
+              <el-table-column prop="date" label="日期" width="180"  align="center">
+              </el-table-column>
+              <el-table-column prop="clickNum" label="点击数" width="180"  align="center">
+              </el-table-column>
+              <el-table-column prop="registerNum" label="进件"  align="center">
+              </el-table-column>
+              <el-table-column prop="amount" label="订阅金额"  align="center">
+              </el-table-column>
+              <el-table-column prop="num" label="订阅数量"  align="center">
+              </el-table-column>
+              <el-table-column prop="conversionRatio" label="转化率"  align="center">
+              </el-table-column>
+              <el-table-column prop="returnRate" label="回款率" align="center">
+              </el-table-column>
+            </el-table>
+            <el-pagination :page-sizes="[10, 15,]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
+              layout="total, sizes, prev, pager, next, jumper" :total="todaydata.total" @size-change="handleSizeChanges"
+              @current-change="todaypageChange" />
+    </el-card>
+   </div>
+</template>
+
+<script>
+import { ListChannel,ListChannels,Listuser, AddChannel, UpdateChannel, InfoChannel, DelChannel } from '@/api/channel';
+// import creatChannel from './creatChannel';
+import { checkPermi } from '@/utils/permission'; // 权限判断函数
+export default {
+  name: 'Channel',
+  filters: {
+    typeFilter(status) {
+      const statusMap = {
+        wechat: '微信用户',
+        routine: '小程序你用户',
+        h5: 'H5用户',
+      };
+      return statusMap[status];
+    },
+  },
+//   components: { creatChannel },
+  data() {
+    return {
+      listLoading: false,
+      dialogVisibles: false,
+      titindex:0,
+      channelInfo: {},
+      chooselist:{},
+      todaydata:{ list: [], total: 0 },
+      userdata:{},
+      constants: this.$constants,
+      listPram: {
+        productId: 1,
+        productName: null,
+        page: 1,
+        limit: this.$constants.page.limit[0],
+      },
+      listPrams: {
+        dateLimit:'',
+        channelId: null,
+        page: 1,
+        limit: 10,
+      },
+      userPrams: {
+        
+        channelId: null,
+        page: 1,
+        limit: 10,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 10,
+      },
+      listData: { list: [], total: 0 },
+      tableData: {
+        data: [],
+        total: 0,
+      },
+    };
+  },
+  mounted() {
+
+    // this.getList();
+    
+  },
+  methods: {
+    changeid(id,time){
+        console.log(id,time,'timetimetimetimetime');
+        this.listPrams.channelId=id
+        this.listPrams.dateLimit=time
+        this.gettodaylist()
+    },
+    handleClose() {
+      this.userPrams.page=1
+      this.listPrams.page=1
+      this.dialogVisibles = false;
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList();
+    },
+    handleSizeChanges(val){
+      this.listPrams.limit = val;
+      this.gettodaylist()
+    },
+    userhandleSizeChange(val){
+      this.userPrams.limit = val;
+      this.getuserlist()
+    },
+    todaypageChange(page){
+      this.listPrams.page = page;
+      this.gettodaylist()
+    },
+    userpageChange(page){
+      
+      this.userPrams.page = page;
+      this.getuserlist()
+    },
+    gettodaylist(){
+      ListChannels(this.listPrams)
+        .then((res) => {
+          this.todaydata= res;
+         
+        })
+        .catch(() => {
+         
+        });
+    },
+    copyurl(url){
+      console.log(url);
+      const textarea = document.createElement('textarea');
+      textarea.value = url;
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand('copy');
+      document.body.removeChild(textarea);
+      // alert('文本已复制到剪贴板！');
+      this.$message.success('复制成功');
+    //   navigator.clipboard.writeText(url)
+    // .then(() => {
+    //   console.log('URL已成功复制到剪贴板');
+    //   this.$message.success('复制成功');
+    // })
+    // .catch(err => {
+    //   console.error('无法复制URL到剪贴板:', err);
+    // });
+    },
+    getuserlist(){
+      Listuser(this.userPrams)
+        .then((res) => {
+          this.userdata = res;
+         console.log( this.todaydata,'returnRatereturnRatereturnRate');
+        })
+        .catch(() => {
+         
+        });
+    },
+    showdlg(row) {
+      this.listPrams.channelId=row.id
+      this.userPrams.channelId=row.id
+      
+     this.gettodaylist()
+     this.getuserlist()
+      console.log(row,'rowrow');
+      this.chooselist=row
+      this.dialogVisibles = true
+    },
+    formatPercentage(value) {
+      if (value == "0.00" || value == "0.0" || value == "0" || value == 0 || value == null) {
+        return "-";
+      } else {
+        return (value * 100).toFixed(2) + '%';
+      }
+    },
+    formatNumber(value) {
+      if (value == 0) {
+        return "-";
+      } else {
+        return value + "期";
+      }
+    },
+    checkPermi,
+    seachList() {
+      this.getList();
+    },
+    add() {
+      this.$refs.grades.dialogVisible = true;
+      this.channelInfo = { status: true };
+    },
+    edit(channelInfo) {
+      // this.$refs.grades.info(id)
+      // user.amountComesUpStr = user.amountComesUp*100;
+      // user.downPaymentPercentStr = user.downPaymentPercent*100;
+      this.channelInfo = channelInfo;
+      this.$refs.grades.dialogVisible = true;
+    },
+    // 列表
+    getList() {
+      this.listLoading = true;
+      ListChannel(this.listPram)
+        .then((res) => {
+          this.listData = res;
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    // 删除
+    handleDelete(id, idx) {
+      this.$modalSure('删除吗？删除会导致对应渠道数据清空，请谨慎操作！').then(() => {
+        DelChannel(id).then(() => {
+          this.$message.success('删除成功');
+          this.getList();
+        });
+      });
+    },
+    handleSizeChange(val) {
+      this.listPram.limit = val;
+      this.handlerGetListData(this.listPram);
+    },
+    handleCurrentChange(val) {
+      this.listPram.page = val;
+      this.handlerGetListData(this.listPram);
+    },
+    onchangeIsShow(row) {
+      if (row.isShow == false) {
+        row.isShow = !row.isShow;
+        UpdateChannel({ id: row.id, isShow: row.isShow })
+          .then(() => {
+            this.$message.success('修改成功');
+            this.getList();
+          })
+          .catch(() => {
+            row.isShow = !row.isShow;
+          });
+      } else {
+        this.$modalSure('确定修改渠道状态吗？').then(() => {
+          row.isShow = !row.isShow;
+          // console.log("row-----------"+JSON.stringify(row))
+          UpdateChannel(row)
+            .then(() => {
+              this.$message.success('修改成功');
+              this.getList();
+            })
+            .catch(() => {
+              row.isShow = !row.isShow;
+            });
+        });
+      }
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.up,
+.el-icon-caret-top,
+.content-is {
+  color: #f5222d;
+  font-size: 12px;
+  opacity: 1 !important;
+
+  &.down {
+    color: #39c15b;
+  }
+}
+.flex {
+  display: flex;
+}
+.flex-wrap {
+  flex-wrap: wrap;
+}
+.w-50 {
+  width: 50%;
+}
+.mt30 {
+  margin-top: 30px;
+}
+.down,
+.el-icon-caret-bottom .content-is {
+  font-size: 12px;
+}
+
+.el-icon-caret-bottom {
+  color: #39c15b;
+}
+
+.br {
+  border-right: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.toDay {
+  width: 49%;
+  display: inline-block;
+
+  &-title {
+    font-size: 14px;
+  }
+
+  &-number {
+    font-size: 20px;
+  }
+
+  &-time {
+    font-size: 12px;
+    color: #8c8c8c;
+    margin-bottom: 5px;
+  }
+}
+
+.title {
+  font-size: 16px;
+  color: #000000;
+  font-weight: 500;
+}
+
+.price {
+  i {
+    font-style: normal;
+    font-size: 21px;
+    color: #000;
+  }
+}
+.ivu-mb {
+  margin-bottom: 20px;
+}
+.up,
+.el-icon-caret-top {
+  color: #f5222d;
+  font-size: 12px;
+  opacity: 1 !important;
+}
+
+.down,
+.el-icon-caret-bottom {
+  color: #39c15b;
+  font-size: 12px;
+  /*opacity: 100% !important;*/
+}
+.main_tit {
+  color: #333;
+  font-size: 16px;
+  font-weight: 500;
+}
+.content-time {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+}
+
+.align-center {
+  align-items: center;
+}
+.baseInfo {
+  ::v-deep .el-card__header {
+    padding: 15px 20px !important;
+  }
+}
+.count_data {
+  padding: 22px 0 12px;
+}
+.content {
+  &-number {
+    font-weight: 600;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-size: 30px;
+  }
+  &-time {
+    font-size: 14px;
+    /*color: #8C8C8C;*/
+  }
+}
+.el-col-4{
+  width: 16.6666666667%;
+}
+</style>

src/views/statistic/channel/components/toDay.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="divBox" style="padding-bottom: 0">
-    <el-row :gutter="20" class="baseInfo" v-if="checkPermi(['admin:statistics:channel:data'])">
+    <!-- <el-row :gutter="20" class="baseInfo" v-if="checkPermi(['admin:statistics:channel:data'])">
       <el-col v-bind="grid" class="el-col-4 ivu-mb" v-for="(item, index) in cardLists" :key="index">
         <el-card :bordered="false" dis-hover :padding="12">
           <div class="acea-row row-between-wrapper">
@@ -10,7 +10,7 @@
             <el-tag type="primary">{{ item.tag }}</el-tag>
           </div>
           <div class="content">
-            <span class="content-number spBlock count_data">{{ item.count }}</span>
+            <span class="content-number spBlock count_data">{{ item.count }}</span> -->
 <!--            <span class="spBlock pt10"-->
 <!--              >环比：-->
 <!--              <i class="content-is" :class="item.percent >= 0 ? 'up' : 'down'"-->

src/views/statistic/channel/index.vue

@@ -1,19 +1,29 @@
 <template>
   <div class="">
-<!--    <to-day></to-day>-->
+   
     <channel-from></channel-from>
+    <!-- <to-day></to-day> -->
+    <toDays ref="todays"></toDays>
   </div>
 </template>
 
 <script>
-import toDay from './components/toDay';
+// import toDay from './components/toDay';
+import toDays from './components/newtoday';
 import channelFrom from './components/channel';
 export default {
   name: 'index',
   components: {
-    toDay,
+    // toDay,
     channelFrom,
+    toDays
   },
+  methods:{
+    getlist(id,time){
+      
+      this.$refs.todays.changeid(id,time)
+    }
+  }
 };
 </script>