首页美化框架已完成

4 years ago · 7b8c88a16b
parent 0df11545dc
commit 7b8c88a16b
190 changed files with 7953 additions and 7892 deletions
--- a/src/ChangShaTour/ChangShaTour.pro
+++ b/src/ChangShaTour/ChangShaTour.pro
--- a/src/ChangShaTour/ChangShaTour.pro.user
+++ b/src/ChangShaTour/ChangShaTour.pro.user
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2021-07-07T08:43:09. -->
+<!-- Written by QtCreator 4.11.1, 2021-01-06T09:35:14. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{4109ff11-a646-43d1-9619-aeb32783df6e}</value>
+  <value type="QByteArray">{0c4c8ccc-c524-4850-ba23-7e124d5915df}</value>
 </data>
 <data>
  <variable>ProjectExplorer.Project.ActiveTarget</variable>
@ -71,7 +71,7 @@
   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -119,7 +119,7 @@
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -167,7 +167,7 @@
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -287,8 +287,8 @@
    </valuelist>
    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/13648/Desktop/Trip-in-Chang-sha-042a8abb0ff29b210015c9bef1bad274bdb5d3d5/ChangShaTour/ChangShaTour.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:F:/QtDemo/ChangShaTour/ChangShaTour.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/13648/Desktop/Trip-in-Chang-sha-042a8abb0ff29b210015c9bef1bad274bdb5d3d5/ChangShaTour/ChangShaTour.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">F:/QtDemo/ChangShaTour/ChangShaTour.pro</value>
    <value type="QString" key="RunConfiguration.Arguments"></value>
    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
@ -299,257 +299,14 @@
    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">F:/QtDemo/build-ChangShaTour-Desktop_Qt_5_14_2_MSVC2017_64bit-Release</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
  </valuemap>
 </data>
 <data>
  <variable>ProjectExplorer.Project.Target.1</variable>
  <valuemap type="QVariantMap">
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Debug</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Release</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
   </valuemap>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/ChangShaTour/Trip-in-Chang-sha/build-ChangShaTour-Desktop_Qt_5_14_2_MinGW_64_bit-Profile</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
     <value type="QString">cpu-cycles</value>
    </valuelist>
    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
    <value type="int" key="Analyzer.Perf.Frequency">250</value>
    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
     <value type="QString">-e</value>
     <value type="QString">cpu-cycles</value>
     <value type="QString">--call-graph</value>
     <value type="QString">dwarf,4096</value>
     <value type="QString">-F</value>
     <value type="QString">250</value>
    </valuelist>
    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
     <value type="int">0</value>
     <value type="int">1</value>
     <value type="int">2</value>
     <value type="int">3</value>
     <value type="int">4</value>
     <value type="int">5</value>
     <value type="int">6</value>
     <value type="int">7</value>
     <value type="int">8</value>
     <value type="int">9</value>
     <value type="int">10</value>
     <value type="int">11</value>
     <value type="int">12</value>
     <value type="int">13</value>
     <value type="int">14</value>
    </valuelist>
    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
    <value type="QString" key="RunConfiguration.Arguments"></value>
    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
  </valuemap>
 </data>
 <data>
  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">2</value>
+  <value type="int">1</value>
 </data>
 <data>
  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
--- a/src/ChangShaTour/ChangShaTour.pro.user.4109ff1
+++ b/src/ChangShaTour/ChangShaTour.pro.user.4109ff1
--- a/src/ChangShaTour/ChangShaTour.pro.user.61ba832
+++ b/src/ChangShaTour/ChangShaTour.pro.user.61ba832
--- a/src/ChangShaTour/ChangShaTour.pro.user.c9f9416
+++ b/src/ChangShaTour/ChangShaTour.pro.user.c9f9416
--- a/src/ChangShaTour/RouteItem.h
+++ b/src/ChangShaTour/RouteItem.h
--- a/src/ChangShaTour/addhistory.cpp
+++ b/src/ChangShaTour/addhistory.cpp
--- a/src/ChangShaTour/addhistory.h
+++ b/src/ChangShaTour/addhistory.h
--- a/src/ChangShaTour/cglobal.cpp
+++ b/src/ChangShaTour/cglobal.cpp
--- a/src/ChangShaTour/cglobal.h
+++ b/src/ChangShaTour/cglobal.h
--- a/src/ChangShaTour/conditionwidget.cpp
+++ b/src/ChangShaTour/conditionwidget.cpp
--- a/src/ChangShaTour/conditionwidget.h
+++ b/src/ChangShaTour/conditionwidget.h
--- a/src/ChangShaTour/conditionwidget.ui
+++ b/src/ChangShaTour/conditionwidget.ui
--- a/src/ChangShaTour/confirmwidget.cpp
+++ b/src/ChangShaTour/confirmwidget.cpp
--- a/src/ChangShaTour/confirmwidget.h
+++ b/src/ChangShaTour/confirmwidget.h
--- a/src/ChangShaTour/confirmwidget.ui
+++ b/src/ChangShaTour/confirmwidget.ui
--- a/src/ChangShaTour/customizewidget.cpp
+++ b/src/ChangShaTour/customizewidget.cpp
@ -8,7 +8,7 @@ CustomizeWidget::CustomizeWidget(QWidget *parent) :
    ui->setupUi(this);
    num = 1;
