wangshan 6 anni fa
parent
commit
66fa234fad
82 ha cambiato i file con 212 aggiunte e 1827 eliminazioni
  1. 19 18
      src/jfw/front/dataExport.go
  2. 56 94
      src/jfw/modules/app/src/app/front/ws_dataExport.go
  3. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/base.css
  4. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/choose_area.css
  5. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css
  6. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/industry.css
  7. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/invoice.css
  8. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/jquery-weui.css
  9. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css
  10. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/messageType.css
  11. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/money.css
  12. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/no_result.css
  13. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_detail.css
  14. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_list.css
  15. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_order.css
  16. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_success.css
  17. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/preview_data.css
  18. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/public.css
  19. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/search_tab.css
  20. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/submit_success.css
  21. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/weui.min.css
  22. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/win_bid.css
  23. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.css
  24. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.eot
  25. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.ttf
  26. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.woff
  27. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.woff2
  28. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/fish.png
  29. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/icon_add.png
  30. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/line.png
  31. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/mark.png
  32. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/weixin.png
  33. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/xuanzhong.png
  34. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/zhifubao.png
  35. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js
  36. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/city-picker.min.js
  37. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/exclusiveWord.js
  38. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/fastclick.js
  39. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/jquery-2.1.4.js
  40. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/jquery-weui.min.js
  41. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js
  42. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js
  43. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/rem.js
  44. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/swiper.min.js
  45. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/weui.min.js
  46. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/zepto.js
  47. 0 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/zepto.touch.js
  48. 0 116
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/choose_area.scss
  49. 0 159
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/dataExport.scss
  50. 0 90
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/industry.scss
  51. 0 71
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/invoice.scss
  52. 0 101
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/messageType.scss
  53. 0 75
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/money.scss
  54. 0 33
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/no_result.scss
  55. 0 94
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_detail.scss
  56. 0 116
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_list.scss
  57. 0 351
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_order.scss
  58. 0 110
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_success.scss
  59. 0 46
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/preview_data.scss
  60. 0 61
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/public.scss
  61. 0 33
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/submit_success.scss
  62. 0 126
      src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/win_bid.scss
  63. 5 5
      src/jfw/modules/app/src/web/templates/dataExport/404.html
  64. 6 6
      src/jfw/modules/app/src/web/templates/dataExport/dataExPort.html
  65. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
  66. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
  67. 9 9
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html
  68. 8 8
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html
  69. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html
  70. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
  71. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
  72. 5 5
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html
  73. 8 8
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html
  74. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
  75. 11 11
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
  76. 17 13
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html
  77. 4 4
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
  78. 5 5
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html
  79. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  80. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  81. 7 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
  82. 2 2
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

+ 19 - 18
src/jfw/front/dataExport.go

@@ -32,7 +32,7 @@ type DataExport struct {
 
 
 	superSearchExport xweb.Mapper `xweb:"/front/dataExport/superSearchExport"`      //数据导出-超级搜索
 	superSearchExport xweb.Mapper `xweb:"/front/dataExport/superSearchExport"`      //数据导出-超级搜索
 	toCreateOrderPage xweb.Mapper `xweb:"/front/dataExport/toCreateOrderPage/(.*)"` //数据导出-订单页面
 	toCreateOrderPage xweb.Mapper `xweb:"/front/dataExport/toCreateOrderPage/(.*)"` //数据导出-订单页面
-	previewData       xweb.Mapper `xweb:"/front/dataExport/previewData/(.*)"`       //数据导出-数据预览
+	previewData       xweb.Mapper `xweb:"/front/(.*)/previewData/(.*)"`             //数据导出-数据预览
 	sendMailVerify    xweb.Mapper `xweb:"/front/dataExport/sendMailVerify"`         //发送邮箱验证码
 	sendMailVerify    xweb.Mapper `xweb:"/front/dataExport/sendMailVerify"`         //发送邮箱验证码
 	checkMailVerify   xweb.Mapper `xweb:"/front/dataExport/checkMailVerify"`        //验证邮箱验证码
 	checkMailVerify   xweb.Mapper `xweb:"/front/dataExport/checkMailVerify"`        //验证邮箱验证码
 	paysuccess        xweb.Mapper `xweb:"/front/dataExport/paysuccess"`             //支付成功页面
 	paysuccess        xweb.Mapper `xweb:"/front/dataExport/paysuccess"`             //支付成功页面
@@ -568,24 +568,25 @@ func (d *DataExport) ToCreateOrderPage(_id string) error {
 	return nil
 	return nil
 }
 }
 
 
