Merge branch 'dev2.9.0' of http://39.105.157.10:10080/qmx/jy into dev2.9.0

src/jfw/front/dataExport.go

@@ -199,10 +199,11 @@ func (d *DataExport) QueryOrder() error {
 	} else {
 		query["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
-	//2.8.5  PC端 不显示vip订单
 	//2.8.8  PC端 不显示vip订单
 	//query["product_type"] = "历史数据"
-	query["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
+	//	query["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
+	notin := []interface{}{"VIP订阅", "企业商机管理"}
+	query["product_type"] = map[string]interface{}{"notin": notin}
 	//总数
 	countData := public.Mysql.Find(tableName_order, query, "", "", -1, 0)
 	count := len(*countData)

src/jfw/modules/entniche/src/service/subscribe/subscribe.go

@@ -741,7 +741,7 @@ func (ac *Action) Get_fastimport() {
 				}
 			}
 			if a[unclassified] == 0 {
-				newOne["a_key"] = all
+				newOne["a_key"] = qutil.MapArrToObjArr(all)
 				newOne["s_item"] = unclassified
 				a_items_ent = append(a_items_ent, newOne)
 			}

src/web/templates/weixin/follow/set.html

@@ -463,9 +463,11 @@ $(function(){
 });
 function isVisited(sid){
 	var a_visited = {{.T.a_visited}};
-	for(var i=0;i<a_visited.length;i++){
-		if(a_visited[i] == sid){
-			return true;
+	if (a_visited!=null){
+		for(var i=0;i<a_visited.length;i++){
+			if(a_visited[i] == sid){
+				return true;
+			}
 		}
 	}
 	return false;