Merge branch 'master' into feature/v4.8.83

src/jfw/modules/bigmember/src/service/use/use.go

@@ -220,6 +220,38 @@ func (u *Use) Info() {
 		i_member_status := qu.IntAll((*data)["i_member_status"])
 		o_member_jy := qu.ObjToMap((*data)["o_member_jy"])
 		if i_member_status != 0 {
+			//区县处理
+			regionMap := map[string]map[string][]string{}
+			if i_member_status > 0 && o_member_jy != nil && len(*o_member_jy) > 0 {
+				if (*o_member_jy)["o_area"] != nil {
+					district := map[string]interface{}{}
+					if (*o_member_jy)["o_district"] != nil {
+						district = *qu.ObjToMap((*o_member_jy)["o_district"])
+					}
+					o_area := (*o_member_jy)["o_area"]
+					for k, v := range *qu.ObjToMap(o_area) {
+						areaMap := map[string][]string{}
+						if k == "北京" || k == "天津" || k == "上海" || k == "重庆" {
+							city := fmt.Sprintf("%s市", k)
+							if district[city] != nil {
+								v = city
+							}
+						}
+						for _, city := range gconv.Strings(v) {
+							if city == "" {
+								continue
+							}
+							if district[city] != nil {
+								areaMap[city] = gconv.Strings(district[city])
+							} else {
+								areaMap[city] = []string{}
+							}
+						}
+						regionMap[k] = areaMap
+					}
+				}
+			}
+			(*o_member_jy)["regionMap"] = regionMap
 			//是否展示附加词合并
 			appendK_bl := false
 			if btip, _ := (*o_member_jy)["b_keytip"].(bool); !btip && i_member_status > 0 && o_member_jy != nil && len(*o_member_jy) > 0 {
@@ -250,35 +282,7 @@ func (u *Use) Info() {
 				if (*o_member_jy)["o_area"] == nil {
 					(*o_member_jy)["o_area"] = map[string]interface{}{}
 				}
-				regionMap := map[string]map[string][]string{}
-				if (*o_member_jy)["o_area"] != nil {
-					district := map[string]interface{}{}
-					if (*o_member_jy)["o_district"] != nil {
-						district = *qu.ObjToMap((*o_member_jy)["o_district"])
-					}
-					o_area := (*o_member_jy)["o_area"]
-					for k, v := range *qu.ObjToMap(o_area) {
-						areaMap := map[string][]string{}
-						if k == "北京" || k == "天津" || k == "上海" || k == "重庆" {
-							city := fmt.Sprintf("%s市", k)
-							if district[city] != nil {
-								v = city
-							}
-						}
-						for _, city := range gconv.Strings(v) {
-							if city == "" {
-								continue
-							}
-							if district[city] != nil {
-								areaMap[city] = gconv.Strings(district[city])
-							} else {
-								areaMap[city] = []string{}
-							}
-						}
-						regionMap[k] = areaMap
-					}
-				}
-				(*o_member_jy)["regionMap"] = regionMap
+
 				//大会员默认全国
 				//大会员单省版本
 				(*o_member_jy)["i_areacount"] = qu.IntAllDef((*o_member_jy)["i_areacount"], -1)

src/web/staticres/js/selector/area-city-country.js

@@ -337,7 +337,7 @@ var areaCityCountrySelector = {
       const specialRegion = ['香港', '澳门', '台湾']
       // 按拼音排序
       const sortFilterData = filterData.sort((prev, next) => {
-        return prev?.name.localeCompare(next?.name, 'zh')
+        return prev.name.localeCompare(next.name, 'zh')
       })
       // 处理成标准字段
       const standardData = sortFilterData.map(p => {

src/web/templates/pc/supsearch.html

@@ -1897,7 +1897,7 @@
 <script src='{{Msg "seo" "cdn"}}/js/selector/keyword-tags.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/selector/keyword-tags-new.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/selector/area-city-data.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/js/selector/area-city-country.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/selector/area-city-country.min.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/buyerClass.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/province_city.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -195,7 +195,7 @@
             </li>
           </ul>
         </li>
-        <sub-component ref="subComponent" :linkobj="linkObj" :initdata="initData" @mounted="superOrderTemplateMounted" :v-switch="vSwitch"  @back-init="getUserType"></sub-component>
+        <sub-component ref="subComponent" get-container="body" :linkobj="linkObj" :initdata="initData" @mounted="superOrderTemplateMounted" :v-switch="vSwitch"  @back-init="getUserType"></sub-component>
         <div class="provincePayWarp" v-show="userType">
             <span class="provincePayTips">省份订阅包</span>
             <div class="provincePay">