Change 餐厅搜索范围调整为50公里

flash-waimai-core/src/main/java/cn/enilu/flash/dao/MongoRepository.java

@@ -208,7 +208,7 @@ public class MongoRepository {
      * @return
      */
     public GeoResults<Map> near(double x, double y, String collectionName, Map<String, Object> params) {
-        return near(x,y,collectionName,params,10);
+        return near(x,y,collectionName,params,50);
     }
 
     public long count(Class klass) {

flash-waimai-manage/src/views/dashboard/dashboard.js

@@ -180,8 +180,12 @@ export default {
       const self = this
       getList(self.listQuery).then(response => {
         for (var i = 0; i < response.data.length; i++) {
-
-
+          var notice = response.data[i]
+          self.$notify({
+            title: notice.title,
+            message: notice.content,
+            duration: 3000
+          })
         }
         self.listLoading = false
       })

flash-waimai-manage/src/views/dashboard/index.vue

@@ -2,6 +2,119 @@
   <div class="dashboard-container">
     <div class="dashboard-text">欢迎光临:{{name}}(<span v-for='role in roles' :key='role'>{{role}}</span>)</div>
 
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-card class="box-card">
+          <el-col :span="12">
+            <svg-icon  icon-class="documentation" ></svg-icon>
+          </el-col>
+          <el-col :span="12" >
+            <div class="card-panel-text">进驻商家</div>
+            <div class="card-panel-num">
+              8000
+            </div>
+          </el-col>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card class="box-card">
+          <el-col :span="12">
+            <svg-icon  icon-class="user"></svg-icon>
+          </el-col>
+          <el-col :span="12" >
+            <div class="card-panel-text">{{ $t('dashboard.newUser') }}</div>
+            <div class="card-panel-num">102,400</div>
+          </el-col>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card class="box-card">
+          <el-col :span="12">
+            <svg-icon  icon-class="message" ></svg-icon>
+          </el-col>
+          <el-col :span="12" >
+            <div class="card-panel-text">{{ $t('dashboard.message') }}</div>
+            <div class="card-panel-num">5</div>
+          </el-col>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card class="box-card">
+          <el-col :span="12">
+            <svg-icon  icon-class="money" ></svg-icon>
+          </el-col>
+          <el-col :span="12" >
+            <div class="card-panel-text">{{ $t('dashboard.income') }}</div>
+            <div class="card-panel-num">10000</div>
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="24">
+        <div class="chart section">
+          <v-chart :options="lineData"/>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20" >
+      <el-col :span="12">
+        <el-collapse   class="section">
+          <el-collapse-item title="2019双11All in cloud低至一折" name="1">
+            <div><a href="https://www.aliyun.com/1111/2019/home?userCode=alts44ap" target="_blank">点击查看详情</a></div>
+          </el-collapse-item>
+          <el-collapse-item title="主机爆款限时优惠" name="2">
+            <div><a href="https://www.aliyun.com/acts/hotsale?userCode=alts44ap" target="_blank">点击查看详情</a> </div>
+          </el-collapse-item>
+          <el-collapse-item title="企业级云服务器五折优惠" name="3">
+            <div><a href="https://promotion.aliyun.com/ntms/act/enterprise-discount.html?userCode=alts44ap" target="_blank">点击查看详情</a> </div>
+          </el-collapse-item>
+          <el-collapse-item title="全民云计算云主机低至4折" name="4">
+            <div><a href="https://promotion.aliyun.com/ntms/act/qwbk.html?userCode=alts44ap" target="_blank">点击查看详情</a> </div>
+          </el-collapse-item>
+          <el-collapse-item title="商标注册服务低至8折" name="5">
+            <div><a href="https://tm.aliyun.com/?userCode=alts44ap" target="_blank">点击查看详情</a> </div>
+          </el-collapse-item>
+          <el-collapse-item title="云短信产品低至8折" name="6">
+            <div><a href="https://www.aliyun.com/acts/alicomcloud/new-discount?userCode=alts44ap" target="_blank">点击查看详情</a> </div>
+          </el-collapse-item>
+
+
+
+        </el-collapse>
+      </el-col>
+      <el-col :span="12">
+        <v-chart :options="barData" class="chart section"/>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="20" >
+      <el-col :span="12">
+        <el-table :data="tableData" class="section">
+          <el-table-column
+            prop="date"
+            :label="$t('dashboard.date')"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            :label="$t('dashboard.name')"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            :label="$t('dashboard.addr')">
+          </el-table-column>
+        </el-table>
+
+      </el-col>
+
+      <el-col :span="12">
+        <v-chart :options="pieData" class="chart section"/>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -15,25 +128,25 @@
     }
   }
 
-.dashboard {
+  .dashboard {
 
-  &-container {
-    padding: 15px;
-    background-color: #f0f2f5;
+    &-container {
+      padding: 15px;
+      background-color: #f0f2f5;
+    }
+    &-text {
+      font-size: 14px;
+      line-height: 22px;
+      padding-bottom:15px;
+    }
+  }
+  .echarts{
+    width: 100%;
+    height: 100%;
   }
-  &-text {
-    font-size: 14px;
-    line-height: 22px;
-    padding-bottom:15px;
+  .box-card{
+    height:108px;
   }
-}
-.echarts{
-  width: 100%;
-  height: 100%;
-}
-.box-card{
-  height:108px;
-}
   .chart{
     height: 350px;
   }