-    limit = 15;
+    limit = 12;
    startTimeList = (QDateTime *)malloc(sizeof(QDateTime) * limit);
    endTimeList = (QDateTime *)malloc(sizeof(QDateTime) * limit);
    for(int i = 0; i < limit; i++)
@ -54,8 +54,8 @@ CustomizeWidget::CustomizeWidget(QWidget *parent) :
        labelList[i] = new QLabel(QString::number(i+1));
        labelList[i]->setAlignment(Qt::AlignCenter);
        placeBtnList[i] = new QPushButton("");
-        startEditList[i] = new QDateTimeEdit();
+        startEditList[i] = new QDateTimeEdit(QDateTime::currentDateTime());
-        endEditList[i] = new QDateTimeEdit();
+        endEditList[i] = new QDateTimeEdit(QDateTime::currentDateTime());
        addBtnList[i] = new QPushButton("add");
        delBtnList[i] = new QPushButton("del");
@ -120,10 +120,18 @@ void CustomizeWidget::addAt(int index)
        for (int i = num - 1; i > index + 1; i--)
        {
            nameList[i] = nameList[i - 1];
            urlList[i] = urlList[i - 1];
            cateIdList[i] = urlList[i - 1];
            //后期还要加上修改两个时间List的语句
            placeBtnList[i]->setText(nameList[i]);
            //后期还要加上修改两个时间Edit的语句
        }
        nameList[index + 1] = "";
        urlList[index + 1] = "";
        cateIdList[index + 1] = "";
        //后期还要加上修改两个时间List的语句
        placeBtnList[index + 1]->setText(nameList[index + 1]);
        //后期还要加上修改两个时间Edit的语句
    }
 }
@ -139,10 +147,18 @@ void CustomizeWidget::delAt(int index)
        for (int i = index; i < num  ; i++)
        {
            nameList[i] = nameList[i + 1];
            urlList[i] = urlList[i + 1];
            cateIdList[i] = cateIdList[i + 1];
            //后期还要加上修改两个时间List的语句
            placeBtnList[i]->setText(nameList[i]);
            //后期还要加上修改两个时间Edit的语句
        }
        nameList[num] = "";
        urlList[num] = "";
        cateIdList[num] = "";
        //后期还要加上修改两个时间List的语句
        placeBtnList[num]->setText(nameList[index + 1]);
        //后期还要加上修改两个时间Edit的语句
    }
 }
@ -150,7 +166,16 @@ void CustomizeWidget::setBtn(int index)
 {
    PopWidget * w = new PopWidget();
    w->show();
-    connect(w->getConfirmBtn(), &QPushButton::clicked, this, [=](){w->close();});
+    connect(w->getConfirmBtn(), &QPushButton::clicked, this, [=](){getResult(index, w->getChosen()); w->close();});
    connect(w->getCancelBtn(), &QPushButton::clicked, this, [=](){w->close();});
    qDebug() << "Set Btn" << QString::number(index);
 }
 void CustomizeWidget::getResult(int index, QStringList chosen)
 {
    nameList[index] = chosen[0];
    urlList[index] = chosen[1];
    cateIdList[index] = chosen[2];
    placeBtnList[index]->setText(nameList[index]);
 }
--- a/src/ChangShaTour/customizewidget.h
+++ b/src/ChangShaTour/customizewidget.h
@ -35,6 +35,7 @@ public:
    void delAt(int index);
    void setBtn(int index);
    QString getBtn(int index);
    void getResult(int index, QStringList chosen);
 private:
    Ui::CustomizeWidget *ui;
--- a/src/ChangShaTour/customizewidget.ui
+++ b/src/ChangShaTour/customizewidget.ui
--- a/src/ChangShaTour/databaseconnector.cpp
+++ b/src/ChangShaTour/databaseconnector.cpp
--- a/src/ChangShaTour/databaseconnector.h
+++ b/src/ChangShaTour/databaseconnector.h
--- a/src/ChangShaTour/databaseconnector.ui
+++ b/src/ChangShaTour/databaseconnector.ui
--- a/src/ChangShaTour/favoritewidget.cpp
+++ b/src/ChangShaTour/favoritewidget.cpp
--- a/src/ChangShaTour/favoritewidget.h
+++ b/src/ChangShaTour/favoritewidget.h
--- a/src/ChangShaTour/favoritewidget.ui
+++ b/src/ChangShaTour/favoritewidget.ui
--- a/src/ChangShaTour/historywidget.cpp
+++ b/src/ChangShaTour/historywidget.cpp
--- a/src/ChangShaTour/historywidget.h
+++ b/src/ChangShaTour/historywidget.h
--- a/src/ChangShaTour/historywidget.ui
+++ b/src/ChangShaTour/historywidget.ui
--- a/src/ChangShaTour/homewidget.cpp
+++ b/src/ChangShaTour/homewidget.cpp
@ -7,46 +7,7 @@ HomeWidget::HomeWidget(QWidget *parent) :
 {
    ui->setupUi(this);
-    verLayout = new QVBoxLayout();
+    InitHomeWidget();
    horLayout = new QHBoxLayout();
    rcmdBtn = new QPushButton("猜你喜欢");
    listBtn = new QPushButton("热门榜单");
    sortBtn = new QPushButton("分类筛选");
    planBtn = new QPushButton("方案定制");
    //默认选择显示“猜你喜欢”界面
    pageIndex = 0;
    //rcmdBtn->setStyleSheet("QPushButton{background-color: rgb(20, 62, 134);color:rgb(255, 255, 255);}");
    //listBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
    //sortBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
    //planBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
    rcmdWidget = new RecommendWidget(this);
    listWidget = new ListWidget(this);
    sortWidget = new SortWidget(this);
    planWidget = new PlanWidget(this);
    rcmdWidget->setVisible(true);
    listWidget->setVisible(false);
    sortWidget->setVisible(false);
    planWidget->setVisible(false);
    setLayout(verLayout);
    verLayout->addLayout(horLayout);
    verLayout->addWidget(rcmdWidget);
    verLayout->addWidget(listWidget);
    verLayout->addWidget(sortWidget);
    verLayout->addWidget(planWidget);
    horLayout->addWidget(rcmdBtn);
    horLayout->addWidget(listBtn);
    horLayout->addWidget(sortBtn);
    horLayout->addWidget(planBtn);
    connect(rcmdBtn, &QPushButton::clicked, this, &HomeWidget::switchToRcmdWidget);
    connect(listBtn, &QPushButton::clicked, this, &HomeWidget::switchToListWidget);
    connect(sortBtn, &QPushButton::clicked, this, &HomeWidget::switchToSortWidget);
    connect(planBtn, &QPushButton::clicked, this, &HomeWidget::switchToPlanWidget);
 }
 void HomeWidget::switchToRcmdWidget()
