Browse Source

fix:调整品种权限名称

Roc 3 years ago
parent
commit
164551a1b8
2 changed files with 21 additions and 21 deletions
  1. 20 20
      logic/public.go
  2. 1 1
      logic/user/user.go

+ 20 - 20
logic/public.go

@@ -8,25 +8,25 @@ type ApplyVariety struct {
 
 // GetApplyVarietyList 获取所有可以申请的品种权限
 func GetApplyVarietyList() (list []ApplyVariety) {
-	list = append(list, ApplyVariety{PermissionName: "宏观经济", Name: "宏观经济", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/宏观经济.png"})
-	list = append(list, ApplyVariety{PermissionName: "利率债", Name: "利率债", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/利率债.png"})
-	list = append(list, ApplyVariety{PermissionName: "钢材", Name: "钢材", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/钢材.png"})
-	list = append(list, ApplyVariety{PermissionName: "铁矿", Name: "铁矿", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/铁矿.png"})
-	list = append(list, ApplyVariety{PermissionName: "双焦(焦煤、焦炭)", Name: "双焦(焦煤、焦炭)", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/双焦(焦煤、焦炭).png"})
-	list = append(list, ApplyVariety{PermissionName: "有色(锌、铅)", Name: "有色(锌、铅)", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/有色(锌、铅).png"})
-	list = append(list, ApplyVariety{PermissionName: "有色(铜、铝)", Name: "有色(铜、铝)", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/有色(铜、铝).png"})
-	list = append(list, ApplyVariety{PermissionName: "镍+不锈钢", Name: "镍+不锈钢", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/镍2不锈钢.png"})
-	list = append(list, ApplyVariety{PermissionName: "原油", Name: "原油", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/原油.png"})
-	list = append(list, ApplyVariety{PermissionName: "聚烯烃", Name: "聚烯烃", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/聚烯烃.png"})
-	list = append(list, ApplyVariety{PermissionName: "苯乙烯", Name: "苯乙烯", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/苯乙烯.png"})
-	list = append(list, ApplyVariety{PermissionName: "甲醇", Name: "甲醇", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/甲醇.png"})
-	list = append(list, ApplyVariety{PermissionName: "玻璃纯碱", Name: "玻璃纯碱", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/玻璃纯碱.png"})
-	list = append(list, ApplyVariety{PermissionName: "橡胶", Name: "橡胶", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/橡胶.png"})
-	//list = append(list, ApplyVariety{PermissionName: "聚酯", Name: "聚酯", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/聚酯.png"})
-	list = append(list, ApplyVariety{PermissionName: "PTA", Name: "PTA", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/PTA.png"})
-	list = append(list, ApplyVariety{PermissionName: "MEG", Name: "MEG", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/MEG.png"})
-	list = append(list, ApplyVariety{PermissionName: "沥青", Name: "沥青", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/沥青.png"})
-	list = append(list, ApplyVariety{PermissionName: "织造终端", Name: "织造终端", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/织造终端.png"})
-	list = append(list, ApplyVariety{PermissionName: "市场策略", Name: "市场策略", PicUrl: "http://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/市场策略.png"})
+	list = append(list, ApplyVariety{PermissionName: "宏观经济", Name: "宏观经济", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/宏观经济.png"})
+	list = append(list, ApplyVariety{PermissionName: "利率债", Name: "利率债", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/利率债.png"})
+	list = append(list, ApplyVariety{PermissionName: "钢材", Name: "钢材", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/钢材.png"})
+	list = append(list, ApplyVariety{PermissionName: "铁矿", Name: "铁矿", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/铁矿.png"})
+	list = append(list, ApplyVariety{PermissionName: "双焦(焦煤、焦炭)", Name: "双焦(焦煤、焦炭)", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/双焦(焦煤、焦炭).png"})
+	list = append(list, ApplyVariety{PermissionName: "有色(锌、铅)", Name: "有色(锌、铅)", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/有色(锌、铅).png"})
+	list = append(list, ApplyVariety{PermissionName: "有色(铜、铝)", Name: "有色(铜、铝)", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/有色(铜、铝).png"})
+	list = append(list, ApplyVariety{PermissionName: "镍+不锈钢", Name: "镍+不锈钢", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/镍2不锈钢.png"})
+	list = append(list, ApplyVariety{PermissionName: "原油", Name: "原油", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/原油.png"})
+	list = append(list, ApplyVariety{PermissionName: "聚烯烃", Name: "聚烯烃", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/聚烯烃.png"})
+	list = append(list, ApplyVariety{PermissionName: "苯乙烯", Name: "苯乙烯", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/苯乙烯.png"})
+	list = append(list, ApplyVariety{PermissionName: "甲醇", Name: "甲醇", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/甲醇.png"})
+	list = append(list, ApplyVariety{PermissionName: "玻璃纯碱", Name: "玻璃纯碱", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/玻璃纯碱.png"})
+	list = append(list, ApplyVariety{PermissionName: "橡胶", Name: "橡胶", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/橡胶.png"})
+	//list = append(list, ApplyVariety{PermissionName: "聚酯", Name: "聚酯", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/聚酯.png"})
+	list = append(list, ApplyVariety{PermissionName: "PTA", Name: "PTA", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/PTA.png"})
+	list = append(list, ApplyVariety{PermissionName: "MEG", Name: "MEG", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/MEG.png"})
+	list = append(list, ApplyVariety{PermissionName: "沥青", Name: "沥青", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/沥青.png"})
+	list = append(list, ApplyVariety{PermissionName: "织造终端", Name: "织造终端", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/织造终端.png"})
+	list = append(list, ApplyVariety{PermissionName: "策略", Name: "市场策略", PicUrl: "https://hongze.oss-cn-shanghai.aliyuncs.com/static/yb_variety/市场策略.png"})
 	return
 }

+ 1 - 1
logic/user/user.go

@@ -168,7 +168,7 @@ func GetUserInfo(userInfo user.UserInfo) (userDetail Detail, err error, errMsg s
 				chartPermission, ok := permissionClassMap[permission.ChartPermissionID]
 				if ok {
 					tmpPermission := PermissionList{
-						Name:      chartPermission.ChartPermissionName,
+						Name:      chartPermission.PermissionName,
 						StartDate: permission.StartDate,
 						EndDate:   permission.EndDate,
 						Status:    permission.Status,