|
@@ -115,7 +115,17 @@ func (m *PcIndex) NewSordfish(flag string) error {
|
|
|
}
|
|
|
if !isLogin {
|
|
|
appendData := []interface{}{}
|
|
|
- if labUrl_2, ok := m.T["labUrl_2"].([]map[string][]map[string]interface{}); ok {
|
|
|
+ if labUrl_2, ok := m.T["labUrl_2"].([]interface{}); ok {
|
|
|
+ for i := 0; i < len(labUrl_2); i++ {
|
|
|
+ labUrl_ := util.ObjToMap(labUrl_2[i])
|
|
|
+ if labUrl_ != nil {
|
|
|
+ if _, ok := (*labUrl_)["拟建项目"]; ok {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ appendData = append(appendData, labUrl_)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if labUrl_2, ok := m.T["labUrl_2"].([]map[string][]map[string]interface{}); ok {
|
|
|
for i := 0; i < len(labUrl_2); i++ {
|
|
|
labUrl_ := labUrl_2[i]
|
|
|
if labUrl_ != nil {
|
|
@@ -125,8 +135,8 @@ func (m *PcIndex) NewSordfish(flag string) error {
|
|
|
appendData = append(appendData, labUrl_)
|
|
|
}
|
|
|
}
|
|
|
- m.T["labUrl_2"] = appendData
|
|
|
}
|
|
|
+ m.T["labUrl_2"] = appendData
|
|
|
}
|
|
|
return m.Render("/pc/index_old.html", &m.T)
|
|
|
} else if flag == "tmp" {
|
|
@@ -144,14 +154,25 @@ func (m *PcIndex) NewSordfish(flag string) error {
|
|
|
// p397 未登录信息类型不展示拟建
|
|
|
if !isLogin {
|
|
|
appendData := []interface{}{}
|
|
|
- labUrl_2 := m.T["labUrl_2"].([]interface{})
|
|
|
- for i := 0; i < len(labUrl_2); i++ {
|
|
|
- labUrl_ := util.ObjToMap(labUrl_2[i])
|
|
|
- if labUrl_ != nil {
|
|
|
- if _, ok := (*labUrl_)["拟建项目"]; ok {
|
|
|
- continue
|
|
|
+ if labUrl_2, ok := m.T["labUrl_2"].([]interface{}); ok {
|
|
|
+ for i := 0; i < len(labUrl_2); i++ {
|
|
|
+ labUrl_ := util.ObjToMap(labUrl_2[i])
|
|
|
+ if labUrl_ != nil {
|
|
|
+ if _, ok := (*labUrl_)["拟建项目"]; ok {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ appendData = append(appendData, labUrl_)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if labUrl_2, ok := m.T["labUrl_2"].([]map[string][]map[string]interface{}); ok {
|
|
|
+ for i := 0; i < len(labUrl_2); i++ {
|
|
|
+ labUrl_ := labUrl_2[i]
|
|
|
+ if labUrl_ != nil {
|
|
|
+ if _, ok := (labUrl_)["拟建项目"]; ok {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ appendData = append(appendData, labUrl_)
|
|
|
}
|
|
|
- appendData = append(appendData, labUrl_)
|
|
|
}
|
|
|
}
|
|
|
m.T["labUrl_2"] = appendData
|