Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!140

src/views/business/channel/childs.vue

@@ -66,44 +66,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-         <!-- <el-form-item label="地区">
-           <el-select
-             v-model="queryParams.provinceId"
-             placeholder="选择省份"
-             clearable
-             size="small"
-             @change="getCityList()"
-             style="width: 120px;margin-right: 1px;">
-             <el-option
-               v-for="item in provinceList"
-               :key="item.areaId"
-               :label="item.areaName"
-               :value="item.areaId"
-             />
-           </el-select>
-           <el-select
-             v-model="queryParams.cityId"
-             placeholder="选择市"
-             clearable
-             size="small"
-              @change="getAreaList()"
-             style="width: 120px;margin-right: 1px;">
-             <el-option
-               v-for="item in cityList"
-               :key="item.areaId"
-               :label="item.areaName"
-               :value="item.areaId"
-             />
-           </el-select>
-           <el-select v-model="queryParams.areaId" placeholder="选择区" clearable size="small" style="width: 120px;margin-right: 1px;">
-             <el-option
-               v-for="item in areaList"
-               :key="item.areaId"
-               :label="item.areaName"
-               :value="item.areaId"
-             />
-           </el-select>
-         </el-form-item> -->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -119,14 +81,23 @@
               @click="handleAdd"
               v-hasPermi="['business:channel:add']"
             >添加一级渠道</el-button> -->
-
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="channelList">
           <el-table-column label="渠道编号" prop="channelId" width="100px" />
-          <el-table-column label="渠道名称" prop="name" show-overflow-tooltip  width="180px"/>
+          <el-table-column label="渠道名称" prop="name" show-overflow-tooltip  width="180px">
+            <template slot-scope="scope">
+              <el-link
+                  :underline="false"
+                   type="primary"
+                  @click="handleView(scope.row)"
+                >
+                  {{scope.row.name}}
+              </el-link>
+            </template>
+          </el-table-column>
           <el-table-column label="手机号码" prop="mobile" show-overflow-tooltip  width="120px"/>
           <el-table-column label="佣金比例" prop="commRate">
             <template slot-scope="scope">
@@ -274,9 +245,7 @@ export default {
       queryParams: {
         name: "",
         mobile: "",
-        provinceId:"",
-        cityId:"",
-        areaId:""
+        parentName: ""
       },
       pageParams: {
         pageNum: 1,
@@ -427,6 +396,18 @@ export default {
       const dataObj = JSON.parse(val);
       return (dataObj && dataObj.value) || "";
     },
+
+    handleView(row) {
+      // this.createShow = true
+      let parentId = row.channelId
+      let title = row.name
+
+      // this.parentId = parentId
+      // this.title = title;
+      this.queryParams.parentId = parentId
+      this.queryParams.parentName = title
+      this.getList();
+    },
   }
 };
 </script>

src/views/index.vue

@@ -27,16 +27,16 @@
                    <span class="rate__num">
                       <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) > 0 ">
                           <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
-                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) < 0" class="el-icon-sort-down rate__icon" style="color: green;" />
+                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
                            <span v-if="(daily.payAmt && daily.payAmt.today || 0) >0">
-                              {{((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) / daily.payAmt.yesterday }}
+                              {{ getRate((daily.payAmt && daily.payAmt.today || 0) , daily.payAmt.yesterday) }}
                            </span>
                            <span v-else>100</span>
                       </span>
                       <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) == 0">
                           <span v-if="(daily.payAmt && daily.payAmt.today || 0) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="(daily.payAmt && daily.payAmt.today || 0) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
+                          <span v-if="(daily.payAmt && daily.payAmt.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
                            {{(daily.payAmt && daily.payAmt.today || 0) > 0 ? 100 : 0 }}
                       </span>
                       %
@@ -67,16 +67,16 @@
                    <span class="rate__num">
                      <span v-if="(daily.payUser && daily.payUser.yesterday || 0) > 0 ">
                           <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