@ -117,3 +78,116 @@ HomeWidget::~HomeWidget()
 {
    delete ui;
 }
 void HomeWidget::SetBackground(QString url)
 {
    background->setPixmap(url);
    background->setScaledContents(true);
 }
 void HomeWidget::InitHomeWidget()
 {
    background = new QLabel(this);
    SetBackground("./softImages/homeWidget/homeWidgetBrownHalf.png");
    QVBoxLayout * verLayout = new QVBoxLayout();
    setLayout(verLayout);
    verLayout->setMargin(0);
    verLayout->setSpacing(0);
    subWidget = new QWidget();
    InitSubWidget();
    subWidget->setFixedSize(1440, 140);
    verLayout->addWidget(subWidget);
    //默认选择显示“猜你喜欢”界面
    pageIndex = 0;
    rcmdWidget = new RecommendWidget(this);
    verLayout->addWidget(rcmdWidget);
    listWidget = new ListWidget(this);
    verLayout->addWidget(listWidget);
    sortWidget = new SortWidget(this);
    verLayout->addWidget(sortWidget);
    planWidget = new PlanWidget(this);
    verLayout->addWidget(planWidget);
    rcmdWidget->setVisible(true);
    listWidget->setVisible(false);
    sortWidget->setVisible(false);
    planWidget->setVisible(false);
 }
 void HomeWidget::InitSubWidget()
 {
    QHBoxLayout * horiLayout = new QHBoxLayout();
    subWidget->setLayout(horiLayout);
    rcmdBtn = new QPushButton();
    InitButton(rcmdBtn, "recommendBtn.jpg", "recommendBtnBlur.jpg");
    horiLayout->addWidget(rcmdBtn);
    listBtn = new QPushButton();
    InitButton(listBtn, "listBtn.jpg", "listBtnBlur.jpg");
    horiLayout->addWidget(listBtn);
    sortBtn = new QPushButton();
    InitButton(sortBtn, "sortBtn.jpg", "sortBtnBlur.jpg");
    horiLayout->addWidget(sortBtn);
    planBtn = new QPushButton();
    InitButton(planBtn, "planBtn.jpg", "planBtnBlur.jpg");
    horiLayout->addWidget(planBtn);
    connect(rcmdBtn, &QPushButton::clicked, this, &HomeWidget::switchToRcmdWidget);
    connect(listBtn, &QPushButton::clicked, this, &HomeWidget::switchToListWidget);
    connect(sortBtn, &QPushButton::clicked, this, &HomeWidget::switchToSortWidget);
    connect(planBtn, &QPushButton::clicked, this, &HomeWidget::switchToPlanWidget);
 }
 void HomeWidget::InitLabel(QLabel * label)
 {
    QFont lbl_font("Microsoft YaHei");
    lbl_font.setPointSize(20);
    lbl_font.setBold(true);
    label->setFont(lbl_font);
    label->setStyleSheet("color:#FFFFFF");
    label->setAlignment(Qt::AlignRight);
 }
 void HomeWidget::InitButton(QPushButton * button, QString url, QString blurUrl)
 {
    button->setStyleSheet("QPushButton {"
                          "border-image: url(./softImages/homeWidget/" + blurUrl + ");"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "} "
                          "QPushButton:hover {"
                          "border-image: url(./softImages/homeWidget/" + url + ");"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "} "
                          "QPushButton:pressed {"
                          "border-image: url(./softImages/homeWidget/" + url + ");"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "}");
    button->setFixedSize(260, 120);
 }
 void HomeWidget::resizeEvent(QResizeEvent *event)
 {
    background->resize(this->size());
 }
--- a/src/ChangShaTour/homewidget.h
+++ b/src/ChangShaTour/homewidget.h
@ -26,20 +26,30 @@ public:
    explicit HomeWidget(QWidget *parent = nullptr);
    ~HomeWidget();
    void SetBackground(QString);
    void InitHomeWidget();
    void InitSubWidget();
    void InitLabel(QLabel *);
    void InitButton(QPushButton *, QString, QString);
    void resizeEvent(QResizeEvent *event);
 private:
    Ui::HomeWidget *ui;
    QLabel * background;
    //表示现在homeWidget处在哪个界面
    int pageIndex;
    QVBoxLayout *verLayout;
    QHBoxLayout *horLayout;
    QPushButton *rcmdBtn;
    QPushButton *listBtn;
    QPushButton *sortBtn;
    QPushButton *planBtn;
    QWidget * subWidget;
    RecommendWidget *rcmdWidget;
    ListWidget *listWidget;
    SortWidget *sortWidget;