-func (d *DataExport) PreviewData(_id string) error {
-	userId := util.ObjToString(d.GetSession("userId"))
-	//	openid := util.ObjToString(d.GetSession("s_m_openid"))
-	if userId == "" {
-		return errors.New("未登录")
-	}
-	//数据预览每天限制50次
-	incurKey := fmt.Sprintf("PreviewData_%s_%d", d.GetSession("userId"), time.Now().Day())
-	times := util.IntAll(redis.Get("other", incurKey))
-	if times >= 50 {
-		return errors.New("超出预览次数")
-	}
-	if times == 0 {
-		redis.Put("other", incurKey, 1, 24*60*60)
-	} else {
-		redis.Incr("other", incurKey)
+func (d *DataExport) PreviewData(source, _id string) error {
+	if !strings.Contains(source, "app") {
+		userId := util.ObjToString(d.GetSession("userId"))
+		//	openid := util.ObjToString(d.GetSession("s_m_openid"))
+		if userId == "" {
+			return errors.New("未登录")
+		}
+		//数据预览每天限制50次
+		incurKey := fmt.Sprintf("PreviewData_%s_%d", d.GetSession("userId"), time.Now().Day())
+		times := util.IntAll(redis.Get("other", incurKey))
+		if times >= 50 {
+			return errors.New("超出预览次数")
+		}
+		if times == 0 {
+			redis.Put("other", incurKey, 1, 24*60*60)
+		} else {
+			redis.Incr("other", incurKey)
+		}
 	}
 	}
-
 	_id = util.SE.Decode4Hex(_id)
 	_id = util.SE.Decode4Hex(_id)
 	dataType := d.GetString("dataType")
 	dataType := d.GetString("dataType")
 	//从500条数据中筛选字段最全五条
 	//从500条数据中筛选字段最全五条

+ 56 - 94
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -1,6 +1,7 @@
 package front
 package front
 
 
 import (
 import (
+	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
 	"jfw/config"
 	"jfw/config"
@@ -19,14 +20,13 @@ import (
 
 
 type WsDataExport struct {
 type WsDataExport struct {
 	*xweb.Action
 	*xweb.Action
-	searchExport      xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/searchExport"`      //微信数据导出
-	toPreview         xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/toPreview/(.*)"`    //微信数据导出-预览页面
-	paySuccessPage    xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/paySuccessPage"`    //微信数据导出-支付成功页面
-	getPayParm        xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/getPayParm"`        //微信数据导出-获取微信支付参数
-	toCreateOrderPage xweb.Mapper `xweb:"/jyapp/front/wx_dataExport/toCreateOrderPage"` //微信数据导出-订单微信支付
-	sendMailVerify    xweb.Mapper `xweb:"/jyapp/front/dataExport/sendMailVerify"`       //发送邮箱验证码
-	checkMailVerify   xweb.Mapper `xweb:"/jyapp/front/dataExport/checkMailVerify"`      //验证邮箱验证码
-	checkPhoneVerify  xweb.Mapper `xweb:"/jyapp/front/dataExport/checkPhoneVerify"`     //验证手机号
+	searchExport      xweb.Mapper `xweb:"/jyapp/front/dataExport/searchExport"`      //app数据导出
+	paySuccessPage    xweb.Mapper `xweb:"/jyapp/front/dataExport/paySuccessPage"`    //app数据导出-支付成功页面
+	toCreateOrderPage xweb.Mapper `xweb:"/jyapp/front/dataExport/toCreateOrderPage"` //app数据导出-订单支付
+	sendMailVerify    xweb.Mapper `xweb:"/jyapp/front/dataExport/sendMailVerify"`    //发送邮箱验证码
+	checkMailVerify   xweb.Mapper `xweb:"/jyapp/front/dataExport/checkMailVerify"`   //验证邮箱验证码
+	checkPhoneVerify  xweb.Mapper `xweb:"/jyapp/front/dataExport/checkPhoneVerify"`  //验证手机号
+	previewData       xweb.Mapper `xweb:"/jyapp/front/dataExport/previewData/(.*)"`  //app数据导出-数据预览
 }
 }
 
 
 func init() {
 func init() {
@@ -133,87 +133,60 @@ func (w *WsDataExport) CheckMailVerify() {
 	w.ServeJson(&w.T)
 	w.ServeJson(&w.T)
 }
 }
 
 
-func isEmail(value string) bool {
-	var emailPattern = regexp.MustCompile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$")
-	return emailPattern.MatchString(value)
-}
-
-//
-func (w *WsDataExport) GetPayParm() error {
-	defer util.Catch()
-	userid := util.ObjToString(w.GetSession("userId"))
-	openid := util.ObjToString(w.GetSession("s_m_openid"))
-	id := util.SE.Decode4Hex(w.GetString("id"))
-	if userid == "" || id == "" {
-		log.Println("userid,id 有误!")
-		w.ServeJson(map[string]interface{}{
-			"status": 0,
-		})
-		return nil
+func (w *WsDataExport) PreviewData(_id string) error {
+	userId := util.ObjToString(w.GetSession("userId"))
+	if userId == "" {
+		return errors.New("未登录")
 	}
 	}
-	token := w.GetString("token")
-	fmt.Println(userid, "---", id)
-	//查看创建过的预支付订单
-	Order := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
-		"user_id":   userid,
-		"filter_id": id,
-	}, "prepay_id,order_code,order_money,id,prepay_time", "")
-	fmt.Println("Order:", Order)
-	if Order == nil {
-		log.Println("查不到订单!")
-		w.ServeJson(map[string]interface{}{
-			"status": -1,
-		})
-		return nil
+	//数据预览每天限制50次
+	incurKey := fmt.Sprintf("PreviewData_%s_%d", w.GetSession("userId"), time.Now().Day())
+	times := util.IntAll(redis.Get("other", incurKey))
+	if times >= 50 {
+		return errors.New("超出预览次数")
 	}
 	}
-	prepayId := util.ObjToString((*Order)["prepay_id"])
-	if prepayId == "" {
-		log.Println("订单有误!")
-		w.ServeJson(map[string]interface{}{
-			"status": -2,
-		})
-		return nil
+	if times == 0 {
+		redis.Put("other", incurKey, 1, 24*60*60)
+	} else {
+		redis.Incr("other", incurKey)
 	}
 	}
-	code := util.ObjToString((*Order)["order_code"])
-	orderid := util.Int64All((*Order)["id"])
-	orderMoney := util.IntAll((*Order)["order_money"])
+	w.T["id"] = _id
+	w.Render("/dataExport/dataExport_previewData.html", &w.T)
+	return nil
+}
 
 
-	realToken := public.GetWaitPayToken(orderid, orderMoney, code, "微信", userid)
-	if realToken != token {
-		log.Println("token错误!", userid, realToken, token, code, orderMoney, orderid)
-		return nil
-	}
-	prepayTime, err := time.ParseInLocation(util.Date_Full_Layout, util.ObjToString((*Order)["prepay_time"]), time.Local)
-	surplus_second := prepayTime.Unix() + 7200 - time.Now().Unix()
-	if err == nil && surplus_second <= 0 {
-		log.Println("订单过期,重新生成预订单!", userid)
-		tradeno, ret := public.WxStruct.CreatePrepayOrder(config.Sysconfig["weixinrpc"].(string), "c", w.IP(), openid, "", orderMoney)
-		if ret != nil {
-			now := time.Now()
-			if public.Mysql.Update("dataexport_order", map[string]interface{}{
-				"id": orderid,
-			}, map[string]interface{}{
-				"prepay_time":  util.FormatDate(&now, util.Date_Full_Layout),
-				"prepay_id":    (*ret)["prepayid"],
-				"out_trade_no": tradeno,
-			}) {
-				prepayId = (*ret)["prepayid"]
-			}
+func subUrl(list *[]map[string]interface{}, dataType string) *[]map[string]interface{} {
+	for _, v := range *list {
+		//加密截取url
+		href := util.ObjToString(v["href"])
+		url := util.ObjToString(v["url"])
+		if len(url) > 40 { //截取剑鱼标讯地址
+			v["url"] = url[:40] + "*****" + url[len(url)-10:]
+		}
+		if len(href) > 40 { //截取原文地址
+			v["href"] = href[:40] + "*****" + href[len(href)-10:]
+		} else if len(href) > 0 {
+			v["href"] = href[:len(href)*8/10] + "*****"
 		}
 		}
 	}
 	}
-	timestamp := time.Now().Unix()
-	nonceStr := util.GetRandom(16) + util.GetLetterRandom(16)
-	sign := util.WxSign(fmt.Sprintf("appId=%s&nonceStr=%s&package=%s&signType=%s&timeStamp=%d&key=%s", public.WxStruct.Appid, nonceStr, "prepay_id="+prepayId, "MD5", timestamp, public.WxStruct.Key))
-	w.ServeJson(map[string]interface{}{
-		"status":    1,
-		"appId":     public.WxStruct.Appid,
-		"timestamp": fmt.Sprint(timestamp),
-		"signType":  "MD5",
-		"sign":      sign,
-		"nonceStr":  nonceStr,
-		"prepayId":  "prepay_id=" + prepayId,
-	})
-	return nil
+	var result []map[string]interface{}
+	bytes, marshalErr := json.Marshal(list)
+	if marshalErr != nil {
+		log.Println("数据导出字体混淆errMarshal", marshalErr)
+		return list
+	}
+	//字体混淆
+	hxb := public.GetFontConvertStr(public.ExConf.Font.ConvertVersionDefault, string(bytes), "pc")
+	unmarshalErr := json.Unmarshal([]byte(hxb), &result)
+	if unmarshalErr != nil {
+		log.Println("数据导出字体混淆unmarshalErr", unmarshalErr)
+		return list
+	}
+	return &result
+}
+
+func isEmail(value string) bool {
+	var emailPattern = regexp.MustCompile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$")
+	return emailPattern.MatchString(value)
 }
 }
 
 
 //
 //
@@ -226,17 +199,6 @@ func (w *WsDataExport) PaySuccessPage() error {
 	return w.Render("/weixin/dataExport/dataExport_paySuccess.html", &w.T)
 	return w.Render("/weixin/dataExport/dataExport_paySuccess.html", &w.T)
 }
 }
 
 
-//预览
-func (w *WsDataExport) ToPreview(_id string) error {
-	defer util.Catch()
-	userid, _ := w.Session().Get("userId").(string)
-	if userid == "" {
-		return errors.New("未登录")
-	}
-	w.T["id"] = _id
-	return w.Render("/dataExport/dataExport_previewData.html")
-}
-
 //创建订单页面
 //创建订单页面
 func (w *WsDataExport) ToCreateOrderPage() error {
 func (w *WsDataExport) ToCreateOrderPage() error {
 	defer util.Catch()
 	defer util.Catch()

+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/base.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/base.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/choose_area.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/choose_area.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/dataExport.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/industry.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/industry.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/invoice.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/invoice.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/jquery-weui.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/jquery-weui.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/keyWord.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/messageType.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/messageType.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/money.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/money.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/no_result.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/no_result.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_detail.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_detail.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_list.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_list.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_order.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_order.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_success.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_success.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/preview_data.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/preview_data.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/public.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/public.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/search_tab.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/search_tab.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/submit_success.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/submit_success.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/weui.min.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/weui.min.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/win_bid.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/win_bid.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/iconfont/iconfont.css → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.css


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/iconfont/iconfont.eot → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.eot


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/iconfont/iconfont.ttf → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.ttf


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/iconfont/iconfont.woff → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.woff


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/iconfont/iconfont.woff2 → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/iconfont/iconfont.woff2


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/fish.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/fish.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/icon_add.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/icon_add.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/line.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/line.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/mark.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/mark.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/weixin.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/weixin.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/xuanzhong.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/xuanzhong.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/images/zhifubao.png → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/images/zhifubao.png


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/additionWord.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/city-picker.min.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/city-picker.min.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/exclusiveWord.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/exclusiveWord.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/fastclick.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/fastclick.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/jquery-2.1.4.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/jquery-2.1.4.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/jquery-weui.min.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/jquery-weui.min.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/keyWord.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/mapJSON.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/rem.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/rem.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/swiper.min.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/swiper.min.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/weui.min.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/weui.min.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/zepto.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/zepto.js


+ 0 - 0
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/zepto.touch.js → src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/zepto.touch.js


+ 0 - 116
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/choose_area.scss

@@ -1,116 +0,0 @@
-@import 'public.scss';
-#choose_area{
-	.btn{
-		position: fixed;
-		width: 100%;
-		height: .94rem;
-		bottom: 0;
-		left:0;
-		right:0;
-		line-height: .94rem;
-		color: #fff;
-		font-size: .34rem;
-		display:flex;
-		align-items:center;
-		justify-content:space-between;
-		.save-btn,.reset-btn{
-			flex: 1;
-			width: 50%;
-			text-align: center;
-			height: 100%;
-			font-size: .34rem;
-		}
-		.reset-btn{
-			background: $white;
-			color: $green_1;
-		}
-		.save-btn{
-			background: $green_1;
-			color: #fff;
-		}
-	}
-	.main{
-		.result{
-			padding: .2rem .3rem;
-			font-size:.26rem;
-		}
-		.select-area-box{
-			padding-bottom:.94rem;
-			.tab {
-			  display: flex;
-			  align-items:center;
-			  justify-content:space-between;
-			  color: $black;
-			  background: #fff;
-			  font-size: .3rem;
-			  padding: .2rem .5rem ;
-			  border-bottom: 0.5px solid $border_2;
-			  
-			  .province{
-				  display: flex;
-				  align-items: center;
-				  .checkbox{
-					 width: .4rem;
-					 height:.4rem;
-					 border:1px solid #ddd;
-					 border-radius: 50%;
-					 margin-right: .2rem;
-					 -webkit-appearance: none;
-					 background: #fff;
-				  }
-				  .checkbox:checked{
-				  	border: 0;
-				  	background:url(/wx_dataExport/images/xuanzhong.png) no-repeat center center;
-				  	background-size: 100% 100%;
-				  }
-			  }
-			} 
-			label::after {
-			  font-size: 14px;
-			  float: right;
-			  margin-right: 15px;
-			} 
-			
-			.tab_content {
-			  display: none;
-			  font-size: .28rem;
-			  padding: .1rem .3rem;
-			  text-align: center;
-			  .city{
-				  float: left;
-				  padding: .1rem .2rem;
-				  background: $white;
-				  margin: .1rem;
-			  }
-			  .active{
-				  background: $green_1;
-				  color: $white;
-			  }
-			}
-			.index{
-				padding: .3rem .3rem .1rem .3rem;
-				font-size: .32rem;
-			}
-		}
-		.slide{
-			background: #eee;
-			position: fixed;
-			right: 0;
-			top: 50%;
-			height: 8.5rem;
-			width: .4rem;
-			font-size: .26rem;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			padding: .1rem 0;
-			align-items: center;
-			margin-top: -4.25rem;
-			z-index: 9999;
-			a{
-				margin-bottom: .1rem;
-			}
-		}
-	}
-}

+ 0 - 159
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/dataExport.scss

@@ -1,159 +0,0 @@
-html{
-    .page{
-        background: #F5F4F9;
-        padding-bottom: .94rem;
-        .progress{
-        	display: flex;
-        	align-items: center;
-        	justify-content: space-around;
-        	padding: .28rem 0;
-        	background:#fff;
-        	border-bottom:1px solid #e0e0e0;
-        	.p-item{
-        		flex: 1;
-        		display: flex;
-        		flex-direction: column;
-        		align-items: center;
-        		position: relative;
-        		.line{
-        			position: absolute;
-        			top: .2rem;
-        			right:-0.92rem;
-        			height: 0.04rem;
-        			width:1.86rem;
-        			background: #DCDADD;
-        		}
-        		.p-item-icon{
-        			width: .48rem;
-        			height: .48rem;
-        			line-height: .48rem;
-        			text-align: center;
-        			border-radius: 50%;
-        			background: #DCDADD;
-        			i{
-        				color: #fff;
-        				font-size: .11rem;
-        			}
-        		}
-        		.icon-gray{
-        			background: #DCDADD;
-        		}
-        		span{
-        			margin-top: 0.06rem;
-        		}
-                .active{
-                    color: #2cb7ca;
-                }
-        	}
-        
-        }
-        
-        .chooseTime{
-            margin-top: .32rem;
-            ul{
-                display: flex;
-                padding:0 .32rem;
-                justify-content: space-between;
-                li{
-                    width: 1.64rem;
-                    height: .64rem;
-                    background: #fff;
-                    border-radius: 3px;
-                    text-align: center;
-                    line-height: .64rem;
-                    a{
-                        font-size: .28rem;
-                        color: #1d1d1d;
-                        display: block;
-                        font-weight: bold;
-                    }
-                }
-                .active{
-                    background: #2cb7ca;
-                    a{
-                        color: #fff;
-                    }
-                }
-            }
-            .dateMake{
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                height: 1.08rem;
-                line-height: 1.08rem;
-                background: #fff;
-                margin-top: .16rem;
-                padding: 0 .3rem;
-                color: #888888;
-                span{
-                    display: inline-block;
-                    width: 2.9rem;
-                    height: .72rem;
-                    line-height: .72rem;
-                    font-size: .3rem;
-                    border: 1px solid #CECECE;
-                    margin: .16rem .2rem;
-                    border-radius: 0.02rem;
-                    i{
-                        padding: 0 .3rem
-                    }
-                }
-            }
-        }
-        .elseChoose{
-            margin-top: 0.3rem;
-            p{
-             font-size: .24rem;
-             color: #888;
-             line-height: .36rem; 
-             padding:0 .4rem;  
-            }
-            .elseChooseList{
-                margin-top: .16rem;
-                ul{
-                    li{
-                        padding:0 .4rem;  
-                        height: .88rem;
-                        line-height: .88rem;
-                        background: #fff;
-                        font-size: 0.3rem;
-                        color: #1d1d1d;
-                        margin-bottom: .24rem;
-                        a{
-                            display: block;
-                            strong{
-                                width: 1.5rem;
-                                font-weight: normal;
-                                float: left;
-                            }
-                            span{
-                                float: left;
-                                width: 4.5rem;
-                                height: .88rem;
-                                color: #686868;
-                                font-size: .26rem;
-                                overflow:hidden;
-                                text-overflow:ellipsis;
-                                white-space:nowrap;
-                                text-align: right;
-                            }
-                            i{
-                                float: right;
-                                color: #707070;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        button{
-            width: 100%;
-            height: 0.94rem;
-            background: #2cb7ca;
-            font-size: .36rem;
-            color: #fff;
-            position: fixed;
-            bottom: 0;
-        }
-    }
-}

+ 0 - 90
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/industry.scss

@@ -1,90 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            margin:0 0.3rem;
-            padding: 0.3rem 0;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .list{
-            ul{
-                li{
-                    margin:0 0.3rem;
-                    padding: 0.3rem 0;
-                    border-bottom: 1px solid #E0E0E0;
-                    dt{
-                        background: #F4F4F9;
-                        display:block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        font-weight: bold; 
-                        margin-bottom: 0.2rem;
-                    }
-                    dd{
-                        background: #F4F4F9;
-                        display: inline-block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        margin-right: .05rem;
-                        margin-bottom: 0.2rem;
-                    }
-                    .active{
-                        background: #2cb7ca;
-                        color: #fff;
-                    }
-                }
-            }
-        }
-        .consfirm{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            button{
-                width: 100%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-            } 
-        }
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            display: none;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

+ 0 - 71
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/invoice.scss

@@ -1,71 +0,0 @@
-@import 'public.scss';
-#invoice {
-    height: 100%;
-    background: #f5f4f9;
-    .form {
-        .form-item {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            height: 0.88rem;
-            line-height: 0.88rem;
-            margin-top: 0.24rem;
-            padding: 0 0.4rem;
-            background: #fff;
-            .left {
-                font-size: 0.3rem;
-                color: #1d1d1d;
-            }
-            .right {
-                font-size: 0.26rem;
-                color: $gray_1;
-                display: flex;
-                align-items: center;
-                i {
-                    color: #707070;
-                    padding-left: 0.12rem;
-                }
-            }
-        }
-        .form-control {
-            .form-input {
-                height: 0.88rem;
-                line-height: 0.88rem;
-                padding: 0 0.4rem;
-                background: #fff;
-                border-top: 1px solid #eee;
-                input {
-                    width: 100%;
-                    // height: 100%;
-                    font-size: .3rem;
-                }
-            }
-        }
-    }
-    .action {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: 0.94rem;
-        line-height: 0.94rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .btn {
-            flex: 1;
-            width: 50%;
-            height: 100%;
-            text-align: center;
-            font-size: 0.36rem;
-        }
-        .cancel-btn {
-            background: #fff;
-            color: $green_1;
-        }
-        .submit-btn {
-            background: $green_1;
-            color: #fff;
-        }
-    }
-}

+ 0 - 101
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/messageType.scss

@@ -1,101 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            margin:0 0.3rem;
-            padding: 0.3rem 0;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .list{
-            ul{
-                li{
-                    margin:0 0.3rem;
-                    padding: 0.3rem 0;
-                    border-bottom: 1px solid #E0E0E0;
-                    dt{
-                        background: #F4F4F9;
-                        display:block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        font-weight: bold; 
-                        margin-bottom: 0.2rem;
-                    }
-                    dd{
-                        background: #F4F4F9;
-                        display: inline-block;
-                        width: 1.58rem;
-                        height: .7rem;
-                        border-radius: 3px;
-                        text-align: center;
-                        line-height: .7rem;
-                        margin-right: .05rem;
-                        margin-bottom: 0.2rem;
-                    }
-                    .active{
-                        background: #2cb7ca;
-                        color: #fff;
-                    }
-                    .question{
-                        display: inline-block; 
-                    }
-                    i{
-                        font-size: .52rem;
-                        color: #2cb7ca;
-                        margin-left: 0.2rem;
-                        position: relative;
-                        top: 0.08rem;
-
-                    }
-                }
-            }
-        }
-        .consfirm{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            button{
-                width: 100%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-            } 
-        }
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            display: none;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

+ 0 - 75
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/money.scss

@@ -1,75 +0,0 @@
-body{
-    background: #fff;
-    font-size: 0.3rem;
-    padding-bottom: 0.94rem;
-    .industry{
-        .all{
-            padding: 0.3rem ;
-            border-bottom: 1px solid #E0E0E0;
-            span{
-                background: #F4F4F9;
-                display: inline-block;
-                width: 1.58rem;
-                height: .7rem;
-                border-radius: 3px;
-                text-align: center;
-                line-height: .7rem;
-                font-weight: bold;
-            }
-        }
-        .connect{
-            h3{
-                font-size: .26rem;
-                color: #686868;
-                line-height: 1.08rem;
-                font-weight: normal;
-                padding:0 0.3rem ;
-            }
-            .connectMain{
-                height: 1.08rem;
-                background: #F5F4F9;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                color: #888;
-                span{
-                    line-height: .72rem;
-                    background: #fff;
-                    display: inline-block;
-                    width: 3.2rem;
-                    height: .72rem;
-                    margin: 0 0.1rem;
-                    border: 1px solid #CECECE;
-                    input{
-                        width: 2rem;
-                        text-indent: 0.1rem;
-                    }
-                }
-            }
-            
-            
-            
-        }
-       
-
-        .resetOne{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: 1px solid #F4F4F9;
-            button{
-                width:50%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                font-size: .36rem;
-                color: #fff;
-                float: left;
-            }
-            button:first-child{
-                background: #fff;
-                color: #2cb7ca;
-            }
-        }
-    }
-}

+ 0 - 33
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/no_result.scss

@@ -1,33 +0,0 @@
-@import 'public.scss';
-#no_result{
-	.main{
-		position:fixed;
-		top:0;
-		bottom:0;
-		left:0;
-		right:0;
-		width:100%;
-		height:100%;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		justify-content: center;
-		img{
-			width: 2.8rem;
-			height: 2.8rem;
-		}
-		p{
-			color: #888;
-			font-size: .28rem;
-			margin-top: .2rem;
-		}
-		a{
-			color: #2CB7CA;
-			font-size: .36rem;
-			margin-top: .48rem;
-		}
-		a:hover,a:focus{
-			color:#2CB7CA;
-		}
-	}
-}

+ 0 - 94
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_detail.scss

@@ -1,94 +0,0 @@
-@import 'public.scss';
-#order_detail{
-	.main{
-		.lists{
-			margin-bottom:1.26rem;
-			.card{
-				.card-header{
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					padding: .4rem .3rem;
-					img{
-						width:36%;
-						flex:1;
-					}
-					h3{
-						font-size: .36rem;
-						color: $black;
-						margin: 0 .2rem;
-					}
-				}
-				.card-content{
-					.text{
-						padding: 0.04rem .4rem;
-						font-size: .28rem;
-						margin-bottom: .12rem;
-					}
-					.item-list{
-						display: flex;
-						justify-content: flex-start;
-						padding: 0 .4rem;
-						margin-bottom: .16rem;
-						label{
-							font-weight: bold;
-							font-size: .28rem;
-							display: block;
-							white-space: nowrap;
-						}
-						.item-list-parents{
-							display: flex;
-							flex-wrap: wrap;
-							justify-content: flex-start;
-							li{
-								margin-right: 0.1rem;
-								font-size: .28rem;
-								color: $gray_1;
-							}
-						}
-					}
-				}
-                .invoicing{
-                    padding: 0 .12rem;
-                    border: 1px solid $green_1;
-                    border-radius: 0.06rem;
-                    font-size: .28rem;
-                    color: $green_1;
-                }
-                .unit p{
-                    display: flex;
-                    padding: 0.04rem .4rem;
-                    font-size: .28rem;
-                    span:nth-child(2){
-                        flex: 1
-                    }
-                }
-                .person p{
-                    display: flex;
-                    padding: 0.04rem .4rem;
-                    font-size: .28rem;
-                    span:nth-child(2){
-                        flex: 1
-                    }
-                }
-			}
-			.button{
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				z-index: 99;
-				width: 100%;
-				height: .94rem;
-				line-height: .94rem;
-				text-align: center;
-				font-size: .36rem;
-				margin-top: .4rem;
-			}
-			.align{
-				background: $green_1;
-				color: $white;
-			}
-		}
-	}
-}

+ 0 - 116
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_list.scss

@@ -1,116 +0,0 @@
-@import 'public.scss';
-#order_list{
-	.main{
-		.buttons-tab>ul{
-			width: 100%;
-			height: 1rem;
-			line-height:1rem;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 .3rem;
-			background: $white;
-			border-bottom: 1px solid $border_2;
-			box-sizing: border-box;
-			.tab-link{
-				display: block;
-				flex: 1;
-				text-align: center;
-				color: $black;
-				font-size: .34rem;
-				box-sizing: border-box;
-				height:99%;
-			}
-			.active{
-				color: $green_1;
-				border-bottom: 2px solid $green_1;
-				box-sizing: border-box;
-			}
-		}
-		.tabs{
-			.card{
-				background: $white;
-				margin-top: .2rem;
-				.card-header{
-					height: .82rem;
-					line-height: .82rem;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 .3rem;
-					border-bottom: 0.01rem solid $border_2;
-					.time{
-						font-size: .24rem;
-					}
-					.status{
-						font-size: .3rem;
-					}
-					.notpay{
-						color: $yellow;
-					}
-					.finish{
-						color: $gray_1;
-					}
-				}
-				.card-content{
-					border-bottom: 0.01rem solid $border_2;
-					.media{
-						display: flex;
-						background: #F5F4F9;
-						padding: .22rem .2rem;
-						margin: .16rem .3rem;
-						.media-img{
-							width: 1.15rem;
-							height: 1.15rem;
-							margin-right: .2rem;
-						}
-						.item-ifo{
-							font-size: .26rem;
-							color: $black;
-						}
-					}
-					.price{
-						display: flex;
-						justify-content: flex-end;
-						align-items: center;
-						padding: 0 .3rem;
-						margin-bottom: .2rem;
-						.initial{
-							font-size: .26rem;
-							color: $gray_2;
-							text-decoration: line-through;
-							margin-right: 0.08rem;
-						}
-						.current{
-							font-size: .36rem;
-						}
-					}
-				}
-				.card-footer{
-					display: flex;
-					justify-content: flex-end;
-					align-items: center;
-					padding: .2rem .3rem;
-					.btn{
-						width: 2.18rem;
-						height: .72rem;
-						line-height: .72rem;
-						text-align: center;
-						border-radius: 0.05rem;
-						font-size: .28rem;
-					}
-					.cancle{
-						border: 1px solid $green_1;
-						color: $green_1;
-						background: transparent;
-						margin-right: .16rem;
-					}
-					.pay{
-						background: $green_1;
-						color: #fff;
-					}
-				}
-			}
-		}
-	}
-}

+ 0 - 351
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_order.scss

@@ -1,351 +0,0 @@
-@import 'public.scss';
-#pay_order{
-    padding-bottom: .94rem;
-	.main{
-		.progress{
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			padding: .28rem 0;
-			background:$white;
-			border-bottom:1px solid $border_2;
-			.p-item{
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				.line{
-					position: absolute;
-					top: .2rem;
-					right:-0.92rem;
-					height: 0.04rem;
-					width:1.86rem;
-					background: #DCDADD;
-				}
-				.p-item-icon{
-					width: .48rem;
-					height: .48rem;
-					line-height: .48rem;
-					text-align: center;
-					border-radius: 50%;
-					background: #2CB7CA;
-					i{
-						color: #fff;
-						font-size: .11rem;
-					}
-				}
-				.icon-gray{
-					background: #DCDADD;
-				}
-				span{
-					margin-top: 0.06rem;
-				}
-                .active{
-                    color: $green_1;
-                }
-			}
-			
-		}
-	
-		.form{
-			.form-item{
-				background: $white;
-				.label-title{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: .28rem .3rem;
-					.left{
-						font-size: .26rem;
-						color: $black;
-                        font-weight: bold;
-						strong{
-							color: $green_1;
-							font-size: .32rem;
-							padding: 0 0.08rem;
-						}
-					}
-					.right{
-						color: $green_1;
-						font-size: .3rem;
-					}
-				}
-				.choose{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 .3rem;
-					.choose-item{
-						position: relative;
-						width: 48%;
-						height: 1.25rem;
-						display: flex;
-						align-items: center;
-						flex-direction: column;
-						justify-content: center;
-						border-radius: .08rem;
-						border: 1px solid $border_2;
-						h2{
-							font-size: .3rem;
-							margin-bottom: 0.08rem;
-							.crown{
-								font-size: .24rem;
-								font-weight: normal;
-								color: $border_2;
-							}
-						}
-						p{
-							font-size: .24rem;
-							color: $gray_2;
-							letter-spacing: 0.02rem;
-						}
-						.initial{
-							text-decoration: line-through;
-						}
-						.mark{
-							position: absolute;
-							width: .48rem;
-							height: .36rem;
-							top: 0;
-							right: 0;
-							color: $green_1;
-							display: none;
-						}
-					}
-					.active{
-						border: 1px solid $green_1;
-					}
-					.active h2{
-						color: $green_1;
-					}
-					.active h2 .crown{
-						color: $yellow;
-					}
-					.active .mark{
-						display: block;
-					}
-				}
-				.tips{
-					display: flex;
-					align-items: center;
-					padding: .2rem .4rem;
-					color: $gray_2;
-					.tips-icon{
-						color: $green_1;
-						font-size: .32rem;
-						font-weight: bold;
-						margin-left: .1rem;
-					}
-				}
-				.form-control{
-					height: .88rem;
-					line-height: .88rem;
-					display: flex;
-					align-items: center;
-					font-size: .28rem;
-					color: $gray_2;
-					margin-left: .3rem;
-					border-bottom: 1px solid $border_2;
-					.on{
-						color: $gray_2;
-					}
-					.input{
-						flex: 1;
-						padding: 0 .3rem;
-						display: flex;
-						input[type='text']{
-							height: 100%;
-							width: 100%;
-						}
-						input[type='number']{
-							flex: 1;
-						}
-						button{
-							background: transparent;
-							color: $green_1;
-							font-size: .3rem;
-						}
-					}
-				}
-				.way{
-                    position: relative;
-					height: .88rem;
-					line-height: .88rem;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					font-size: .3rem;
-					padding: 0 .3rem;
-					span:nth-child(1){
-						color: $gray_2;
-					}
-					.way-right{
-                        display: flex;
-                        align-items: center;
-                        span{
-                           color: $black; 
-                           padding-right: .1rem;
-                        }
-						.icon-right{
-						    color: #C2C2C2;
-						    font-size: .26rem;
-						}
-					}
-				}
-			}
-			.msg{
-				padding: .33rem .4rem .16rem;
-				color: $gray_2;
-			}
-			.radio-form{
-				background: transparent;
-				padding: .2rem .3rem;
-				border: 0;
-				margin: 0;
-				.weui-cell{
-					padding: 0;
-				}
-				.weui-cell__hd{
-					transform: scale(0.8);
-				}
-				.read{
-					font-size: .26rem;
-					a{
-						color: $green_1;
-					}
-				}
-                .weui-check:checked +.weui-icon-checked:before{
-                    color: $green_1;
-                }
-			}
-			.price{
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
-				padding: .2rem .3rem;
-				span{
-					text-decoration: line-through;
-					font-size: .26rem;
-					color: $gray_2;
-					margin-right: .18rem;
-				}
-				strong{
-					font-size: .4rem;
-					color: $black;
-				}
-			}
-			.form-btn{
-				display: flex;
-				align-items: center;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				z-index: 99;
-				.btn{
-					flex: 1;
-					height: .94rem;
-					line-height: .94rem;
-					text-align: center;
-					font-size: .36rem;
-				}
-				.prew{
-					background: $white;
-					color: $green_1;
-				}
-				.enter{
-					background: $green_1;
-					color: $white;
-				}
-                .enter[disabled]{
-                    background: $border_2;
-                }
-			}
-		}
-	}
-	// weui组件样式
-	#tipDialog{
-		text-align: left;
-		.dialog-title{
-			font-size: .34rem;
-		}
-		.info{
-			li{
-				text-align: left!important;
-				font-size: .28rem;
-				label{
-					display: block;
-					font-weight: bold;
-					margin: .24rem 0; 
-				}
-				p{
-					font-size: .28rem;
-					line-height: 1.4;
-				}
-			}
-		}
-        
-		.weui-dialog__btn_primary{
-			color: $green_1;
-		}
-	}
-    .pay_way{
-        .box{
-            position:fixed;
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            background: #fff;
-            height: 4.8rem;
-            z-index: 9999;
-            .box_hd{
-                padding: 0 .4rem;
-                height: .88rem;
-                line-height: .88rem;
-                background: #F4F4F9;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                border-bottom: 1px solid #eee;
-                h3{
-                    color: #1D1D1D;
-                    font-size: .32rem;
-                }
-                .cancel{
-                    color: $green_1;
-                    font-size: .32rem;
-                }
-            }
-            .box_bd{
-                .weui-cells:after{
-                    border: 0;
-                } 
-                .weui-cells:before{
-                    border: 0;
-                }
-                .weui-cell:before{
-                    border: 0;
-                }
-                .choose-form{
-                    margin: 0;
-                }
-                .wx_label,.zfb_label{
-                    margin-top: .68rem;
-                    padding: 0 .3rem;
-                }
-                p{
-                    font-size: .32rem;
-                }
-                img{
-                    width: .8rem;
-                    height: .8rem;
-                    margin-right: .3rem;
-                }
-                .weui-check:checked +.weui-icon-checked:before{
-                    color: $green_1;
-                }
-            }
-        }
-    }
-}

+ 0 - 110
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_success.scss

@@ -1,110 +0,0 @@
-@import 'public.scss';
-#pay_success{
-	width: 100%;
-	height: 100%;
-	background: #fff;
-	.main{
-		padding-bottom: .94rem;
-		.progress{
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			padding: .24rem 0;
-			.p-item{
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				.line{
-					position: absolute;
-					top: .2rem;
-					right:-0.92rem;
-					height: 0.04rem;
-					width:1.86rem;
-					background: #2CB7CA;
-				}
-				.p-item-icon{
-					width: .48rem;
-					height: .48rem;
-					line-height: .48rem;
-					text-align: center;
-					border-radius: 50%;
-					background: #2CB7CA;
-					i{
-						color: #fff;
-						font-size: .11rem;
-					}
-				}
-				span{
-					margin-top: 0.06rem;
-				}
-			}
-			
-		}
-		.space{
-			width: 100%;
-			height: .2rem;
-			background: rgba(245,244,249,1);
-		}
-		.result{
-			width: 100%;
-			.success{
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				padding: .56rem 0;
-			}
-			i{
-				font-size: 1.6rem;
-				color: #2CB7CA;
-			}
-			h2{
-				color: #2CB7CA;
-				font-size: .48rem;
-				margin: .24rem 0 .16rem;
-			}
-			p{
-				font-size: .28rem;
-				color: #888;
-			}
-		}
-		.order_lists{
-			border-top: 1px solid rgba(224,224,224,1);
-			border-bottom:1px solid rgba(224,224,224,1);
-			padding: 0 .4rem;
-			.item{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				// padding: .24rem 0;
-                height: .88rem;
-                line-height: .88rem;
-				border-bottom: 1px solid rgba(224,224,224,1);
-				color: #666;
-			}
-			.item:last-child{
-				border: 0;
-			}
-		}
-		
-	}
-	.main::-webkit-scrollbar {
-	        display: none;
-	}
-	.go_detail{
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 999;
-		display: block;
-		background: #2CB7CA;
-		color: #fff;
-		width: 100%;
-		height: .94rem;
-		line-height: .94rem;
-		text-align: center;
-		font-size: .36rem;
-	}
-}

+ 0 - 46
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/preview_data.scss

@@ -1,46 +0,0 @@
-@import 'public.scss';
-#preview_data{
-	.main{
-		.buttons-tab>ul{
-			width: 100%;
-			height: 1rem;
-			line-height:1rem;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 .6rem;
-			background: $white;
-			border-bottom: 1px solid $border_2;
-			box-sizing: border-box;
-			.tab-link{
-				display: block;
-				flex: 1;
-				text-align: center;
-				color: $black;
-				font-size: .34rem;
-				box-sizing: border-box;
-				height:99%;
-			}
-			.active{
-				color: $green_1;
-				border-bottom: 2px solid $green_1;
-				box-sizing: border-box;
-			}
-		}
-		.tabs{
-			.tab{
-				padding: .2rem;
-			}
-			.table{
-				width: 100%;
-				td{
-					text-align: center;
-					white-space: pre-wrap;
-					font-size: .1rem;
-					border: 0.01rem solid $border_2;
-					padding: 0.08rem;
-				}
-			}
-		}
-	}
-}

+ 0 - 61
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/public.scss

@@ -1,61 +0,0 @@
-// 主色
-
-$gray-button:#f5f4f9;
-$white:#fff;
-// 分割线颜色
-$border_1:#cecece;
-$border_2:#e0e0e0;
-// 文字色
-$black:#1d1d1d;
-$gray_1:#686868;
-$gray_2:#888;
-$blue:#0987ff;
-$yellow:#ffb900;
-$green_1:#2cb7ca;
-$green_2:#25c78c;
-$red:#fe737a;
-// .header{
-// 	width: 100%;
-// 	height: .88rem;
-// 	line-height: .88rem;
-// 	background:$white;
-// 	position: fixed;
-// 	top: 0;
-// 	left: 0;
-// 	z-index: 999;
-// 	padding: 0 .3rem;
-// 	border-bottom: 1px solid $border_1;
-// 	.return{
-// 		position: relative;
-// 		display: block;
-// 		z-index: 22;
-// 		i{
-// 			font-size: .42rem;
-// 		}
-// 	}
-// 	.title{
-// 		position: absolute;
-// 		top: 0;
-// 		left: 0;
-// 		right: 0;
-// 		width: 100%;
-// 		padding: 0;
-// 		font-size: 0.38rem;
-// 		font-weight: 500;
-// 		color: #3d4145;
-// 		text-align: center;
-// 		white-space: nowrap;
-// 	}
-// }
-.main{
-// 	position: fixed;
-// 	top: .88rem;
-// 	bottom: 0;
-// 	left: 0;
-// 	right:0;
-	width:100%;
-	overflow: scroll;
-}
-.main::-webkit-scrollbar {
-	display: none;
-}

+ 0 - 33
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/submit_success.scss

@@ -1,33 +0,0 @@
-@import 'public.scss';
-.submit_success{
-    height: 100%;
-    .success{
-    	display: flex;
-    	align-items: center;
-    	flex-direction: column;
-    	justify-content: center;
-    	padding: 2rem 0;
-        i{
-        	font-size: 1.6rem;
-        	color: #2CB7CA;
-        }
-        h2{
-        	color: #2CB7CA;
-        	font-size: .48rem;
-        	margin: .24rem 0 .16rem;
-        }
-    }
-    .go_back{
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: .94rem;
-        line-height: .94rem;
-        background: $green_1;
-        color: #fff;
-        font-size: .36rem;
-        text-align: center;
-    }
-    
-}

+ 0 - 126
src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/win_bid.scss

@@ -1,126 +0,0 @@
-@import 'public.scss';
-.win_bid{
-	.main{
-		.query{
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			padding: .3rem;
-			color: $green_1;
-			font-size: .3rem;
-			i{
-				font-size: .4rem;
-				margin-left: .1rem;
-			}
-		}
-		.form{
-			.form-item{
-				padding: .3rem;
-				margin:.2rem 0;
-				background: $white;
-				input{
-					width:100%;
-					height: 100%;
-					font-size: .28rem;
-				}
-			}
-			.btn{
-				width: 100%;
-				height: .94rem;
-				background: $green_1;
-				color: $white;
-				font-size: .34rem;
-				text-align: center;
-			}
-		}
-		.form-edit{
-			.item-control{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				background: #fff;
-				height: .88rem;
-				line-height: .88rem;
-				padding: 0 .3rem;
-				margin-top: .2rem;
-				input{
-					height: 100%;
-					flex: 1;
-					background: transparent;
-					font-size: .28rem;
-				}
-				.edit{
-					display: flex;
-					align-items: center;
-					color: $green_1;
-					height: .4rem;
-					padding: 0 .2rem;
-					border-left: 1px solid $border_2;
-					i{
-						margin-right: .1rem;
-					}
-				}
-			}
-			.item-btn{
-				width: 100%;
-				height: .88rem;
-				height: .88rem;
-				text-align: center;
-				margin-top: .1rem;
-				display: none;
-				.btn{
-					width: 50%;
-					height: 100%;
-					flex: 1;
-					color: $white;
-					float: left;
-					font-size:.3rem;
-				}
-				.del{
-					background: $red;
-				}
-				.enter{
-					background: $green_1;
-				}
-			}
-		}
-		.add{
-			width: 1rem;
-			height: 1rem;
-			display: block;
-			position: fixed;
-			bottom: .72rem;
-			left: 50%;
-			margin-left: -.5rem;
-			img{
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-	// weui组件样式
-	#tipDialog{
-		text-align: left;
-		.dialog-title{
-			font-size: .34rem;
-		}
-		.info{
-			li{
-				text-align: left!important;
-				font-size: .28rem;
-				label{
-					display: block;
-					font-weight: bold;
-					margin: .24rem 0; 
-				}
-				p{
-					font-size: .28rem;
-					line-height: 1.4;
-				}
-			}
-		}
-		.weui-dialog__btn_primary{
-			color: $green_1;
-		}
-	}
-}

+ 5 - 5
src/jfw/modules/app/src/web/templates/dataExport/404.html

@@ -3,15 +3,15 @@
 		<meta charset="utf-8">
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>404</title>
 		<title>404</title>
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}"/>
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/no_result.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+		<script src="{{Msg "seo" "cdn"}}/dataExport/js/rem.js"></script>
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/dataExport/css/base.css?v={{Msg "seo" "version"}}"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/no_result.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	</head>
 	</head>
 	<body>
 	<body>
 		<div id="no_result">
 		<div id="no_result">
 			<main class="main">
 			<main class="main">
-				<img src="{{Msg "seo" "cdn"}}/wx_dataExport/images/fish.png" >
+				<img src="{{Msg "seo" "cdn"}}/dataExport/images/fish.png" >
 				<p>根据您的筛选条件,未匹配到数据</p>
 				<p>根据您的筛选条件,未匹配到数据</p>
 				<a href="javascript:history.go(-1)">返回筛选</a>
 				<a href="javascript:history.go(-1)">返回筛选</a>
 			</main>
 			</main>

+ 6 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExPort.html

@@ -6,15 +6,15 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>数据导出</title>
     <title>数据导出</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 </head>
 </head>
 <style>
 <style>
@@ -585,7 +585,7 @@
                 dataType: 'json',
                 dataType: 'json',
                 success: function(data){
                 success: function(data){
                     if(data._id!==""){
                     if(data._id!==""){
-                        window.location.href="/jyapp/front/wx_dataExport/toCreateOrderPage?id="+data._id+"&source=d"
+                        window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d"
                     }
                     }
                 }
                 }
             })
             })

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>附加词</title>
     <title>附加词</title>
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -106,8 +106,8 @@
     </div>
     </div>
 
 
     </div>
     </div>
