diff --git a/manager-admin/src/views/dashboard/index.vue b/manager-admin/src/views/dashboard/index.vue
index ba9b02ae5f16ac624747b6e979b49c7a2b16a844..0ed36ad984c7b2f4803494f3227121f71e648515 100644
--- a/manager-admin/src/views/dashboard/index.vue
+++ b/manager-admin/src/views/dashboard/index.vue
@@ -273,7 +273,11 @@
     },
     methods: {
       handleJump(url) {
-        this.$router.push({ name: url })
+				if (this.pageHasPermission(url)) {
+					this.$router.push({ name: url })
+				} else {
+          this.$message.error('暂无权限查看！')
+				}
       },
       getIndexHotShop() {
         const hotShopTimeRange = this.hotShopTimeRange
@@ -413,9 +417,9 @@
         })
       },
       // 页面是否有权限
-      pageHasPermission(url) {
+      pageHasPermission(name) {
         const routers = this.$router.getRoutes()
-        return routers.filter(item => item.path.indexOf(url) !== -1).length !== 0
+        return routers.filter(item => item.name === name).length !== 0
       }
     }
   }
@@ -571,15 +575,4 @@
 			}
 		}
 	}
-
-  // .el-col {
-  //   border-radius: 4px;
-  // }
-  // .goods-name {
-  //   color: #4183c4;
-  //   &:hover { color: #f42424 }
-  // }
-  // .o2o-goods-name {
-  //   color: #4183c4;
-  // }
 </style>
diff --git a/manager-seller/src/api/dashboard.js b/manager-seller/src/api/dashboard.js
index 4a0b866b3de99599059bec40412253e6cc024d86..b6966856432658d19ad068a21aa05bda63e5d7e5 100644
--- a/manager-seller/src/api/dashboard.js
+++ b/manager-seller/src/api/dashboard.js
@@ -17,6 +17,17 @@ export function getDashboardData() {
   })
 }
 
+/**
+ * 获取店铺基础信息
+ * @returns
+ */
+export function getDashboardShopScore() {
+  return request({
+    url: 'seller/statistics/dashboard/shopScore',
+    method: 'get',
+    loading: false
+  })
+}
 /**
  * 获取商城公告
  * @param params
@@ -44,3 +55,44 @@ export function getConcate(params) {
   })
 }
 
+/**
+ * 获取交易图表数据
+ * @param {*} params
+ * @returns
+ */
+export function getTurnoverChart(params) {
+  return request({
+    url: 'seller/statistics/dashboard/turnoverChart',
+    method: 'get',
+    loading: false,
+    params
+  })
+}
+
+/**
+ * 获取商品销售排行
+ * @param {*} params
+ * @returns
+ */
+export function getHotGoodsCount(params) {
+  return request({
+    url: 'seller/statistics/dashboard/hotGoodsCount',
+    method: 'get',
+    loading: false,
+    params
+  })
+}
+/**
+ * 获取交易排行
+ * @param {*} params
+ * @returns
+ */
+export function getHotGoodsAmount(params) {
+  return request({
+    url: 'seller/statistics/dashboard/hotGoodsAmount',
+    method: 'get',
+    loading: false,
+    params
+  })
+}
+
diff --git a/manager-seller/src/views/dashboard/index.vue b/manager-seller/src/views/dashboard/index.vue
index 2a67b92a71baa21ad0d62959f125beaaf255c1cf..c94b8abbe26ad738a9911afcfdb9620987751792 100644
--- a/manager-seller/src/views/dashboard/index.vue
+++ b/manager-seller/src/views/dashboard/index.vue
@@ -1,14 +1,13 @@
 <template>
   <div class="dashboard-container" v-loading="loading">
-    <!--商家基本信息-->
-    <el-row :gutter="20" type="flex" justify="space-around" v-if="shop_info">
+    <el-row :gutter="20" type="flex" justify="space-around">
       <el-col  :span="24">
         <div class="grid-content bg-purple-light">
           <!--logo-->
           <div class="logo">
             <div class="shop-img-icon">