--- a/src/ChangShaTour/homewidget.ui
+++ b/src/ChangShaTour/homewidget.ui
--- a/src/ChangShaTour/imgdownloader.cpp
+++ b/src/ChangShaTour/imgdownloader.cpp
--- a/src/ChangShaTour/imgdownloader.h
+++ b/src/ChangShaTour/imgdownloader.h
--- a/src/ChangShaTour/journywidget.cpp
+++ b/src/ChangShaTour/journywidget.cpp
--- a/src/ChangShaTour/journywidget.h
+++ b/src/ChangShaTour/journywidget.h
--- a/src/ChangShaTour/journywidget.ui
+++ b/src/ChangShaTour/journywidget.ui
--- a/src/ChangShaTour/lightblue.css
+++ b/src/ChangShaTour/lightblue.css
--- a/src/ChangShaTour/listwidget.cpp
+++ b/src/ChangShaTour/listwidget.cpp
@ -60,8 +60,8 @@ ListWidget::ListWidget(QWidget *parent) :
    lineList_2[0] = line_2;
    lineList_3[0] = line_3;
    setHotList();
-    //setMinorityList();
+    setMinorityList();
-    //setFavorableList();
+    setFavorableList();
    //设置总体布局
    this->setLayout(mainLayout);
@ -78,8 +78,8 @@ ListWidget::ListWidget(QWidget *parent) :
    for (int i = 0; i < (listLen + 1); i++)
    {
        layout_1->addLayout(lineList_1[i]);
-        //layout_2->addLayout(lineList_2[i]);
+        layout_2->addLayout(lineList_2[i]);
-        //layout_3->addLayout(lineList_3[i]);
+        layout_3->addLayout(lineList_3[i]);
    }
    connect(web->getReturnBtn(), &QPushButton::clicked, this, &ListWidget::returnWeb);
@ -188,7 +188,7 @@ void ListWidget::setHotList()
 }
 void ListWidget::setMinorityList()
 {
-
+    /*
    QSqlQuery queryList(listDb);
    QSqlQuery queryMeituan(meituanDb);
    int index = 1;
@ -225,11 +225,48 @@ void ListWidget::setMinorityList()
        index++;
    }
    */
    QSqlQuery queryList(listDb);
    QSqlQuery queryMeituan(meituanDb);
    int index = 1;
    queryList.prepare("select * from minoritylist order by score desc");
    //queryList.bindValue(":limit", listLen);
    queryList.exec();
    while (queryList.next() == true && index < (listLen + 1))
    {
        QHBoxLayout *line = new QHBoxLayout();
        QLabel *rank = new QLabel(QString::number(index));
        rank->setAlignment(Qt::AlignCenter);
        QToolButton *btn = new QToolButton();
        int id = queryList.value("id").value<int>();
        QString name = queryList.value("title").value<QString>();
        QString img = queryList.value("frontimg").value<QString>();
        QString url = queryList.value("detail").value<QString>();
        QString cate = queryList.value("cateId").value<QString>();
        /*queryMeituan.prepare("select * from " + labelToDb[cate] + " where detail = :url");
 //            qDebug() << "类名：" << cate;
 //            qDebug() << "所属表名：" << labelToDb[cate];
        queryMeituan.bindValue(":url", url);
        QStringList list = queryMeituanDatabase(queryMeituan);//获得图片链接和店铺名和id*/
        imgDownloader *imgDownload = new imgDownloader();
        QString imgPath = "./images/minoritylist" + QString::number(id) + ".png";
        imgDownload->downloadFileFromUrl(img, imgPath);
        btn = setBtn(btn, imgPath, name);
        connect(btn, &QToolButton::clicked, this, [=](){web->loadPage(name, img, url, cate); subWidget->setVisible(false); web->setVisible(true);});
        line->addWidget(rank, 1);
        line->addWidget(btn, 10);
        lineList_2[index] = line;
        index++;
    }
 }
 void ListWidget::setFavorableList()
 {
-
+    /*
    QSqlQuery queryList(listDb);
    QSqlQuery queryMeituan(meituanDb);
    int index = 1;
@ -264,6 +301,43 @@ void ListWidget::setFavorableList()
        index++;
    }
    */
    QSqlQuery queryList(listDb);
    QSqlQuery queryMeituan(meituanDb);
    int index = 1;
    queryList.prepare("select * from favorablelist order by score desc");
    //queryList.bindValue(":limit", listLen);
    queryList.exec();
    while (queryList.next() == true && index < (listLen + 1))
    {
        QHBoxLayout *line = new QHBoxLayout();
        QLabel *rank = new QLabel(QString::number(index));
        rank->setAlignment(Qt::AlignCenter);
        QToolButton *btn = new QToolButton();
        int id = queryList.value("id").value<int>();
        QString name = queryList.value("title").value<QString>();
        QString img = queryList.value("frontimg").value<QString>();
        QString url = queryList.value("detail").value<QString>();
        QString cate = queryList.value("cateId").value<QString>();
        /*queryMeituan.prepare("select * from " + labelToDb[cate] + " where detail = :url");
 //            qDebug() << "类名：" << cate;
 //            qDebug() << "所属表名：" << labelToDb[cate];
        queryMeituan.bindValue(":url", url);
        QStringList list = queryMeituanDatabase(queryMeituan);//获得图片链接和店铺名和id*/
        imgDownloader *imgDownload = new imgDownloader();
        QString imgPath = "./images/favorablelist" + QString::number(id) + ".png";
        imgDownload->downloadFileFromUrl(img, imgPath);
        btn = setBtn(btn, imgPath, name);
        connect(btn, &QToolButton::clicked, this, [=](){web->loadPage(name, img, url, cate); subWidget->setVisible(false); web->setVisible(true);});
        line->addWidget(rank, 1);
        line->addWidget(btn, 10);
        lineList_3[index] = line;
        index++;
    }
 }
