diff --git a/server/common/consts/consts.go b/server/common/consts/consts.go
index 9765b40..15fe8d4 100644
--- a/server/common/consts/consts.go
+++ b/server/common/consts/consts.go
@@ -7,14 +7,18 @@ package common
type GoodsType int
const (
- GoodsTypeSolidDoor GoodsType = 1 // 实木门
- GoodsTypeCompositeDoor GoodsType = 2 // 复合板门
- GoodsTypeChair GoodsType = 3 // 椅子
- GoodsTypeCombo GoodsType = 4 // 组合
- GoodsTypeVanity GoodsType = 5 // 浴室柜
- GoodsTypeCloset GoodsType = 6 // 衣柜
- GoodsTypeMDKitchen GoodsType = 7 // 现代橱柜
- GoodsTypeCCKitchen GoodsType = 8 // 古典橱柜
+ GoodsTypeSolidDoor GoodsType = 1 // 实木门
+ GoodsTypeCompositeDoor GoodsType = 2 // 复合板门
+ GoodsTypeChair GoodsType = 3 // 椅子
+ GoodsTypeCombo GoodsType = 4 // 组合
+ GoodsTypeVanity GoodsType = 5 // 浴室柜
+ GoodsTypeCloset GoodsType = 6 // 衣柜
+ GoodsTypeMDKitchen GoodsType = 7 // 现代橱柜
+ GoodsTypeCCKitchen GoodsType = 8 // 古典橱柜
+ GoodsTypeBed GoodsType = 9 // 床
+ GoodsTypeMattress GoodsType = 10 // 床垫
+ GoodsTypeLivingRoom GoodsType = 11 // 客厅
+ GoodsTypeDiningRoom GoodsType = 12 // 餐厅
)
// LangType 文字类型
diff --git a/server/common/consts/goodstype_map.go b/server/common/consts/goodstype_map.go
index 2ff8b51..5a54324 100644
--- a/server/common/consts/goodstype_map.go
+++ b/server/common/consts/goodstype_map.go
@@ -1,7 +1,7 @@
package common
func GetGoodsTypeMap() (r map[GoodsType]string) {
- l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen}
+ l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen, GoodsTypeBed, GoodsTypeMattress, GoodsTypeLivingRoom, GoodsTypeDiningRoom}
r = make(map[GoodsType]string)
for _, k := range l {
r[k] = k.String()
@@ -9,7 +9,7 @@ func GetGoodsTypeMap() (r map[GoodsType]string) {
return r
}
func GetGoodsTypeReverseMap() (r map[string]GoodsType) {
- l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen}
+ l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen, GoodsTypeBed, GoodsTypeMattress, GoodsTypeLivingRoom, GoodsTypeDiningRoom}
r = make(map[string]GoodsType)
for _, k := range l {
r[k.String()] = k
@@ -17,7 +17,7 @@ func GetGoodsTypeReverseMap() (r map[string]GoodsType) {
return r
}
func GetGoodsTypeReverseIntMap() (r map[string]int) {
- l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen}
+ l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen, GoodsTypeBed, GoodsTypeMattress, GoodsTypeLivingRoom, GoodsTypeDiningRoom}
r = make(map[string]int)
for _, k := range l {
r[k.String()] = int(k)
@@ -26,7 +26,7 @@ func GetGoodsTypeReverseIntMap() (r map[string]int) {
}
func (t GoodsType) Check() bool {
- l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen}
+ l := []GoodsType{GoodsTypeSolidDoor, GoodsTypeCompositeDoor, GoodsTypeChair, GoodsTypeCombo, GoodsTypeVanity, GoodsTypeCloset, GoodsTypeMDKitchen, GoodsTypeCCKitchen, GoodsTypeBed, GoodsTypeMattress, GoodsTypeLivingRoom, GoodsTypeDiningRoom}
for i := range l {
if l[i] == t {
return true
diff --git a/server/common/consts/goodstype_string.go b/server/common/consts/goodstype_string.go
index ccdfa0e..041d515 100644
--- a/server/common/consts/goodstype_string.go
+++ b/server/common/consts/goodstype_string.go
@@ -16,11 +16,15 @@ func _() {
_ = x[GoodsTypeCloset-6]
_ = x[GoodsTypeMDKitchen-7]
_ = x[GoodsTypeCCKitchen-8]
+ _ = x[GoodsTypeBed-9]
+ _ = x[GoodsTypeMattress-10]
+ _ = x[GoodsTypeLivingRoom-11]
+ _ = x[GoodsTypeDiningRoom-12]
}
-const _GoodsType_name = "实木门复合板门椅子组合浴室柜衣柜现代橱柜古典橱柜"
+const _GoodsType_name = "实木门复合板门椅子组合浴室柜衣柜现代橱柜古典橱柜床床垫客厅餐厅"
-var _GoodsType_index = [...]uint8{0, 9, 21, 27, 33, 42, 48, 60, 72}
+var _GoodsType_index = [...]uint8{0, 9, 21, 27, 33, 42, 48, 60, 72, 75, 81, 87, 93}
func (i GoodsType) String() string {
i -= 1
diff --git a/server/common/consts/langtype_map.go b/server/common/consts/langtype_map.go
index 608a34c..738800c 100644
--- a/server/common/consts/langtype_map.go
+++ b/server/common/consts/langtype_map.go
@@ -4,7 +4,7 @@ func GetLangTypeMap() (r map[LangType]string) {
l := []LangType{LangTypeChinese, LangTypeEnglish}
r = make(map[LangType]string)
for _, k := range l {
- r[k] = k.ToString()
+ r[k] = k.String()
}
return r
}
@@ -12,7 +12,7 @@ func GetLangTypeReverseMap() (r map[string]LangType) {
l := []LangType{LangTypeChinese, LangTypeEnglish}
r = make(map[string]LangType)
for _, k := range l {
- r[k.ToString()] = k
+ r[k.String()] = k
}
return r
}
@@ -20,7 +20,7 @@ func GetLangTypeReverseIntMap() (r map[string]int) {
l := []LangType{LangTypeChinese, LangTypeEnglish}
r = make(map[string]int)
for _, k := range l {
- r[k.ToString()] = int(k)
+ r[k.String()] = int(k)
}
return r
}
diff --git a/server/common/consts/langtype_string.go b/server/common/consts/langtype_string.go
index 28a54b5..0bbaad6 100644
--- a/server/common/consts/langtype_string.go
+++ b/server/common/consts/langtype_string.go
@@ -16,7 +16,7 @@ const _LangType_name = "中文英文"
var _LangType_index = [...]uint8{0, 6, 12}
-func (i LangType) ToString() string {
+func (i LangType) String() string {
i -= 1
if i < 0 || i >= LangType(len(_LangType_index)-1) {
return "LangType(" + strconv.FormatInt(int64(i+1), 10) + ")"
diff --git a/web/foreground/en/index.html b/web/foreground/en/index.html
index f22351b..9eb13dc 100644
--- a/web/foreground/en/index.html
+++ b/web/foreground/en/index.html
@@ -274,19 +274,36 @@
>Closet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
