Merge branch 'dev4.5.8' of http://127.0.0.1:8080/qmx/jy into dev4.5.8

src/jfw/modules/common/src/qfw/util/dataexport/entdataexport.go

@@ -364,18 +364,18 @@ func SaveExportLog(mysqlSess *mysql.Mysql, entId, entUserId, count, newCount, re
 		phone := util.ObjToString((*userData)["phone"])
 		now := time.Now()
 		mysqlSess.Insert("entniche_export_log", map[string]interface{}{
-			"user_name":         name,
-			"export_time":       util.FormatDate(&now, util.Date_Full_Layout),
-			"data_source":       "2",
-			"export_num":        count,
-			"deduct_num":        newCount,
-			"download_url":      xlsxUrl,
-			"ent_id":            entId,
-			"phone":             phone,
-			"user_id":           entUserId,
-			"filter":            filterStr,
-			"user_export_phone": exportPhone,
-			"user_export_mail":  exportEmail,
+			"user_name":    name,
+			"export_time":  util.FormatDate(&now, util.Date_Full_Layout),
+			"data_source":  "2",
+			"export_num":   count,
+			"deduct_num":   newCount,
+			"download_url": xlsxUrl,
+			"ent_id":       entId,
+			"phone":        phone,
+			"user_id":      entUserId,
+			"filter":       filterStr,
+			"export_phone": exportPhone,
+			"export_mail":  exportEmail,
 		})
 	}
 }

src/jfw/modules/subscribepay/src/entity/dataExportPackStruct.go

@@ -361,7 +361,7 @@ var (
 )
 
 // UseEntPack 企业数据包扣除
-func (this *dataExportPackStruct) UseEntPack(sess *httpsession.Session, userId, entId string, selectId string, phone, email string) error {
+func (this *dataExportPackStruct) UseEntPack(sess *httpsession.Session, userId, entId string, selectId string, exportPhone, exportEmail string) error {
 	if phone := getAndCacheUserPhone(sess, userId); phone != "" {
 		res := util.Mysql.FindOne("entniche_user", map[string]interface{}{"phone": phone, "ent_id": entId}, "id,ent_id", "")
 		if res == nil || len(*res) == 0 {
@@ -408,10 +408,10 @@ func (this *dataExportPackStruct) UseEntPack(sess *httpsession.Session, userId,
 					FilterId: selectId,
 				}
 				filterStr, _ := json.Marshal(filter)
-				dataexport.SaveExportLog(util.Mysql, entIdInt, entUserId, count, newCount, remain_nums, export_nums, xlsxUrl, "2", string(filterStr), phone, email)
+				dataexport.SaveExportLog(util.Mysql, entIdInt, entUserId, count, newCount, remain_nums, export_nums, xlsxUrl, "2", string(filterStr), exportPhone, exportEmail)
 				dataexport.DeductNum(util.Mysql, util.Mgo_Qyfw, entIdInt, newCount)
 				cacheResult(nil, xlsxUrl, fmt.Sprintf("entPackResult_%s_%s", userId, selectId))
-				sendPackExportMail(userId, selectId, email, xlsxUrl)
+				sendPackExportMail(userId, selectId, exportEmail, xlsxUrl)
 				for _, v := range *data {
 					util.MQFW.Save("entdataexport", v)
 				}

src/web/staticres/common-module/data-pack/css/index.css

@@ -79,6 +79,7 @@
 .data-box .up-line .d-conts .d-card .words .nums .p1 i {
     font-size: .22rem;
     line-height: 18px;
+    font-weight: 500!important;
     color: #9B9CA3;
     margin-left: .08rem;
 }
@@ -242,7 +243,7 @@
 }
 
 .emptycom{
-    margin: 1.2rem 0 1.4rem 0;
+    margin: .2rem 0 1.4rem 0;
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
@@ -280,6 +281,10 @@
     padding-top: .24rem;
 }
 
+.export-box .emptycom {
+    margin-top: 1.2rem;
+}
+
 .ex-port {
     display: block;
 }

src/web/staticres/frontRouter/pc/my_data_packet/css/index-pc.css

@@ -131,7 +131,6 @@
     height: 122px;
     border-radius: 8px 8px 0 0;
     padding: 28px 32px;
-    /* background: linear-gradient(276deg,#14a7d6 100%, #1ec2db 100%); */
     background: -webkit-linear-gradient(180deg,#14a7d6 0%, #1ec2db 100%);
 }
 
@@ -139,7 +138,7 @@
     color: #fff;
 }
 
-.data-box .down-line .d-chong .d-head .s-zhu .el-button {
+.data-box .down-line .d-chong .d-head .el-button {
     border: none;
 }