代码调整

biz/banner.go

@@ -82,12 +82,11 @@ func (s *BannerAPIService) DeleteBanner(ctx context.Context, req *pb.DeleteBanne
 }
 
 func (s *BannerAPIService) GetBanner(ctx context.Context, req *pb.GetBannerRequest) (*pb.Banner, error) {
-	fields := []string{"id", "title", "path", "url"}
-	if _, errPermission := s.checkPermission(ctx); errPermission == nil {
-		fields = []string{}
+	if _, errPermission := s.checkPermission(ctx); errPermission != nil {
+		return nil, errPermission
 	}
 
-	banner, err := s.dbModel.GetBanner(req.Id, fields...)
+	banner, err := s.dbModel.GetBanner(req.Id)
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}

biz/friendlink.go

@@ -89,19 +89,21 @@ func (s *FriendlinkAPIService) DeleteFriendlink(ctx context.Context, req *pb.Del
 
 // GetFriendlink 查询友情链接
 func (s *FriendlinkAPIService) GetFriendlink(ctx context.Context, req *pb.GetFriendlinkRequest) (*pb.Friendlink, error) {
-	var fields []string
 	_, err := s.checkPermission(ctx)
 	if err != nil {
-		fields = s.dbModel.GetFriendlinkPublicFields() // 非管理员可查询的字段
+		return nil, err
 	}
 
-	friendlink, err := s.dbModel.GetFriendlink(req.Id, fields...)
+	friendlink, err := s.dbModel.GetFriendlink(req.Id)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, err.Error())
 	}
 
 	pbFriendlink := &pb.Friendlink{}
 	util.CopyStruct(friendlink, pbFriendlink)
+
+	s.logger.Debug("GetFriendlink", zap.Any("pbFriendlink", pbFriendlink), zap.Any("friendlink", friendlink))
+
 	return pbFriendlink, nil
 }
 

model/friendlink.go

@@ -13,7 +13,7 @@ type Friendlink struct {
 	Link        string     `form:"link" json:"link,omitempty" gorm:"column:link;type:varchar(255);size:255;comment:链接地址;"`
 	Description string     `form:"description" json:"description,omitempty" gorm:"column:description;type:text;comment:描述，备注;"`
 	Sort        int        `form:"sort" json:"sort,omitempty" gorm:"column:sort;type:int(11);size:11;default:0;comment:排序，值越大越靠前;"`
-	Enable      int8       `form:"enable" json:"enable,omitempty" gorm:"column:enable;type:tinyint(4);size:4;default:0;"`
+	Enable      bool       `form:"enable" json:"enable,omitempty" gorm:"column:enable;type:tinyint(4);size:4;default:0;"`
 	CreatedAt   *time.Time `form:"created_at" json:"created_at,omitempty" gorm:"column:created_at;type:datetime;comment:创建时间;"`
 	UpdatedAt   *time.Time `form:"updated_at" json:"updated_at,omitempty" gorm:"column:updated_at;type:datetime;comment:更新时间;"`
 }

web/components/FormFriendlink.vue

@@ -49,12 +49,12 @@
         <el-col :span="12">
           <el-form-item label="是否启用">
             <el-switch
-              v-model="friendlink.status"
+              v-model="friendlink.enable"
               style="display: block"
-              active-color="#ff4949"
-              inactive-color="#13ce66"
-              active-text="否"
-              inactive-text="是"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="是"
+              inactive-text="否"
             >
             </el-switch> </el-form-item
         ></el-col>

web/pages/admin/attachment.vue

@@ -48,7 +48,11 @@
 </template>
 
 <script>
-import { listAttachment, deleteAttachment } from '~/api/attachment'
+import {
+  listAttachment,
+  deleteAttachment,
+  getAttachment,
+} from '~/api/attachment'
 import TableList from '~/components/TableList.vue'
 import FormSearch from '~/components/FormSearch.vue'
 import FormAttachment from '~/components/FormAttachment.vue'
@@ -103,10 +107,14 @@ export default {
       this.search = { ...this.search, page: 1, ...search }
       this.listAttachment()
     },
-    editRow(row) {
-      console.log('editRow', row)
-      this.formVisible = true
-      this.attachment = row
+    async editRow(row) {
+      const res = await getAttachment({ id: row.id })
+      if (res.status === 200) {
+        this.attachment = res.data
+        this.formVisible = true
+      } else {
+        this.$message.error(res.data.message)
+      }
     },
     formSuccess() {
       this.formVisible = false

web/pages/admin/banner.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { listBanner, deleteBanner } from '~/api/banner'
+import { listBanner, deleteBanner, getBanner } from '~/api/banner'
 import TableList from '~/components/TableList.vue'
 import FormSearch from '~/components/FormSearch.vue'
 import FormBanner from '~/components/FormBanner.vue'
@@ -119,10 +119,14 @@ export default {
         this.$refs.formBanner.reset()
       })
     },
-    editRow(row) {
-      this.formVisible = true
-      console.log('editRow', row)
-      this.banner = row
+    async editRow(row) {
+      const res = await getBanner({ id: row.id })
+      if (res.status === 200) {
+        this.banner = res.data
+        this.formVisible = true
+      } else {
+        this.$message.error(res.data.message)
+      }
     },
     formSuccess() {
       this.formVisible = false

web/pages/admin/document/category.vue

@@ -117,13 +117,7 @@ export default {
         this.$refs.friendlinkForm.reset()
       })
     },
-    editRow(row) {
-      this.formFriendlinkVisible = true
-      this.$nextTick(() => {
-        this.$refs.friendlinkForm.clearValidate()
-        this.friendlink = row
-      })
-    },
+    editRow(row) {},
     formFriendlinkSuccess() {
       this.formFriendlinkVisible = false
       this.listFriendlink()

web/pages/admin/friendlink.vue

@@ -56,7 +56,11 @@
 </template>
 
 <script>
-import { listFriendlink, deleteFriendlink } from '~/api/friendlink'
+import {
+  listFriendlink,
+  deleteFriendlink,
+  getFriendlink,
+} from '~/api/friendlink'
 import TableList from '~/components/TableList.vue'
 import FormSearch from '~/components/FormSearch.vue'
 import FormFriendlink from '~/components/FormFriendlink.vue'
@@ -117,12 +121,14 @@ export default {
         this.$refs.friendlinkForm.reset()
       })
     },
-    editRow(row) {
-      this.formFriendlinkVisible = true
-      this.$nextTick(() => {
-        this.$refs.friendlinkForm.clearValidate()
-        this.friendlink = row
-      })
+    async editRow(row) {
+      const res = await getFriendlink({ id: row.id })
+      if (res.status === 200) {
+        this.friendlink = res.data
+        this.formFriendlinkVisible = true
+      } else {
+        this.$message.error(res.data.message)
+      }
     },
     formFriendlinkSuccess() {
       this.formFriendlinkVisible = false
@@ -199,14 +205,10 @@ export default {
       this.tableListFields = [
         { prop: 'id', label: 'ID', width: 80, type: 'number', fixed: 'left' },
         {
-          prop: 'status',
+          prop: 'enable',
           label: '状态',
           width: 80,
-          type: 'enum',
-          enum: {
-            1: { label: '禁用', type: 'danger' },
-            0: { label: '启用', type: 'success' },
-          },
+          type: 'bool',
           fixed: 'left',
         },
         { prop: 'title', label: '名称', minWidth: 150, fixed: 'left' },