-    <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
         var keyWordArr = [];
         var keyWordArr = [];
         var keyWordsArr = [];
         var keyWordsArr = [];

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>附加词</title>
     <title>附加词</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"2>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"2>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     </head>
@@ -94,8 +94,8 @@
         </div>
         </div>
 
 
         </div>
         </div>
-        <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
         var keyWordArr = [];
         var keyWordArr = [];
         var keyWordsArr = [];
         var keyWordsArr = [];

+ 9 - 9
src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -7,19 +7,19 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 
 
-		<link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" type="text/css" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" type="text/css" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="/jyapp/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/jyapp/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}">
-		<script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}" />
+		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+		<link rel="stylesheet" href="/jyapp/dataExport/css/public.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="/jyapp/dataExport/css/choose_area.css?v={{Msg "seo" "version"}}">
+		<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	</head>
 	</head>
 		<style>
 		<style>
 			#choose_area .main .select-area-box .tab .province .checkbox:checked {
 			#choose_area .main .select-area-box .tab .province .checkbox:checked {
 				border: 0;
 				border: 0;
-				background: url(/jyapp/wx_dataExport/images/xuanzhong.png) no-repeat center center;
+				background: url(/jyapp/dataExport/images/xuanzhong.png) no-repeat center center;
 				background-size: 100% 100%;
 				background-size: 100% 100%;
 			}
 			}
 			.result{
 			.result{
@@ -418,8 +418,8 @@
 				</main>
 				</main>
 
 
 				</div>
 				</div>
-		<script src="/jyapp/wx_dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-		<script src="/jyapp/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
+		<script src="/jyapp/dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+		<script src="/jyapp/dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 		<script>
 		<script>
 			chinaMapJSON.forEach(function(item,index){
 			chinaMapJSON.forEach(function(item,index){
 				// console.log(item,index)
 				// console.log(item,index)

+ 8 - 8
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -6,11 +6,11 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>采购单位</title>
 	<title>采购单位</title>
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css">
-	<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css">
+	<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -83,9 +83,9 @@
 		</div>
 		</div>
 	</div>
 	</div>
 </div>
 </div>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}26"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}26"></script>
 <script>
 <script>
 	var buyerArr = [];
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>采购单位</title>
     <title>采购单位</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     </head>
@@ -83,8 +83,8 @@
         </div>
         </div>
         </div>
         </div>
         </div>
         </div>
-        <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
     <script>
     <script>
         var buyerArr = [];
         var buyerArr = [];
         if(localStorage.buyer !== "" && localStorage.buyer !== undefined) {
         if(localStorage.buyer !== "" && localStorage.buyer !== undefined) {

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>排除词</title>
     <title>排除词</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -106,8 +106,8 @@
     </div>
     </div>
 
 
     </div>
     </div>
-    <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
         var keyWordArr = [];
         var keyWordArr = [];
         var keyWordsArr = [];
         var keyWordsArr = [];

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>排除词</title>
     <title>排除词</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     </head>
@@ -106,8 +106,8 @@
         </div>
         </div>
 
 
         </div>
         </div>
-        <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
         var keyWordArr = [];
         var keyWordArr = [];
         var keyWordsArr = [];
         var keyWordsArr = [];

+ 5 - 5
src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>行业</title>
     <title>行业</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/industry.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/industry.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -189,7 +189,7 @@
         </div>
         </div>
 
 
     </div>
     </div>
-    <script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
 
 
             function hasActive(){
             function hasActive(){

+ 8 - 8
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>关键词</title>
     <title>关键词</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -135,9 +135,9 @@
         </div>
         </div>
 
 
     </div>
     </div>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}23"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}23"></script>
     <script>
     <script>
         var keyWordArr = [];
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>关键词</title>
     <title>关键词</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -98,8 +98,8 @@
     </div>
     </div>
 
 
 </div>
 </div>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script>
 <script>
     var keyWordArr = [];
     var keyWordArr = [];
     if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
     if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){

+ 11 - 11
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -5,12 +5,12 @@
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
 		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}2">
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}" />
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/pay_order.css?v={{Msg "seo" "version"}}2">
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js"></script>
         <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js"></script>
-        <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
 		{{include "/common/js.html"}}
 		{{include "/common/js.html"}}
     </head>
     </head>
     <body>
     <body>
@@ -62,7 +62,7 @@
                                     <span class="current">{{.T.unitPrice_normal_final}}元/条</span>
                                     <span class="current">{{.T.unitPrice_normal_final}}元/条</span>
                                 </p>
                                 </p>
                                 <!-- <i class="icon iconfont mark">&#xe611;</i> -->
                                 <!-- <i class="icon iconfont mark">&#xe611;</i> -->
-                                <img class="mark" src="/wx_dataExport/images/mark.png">
+                                <img class="mark" src="/jyapp/dataExport/images/mark.png">
                             </div>
                             </div>
                             <div class="choose-item">
                             <div class="choose-item">
                                 <h2>
                                 <h2>
@@ -74,7 +74,7 @@
                                     <span class="current">{{.T.unitPrice_senior_final}}元/条</span>
                                     <span class="current">{{.T.unitPrice_senior_final}}元/条</span>
                                 </p>
                                 </p>
                                 <!-- <i class="icon iconfont mark">&#xe611;</i> -->
                                 <!-- <i class="icon iconfont mark">&#xe611;</i> -->
-                                <img class="mark" src="/wx_dataExport/images/mark.png">
+                                <img class="mark" src="/jyapp/dataExport/images/mark.png">
                             </div>
                             </div>
                         </div>
                         </div>
                         <!-- 字段包提示 -->
                         <!-- 字段包提示 -->
@@ -185,7 +185,7 @@
                         <div class="weui-cells weui-cells_checkbox choose-form">
                         <div class="weui-cells weui-cells_checkbox choose-form">
                             <label class="weui-cell weui-check__label wx_label" for="wx">
                             <label class="weui-cell weui-check__label wx_label" for="wx">
                                 <div class="weui-cell__bd read">
                                 <div class="weui-cell__bd read">
-                                    <p><img src="/wx_dataExport/images/weixin.png">微信支付</p>
+                                    <p><img src="/jyapp/dataExport/images/weixin.png">微信支付</p>
                                 </div>
                                 </div>
                                 <div class="weui-cell__hd">
                                 <div class="weui-cell__hd">
                                     <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
                                     <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
@@ -194,7 +194,7 @@
                             </label>
                             </label>
                             <label class="weui-cell weui-check__label zfb_label" for="zfb">
                             <label class="weui-cell weui-check__label zfb_label" for="zfb">
                                 <div class="weui-cell__bd read">
                                 <div class="weui-cell__bd read">
-                                    <p><img src="/wx_dataExport/images/zhifubao.png">支付宝支付</p>
+                                    <p><img src="/jyapp/dataExport/images/zhifubao.png">支付宝支付</p>
                                 </div>
                                 </div>
                                 <div class="weui-cell__hd">
                                 <div class="weui-cell__hd">
                                     <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
                                     <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
@@ -501,10 +501,10 @@
 				})
 				})
 				
 				
 				//数据浏览
 				//数据浏览
-				$(".dataPreview").on("click",function(){
+				$(".dataPreview").on("tap",function(){
 					if(previewDataTime<50){
 					if(previewDataTime<50){
 						previewDataTime++
 						previewDataTime++
-						window.open("/jyapp/front/wx_dataExport/toPreview/"+{{.T._id}});
+						window.location.href="/jyapp/front/dataExport/previewData/"+{{.T._id}};
 					}else{
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限!","",3000);
 						EasyAlert.show("预览数据次数超出今日上限!","",3000);
 					}
 					}

+ 17 - 13
src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -6,9 +6,15 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css" />
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/preview_data.css">
+		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css" />
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css" />
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/preview_data.css">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/previewData.css?v={{Msg "seo" "version"}}">
+		<script src="https://cdn.bootcss.com/js-polyfills/0.1.42/polyfill.min.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/html2canvas.min.js"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js"></script>
 		<style>
 		<style>
 			iframe{
 			iframe{
 				border: 0px !important;
 				border: 0px !important;
@@ -16,13 +22,11 @@
 		</style>
 		</style>
 	</head>
 	</head>
 	<body>
 	<body>
-		<div id="preview_data">
-			<!-- <header class="header">
-				<a href="#" class="return pull-left">
-					<i class="icon iconfont">&#xe640;</i>
-				</a>
-				<h1 class="title">预览数据</h1>
-			</header> -->
+		<div class="app-layout-header">
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+			预览数据
+		</div>
+		<div id="preview_data" style="    margin-top: 64px;">
 			<main class="main">
 			<main class="main">
 				<div class="buttons-tab">
 				<div class="buttons-tab">
 					<ul>
 					<ul>
@@ -32,15 +36,15 @@
 				</div>
 				</div>
 				<div class="tabs">
 				<div class="tabs">
 					<div class="tab active">
 					<div class="tab active">
-						<iframe id="one" width="100%" height="100%" src="/front/dataExport/previewData/{{.T.id}}?dataType=1"></iframe>
+						<iframe id="one" width="100%" height="100%" src="/front/app_dataExport/previewData/{{.T.id}}?dataType=1"></iframe>
 					</div>
 					</div>
 					<div class="tab" style="display: none;">
 					<div class="tab" style="display: none;">
-						<iframe id="two" width="100%" height="100%" src="/front/dataExport/previewData/{{.T.id}}?dataType=2"></iframe>
+						<iframe id="two" width="100%" height="100%" src="/front/app_dataExport/previewData/{{.T.id}}?dataType=2"></iframe>
 					</div>
 					</div>
 				</div>
 				</div>
 			</main>
 			</main>
 		</div>
 		</div>
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/dataExport/js/zepto.js"></script>
 		<script>
 		<script>
 			$(function() {
 			$(function() {
 				$(".buttons-tab .tab-link").each(function() {
 				$(".buttons-tab .tab-link").each(function() {

+ 4 - 4
src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>金额</title>
     <title>金额</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/money.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/money.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>

+ 5 - 5
src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>信息类型</title>
     <title>信息类型</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/messageType.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/messageType.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>
@@ -178,7 +178,7 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
            
            
             function hasActive(){
             function hasActive(){

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -219,7 +219,7 @@
 			                                                    	nodataHtml=""
 			                                                    	nodataHtml=""
 																	nodataHtml+='<div style="text-align:center;">';
 																	nodataHtml+='<div style="text-align:center;">';
 																	//nodataHtml+='<div style="display:flex;justify-content:center;align-items: center;">';
 																	//nodataHtml+='<div style="display:flex;justify-content:center;align-items: center;">';
-																	nodataHtml+='<img src="/wx_dataExport/images/fish.png" style="width: 2.8rem;height: 2.8rem;margin-top: 45%;">'
+																	nodataHtml+='<img src="/dataExport/images/fish.png" style="width: 2.8rem;height: 2.8rem;margin-top: 45%;">'
 																	nodataHtml+='<div style="color: #888;font-size: .32rem;text-align:center;">暂无数据</div></div>'
 																	nodataHtml+='<div style="color: #888;font-size: .32rem;text-align:center;">暂无数据</div></div>'
 			                                                        $(".card_lists").append(nodataHtml);
 			                                                        $(".card_lists").append(nodataHtml);
 			                                                       	$(".dropload-down").hide();
 			                                                       	$(".dropload-down").hide();

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -6,11 +6,11 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>中标单位</title>
 	<title>中标单位</title>
-	<link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-	<script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+	<link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+	<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	</head>
 	</head>
@@ -83,8 +83,8 @@
 			</div>
 			</div>
 
 
 			</div>
 			</div>
-			<script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-	<script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+			<script src="/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+	<script src="/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 	<script>
 		var winnerArr = [];
 		var winnerArr = [];
 		if(localStorage.winner !== "" && localStorage.winner !== undefined){
 		if(localStorage.winner !== "" && localStorage.winner !== undefined){

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>中标单位</title>
     <title>中标单位</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     </head>
@@ -83,8 +83,8 @@
         </div>
         </div>
 
 
         </div>
         </div>
-        <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
     <script>
     var winnerArr = [];
     var winnerArr = [];
     if(localStorage.winner !== "" && localStorage.winner !== undefined){
     if(localStorage.winner !== "" && localStorage.winner !== undefined){

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -138,13 +138,13 @@
 			$(".loading_").show();
 			$(".loading_").show();
 			$.ajax({
 			$.ajax({
 				type: "post",
 				type: "post",
-				url: "/jyapp/front/wx_dataExport/searchExport",
+				url: "/jyapp/front/dataExport/searchExport",
 				data: SuperSearch.reqParam,
 				data: SuperSearch.reqParam,
 				dataType: "json",
 				dataType: "json",
 				success: function(data){
 				success: function(data){
 					$(".loading_").hide();
 					$(".loading_").hide();
 					if(data._id!=""){
 					if(data._id!=""){
-						window.location.href="/jyapp/front/wx_dataExport/toCreateOrderPage?id="+data._id+"&source=d"
+						window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d"
 					}
 					}
 				},
 				},
 				error:function(e){
 				error:function(e){