Merge branch 'dev/v4.9.14_dx' of qmx/jy into feature/v4.9.14

src/jfw/front/dataServiceArea.go

@@ -184,11 +184,13 @@ func DistrictsTender(number int) []argument {
 			break
 		}
 		data = append(data, argument{
-			fmt.Sprintf("%s%s", acronym.city, acronym.district),
+			common.If(strings.Contains(acronym.district, "区"), fmt.Sprintf("%s%s", acronym.city, acronym.district), acronym.district).(string),
 			fmt.Sprintf("/list/area/%s.html", acronym.code),
 		})
 	}
-	redis.Put(RedisNameNew, redisKey, data, RedisTimeout)
+	if data != nil && len(data) > 0 {
+		redis.Put(RedisNameNew, redisKey, data, RedisTimeout)
+	}
 	return data
 }
 

src/web/templates/pc/template/index/important-gov-bidding.html

@@ -14,12 +14,12 @@
       </li>
       <li class="i-g-card-list-item" data-value="地区招标" style="display: none;">
         {{range $n := .T.districtsBidding}}
-        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}" target="_blank">{{$n.Name}}</a>
+        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}招标采购" target="_blank">{{$n.Name}}</a>
         {{end}}
       </li>
       <li class="i-g-card-list-item" data-value="政府招标" style="display: none;">
         {{range $n := .T.governmentBidding}}
-        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}" target="_blank">{{$n.Name}}</a>
+        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}招标采购" target="_blank">{{$n.Name}}</a>
         {{end}}
       </li>
     </ul>