diff --git a/ToDayEatWhatServer/.idea/jarRepositories.xml b/ToDayEatWhatServer/.idea/jarRepositories.xml
index 712ab9d985c20018a0c97b93d2148ac1ffe588a5..22e83c6b398d40fa937107583781f65c9e1262b6 100644
--- a/ToDayEatWhatServer/.idea/jarRepositories.xml
+++ b/ToDayEatWhatServer/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
diff --git a/ToDayEatWhatServer/.idea/misc.xml b/ToDayEatWhatServer/.idea/misc.xml
index 132404bc29da2535f7f7dde84180d85abc60d5a4..79a352f1e92a127a65b42ab6185343abcbe656e0 100644
--- a/ToDayEatWhatServer/.idea/misc.xml
+++ b/ToDayEatWhatServer/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/ToDayEatWhatServer/pom.xml b/ToDayEatWhatServer/pom.xml
index a7674626b04e8708227ba01119c071f5f7f79967..2e831eb13d32d99e24092ed082ac9edc7cc29ad1 100644
--- a/ToDayEatWhatServer/pom.xml
+++ b/ToDayEatWhatServer/pom.xml
@@ -140,5 +140,15 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>
diff --git a/ToDayEatWhatServer/src/main/java/org/storm/controller/HotMenuController.java b/ToDayEatWhatServer/src/main/java/org/storm/controller/HotMenuController.java
new file mode 100644
index 0000000000000000000000000000000000000000..20be8476f2a9829f721813ff91eecc8ffd417e3e
--- /dev/null
+++ b/ToDayEatWhatServer/src/main/java/org/storm/controller/HotMenuController.java
@@ -0,0 +1,45 @@
+package org.storm.controller;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.storm.mapper.DishMapper;
+import org.storm.po.Dish;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+@Controller
+public class HotMenuController {
+
+    @RequestMapping("/hotMenu")
+    @ResponseBody
+    public List<Dish> HotDishes() throws IOException {
+        //构建 sqlSession 工厂类
+        InputStream is = Resources.getResourceAsStream("mybatis.xml");
+        SqlSessionFactory sessionFactory=new SqlSessionFactoryBuilder().build(is);
+        //构建 sqlSession
+        SqlSession sqlSession = sessionFactory.openSession();
+        DishMapper dishMapper = sqlSession.getMapper(DishMapper.class);
+        /*获取数据库中的所有菜品*/
+        List<Dish> dishes = dishMapper.selectAllDish();
+        List<Dish> result = new ArrayList<>();
+        /*对所有菜品按照Score从高到低进行排序*/
+        Collections.sort(dishes , Comparator.comparingLong(Dish::getScore).reversed());
+        /*选取排名前八的菜品返回*/
+        for (int i = 0 ; i < 8 ; i++){
+            result.add(dishes.get(i));
+        }
+        System.out.println(result);
+        return result;
+    }
+}
diff --git a/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.java b/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.java
index d7464a73181b01ca213bd01afa9f832276c3553b..618935ed2223305360c5793235c73b7746bf54bf 100644
--- a/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.java
+++ b/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.java
@@ -12,4 +12,5 @@ import java.util.List;
  */
 public interface DishMapper {
     List<Dish> selectDishByName(@Param("name")String  dishName);
+    List<Dish> selectAllDish();
 }
diff --git a/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.xml b/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.xml
index 83fdf0d46dc2d2fa956bc30015e4b68bbf5566dd..689e66ccd72dfe318e9a3616b4981e3e25d6bf4c 100644
--- a/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.xml
+++ b/ToDayEatWhatServer/src/main/java/org/storm/mapper/DishMapper.xml
@@ -10,4 +10,8 @@
         from dishes
         where dishName = #{name}
     </select>