-                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) < 0" class="el-icon-sort-down rate__icon" style="color: green;" />
+                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
                           <span v-if="(daily.payUser && daily.payUser.today || 0) >0">
-                            {{((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) / daily.payUser.yesterday }}
+                             {{ getRate((daily.payUser && daily.payUser.today || 0) , daily.payUser.yesterday) }}
                           </span>
                           <span v-else>100</span>
                      </span>
                      <span v-if="(daily.payUser && daily.payUser.yesterday || 0) == 0">
                           <span v-if="(daily.payUser && daily.payUser.today || 0) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="(daily.payUser && daily.payUser.today || 0) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
+                          <span v-if="(daily.payUser && daily.payUser.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
                           {{(daily.payUser && daily.payUser.today || 0) > 0 ? 100 : 0 }}
                      </span>
                      %
@@ -107,16 +107,16 @@
                    <span class="rate__num">
                      <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) > 0 ">
                           <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
-                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) < 0" class="el-icon-sort-down rate__icon" style="color: green;" />
+                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
                           <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) >0">
-                            {{((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) / daily.ticketNum.yesterday }}
+                            {{ getRate((daily.ticketNum && daily.ticketNum.today || 0) , daily.ticketNum.yesterday) }}
                           </span>
                           <span v-else>100</span>
                      </span>
                      <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) == 0">
                          <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) == 0" class="el-icon-sort rate__icon" />
-                         <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
+                         <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
                           {{(daily.ticketNum && daily.ticketNum.today || 0) > 0 ? 100 : 0 }}
                      </span>
                      %
@@ -148,16 +148,16 @@
                    <span class="rate__num">
                      <span v-if="(daily.newSite && daily.newSite.yesterday || 0) > 0 ">
                           <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
-                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) < 0" class="el-icon-sort-down rate__icon" style="color: green;" />
+                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
                           <span v-if="(daily.newSite && daily.newSite.today || 0) >0">
-                            {{((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) / daily.newSite.yesterday }}
+                            {{ getRate((daily.newSite && daily.newSite.today || 0) , daily.newSite.yesterday) }}
                           </span>
                           <span v-else>100</span>
                      </span>
                      <span v-if="(daily.newSite && daily.newSite.yesterday || 0) == 0">
                           <span v-if="(daily.newSite && daily.newSite.today || 0) == 0" class="el-icon-sort rate__icon" />
-                          <span v-if="(daily.newSite && daily.newSite.today || 0) > 0" class="el-icon-sort-up rate__icon" style="color: red;" />
+                          <span v-if="(daily.newSite && daily.newSite.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
                           {{(daily.newSite && daily.newSite.today || 0) > 0 ? 100 : 0 }}
                      </span>
                      %
@@ -403,7 +403,12 @@ export default {
         title: {
           text: ''
         },
-        tooltip: {},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          }
+        },
         xAxis: {
           data: []
         },
@@ -433,7 +438,12 @@ export default {
         title: {
           text: ''
         },
-        tooltip: {},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          }
+        },
         xAxis: {
           data: []
         },
@@ -463,7 +473,12 @@ export default {
         title: {
           text: ''
         },
-        tooltip: {},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          }
+        },
         xAxis: {
           data: []
         },
@@ -500,7 +515,12 @@ export default {
         title: {
           text: ''
         },
-        tooltip: {},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          }
+        },
         xAxis: {
           data: []
         },
@@ -535,6 +555,15 @@ export default {
       this.getTicketSiteTop()
     },
 
+    getRate(today, yestoday){
+      if(today > yestoday){
+         {{((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) / daily.newSite.yesterday }}
+         return ((today - yesterday) / yesterday )*100
+      }else{
+         return ((yesterday - today) / yesterday )*100
+      }
+    },
+
     // 统计今日实时交易金额、交易用户、盲票销售张数、新增经销商数量
     getDailyData() {
       getDailyData({}).then(res => {