Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

controllers/order.go

@@ -486,8 +486,10 @@ func (this *OrderController) UserOrderList() {
 				item.StartDate = v.StartDate.Format(utils.FormatDate)
 				item.EndDate = v.EndDate.Format(utils.FormatDate)
 			}
-		} else {
+		} else if orderType == 2 {
 			item.LabelKeywordImgLink = utils.LABEL_ICO_3
+		} else if orderType == 3 {
+			item.LabelKeywordImgLink = utils.LABEL_ICO_10
 		}
 
 		if v.OrderType == 3 {

utils/constants.go

@@ -331,13 +331,14 @@ const (
 	//LABEL_ICO_5 string = "https://hzstatic.hzinsights.com/mfyx/config/Frame468.png" // 纪要
 	//LABEL_ICO_6 string = "https://hzstatic.hzinsights.com/mfyx/config/Frame469.png" // 买方沙龙
 
-	LABEL_ICO_1 string = "https://hzstatic.hzinsights.com/mfyx/config/maifangjiaoliu.png"           // 买方交流
-	LABEL_ICO_2 string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanjiadiaoyan.png"          // 专家访谈
-	LABEL_ICO_3 string = "https://hzstatic.hzinsights.com/mfyx/config/shangshigongsixiaofanwei.png" // 上市公司小范围
-	LABEL_ICO_4 string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanlan.png"                 // 专栏
-	LABEL_ICO_5 string = "https://hzstatic.hzinsights.com/mfyx/config/jiyao.png"                    // 纪要
-	LABEL_ICO_6 string = "https://hzstatic.hzinsights.com/mfyx/config/maifangshalong.png"           // 买方沙龙
-	LABEL_ICO_7 string = "https://hzstatic.hzinsights.com/mfyx/config/rika.png"                     // 日卡图标
-	LABEL_ICO_8 string = "https://hzstatic.hzinsights.com/mfyx/config/yueka.png"                    // 月卡图标
-	LABEL_ICO_9 string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanlan_author.png"          // 专栏作者
+	LABEL_ICO_1  string = "https://hzstatic.hzinsights.com/mfyx/config/maifangjiaoliu.png"           // 买方交流
+	LABEL_ICO_2  string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanjiadiaoyan.png"          // 专家访谈
+	LABEL_ICO_3  string = "https://hzstatic.hzinsights.com/mfyx/config/shangshigongsixiaofanwei.png" // 上市公司小范围
+	LABEL_ICO_4  string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanlan.png"                 // 专栏
+	LABEL_ICO_5  string = "https://hzstatic.hzinsights.com/mfyx/config/jiyao.png"                    // 纪要
+	LABEL_ICO_6  string = "https://hzstatic.hzinsights.com/mfyx/config/maifangshalong.png"           // 买方沙龙
+	LABEL_ICO_7  string = "https://hzstatic.hzinsights.com/mfyx/config/rika.png"                     // 日卡图标
+	LABEL_ICO_8  string = "https://hzstatic.hzinsights.com/mfyx/config/yueka.png"                    // 月卡图标
+	LABEL_ICO_9  string = "https://hzstatic.hzinsights.com/mfyx/config/zhuanlan_author.png"          // 专栏作者
+	LABEL_ICO_10 string = "https://hzstatic.hzinsights.com/mfyx/config/activity_vivo.png"            // 活动音视频
 )