--- a/src/ChangShaTour/listwidget.h
+++ b/src/ChangShaTour/listwidget.h
--- a/src/ChangShaTour/listwidget.ui
+++ b/src/ChangShaTour/listwidget.ui
--- a/src/ChangShaTour/loginmanager.cpp
+++ b/src/ChangShaTour/loginmanager.cpp
--- a/src/ChangShaTour/loginmanager.h
+++ b/src/ChangShaTour/loginmanager.h
--- a/src/ChangShaTour/loginwidget.cpp
+++ b/src/ChangShaTour/loginwidget.cpp
--- a/src/ChangShaTour/loginwidget.h
+++ b/src/ChangShaTour/loginwidget.h
--- a/src/ChangShaTour/loginwidget.ui
+++ b/src/ChangShaTour/loginwidget.ui
--- a/src/ChangShaTour/main.cpp
+++ b/src/ChangShaTour/main.cpp
--- a/src/ChangShaTour/mainwidget.cpp
+++ b/src/ChangShaTour/mainwidget.cpp
@ -7,47 +7,7 @@ MainWidget::MainWidget(QWidget *parent) :
 {
    ui->setupUi(this);
-    verLayout = new QVBoxLayout();
+    InitMainWidget();
    horLayout = new QHBoxLayout();
    homeBtn = new QPushButton("首页");
    userBtn = new QPushButton("个人主页");
    searchBar = new QLineEdit();
    searchBtn = new QPushButton("搜索");
    //首页按钮默认选中
    index = 0;
    //homeBtn->setStyleSheet("QPushButton{background-color: rgb(20, 62, 134);color:rgb(255, 255, 255);}");
    //userBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
    homeWidget = new HomeWidget(this);
    userWidget = new UserWidget(this);
    searchWidget = new SearchWidget(this);
 //    home2user = new QPropertyAnimation(homeWidget, "geometry");
 //    user2home = new QPropertyAnimation(userWidget, "geometry");
    this->setLayout(verLayout);
    verLayout->addLayout(horLayout);
    verLayout->addWidget(homeWidget);
    verLayout->addWidget(userWidget);
    verLayout->addWidget(searchWidget);
    horLayout->addWidget(homeBtn);
    horLayout->addWidget(userBtn);
    horLayout->addWidget(searchBar);
    horLayout->addWidget(searchBtn);
 //    homeWidget->setGeometry(11, 45, 1418, 727);
 //    userWidget->setGeometry(1440, 45, 1418, 727);
 //    searchWidget->setGeometry();
    userWidget->setVisible(false);
    searchWidget->setVisible(false);
    connect(homeBtn, &QPushButton::clicked, this, &MainWidget::switchToHome);
    connect(userBtn, &QPushButton::clicked, this, &MainWidget::switchToUser);
    connect(searchBtn, &QPushButton::clicked, this, &MainWidget::actSearch);
    connect(searchWidget->getReturnBtn(), &QPushButton::clicked, this, &MainWidget::returnSearch);
 }
 void MainWidget::switchToHome()
