Merge branch 'dev2.6' of ssh://192.168.3.207:10022/qmx/qfw into dev2.6

core/src/qfw/manage/dataExport.go

@@ -52,7 +52,7 @@ func (d *DataExport) DataDetail(order_code string) error {
 	} else {
 		(*res)["applybill_type"] = "个人"
 	}
-	(*res)["service_status"] = "未发送"
+	(*res)["service_status"] = "发送失败"
 	(*res)["product_type"] = "历史数据导出"
 	(*res)["order_money"] = orderMoney
 	(*res)["order_status"] = "未支付"

core/src/qfw/manage/dataExportOrder.go

@@ -57,7 +57,7 @@ func (d *DataExportOrder) Pageing() {
 		if v["service_status"] == y {
 			v["service_status"] = "发送成功"
 		} else {
-			v["service_status"] = "未发送"
+			v["service_status"] = "发送失败"
 		}
 		//是否支付
 		if v["order_status"] == n {