Merge branch 'dev2.10.10' of http://192.168.3.207:10080/qmx/jy into dev2.10.10

src/jfw/front/structedData.go

@@ -313,7 +313,7 @@ func (t *StructedData) SendMailVerify() {
 			if isEmail(email) {
 				lastSendDEVerify := util.Int64All(t.GetSession("CreatSMVerifyTime"))
 				timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
-				incurKey := fmt.Sprintf("SendSMEmail_%s_%t", t.GetSession("userId"), time.Now().Day())
+				incurKey := fmt.Sprintf("SendSMEmail_%s_%d", t.GetSession("userId"), time.Now().Day())
 				if lastSendDEVerify == 0 || timeSpaceing < 0 {
 					//每日限制10次
 					times := util.IntAll(redis.Get("other", incurKey))

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

@@ -182,7 +182,7 @@ func (t *StructedData) SendMailVerify() {
 			if isEmail(email) {
 				lastSendDEVerify := util.Int64All(t.GetSession("CreatSMVerifyTime"))
 				timeSpaceing := lastSendDEVerify - time.Now().Unix() + 60*5
-				incurKey := fmt.Sprintf("SendSMEmail_%s_%t", t.GetSession("userId"), time.Now().Day())
+				incurKey := fmt.Sprintf("SendSMEmail_%s_%d", t.GetSession("userId"), time.Now().Day())
 				if lastSendDEVerify == 0 || timeSpaceing < 0 {
 					//每日限制10次
 					times := util.IntAll(redis.Get("other", incurKey))

src/web/staticres/structuredata/pc/css/write_infor.css

@@ -13,6 +13,7 @@ html {
   justify-content: center; */
 	line-height: 1;
     padding-top: 76px;
+    min-height: calc(100% - 340px);
 }
 
 .write_infor .wrap {

src/web/templates/pc/myOrder.html

@@ -210,7 +210,7 @@
 				$("body").css("line-height", "1");
 				$(".logo img").attr("src", "/images/swordfish/sf_01_new.png");
 				$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-				$("section[id='drder']").css("padding-top", "97px");
+				$("section[id='drder']").css({"padding-top":"97px","min-height":"calc(100% - 340px)"});
 
 				/*设置关键词css*/
 				var $gjccss = $(".list .gjc");