-              <img v-if="shop_info.shop_logo" :src="shop_info.shop_logo">
-              <img v-if="!shop_info.shop_logo" src="../../assets/icon-no-shop-logo.png">
+              <img v-if="shopInfo.shop_logo" :src="shopInfo.shop_logo">
+              <img v-if="!shopInfo.shop_logo" src="../../assets/icon-no-shop-logo.png">
               <span class="to-change-shop-icon" @click="toChangeShopIcon">更改图标</span>
             </div>
             <el-upload
@@ -26,20 +25,20 @@
           <!--文字信息-->
           <div class="shop-info">
             <div class="shop-info-basic">
-              <span>{{ shop_info.shop_name }}</span>
+              <span>{{ shopInfo.shop_name }}</span>
               <span>（用户名：{{ user_info.username }}）</span>
               <!--是否是平台自营-->
-              <span v-if="parseInt(shop_info.self_operated) === 1">平台自营</span>
+              <span v-if="parseInt(shopInfo.self_operated) === 1">平台自营</span>
             </div>
             <div class="shop-info-credit">
               <span>
-                卖家信用：{{shop_info.shop_credit}} &nbsp;
+                卖家信用：{{shopInfo.shop_credit}}分 &nbsp;
               </span>
               <div></div>
-              <span>店铺地址：{{shop_info.shop_province}}
-                {{shop_info.shop_city}}
-                {{shop_info.shop_county}}
-                {{shop_info.shop_town}}</span>
+              <span>店铺地址：{{shopInfo.shop_province}}
+                {{shopInfo.shop_city}}
+                {{shopInfo.shop_county}}
+                {{shopInfo.shop_town}}</span>
             </div>
           </div>
           <!--动态评分-->
@@ -48,314 +47,398 @@
             <div class="active-score">
               <div>
                 <span>描述</span>
-                <span>{{shop_info.shop_description_credit_text}}分</span>
+                <span>{{shopInfo.shop_description_credit_text}}分</span>
               </div>
               <div>
                 <span>服务</span>
-                <span>{{shop_info.shop_service_credit_text}}分</span>
+                <span>{{shopInfo.shop_service_credit_text}}分</span>
               </div>
               <div>
                 <span>发货</span>
-                <span>{{shop_info.shop_delivery_credit_text}}分</span>
+                <span>{{shopInfo.shop_delivery_credit_text}}分</span>
               </div>
             </div>
           </div>
         </div>
       </el-col>
     </el-row>
-    <el-row :gutter="20" type="flex" justify="space-around">
-      <!--店铺 商品提示-->
-      <el-col  :span="12">
-        <el-card class="box-card">
-          <div>
-            <h1>店铺及商品提示</h1>
-            <h2>您需要关注的店铺信息以及待处理事项</h2>
-          </div>
-          <div class="store-index-content">
-            <p class="store-rompt" @click="toGoodsManager(1)">出售中的商品：
-              <span style="color: red;">{{dashBoardData.market_goods}}</span>
-            </p>
-            <div>
-              <el-tag type="success" @click.native="toGoodsManager(0)">仓库待上架货品  {{dashBoardData.pending_goods}}</el-tag>
-              <el-tag type="success" @click.native="toConsumerMsg">待回复的咨询 {{dashBoardData.pending_member_ask}}</el-tag>
-            </div>
-          </div>
-        </el-card>
+    <el-row class="row-box">
+      <div class="title">
+				<div class="line"></div>
+				今日待办
+			</div>
+      <el-col :span="4" class="col-item" v-on:click.native="handleJump('understock')">
+				<p class="number">{{pageData.warning_goods_count}}</p>
+        <p>商品库存预警</p>
       </el-col>
-      <!--商城公告-->
-      <el-col :span="12">
-        <el-card class="box-card">
-          <div>
-            <h1>商城公告</h1>
-            <h2>您可以关注商城公告，以便能更快的了解商城的信息</h2>
-          </div>
-          <p class="store-bulletin" v-for="row in shop_announcement">
-            <a @click="showArticleContext(row)" :title="row.content">{{row.article_name}}</a>
-          </p>
-        </el-card>
+      <el-col :span="4" :offset="1" class="col-item" v-on:click.native="handleJump('serviceList')">
+        <p class="number">{{pageData.after_sale_order_num}}</p>
+        <p>待处理售后</p>
       </el-col>
