Merge branch 'dev4.7.9' of http://192.168.3.207:8080/qmx/jy into dev4.7.9

src/jfw/front/ws_dataExport.go

@@ -199,11 +199,13 @@ func (w *WsDataExport) GetPreview() error {
 	if res == nil || err != nil {
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
 	}
+	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
 	//格式化字段
 	res_screen := dataexport.ScreenData(res, dataType, 20, kws)
 	list := dataexport.FormatExportData(public.Mgo_Ent, &res_screen, config.Sysconfig["webdomain"].(string), dataType, true)
 	_res["data"] = subUrl(list, dataType)
 	_res["dataType"] = dataType
+	_res["total"] = msgCount
 	w.ServeJson(map[string]interface{}{
 		"res": _res,
 	})

src/jfw/front/wx_dataExport.go

@@ -204,7 +204,8 @@ func (w *WxDataExport) SaveData() error {
 		saveData["s_userid"] = w.GetSession("userId").(string)
 	}
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
-	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id)})
+	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
+	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id), "total": msgCount})
 	return nil
 }
 

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

@@ -210,7 +210,8 @@ func (w *WxDataExport) SaveData() error {
 		saveData["s_userid"] = w.GetSession("userId").(string)
 	}
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
-	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id)})
+	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
+	w.ServeJson(bson.M{"_id": util.SE.Encode2Hex(_id), "total": msgCount})
 	return nil
 }
 

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

@@ -68,6 +68,7 @@ func (w *WsDataExport) GetPreview() error {
 	if res == nil || err != nil {
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
 	}
+	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
 	//格式化字段
 	res_screen := dataexport.ScreenData(res, dataType, 20, kws)
 	var EntArr = []string{}
@@ -82,6 +83,7 @@ func (w *WsDataExport) GetPreview() error {
 	list := dataexport.FormatExportData(public.Mgo_Ent, &res_screen, config.Sysconfig["webdomain"].(string), dataType, true)
 	_res["data"] = subUrl(list, dataType)
 	_res["dataType"] = dataType
+	_res["total"] = msgCount
 	w.ServeJson(map[string]interface{}{
 		"res": _res,
 	})

src/web/templates/pc/createOrderPage.html

@@ -139,7 +139,7 @@
                 <div class="gr no-select" data-pay-type="个人支付"><p>个人支付</p></div>
             </div>
             <div class="datapackage-buy-tip-group">
-                <span>数据流量包特惠充值，即充即导，2年有效</span>
+                <span>数据流量包：按条数预充值，即充即导，价格更优！</span>
                 <span class="arrowPC" style="margin-left: 16px;"></span>
                 <a id="buy-data-pack-for-link" href="/front/dataPack/createOrder">立即购买数据流量包</a>
             </div>
@@ -225,8 +225,7 @@
               <div class="fl left" data-show-type="个人支付" style="flex: 1;color: #888888;font-size: 12px;line-height: 13px;">
                 <p>购买须知：</p>
                 <p>最低起售<span></span>元</p>
-                <p>标准字段包：原价<span></span>元/条，限时<span></span>
-                  折，现价<span></span>元/条；</p>
+                <p>标准字段包：原价<span></span>元/条，限时<span></span>折，现价<span></span>元/条；</p>
                 <p>高级字段包：原价<span></span>元/条，限时<span></span>折，现价<span></span>元/条。</p>
               </div>
                 <!--S-优惠券-->