Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev

server/service/sys_dictionary.go

@@ -85,16 +85,16 @@ func GetSysDictionaryInfoList(info request.SysDictionarySearch) (err error, list
 	var sysDictionarys []model.SysDictionary
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if info.Name != "" {
-		db = db.Where("name LIKE ?", "%"+info.Name+"%")
+		db = db.Where("`name` LIKE ?", "%"+info.Name+"%")
 	}
 	if info.Type != "" {
-		db = db.Where("type LIKE ?", "%"+info.Type+"%")
+		db = db.Where("`type` LIKE ?", "%"+info.Type+"%")
 	}
 	if info.Status != nil {
-		db = db.Where("status = ?", info.Status)
+		db = db.Where("`status` = ?", info.Status)
 	}
 	if info.Desc != "" {
-		db = db.Where("desc LIKE ?", "%"+info.Desc+"%")
+		db = db.Where("`desc` LIKE ?", "%"+info.Desc+"%")
 	}
 	err = db.Count(&total).Error
 	err = db.Limit(limit).Offset(offset).Find(&sysDictionarys).Error

web/src/view/layout/bottomInfo/bottomInfo.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="bottom-info">
+    <div>
+      <span>Powered by</span>
+      <span>
+      <a href="https://github.com/flipped-aurora/gin-vue-admin">gin-vue-admin</a>
+      </span>
+      <el-divider direction="vertical"></el-divider>
+      <span>Copyright</span>
+      <span>
+      <a href="https://github.com/flipped-aurora">flipped-aurora团队</a>
+      </span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name:"BottomInfo"
+}
+</script>
+<style lang="scss">
+.bottom-info {
+  color: #888;
+  height: 30px;
+  line-height: 12px;
+  a {
+    color: #888;
+  }
+  div {
+    display: flex;
+    justify-content: center;
+    span{
+      margin: 0 3px;
+    }
+  }
+}
+</style>

web/src/view/layout/index.vue

@@ -64,6 +64,7 @@
         <transition mode="out-in" name="el-fade-in-linear">
           <router-view class="admin-box" v-if="!$route.meta.keepAlive"></router-view>
         </transition>
+       <BottomInfo />
       </el-main>
     </el-container>
     <el-dialog :visible.sync="showPassword" @close="clearPassword" title="修改密码" width="360px">
@@ -91,6 +92,7 @@ import Aside from '@/view/layout/aside'
 import HistoryComponent from '@/view/layout/aside/historyComponent/history'
 import Screenfull from '@/view/layout/screenfull'
 import Search from '@/view/layout/search/search'
+import BottomInfo from '@/view/layout/bottomInfo/bottomInfo'
 import { mapGetters, mapActions } from 'vuex'
 import { changePassword } from '@/api/user'
 export default {
@@ -135,7 +137,8 @@ export default {
     Aside,
     HistoryComponent,
     Screenfull,
-    Search
+    Search,
+    BottomInfo
   },
   methods: {
     ...mapActions('user', ['LoginOut']),
@@ -241,6 +244,7 @@ $mainHight: 100vh;
   z-index: 999;
 }
 .admin-box {
+  min-height: calc(100vh - 240px);
   background-color: rgb(255, 255, 255);
   margin-top: 100px;
 }
@@ -272,7 +276,7 @@ $mainHight: 100vh;
       // padding: 6px;
       // border-bottom: 1px solid #eee;
     }
-   
+
     &.el-main {
       overflow: auto;
       background: #fff;
@@ -366,6 +370,7 @@ $mainHight: 100vh;
   }
 }
 
+
 .screenfull {
   display: inline-block;
 }