-    </el-row>
-    <el-row :gutter="20" type="flex" justify="space-around">
-      <!--交易提示-->
-      <el-col  :span="12">
-        <el-card class="box-card">
-          <div>
-            <h1>交易提示</h1>
-            <h2>您需要立即处理的交易订单</h2>
-          </div>
-          <div class="store-index-content">
-            <p class="store-rompt" @click="toOrderList('ALL')">所有的订单：<span style="color: red;">{{dashBoardData.all_orders_num}}</span></p>
-            <div>
-              <el-tag type="success" @click.native="toOrderList('WAIT_PAY')"> 待付款  {{dashBoardData.wait_pay_order_num}}</el-tag>
-              <el-tag type="success" @click.native="toOrderList('WAIT_SHIP')">待发货  {{dashBoardData.wait_ship_order_num}}</el-tag>
-              <el-tag type="success" @click.native="toOrderList('WAIT_ROG')"> 待收货  {{dashBoardData.wait_delivery_order_num}}</el-tag>
-              <el-tag type="success" @click.native="toRefundOrderList()">     待处理售后 {{dashBoardData.after_sale_order_num}}</el-tag>
-            </div>
-          </div>
-        </el-card>
+      <el-col :span="4" :offset="1" class="col-item" v-on:click.native="handleJump('complaintList')">
+				<p class="number">{{pageData.wait_handle_complain_count}}</p>
+        <p>待处理投诉</p>
       </el-col>
-      <!--平台联系方式-->
-      <el-col :span="12">
-        <el-card class="box-card">
-          <div>
-            <h1>平台联系方式</h1>
-            <h2>可以致电平台联系电话或将建议、问题提交到平台邮箱中</h2>
-          </div>
-          <ul class="platform-concate">
-            <li v-if="concat"><span>{{ concat.article_name }} </span>：<span v-html="concat.content"></span></li>
-          </ul>
-        </el-card>
+      <el-col :span="4" :offset="1" class="col-item" v-on:click.native="handleJump('orderList', {order_status: 'WAIT_SHIP'})">
+				<p class="number">{{pageData.wait_ship_order_num}}</p>
+        <p>待发货订单</p>
+      </el-col>
+			<el-col :span="4" :offset="1" class="col-item" v-on:click.native="handleJump('consultation')">
+				<p class="number">{{pageData.pending_member_ask}}</p>
+        <p>待处理买家咨询</p>
       </el-col>
     </el-row>