@ -56,9 +16,9 @@ void MainWidget::switchToHome()
    {
        //homeBtn->setStyleSheet("QPushButton{background-color: rgb(20, 62, 134);color:rgb(255, 255, 255);}");
        //userBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
-//        homeWidget->setVisible(true);
+        homeWidget->setVisible(true);
-//        userWidget->setVisible(false);
+        userWidget->setVisible(false);
-        user2homeAnimation();
+        //user2homeAnimation();
        homeWidget->setVisible(true);
        userWidget->setVisible(false);
        searchWidget->setVisible(false);
@ -75,11 +35,9 @@ void MainWidget::switchToUser()
    {
        //homeBtn->setStyleSheet("QPushButton{color:rgb(255, 255, 255);}""QPushButton:hover{background-color: rgb(20, 62, 134);border:none;color:rgb(255, 255, 255);}");
        //userBtn->setStyleSheet("QPushButton{background-color: rgb(20, 62, 134);color:rgb(255, 255, 255);}");
-//        homeWidget->setVisible(false);
+        //home2userAnimation();
-//        userWidget->setVisible(true);
+        homeWidget->setVisible(false);
-        home2userAnimation();
+        userWidget->setVisible(true);
 //        homeWidget->setVisible(false);
 //        userWidget->setVisible(true);
        searchWidget->setVisible(false);
        searchBar->clear();
        index = 1;
@ -181,3 +139,138 @@ MainWidget::~MainWidget()
 {
    delete ui;
 }
 void MainWidget::SetBackground(QString url)
 {
    background->setPixmap(url);
    background->setScaledContents(true);
 }
 void MainWidget::InitMainWidget()
 {
    background = new QLabel(this);
    SetBackground("./softImages/MainImage.jpg");
    QVBoxLayout * verLayout = new QVBoxLayout();
    setLayout(verLayout);
    verLayout->setMargin(0);
    verLayout->setSpacing(0);
    firstSubWidget = new QWidget();
    InitFirstSubWidget();
    verLayout->addWidget(firstSubWidget);
    homeWidget = new HomeWidget();
    verLayout->addWidget(homeWidget);
    userWidget = new UserWidget();
    verLayout->addWidget(userWidget);
    searchWidget = new SearchWidget();
    verLayout->addWidget(searchWidget);
    //首页按钮默认选中
    index = 0;
    userWidget->setVisible(false);
    searchWidget->setVisible(false);
    connect(searchWidget->getReturnBtn(), &QPushButton::clicked, this, &MainWidget::returnSearch);
 }
 void MainWidget::InitFirstSubWidget()
 {
    QHBoxLayout * horiLayout = new QHBoxLayout();
    firstSubWidget->setLayout(horiLayout);
    homeBtn = new QPushButton("首页");
    InitButton(homeBtn);
    horiLayout->addWidget(homeBtn);
    userBtn = new QPushButton("个人主页");
    InitButton(userBtn);
    horiLayout->addWidget(userBtn);
    searchBar = new QLineEdit();
    InitLineEdit(searchBar);
    horiLayout->addWidget(searchBar);
    searchBtn = new QPushButton("搜索");
    InitButton(searchBtn);
    horiLayout->addWidget(searchBtn);
    connect(homeBtn, &QPushButton::clicked, this, &MainWidget::switchToHome);
    connect(userBtn, &QPushButton::clicked, this, &MainWidget::switchToUser);
    connect(searchBtn, &QPushButton::clicked, this, &MainWidget::actSearch);
 }
 void MainWidget::InitLabel(QLabel * label)
 {
    QFont lbl_font("Microsoft YaHei");
    lbl_font.setPointSize(20);
    lbl_font.setBold(true);
    label->setFont(lbl_font);
    label->setStyleSheet("color:#FFFFFF");
    label->setAlignment(Qt::AlignRight);
 }
 void MainWidget::InitButton(QPushButton * button)
 {
    button->setStyleSheet("QPushButton {"
                          "color:#ffffff;"
                          "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #E1B37C, stop: 1 #E1B37C);"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "font:bold 32px;"
                          "font-family: Microsoft YaHei;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "} "
                          "QPushButton:hover {"
                          "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #D2AD90, stop: 1 #D2AD90);"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "font:bold 32px;"
                          "font-family: Microsoft YaHei;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "} "
                          "QPushButton:pressed {"
                          "background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #D2AD90, stop: 1 #D2AD90);"
                          "border-style:outset;"
                          "border-radius:10px;"
                          "font:bold 32px;"
                          "font-family: Microsoft YaHei;"
                          "min-width:100px;"
                          "min-height:20px;"
                          "padding:4px;"
                          "}");
    button->setFixedSize(195, 65);
 }
 void MainWidget::InitLineEdit(QLineEdit * lineEdit)
 {
    lineEdit->setStyleSheet("QLineEdit {"
                            " border-style:outset; "
                            //" border-width:4px; "
                            " border-radius: 4px; "
                            //" border-color: #C1D7F1; "
                            " color:#ffffff; "
                            " background-color: rgb(88, 128, 77, 0.4);"
                            "} "
                            " QLineEdit:focus { "
                            " border-style:outset; "
                            //" border-width:4px; "
                            " border-radius: 4px; "
                            //" border-color: #C1D7F1; "
                            " color:#ffffff; "
                            " background-color: rgb(88, 128, 77, 0.6);"
                            "} ");
    lineEdit->setFont(QFont("Microsoft YaHei" , 24, QFont::Bold));
    lineEdit->setFixedSize(640, 60);
 }
 void MainWidget::resizeEvent(QResizeEvent *event)
 {
    background->resize(this->size());
 }
--- a/src/ChangShaTour/mainwidget.h
+++ b/src/ChangShaTour/mainwidget.h
@ -30,22 +30,33 @@ public:
    explicit MainWidget(QWidget *parent = nullptr);
    ~MainWidget();
    void SetBackground(QString);
    void InitMainWidget();
    void InitFirstSubWidget();
    void InitLabel(QLabel *);
    void InitButton(QPushButton *);
    void InitLineEdit(QLineEdit *);
    void resizeEvent(QResizeEvent *event);
    void home2userAnimation();
    void user2homeAnimation();
 private:
    Ui::MainWidget *ui;
-    int index;
+    QLabel * background;
-    QVBoxLayout *verLayout;
+    int index;
    QHBoxLayout *horLayout;
    QPushButton *homeBtn;
    QPushButton *userBtn;
    QLineEdit *searchBar;
    QPushButton *searchBtn;
    QWidget * firstSubWidget;
    HomeWidget *homeWidget;
    UserWidget *userWidget;
    SearchWidget *searchWidget;