+    <select id="selectAllDish" resultType="dish">
+        select *
+        from dishes
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ToDayEatWhatServer/src/main/java/org/storm/po/Dish.java b/ToDayEatWhatServer/src/main/java/org/storm/po/Dish.java
index 3b6568f8753119cdad26d363b36ca1d795d0a551..85a03e3dd1aa27dfdf6e260410352a019eafc1fb 100644
--- a/ToDayEatWhatServer/src/main/java/org/storm/po/Dish.java
+++ b/ToDayEatWhatServer/src/main/java/org/storm/po/Dish.java
@@ -13,9 +13,26 @@ public class Dish {
     private List<String> types;
     private Float price;
     private Long like;
+    private Long costNum;//销量
+    private Long views;//浏览量
     private List<String> comments;
     private String location;
-    public Dish(Long dishID,String dishName,Float price,Long like,String location)
+    private Long score;
+    public Dish() {
+    }
+
+    public Dish(Long dishID, String dishName, Float price, Long like, Long costNum, Long views, String location,Long score) {
+        this.dishID = dishID;
+        this.dishName = dishName;
+        this.price = price;
+        this.like = like;
+        this.costNum = costNum;
+        this.views = views;
+        this.location = location;
+        this.score = score;
+    }
+
+    public Dish(Long dishID, String dishName, Float price, Long like, String location)
     {
         this.dishID=dishID;
         this.dishName=dishName;
@@ -26,6 +43,14 @@ public class Dish {
     /*
     不设置实体类属性的get方法jackson就无法自动将对象返回类型变成json格式
      */
+    /*这是score的各项得分组成*/
+    public Long getScore() {
+        score = like/4 + views/4 +costNum/2;
+        return score;
+    }
+    public Float getPrice() { return price; }
+    public Long getCostNum() { return costNum; }
+    public Long getViews() { return views; }
     public String getDishName()
     {
         return dishName;
@@ -50,4 +75,59 @@ public class Dish {
     {
         return comments;
     }
+    public void setScore(Long score) {
+        this.score = score;
+    }
+
+    public void setDishID(Long dishID) {
+        this.dishID = dishID;
+    }
+
+    public void setDishName(String dishName) {
+        this.dishName = dishName;
+    }
+
+    public void setTypes(List<String> types) {
+        this.types = types;
+    }
+
+    public void setPrice(Float price) {
+        this.price = price;
+    }
+
+    public void setLike(Long like) {
+        this.like = like;
+    }
+
+    public void setCostNum(Long costNum) {
+        this.costNum = costNum;
+    }
+
+    public void setViews(Long views) {
+        this.views = views;
+    }
+
+    public void setComments(List<String> comments) {
+        this.comments = comments;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    @Override
+    public String toString() {
+        return "Dish{" +
+                "dishID=" + dishID +
+                ", dishName='" + dishName + '\'' +
+                ", types=" + types +
+                ", price=" + price +
+                ", like=" + like +
+                ", costNum=" + costNum +
+                ", views=" + views +
+                ", comments=" + comments +
+                ", location='" + location + '\'' +
+                ", score=" + score +
+                '}';
+    }
 }
diff --git a/ToDayEatWhatServer/src/main/resources/jdbc.properties b/ToDayEatWhatServer/src/main/resources/jdbc.properties
index 2b867e03a5d9e21e378076782c26e607a6523d54..e965ed98a4903cbf4afaa9aa1a534d66935bf708 100644
--- a/ToDayEatWhatServer/src/main/resources/jdbc.properties
+++ b/ToDayEatWhatServer/src/main/resources/jdbc.properties
@@ -1,4 +1,4 @@
 mysql.driver=com.mysql.cj.jdbc.Driver
-mysql.url=jdbc:mysql://121.196.196.53:3306/TodayEatWhat?characterEncoding=utf-8&useUnicode=true&serverTimezone=Asia/Shanghai
-mysql.username=rehemaiti
-mysql.password=rehemaiti
\ No newline at end of file
+mysql.url=jdbc:mysql://121.196.196.53:3306/WhatEatToday?characterEncoding=utf-8&useUnicode=true&serverTimezone=Asia/Shanghai
+mysql.username=WhatEatToday
+mysql.password=WhatEatToday
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT.war b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT.war
new file mode 100644
index 0000000000000000000000000000000000000000..ffe83944a353a6ab211286f539d4904690dbe086
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT.war differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/META-INF/MANIFEST.MF b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..62900daf9e411d6e76699ab055c70e42083ea0d2
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Created-By: IntelliJ IDEA
+Built-By: chenjun
+Build-Jdk: version 1.8.0_261
+
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/jdbc.properties b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/jdbc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e965ed98a4903cbf4afaa9aa1a534d66935bf708
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/jdbc.properties
@@ -0,0 +1,4 @@
+mysql.driver=com.mysql.cj.jdbc.Driver
+mysql.url=jdbc:mysql://121.196.196.53:3306/WhatEatToday?characterEncoding=utf-8&useUnicode=true&serverTimezone=Asia/Shanghai
+mysql.username=WhatEatToday
+mysql.password=WhatEatToday
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/log4j.properties b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/log4j.properties
new file mode 100644
index 0000000000000000000000000000000000000000..913391dbfa8f50a3b6662040fe4cd312205e2054
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/log4j.properties
@@ -0,0 +1,6 @@
+# Global logging configuration
+log4j.rootLogger=INFO, stdout
+# Console output...
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] - %m%n
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/mybatis.xml b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/mybatis.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66ee7bb3f95ff7313c97df900bec463b6926860c
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/mybatis.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<!--Mybatis全局配置文件-->
+<configuration>
+<!--    resource可以引入外部的配置定义文件做常量的定义-->
+    <properties resource="jdbc.properties">
+<!--        提前定义一个常量键值对，键为mysql.driver，值为com.mysql.jdbc.Driver-->
+<!--        后面要使用就用${mysql.driver}即可-->
+        <property name="mysql.driver" value="com.mysql.jdbc.Driver"/>
+    </properties>
+    <typeAliases>
+<!--        <typeAlias type="com.storm.entity.Admin" alias="admin"></typeAlias>-->
+<!--        包内自动取别名，遵循驼峰命名法，第一个字母小写，还有些有特定的别名-->
+        <package name="org.storm.po"/>
+    </typeAliases>
+<!--    数据库连接配置-->
+    <environments default="mysql">
+        <environment id="mysql">
+            <transactionManager type="JDBC"></transactionManager>
+            <dataSource type="POOLED">
+<!--                MySQL 5.x和8.x的驱动不同，一个是jdbc一个是cj-->
+                <property name="driver" value="${mysql.driver}"/>
+                <property name="url" value="${mysql.url}"/>
+                <property name="username" value="${mysql.username}"/>
+                <property name="password" value="${mysql.password}"/>
+            </dataSource>
+        </environment>
+    </environments>
+<!--指定了mybatis的映射文件所在的位置-->
+    <mappers>
+<!--        纯mapper.xml映射文件配置-->
+<!--        resource:精确注册方式，每个mapper.xml需要一个<mapper>配置-->
+<!--        <mapper resource="mapper/AdminMapper.xml"/>-->
+<!--        正则匹配方式-->
+<!--        <mapper resource="mapper/*.xml"/>-->
+<!--        映射接口配置方式-->
+        <package name="org.storm.mapper"/>
+    </mappers>
+</configuration>
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/HotMenuController.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/HotMenuController.class
new file mode 100644
index 0000000000000000000000000000000000000000..1d244f4402f8b5cd5ae13e3b31420cd6d1c82123
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/HotMenuController.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/LoginController.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/LoginController.class
new file mode 100644
index 0000000000000000000000000000000000000000..99815e90b8dae9a25d57e1ea7b12976db227ef39
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/LoginController.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/SearchController.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/SearchController.class
new file mode 100644
index 0000000000000000000000000000000000000000..f91d04cfb215dad54113d82c67120aaef54e2977
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/controller/SearchController.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.class
new file mode 100644
index 0000000000000000000000000000000000000000..d7849392e6c1a6da24f88f1fc6e4c4c79f3a8f13
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.xml b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..689e66ccd72dfe318e9a3616b4981e3e25d6bf4c
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/DishMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--Mybaits 映射文件-->
+<!--namespace：命名空间，也是唯一标识-->
+<mapper namespace="org.storm.mapper.DishMapper">
+    <!--    id标识了这个操作的代号，parameterType指明了需要传入的参数类型-->
+    <select id="selectDishByName" resultType="dish">
+        select *
+        from dishes
+        where dishName = #{name}
+    </select>
+    <select id="selectAllDish" resultType="dish">
+        select *
+        from dishes
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.class
new file mode 100644
index 0000000000000000000000000000000000000000..d38500c41fe016f9fefa72c67928e63cf2cc7111
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.xml b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21928bba7ece35f68de405e7ad060281433597fa
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/mapper/UserMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--Mybaits 映射文件-->
+<!--namespace：命名空间，也是唯一标识-->
+<mapper namespace="org.storm.mapper.UserMapper">
+    <!--    id标识了这个操作的代号，parameterType指明了需要传入的参数类型-->
+    <select id="userLogin" resultType="user">
+        select *
+        from users
+        where userID = #{userID} and password = #{password}
+    </select>
+    <insert id="userRegister">
+        insert into users (userID, password, userName
+        )
+        values (#{userID,jdbcType=BIGINT}, #{password,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}
+        )
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/Dish.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/Dish.class
new file mode 100644
index 0000000000000000000000000000000000000000..c38ca6204350dc60c3e75bc9df66bf6bee37c99e
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/Dish.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/User.class b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/User.class
new file mode 100644
index 0000000000000000000000000000000000000000..cb073e0c63b5979313430921fc2b9413d2ac083d
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/org/storm/po/User.class differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/springmvc.xml b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/springmvc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..545a94d369884b04d048301c0845fd09be645c64
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/classes/springmvc.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd
+         http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd"
+       default-autowire="byName">
+
+    <!--注解扫描-->
+    <context:component-scan base-package="org.storm.controller"/>
+    <!--注解驱动-->
+    <mvc:annotation-driven></mvc:annotation-driven>
+</beans>
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-annotations-2.9.10.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-annotations-2.9.10.jar
new file mode 100644
index 0000000000000000000000000000000000000000..de054c66b25e559d868336a9ca85c1ce663673b1
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-annotations-2.9.10.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-core-2.9.10.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-core-2.9.10.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1b5e87ccc0adde69fc1499539a29e87a0f416832
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-core-2.9.10.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-databind-2.9.10.6.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-databind-2.9.10.6.jar
new file mode 100644
index 0000000000000000000000000000000000000000..fa1b1d069312398012e0f85cae0303f94f1caf9c
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jackson-databind-2.9.10.6.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jboss-logging-3.4.1.Final.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jboss-logging-3.4.1.Final.jar
new file mode 100644
index 0000000000000000000000000000000000000000..42cd1e0a86e7bd42b47495e3c0936c599da8e39e
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/jboss-logging-3.4.1.Final.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-1.2.17.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-1.2.17.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1d425cf7d7e25f81be64d32c406ff66cfb6c4766
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-1.2.17.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-api-2.13.3.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-api-2.13.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f604e80e69299d76d7bcf9c545b84c1e0def181f
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-api-2.13.3.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-core-2.13.3.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-core-2.13.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..997e3438f5024a73b31605ff481062b1599abd85
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/log4j-core-2.13.3.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mybatis-3.5.9.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mybatis-3.5.9.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d5545d7188e3ef3b36be80d9e0bd96ad8c3437de
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mybatis-3.5.9.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mysql-connector-java-8.0.27.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mysql-connector-java-8.0.27.jar
new file mode 100644
index 0000000000000000000000000000000000000000..683ac268138ae43b8df6fd76f37eafed7236f05c
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/mysql-connector-java-8.0.27.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/protobuf-java-3.11.4.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/protobuf-java-3.11.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7224d23dfd2702ff1f4479ed9243124f9924acb4
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/protobuf-java-3.11.4.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/servlet-api-2.5.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/servlet-api-2.5.jar
new file mode 100644
index 0000000000000000000000000000000000000000..fb5249346847105c26d30da1048d8e2c364e7d6f
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/servlet-api-2.5.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-api-1.7.30.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-api-1.7.30.jar
new file mode 100644
index 0000000000000000000000000000000000000000..29ac26fb8cad7ef5934377a8c269c4e521520e5c
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-api-1.7.30.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-log4j12-1.7.30.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-log4j12-1.7.30.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c6bc8b2efe5f92db94964defab9a80818758d613
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/slf4j-log4j12-1.7.30.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-aop-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-aop-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0fc0780224f3c54fee2a6c8fe5b913843a927846
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-aop-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-beans-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-beans-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..681b3d4af9635fb96aeeba5791786a4b9b09e491
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-beans-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-context-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-context-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..650032e960263cde686a625b68512554a0c48d21
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-context-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-core-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-core-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8d4b6c77bca86adad6b8910a58089358bf10d779
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-core-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-expression-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-expression-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cfbd5b3f0c9d1541643d9e4b0489c80b8cda2e27
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-expression-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-jcl-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-jcl-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..173692c4af0fa9cdbd51739ef4578420abe1db36
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-jcl-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-web-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-web-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cd5dd708f01d57024cb1992aca378a10d4caa9e1
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-web-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-webmvc-5.3.14.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-webmvc-5.3.14.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1f4ca55526348f7d4217ad24072faecf70cbf94b
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/spring-webmvc-5.3.14.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/validation-api-2.0.0.CR3.jar b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/validation-api-2.0.0.CR3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9f25da5f4618b0c9f6bd4a1c26b7e1692b04e249
Binary files /dev/null and b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/lib/validation-api-2.0.0.CR3.jar differ
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/web.xml b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..affae2aa7b86b8e749ebd9fb4a7b00e6cf306ba0
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/WEB-INF/web.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+
+    <!--前端控制器-->
+    <servlet>
+        <servlet-name>springmvc</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:springmvc.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>springmvc</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+    <!--字符编码-->
+    <filter>
+        <filter-name>encoding</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>utf-8</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>encoding</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/index.jsp b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/index.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..c38169bb958579c635a5c09ee2f379cc5956c0c2
--- /dev/null
+++ b/ToDayEatWhatServer/target/ToDayEatWhatServer-1.0-SNAPSHOT/index.jsp
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
diff --git a/ToDayEatWhatServer/target/classes/jdbc.properties b/ToDayEatWhatServer/target/classes/jdbc.properties
index 2b867e03a5d9e21e378076782c26e607a6523d54..e9dd49ba5d0bbfd6d04f27d22c62e38f2d195900 100644
--- a/ToDayEatWhatServer/target/classes/jdbc.properties
+++ b/ToDayEatWhatServer/target/classes/jdbc.properties
@@ -1,4 +1,10 @@
 mysql.driver=com.mysql.cj.jdbc.Driver
+<<<<<<< Updated upstream
 mysql.url=jdbc:mysql://121.196.196.53:3306/TodayEatWhat?characterEncoding=utf-8&useUnicode=true&serverTimezone=Asia/Shanghai
 mysql.username=rehemaiti
-mysql.password=rehemaiti
\ No newline at end of file
+mysql.password=rehemaiti
+=======
+mysql.url=jdbc:mysql://121.196.196.53:3306/WhatEatToday?characterEncoding=utf-8&useUnicode=true&serverTimezone=Asia/Shanghai
+mysql.username=WhatEatToday
+mysql.password=WhatEatToday
+>>>>>>> Stashed changes
diff --git a/ToDayEatWhatServer/target/classes/org/storm/controller/HotMenuController.class b/ToDayEatWhatServer/target/classes/org/storm/controller/HotMenuController.class
new file mode 100644
index 0000000000000000000000000000000000000000..1d244f4402f8b5cd5ae13e3b31420cd6d1c82123
Binary files /dev/null and b/ToDayEatWhatServer/target/classes/org/storm/controller/HotMenuController.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/controller/LoginController.class b/ToDayEatWhatServer/target/classes/org/storm/controller/LoginController.class
index 8fabfe971df0c66e6dcba919c7e8e31d92ea377d..99815e90b8dae9a25d57e1ea7b12976db227ef39 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/controller/LoginController.class and b/ToDayEatWhatServer/target/classes/org/storm/controller/LoginController.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/controller/SearchController.class b/ToDayEatWhatServer/target/classes/org/storm/controller/SearchController.class
index 398320dac10c7debeea92ef788f74de6b244ad83..f91d04cfb215dad54113d82c67120aaef54e2977 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/controller/SearchController.class and b/ToDayEatWhatServer/target/classes/org/storm/controller/SearchController.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.class b/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.class
index c471b86b3081b37bc10dd4c8463f67e45f9aee34..d7849392e6c1a6da24f88f1fc6e4c4c79f3a8f13 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.class and b/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.xml b/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.xml
index 83fdf0d46dc2d2fa956bc30015e4b68bbf5566dd..689e66ccd72dfe318e9a3616b4981e3e25d6bf4c 100644
--- a/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.xml
+++ b/ToDayEatWhatServer/target/classes/org/storm/mapper/DishMapper.xml
@@ -10,4 +10,8 @@
         from dishes
         where dishName = #{name}
     </select>
+    <select id="selectAllDish" resultType="dish">
+        select *
+        from dishes
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ToDayEatWhatServer/target/classes/org/storm/mapper/UserMapper.class b/ToDayEatWhatServer/target/classes/org/storm/mapper/UserMapper.class
index 2ad8925b7b595f37761af7c19b464b4864e60d51..d38500c41fe016f9fefa72c67928e63cf2cc7111 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/mapper/UserMapper.class and b/ToDayEatWhatServer/target/classes/org/storm/mapper/UserMapper.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/po/Dish.class b/ToDayEatWhatServer/target/classes/org/storm/po/Dish.class
index b407bf0f70f9a1b9dfcf4c917671b69892563029..c38ca6204350dc60c3e75bc9df66bf6bee37c99e 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/po/Dish.class and b/ToDayEatWhatServer/target/classes/org/storm/po/Dish.class differ
diff --git a/ToDayEatWhatServer/target/classes/org/storm/po/User.class b/ToDayEatWhatServer/target/classes/org/storm/po/User.class
index d3c9b345e61d27e035c567d2aa07295ebc4bd2b9..cb073e0c63b5979313430921fc2b9413d2ac083d 100644
Binary files a/ToDayEatWhatServer/target/classes/org/storm/po/User.class and b/ToDayEatWhatServer/target/classes/org/storm/po/User.class differ
diff --git a/ToDayEatWhatServer/target/test-classes/org/storm/AppTest.class b/ToDayEatWhatServer/target/test-classes/org/storm/AppTest.class
index 8944172ce8cf2c3f3f956f9cf5c26971d0559bcc..b192a61bbe3dd003030ceb7f8a3f320ef55d8d8e 100644
Binary files a/ToDayEatWhatServer/target/test-classes/org/storm/AppTest.class and b/ToDayEatWhatServer/target/test-classes/org/storm/AppTest.class differ
diff --git a/TodayEatWhat/pages/helpMeChoose/eatwhat.js b/TodayEatWhat/pages/helpMeChoose/eatwhat.js
index 5447afe7e8959a25b791a34d9a632491a663ebae..52c3099b08cc2132175d83708f7a832fbf9f4c61 100644
--- a/TodayEatWhat/pages/helpMeChoose/eatwhat.js
+++ b/TodayEatWhat/pages/helpMeChoose/eatwhat.js
@@ -108,7 +108,7 @@ Page({
      * 生命周期函数--监听页面隐藏
      */
     onHide: function () {
-
+        
     },
 
     /**
diff --git a/TodayEatWhat/pages/popularMenu/popularMenu.js b/TodayEatWhat/pages/popularMenu/popularMenu.js
index ae93f6256d4d10e232240cf7e7b872882c2d2005..4b8edb2fc10ccd399203399b2a435a1d1360d432 100644
--- a/TodayEatWhat/pages/popularMenu/popularMenu.js
+++ b/TodayEatWhat/pages/popularMenu/popularMenu.js
@@ -7,6 +7,71 @@ Page({
     data: {
 
     },
+    top1:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top1/'+navi,
+        })
+    },
+    top2:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top2/'+navi,
+        })
+    },
+    top3:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top3/'+navi,
+        })
+    },
+    top4:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top4/'+navi,
+        })
+    },
+    top5:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top5/'+navi,
+        })
+    },
+    top6:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top6/'+navi,
+        })
+    },
+    top7:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top7/'+navi,
+        })
+    },
+    top8:function(e){
+        console.log(e.detail)
+        var navi=e.target.id
+        console.log(navi)
+        wx.navigateTo({
+          url: './top8/'+navi,
+        })
+    },
+
 
     /**
      * 生命周期函数--监听页面加载
diff --git a/TodayEatWhat/pages/popularMenu/popularMenu.wxml b/TodayEatWhat/pages/popularMenu/popularMenu.wxml
index b5e9e0af1b54bf4f629348384a34ef72c3f3d231..b028b506fc96f6063902a6889cb610ed1bcacab2 100644
--- a/TodayEatWhat/pages/popularMenu/popularMenu.wxml
+++ b/TodayEatWhat/pages/popularMenu/popularMenu.wxml
@@ -12,9 +12,11 @@
         </swiper-item>
     </swiper>
 </view>
-<view class="container">
-    <view class="dish" id="top1">top1</view>
-    <view class="dish" id="top2">top2</view>
-    <view class="dish" id="top3">top3</view>
-    <view class="dish" id="top4">top4</view>
-</view>
\ No newline at end of file
+<scroll-view scroll-y="true" class="scroll">
+    <view class="container">
+        <view catchtap="top1" class="dish" id="top1">top1</view>
+        <view catchtap="top2" class="dish" id="top2">top2</view>
+        <view catchtap="top3" class="dish" id="top3">top3</view>
+        <view catchtap="top4" class="dish" id="top4">top4</view>
+    </view>
+</scroll-view>
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/popularMenu.wxss b/TodayEatWhat/pages/popularMenu/popularMenu.wxss
index e18c8c0ae5255c98bc7c0c20211e769f9086ef66..b03a0772513d941e56fa3e38e52b0a257476f450 100644
--- a/TodayEatWhat/pages/popularMenu/popularMenu.wxss
+++ b/TodayEatWhat/pages/popularMenu/popularMenu.wxss
@@ -31,8 +31,8 @@ swiper{
     height: 65%;
 }
 .dish{
-    height: 49%;
-    width: 49%;
+    height: 99%;
+    width: 99%;
     background-color: khaki;
     border-radius:10%;
 }
diff --git a/TodayEatWhat/pages/popularMenu/top1.js b/TodayEatWhat/pages/popularMenu/top1.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ea9310fa67dd7040c0ba6017479557959715fbf
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top1.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top1.wxml b/TodayEatWhat/pages/popularMenu/top1.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..1177fb3c769d2bdb23340949b5c6deb9f624185c
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top1.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top1.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top1/top1.js b/TodayEatWhat/pages/popularMenu/top1/top1.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ea9310fa67dd7040c0ba6017479557959715fbf
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1/top1.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top1.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top1/top1.json b/TodayEatWhat/pages/popularMenu/top1/top1.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1/top1.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top1/top1.wxml b/TodayEatWhat/pages/popularMenu/top1/top1.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..1177fb3c769d2bdb23340949b5c6deb9f624185c
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1/top1.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top1.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top1.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top1/top1.wxss b/TodayEatWhat/pages/popularMenu/top1/top1.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..6e07a81ce1cae9ee7d0073f706edb71e4ffec4b0
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top1/top1.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top1.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top2.js b/TodayEatWhat/pages/popularMenu/top2.js
new file mode 100644
index 0000000000000000000000000000000000000000..2debf60cedb4be0ed48f561ce31643aed8605407
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top2.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top2.wxml b/TodayEatWhat/pages/popularMenu/top2.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..a034256c2241240fc133afba2046e58349fc7b16
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top2.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top2.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top2/top2.js b/TodayEatWhat/pages/popularMenu/top2/top2.js
new file mode 100644
index 0000000000000000000000000000000000000000..2debf60cedb4be0ed48f561ce31643aed8605407
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2/top2.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top2.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top2/top2.json b/TodayEatWhat/pages/popularMenu/top2/top2.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2/top2.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top2/top2.wxml b/TodayEatWhat/pages/popularMenu/top2/top2.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..a034256c2241240fc133afba2046e58349fc7b16
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2/top2.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top2.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top2.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top2/top2.wxss b/TodayEatWhat/pages/popularMenu/top2/top2.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..76a95915d59b66e4d1c6b1390d5d5a46d68a6ba3
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top2/top2.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top2.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top3/top3.js b/TodayEatWhat/pages/popularMenu/top3/top3.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f8f1654a820167cbece7a7d5001c3019fb0f5a5
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top3/top3.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top3/top3.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top3/top3.json b/TodayEatWhat/pages/popularMenu/top3/top3.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top3/top3.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top3/top3.wxml b/TodayEatWhat/pages/popularMenu/top3/top3.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..8e37e3948977b87d98d8068929e77b6403dc4bd4
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top3/top3.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top3/top3.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top3/top3.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top3/top3.wxss b/TodayEatWhat/pages/popularMenu/top3/top3.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..f6be404ea5bff18019e7412ef4ad39f3a8ee5dff
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top3/top3.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top3/top3.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top4/top4.js b/TodayEatWhat/pages/popularMenu/top4/top4.js
new file mode 100644
index 0000000000000000000000000000000000000000..fd11271ea5463a8f611754f3e3d86ae3f83ce4d5
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top4/top4.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top4/top4.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top4/top4.json b/TodayEatWhat/pages/popularMenu/top4/top4.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top4/top4.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top4/top4.wxml b/TodayEatWhat/pages/popularMenu/top4/top4.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..b8d1159eb8e41b7dd0f29738aa167affd651db51
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top4/top4.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top4/top4.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top4/top4.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top4/top4.wxss b/TodayEatWhat/pages/popularMenu/top4/top4.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..c3fc3d594b2e6f85fbaaeac78d71637aeccad393
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top4/top4.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top4/top4.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top5/top5.js b/TodayEatWhat/pages/popularMenu/top5/top5.js
new file mode 100644
index 0000000000000000000000000000000000000000..924a6d193767c3be0bd60e8feadf007ec24c63fe
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top5/top5.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top5/top5.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top5/top5.json b/TodayEatWhat/pages/popularMenu/top5/top5.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top5/top5.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top5/top5.wxml b/TodayEatWhat/pages/popularMenu/top5/top5.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..6c65cf386b9d3327a9d65c218f39dc150dae20c2
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top5/top5.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top5/top5.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top5/top5.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top5/top5.wxss b/TodayEatWhat/pages/popularMenu/top5/top5.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..edbb9b5674e5771b19667c6bbc99ec54f5cd5517
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top5/top5.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top5/top5.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top6/top6.js b/TodayEatWhat/pages/popularMenu/top6/top6.js
new file mode 100644
index 0000000000000000000000000000000000000000..62e8508685f38cbe0fe182b29d71ea98347a39b1
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top6/top6.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top6/top6.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top6/top6.json b/TodayEatWhat/pages/popularMenu/top6/top6.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top6/top6.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top6/top6.wxml b/TodayEatWhat/pages/popularMenu/top6/top6.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..ac38021c6b649c4ecf53a6248b3090a7b44a4d35
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top6/top6.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top6/top6.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top6/top6.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top6/top6.wxss b/TodayEatWhat/pages/popularMenu/top6/top6.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..94c67bd15236a30be28278a7b67f4276b28a4818
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top6/top6.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top6/top6.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top7/top7.js b/TodayEatWhat/pages/popularMenu/top7/top7.js
new file mode 100644
index 0000000000000000000000000000000000000000..219be74df5ce37849b88e56e76067302101331e7
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top7/top7.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top7/top7.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top7/top7.json b/TodayEatWhat/pages/popularMenu/top7/top7.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top7/top7.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top7/top7.wxml b/TodayEatWhat/pages/popularMenu/top7/top7.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..fe4aba7138792b5caa630d8e09f24b8fb8705d73
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top7/top7.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top7/top7.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top7/top7.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top7/top7.wxss b/TodayEatWhat/pages/popularMenu/top7/top7.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..25e3088bf38db4de5b888b6a73b52e7790512345
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top7/top7.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top7/top7.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top8/top8.js b/TodayEatWhat/pages/popularMenu/top8/top8.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d79dee0375ab868fa09be0fb6b9128ee4e1a498
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top8/top8.js
@@ -0,0 +1,66 @@
+// TodayEatWhat/pages/popularMenu/top8/top8.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top8/top8.json b/TodayEatWhat/pages/popularMenu/top8/top8.json
new file mode 100644
index 0000000000000000000000000000000000000000..8835af0699ccec004cbe685ef938cd2d63ea7037
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top8/top8.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/TodayEatWhat/pages/popularMenu/top8/top8.wxml b/TodayEatWhat/pages/popularMenu/top8/top8.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..253a37aab0f1c6627fa9ba65e90cc4521ba8ee71
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top8/top8.wxml
@@ -0,0 +1,2 @@
+<!--TodayEatWhat/pages/popularMenu/top8/top8.wxml-->
+<text>TodayEatWhat/pages/popularMenu/top8/top8.wxml</text>
diff --git a/TodayEatWhat/pages/popularMenu/top8/top8.wxss b/TodayEatWhat/pages/popularMenu/top8/top8.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..b76d7a17571eaaf2519fe0ca80799f13b95b0642
--- /dev/null
+++ b/TodayEatWhat/pages/popularMenu/top8/top8.wxss
@@ -0,0 +1 @@
+/* TodayEatWhat/pages/popularMenu/top8/top8.wxss */
\ No newline at end of file
diff --git a/TodayEatWhat/pages/search/search.js b/TodayEatWhat/pages/search/search.js
index 125c57158be068826163e22270aea7eb788b659e..e4138d88e75e6e8c784e1497bec69d3af3f1fd28 100644
--- a/TodayEatWhat/pages/search/search.js
+++ b/TodayEatWhat/pages/search/search.js
@@ -32,7 +32,7 @@ Page({
         var that = this
         //请求后台处理搜索
         wx.request({
-          url: 'http://10.62.112.246:8080/search',//服务器地址
+          url: 'http://localhost:8088/search',//服务器地址
           method: 'GET',//只是搜索的话用GET请求就行了
           header:{
               'content-type':'application/json'//默认值
diff --git a/TodayEatWhat/pages/search/search.wxml b/TodayEatWhat/pages/search/search.wxml
index 4c0ab974ae17f92ab2ca5c250dba64000e3989ca..1694fe0a7f7c1ba0a38fc041c5edeaa79cfc14c3 100644
--- a/TodayEatWhat/pages/search/search.wxml
+++ b/TodayEatWhat/pages/search/search.wxml
@@ -22,6 +22,8 @@
         <view>共检索到{{list.length}}个结果</view>
     </block>
     <view wx:for="{{list}}">
-        <text>菜品序号:{{item.dishID}}\n菜品名称:{{item.dishName}}\n菜品热度:{{item.like}}\n位置:{{item.location}}</text>
+        <text>菜品序号:{{item.dishID}}\n菜品名称:{{item.dishName}}\n菜品热度:{{item.like}}\n位置:{{item.location}}
+            \n图片：{{item.img}}
+        </text>
     </view>
 </view>
diff --git a/app.json b/app.json
index 123ff260fd13b71029414634fcd7bfb259715958..37ca5e47627c5f41a3b15885ecf633049cdf6b38 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,15 @@
         "TodayEatWhat/pages/mine/healthy/healthy",
         "TodayEatWhat/pages/mine/subscribe/subscribe",
         "TodayEatWhat/pages/partition/goodTaste/salty/salty",
-        "TodayEatWhat/pages/partition/goodTaste/light/light"
+        "TodayEatWhat/pages/partition/goodTaste/light/light",
+        "TodayEatWhat/pages/popularMenu/top1",
+        "TodayEatWhat/pages/popularMenu/top2",
+        "TodayEatWhat/pages/popularMenu/top3/top3",
+        "TodayEatWhat/pages/popularMenu/top4/top4",
+        "TodayEatWhat/pages/popularMenu/top5/top5",
+        "TodayEatWhat/pages/popularMenu/top6/top6",
+        "TodayEatWhat/pages/popularMenu/top7/top7",
+        "TodayEatWhat/pages/popularMenu/top8/top8"
     ],
     "window": {
         "backgroundTextStyle": "dark",
diff --git a/project.config.json b/project.config.json
index d9a8d22ae97e8278029718b13b520277a30492e0..4df04cf38bd28c65a96257a9c4c8a77787b8f78d 100644
--- a/project.config.json
+++ b/project.config.json
@@ -30,12 +30,16 @@
             "disablePlugins": [],
             "outputPath": ""
         },
+        "enableEngineNative": false,
         "useIsolateContext": true,
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [],
         "minifyWXSS": true,
-        "showES6CompileOption": false
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "minifyWXML": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.20.1",
diff --git "a/\351\241\271\347\233\256\346\226\207\346\241\243/\351\241\271\347\233\256\350\277\233\345\272\246\350\256\241\345\210\222-\344\273\212\345\244\251\345\220\203\344\273\200\344\271\210.xlsx" "b/\351\241\271\347\233\256\346\226\207\346\241\243/\351\241\271\347\233\256\350\277\233\345\272\246\350\256\241\345\210\222-\344\273\212\345\244\251\345\220\203\344\273\200\344\271\210.xlsx"
index 9b3fb50dab9e3c9854e135967b898716f297efd7..66446b91e6e280e17e744ace7ce46651492575d1 100644
Binary files "a/\351\241\271\347\233\256\346\226\207\346\241\243/\351\241\271\347\233\256\350\277\233\345\272\246\350\256\241\345\210\222-\344\273\212\345\244\251\345\220\203\344\273\200\344\271\210.xlsx" and "b/\351\241\271\347\233\256\346\226\207\346\241\243/\351\241\271\347\233\256\350\277\233\345\272\246\350\256\241\345\210\222-\344\273\212\345\244\251\345\220\203\344\273\200\344\271\210.xlsx" differ