-    <el-dialog :title="currentName" :visible.sync="isShowArticle" width="30%" align="center">
-      <p v-html="currentContent.replace(/\n/g, '<br>')" class="current-content"></p>
-    </el-dialog>
+
+		<div class="base-box">
+			<el-col class="count-box">
+				<div class="title">
+					商品概括
+				</div>
+				<div class="count-item">
+          <div class="count-child" @click="handleJump('goodsList', {market_enable: 1})">
+						<p>出售中</p>
+						<p class="value">{{pageData.market_goods}}</p>
+					</div>
+					<div class="count-child" @click="handleJump('goodsList', {market_enable: 0})">
+						<p>待上架</p>
+						<p class="value">{{pageData.pending_goods}}</p>
+					</div>
+				</div>
+				<div class="count-item" @click="handleJump('authGoodsList')">
+					<div class="count-child">
+						<p>待审核</p>
+						<p class="value">{{pageData.wait_audit_goods_count}}</p>
+					</div>
+				</div>
+			</el-col>
+			<el-col class="count-box" >
+				<div class="title">
+					今日概括
+				</div>
+        <div class="count-item">
+					<div class="today-count-child">
+						<p >今日订单数</p>
+						<p class="value">{{pageData.today_order_count}}</p>
+					</div>
+					<div class="today-count-child">
+						<p>今日交易额</p>
+						<p class="value">￥{{pageData.today_order_amount}}</p>
+					</div>
+				</div>
+        <div class="count-item">
+          <div class="today-count-child">
+						<p>今日新增商品</p>
+						<p class="value">{{pageData.today_goods_count}}</p>
+					</div>
+					<div class="today-count-child">
+						<p>今日新增访客</p>
+						<p class="value">{{pageData.today_visit_count}}</p>
+					</div>
+				</div>
+			</el-col>
+    </div>
+
+    <div class="base-box">
+      <el-col class="count-box">
+				<div class="title">
+					交易趋势
+				</div>
+        <el-date-picker
+          v-model="turnoverTimeRange"
+          type="daterange"
+          align="center"
+          :editable="false"
+          unlink-panels
+          :default-time="['00:00:00', '23:59:59']"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="timestamp"
+          @change="getTurnoverChart"
+          :picker-options="{ disabledDate (time) { return time.getTime() - 1 >= new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()).getTime() + 86400000 - 1 }, shortcuts: MixinPickerShortcuts }">
+        </el-date-picker>
+        <div id="turnoverChart" :style="{height: tableHeight + 'px'}"></div>
+      </el-col>
+    </div>
+    <div class="hot-box">
+      <div class="title-box">
+        <div class="title">
+          热卖商品TOP10
+        </div>
+        <el-date-picker
+          v-model="hotGoodsTimeRange"
+          type="daterange"
+          align="center"
+          :editable="false"
+          unlink-panels
+          :default-time="['00:00:00', '23:59:59']"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="timestamp"
+          @change="getHotGoodsCount"
+          :picker-options="{ disabledDate (time) { return time.getTime() - 1 >= new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()).getTime() + 86400000 - 1 }, shortcuts: MixinPickerShortcuts }">
+        </el-date-picker>
+      </div>
+
+      <el-table stripe :data="hotGoodsList" border :height="480">
+        <el-table-column label="商品名称">
+          <template slot-scope="scope">
+            <a :href="isO2O ? 'javascript:void(0)' : `${MixinBuyerDomain}/goods/${scope.row.goods_id}`" :target="isO2O ? '' : '_blank'" :class="[isO2O ? 'o2o-goods-name' : 'goods-name']" v-html="scope.row.goods_name">{{ scope.row.goods_name }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column label="销售数量" width="130">
+          <template slot-scope="scope">{{ scope.row.goods_num }}</template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="hot-box">
+      <div class="title-box">
+        <div class="title">
+          交易额TOP10
+        </div>
+        <el-date-picker
+          v-model="hotGoodsAmountTimeRange"
+          type="daterange"
+          align="center"
+          :editable="false"
+          unlink-panels
+          :default-time="['00:00:00', '23:59:59']"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="timestamp"
+          @change="getHotGoodsAmount"
+          :picker-options="{ disabledDate (time) { return time.getTime() - 1 >= new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()).getTime() + 86400000 - 1 }, shortcuts: MixinPickerShortcuts }">
+        </el-date-picker>
+      </div>
+
+      <el-table stripe :data="hotAmountList" border :height="480">
+        <el-table-column label="商品名称" prop="goods_name">
+        </el-table-column>
+        <el-table-column label="销售额" width="130">
+          <template slot-scope="scope">{{ scope.row.price | unitPrice('￥') }}</template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
 <script>
-import * as API_Dashboard from '@/api/dashboard'
-import * as API_shop from '@/api/shop'
-export default {
-  name: 'dashboard',
-  activated() {
-    this.shop_info = this.$store.getters.shopInfo
-  },
-  mounted() {
-    /** 获取首页统计信息 */
-    this.GET_DashBoard()
-
-    /** 获取首页商城公告 */
-    this.GET_Notice()
-
-    /** 获取首页联系方式 */
-    this.GET_Concate()
-
-    window.onresize = this.countTableHeight
-  },
-  data() {
-    return {
-      /** 加载中*/
-      loading: false,
-
-      /** 商家基本信息 */
-      shop_info: this.$store.getters.shopInfo,
-
-      /** 首页统计数据*/
-      dashBoardData: {},
-
-      /** 商城公告*/
-      shop_announcement: [],
-
-      /** 平台联系方式*/
-      concat: null,
-
-      /** 商家图标*/
-      fileList: [],
-
-      /** 视图高度*/
-      tableHeight: (document.body.clientHeight - 84 - 80 - 80 - 20 - 20 - 4) / 2,
-
-      /** 当前商城公告名称 */
-      currentName: '',
-
-      /** 当前商城公告内容 */
-      currentContent: '',
-
-      /** 是否显示商城公告 默认不显示 */
-      isShowArticle: false
-    }
-  },
-  computed: {
-    /** 用户信息 */
-    user_info() {
-      return this.$store.getters.user
-    }
-  },
-  methods: {
-    /** 窗口缩放时计算table高度 */
-    countTableHeight() {
-      this.tableHeight = (document.body.clientHeight - 84 - 80 - 80 - 20 - 20 - 4) / 2
+  import * as API_Dashboard from '@/api/dashboard'
+  import * as API_shop from '@/api/shop'
+
+  export default {
+    name: 'dashboard',
+    data() {
+      return {
+        loading: true,
+        pageData: {},
+        shopInfo: {},
+        /** 商家图标*/
+        fileList: [],
+        turnoverTimeRange: [],
+        hotGoodsTimeRange: [],
+        hotGoodsAmountTimeRange: [],
+        tableHeight: document.body.clientHeight / 2,
+        hotAmountList: [],
+        hotGoodsList: []
+      }
     },
-
-    /** 获得首页统计信息*/
-    GET_DashBoard() {
-      this.loading = true
-      API_Dashboard.getDashboardData().then(response => {
-        this.loading = false
-        this.dashBoardData = response
-      })
+    activated() {
+      window.onresize = this.countTableHeight
     },
-
-    /** 获取首页 商城公告 */
-    GET_Notice() {
-      this.loading = true
-      const category_type = 'NOTICE'
-      API_Dashboard.getNotice(category_type, {}).then((response) => {
-        this.loading = false
-        this.shop_announcement = response
-      })
+    computed: {
+      /** 用户信息 */
+      user_info() {
+        return this.$store.getters.user
+      }
     },
-
-    /** 获取首页 平台联系方式 */
-    GET_Concate() {
-      this.loading = true
-      API_Dashboard.getConcate({ position: 'CONTACT_INFORMATION' }).then((response) => {
-        this.loading = false
-        this.concat = response
+    mounted() {
+      this.$nextTick(() => {
+        this.turnoverChart = this.$echarts.init(document.getElementById('turnoverChart'))
       })
-    },
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      start.setHours(0, 0, 0, 0)
 
-    /** 店铺LOGO上传 */
-    toChangeShopIcon() {
-      this.$refs.uploadBtn.click()
-    },
+      const timeRange = [start.getTime(), end.getTime()]
 
-    /** 图片上传之前的校验 */
-    handleShopLogoBefore(file) {
-      const isImage = file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png'
-      if (!isImage) {
-        this.$message.error('上传头像图片只能是 JPG、JPEG或PNG格式!')
-        return isImage
-      }
-      return new Promise((resolve, reject) => {
-        let reader = new FileReader()
-        reader.onload = (event) => {
-          let image = new Image()
-          image.onload = () => {
-            let width = image.width
-            let height = image.height
-            if (width !== height) {
-              this.$message.error('图片必须是正方形图片！')
-              reject()
-            }
-            resolve()
-          }
-          image.src = event.target.result
-        }
-        reader.readAsDataURL(file)
-      })
-    },
+      this.turnoverTimeRange = timeRange
+      this.hotGoodsTimeRange = timeRange
+      this.hotGoodsAmountTimeRange = timeRange
 
-    /** 上传成功后的钩子 更换图片 置空存储数组*/
-    uploaded(response) {
-      this.shop_info.shop_logo = response.url
-      this.fileList = []
-      API_shop.updateShopLogo({ logo: response.url }).then(() => {
-        this.$message.success('店铺LOGO修改成功')
-        this.$store.dispatch('getShopInfoAction')
+      this.getHotGoodsAmount()
+      this.getHotGoodsCount()
+      this.getTurnoverChart()
+      this.getDashboardShopScore()
+      API_Dashboard.getDashboardData().then(response => {
+        this.loading = false
+        this.pageData = response
       })
     },
-
-    /** 跳转商品列表*/
-    toGoodsManager(goodsStatus) {
-      const result = this.$store.getters.addRouters.some(key => {
-        if (key.name === 'goods' && key.children) {
-          return key.children.some(item => item.name === 'goodsList')
+    methods: {
+      /** 图片上传之前的校验 */
+      handleShopLogoBefore(file) {
+        const isImage = file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png'
+        if (!isImage) {
+          this.$message.error('上传头像图片只能是 JPG、JPEG或PNG格式!')
+          return isImage
         }
-        return false
-      })
-      if (result) {
-        this.$router.push({ path: '/goods/goods-list', query: { market_enable: goodsStatus }})
-      } else {
-        this.$message.error('权限不足，无法查看')
-      }
-    },
-
-    /** 跳转买家留言 待回复的咨询 */
-    toConsumerMsg() {
-      const result = this.$store.getters.addRouters.some(key => {
-        if (key.name === 'customer' && key.children) {
-          return key.children.some(item => item.name === 'consultation')
+        return new Promise((resolve, reject) => {
+          let reader = new FileReader()
+          reader.onload = (event) => {
+            let image = new Image()
+            image.onload = () => {
+              let width = image.width
+              let height = image.height
+              if (width !== height) {
+                this.$message.error('图片必须是正方形图片！')
+                reject()
+              }
+              resolve()
+            }
+            image.src = event.target.result
+          }
+          reader.readAsDataURL(file)
+        })
+      },
+      /** 上传成功后的钩子 更换图片 置空存储数组*/
+      uploaded(response) {
+        this.shop_info.shop_logo = response.url
+        this.fileList = []
+        API_shop.updateShopLogo({ logo: response.url }).then(() => {
+          this.$message.success('店铺LOGO修改成功')
+          this.$store.dispatch('getShopInfoAction')
+        })
+      },
+      /** 店铺LOGO上传 */
+      toChangeShopIcon() {
+        this.$refs.uploadBtn.click()
+      },
+      /** 获取店铺基础信息 */
+      getDashboardShopScore() {
+        API_Dashboard.getDashboardShopScore().then(res => {
+          this.shopInfo = res
+        })
+      },
+      handleJump(url, query) {
+        if (this.pageHasPermission(url)) {
+          this.$router.push({ name: url, query })
+        } else {
+          this.$message.error('暂无权限查看！')
         }
-        return false
-      })
-      if (result) {
-        this.$router.push({ path: '/customer/consultation', query: { reply_status: 0 }})
-      } else {
-        this.$message.error('权限不足，无法查看')
-      }
-    },
-
-    /** 跳转订单列表*/
-    toOrderList(orderStatus) {
-      const result = this.$store.getters.addRouters.some(key => {
-        if (key.name === 'order' && key.children) {
-          return key.children.some(item => item.name === 'orderList')
+      },
+      getHotGoodsAmount() {
+        const hotGoodsAmountTimeRange = this.hotGoodsAmountTimeRange
+        const params = {
+          start_time: parseInt(hotGoodsAmountTimeRange[0] / 1000),
+          end_time: parseInt(hotGoodsAmountTimeRange[1] / 1000)
         }
-        return false
-      })
-      if (result) {
-        this.$router.push({ path: '/order/order-list', query: { order_status: orderStatus }})
-      } else {
-        this.$message.error('权限不足，无法查看')
-      }
-    },
-
-    /** 跳转维权订单*/
-    toRefundOrderList() {
-      const result = this.$store.getters.addRouters.some(key => {
-        if (key.name === 'customer' && key.children) {
-          return key.children.some(item => item.name === 'afterSale')
+        API_Dashboard.getHotGoodsAmount(params).then(res => {
+          this.hotAmountList = res.data
+        })
+      },
+      getHotGoodsCount() {
+        const hotGoodsTimeRange = this.hotGoodsTimeRange
+        const params = {
+          start_time: parseInt(hotGoodsTimeRange[0] / 1000),
+          end_time: parseInt(hotGoodsTimeRange[1] / 1000)
         }
-        return false
-      })
-      if (result) {
-        this.$router.push({ path: '/order/after-sale/service-list' })
-      } else {
-        this.$message.error('权限不足，无法查看')
+        API_Dashboard.getHotGoodsCount(params).then(res => {
+          this.hotGoodsList = res.data
+        })
+      },
+      /** 获取交易趋势图表数据 */
+      getTurnoverChart() {
+        const turnoverTimeRange = this.turnoverTimeRange
+        const params = {
+          start_time: parseInt(turnoverTimeRange[0] / 1000),
+          end_time: parseInt(turnoverTimeRange[1] / 1000)
+        }
+        API_Dashboard.getTurnoverChart(params).then(res => {
+          this.turnoverChart.setOption({
+            xAxis: {
+              type: 'category',
+              boundaryGap: false,
+              data: res.xAxis
+            },
+            axisPointer: {
+              type: 'cross',
+              label: {
+                backgroundColor: '#6a7985'
+              }
+            },
+            tooltip: { trigger: 'item' },
+            legend: {
+              data: [res.series[0].name, res.series[1].name]
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [
+              {
+                name: res.series[0].name,
+                data: res.series[0].data,
+                type: 'line',
+                itemStyle: {
+                  normal: {
+                    color: '#67C23A',
+                    lineStyle: {
+                      color: '#67C23A'
+                    }
+                  }
+                },
+                areaStyle: {
+                  color: '#e1f3d8',
+                  opacity: 0.5
+                }
+              },
+              {
+                name: res.series[1].name,
+                data: res.series[1].data,
+                type: 'line',
+                itemStyle: {
+                  normal: {
+                    color: '#409EFF',
+                    lineStyle: {
+                      color: '#409EFF'
+                    }
+                  }
+                },
+                areaStyle: {
+                  color: '#79bbff',
+                  opacity: 0.5
+                }
+              }
+            ]
+          })
+        })
+      },
+      /** 窗口缩放时计算table高度 */
+      countTableHeight() {
+        /** 图表刷新 */
+        setTimeout(() => {
+          this.turnoverChart.resize
+        })
+      },
+      // 页面是否有权限
+      pageHasPermission(name) {
+        const routers = this.$router.getRoutes()
+        return routers.filter(item => item.name === name).length !== 0
       }
-    },
-
-    /** 显示商城公告 */
-    showArticleContext(row) {
-      this.currentName = row.article_name
-      this.currentContent = row.content
-      this.isShowArticle = true
     }
   }
-}
 </script>
 
 <style type="text/scss" lang="scss" scoped>
-
   .dashboard-container {
-    height: 100%;
-    background-color: #fff;
+    max-height: 100%;
     /deep/ .el-card__body {
-      min-height: 300px;
-      padding: 10px;
+      padding: 14px;
     }
   }
-
-  /deep/ .el-row {
-    position: relative;
-    margin: 0 3px 20px 3px !important;
-  }
-  .el-col {
-    border-radius: 4px;
-  }
-
   /*商家基本信息*/
   div.grid-content {
     display: flex;
@@ -363,10 +446,12 @@ export default {
     flex-wrap: nowrap;
     justify-content: space-between;
     align-items: stretch;
-
+    background: #fff;
+    border-radius: 10px;
+    margin: 0 10px;
+    padding: 0 20px;
     /*logo*/
     .logo {
-      flex-grow: 1;
       padding: 15px;
       position: relative;
       box-sizing: content-box;
@@ -404,7 +489,7 @@ export default {
 
     /*商家信息*/
     .shop-info {
-      flex-grow: 40;
+      flex-grow: 5;
       padding-top: 30px;
       /*商家主营信息*/
       .shop-info-basic {
@@ -500,75 +585,146 @@ export default {
       }
     }
   }
-
-  /* 店铺商品提示/交易订单提示*/
-  h1 {
-    border-left: 3px solid #28b779;
-    font: 16px/18px "microsoft yahei";
-    height: 18px;
-    margin-bottom: 4px;
-    padding-left: 6px;
-  }
-  /*副标题*/
-  h2 {
-    color: #aaa;
-    font: 12px/16px "microsoft yahei";
-    margin: 10px 0;
-  }
-  /* 店铺/交易提示内容 */
-  .store-index-content {
-    margin: 20px 0;
-    overflow: hidden;
-    .store-rompt {
-      clear: both;
-      display: block;
-      overflow: hidden;
-      margin-bottom: 10px;
-      padding: 10px;
-      background-color: #fcf8e3;
-      border: 1px solid #fbeed5;
-      cursor: pointer;
-    }
-    /** 标签 */
-    .el-tag {
-      cursor: pointer;
+	.count-box {
+		background: #fff;
+    border-radius: 12px;
+		padding: 20px;
+		margin: 0 10px;
+    cursor: pointer;
+    transition: .5s;
+    &:hover {
+      transform: translateY(-10px);
+      box-shadow: 0 0 10px 0 #ccc;
     }
-  }
-  /*商城公告*/
-  .store-bulletin {
-    color: #aaa;
+		.count-item {
+			display: flex;
+      .today-count-child {
+				width: 50%;
+        padding-left: 20px;
+				font-size: 15px;
+				color: #333;
+				font-weight: 500;
+				margin-bottom: 10px;
+        .value {
+					font-size: 21px;
+					color: #ff5c58;
+					font-weight: 700;
+					margin: 10px 0;
+				}
+      }
+			.count-child {
+				width: 50%;
+				padding-left: 20px;
+				font-size: 15px;
+				color: #333;
+				font-weight: 500;
+				margin-bottom: 10px;
+				.value {
+					font-size: 21px;
+					color: #409EFF;
+					font-weight: 700;
+					margin: 10px 0;
+				}
+			}
+		}
+	}
+  .hot-box {
+    margin: 20px;
+    background: #fff;
+    padding:20px;
+    border-radius: 20px;
     cursor: pointer;
-    font: 12px/16px "microsoft yahei";
-    margin: 10px 0;
-    &:hover a {
-      color: #337ab7;
+    transition: .5s;
+    &:hover {
+      transform: translateY(-10px);
+      box-shadow: 0 0 10px 0 #ccc;
+    }
+    .title-box {
+      display: flex;
+      align-items: center;
+      justify-content:space-between;
+      margin-bottom: 10px;
     }
   }
-
-  /*平台联系方式*/
-  .platform-concate {
-    padding: 0;
-    li {
-      list-style: none;
-      margin: 0;
-      color: #aaa;
-      font: 12px/16px "microsoft yahei";
+  .base-box {
+    margin: 20px 0;
+    display: flex;
+		justify-content: space-between;
+    .base-item {
+      background: #fff;
+      border-radius: 12px;
+      height: 85px;
       display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-      justify-content: flex-start;
+      cursor: pointer;
       align-items: center;
-      span {
-        display: inline-block;
-        /deep/ p {
-          margin: 0;
-        }
+      justify-content: center;
+      transition: .5s;
+			// margin: 0 10px 0 0;
+      &:hover {
+        transform: translateY(-10px);
+        box-shadow: 0 0 10px 0 #ccc;
+      }
+      .base-icon {
+        font-size: 50px;
+        margin-right: 40px;
+      }
+      .number {
+        font-size: 22px;
+        font-weight: 500;
+        margin-bottom: 10px;
+      }
+      p {
+        margin: 0;
+        font-size: 15px;
+        color: #555;
+        text-align: left;
       }
     }
   }
-  .current-content {
-    word-break: break-all;
-    text-align: left;
-    text-indent: 20px;
-  }
+	.title {
+		font-size: 18px;
+		color: #444;
+		font-weight: 500;
+		margin-bottom: 20px;
+		display: flex;
+		.line {
+			height: 24px;
+			width: 4px;
+			border-radius: 2px;
+			background: #FF715F;
+			margin-right: 16px;
+		}
+	}
+	.row-box {
+		background: #fff;
+		border-radius: 12px;
+    margin: 20px 10px;
+		padding: 20px;
+		.col-item {
+			background: hsla(0,0%,92.2%,.5333333333333333);
+			border-radius: 12px;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			height: 84px;
+			color: #333;
+			font-size: 14px;
+      cursor: pointer;
+			transition: .5s;
+      &:hover {
+        transform: translateY(-10px);
+        // box-shadow: 0 0 10px 0 #ccc;
+      }
+			.number {
+				color: #1c9399;
+				font-size: 18px;
+				font-weight: 500;
+				margin-bottom: 10px;
+			}
+			p {
+				margin: 0;
+			}
+		}
+	}
 </style>