fix:移动数据到处预览修改

src/jfw/front/ws_dataExport.go

@@ -168,7 +168,6 @@ func (w *WsDataExport) WxToOrderDetail() error {
 	return nil
 }
 
-//
 func (w *WsDataExport) GetPreview() error {
 	userId := util.ObjToString(w.GetSession("userId"))
 	if userId == "" {
@@ -206,6 +205,7 @@ func (w *WsDataExport) GetPreview() error {
 	if msgCount > 20000 {
 		msgCount = 20000
 	}
+	dataexport.GetMatchKey(scd, list)
 	_res["data"] = subUrl(list, dataType)
 	_res["dataType"] = dataType
 	_res["total"] = msgCount
@@ -215,7 +215,7 @@ func (w *WsDataExport) GetPreview() error {
 	return nil
 }
 
-//预览
+// 预览
 func (w *WsDataExport) ToPreview(_id string) error {
 	defer util.Catch()
 	openid, _ := w.Session().Get("s_m_openid").(string)
@@ -244,7 +244,7 @@ func (w *WsDataExport) ToPreview(_id string) error {
 	return w.Render("/weixin/dataExport/dataExport_previewData.html")
 }
 
-//创建订单页面
+// 创建订单页面
 func (w *WsDataExport) SubmitOrder() error {
 	defer util.Catch()
 	id := util.SE.Decode4Hex(w.GetString("id"))
@@ -344,7 +344,7 @@ func (w *WsDataExport) SubmitOrder() error {
 	return nil
 }
 
-//微信数据导出
+// 微信数据导出
 func (wd *WsDataExport) SearchExport() error {
 	openid := util.ObjToString(wd.GetSession("s_m_openid"))
 	userId := util.ObjToString(wd.GetSession("userId"))

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -37,7 +37,6 @@ func init() {
 	xweb.AddAction(&WsDataExport{})
 }
 
-//
 func (w *WsDataExport) GetPreview() error {
 	userId := util.ObjToString(w.GetSession("userId"))
 	if userId == "" {
@@ -84,6 +83,7 @@ func (w *WsDataExport) GetPreview() error {
 	if msgCount > 20000 {
 		msgCount = 20000
 	}
+	dataexport.GetMatchKey(scd, list)
 	_res["data"] = subUrl(list, dataType)
 	_res["dataType"] = dataType
 	_res["total"] = msgCount
@@ -93,7 +93,7 @@ func (w *WsDataExport) GetPreview() error {
 	return nil
 }
 
-//发送邮件
+// 发送邮件
 func (w *WsDataExport) SendMailVerify() {
 	email := w.GetString("email")
 	if isEmail(email) {
@@ -160,7 +160,7 @@ func (w *WsDataExport) SendMailVerify() {
 	w.ServeJson(&w.T)
 }
 
-//验证手机号
+// 验证手机号
 func (w *WsDataExport) CheckPhoneVerify() {
 	phone := w.GetString("phone")
 	verityResult := false
@@ -238,7 +238,6 @@ func isEmail(value string) bool {
 	return emailPattern.MatchString(value)
 }
 
-//
 func (w *WsDataExport) PaySuccessPage() error {
 	defer util.Catch()
 	w.T["email"] = w.GetString("email")
@@ -249,7 +248,7 @@ func (w *WsDataExport) PaySuccessPage() error {
 	return w.Render("/dataExport/dataExport_paySuccess.html", &w.T)
 }
 
-//创建订单页面
+// 创建订单页面
 func (w *WsDataExport) ToCreateOrderPage() error {
 	defer util.Catch()
 	id := util.SE.Decode4Hex(w.GetString("id"))
@@ -320,13 +319,12 @@ func (w *WsDataExport) ToCreateOrderPage() error {
 	return nil
 }
 
-//
 func isPhone(value string) bool {
 	var phonePattern = regexp.MustCompile("^[1][3-9][0-9]{9}$")
 	return phonePattern.MatchString(value)
 }
 
-//微信数据导出
+// 微信数据导出
 func (wd *WsDataExport) SearchExport() error {
 	openid := util.ObjToString(wd.GetSession("s_m_openid"))
 	userId := util.ObjToString(wd.GetSession("userId"))