Merge branch 'tx' of https://gitee.com/fuding-chuangte-iot/easypay-admin into tx

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

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox" style="padding-top: 0">
     <el-card class="box-card">
-      <div class="flex justify-between mb46">
+      <div class="flex justify-between mb46 padtop20">
         <div class="header_title">渠道状况</div>
         <div class="acea-row">
           <div class="mr-20">
@@ -41,8 +41,8 @@
           <el-button type="default" size="small" icon="el-icon-upload2" @click="exports">导出</el-button>
         </div>
       </div>
-      <div class="flex flex-wrap mb20" v-if="checkPermi(['admin:statistics:channel:overview'])">
-        <div class="infoBox acea-row mb30" v-for="(item, index) in list" :key="index">
+      <div class="flex flex-wrap" v-if="checkPermi(['admin:statistics:channel:overview'])">
+        <div class="infoBox acea-row" v-for="(item, index) in list" :key="index">
           <div class="iconCrl mr15" :class="item.class">
             <i :class="item.icon" class="iconfont" :style="{ color: item.color }"></i>
           </div>
@@ -66,13 +66,13 @@
           </div>
         </div>
       </div>
-      <echarts-new
-        :option-data="optionData"
-        :styles="style"
-        height="100%"
-        width="100%"
-        v-if="optionData && checkPermi(['admin:statistics:channel:trend'])"
-      ></echarts-new>
+<!--      <echarts-new-->
+<!--        :option-data="optionData"-->
+<!--        :styles="style"-->
+<!--        height="100%"-->
+<!--        width="100%"-->
+<!--        v-if="optionData && checkPermi(['admin:statistics:channel:trend'])"-->
+<!--      ></echarts-new>-->
     </el-card>
   </div>
 </template>
@@ -231,14 +231,14 @@ export default {
             class: 'five',
             list: { num: res.totalConversionRatio, percent: res.balanceAmountRatio },
           },
-          {
-            name: '回款率',
-            icon: 'iconzhifuyongjinjine1',
-            info: '该渠道下的所有用户回款金额 / 该渠道下的所有用户分期金额',
-            color: '#EF9C20',
-            class: 'six',
-            list: { num: res.totalReturnRate, percent: res.payoutBrokerageAmountRatio },
-          }
+          // {
+          //   name: '回款率',
+          //   icon: 'iconzhifuyongjinjine1',
+          //   info: '该渠道下的所有用户回款金额 / 该渠道下的所有用户分期金额',
+          //   color: '#EF9C20',
+          //   class: 'six',
+          //   list: { num: res.totalReturnRate, percent: res.payoutBrokerageAmountRatio },
+          // }
           // {
           //   name: '商品退款金额',
           //   icon: 'iconshangpintuikuanjine',
@@ -493,7 +493,9 @@ export default {
     width: 50%;
   }
 }
-
+.padtop20{
+  padding-top: 20px;
+}
 .info {
   .sp1 {
     color: #666;

src/views/statistic/channel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="">
-    <to-day></to-day>
+<!--    <to-day></to-day>-->
     <channel-from></channel-from>
   </div>
 </template>

src/views/store/setting/creatSetting.vue

@@ -92,7 +92,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      installmentNumberTreeData: [3,6,9,12,18,24,36],
+      installmentNumberTreeData: [1,3,6,9,12,18,24,36],
       // categoryProps: {
       //   value: 'id',
       //   label: 'name',