部分修改，但是字典query部分还是有问题存在

create/back.vue.tmpl

@@ -2,15 +2,14 @@
   <div class="back-form-container">
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
-      {{ range .gen.tableColumns }}
-        {{ $value := smallHump .columnName }}
-        {{ if not (eq (ToLower $value) "id") }}
-            {{ $name := .columnComment }}
-            {{ if eq $name "" }}
-              {{ $name = $value }}
-            {{ end }}
-            {{ ElFrom $name $value .vueShowType .dictType }}
-        {{ end }}
+      {{ range .gen.tableColumns }}{{ $value := smallHump .columnName }}
+      {{ if not (eq (ToLower $value) "id") }}
+      {{ $name := .columnComment }}
+      {{ if eq $name "" }}
+      {{ $name = $value }}
+      {{ end }}
+      {{ ElFrom $name $value .vueShowType .dictType .queryType}}
+      {{ end }}
       {{ end }}
     </el-form>
     </div>
@@ -49,7 +48,7 @@
         {{ range .gen.tableColumns }}{{ $value := smallHump .columnName }}{{ $name := .columnComment }}{{ if eq $name "" }}{{ $name = $value }}{{ end }}{{ if eq .IsKey "1" }}{{ ElTableColumn $name $value .vueShowType .dictType }}{{ else }}{{ ElTableColumn $name $value .vueShowType .dictType }}{{ end }}{{ end }}
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/dao/Dao.go