--- a/src/ChangShaTour/mainwidget.ui
+++ b/src/ChangShaTour/mainwidget.ui
--- a/src/ChangShaTour/mainwindow.cpp
+++ b/src/ChangShaTour/mainwindow.cpp
--- a/src/ChangShaTour/mainwindow.h
+++ b/src/ChangShaTour/mainwindow.h
--- a/src/ChangShaTour/mainwindow.ui
+++ b/src/ChangShaTour/mainwindow.ui
--- a/src/ChangShaTour/planwidget.cpp
+++ b/src/ChangShaTour/planwidget.cpp
--- a/src/ChangShaTour/planwidget.h
+++ b/src/ChangShaTour/planwidget.h
--- a/src/ChangShaTour/planwidget.ui
+++ b/src/ChangShaTour/planwidget.ui
--- a/src/ChangShaTour/popwidget.cpp
+++ b/src/ChangShaTour/popwidget.cpp
@ -18,6 +18,7 @@ PopWidget::PopWidget(QWidget *parent) :
    currentPage = 1;
    offset = 0;
    btnList = (QToolButton **)malloc(sizeof(QToolButton *) * showLimit);
    idList = (int *)malloc(sizeof(int) * showLimit);
    mainLayout = new QVBoxLayout();
@ -116,9 +117,17 @@ void PopWidget::queryDatabase()
    int i = 0;
    while(query.next()==true)
    {
-        QVariant detail = query.value("url");
+        QVariant favPlaceId = query.value("favPlaceId");
-
+        QVariant title = query.value("title");
        QVariant detail = query.value("detail");
        QVariant frontimg = query.value("frontimg");
        QVariant cateId = query.value("cateId");
        idList[i] = (int)favPlaceId.value<qlonglong>();
        nameList.append(title.value<QString>());
        urlList.append(detail.value<QString>());
        imgList.append(frontimg.value<QString>());
        cateList.append(cateId.value<QString>());
        i++;
    }
    currentNum = i;
@ -145,10 +154,10 @@ void PopWidget::setBtns()
    {
        int index = i;
        //下载图片到本地
-//        QString imgPath = "D:/Study/SE/project/images/" + cateList[currentCate] + QString::number(idList[index]) + ".png";
+        QString imgPath = "./images/fav" + QString::number(Id) + "_" + QString::number(idList[index]) + ".png";
-//        imgDownloader *download = new imgDownloader();
+        imgDownloader *download = new imgDownloader();
-//        download->downloadFileFromUrl(imgList[index], imgPath);
+        download->downloadFileFromUrl(imgList[index], imgPath);
-        btnList[index] = setBtn(btnList[index], urlList[index], "D:/Study/SE/project/images/transparent.png");
+        btnList[index] = setBtn(btnList[index], nameList[index], imgPath);
        disconnect(btnList[index], 0, 0, 0);
        connect(btnList[index], &QToolButton::clicked, this, [=](){setChosen(index);});
    }
@ -158,11 +167,11 @@ void PopWidget::setChosen(int index)
 {
    if (urlList[index] != chosen[1])
    {
-//        chosen[0] = nameList[index];
+        chosen[0] = nameList[index];
        chosen[1] = urlList[index];
-//        chosen[2] = imgList[index];
+        chosen[2] = cateList[index];
        qDebug() << "popWidget chosen:" + chosen[0] + chosen[1] + chosen[2];
-        chosenLabel->setText("您选择了" + chosen[1]);
+        chosenLabel->setText("您选择了" + chosen[0]);
    }
    else
    {
@ -180,6 +189,7 @@ void PopWidget::setScreen()
    urlList.clear();
    imgList.clear();
    nameList.clear();
    cateList.clear();
    for (int i = 0; i < showLimit; i++)
        btnList[i] = new QToolButton();
@ -241,3 +251,8 @@ void PopWidget::rollTop()
    QScrollBar *scrollBar = scroll->verticalScrollBar();
    scrollBar->setValue(scrollBar->minimum());
 }
 QStringList PopWidget::getChosen()
 {
    return chosen;
 }
--- a/src/ChangShaTour/popwidget.h
+++ b/src/ChangShaTour/popwidget.h
@ -14,6 +14,7 @@
 #include <QIcon>
 #include <QScrollBar>
 #include "cglobal.h"
 #include "imgdownloader.h"
 #if _MSC_VER >= 1600
 #pragma execution_character_set("utf-8")
@ -42,12 +43,13 @@ public:
    QToolButton * setBtn(QToolButton *btn, QString text, QString img);
    void setChosen(int index);
    void rollTop();
    QStringList getChosen();
 private:
    Ui::PopWidget *ui;
    bool inSearch;
-    QStringList chosen;//被选中的场所在当,有三个值name,url,img
+    QStringList chosen;//被选中的场所在当,有三个值name,url,cateId
    int totalNum;//收藏夹总共有多少条
    int showLimit;//一页中最多显示条数
    int pageNum;//总页数
@ -58,6 +60,8 @@ private:
    QStringList urlList;
    QStringList imgList;
    QToolButton **btnList;
    int *idList;
    QStringList cateList;
    QVBoxLayout *mainLayout;
--- a/src/ChangShaTour/popwidget.ui
+++ b/src/ChangShaTour/popwidget.ui
--- a/src/ChangShaTour/preferencewidget.cpp
+++ b/src/ChangShaTour/preferencewidget.cpp
--- a/src/ChangShaTour/preferencewidget.h
+++ b/src/ChangShaTour/preferencewidget.h
--- a/src/ChangShaTour/preferencewidget.ui
+++ b/src/ChangShaTour/preferencewidget.ui
--- a/src/ChangShaTour/qss/lightblue/add_bottom.png
+++ b/src/ChangShaTour/qss/lightblue/add_bottom.png
--- a/src/ChangShaTour/qss/lightblue/add_left.png
+++ b/src/ChangShaTour/qss/lightblue/add_left.png
--- a/src/ChangShaTour/qss/lightblue/add_right.png
+++ b/src/ChangShaTour/qss/lightblue/add_right.png
--- a/src/ChangShaTour/qss/lightblue/add_top.png
+++ b/src/ChangShaTour/qss/lightblue/add_top.png
--- a/src/ChangShaTour/qss/lightblue/branch_close.png
+++ b/src/ChangShaTour/qss/lightblue/branch_close.png
--- a/src/ChangShaTour/qss/lightblue/branch_open.png
+++ b/src/ChangShaTour/qss/lightblue/branch_open.png
--- a/src/ChangShaTour/qss/lightblue/calendar_nextmonth.png
+++ b/src/ChangShaTour/qss/lightblue/calendar_nextmonth.png
--- a/src/ChangShaTour/qss/lightblue/calendar_prevmonth.png
+++ b/src/ChangShaTour/qss/lightblue/calendar_prevmonth.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_checked.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_checked.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_checked_disable.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_checked_disable.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_parcial.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_parcial.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_parcial_disable.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_parcial_disable.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_unchecked.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_unchecked.png
--- a/src/ChangShaTour/qss/lightblue/checkbox_unchecked_disable.png
+++ b/src/ChangShaTour/qss/lightblue/checkbox_unchecked_disable.png
--- a/src/ChangShaTour/qss/lightblue/radiobutton_checked.png
+++ b/src/ChangShaTour/qss/lightblue/radiobutton_checked.png
--- a/src/ChangShaTour/qss/lightblue/radiobutton_checked_disable.png
+++ b/src/ChangShaTour/qss/lightblue/radiobutton_checked_disable.png
--- a/src/ChangShaTour/qss/lightblue/radiobutton_unchecked.png
+++ b/src/ChangShaTour/qss/lightblue/radiobutton_unchecked.png
--- a/src/ChangShaTour/qss/lightblue/radiobutton_unchecked_disable.png
+++ b/src/ChangShaTour/qss/lightblue/radiobutton_unchecked_disable.png
--- a/src/ChangShaTour/recommendwidget.cpp
+++ b/src/ChangShaTour/recommendwidget.cpp
@ -58,7 +58,7 @@ RecommendWidget::RecommendWidget(QWidget *parent) :
        subVerLayout->addLayout(lineList[i]);
    }
