Эх сурвалжийг харах

Merge branch 'feature/v4.9.31' into dev/v4.9.31_zsy

zhangsiya 1 жил өмнө
parent
commit
7531ddb4a2

+ 1 - 3
src/index.yaml

@@ -83,11 +83,9 @@ topMenu:
         href: /swordfish/frontPage/enterpriseCertificatio/free/index
       - name: 展会报名
         href: /exhibition/list/pc/index.html
-      - name: 商务合作
+      - name: 渠道及商务合作
         href: /swordfish/frontPage/cooperation/free/index
         class: red
-      - name: 合作招募
-        href: /swordfish/frontPage/partner/free/index
       - name: 发布供需信息
         href: /swordfish/frontPage/InformationDistribution/free/index
         class: red

+ 3 - 2
src/jfw/modules/bigmember/src/service/use/custom.go

@@ -18,8 +18,9 @@ func (u *Use) GetCustom() {
 			if userid == "" || t == "kf" {
 				return
 			}
+
 			bigPower := jy.GetBigVipUserBaseMsg(u.Session(), *config.Middleground)
-			if (bigPower.Status <= 0 && bigPower.EntnicheStatus <= 0) || bigPower.EntName != "" {
+			if (bigPower.Status <= 0 && bigPower.EntnicheStatus <= 0) || bigPower.EntName == "" {
 				return ""
 			}
 			info := db.MysqlSubject.FindOne("dwd_f_csm_customer_info", map[string]interface{}{
@@ -29,7 +30,7 @@ func (u *Use) GetCustom() {
 			if info != nil && len(*info) > 0 {
 				customName = qu.ObjToString((*info)["name"])
 			}
-			return ""
+			return
 		}()
 		return Result{Data: getWxm(cName)}
 	}()