@@ -80,17 +80,17 @@ func Get2ArticleList(query domain.ArticleQuery, pageNum, pageSize int) (vo.BaseL
     if query.Image != ""{
          session.Where("image = ?", query.Image)
     }
-     
-    if query.PublishTime != ""{
-         session.Where("publish_time = ?", query.PublishTime)
+    
+    if query.PublishTimeStart != "" || query.PublishTimeEnd != ""{
+        session.Where("publish_time between ? and ?", query.PublishTimeStart, query.PublishTimeEnd)
     }
-     
-    if query.EyeFill != 0{
-         session.Where("eye_fill = ?", query.EyeFill)
+    
+    if query.EyeFillStart != 0 || query.EyeFillEnd != 0{
+        session.Where("eye_fill between ? and ?", query.EyeFillStart, query.EyeFillEnd)
     }
-     
-    if query.LikeCount != 0{
-         session.Where("like_count = ?", query.LikeCount)
+    
+    if query.LikeCountStart != 0 || query.LikeCountEnd != 0{
+        session.Where("like_count between ? and ?", query.LikeCountStart, query.LikeCountEnd)
     }
      
     if query.CreateBy != ""{
@@ -108,9 +108,9 @@ func Get2ArticleList(query domain.ArticleQuery, pageNum, pageSize int) (vo.BaseL
     if query.UpdateTime != ""{
          session.Where("update_time = ?", query.UpdateTime)
     }
-     
+    
     if query.ArticleDesc != ""{
-         session.Where("article_desc = ?", query.ArticleDesc)
+        session.Where("article_desc like ?", "%"+query.ArticleDesc+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -209,9 +209,9 @@ func Get2ArticleTagList(query domain.ArticleTagQuery, pageNum, pageSize int) (vo
     if query.TagName != ""{
          session.Where("tag_name = ?", query.TagName)
     }
-     
+    
     if query.TagDesc != ""{
-         session.Where("tag_desc = ?", query.TagDesc)
+        session.Where("tag_desc like ?", "%"+query.TagDesc+"%")
     }
      
     if query.TagTextColor != ""{
@@ -318,13 +318,13 @@ func Get2ArticleTopicList(query domain.ArticleTopicQuery, pageNum, pageSize int)
     if query.Image != ""{
          session.Where("image = ?", query.Image)
     }
-     
+    
     if query.TopicName != ""{
-         session.Where("topic_name = ?", query.TopicName)
+        session.Where("topic_name like ?", "%"+query.TopicName+"%")
     }
-     
+    
     if query.TopicDesc != ""{
-         session.Where("topic_desc = ?", query.TopicDesc)
+        session.Where("topic_desc like ?", "%"+query.TopicDesc+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -536,9 +536,9 @@ func Get2BackMenuList(query domain.BackMenuQuery, pageNum, pageSize int) (vo.Bas
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.BackMenuName != ""{
-         session.Where("back_menu_name = ?", query.BackMenuName)
+        session.Where("back_menu_name like ?", "%"+query.BackMenuName+"%")
     }
      
     if query.BackMenuPater != 0{
@@ -552,13 +552,13 @@ func Get2BackMenuList(query domain.BackMenuQuery, pageNum, pageSize int) (vo.Bas
     if query.Icon != ""{
          session.Where("icon = ?", query.Icon)
     }
-     
+    
     if query.Remark != ""{
-         session.Where("remark = ?", query.Remark)
+        session.Where("remark like ?", "%"+query.Remark+"%")
     }
-     
+    
     if query.BackRouterPath != ""{
-         session.Where("back_router_path = ?", query.BackRouterPath)
+        session.Where("back_router_path like ?", "%"+query.BackRouterPath+"%")
     }
      
     if query.State != ""{
@@ -657,9 +657,9 @@ func Get2BackRoleList(query domain.BackRoleQuery, pageNum, pageSize int) (vo.Bas
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.RoleName != ""{
-         session.Where("role_name = ?", query.RoleName)
+        session.Where("role_name like ?", "%"+query.RoleName+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -956,25 +956,25 @@ func Get2GenTableList(query domain.GenTableQuery, pageNum, pageSize int) (vo.Bas
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.TableName != ""{
-         session.Where("table_name = ?", query.TableName)
+        session.Where("table_name like ?", "%"+query.TableName+"%")
     }
-     
+    
     if query.TableComment != ""{
-         session.Where("table_comment = ?", query.TableComment)
+        session.Where("table_comment like ?", "%"+query.TableComment+"%")
     }
-     
+    
     if query.Name != ""{
-         session.Where("name = ?", query.Name)
+        session.Where("name like ?", "%"+query.Name+"%")
     }
-     
+    
     if query.RouterName != ""{
-         session.Where("router_name = ?", query.RouterName)
+        session.Where("router_name like ?", "%"+query.RouterName+"%")
     }
-     
+    
     if query.Remark != ""{
-         session.Where("remark = ?", query.Remark)
+        session.Where("remark like ?", "%"+query.Remark+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -1077,21 +1077,21 @@ func Get2GenTableColumnList(query domain.GenTableColumnQuery, pageNum, pageSize
     if query.Sort != 0{
          session.Where("sort = ?", query.Sort)
     }
-     
+    
     if query.ColumnComment != ""{
-         session.Where("column_comment = ?", query.ColumnComment)
+        session.Where("column_comment like ?", "%"+query.ColumnComment+"%")
     }
-     
+    
     if query.ColumnType != ""{
-         session.Where("column_type = ?", query.ColumnType)
+        session.Where("column_type like ?", "%"+query.ColumnType+"%")
     }
-     
+    
     if query.GoType != ""{
-         session.Where("go_type = ?", query.GoType)
+        session.Where("go_type like ?", "%"+query.GoType+"%")
     }
-     
+    
     if query.GoField != ""{
-         session.Where("go_field = ?", query.GoField)
+        session.Where("go_field like ?", "%"+query.GoField+"%")
     }
      
     if query.IsKey != ""{
@@ -1113,13 +1113,13 @@ func Get2GenTableColumnList(query domain.GenTableColumnQuery, pageNum, pageSize
     if query.VueShowType != ""{
          session.Where("vue_show_type = ?", query.VueShowType)
     }
-     
+    
     if query.DictType != ""{
-         session.Where("dict_type = ?", query.DictType)
+        session.Where("dict_type like ?", "%"+query.DictType+"%")
     }
-     
+    
     if query.ColumnName != ""{
-         session.Where("column_name = ?", query.ColumnName)
+        session.Where("column_name like ?", "%"+query.ColumnName+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -1331,9 +1331,9 @@ func Get2GoodsCommodityAreaList(query domain.GoodsCommodityAreaQuery, pageNum, p
     if query.GoodsId != 0{
          session.Where("goods_id = ?", query.GoodsId)
     }
-     
+    
     if query.CommodityAreaName != ""{
-         session.Where("commodity_area_name = ?", query.CommodityAreaName)
+        session.Where("commodity_area_name like ?", "%"+query.CommodityAreaName+"%")
     }
      
     if query.DetailImage != ""{
@@ -1440,9 +1440,9 @@ func Get2GoodsCouponList(query domain.GoodsCouponQuery, pageNum, pageSize int) (
     if query.CouponName != ""{
         session.Where("coupon_name like ?", "%"+query.CouponName+"%")
     }
-     
+    
     if query.CouponDesc != ""{
-         session.Where("coupon_desc = ?", query.CouponDesc)
+        session.Where("coupon_desc like ?", "%"+query.CouponDesc+"%")
     }
      
     if query.CashBackPoint != 0{
@@ -1480,9 +1480,9 @@ func Get2GoodsCouponList(query domain.GoodsCouponQuery, pageNum, pageSize int) (
     if query.Validity != ""{
          session.Where("validity = ?", query.Validity)
     }
-     
-    if query.ValidityPeriod != ""{
-         session.Where("validity_period = ?", query.ValidityPeriod)
+    
+    if query.ValidityPeriodStart != "" || query.ValidityPeriodEnd != ""{
+        session.Where("validity_period between ? and ?", query.ValidityPeriodStart, query.ValidityPeriodEnd)
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -1686,9 +1686,9 @@ func Get2GoodsIntroductionList(query domain.GoodsIntroductionQuery, pageNum, pag
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.GoodsArticleName != ""{
-         session.Where("goods_article_name = ?", query.GoodsArticleName)
+        session.Where("goods_article_name like ?", "%"+query.GoodsArticleName+"%")
     }
      
     if query.GoodsArticle != ""{
@@ -1803,29 +1803,29 @@ func Get2GoodsOrderList(query domain.GoodsOrderQuery, pageNum, pageSize int) (vo
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.OrderName != ""{
-         session.Where("order_name = ?", query.OrderName)
+        session.Where("order_name like ?", "%"+query.OrderName+"%")
     }
      
     if query.SkuId != 0{
          session.Where("sku_id = ?", query.SkuId)
     }
-     
-    if query.Count != 0{
-         session.Where("count = ?", query.Count)
+    
+    if query.CountStart != 0 || query.CountEnd != 0{
+        session.Where("count between ? and ?", query.CountStart, query.CountEnd)
     }
-     
-    if query.Price != 0{
-         session.Where("price = ?", query.Price)
+    
+    if query.PriceStart != 0 || query.PriceEnd != 0{
+        session.Where("price between ? and ?", query.PriceStart, query.PriceEnd)
     }
-     
-    if query.TotalPrice != 0{
-         session.Where("total_price = ?", query.TotalPrice)
+    
+    if query.TotalPriceStart != 0 || query.TotalPriceEnd != 0{
+        session.Where("total_price between ? and ?", query.TotalPriceStart, query.TotalPriceEnd)
     }
-     
+    
     if query.ContactInformation != ""{
-         session.Where("contact_information = ?", query.ContactInformation)
+        session.Where("contact_information like ?", "%"+query.ContactInformation+"%")
     }
      
     if query.CouponUserId != 0{
@@ -1944,9 +1944,9 @@ func Get2GoodsSkuList(query domain.GoodsSkuQuery, pageNum, pageSize int) (vo.Bas
     if query.SkuImage != ""{
          session.Where("sku_image = ?", query.SkuImage)
     }
-     
+    
     if query.SkuName != ""{
-         session.Where("sku_name = ?", query.SkuName)
+        session.Where("sku_name like ?", "%"+query.SkuName+"%")
     }
      
     if query.Price != 0{
@@ -1972,9 +1972,9 @@ func Get2GoodsSkuList(query domain.GoodsSkuQuery, pageNum, pageSize int) (vo.Bas
     if query.CreateBy != ""{
          session.Where("create_by = ?", query.CreateBy)
     }
-     
-    if query.CreateTime != ""{
-         session.Where("create_time = ?", query.CreateTime)
+    
+    if query.CreateTimeStart != "" || query.CreateTimeEnd != ""{
+        session.Where("create_time between ? and ?", query.CreateTimeStart, query.CreateTimeEnd)
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -2069,9 +2069,9 @@ func Get2GoodsSkuCardList(query domain.GoodsSkuCardQuery, pageNum, pageSize int)
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.CardName != ""{
-         session.Where("card_name = ?", query.CardName)
+        session.Where("card_name like ?", "%"+query.CardName+"%")
     }
      
     if query.State != ""{
@@ -2085,17 +2085,17 @@ func Get2GoodsSkuCardList(query domain.GoodsSkuCardQuery, pageNum, pageSize int)
     if query.TotalCount != ""{
          session.Where("total_count = ?", query.TotalCount)
     }
-     
+    
     if query.CardKey != ""{
-         session.Where("card_key = ?", query.CardKey)
+        session.Where("card_key like ?", "%"+query.CardKey+"%")
     }
      
     if query.Use != ""{
          session.Where("use = ?", query.Use)
     }
-     
-    if query.UploadTime != ""{
-         session.Where("upload_time = ?", query.UploadTime)
+    
+    if query.UploadTimeStart != "" || query.UploadTimeEnd != ""{
+        session.Where("upload_time between ? and ?", query.UploadTimeStart, query.UploadTimeEnd)
     }
      
     if query.SkuId != 0{
@@ -2311,13 +2311,13 @@ func Get2GoodsTypeList(query domain.GoodsTypeQuery, pageNum, pageSize int) (vo.B
     if query.TypeImage != ""{
          session.Where("type_image = ?", query.TypeImage)
     }
-     
+    
     if query.TypeName != ""{
-         session.Where("type_name = ?", query.TypeName)
+        session.Where("type_name like ?", "%"+query.TypeName+"%")
     }
-     
-    if query.CreateTime != ""{
-         session.Where("create_time = ?", query.CreateTime)
+    
+    if query.CreateTimeStart != "" || query.CreateTimeEnd != ""{
+        session.Where("create_time between ? and ?", query.CreateTimeStart, query.CreateTimeEnd)
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -2412,9 +2412,9 @@ func Get2UserList(query domain.UserQuery, pageNum, pageSize int) (vo.BaseListVo,
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.Username != ""{
-         session.Where("username = ?", query.Username)
+        session.Where("username like ?", "%"+query.Username+"%")
     }
      
     if query.Password != ""{
@@ -2436,17 +2436,17 @@ func Get2UserList(query domain.UserQuery, pageNum, pageSize int) (vo.BaseListVo,
     if query.RoleId != 0{
          session.Where("role_id = ?", query.RoleId)
     }
-     
+    
     if query.Phone != ""{
-         session.Where("phone = ?", query.Phone)
+        session.Where("phone like ?", "%"+query.Phone+"%")
     }
-     
+    
     if query.Email != ""{
-         session.Where("email = ?", query.Email)
+        session.Where("email like ?", "%"+query.Email+"%")
     }
-     
+    
     if query.Name != ""{
-         session.Where("name = ?", query.Name)
+        session.Where("name like ?", "%"+query.Name+"%")
     }
      
     if query.Avatar != ""{
@@ -2557,17 +2557,17 @@ func Get2UserWalletList(query domain.UserWalletQuery, pageNum, pageSize int) (vo
     if query.UserId != 0{
          session.Where("user_id = ?", query.UserId)
     }
-     
-    if query.Balance != 0{
-         session.Where("balance = ?", query.Balance)
+    
+    if query.BalanceStart != 0 || query.BalanceEnd != 0{
+        session.Where("balance between ? and ?", query.BalanceStart, query.BalanceEnd)
     }
-     
-    if query.PromotionAmount != 0{
-         session.Where("promotion_amount = ?", query.PromotionAmount)
+    
+    if query.PromotionAmountStart != 0 || query.PromotionAmountEnd != 0{
+        session.Where("promotion_amount between ? and ?", query.PromotionAmountStart, query.PromotionAmountEnd)
     }
-     
-    if query.RechargeAmount != 0{
-         session.Where("recharge_amount = ?", query.RechargeAmount)
+    
+    if query.RechargeAmountStart != 0 || query.RechargeAmountEnd != 0{
+        session.Where("recharge_amount between ? and ?", query.RechargeAmountStart, query.RechargeAmountEnd)
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -2666,17 +2666,17 @@ func Get2DictDataList(query domain.DictDataQuery, pageNum, pageSize int) (vo.Bas
     if query.Sort != 0{
          session.Where("sort = ?", query.Sort)
     }
-     
+    
     if query.DictLabel != ""{
-         session.Where("dict_label = ?", query.DictLabel)
+        session.Where("dict_label like ?", "%"+query.DictLabel+"%")
     }
-     
+    
     if query.DictValue != ""{
-         session.Where("dict_value = ?", query.DictValue)
+        session.Where("dict_value like ?", "%"+query.DictValue+"%")
     }
-     
+    
     if query.DictType != ""{
-         session.Where("dict_type = ?", query.DictType)
+        session.Where("dict_type like ?", "%"+query.DictType+"%")
     }
      
     if query.Status != ""{
@@ -2690,9 +2690,9 @@ func Get2DictDataList(query domain.DictDataQuery, pageNum, pageSize int) (vo.Bas
     if query.IsDefault != ""{
          session.Where("is_default = ?", query.IsDefault)
     }
-     
+    
     if query.Remark != ""{
-         session.Where("remark = ?", query.Remark)
+        session.Where("remark like ?", "%"+query.Remark+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -2787,21 +2787,21 @@ func Get2DictTypeList(query domain.DictTypeQuery, pageNum, pageSize int) (vo.Bas
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.DictName != ""{
-         session.Where("dict_name = ?", query.DictName)
+        session.Where("dict_name like ?", "%"+query.DictName+"%")
     }
-     
+    
     if query.DictType != ""{
-         session.Where("dict_type = ?", query.DictType)
+        session.Where("dict_type like ?", "%"+query.DictType+"%")
     }
      
     if query.Status != ""{
          session.Where("status = ?", query.Status)
     }
-     
+    
     if query.Remark != ""{
-         session.Where("remark = ?", query.Remark)
+        session.Where("remark like ?", "%"+query.Remark+"%")
     }
 	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
@@ -2846,139 +2846,6 @@ func DeleteDictType(id int64) bool {
 	return i > 0
 }
 
-func GetManageUserById(id int64) (domain.ManageUser, error) {
-	var manageUser domain.ManageUser
-	_, err := configs.Engine.Table("manage_user").Where("id = ?", id).Get(&manageUser)
-	if err != nil {
-		return manageUser, err
-	}
-	return manageUser, nil
-}
-
-func GetManageUserListInId(ids []int64) ([]domain.ManageUser, error) {
-	rows, err := configs.Engine.Table("manage_user").In("id", ids).Rows(&domain.ManageUser{})
-	if err != nil {
-		return make([]domain.ManageUser, 0), err
-	}
-	defer rows.Close()
-	var list []domain.ManageUser
-	for rows.Next() {
-		var u domain.ManageUser
-		rows.Scan(&u)
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetManageUserList(manageUser domain.ManageUser, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.ManageUser
-	Count, err := configs.Engine.Table("manage_user").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &manageUser)
-	var vo vo.BaseListVo
-	if err != nil {
-		return vo, err
-	}
-	if err != nil {
-		return vo, err
-	}
-	vo.PageNum = pageNum
-	vo.PageSize = pageSize
-	vo.List = make([]any, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-func Get2ManageUserList(query domain.ManageUserQuery, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.ManageUser
-	session := configs.Engine.Table("manage_user").Limit(pageSize, (pageNum-1)*pageSize)
-     
-    if query.Id != 0{
-         session.Where("id = ?", query.Id)
-    }
-     
-    if query.Name != ""{
-         session.Where("name = ?", query.Name)
-    }
-     
-    if query.Username != ""{
-         session.Where("username = ?", query.Username)
-    }
-     
-    if query.Password != ""{
-         session.Where("password = ?", query.Password)
-    }
-     
-    if query.CreationTime != 0{
-         session.Where("creation_time = ?", query.CreationTime)
-    }
-     
-    if query.LoginTime != 0{
-         session.Where("login_time = ?", query.LoginTime)
-    }
-     
-    if query.Status != ""{
-         session.Where("status = ?", query.Status)
-    }
-     
-    if query.RoleId != 0{
-         session.Where("role_id = ?", query.RoleId)
-    }
-     
-    if query.Phone != ""{
-         session.Where("phone = ?", query.Phone)
-    }
-     
-    if query.Email != ""{
-         session.Where("email = ?", query.Email)
-    }
-     
-    if query.Avatar != ""{
-         session.Where("avatar = ?", query.Avatar)
-    }
-	Count, err := session.FindAndCount(&arr, &query)
-	var vo vo.BaseListVo
-	if err != nil {
-		return vo, err
-	}
-	if err != nil {
-		return vo, err
-	}
-	vo.PageNum = pageNum
-	vo.PageSize = pageSize
-	vo.List = make([]any, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-func SaveManageUser(manageUser *domain.ManageUser) (domain.ManageUser, error) {
-	_, err := configs.Engine.Table("manage_user").Insert(&manageUser)
-	if err != nil {
-		return *manageUser, err
-	}
-	return *manageUser, nil
-}
-
-func SetManageUser(manageUserMap map[string]interface{}, id int64) (domain.ManageUser, bool, error) {
-	var manageUser domain.ManageUser
-	_, err := configs.Engine.Table("manage_user").Where("id = ?", id).Update(manageUserMap)
-	if err != nil {
-		return manageUser, false, err
-	}
-	return manageUser, true, nil
-}
-
-func DeleteManageUser(id int64) bool {
-	var manageUser domain.ManageUser
-	i, err := configs.Engine.Table("manage_user").Where("id = ?", id).Delete(&manageUser)
-	if err != nil {
-		return false
-	}
-	return i > 0
-}
-
 func GetShopTopicById(id int64) (domain.ShopTopic, error) {
 	var shopTopic domain.ShopTopic
 	_, err := configs.Engine.Table("shop_topic").Where("id = ?", id).Get(&shopTopic)
@@ -3041,13 +2908,13 @@ func Get2ShopTopicList(query domain.ShopTopicQuery, pageNum, pageSize int) (vo.B
     if query.TopicPageImage != ""{
          session.Where("topic_page_image = ?", query.TopicPageImage)
     }
-     
+    
     if query.TopicName != ""{
-         session.Where("topic_name = ?", query.TopicName)
+        session.Where("topic_name like ?", "%"+query.TopicName+"%")
     }
-     
+    
     if query.TopicDesc != ""{
-         session.Where("topic_desc = ?", query.TopicDesc)
+        session.Where("topic_desc like ?", "%"+query.TopicDesc+"%")
     }
      
     if query.TypeIds != ""{
@@ -3146,9 +3013,9 @@ func Get2ShopAdviceCarouselList(query domain.ShopAdviceCarouselQuery, pageNum, p
     if query.Id != 0{
          session.Where("id = ?", query.Id)
     }
-     
+    
     if query.Name != ""{
-         session.Where("name = ?", query.Name)
+        session.Where("name like ?", "%"+query.Name+"%")
     }
      
     if query.ToId != 0{

output/domain/Domain.go

@@ -350,27 +350,9 @@ func (receiver DictType) String() string {
 	return fmt.Sprint("DictType{","Id:",receiver.Id,"DictName:",receiver.DictName,"DictType:",receiver.DictType,"Status:",receiver.Status,"Remark:",receiver.Remark,"}")
 }
 
-type ManageUser struct { 
-	Id int64 `xorm:"id" json:"id"` //注释:
-	Name string `xorm:"name" json:"name"` //注释:名称
-	Username string `xorm:"username" json:"username"` //注释:账号
-	Password string `xorm:"password" json:"password"` //注释:密码
-	CreationTime int64 `xorm:"creation_time" json:"creationTime"` //注释:账号创建时间
-	LoginTime int64 `xorm:"login_time" json:"loginTime"` //注释:登录时间
-	Status string `xorm:"status" json:"status"` //注释:账号状态
-	RoleId int64 `xorm:"role_id" json:"roleId"` //注释:角色id
-	Phone string `xorm:"phone" json:"phone"` //注释:手机
-	Email string `xorm:"email" json:"email"` //注释:邮箱
-	Avatar string `xorm:"avatar" json:"avatar"` //注释:头像
-}
-
-func (receiver ManageUser) String() string {
-	return fmt.Sprint("ManageUser{","Id:",receiver.Id,"Name:",receiver.Name,"Username:",receiver.Username,"Password:",receiver.Password,"CreationTime:",receiver.CreationTime,"LoginTime:",receiver.LoginTime,"Status:",receiver.Status,"RoleId:",receiver.RoleId,"Phone:",receiver.Phone,"Email:",receiver.Email,"Avatar:",receiver.Avatar,"}")
-}
-
 type ShopTopic struct { 
 	Id int64 `xorm:"id" json:"id"` //注释:
-	Sort string `xorm:"sort" json:"sort"` //注释:
+	Sort string `xorm:"sort" json:"sort"` //注释:排序
 	ParentId int64 `xorm:"parent_id" json:"parentId"` //注释:父级id
 	TopicPageImage string `xorm:"topic_page_image" json:"topicPageImage"` //注释:主题首页图片
 	TopicName string `xorm:"topic_name" json:"topicName"` //注释:主题名称

output/domain/Query.go

@@ -1,4 +1,4 @@
-package vo
+package domain
 
 
 type ArticleQuery struct {
@@ -10,9 +10,12 @@ type ArticleQuery struct {
 	ArticleTagIds string  `xorm:"article_tag_ids"  json:"articleTagIds"` // 文章标签
 	ArticleTopicId int64  `xorm:"article_topic_id"  json:"articleTopicId"` // 文章主题id
 	Image string  `xorm:"image"  json:"image"` // 图片
-	PublishTime string  `xorm:"publish_time"  json:"publishTime"` // 发表时间
-	EyeFill int64  `xorm:"eye_fill"  json:"eyeFill"` // 浏览量
-	LikeCount int64  `xorm:"like_count"  json:"likeCount"` // 点赞量
+	PublishTimeStart string  `xorm:"publish_time"  json:"publishTime"` // 发表时间
+	PublishTimeEnd string  `xorm:"publish_time"  json:publishTime"` // 发表时间
+	EyeFillStart int64  `xorm:"eye_fill"  json:"eyeFill"` // 浏览量
+	EyeFillEnd int64  `xorm:"eye_fill"  json:"eyeFill"` // 浏览量
+	LikeCountStart int64  `xorm:"like_count"  json:"likeCount"` // 点赞量
+	LikeCountEnd int64  `xorm:"like_count"  json:"likeCount"` // 点赞量
 	CreateBy string  `xorm:"create_by"  json:"createBy"` // 创建人
 	CreateTime string  `xorm:"create_time"  json:"createTime"` // 创建时间
 	UpdateBy string  `xorm:"update_by"  json:"updateBy"` // 更新人
@@ -143,7 +146,8 @@ type GoodsCouponQuery struct {
 	Count int64  `xorm:"count"  json:"count"` // 优惠券余量
 	ReceiveType string  `xorm:"receive_type"  json:"receiveType"` // 领取条件
 	Validity string  `xorm:"validity"  json:"validity"` // 有效性，领取开始计时(ClaimTiming)，固定时间(FixedTime)
-	ValidityPeriod string  `xorm:"validity_period"  json:"validityPeriod"` // 有效期
+	ValidityPeriodStart string  `xorm:"validity_period"  json:"validityPeriod"` // 有效期
+	ValidityPeriodEnd string  `xorm:"validity_period"  json:validityPeriod"` // 有效期
 }
 
 type GoodsCouponUserQuery struct {
@@ -171,9 +175,12 @@ type GoodsOrderQuery struct {
 	Id int64  `xorm:"id"  json:"id"` // id
 	OrderName string  `xorm:"order_name"  json:"orderName"` // 订单名
 	SkuId int64  `xorm:"sku_id"  json:"skuId"` // skuid
-	Count int64  `xorm:"count"  json:"count"` // 购买数量
-	Price float64  `xorm:"price"  json:"price"` // 单价
-	TotalPrice float64  `xorm:"total_price"  json:"totalPrice"` // 总价
+	CountStart int64  `xorm:"count"  json:"count"` // 购买数量
+	CountEnd int64  `xorm:"count"  json:"count"` // 购买数量
+	PriceStart float64  `xorm:"price"  json:"price"` // 单价
+	PriceEnd float64  `xorm:"price"  json:"price"` // 单价
+	TotalPriceStart float64  `xorm:"total_price"  json:"totalPrice"` // 总价
+	TotalPriceEnd float64  `xorm:"total_price"  json:"totalPrice"` // 总价
 	ContactInformation string  `xorm:"contact_information"  json:"contactInformation"` // 联系方式
 	CouponUserId int64  `xorm:"coupon_user_id"  json:"couponUserId"` // 使用的优惠券
 	State string  `xorm:"state"  json:"state"` // 支付状态，0待支付，1待发货，2已发货，3订单完成，4订单异常
@@ -193,7 +200,8 @@ type GoodsSkuQuery struct {
 	CommodityAreaId int64  `xorm:"commodity_area_id"  json:"commodityAreaId"` // 属地id
 	GoodsId int64  `xorm:"goods_id"  json:"goodsId"` // 商品id
 	CreateBy string  `xorm:"create_by"  json:"createBy"` // 创建人
-	CreateTime string  `xorm:"create_time"  json:"createTime"` // 创建时间
+	CreateTimeStart string  `xorm:"create_time"  json:"createTime"` // 创建时间
+	CreateTimeEnd string  `xorm:"create_time"  json:createTime"` // 创建时间
 }
 
 type GoodsSkuCardQuery struct {
@@ -205,7 +213,8 @@ type GoodsSkuCardQuery struct {
 	TotalCount string  `xorm:"total_count"  json:"totalCount"` // 总数
 	CardKey string  `xorm:"card_key"  json:"cardKey"` // 卡密
 	Use string  `xorm:"use"  json:"use"` // 是否已用
-	UploadTime string  `xorm:"upload_time"  json:"uploadTime"` // 入库时间
+	UploadTimeStart string  `xorm:"upload_time"  json:"uploadTime"` // 入库时间
+	UploadTimeEnd string  `xorm:"upload_time"  json:uploadTime"` // 入库时间
 	SkuId int64  `xorm:"sku_id"  json:"skuId"` // 商品规格绑定
 	Sort string  `xorm:"sort"  json:"sort"` // 排序，出售优先级
 }
@@ -224,7 +233,8 @@ type GoodsTypeQuery struct {
 	Sort int64  `xorm:"sort"  json:"sort"` // 排序
 	TypeImage string  `xorm:"type_image"  json:"typeImage"` // 类型图片
 	TypeName string  `xorm:"type_name"  json:"typeName"` // 商品类别名称
-	CreateTime string  `xorm:"create_time"  json:"createTime"` // 创建时间
+	CreateTimeStart string  `xorm:"create_time"  json:"createTime"` // 创建时间
+	CreateTimeEnd string  `xorm:"create_time"  json:createTime"` // 创建时间
 }
 
 type UserQuery struct {
@@ -248,9 +258,12 @@ type UserWalletQuery struct {
     
 	Id int64  `xorm:"id"  json:"id"` // id
 	UserId int64  `xorm:"user_id"  json:"userId"` // 用户id
-	Balance float64  `xorm:"balance"  json:"balance"` // 余额
-	PromotionAmount float64  `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
-	RechargeAmount float64  `xorm:"recharge_amount"  json:"rechargeAmount"` // 充值金额
+	BalanceStart float64  `xorm:"balance"  json:"balance"` // 余额
+	BalanceEnd float64  `xorm:"balance"  json:"balance"` // 余额
+	PromotionAmountStart float64  `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
+	PromotionAmountEnd float64  `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
+	RechargeAmountStart float64  `xorm:"recharge_amount"  json:"rechargeAmount"` // 充值金额
+	RechargeAmountEnd float64  `xorm:"recharge_amount"  json:"rechargeAmount"` // 充值金额
 }
 
 type DictDataQuery struct {
@@ -275,25 +288,10 @@ type DictTypeQuery struct {
 	Remark string  `xorm:"remark"  json:"remark"` // 备注
 }
 
-type ManageUserQuery struct {
-    
-	Id int64  `xorm:"id"  json:"id"` // 
-	Name string  `xorm:"name"  json:"name"` // 名称
-	Username string  `xorm:"username"  json:"username"` // 账号
-	Password string  `xorm:"password"  json:"password"` // 密码
-	CreationTime int64  `xorm:"creation_time"  json:"creationTime"` // 账号创建时间
-	LoginTime int64  `xorm:"login_time"  json:"loginTime"` // 登录时间
-	Status string  `xorm:"status"  json:"status"` // 账号状态
-	RoleId int64  `xorm:"role_id"  json:"roleId"` // 角色id
-	Phone string  `xorm:"phone"  json:"phone"` // 手机
-	Email string  `xorm:"email"  json:"email"` // 邮箱
-	Avatar string  `xorm:"avatar"  json:"avatar"` // 头像
-}
-
 type ShopTopicQuery struct {
     
 	Id int64  `xorm:"id"  json:"id"` // 
-	Sort string  `xorm:"sort"  json:"sort"` // 
+	Sort string  `xorm:"sort"  json:"sort"` // 排序
 	ParentId int64  `xorm:"parent_id"  json:"parentId"` // 父级id
 	TopicPageImage string  `xorm:"topic_page_image"  json:"topicPageImage"` // 主题首页图片
 	TopicName string  `xorm:"topic_name"  json:"topicName"` // 主题名称

output/router/Router.go

@@ -273,16 +273,6 @@ func BaseDictTypeRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/dictType", DeleteBaseDictType)
 }
 
-func BaseManageUserRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/manageUser", GetBaseManageUserById)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser/list", GetBaseManageUserList)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser/in", GetBaseManageUserListInId)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser", SaveBaseManageUser)
-	PushRouter(BaseArticleGroup, "PUT", "/manageUser", UpdateBaseManageUser)
-	PushRouter(BaseArticleGroup, "DELETE", "/manageUser", DeleteBaseManageUser)
-}
-
 func BaseShopTopicRouter(group *gin.RouterGroup) {
 	BaseArticleGroup := group.Group("/back/base")
 	PushRouter(BaseArticleGroup, "GET", "/shopTopic", GetBaseShopTopicById)
@@ -2380,92 +2370,6 @@ func DeleteBaseDictType(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
  
-//================ManageUser ==============================
-func GetBaseManageUserById(c *gin.Context) {
-	id := c.Query("id")
-	manageUser, err := manage.GetManageUserById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(manageUser))
-	return
-}
-
-func GetBaseManageUserList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	manageUser := domain.ManageUserQuery{}
-	err := mapstructure.Decode(param, &manageUser)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.Get2ManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseManageUserListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetManageUserListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseManageUser(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	manageUserParam, _ := data("manageUser")
-	manageUser := domain.ManageUser{}
-	err := mapstructure.Decode(manageUserParam, &manageUser)
-	
-	
-	saveManageUser, err := manage.SaveManageUser(&manageUser)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveManageUser))
-}
-
-func UpdateBaseManageUser(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	manageUser, _ := data("manageUser")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(manageUser))
-	
-    
-    
-    
-	setManageUser, b, err := manage.SetManageUser(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setManageUser))
-}
-
-func DeleteBaseManageUser(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteManageUser(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
- 
 //================ShopTopic 商品主题==============================
 func GetBaseShopTopicById(c *gin.Context) {
 	id := c.Query("id")

output/vue/BaseApi.ts

@@ -577,30 +577,6 @@ export function DeleteBaseDictTypeById(id: number | string) {
     return api.DeleteDataByPath("/back/base/dictType?id=" + id, {}, true) as Promise<ResponseData<any>>;
 }
 
-export function GetBaseManageUserById(id: number | string) {
-    return api.GetDataByPath("/back/base/manageUser?id=" + id, {}, true) as Promise<ResponseData<ManageUser>>;
-}
-
-export function GetBaseManageUserListByManageUser(param: ManageUser, pageNum = 1, pageSize = 10) {
-    return api.PostDataByPath("/back/base/manageUser/list", {param: param,pageNum: pageNum,pageSize: pageSize}, true) as Promise<ResponseData<BaseListVo<ManageUser>>>;
-}
-
-export function GetBaseManageUserListByIds(ids: number[] | string[]) {
-    return api.PostDataByPath("/back/base/manageUser/in", {ids: ids}, true) as Promise<ResponseData<ManageUser[]>>;
-}
-
-export function SaveBaseManageUser(ManageUser: ManageUser) {
-    return api.PostDataByPath("/back/base/manageUser", { manageUser: ManageUser}, true) as Promise<ResponseData<ManageUser>>;
-}
-
-export function UpdateBaseManageUser(ManageUser: ManageUser, id: number | string) {
-    return api.PutDataByPath("/back/base/manageUser", { manageUser: ManageUser, id: id}, true) as Promise<ResponseData<ManageUser>>;
-}
-
-export function DeleteBaseManageUserById(id: number | string) {
-    return api.DeleteDataByPath("/back/base/manageUser?id=" + id, {}, true) as Promise<ResponseData<any>>;
-}
-
 export function GetBaseShopTopicById(id: number | string) {
     return api.GetDataByPath("/back/base/shopTopic?id=" + id, {}, true) as Promise<ResponseData<ShopTopic>>;
 }
@@ -1291,39 +1267,6 @@ export class DictType{
 	}
 }
 
-export class ManageUser{
-    
-    id: number
-    name: string
-    username: string
-    password: string
-    creationTime: number
-    loginTime: number
-    status: string
-    roleId: number
-    phone: string
-    email: string
-    avatar: string
-	static Create(){
-        return new ManageUser(null,null,null,null,null,null,null,null,null,null,null,);
-    }
-
-	constructor(    id: number,name: string,username: string,password: string,creationTime: number,loginTime: number,status: string,roleId: number,phone: string,email: string,avatar: string,) {
-		 this.id = id;
-		 this.name = name;
-		 this.username = username;
-		 this.password = password;
-		 this.creationTime = creationTime;
-		 this.loginTime = loginTime;
-		 this.status = status;
-		 this.roleId = roleId;
-		 this.phone = phone;
-		 this.email = email;
-		 this.avatar = avatar;
-		 
-	}
-}
-
 export class ShopTopic{
     
     id: number
@@ -1413,9 +1356,12 @@ export class ArticleQuery{
     articleTagIds: string
     articleTopicId: number
     image: string
-    publishTime: string
-    eyeFill: number
-    likeCount: number
+    publishTimeStart: string
+    publishTimeEnd: string
+    eyeFillStart: number
+    eyeFillEnd: number
+    likeCountStart: number
+    likeCountEnd: number
     createBy: string
     createTime: string
     updateBy: string
@@ -1423,10 +1369,10 @@ export class ArticleQuery{
     articleDesc: string
 
 	static Create(){
-        return new ArticleQuery(null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,);
+        return new ArticleQuery(null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,articleTitle: string,articleContent: string,state: string,articleTagIds: string,articleTopicId: number,image: string,publishTime: string,eyeFill: number,likeCount: number,createBy: string,createTime: string,updateBy: string,updateTime: string,articleDesc: string,) {
+	constructor(id: number,articleTitle: string,articleContent: string,state: string,articleTagIds: string,articleTopicId: number,image: string,publishTimeStart: string,publishTimeEnd: string,eyeFillStart: number,eyeFillEnd: number,likeCountStart: number,likeCountEnd: number,createBy: string,createTime: string,updateBy: string,updateTime: string,articleDesc: string,) {
 		 this.id = id;
 		 this.articleTitle = articleTitle;
 		 this.articleContent = articleContent;
@@ -1434,9 +1380,12 @@ export class ArticleQuery{
 		 this.articleTagIds = articleTagIds;
 		 this.articleTopicId = articleTopicId;
 		 this.image = image;
-		 this.publishTime = publishTime;
-		 this.eyeFill = eyeFill;
-		 this.likeCount = likeCount;
+		 this.publishTimeStart = publishTimeStart;
+		 this.publishTimeEnd = publishTimeEnd;
+		 this.eyeFillStart = eyeFillStart;
+		 this.eyeFillEnd = eyeFillEnd;
+		 this.likeCountStart = likeCountStart;
+		 this.likeCountEnd = likeCountEnd;
 		 this.createBy = createBy;
 		 this.createTime = createTime;
 		 this.updateBy = updateBy;
@@ -1722,13 +1671,14 @@ export class GoodsCouponQuery{
     count: number
     receiveType: string
     validity: string
-    validityPeriod: string
+    validityPeriodStart: string
+    validityPeriodEnd: string
 
 	static Create(){
-        return new GoodsCouponQuery(null,null,null,null,null,null,null,null,null,null,null,null,null,);
+        return new GoodsCouponQuery(null,null,null,null,null,null,null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,couponName: string,couponDesc: string,cashBackPoint: number,cashBackPrice: number,conditionByTopic: string,conditionByType: string,conditionByGoods: string,grantCount: string,count: number,receiveType: string,validity: string,validityPeriod: string,) {
+	constructor(id: number,couponName: string,couponDesc: string,cashBackPoint: number,cashBackPrice: number,conditionByTopic: string,conditionByType: string,conditionByGoods: string,grantCount: string,count: number,receiveType: string,validity: string,validityPeriodStart: string,validityPeriodEnd: string,) {
 		 this.id = id;
 		 this.couponName = couponName;
 		 this.couponDesc = couponDesc;
@@ -1741,7 +1691,8 @@ export class GoodsCouponQuery{
 		 this.count = count;
 		 this.receiveType = receiveType;
 		 this.validity = validity;
-		 this.validityPeriod = validityPeriod;
+		 this.validityPeriodStart = validityPeriodStart;
+		 this.validityPeriodEnd = validityPeriodEnd;
 		 
 	}
 }
@@ -1799,9 +1750,12 @@ export class GoodsOrderQuery{
     id: number
     orderName: string
     skuId: number
-    count: number
-    price: number
-    totalPrice: number
+    countStart: number
+    countEnd: number
+    priceStart: number
+    priceEnd: number
+    totalPriceStart: number
+    totalPriceEnd: number
     contactInformation: string
     couponUserId: number
     state: string
@@ -1810,16 +1764,19 @@ export class GoodsOrderQuery{
     otherData: string
 
 	static Create(){
-        return new GoodsOrderQuery(null,null,null,null,null,null,null,null,null,null,null,null,);
+        return new GoodsOrderQuery(null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,orderName: string,skuId: number,count: number,price: number,totalPrice: number,contactInformation: string,couponUserId: number,state: string,createBy: number,createTime: string,otherData: string,) {
+	constructor(id: number,orderName: string,skuId: number,countStart: number,countEnd: number,priceStart: number,priceEnd: number,totalPriceStart: number,totalPriceEnd: number,contactInformation: string,couponUserId: number,state: string,createBy: number,createTime: string,otherData: string,) {
 		 this.id = id;
 		 this.orderName = orderName;
 		 this.skuId = skuId;
-		 this.count = count;
-		 this.price = price;
-		 this.totalPrice = totalPrice;
+		 this.countStart = countStart;
+		 this.countEnd = countEnd;
+		 this.priceStart = priceStart;
+		 this.priceEnd = priceEnd;
+		 this.totalPriceStart = totalPriceStart;
+		 this.totalPriceEnd = totalPriceEnd;
 		 this.contactInformation = contactInformation;
 		 this.couponUserId = couponUserId;
 		 this.state = state;
@@ -1841,13 +1798,14 @@ export class GoodsSkuQuery{
     commodityAreaId: number
     goodsId: number
     createBy: string
-    createTime: string
+    createTimeStart: string
+    createTimeEnd: string
 
 	static Create(){
-        return new GoodsSkuQuery(null,null,null,null,null,null,null,null,null,null,);
+        return new GoodsSkuQuery(null,null,null,null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,skuImage: string,skuName: string,price: number,historicalPrices: number,inventoryNumber: number,commodityAreaId: number,goodsId: number,createBy: string,createTime: string,) {
+	constructor(id: number,skuImage: string,skuName: string,price: number,historicalPrices: number,inventoryNumber: number,commodityAreaId: number,goodsId: number,createBy: string,createTimeStart: string,createTimeEnd: string,) {
 		 this.id = id;
 		 this.skuImage = skuImage;
 		 this.skuName = skuName;
@@ -1857,7 +1815,8 @@ export class GoodsSkuQuery{
 		 this.commodityAreaId = commodityAreaId;
 		 this.goodsId = goodsId;
 		 this.createBy = createBy;
-		 this.createTime = createTime;
+		 this.createTimeStart = createTimeStart;
+		 this.createTimeEnd = createTimeEnd;
 		 
 	}
 }
@@ -1871,15 +1830,16 @@ export class GoodsSkuCardQuery{
     totalCount: string
     cardKey: string
     use: string
-    uploadTime: string
+    uploadTimeStart: string
+    uploadTimeEnd: string
     skuId: number
     sort: string
 
 	static Create(){
-        return new GoodsSkuCardQuery(null,null,null,null,null,null,null,null,null,null,);
+        return new GoodsSkuCardQuery(null,null,null,null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,cardName: string,state: string,count: number,totalCount: string,cardKey: string,use: string,uploadTime: string,skuId: number,sort: string,) {
+	constructor(id: number,cardName: string,state: string,count: number,totalCount: string,cardKey: string,use: string,uploadTimeStart: string,uploadTimeEnd: string,skuId: number,sort: string,) {
 		 this.id = id;
 		 this.cardName = cardName;
 		 this.state = state;
@@ -1887,7 +1847,8 @@ export class GoodsSkuCardQuery{
 		 this.totalCount = totalCount;
 		 this.cardKey = cardKey;
 		 this.use = use;
-		 this.uploadTime = uploadTime;
+		 this.uploadTimeStart = uploadTimeStart;
+		 this.uploadTimeEnd = uploadTimeEnd;
 		 this.skuId = skuId;
 		 this.sort = sort;
 		 
@@ -1920,18 +1881,20 @@ export class GoodsTypeQuery{
     sort: number
     typeImage: string
     typeName: string
-    createTime: string
+    createTimeStart: string
+    createTimeEnd: string
 
 	static Create(){
-        return new GoodsTypeQuery(null,null,null,null,null,);
+        return new GoodsTypeQuery(null,null,null,null,null,null,);
     }
 
-	constructor(id: number,sort: number,typeImage: string,typeName: string,createTime: string,) {
+	constructor(id: number,sort: number,typeImage: string,typeName: string,createTimeStart: string,createTimeEnd: string,) {
 		 this.id = id;
 		 this.sort = sort;
 		 this.typeImage = typeImage;
 		 this.typeName = typeName;
-		 this.createTime = createTime;
+		 this.createTimeStart = createTimeStart;
+		 this.createTimeEnd = createTimeEnd;
 		 
 	}
 }
@@ -1978,20 +1941,26 @@ export class UserWalletQuery{
     
     id: number
     userId: number
-    balance: number
-    promotionAmount: number
-    rechargeAmount: number
+    balanceStart: number
+    balanceEnd: number
+    promotionAmountStart: number
+    promotionAmountEnd: number
+    rechargeAmountStart: number
+    rechargeAmountEnd: number
 
 	static Create(){
-        return new UserWalletQuery(null,null,null,null,null,);
+        return new UserWalletQuery(null,null,null,null,null,null,null,null,);
     }
 
-	constructor(id: number,userId: number,balance: number,promotionAmount: number,rechargeAmount: number,) {
+	constructor(id: number,userId: number,balanceStart: number,balanceEnd: number,promotionAmountStart: number,promotionAmountEnd: number,rechargeAmountStart: number,rechargeAmountEnd: number,) {
 		 this.id = id;
 		 this.userId = userId;
-		 this.balance = balance;
-		 this.promotionAmount = promotionAmount;
-		 this.rechargeAmount = rechargeAmount;
+		 this.balanceStart = balanceStart;
+		 this.balanceEnd = balanceEnd;
+		 this.promotionAmountStart = promotionAmountStart;
+		 this.promotionAmountEnd = promotionAmountEnd;
+		 this.rechargeAmountStart = rechargeAmountStart;
+		 this.rechargeAmountEnd = rechargeAmountEnd;
 		 
 	}
 }
@@ -2048,40 +2017,6 @@ export class DictTypeQuery{
 	}
 }
 
-export class ManageUserQuery{
-    
-    id: number
-    name: string
-    username: string
-    password: string
-    creationTime: number
-    loginTime: number
-    status: string
-    roleId: number
-    phone: string
-    email: string
-    avatar: string
-
-	static Create(){
-        return new ManageUserQuery(null,null,null,null,null,null,null,null,null,null,null,);
-    }
-
-	constructor(id: number,name: string,username: string,password: string,creationTime: number,loginTime: number,status: string,roleId: number,phone: string,email: string,avatar: string,) {
-		 this.id = id;
-		 this.name = name;
-		 this.username = username;
-		 this.password = password;
-		 this.creationTime = creationTime;
-		 this.loginTime = loginTime;
-		 this.status = status;
-		 this.roleId = roleId;
-		 this.phone = phone;
-		 this.email = email;
-		 this.avatar = avatar;
-		 
-	}
-}
-
 export class ShopTopicQuery{
     
     id: number

output/vue/page/ArticleTagView.vue

@@ -3,46 +3,43 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="标签名" prop="tagName">
           <el-input v-model="query.tagName" placeholder="请输入标签名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="标签描述" prop="tagDesc">
           <el-input v-model="query.tagDesc" placeholder="请输入标签描述"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="标签字体颜色" prop="tagTextColor">                <el-text class="mx-1">{{query.tagTextColor}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="标签字体颜色" prop="tagTextColor">
+          <el-input v-model="query.tagTextColor" placeholder="请输入标签字体颜色"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="标签背景颜色" prop="tagBackgroundColor">                <el-text class="mx-1">{{query.tagBackgroundColor}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="标签背景颜色" prop="tagBackgroundColor">
+          <el-input v-model="query.tagBackgroundColor" placeholder="请输入标签背景颜色"/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -86,7 +83,7 @@
         <el-table-column label="标签背景颜色" align="center" prop="tagBackgroundColor"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -114,9 +111,11 @@
         <el-form-item label="标签描述" prop="tagDesc">
           <el-input v-model="dialogForm.tagDesc" placeholder="请输入标签描述"/>
         </el-form-item>
-        <el-form-item label="标签字体颜色" prop="tagTextColor">                <el-text class="mx-1">{{dialogForm.tagTextColor}}</el-text>
+        <el-form-item label="标签字体颜色" prop="tagTextColor">
+          <el-input v-model="dialogForm.tagTextColor" placeholder="请输入标签字体颜色"/>
         </el-form-item>
-        <el-form-item label="标签背景颜色" prop="tagBackgroundColor">                <el-text class="mx-1">{{dialogForm.tagBackgroundColor}}</el-text>
+        <el-form-item label="标签背景颜色" prop="tagBackgroundColor">
+          <el-input v-model="dialogForm.tagBackgroundColor" placeholder="请输入标签背景颜色"/>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/ArticleTopicView.vue

@@ -3,37 +3,28 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="图片" prop="image">              <ImageUpload v-model:ImgUrl="query.image"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="主题名称" prop="topicName">
           <el-input v-model="query.topicName" placeholder="请输入主题名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="主题描述" prop="topicDesc">
-          <el-input v-model="query.topicDesc" placeholder="请输入主题描述" type="textarea"/>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -80,7 +71,7 @@
         <el-table-column label="主题描述" align="center" prop="topicDesc"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/ArticleView.vue

@@ -3,33 +3,27 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="文章名称" prop="articleTitle">
           <el-input v-model="query.articleTitle" placeholder="请输入文章名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="文章内容" prop="articleContent">              <EditorComponent v-model:htmlString="query.articleContent"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="状态" prop="state">
           <el-select v-model="query.state" placeholder="请选择状态">
             <el-option
@@ -39,108 +33,85 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="文章标签" prop="articleTagIds">                <el-text class="mx-1">{{query.articleTagIds}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="文章主题id" prop="articleTopicId">                <el-text class="mx-1">{{query.articleTopicId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="图片" prop="image">              <ImageUpload v-model:ImgUrl="query.image"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="发表时间" prop="publishTime">      <el-date-picker v-model="query.publishTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="发表时间" prop="publishTime">      <DatePicker v-model:startDate=query.publishTimeStart v-model:endDate=query.publishTimeEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="浏览量" prop="eyeFill">
-          <el-input-number v-model="query.eyeFill" placeholder="请输入浏览量"/>
+          <InputNumberRange v-model:min=query.eyeFillStart v-model:max=query.eyeFillEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="点赞量" prop="likeCount">
-          <el-input-number v-model="query.likeCount" placeholder="请输入点赞量"/>
+          <InputNumberRange v-model:min=query.likeCountStart v-model:max=query.likeCountEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建人" prop="createBy">                <el-text class="mx-1">{{query.createBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="更新人" prop="updateBy">                <el-text class="mx-1">{{query.updateBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="更新时间" prop="updateTime">      <el-date-picker v-model="query.updateTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="文章简介" prop="articleDesc">                <el-text class="mx-1">{{query.articleDesc}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -202,7 +173,7 @@
         <el-table-column label="文章简介" align="center" prop="articleDesc"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/BackAuthorityView.vue

@@ -3,44 +3,39 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="接口名" prop="authorityName">
           <el-input v-model="query.authorityName" placeholder="请输入接口名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="接口路径" prop="authorityPath">
           <el-input v-model="query.authorityPath" placeholder="请输入接口路径"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="方法" prop="method">
           <el-input v-model="query.method" placeholder="请输入方法"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="接口是否启用(0关闭，1启用)" prop="state">
           <el-select v-model="query.state" placeholder="请选择接口是否启用(0关闭，1启用)">
             <el-option
@@ -50,26 +45,24 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="权限校验" prop="authorityVerification">
           <el-input v-model="query.authorityVerification" placeholder="请输入权限校验"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
+      
+      
+      
+      
+      
+        <el-form-item label="创建时间" prop="createTime">      <DatePicker v-model:startDate=query.createTimeStart v-model:endDate=query.createTimeEnd/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -119,7 +112,7 @@
         <el-table-column label="创建时间" align="center" prop="createTime"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/BackMenuView.vue

@@ -3,71 +3,70 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="菜单名称" prop="backMenuName">                <el-text class="mx-1">{{query.backMenuName}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="父级菜单" prop="backMenuPater">                <el-text class="mx-1">{{query.backMenuPater}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="排序" prop="sort">                <el-text class="mx-1">{{query.sort}}</el-text>
+      
+      
+      
+        <el-form-item label="菜单名称" prop="backMenuName">
+          <el-input v-model="query.backMenuName" placeholder="请输入菜单名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="图标" prop="icon">                <el-text class="mx-1">{{query.icon}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="父级菜单" prop="backMenuPater">
+          <el-input-number v-model="query.backMenuPater" placeholder="请输入父级菜单"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{query.remark}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="query.sort" placeholder="请输入排序"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="路由路径" prop="backRouterPath">                <el-text class="mx-1">{{query.backRouterPath}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="路由路径" prop="backRouterPath">
+          <el-input v-model="query.backRouterPath" placeholder="请输入路由路径"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态" prop="state">                <el-text class="mx-1">{{query.state}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="状态" prop="state">
+          <el-select v-model="query.state" placeholder="请选择状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -108,13 +107,21 @@
         <el-table-column label="菜单名称" align="center" prop="backMenuName"/>
         <el-table-column label="父级菜单" align="center" prop="backMenuPater"/>
         <el-table-column label="排序" align="center" prop="sort"/>
-        <el-table-column label="图标" align="center" prop="icon"/>
+      <el-table-column label="图标" align="center" prop="icon">
+        <template #default="scope">
+          <el-image  :src="scope.row.icon"></el-image>
+        </template>
+      </el-table-column>
         <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column label="路由路径" align="center" prop="backRouterPath"/>
-        <el-table-column label="状态" align="center" prop="state"/>
+      <el-table-column label="状态" align="center" prop="state">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_state'" :dict-value="scope.row.state"/>
+        </template>
+      </el-table-column>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -136,19 +143,31 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="菜单名称" prop="backMenuName">                <el-text class="mx-1">{{dialogForm.backMenuName}}</el-text>
+        <el-form-item label="菜单名称" prop="backMenuName">
+          <el-input v-model="dialogForm.backMenuName" placeholder="请输入菜单名称"/>
         </el-form-item>
-        <el-form-item label="父级菜单" prop="backMenuPater">                <el-text class="mx-1">{{dialogForm.backMenuPater}}</el-text>
+        <el-form-item label="父级菜单" prop="backMenuPater">
+          <el-input-number v-model="dialogForm.backMenuPater" placeholder="请输入父级菜单"/>
         </el-form-item>
-        <el-form-item label="排序" prop="sort">                <el-text class="mx-1">{{dialogForm.sort}}</el-text>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dialogForm.sort" placeholder="请输入排序"/>
         </el-form-item>
-        <el-form-item label="图标" prop="icon">                <el-text class="mx-1">{{dialogForm.icon}}</el-text>
+        <el-form-item label="图标" prop="icon">              <ImageUpload v-model:ImgUrl="dialogForm.icon"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{dialogForm.remark}}</el-text>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dialogForm.remark" placeholder="请输入备注" type="textarea"/>
         </el-form-item>
-        <el-form-item label="路由路径" prop="backRouterPath">                <el-text class="mx-1">{{dialogForm.backRouterPath}}</el-text>
+        <el-form-item label="路由路径" prop="backRouterPath">
+          <el-input v-model="dialogForm.backRouterPath" placeholder="请输入路由路径"/>
         </el-form-item>
-        <el-form-item label="状态" prop="state">                <el-text class="mx-1">{{dialogForm.state}}</el-text>
+        <el-form-item label="状态" prop="state">
+          <el-select v-model="dialogForm.state" placeholder="请选择状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/BackRoleAuthorityView.vue

@@ -3,26 +3,19 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="角色id" prop="roleId">                <el-text class="mx-1">{{query.roleId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="权限id" prop="authorityId">                <el-text class="mx-1">{{query.authorityId}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -64,7 +57,7 @@
         <el-table-column label="权限id" align="center" prop="authorityId"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/BackRoleMenuView.vue

@@ -3,26 +3,19 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="角色id" prop="roleId">                <el-text class="mx-1">{{query.roleId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="枚舉id" prop="menuId">                <el-text class="mx-1">{{query.menuId}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -64,7 +57,7 @@
         <el-table-column label="枚舉id" align="center" prop="menuId"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/BackRoleView.vue

@@ -3,19 +3,18 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-              
-            
-            
-        <el-form-item label="roleName" prop="roleName">                <el-text class="mx-1">{{query.roleName}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="roleName" prop="roleName">
+          <el-input v-model="query.roleName" placeholder="请输入roleName"/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -56,7 +55,7 @@
         <el-table-column label="roleName" align="center" prop="roleName"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -78,7 +77,8 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="roleName" prop="roleName">                <el-text class="mx-1">{{dialogForm.roleName}}</el-text>
+        <el-form-item label="roleName" prop="roleName">
+          <el-input v-model="dialogForm.roleName" placeholder="请输入roleName"/>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/DictDataView.vue

@@ -3,80 +3,86 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="排序" prop="sort">                <el-text class="mx-1">{{query.sort}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字典标签" prop="dictLabel">                <el-text class="mx-1">{{query.dictLabel}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字典键值" prop="dictValue">                <el-text class="mx-1">{{query.dictValue}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="字典标签" prop="dictLabel">
+          <el-input v-model="query.dictLabel" placeholder="请输入字典标签"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字典类型" prop="dictType">                <el-text class="mx-1">{{query.dictType}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="字典键值" prop="dictValue">
+          <el-input v-model="query.dictValue" placeholder="请输入字典键值"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态" prop="status">                <el-text class="mx-1">{{query.status}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="query.dictType" placeholder="请输入字典类型"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="样式" prop="cssStyle">                <el-text class="mx-1">{{query.cssStyle}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="query.status" placeholder="请选择状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="是否默认" prop="isDefault">                <el-text class="mx-1">{{query.isDefault}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="样式" prop="cssStyle">
+          <el-input v-model="query.cssStyle" placeholder="请输入样式"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{query.remark}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="是否默认" prop="isDefault">
+          <el-radio-group v-model="query.isDefault">
+            <el-radio
+              v-for="item in store.state.dicts.get(sys_yes_no)"
+              :key="item.dictValue"
+              :label="item.dictLabel">
+              {{item.dictLabel}}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -118,13 +124,21 @@
         <el-table-column label="字典标签" align="center" prop="dictLabel"/>
         <el-table-column label="字典键值" align="center" prop="dictValue"/>
         <el-table-column label="字典类型" align="center" prop="dictType"/>
-        <el-table-column label="状态" align="center" prop="status"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_state'" :dict-value="scope.row.status"/>
+        </template>
+      </el-table-column>
         <el-table-column label="样式" align="center" prop="cssStyle"/>
-        <el-table-column label="是否默认" align="center" prop="isDefault"/>
+      <el-table-column label="是否默认" align="center" prop="isDefault">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_yes_no'" :dict-value="scope.row.isDefault"/>
+        </template>
+      </el-table-column>
         <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -148,19 +162,39 @@
             
         <el-form-item label="排序" prop="sort">                <el-text class="mx-1">{{dialogForm.sort}}</el-text>
         </el-form-item>
-        <el-form-item label="字典标签" prop="dictLabel">                <el-text class="mx-1">{{dialogForm.dictLabel}}</el-text>
+        <el-form-item label="字典标签" prop="dictLabel">
+          <el-input v-model="dialogForm.dictLabel" placeholder="请输入字典标签"/>
         </el-form-item>
-        <el-form-item label="字典键值" prop="dictValue">                <el-text class="mx-1">{{dialogForm.dictValue}}</el-text>
+        <el-form-item label="字典键值" prop="dictValue">
+          <el-input v-model="dialogForm.dictValue" placeholder="请输入字典键值"/>
         </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">                <el-text class="mx-1">{{dialogForm.dictType}}</el-text>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="dialogForm.dictType" placeholder="请输入字典类型"/>
         </el-form-item>
-        <el-form-item label="状态" prop="status">                <el-text class="mx-1">{{dialogForm.status}}</el-text>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="dialogForm.status" placeholder="请选择状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="样式" prop="cssStyle">                <el-text class="mx-1">{{dialogForm.cssStyle}}</el-text>
+        <el-form-item label="样式" prop="cssStyle">
+          <el-input v-model="dialogForm.cssStyle" placeholder="请输入样式"/>
         </el-form-item>
-        <el-form-item label="是否默认" prop="isDefault">                <el-text class="mx-1">{{dialogForm.isDefault}}</el-text>
+        <el-form-item label="是否默认" prop="isDefault">
+          <el-radio-group v-model="dialogForm.isDefault">
+            <el-radio
+              v-for="item in store.state.dicts.get(sys_yes_no)"
+              :key="item.dictValue"
+              :label="item.dictLabel">
+              {{item.dictLabel}}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{dialogForm.remark}}</el-text>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dialogForm.remark" placeholder="请输入备注" type="textarea"/>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/DictTypeView.vue

@@ -3,44 +3,46 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字典名称" prop="dictName">                <el-text class="mx-1">{{query.dictName}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字典类型" prop="dictType">                <el-text class="mx-1">{{query.dictType}}</el-text>
+      
+      
+      
+      
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="query.dictName" placeholder="请输入字典名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态（1正常/0停用）" prop="status">                <el-text class="mx-1">{{query.status}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="query.dictType" placeholder="请输入字典类型"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{query.remark}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="状态（1正常/0停用）" prop="status">
+          <el-select v-model="query.status" placeholder="请选择状态（1正常/0停用）">
+            <el-option
+              v-for="item in store.state.dicts.get('sys _state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -80,11 +82,15 @@
         <el-table-column label="id" align="center" prop="id"/>
         <el-table-column label="字典名称" align="center" prop="dictName"/>
         <el-table-column label="字典类型" align="center" prop="dictType"/>
-        <el-table-column label="状态（1正常/0停用）" align="center" prop="status"/>
+      <el-table-column label="状态（1正常/0停用）" align="center" prop="status">
+        <template #default="scope">
+          <DictTag :dict-type="'sys _state'" :dict-value="scope.row.status"/>
+        </template>
+      </el-table-column>
         <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -106,13 +112,23 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="字典名称" prop="dictName">                <el-text class="mx-1">{{dialogForm.dictName}}</el-text>
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="dialogForm.dictName" placeholder="请输入字典名称"/>
         </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">                <el-text class="mx-1">{{dialogForm.dictType}}</el-text>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="dialogForm.dictType" placeholder="请输入字典类型"/>
         </el-form-item>
-        <el-form-item label="状态（1正常/0停用）" prop="status">                <el-text class="mx-1">{{dialogForm.status}}</el-text>
+        <el-form-item label="状态（1正常/0停用）" prop="status">
+          <el-select v-model="dialogForm.status" placeholder="请选择状态（1正常/0停用）">
+            <el-option
+              v-for="item in store.state.dicts.get('sys _state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">                <el-text class="mx-1">{{dialogForm.remark}}</el-text>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dialogForm.remark" placeholder="请输入备注" type="textarea"/>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/GenTableColumnView.vue

@@ -3,53 +3,48 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="表格id" prop="tableId">
           <el-input v-model="query.tableId" placeholder="请输入表格id"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="query.sort" placeholder="请输入排序"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="字段注释" prop="columnComment">
           <el-input v-model="query.columnComment" placeholder="请输入字段注释"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字段类型" prop="columnType">                <el-text class="mx-1">{{query.columnType}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="字段类型" prop="columnType">
+          <el-input v-model="query.columnType" placeholder="请输入字段类型"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="go类型" prop="goType">
           <el-select v-model="query.goType" placeholder="请选择go类型">
             <el-option
@@ -59,23 +54,21 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="go字段名" prop="goField">
           <el-input v-model="query.goField" placeholder="请输入go字段名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="是否主键" prop="isKey">            <el-radio-group v-model="query.isKey">
               <el-radio
                   v-for="item in [['0','否'], ['1','是']]"
@@ -85,13 +78,12 @@
               </el-radio>
             </el-radio-group>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="是否自增" prop="isIncrement">            <el-radio-group v-model="query.isIncrement">
               <el-radio
                   v-for="item in [['0','否'], ['1','是']]"
@@ -101,13 +93,12 @@
               </el-radio>
             </el-radio-group>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="是否未必填" prop="isRequired">            <el-radio-group v-model="query.isRequired">
               <el-radio
                   v-for="item in [['0','否'], ['1','是']]"
@@ -117,13 +108,12 @@
               </el-radio>
             </el-radio-group>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="查询方式" prop="queryType">
           <el-select v-model="query.queryType" placeholder="请选择查询方式">
             <el-option
@@ -133,13 +123,12 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="前端显示类型" prop="vueShowType">
           <el-select v-model="query.vueShowType" placeholder="请选择前端显示类型">
             <el-option
@@ -149,13 +138,12 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="字典类型" prop="dictType">
           <el-select v-model="query.dictType" placeholder="请选择字典类型">
             <el-option
@@ -165,16 +153,16 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="字段名" prop="columnName">                <el-text class="mx-1">{{query.columnName}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="字段名" prop="columnName">
+          <el-input v-model="query.columnName" placeholder="请输入字段名"/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -239,7 +227,7 @@
         <el-table-column label="字段名" align="center" prop="columnName"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -270,7 +258,8 @@
         <el-form-item label="字段注释" prop="columnComment">
           <el-input v-model="dialogForm.columnComment" placeholder="请输入字段注释"/>
         </el-form-item>
-        <el-form-item label="字段类型" prop="columnType">                <el-text class="mx-1">{{dialogForm.columnType}}</el-text>
+        <el-form-item label="字段类型" prop="columnType">
+          <el-input v-model="dialogForm.columnType" placeholder="请输入字段类型"/>
         </el-form-item>
         <el-form-item label="go类型" prop="goType">
           <el-select v-model="dialogForm.goType" placeholder="请选择go类型">
@@ -338,7 +327,8 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="字段名" prop="columnName">                <el-text class="mx-1">{{dialogForm.columnName}}</el-text>
+        <el-form-item label="字段名" prop="columnName">
+          <el-input v-model="dialogForm.columnName" placeholder="请输入字段名"/>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/GenTableView.vue

@@ -3,58 +3,49 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="数据库名" prop="tableName">
           <el-input v-model="query.tableName" placeholder="请输入数据库名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="数据库注释" prop="tableComment">
           <el-input v-model="query.tableComment" placeholder="请输入数据库注释"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="名字" prop="name">
           <el-input v-model="query.name" placeholder="请输入名字"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="路由名" prop="routerName">
           <el-input v-model="query.routerName" placeholder="请输入路由名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="query.remark" placeholder="请输入备注" type="textarea"/>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -99,7 +90,7 @@
         <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsCommodityAreaView.vue

@@ -3,42 +3,33 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品id" prop="goodsId">                <el-text class="mx-1">{{query.goodsId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="商品属地名称" prop="commodityAreaName">
           <el-input v-model="query.commodityAreaName" placeholder="请输入商品属地名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="详情图片" prop="detailImage">              <ImageUpload v-model:ImgUrl="query.detailImage"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="相关文本详情id" prop="detailIntroductionId">
           <el-select v-model="query.detailIntroductionId" placeholder="请选择相关文本详情id">
             <el-option
@@ -48,7 +39,7 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -96,7 +87,7 @@
         <el-table-column label="相关文本详情id" align="center" prop="detailIntroductionId"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsCouponUserView.vue

@@ -3,44 +3,40 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="用户id" prop="userId">                <el-text class="mx-1">{{query.userId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="优惠券id" prop="couponId">                <el-text class="mx-1">{{query.couponId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="领取时间" prop="collectionTime">                <el-text class="mx-1">{{query.collectionTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态，已使用2，未使用1，已过期0" prop="state">                <el-text class="mx-1">{{query.state}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="状态，已使用2，未使用1，已过期0" prop="state">
+          <el-select v-model="query.state" placeholder="请选择状态，已使用2，未使用1，已过期0">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -81,10 +77,14 @@
         <el-table-column label="用户id" align="center" prop="userId"/>
         <el-table-column label="优惠券id" align="center" prop="couponId"/>
         <el-table-column label="领取时间" align="center" prop="collectionTime"/>
-        <el-table-column label="状态，已使用2，未使用1，已过期0" align="center" prop="state"/>
+      <el-table-column label="状态，已使用2，未使用1，已过期0" align="center" prop="state">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_state'" :dict-value="scope.row.state"/>
+        </template>
+      </el-table-column>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -112,7 +112,14 @@
         </el-form-item>
         <el-form-item label="领取时间" prop="collectionTime">                <el-text class="mx-1">{{dialogForm.collectionTime}}</el-text>
         </el-form-item>
-        <el-form-item label="状态，已使用2，未使用1，已过期0" prop="state">                <el-text class="mx-1">{{dialogForm.state}}</el-text>
+        <el-form-item label="状态，已使用2，未使用1，已过期0" prop="state">
+          <el-select v-model="dialogForm.state" placeholder="请选择状态，已使用2，未使用1，已过期0">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
           </el-form>
           <template #footer>

output/vue/page/GoodsCouponView.vue

@@ -3,54 +3,45 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="优惠券名称" prop="couponName">
           <el-input v-model="query.couponName" placeholder="请输入优惠券名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="优惠券描述" prop="couponDesc">
-          <el-input v-model="query.couponDesc" placeholder="请输入优惠券描述" type="textarea"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="满x" prop="cashBackPoint">
           <el-input-number v-model="query.cashBackPoint" placeholder="请输入满x"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="减x" prop="cashBackPrice">
           <el-input-number v-model="query.cashBackPrice" placeholder="请输入减x"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="主题可用，id" prop="conditionByTopic">
           <el-select v-model="query.conditionByTopic" placeholder="请选择主题可用，id">
             <el-option
@@ -60,13 +51,12 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="类型可用，id" prop="conditionByType">
           <el-select v-model="query.conditionByType" placeholder="请选择类型可用，id">
             <el-option
@@ -76,13 +66,12 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="商品可用，id" prop="conditionByGoods">
           <el-select v-model="query.conditionByGoods" placeholder="请选择商品可用，id">
             <el-option
@@ -92,42 +81,36 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="发放数量" prop="grantCount">
           <el-input-number v-model="query.grantCount" placeholder="请输入发放数量"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="优惠券余量" prop="count">                <el-text class="mx-1">{{query.count}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="领取条件" prop="receiveType">
           <el-input v-model="query.receiveType" placeholder="请输入领取条件"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="有效性，领取开始计时(ClaimTiming)，固定时间(FixedTime)" prop="validity">
           <el-select v-model="query.validity" placeholder="请选择有效性，领取开始计时(ClaimTiming)，固定时间(FixedTime)">
             <el-option
@@ -137,16 +120,15 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="有效期" prop="validityPeriod">      <el-date-picker v-model="query.validityPeriod" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
+      
+      
+      
+      
+      
+        <el-form-item label="有效期" prop="validityPeriod">      <DatePicker v-model:startDate=query.validityPeriodStart v-model:endDate=query.validityPeriodEnd/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -202,7 +184,7 @@
         <el-table-column label="有效期" align="center" prop="validityPeriod"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsIntroductionView.vue

@@ -3,63 +3,50 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="商品文章名" prop="goodsArticleName">
           <el-input v-model="query.goodsArticleName" placeholder="请输入商品文章名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品文章" prop="goodsArticle">              <EditorComponent v-model:htmlString="query.goodsArticle"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建人" prop="createBy">                <el-text class="mx-1">{{query.createBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="更新人" prop="updateBy">                <el-text class="mx-1">{{query.updateBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="更新时间" prop="updateTime">      <el-date-picker v-model="query.updateTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -105,7 +92,7 @@
         <el-table-column label="更新时间" align="center" prop="updateTime"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsOrderView.vue

@@ -3,107 +3,88 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="订单名" prop="orderName">                <el-text class="mx-1">{{query.orderName}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="skuid" prop="skuId">                <el-text class="mx-1">{{query.skuId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="购买数量" prop="count">                <el-text class="mx-1">{{query.count}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="单价" prop="price">                <el-text class="mx-1">{{query.price}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="总价" prop="totalPrice">                <el-text class="mx-1">{{query.totalPrice}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="联系方式" prop="contactInformation">                <el-text class="mx-1">{{query.contactInformation}}</el-text>
+        <el-form-item label="订单名" prop="orderName">
+          <el-input v-model="query.orderName" placeholder="请输入订单名"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="使用的优惠券" prop="couponUserId">                <el-text class="mx-1">{{query.couponUserId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="支付状态，0待支付，1待发货，2已发货，3订单完成，4订单异常" prop="state">                <el-text class="mx-1">{{query.state}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="购买数量" prop="count">
+          <InputNumberRange v-model:min=query.countStart v-model:max=query.countEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="用户id" prop="createBy">                <el-text class="mx-1">{{query.createBy}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="单价" prop="price">
+          <InputNumberRange v-model:min=query.priceStart v-model:max=query.priceEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="订单创建时间" prop="createTime">                <el-text class="mx-1">{{query.createTime}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="总价" prop="totalPrice">
+          <InputNumberRange v-model:min=query.totalPriceStart v-model:max=query.totalPriceEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="其他数据" prop="otherData">                <el-text class="mx-1">{{query.otherData}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="联系方式" prop="contactInformation">
+          <el-input v-model="query.contactInformation" placeholder="请输入联系方式"/>
         </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -154,7 +135,7 @@
         <el-table-column label="其他数据" align="center" prop="otherData"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -176,17 +157,22 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="订单名" prop="orderName">                <el-text class="mx-1">{{dialogForm.orderName}}</el-text>
+        <el-form-item label="订单名" prop="orderName">
+          <el-input v-model="dialogForm.orderName" placeholder="请输入订单名"/>
         </el-form-item>
         <el-form-item label="skuid" prop="skuId">                <el-text class="mx-1">{{dialogForm.skuId}}</el-text>
         </el-form-item>
-        <el-form-item label="购买数量" prop="count">                <el-text class="mx-1">{{dialogForm.count}}</el-text>
+        <el-form-item label="购买数量" prop="count">
+          <el-input-number v-model="dialogForm.count" placeholder="请输入购买数量"/>
         </el-form-item>
-        <el-form-item label="单价" prop="price">                <el-text class="mx-1">{{dialogForm.price}}</el-text>
+        <el-form-item label="单价" prop="price">
+          <el-input-number v-model="dialogForm.price" placeholder="请输入单价"/>
         </el-form-item>
-        <el-form-item label="总价" prop="totalPrice">                <el-text class="mx-1">{{dialogForm.totalPrice}}</el-text>
+        <el-form-item label="总价" prop="totalPrice">
+          <el-input-number v-model="dialogForm.totalPrice" placeholder="请输入总价"/>
         </el-form-item>
-        <el-form-item label="联系方式" prop="contactInformation">                <el-text class="mx-1">{{dialogForm.contactInformation}}</el-text>
+        <el-form-item label="联系方式" prop="contactInformation">
+          <el-input v-model="dialogForm.contactInformation" placeholder="请输入联系方式"/>
         </el-form-item>
         <el-form-item label="使用的优惠券" prop="couponUserId">                <el-text class="mx-1">{{dialogForm.couponUserId}}</el-text>
         </el-form-item>

output/vue/page/GoodsSkuCardView.vue

@@ -3,89 +3,93 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="卡种名称" prop="cardName">                <el-text class="mx-1">{{query.cardName}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态，0未使用，1已用，2过期" prop="state">                <el-text class="mx-1">{{query.state}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="库存" prop="count">                <el-text class="mx-1">{{query.count}}</el-text>
+      
+      
+      
+        <el-form-item label="卡种名称" prop="cardName">
+          <el-input v-model="query.cardName" placeholder="请输入卡种名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="总数" prop="totalCount">                <el-text class="mx-1">{{query.totalCount}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="状态，0未使用，1已用，2过期" prop="state">
+          <el-select v-model="query.state" placeholder="请选择状态，0未使用，1已用，2过期">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="卡密" prop="cardKey">                <el-text class="mx-1">{{query.cardKey}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="库存" prop="count">
+          <el-input-number v-model="query.count" placeholder="请输入库存"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="是否已用" prop="use">                <el-text class="mx-1">{{query.use}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="总数" prop="totalCount">
+          <el-input-number v-model="query.totalCount" placeholder="请输入总数"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="入库时间" prop="uploadTime">                <el-text class="mx-1">{{query.uploadTime}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="卡密" prop="cardKey">
+          <el-input v-model="query.cardKey" placeholder="请输入卡密"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品规格绑定" prop="skuId">                <el-text class="mx-1">{{query.skuId}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="是否已用" prop="use">
+          <el-select v-model="query.use" placeholder="请选择是否已用">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_yes_no')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="排序，出售优先级" prop="sort">                <el-text class="mx-1">{{query.sort}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="入库时间" prop="uploadTime">      <DatePicker v-model:startDate=query.uploadTimeStart v-model:endDate=query.uploadTimeEnd/>
         </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -124,17 +128,25 @@
         
         <el-table-column label="id" align="center" prop="id"/>
         <el-table-column label="卡种名称" align="center" prop="cardName"/>
-        <el-table-column label="状态，0未使用，1已用，2过期" align="center" prop="state"/>
+      <el-table-column label="状态，0未使用，1已用，2过期" align="center" prop="state">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_state'" :dict-value="scope.row.state"/>
+        </template>
+      </el-table-column>
         <el-table-column label="库存" align="center" prop="count"/>
         <el-table-column label="总数" align="center" prop="totalCount"/>
         <el-table-column label="卡密" align="center" prop="cardKey"/>
-        <el-table-column label="是否已用" align="center" prop="use"/>
+      <el-table-column label="是否已用" align="center" prop="use">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_yes_no'" :dict-value="scope.row.use"/>
+        </template>
+      </el-table-column>
         <el-table-column label="入库时间" align="center" prop="uploadTime"/>
         <el-table-column label="商品规格绑定" align="center" prop="skuId"/>
         <el-table-column label="排序，出售优先级" align="center" prop="sort"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -156,19 +168,37 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="卡种名称" prop="cardName">                <el-text class="mx-1">{{dialogForm.cardName}}</el-text>
+        <el-form-item label="卡种名称" prop="cardName">
+          <el-input v-model="dialogForm.cardName" placeholder="请输入卡种名称"/>
         </el-form-item>
-        <el-form-item label="状态，0未使用，1已用，2过期" prop="state">                <el-text class="mx-1">{{dialogForm.state}}</el-text>
+        <el-form-item label="状态，0未使用，1已用，2过期" prop="state">
+          <el-select v-model="dialogForm.state" placeholder="请选择状态，0未使用，1已用，2过期">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_state')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="库存" prop="count">                <el-text class="mx-1">{{dialogForm.count}}</el-text>
+        <el-form-item label="库存" prop="count">
+          <el-input-number v-model="dialogForm.count" placeholder="请输入库存"/>
         </el-form-item>
-        <el-form-item label="总数" prop="totalCount">                <el-text class="mx-1">{{dialogForm.totalCount}}</el-text>
+        <el-form-item label="总数" prop="totalCount">
+          <el-input-number v-model="dialogForm.totalCount" placeholder="请输入总数"/>
         </el-form-item>
-        <el-form-item label="卡密" prop="cardKey">                <el-text class="mx-1">{{dialogForm.cardKey}}</el-text>
+        <el-form-item label="卡密" prop="cardKey">
+          <el-input v-model="dialogForm.cardKey" placeholder="请输入卡密"/>
         </el-form-item>
-        <el-form-item label="是否已用" prop="use">                <el-text class="mx-1">{{dialogForm.use}}</el-text>
+        <el-form-item label="是否已用" prop="use">
+          <el-select v-model="dialogForm.use" placeholder="请选择是否已用">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_yes_no')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="入库时间" prop="uploadTime">                <el-text class="mx-1">{{dialogForm.uploadTime}}</el-text>
+        <el-form-item label="入库时间" prop="uploadTime">      <el-date-picker v-model="dialogForm.uploadTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
         <el-form-item label="商品规格绑定" prop="skuId">                <el-text class="mx-1">{{dialogForm.skuId}}</el-text>
         </el-form-item>

output/vue/page/GoodsSkuView.vue

@@ -3,63 +3,54 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="sku图片" prop="skuImage">              <ImageUpload v-model:ImgUrl="query.skuImage"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="商品sku名字" prop="skuName">
           <el-input v-model="query.skuName" placeholder="请输入商品sku名字"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="现在价格" prop="price">
-          <el-input v-model="query.price" placeholder="请输入现在价格"/>
+          <el-input-number v-model="query.price" placeholder="请输入现在价格"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="历史价格" prop="historicalPrices">
-          <el-input v-model="query.historicalPrices" placeholder="请输入历史价格"/>
+          <el-input-number v-model="query.historicalPrices" placeholder="请输入历史价格"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="库存" prop="inventoryNumber">
           <el-input-number v-model="query.inventoryNumber" placeholder="请输入库存"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="属地id" prop="commodityAreaId">
           <el-select v-model="query.commodityAreaId" placeholder="请选择属地id">
             <el-option
@@ -69,13 +60,12 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="商品id" prop="goodsId">
           <el-select v-model="query.goodsId" placeholder="请选择商品id">
             <el-option
@@ -85,25 +75,21 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建人" prop="createBy">                <el-text class="mx-1">{{query.createBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="创建时间" prop="createTime">      <DatePicker v-model:startDate=query.createTimeStart v-model:endDate=query.createTimeEnd/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -156,7 +142,7 @@
         <el-table-column label="创建时间" align="center" prop="createTime"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -184,10 +170,10 @@
           <el-input v-model="dialogForm.skuName" placeholder="请输入商品sku名字"/>
         </el-form-item>
         <el-form-item label="现在价格" prop="price">
-          <el-input v-model="dialogForm.price" placeholder="请输入现在价格"/>
+          <el-input-number v-model="dialogForm.price" placeholder="请输入现在价格"/>
         </el-form-item>
         <el-form-item label="历史价格" prop="historicalPrices">
-          <el-input v-model="dialogForm.historicalPrices" placeholder="请输入历史价格"/>
+          <el-input-number v-model="dialogForm.historicalPrices" placeholder="请输入历史价格"/>
         </el-form-item>
         <el-form-item label="库存" prop="inventoryNumber">
           <el-input-number v-model="dialogForm.inventoryNumber" placeholder="请输入库存"/>

output/vue/page/GoodsTagView.vue

@@ -3,37 +3,31 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="名字" prop="name">
           <el-input v-model="query.name" placeholder="请输入名字"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="图标路径" prop="iconUrl">              <ImageUpload v-model:ImgUrl="query.iconUrl"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="标签" prop="tag">
           <el-input v-model="query.tag" placeholder="请输入标签"/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -80,7 +74,7 @@
         <el-table-column label="标签" align="center" prop="tag"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsTypeView.vue

@@ -3,45 +3,36 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="排序" prop="sort">                <el-text class="mx-1">{{query.sort}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="类型图片" prop="typeImage">              <ImageUpload v-model:ImgUrl="query.typeImage"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="商品类别名称" prop="typeName">
           <el-input v-model="query.typeName" placeholder="请输入商品类别名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
+      
+      
+      
+      
+      
+        <el-form-item label="创建时间" prop="createTime">      <DatePicker v-model:startDate=query.createTimeStart v-model:endDate=query.createTimeEnd/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -89,7 +80,7 @@
         <el-table-column label="创建时间" align="center" prop="createTime"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/GoodsView.vue

@@ -3,14 +3,12 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="分类id" prop="typeId">
           <el-select v-model="query.typeId" placeholder="请选择分类id">
             <el-option
@@ -20,45 +18,37 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="商品名字" prop="goodsName">
           <el-input v-model="query.goodsName" placeholder="请输入商品名字"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品介绍id" prop="introductionId">                <el-text class="mx-1">{{query.introductionId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="近30天销量" prop="salesVolume">
-          <el-input-number v-model="query.salesVolume" placeholder="请输入近30天销量"/>
+          <InputNumberRange v-model:min=query.salesVolumeStart v-model:max=query.salesVolumeEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品标签" prop="tagIds">                <el-text class="mx-1">{{query.tagIds}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -103,7 +93,7 @@
         <el-table-column label="商品标签" align="center" prop="tagIds"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/ManageUserView.vue

@@ -3,98 +3,67 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="名称" prop="name">                <el-text class="mx-1">{{query.name}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号" prop="username">                <el-text class="mx-1">{{query.username}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="密码" prop="password">                <el-text class="mx-1">{{query.password}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号创建时间" prop="creationTime">                <el-text class="mx-1">{{query.creationTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="登录时间" prop="loginTime">                <el-text class="mx-1">{{query.loginTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号状态" prop="status">                <el-text class="mx-1">{{query.status}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="角色id" prop="roleId">                <el-text class="mx-1">{{query.roleId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="手机" prop="phone">                <el-text class="mx-1">{{query.phone}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="邮箱" prop="email">                <el-text class="mx-1">{{query.email}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="头像" prop="avatar">                <el-text class="mx-1">{{query.avatar}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -144,7 +113,7 @@
         <el-table-column label="头像" align="center" prop="avatar"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/ShopAdviceCarouselView.vue

@@ -3,34 +3,30 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="广告名称" prop="name">
           <el-input v-model="query.name" placeholder="请输入广告名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="目标id" prop="toId">
           <el-input v-model="query.toId" placeholder="请输入目标id"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="广告类型，用于跳转到对应的页面" prop="adviceType">
           <el-select v-model="query.adviceType" placeholder="请选择广告类型，用于跳转到对应的页面">
             <el-option
@@ -40,39 +36,37 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="query.sort" placeholder="请输入排序"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="状态" prop="state">            <el-radio-group v-model="query.state">
-              <el-radio
-                  v-for="item in [['0','否'], ['1','是']]"
-                  :key="item[0]"
-                  :label="item[0]">
-                {{ item[1] }}
-              </el-radio>
-            </el-radio-group>
+      
+      
+      
+      
+      
+        <el-form-item label="状态" prop="state">
+          <el-radio-group v-model="query.state">
+            <el-radio
+              v-for="item in store.state.dicts.get(sys_state)"
+              :key="item.dictValue"
+              :label="item.dictLabel">
+              {{item.dictLabel}}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="显示类型，carousel轮播图，package，礼包" prop="showType">
           <el-select v-model="query.showType" placeholder="请选择显示类型，carousel轮播图，package，礼包">
             <el-option
@@ -82,58 +76,46 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建人" prop="createBy">                <el-text class="mx-1">{{query.createBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="创建时间" prop="createTime">                <el-text class="mx-1">{{query.createTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="更新人" prop="updateBy">                <el-text class="mx-1">{{query.updateBy}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="更新时间" prop="updateTime">                <el-text class="mx-1">{{query.updateTime}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="query.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="图片" prop="imageUrl">              <ImageUpload v-model:ImgUrl="query.imageUrl"/>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="更新时间" prop="updateTime">      <el-date-picker v-model="query.updateTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="目标类型" prop="toType">
           <el-select v-model="query.toType" placeholder="请选择目标类型">
             <el-option
@@ -143,7 +125,7 @@
               :value="item.dictValue"/>
           </el-select>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -189,7 +171,11 @@
         </template>
       </el-table-column>
         <el-table-column label="排序" align="center" prop="sort"/>
-        <el-table-column label="状态" align="center" prop="state"/>
+      <el-table-column label="状态" align="center" prop="state">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_state'" :dict-value="scope.row.state"/>
+        </template>
+      </el-table-column>
       <el-table-column label="显示类型，carousel轮播图，package，礼包" align="center" prop="showType">
         <template #default="scope">
           <DictTag :dict-type="'show_type'" :dict-value="scope.row.showType"/>
@@ -211,7 +197,7 @@
       </el-table-column>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -251,14 +237,15 @@
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="dialogForm.sort" placeholder="请输入排序"/>
         </el-form-item>
-        <el-form-item label="状态" prop="state">            <el-radio-group v-model="dialogForm.state">
-              <el-radio
-                  v-for="item in [['0','否'], ['1','是']]"
-                  :key="item[0]"
-                  :label="item[0]">
-                {{ item[1] }}
-              </el-radio>
-            </el-radio-group>
+        <el-form-item label="状态" prop="state">
+          <el-radio-group v-model="dialogForm.state">
+            <el-radio
+              v-for="item in store.state.dicts.get(sys_state)"
+              :key="item.dictValue"
+              :label="item.dictLabel">
+              {{item.dictLabel}}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="显示类型，carousel轮播图，package，礼包" prop="showType">
           <el-select v-model="dialogForm.showType" placeholder="请选择显示类型，carousel轮播图，package，礼包">
@@ -271,11 +258,11 @@
         </el-form-item>
         <el-form-item label="创建人" prop="createBy">                <el-text class="mx-1">{{dialogForm.createBy}}</el-text>
         </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">                <el-text class="mx-1">{{dialogForm.createTime}}</el-text>
+        <el-form-item label="创建时间" prop="createTime">      <el-date-picker v-model="dialogForm.createTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
         <el-form-item label="更新人" prop="updateBy">                <el-text class="mx-1">{{dialogForm.updateBy}}</el-text>
         </el-form-item>
-        <el-form-item label="更新时间" prop="updateTime">                <el-text class="mx-1">{{dialogForm.updateTime}}</el-text>
+        <el-form-item label="更新时间" prop="updateTime">      <el-date-picker v-model="dialogForm.updateTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
         <el-form-item label="图片" prop="imageUrl">              <ImageUpload v-model:ImgUrl="dialogForm.imageUrl"/>
         </el-form-item>

output/vue/page/ShopTopicSkuView.vue

@@ -3,30 +3,23 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-              
-            
-            
-        <el-form-item label="topicId" prop="topicId">                <el-text class="mx-1">{{query.topicId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-              
-            
-            
-        <el-form-item label="skuId" prop="skuId">                <el-text class="mx-1">{{query.skuId}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -68,7 +61,7 @@
         <el-table-column label="skuId" align="center" prop="skuId"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>

output/vue/page/ShopTopicView.vue

@@ -3,67 +3,52 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-              
-            
-            
-        <el-form-item label="sort" prop="sort">
-          <el-input-number v-model="query.sort" placeholder="请输入sort"/>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="父级id" prop="parentId">                <el-text class="mx-1">{{query.parentId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="主题首页图片" prop="topicPageImage">              <ImageUpload v-model:ImgUrl="query.topicPageImage"/>
+      
+      
+      
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="query.sort" placeholder="请输入排序"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
         <el-form-item label="主题名称" prop="topicName">
           <el-input v-model="query.topicName" placeholder="请输入主题名称"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
+      
+      
+      
+      
+      
         <el-form-item label="主题描述" prop="topicDesc">
           <el-input v-model="query.topicDesc" placeholder="请输入主题描述"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="商品类型id" prop="typeIds">                <el-text class="mx-1">{{query.typeIds}}</el-text>
-        </el-form-item>
-        
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -101,7 +86,7 @@
         <el-table-column type="selection" width="40" align="center"/>
         
         <el-table-column label="id" align="center" prop="id"/>
-        <el-table-column label="sort" align="center" prop="sort"/>
+        <el-table-column label="排序" align="center" prop="sort"/>
         <el-table-column label="父级id" align="center" prop="parentId"/>
       <el-table-column label="主题首页图片" align="center" prop="topicPageImage">
         <template #default="scope">
@@ -113,7 +98,7 @@
         <el-table-column label="商品类型id" align="center" prop="typeIds"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -135,8 +120,8 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="sort" prop="sort">
-          <el-input-number v-model="dialogForm.sort" placeholder="请输入sort"/>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dialogForm.sort" placeholder="请输入排序"/>
         </el-form-item>
         <el-form-item label="父级id" prop="parentId">                <el-text class="mx-1">{{dialogForm.parentId}}</el-text>
         </el-form-item>

output/vue/page/UserView.vue

@@ -3,116 +3,104 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号" prop="username">                <el-text class="mx-1">{{query.username}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="密码" prop="password">                <el-text class="mx-1">{{query.password}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号创建时间" prop="creationTime">                <el-text class="mx-1">{{query.creationTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="登录时间" prop="loginTime">                <el-text class="mx-1">{{query.loginTime}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="账号状态" prop="status">                <el-text class="mx-1">{{query.status}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="角色id" prop="roleId">                <el-text class="mx-1">{{query.roleId}}</el-text>
+        <el-form-item label="账号" prop="username">
+          <el-input v-model="query.username" placeholder="请输入账号"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="手机" prop="phone">                <el-text class="mx-1">{{query.phone}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="账号创建时间" prop="creationTime">      <el-date-picker v-model="query.creationTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="邮箱" prop="email">                <el-text class="mx-1">{{query.email}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="登录时间" prop="loginTime">      <el-date-picker v-model="query.loginTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="用户名" prop="name">                <el-text class="mx-1">{{query.name}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="账号状态" prop="status">
+          <el-select v-model="query.status" placeholder="请选择账号状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_ste')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="头像" prop="avatar">              <ImageUpload v-model:ImgUrl="query.avatar"/>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="手机" prop="phone">
+          <el-input v-model="query.phone" placeholder="请输入手机"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="推荐码" prop="recommendCode">                <el-text class="mx-1">{{query.recommendCode}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="query.email" placeholder="请输入邮箱"/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="邀请人" prop="inviterBy">                <el-text class="mx-1">{{query.inviterBy}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="用户名" prop="name">
+          <el-input v-model="query.name" placeholder="请输入用户名"/>
         </el-form-item>
-        
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
     </el-form>
     </div>
@@ -154,7 +142,11 @@
         <el-table-column label="密码" align="center" prop="password"/>
         <el-table-column label="账号创建时间" align="center" prop="creationTime"/>
         <el-table-column label="登录时间" align="center" prop="loginTime"/>
-        <el-table-column label="账号状态" align="center" prop="status"/>
+      <el-table-column label="账号状态" align="center" prop="status">
+        <template #default="scope">
+          <DictTag :dict-type="'sys_ste'" :dict-value="scope.row.status"/>
+        </template>
+      </el-table-column>
         <el-table-column label="角色id" align="center" prop="roleId"/>
         <el-table-column label="手机" align="center" prop="phone"/>
         <el-table-column label="邮箱" align="center" prop="email"/>
@@ -168,7 +160,7 @@
         <el-table-column label="邀请人" align="center" prop="inviterBy"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -190,23 +182,34 @@
         <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
           <el-form ref="dictRef" :model="dialogForm" label-width="80px">
             
-        <el-form-item label="账号" prop="username">                <el-text class="mx-1">{{dialogForm.username}}</el-text>
+        <el-form-item label="账号" prop="username">
+          <el-input v-model="dialogForm.username" placeholder="请输入账号"/>
         </el-form-item>
         <el-form-item label="密码" prop="password">                <el-text class="mx-1">{{dialogForm.password}}</el-text>
         </el-form-item>
-        <el-form-item label="账号创建时间" prop="creationTime">                <el-text class="mx-1">{{dialogForm.creationTime}}</el-text>
+        <el-form-item label="账号创建时间" prop="creationTime">      <el-date-picker v-model="dialogForm.creationTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        <el-form-item label="登录时间" prop="loginTime">                <el-text class="mx-1">{{dialogForm.loginTime}}</el-text>
+        <el-form-item label="登录时间" prop="loginTime">      <el-date-picker v-model="dialogForm.loginTime" type="datetime" placeholder="请选择时间" value-format="YYYY-MM-DD hh:mm:ss"/>
         </el-form-item>
-        <el-form-item label="账号状态" prop="status">                <el-text class="mx-1">{{dialogForm.status}}</el-text>
+        <el-form-item label="账号状态" prop="status">
+          <el-select v-model="dialogForm.status" placeholder="请选择账号状态">
+            <el-option
+              v-for="item in store.state.dicts.get('sys_ste')"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="角色id" prop="roleId">                <el-text class="mx-1">{{dialogForm.roleId}}</el-text>
         </el-form-item>
-        <el-form-item label="手机" prop="phone">                <el-text class="mx-1">{{dialogForm.phone}}</el-text>
+        <el-form-item label="手机" prop="phone">
+          <el-input v-model="dialogForm.phone" placeholder="请输入手机"/>
         </el-form-item>
-        <el-form-item label="邮箱" prop="email">                <el-text class="mx-1">{{dialogForm.email}}</el-text>
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="dialogForm.email" placeholder="请输入邮箱"/>
         </el-form-item>
-        <el-form-item label="用户名" prop="name">                <el-text class="mx-1">{{dialogForm.name}}</el-text>
+        <el-form-item label="用户名" prop="name">
+          <el-input v-model="dialogForm.name" placeholder="请输入用户名"/>
         </el-form-item>
         <el-form-item label="头像" prop="avatar">              <ImageUpload v-model:ImgUrl="dialogForm.avatar"/>
         </el-form-item>

output/vue/page/UserWalletView.vue

@@ -3,44 +3,40 @@
     <div>
     <el-form :model="query" label-width="80px" :inline="true">
       
-        
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="用户id" prop="userId">                <el-text class="mx-1">{{query.userId}}</el-text>
-        </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="余额" prop="balance">                <el-text class="mx-1">{{query.balance}}</el-text>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+        <el-form-item label="余额" prop="balance">
+          <InputNumberRange v-model:min=query.balanceStart v-model:max=query.balanceEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="推广获取总金额" prop="promotionAmount">                <el-text class="mx-1">{{query.promotionAmount}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="推广获取总金额" prop="promotionAmount">
+          <InputNumberRange v-model:min=query.promotionAmountStart v-model:max=query.promotionAmountEnd/>
         </el-form-item>
-        
       
-        
-        
-            
-            
-            
-        <el-form-item label="充值金额" prop="rechargeAmount">                <el-text class="mx-1">{{query.rechargeAmount}}</el-text>
+      
+      
+      
+      
+      
+        <el-form-item label="充值金额" prop="rechargeAmount">
+          <InputNumberRange v-model:min=query.rechargeAmountStart v-model:max=query.rechargeAmountEnd/>
         </el-form-item>
-        
+      
       
     </el-form>
     </div>
@@ -84,7 +80,7 @@
         <el-table-column label="充值金额" align="center" prop="rechargeAmount"/>
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-            <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
+            <el-button link type="primary" @click="openDialog('update',scope.row)">修改</el-button>
             <el-button link type="danger" @click="deleteById(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -108,11 +104,14 @@
             
         <el-form-item label="用户id" prop="userId">                <el-text class="mx-1">{{dialogForm.userId}}</el-text>
         </el-form-item>
-        <el-form-item label="余额" prop="balance">                <el-text class="mx-1">{{dialogForm.balance}}</el-text>
+        <el-form-item label="余额" prop="balance">
+          <el-input-number v-model="dialogForm.balance" placeholder="请输入余额"/>
         </el-form-item>
-        <el-form-item label="推广获取总金额" prop="promotionAmount">                <el-text class="mx-1">{{dialogForm.promotionAmount}}</el-text>
+        <el-form-item label="推广获取总金额" prop="promotionAmount">
+          <el-input-number v-model="dialogForm.promotionAmount" placeholder="请输入推广获取总金额"/>
         </el-form-item>
-        <el-form-item label="充值金额" prop="rechargeAmount">                <el-text class="mx-1">{{dialogForm.rechargeAmount}}</el-text>
+        <el-form-item label="充值金额" prop="rechargeAmount">
+          <el-input-number v-model="dialogForm.rechargeAmount" placeholder="请输入充值金额"/>
         </el-form-item>
           </el-form>
           <template #footer>

util/BaseTemplateFunc.go

@@ -114,20 +114,22 @@ func QueryType(GoType, GoField, QueryType, ColumnName, ColumnComment string) str
 	return GoField + " string  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment
 }
 
-func ElFrom(name, value, typeName, dictType string) string {
+func ElFrom(name, value, typeName, dictType, queryType string) string {
 	typeName = strings.ToLower(typeName)
 	if typeName == "input" {
 		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
 			"\n          <el-input v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\"/>" +
 			"\n        </el-form-item>"
 	} else if typeName == "number" {
-		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
-			"\n          <el-input-number v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\"/>" +
-			"\n        </el-form-item>"
-	} else if typeName == "textarea" {
-		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
-			"\n          <el-input v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\" type=\"textarea\"/>" +
-			"\n        </el-form-item>"
+		if strings.ToUpper(queryType) == "BETWEEN" {
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"\n          <InputNumberRange v-model:min=query." + value + "Start v-model:max=query." + value + "End/>" +
+				"\n        </el-form-item>"
+		} else {
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"\n          <el-input-number v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\"/>" +
+				"\n        </el-form-item>"
+		}
 	} else if typeName == "select" {
 		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
 			"\n          <el-select v-model=\"query." + value + "\" placeholder=\"请选择" + name + "\">" +
@@ -162,16 +164,29 @@ func ElFrom(name, value, typeName, dictType string) string {
 				"\n          </el-radio-group>" +
 				"\n        </el-form-item>"
 		}
+	} else if typeName == "time" {
+		if strings.ToUpper(queryType) == "BETWEEN" {
+			//
+
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"      <DatePicker v-model:startDate=query." + value + "Start v-model:endDate=query." + value + "End/>" +
+				"\n        </el-form-item>"
+		} else {
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"      <el-date-picker v-model=\"query." + value + "\" type=\"datetime\" placeholder=\"请选择时间\" value-format=\"YYYY-MM-DD hh:mm:ss\"/>" +
+				"\n        </el-form-item>"
+		}
+	}
+	/*else if typeName == "textarea" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n          <el-input v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\" type=\"textarea\"/>" +
+			"\n        </el-form-item>"
 	} else if typeName == "checkbox" {
 		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
 			"\n        	<el-checkbox-group v-model=\"query." + value + "\">" +
 			"\n          <el-checkbox :label=\"item.dictLabel\" :value=\"item.dictValue\" v-for=\"item in store.state.dicts.get('" + dictType + "')\"/>" +
 			"\n        </el-checkbox-group>" +
 			"\n        </el-form-item>"
-	} else if typeName == "time" {
-		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
-			"      <el-date-picker v-model=\"query." + value + "\" type=\"datetime\" placeholder=\"请选择时间\" value-format=\"YYYY-MM-DD hh:mm:ss\"/>" +
-			"\n        </el-form-item>"
 	} else if typeName == "image" {
 		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
 			"              <ImageUpload v-model:ImgUrl=\"query." + value + "\"/>" +
@@ -187,11 +202,8 @@ func ElFrom(name, value, typeName, dictType string) string {
 		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
 			"                <el-text class=\"mx-1\">{{query." + value + "}}</el-text>" +
 			"\n        </el-form-item>"
-	}
-	//默认的就显示文本
-	return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
-		"                <el-text class=\"mx-1\">{{query." + value + "}}</el-text>" +
-		"\n        </el-form-item>"
+	}*/
+	return ""
 }
 
 func ElTableColumn(name, value, typeName string, dictType string) string {