-    funcLine->addWidget(refreshBtn);
+    //funcLine->addWidget(refreshBtn);
    for (int i = 0; i < row; i++)
    {
        for (int j = 0; j <column; j++)
--- a/src/ChangShaTour/recommendwidget.h
+++ b/src/ChangShaTour/recommendwidget.h
--- a/src/ChangShaTour/recommendwidget.ui
+++ b/src/ChangShaTour/recommendwidget.ui
--- a/src/ChangShaTour/registermanager.cpp
+++ b/src/ChangShaTour/registermanager.cpp
--- a/src/ChangShaTour/registermanager.h
+++ b/src/ChangShaTour/registermanager.h
--- a/src/ChangShaTour/registerwidget.cpp
+++ b/src/ChangShaTour/registerwidget.cpp
@ -10,7 +10,6 @@ RegisterWidget::RegisterWidget(QWidget *parent) :
    background = new QLabel(this);
    subWidget = new QWidget(this);
    qDebug() << QDir::currentPath();
    InitRegisterWidget();
 }
--- a/src/ChangShaTour/registerwidget.h
+++ b/src/ChangShaTour/registerwidget.h
--- a/src/ChangShaTour/registerwidget.ui
+++ b/src/ChangShaTour/registerwidget.ui
--- a/src/ChangShaTour/resource.qrc
+++ b/src/ChangShaTour/resource.qrc
--- a/src/ChangShaTour/route.cpp
+++ b/src/ChangShaTour/route.cpp
--- a/src/ChangShaTour/route.h
+++ b/src/ChangShaTour/route.h
--- a/src/ChangShaTour/routechoicewidget.cpp
+++ b/src/ChangShaTour/routechoicewidget.cpp
--- a/src/ChangShaTour/routechoicewidget.h
+++ b/src/ChangShaTour/routechoicewidget.h
--- a/src/ChangShaTour/routechoicewidget.ui
+++ b/src/ChangShaTour/routechoicewidget.ui
--- a/src/ChangShaTour/searchwidget.cpp
+++ b/src/ChangShaTour/searchwidget.cpp
--- a/src/ChangShaTour/searchwidget.h
+++ b/src/ChangShaTour/searchwidget.h
--- a/src/ChangShaTour/searchwidget.ui
+++ b/src/ChangShaTour/searchwidget.ui
--- a/src/ChangShaTour/showplaceinfowidget.cpp
+++ b/src/ChangShaTour/showplaceinfowidget.cpp
--- a/src/ChangShaTour/showplaceinfowidget.h
+++ b/src/ChangShaTour/showplaceinfowidget.h
--- a/src/ChangShaTour/showplaceinfowidget.ui
+++ b/src/ChangShaTour/showplaceinfowidget.ui
--- a/src/ChangShaTour/showrouteinfowidget.cpp
+++ b/src/ChangShaTour/showrouteinfowidget.cpp
--- a/Show More
+++ b/Show More