xiugai

src/jfw/modules/app/src/config.json

@@ -54,9 +54,9 @@
         "弹指一挥间，剑鱼因你而不同！",
         "携手同行，认真对待每一次招投标"
     ],
-    "advertImg": "/images/advert.png",
+    "advertImg": "/jyapp/images/advert.png",
     "advertName": "广告",
-    "advertUrl": "/swordfish/about",
+    "advertUrl": "/jyapp/free/swordfish/about",
 	"industry":"分类综合测试",
     "recommendEntLimit":"50",
 	"update":{

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

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"jfw/config"
-	"jfw/jyutil"
+	//"jfw/jyutil"
 	"log"
 	"net/http"
 	qutil "qfw/util"
@@ -420,7 +420,7 @@ func SendIdentCode(title, phone string, session *httpsession.Session) bool {
 	param := make(map[string]string)
 	param["code"] = s_ranNum
 	log.Println("验证码", phone, s_ranNum)
-	jyutil.SendSMS("2175916", phone, param)
+	//jyutil.SendSMS("2175916", phone, param)
 	return true
 }
 

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

@@ -12,13 +12,14 @@ type Me struct {
 	*xweb.Action
 	meIndex      xweb.Mapper `xweb:"/jyapp/free/me"`
 	meSet        xweb.Mapper `xweb:"/jyapp/free/set"`
-	updatepwd    xweb.Mapper `xweb:"/jyapp/free/updatepwd"`          //修改密码
+	updatepwd    xweb.Mapper `xweb:"/jyapp/updatepwd"`               //修改密码
 	pushMsgSet   xweb.Mapper `xweb:"/jyapp/free/pushMsgSet"`         //推送消息设置
 	useHelp      xweb.Mapper `xweb:"/jyapp/free/iframe"`             //使用帮助
 	solveWay     xweb.Mapper `xweb:"/jyapp/free/solveWay"`           //android收不到推送的解决办法
 	notice       xweb.Mapper `xweb:"/jyapp/free/notice"`             //通知
 	noticeDetail xweb.Mapper `xweb:"/jyapp/free/notice/detail/(.*)"` //通知
 	checkUpdate  xweb.Mapper `xweb:"/jyapp/free/checkUpdate"`        //检查是否更新
+	download     xweb.Mapper `xweb:"/jyapp/free/download"`
 }
 
 func init() {
@@ -47,6 +48,12 @@ func (m *Me) NoticeDetail(id string) error {
 	m.T["id"] = id
 	return m.Render("/me/noticeDetail.html", &m.T)
 }
+func (m *Me) Download() error {
+	m.T["from"] = m.GetString("from")
+	update := config.Sysconfig["update"].(map[string]interface{})
+	m.T["apkurl"] = update["apkurl"]
+	return m.Render("/me/download.html", &m.T)
+}
 func (l *Me) Updatepwd() error {
 	defer qutil.Catch()
 	if l.Method() == "GET" {

src/jfw/modules/app/src/seo.json

@@ -77,5 +77,5 @@
 	},
 	"jyadd":"http://127.0.0.1",
 	"limitcount":20,
-	"ZBADDRESS":"",
+	"ZBADDRESS":"http://webwcj.qmx.top",
 }

src/jfw/modules/app/src/web/staticres/jyapp/css/common.css

@@ -1,5 +1,12 @@
 @import url(/jyapp/css/layout.css);
 @import url(/jyapp/css/font.css);
+* {
+  -webkit-touch-callout:none;
+  -khtml-user-select:none;
+  -moz-user-select:none;
+  -ms-user-select:none;
+  user-select:none;
+}
 body{
 	margin: 0px;
 	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;

src/jfw/modules/app/src/web/staticres/jyapp/css/dev2/syz-public-href.css

@@ -70,8 +70,8 @@ body {
 #syz-secondHtml .title .weui-switch-cp__box {
   /*微信开关*/
   position: relative;
-  width: 1.04rem;
-  height: .64rem;
+  width: 1.06rem;
+  height: .68rem;
   border: 1px solid #dfdfdf;
   outline: 0;
   border-radius: .32rem;

src/jfw/modules/app/src/web/staticres/jyapp/css/dev2/syzindex.css

@@ -14,7 +14,7 @@
 /*文字高亮*/
 /*白色字体*/
 body {
-  background: #2cb7ca url(/jyapp/images/syzindex/syz-bg.png) 95% 0.5rem no-repeat;
+  background: #2cb7ca url(/jyapp/images/syzindex/syz-bg.png) 95% 20px no-repeat;
 }
 
 #sys-main {
@@ -25,7 +25,6 @@ body {
 #sys-main .header-text {
   /*头部文字*/
   color: #ffffff;
-  margin-top: 0.7rem;
 }
 
 #sys-main .header-text h3 {

src/jfw/modules/app/src/web/staticres/jyapp/css/follow.css

@@ -466,11 +466,10 @@ top:17px;
 	line-height: 24px;
 	font-weight: 600;
 	position: fixed;
-	top: 1.1rem;
+	top: 65px;
 	left: 0px;
 	right: 0px;
 	z-index: 1;
-	margin-top: 20px;
 }
 .setpage .noticenew{
     padding: 1px 2px 2px 3px;

src/jfw/modules/app/src/web/staticres/jyapp/css/layout.css

@@ -1,13 +1,13 @@
 /*****app 第一版 布局*****/
 .app-layout-header{
-	line-height: 1.1rem;
+	line-height: 44px;
     background-color: #FFFFFF;
     text-align: center;
     border-bottom: 1px solid #E6E6E6;
-    font-size: 0.45rem;
+    font-size: 18px;
     position: fixed;
     padding-top: 20px;
-    z-index: 1;
+    z-index: 99999;
     left: 0;
     right: 0;
     top: 0;
@@ -15,26 +15,23 @@
 }
 .app-layout-header>.app-back{
 	position: absolute;
-    left: 0rem;
-    font-size: 0.4rem;
-    line-height: 1.1rem;
+    font-size: 19px;
     padding-top: 20px;
-    padding-left: 0.36rem;
-    padding-right: 0.36rem;
-    top: 5px;
-    bottom: 0px;
+    padding-left: 11px;
+    padding-right: 11px;
+    left: 0px;
+    top: 18px;
 	color: #444444;
 }
 .app-layout-content-a,.app-layout-content-b{
-    margin-top: 1.1rem;
+    margin-top: 44px;
     padding-top: 20px;
 }
 .app-layout-content-a{
-	margin-bottom: 1.2rem;
+	margin-bottom: 65px;
 }
 .app-layout-footer {
   width: 100%;
-  height: 1.2rem;
   background: #fff;
   position: fixed;
   left: 0;
@@ -49,37 +46,35 @@
 }
 .app-layout-footer ul {
   width: 100%;
-  height: 1.2rem;
 }
 
 .app-layout-footer ul li {
   width: 25%;
   float: left;
-  font-size: 0.35rem;
   text-align: center;
+  color: #888888;
+  height: 49px;
 }
 
-.app-layout-footer ul li a span {
-  font-size: 0.47rem;
+.app-layout-footer ul li span {
+  font-size: 21px;
   display: block;
   width: 100%;
-  line-height: 0.7rem;
-  color: #aaa9a9;
   text-align: center;
-  margin-top: 0.15rem;
+  margin-top: 10px;
+  margin-bottom: 2px;
 }
 
-.app-layout-footer ul li a p {
-  color: #888888;
-  line-height: 0.25rem;
+.app-layout-footer ul li p {
   margin: 0;
+  font-size: 10px;
 }
 
-.app-layout-footer ul li.active a span {
+.app-layout-footer ul li.active span {
   color: #2CB7CA;
 }
 
-.app-layout-footer ul li.active a p {
+.app-layout-footer ul li.active p {
   color: #2CB7CA;
 }
 .easyalert-mask{
@@ -98,9 +93,12 @@
 	top: 50%;
 	color: #fff;
 	z-index: 999;
-	border-radius: 5px;
+	border-radius: 6px;
 	text-align: center;
-	padding: 15px 20px;
+	padding: 14px 26px;
     font-size: 15px;
-	letter-spacing: 2px;
+	letter-spacing: 1px;
+}
+.jyapp-li-active{
+	background-color: #e5e5e8 !important;
 }

src/jfw/modules/app/src/web/staticres/jyapp/css/wxkeyset.css

@@ -2,7 +2,13 @@ body{
 	background-color: #F5F4FA;
 	font-size: 16px;
 }
-
+input:focus{
+    -webkit-tap-highlight-color:rgba(0,0,0,0);   
+    -webkit-user-modify:read-write-plaintext-only;   
+}
+input{
+	outline:none;
+}
 img{
 	vertical-align: middle;
 }

src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -44,7 +44,7 @@ form{
   display: -webkit-box;
   display: flex;
   -webkit-box-pack: justify;
-          justify-content: space-between;
+  justify-content: space-between;
   width: 100%;
   height: 0.9rem;
    margin-top: 20px;
@@ -62,11 +62,14 @@ form{
   background-size: .38rem .38rem;
 }
 
+#searchIndex .search-header .search-tontrol>div{
+	position: relative;
+  width: 85%;
+}
 #searchIndex .search-header .search-tontrol .inp-search {
   position: absolute;
   left: 0.2rem;
   top: 0;
-  width: 85%;
   padding-left: 0.3rem;
   box-sizing: border-box;
   height: 0.88rem;
@@ -76,8 +79,15 @@ form{
   color: #888888;
   border-radius: 6px;
   margin-top: 1px;
+  width: 100%;
+}
+#searchIndex .search-header .search-tontrol>div>img {
+	width: 19px;
+	position: absolute;
+	right: 5px;
+	top: 50%;
+	margin-top: -9.5px;
 }
-
 #searchIndex .search-header .search-tontrol .search-submit {
   position: absolute;
   left: 80%;

src/jfw/modules/app/src/web/staticres/jyapp/followent/css/follow.css

@@ -455,11 +455,10 @@
 	line-height: 24px;
 	font-weight: 600;
 	position: fixed;
-	top: 1.1rem;
+	top: 65px;
 	left: 0px;
 	right: 0px;
 	z-index: 1;
-	margin-top: 20px;
 	font-size: 16px;
 }
 .setpage .noticenew{

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -63,7 +63,7 @@ function timeDiff(date){
 		if (days > 10) {
 			var date1year = date1.getFullYear();
 			var date2year = date2.getFullYear();
-			var date1month = date1.getUTCMonth()+1;
+			var date1month = date1.getMonth()+1;
 			var date1day = date1.getDate();
 			if(date1month < 10){
 				date1month ="0"+date1month;
@@ -329,4 +329,36 @@ $(function(){
 				break;
 		}
 	});
-});
+});
+function setLiActive(obj){
+	$(obj).addClass("jyapp-li-active");
+	setTimeout(function(){
+		$(obj).removeClass("jyapp-li-active");
+	},500);
+}
+function mySysIsIos(){
+	return !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+}
+function appQuit(url){
+	JyObj.removeUserToken();
+	$.ajax({
+		url: "/jyapp/free/signOut",
+		type: "post",
+		data: {},
+		dataType: "json",
+		success: function(r){
+			if(url){
+				window.location.href = url;
+			}else{
+				window.location.href = "/jyapp/free/me";
+			}
+		},
+		error: function(){
+			if(url){
+				window.location.href = url;
+			}else{
+				window.location.href = "/jyapp/free/me";
+			}
+		}
+	});
+}

src/jfw/modules/app/src/web/staticres/jyapp/js/wxEntsesearch.js

@@ -21,6 +21,7 @@ var EntSearch = {
 		this.isMyPage = true;
 		$("#searchIndex").addClass("hidden");
 		$("#entsearchPage").removeClass("hidden");
+		$(".app-layout-footer").addClass("hidden");
 		$("body").css("background-color","#fff");
 		if(isReload){
 			this.resetPage(isFocus);
@@ -289,6 +290,7 @@ var EntSearch = {
 	recoveryPage: function(){
 		$("#searchIndex").addClass("hidden");
 		$("#entsearchPage").removeClass("hidden");
+		$(".app-layout-footer").addClass("hidden");
 		$("#entsearchPage #wrapper").removeClass("hidden");
 		EntSearch.setUpLastPage();
 	},

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -504,8 +504,8 @@ var SuperSearch = {
 		if(flag){
 			$("#supersearchPage input[name=super_searchinput]").focus();
 			this.afterFocus();
-			this.getIndustry();
 		}
+		this.getIndustry();
 		this.resetSx();//重置筛选
 		$("#supersearchPage .shaixIndustry").addClass("shaixcl");
 		$("#supersearchPage .shaixIndustry").siblings().removeClass("shaixcl");

src/jfw/modules/app/src/web/staticres/jyapp/me/css/forgetPwd.css

@@ -4,27 +4,28 @@ body {
 }
 
 .register {
-  margin-top: 0.35rem;
+  margin-top: 13px;
 }
 
+.tran-line-bottom{
+	left: 15px;
+}
 .register .registerMain {
   background: #fff;
   border-bottom: 1px solid #E6E6E6;
   border-top: 1px solid #E6E6E6;
 }
 .register .registerMain .code>span{
-	font-size: 0.32rem;
+	font-size: 16px;
     text-align: center;
     color: #888888;
     background: #fff;
-	height: 100%;
-    line-height: 1rem;
 	vertical-align: top;
-	width: 35%;
 	right: 0px;
 	position: relative;
+	width: 110px;
 }
-.register .registerMain .code>*{
+.register .registerMain .code>div:first-child,.register .registerMain .code>span{
 	display: table-cell;
 }
 .register .registerMain .code .captcha img{
@@ -33,69 +34,36 @@ body {
 	height: 30px;
 }
 .register .registerMain .code>div:nth-child(1){
-   width: 5%;
-}
-.register .registerMain .code>div:nth-child(2){
-   width: 60%;
-   border-bottom: 1px solid #E6E6E6;
-}
-.register .registerMain .captcha{
-	border-bottom: 1px solid #E6E6E6;
+   position: relative;
 }
-.register .registerMain .code:nth-child(3)>div{
+.register .registerMain .code:nth-child(3) input{
 	border-bottom: none;
+	border-bottom-width: 1px;
 }
 .register .registerMain .code input{
-	border: none;
-	width: 90%;
-	height: 0.9rem;
-    font-size: 0.32rem;
+	width: 100%;
+    font-size: 16px;
+	padding-left: 15px;
 }
 .register .registerMain .code {
   position: relative;
-  height: 1rem;
-  line-height: 1rem;
   display: table;
   width: 100%;
-}
-.register .registerMain .code:first-child>div:nth-child(2) {
-	width: 92%;
-}
-.register .registerMain .code:first-child,.register .registerMain .code:first-child input {
-	border: none;
+	height: 50px;
+	line-height: 50px;
 }
 .register .registerMain .code:first-child input{
-	width: 90%;
+	width: 100%;
 }
 .register .code #btn>font {
 	margin-right: 10px;
 }
-.register .line{
-    height: 100%;
-    width: 1px;
-    background-color: #E6E6E6;
-    position: absolute;
-    left: 0px;
-    top: 0px;
+.closeQc{
+	right: 15px;
 }
-/*手机号错误弹窗*/
-.errorTc {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 99;
-  width: 5rem;
-  height: 1rem;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -2.5rem;
-  margin-top: -0.5rem;
-  background: rgba(0, 0, 0, 0.6);
-  color: #fff;
-  text-align: center;
-  line-height: 1rem;
-  border-radius: 0.2rem;
-  font-size: 0.34rem;
-  display: none;
+.code input{
+	padding-right: 45px;
 }
+center{
+	padding: 0px 15px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/header.css

@@ -1,21 +1,20 @@
 #header {
   width: 100%;
-  height: 4rem;
+  height: 180px;
   background: url(/jyapp/me/images/banner_03.png);
   background-size: 100%;
-  padding-top: 20px;
+  padding-top: 30px;
 }
 
 #header a {
-  font-size: 0.36rem;
+  font-size: 14px;
   color: #fff;
-  line-height: 0.6rem;
-  padding-left: 0.24rem;
+  padding-left: 15px;
 }
 
 #header h2 {
-  font-size: 0.6rem;
+  font-size: 30px;
   color: #fff;
   text-align: center;
-  margin-top: 0.8rem;
+  margin-top: 20px;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/index.css

@@ -5,26 +5,22 @@ body {
   width: 100%;
   background-image: url(../images/core.png);
   background-size: 100% 100%;
-  padding-bottom: 0.5rem;
-  padding-top: 1.1rem;
+  padding-bottom: 30px;
+  padding-top: 44px;
 }
 #main .core>div {
   margin-top: 20px;
-}
-#main .core h2 {
-  text-align: center;
-  line-height: 1rem;
-  color: #fff;
-  font-size: 0.36rem;
+  line-height: 58px;
+  height: 58px;
+  position: relative;
 }
 
 #main .core .coreLeft {
-  width: 1.2rem;
-  height: 1.2rem;
-  margin: 0 0.3rem;
+  width: 58px;
+  height: 58px;
+  margin: 0px 20px 0px 15px;
   border-radius: 100%;
   overflow: hidden;
-  float: left;
 }
 
 #main .core .coreLeft img {
@@ -32,123 +28,127 @@ body {
 }
 
 #main .core .coreRight {
-  width: 5.6rem;
-  margin-top: 0.3rem;
-  float: left;
   color: #fff;
   overflow: hidden;
   text-overflow:ellipsis;
   white-space: nowrap;
+  font-size: 18px;
+  position: absolute;
+  left: 93px;
+  right: 15px;
+  top: 0px;
+  bottom: 0px;
+  margin: auto 0px;
 }
 
 #main .core .coreRight a {
-  width: 1.75rem;
-  height: 0.6rem;
   display: block;
-  border-radius: 0.04rem;
   border: 1px solid #fff;
-  font-size: 0.28rem;
+  font-size: 14px;
   text-align: center;
-  line-height: 0.6rem;
   color: #ffffff !important;
+  width: 87px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+  position: absolute;
+  top: 50%;
+  margin-top: -15px;
 }
 
 #main .notice {
-  width: 100%;
-  height: 1.1rem;
+  height: 55px;
+  line-height: 55px;
   border-bottom: 1px solid #E6E6E6;
   background: #fff;
-  padding-left: 0.36rem;
+  padding-left: 52px;
+  padding-right: 15px;
+  position: relative;
 }
 
 #main .notice span {
-  float: left;
-  font-size: 0.55rem;
+  font-size: 27px;
   color: #ffba00;
-  margin-top: 0.36rem;
+  position: absolute;
+  left: 18px;
+  top: 18px;
 }
 
 #main .notice a {
   display: block;
-  width: 100%;
-  height: 1.1rem;
-  color: #000000;
-  line-height: 1.1rem;
-  padding-left: 0.75rem;
-  font-size: 0.34rem;
-  background: url(../images/arrow_right.png) no-repeat 6.6rem center;
-  background-size: 0.2rem 0.33rem;
-position: relative;
+  color: #1d1d1d;
+  line-height: 55px;
+  font-size: 17px;
+  position: relative;
 }
 
-#main .notice a i {
+#main .notice a font {
     position: absolute;
-    width: 0.4rem;
-    height: 0.4rem;
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
     background: #f12c20;
     border-radius: 100%;
     text-align: center;
-    line-height: 0.4rem;
-    font-size: 0.23rem;
+    font-size: 12px;
     color: #fff;
     display: none;
-    right: 0.8rem;
+    right: 18px;
     top: 0px;
     bottom: 0px;
     margin: auto;
 }
 
 #main .follow {
-  margin-top: 0.4rem;
+  margin-top: 13px;
   background: #fff;
-  border-top: 1px solid #E6E6E6;
   border-bottom: 1px solid #E6E6E6;
 }
 
 #main .follow ul li {
-  padding-left: 0.3rem;
+  padding-left: 52px;
+  padding-right: 15px;
+  line-height: 55px;
+  height: 55px;
+  position: relative;
+  font-size: 17px;
+  border-top: 1px solid #E6E6E6;
 }
 
 #main .follow ul li span {
-  float: left;
-  font-size: 0.6rem;
+  font-size: 27px;
   color: #9acd6b;
-  margin-top: 0.36rem;
+  position: absolute;
+  left: 15px;
+  top: 19px;
 }
 
 #main .follow ul li a {
-  display: block;
-  width: 100%;
-  height: 1.1rem;
   color: #1d1d1d;
-  line-height: 1.1rem;
-  padding-left: 0.75rem;
-  border-top: 1px solid #E6E6E6;
-  background: url(../images/arrow_right.png) no-repeat 6.6rem center;
-  background-size: 0.2rem 0.33rem;
-  font-size: 0.34rem;
-}
-
-#main .follow ul li.listOne a {
-  border-top: none;
-}
-
-#main .history {
-  margin-top: 0.4rem;
-  background: #fff url(../images/history.png) no-repeat 0.34rem center;
-  background-size: 0.6rem;
-  border-top: 1px solid #E6E6E6;
-  border-bottom: 1px solid #E6E6E6;
+  display: block;
 }
 
 #main .install {
-  margin-top: 0.4rem;
+  margin-top: 13px;
   background: #fff;
   border-top: 1px solid #E6E6E6;
   border-bottom: 1px solid #E6E6E6;
 }
+#main .install span{
+	left: 15px;
+}
 .app-layout-header{
 	background-color: transparent;
 	border-bottom: none;
 	color: #ffffff;
 }
+.notice i,.follow i {
+    font-size: 13px;
+    color: #C2C2C2;
+    position: absolute;
+    right: 15px;
+    top: 4px;
+    bottom: 0px;
+    margin: auto;
+    line-height: inherit;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/login.css

@@ -1,75 +1,37 @@
 @charset "UTF-8";
 .login {
-  margin-top: 0.5rem;
-  padding: 0rem 0.5rem;
+  margin-top: 20px;
+  padding: 0px 25px;
   /*微信登陆*/
 }
 
-.login .tel {
-  width: 100%;
-  height: 0.9rem;
-  line-height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-  font-size: 0.32rem;
-}
-
 .login div.pass {
   width: 100%;
-  position: relative;
-  top: 0.1rem;
   background: #fff;
+  position: relative;
+  border-bottom: 1px solid #E6E6E6;
+  height: 50px;
+  line-height: 50px;
 }
 
 .login div.pass input {
-  width: 100%;
-  height: 0.9rem;
   border: none;
-  border-bottom: 1px solid #E6E6E6;
-  font-size: 0.32rem;
+  font-size: 16px;
   background: #fff;
+  padding-right: 75px;
 }
 
-.login div.pass span.jyapp-icon {
-  width: 0.5rem;
-  height: 0.9rem;
-  line-height: 0.9rem;
-  position: absolute;
-  right: 0.1rem;
-  top: 0.1rem;
-  font-size: 0.2rem;
-  color: #c2c2c2;
-}
-
-.login div.pass span.closeQc {
-  position: absolute;
-  right: 1.2rem;
-  top: 0.28rem;
-  font-size: 0.4rem;
-  color: #c2c2c2;
-  display: inline-block;
-  width: 0.4rem;
-  height: 0.4rem;
-  border: 1px solid #999;
-  background: linear-gradient(to right, #999, #999) no-repeat center, linear-gradient(to top, #999, #999) no-repeat center;
-  background-size: 2px 10px, 10px 2px;
-  border-radius: 100%;
-  -webkit-transform: rotate(45deg);
-          transform: rotate(45deg);
-  display: none;
-}
-
-.login .btn {
-  margin-bottom: 0rem;
-  width: 100%;
+.login div.onePass .closeQc {
+	right: 40px;
 }
 
 .login .forget {
-  margin-top: 0.4rem;
+  margin-top: 18px;
 }
 
 .login .forget a {
   color: #0987ff;
-  font-size: 0.3rem;
+  font-size: 14px;
   float: left;
 }
 
@@ -78,9 +40,8 @@
 }
 
 .login .wx {
-  width: 100%;
   text-align: center;
-  margin-top: 2.8rem;
+  margin-top: 2rem;
 }
 
 .login .wx>span {
@@ -88,36 +49,13 @@
 }
 
 .login .wx .jyapp-icon {
-  font-size: 0.8rem;
+  font-size: 40px;
   color: #0ab70e;
-	vertical-align: text-top;
+  vertical-align: text-top;
 }
 
 .login .wx i {
-  font-size: 0.32rem;
+  font-size: 16px;
   color: #1d1d1d;
-  margin-left: 0.15rem;
-}
-
-.jyapp-icon-zhengyan {
-  font-size: 0.3rem !important;
-  color: #2cb7ca !important;
-}
-
-/*弹窗*/
-.tc {
-  width: 3.7rem;
-  height: 1rem;
-  background: #4c4c4c;
-  text-align: center;
-  line-height: 1rem;
-  color: #fff;
-  font-size: 0.3rem;
-  border-radius: 0.1rem;
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  margin-left: -1.8rem;
-  margin-top: -0.5rem;
-  display: none;
-}
+  margin-left: 10px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/notice.css

@@ -3,117 +3,83 @@ body {
   background: #f4f4f9;
 }
 
-.header {
-  height: 0.9rem;
-  background: #fff;
-  position: relative;
-  line-height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-}
-
-.header a {
-  position: absolute;
-  left: 0.2rem;
-  top: 0;
-}
-
-.header a span {
-  font-size: 0.36rem;
-  color: #444;
-}
-
-.header h3 {
-  text-align: center;
-  width: 100%;
-  font-size: 0.36rem;
-}
-
 .noticeMain {
-  margin-top: 0.2rem;
+  margin-top: 13px;
   /*通知列表*/
 }
 
 .noticeMain .empty {
   display: none;
+  text-align: center;
+  position: absolute;
+  top: 50%;
+  margin-top: -101.5px;
+  left: 50%;
+  margin-left: -75px;
 }
 
 .noticeMain .empty img {
-  width: 3rem;
-  margin-left: 2.25rem;
-  margin-top: 2.5rem;
+  width: 150px;
 }
 
 .noticeMain .empty p {
-  margin-top: 0.6rem;
-  font-size: 0.34rem;
+  margin-top: 20px;
+  font-size: 16px;
   text-align: center;
   color: #1D1D1D;
 }
 
 .noticeMain .noticeList ul li {
   background: #fff;
-  margin-bottom: 0.2rem;
-  padding: 0.2rem 0 0.2rem;
+  margin-bottom: 13px;
+  padding: 18px 15px 18px 69px;
   border-top: 1px solid #E6E6E6;
   border-bottom: 1px solid #E6E6E6;
 }
 
 .noticeMain .noticeList ul li .noticeListLeft {
-  width: 1.3rem;
-  float: left;
+	position: absolute;
+	left: 15px;
 }
 
 .noticeMain .noticeList ul li .noticeListLeft img {
-  width: 0.8rem;
-  margin-left: 0.3rem;
-  margin-top: 0.12rem;
+    width: 39px;
 }
 
 .noticeMain .noticeList ul li .noticeListRight {
-  width: 6.2rem;
-  float: left;
+	font-size: 14px;
 }
 
 .noticeMain .noticeList ul li .noticeListRight h3 strong {
-  font-size: 0.32rem;
+  font-size: 16px;
   color: #1d1d1d;
-  line-height: 0.6rem;
   float: left;
-  width: 4.8rem;
 }
 
 .noticeMain .noticeList ul li .noticeListRight h3 i {
   float: right;
-  width: 1.2rem;
+  width: 80px;
   text-align: right;
-  font-size: 0.28rem;
+  font-size: 14px;
   font-style: normal;
-  padding-right: 0.2rem;
-  line-height: 0.6rem;
   color: #686868;
 }
 
 .noticeMain .noticeList ul li .noticeListRight p {
-  font-size: 0.28rem;
+  margin-top: 11px;
   color: #686868;
-  padding-right: 0.1rem;
-  line-height: 0.4rem;
 }
 
 .noticeMain .noticeList ul li .noticeListRight a {
   display: block;
   color: #686868;
-  font-size: 0.28rem;
-  margin-top: 0.1rem;
+  font-size: 14px;
+  margin-top: 5px;
 }
 
 .noticeMain .noticeList ul li .noticeListRight a span {
-  float: right;
-  margin-right: 0.3rem;
-  color: #C2C2C2;
-  position: relative;
-  top: 0.12rem;
-}
-.app-layout-content-b{
-	margin-bottom: 0.5rem;
+    float: right;
+    font-size: 13px;
+    color: #C2C2C2;
+	top: 8px;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/pushMsgSet.css

@@ -3,37 +3,12 @@ body {
   background: #f4f4f9;
 }
 
-.header {
-  height: 0.9rem;
-  background: #fff;
-  position: relative;
-  line-height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-}
-
-.header a {
-  position: absolute;
-  left: 0.2rem;
-  top: 0;
-}
-
-.header a span {
-  font-size: 0.36rem;
-  color: #444;
-}
-
-.header h3 {
-  text-align: center;
-  width: 100%;
-  font-size: 0.36rem;
-}
-
 .modifyPass {
-  margin-top: 0.4rem;
-  height: 1.1rem;
+  margin-top: 13px;
+  height: 55px;
   border-top: 1px solid #E6E6E6;
   border-bottom: 1px solid #E6E6E6;
-  line-height: 1.1rem;
+  line-height: 55px;
   background: #fff;
   overflow: hidden;
   display: block;
@@ -41,119 +16,35 @@ body {
 }
 
 .modifyPass strong {
-  font-size: 0.34rem;
+  font-size: 17px;
   color: #1D1D1D;
-  padding-left: 0.36rem;
+  padding-left: 15px;
 }
 
 .modifyPass i {
-  font-size: 0.3rem;
+  font-size: 12px;
   float: right;
-  margin-right: 0.3rem;
+  margin-right: 15px;
   color: #686868;
 }
 
 .modifyPass span {
-  font-size: 0.34rem;
-  color: #C2C2C2;
-  float: right;
-  padding-right: 0.3rem;
-  margin-top: 0.44rem;
+    font-size: 13px;
+    color: #C2C2C2;
+    position: absolute;
+    right: 15px;
+    top: 4px;
+    bottom: 0px;
+    margin: auto;
+    line-height: inherit;
 }
 
 .warning {
-  font-size: 0.28rem;
+  font-size: 12px;
   color: #888;
-  height: 0.7rem;
-  line-height: 0.7rem;
-  padding-left: 0.3rem;
-}
-
-/*推送消息 开关*/
-.weui-cell_switch {
-  padding-top: 6px;
-  padding-bottom: 6px;
+  padding-left: 15px;
 }
 
-.weui-switch {
-  -webkit-appearance: none;
-  appearance: none;
-}
-
-.weui-switch,
-.weui-switch-cp__box {
-  position: relative;
-  width: 1.04rem;
-  height: 0.64rem;
-  border: 0.04rem solid #dfdfdf;
-  outline: 0;
-  border-radius: 0.32rem;
-  box-sizing: border-box;
-  background-color: #dfdfdf;
-  transition: background-color .1s, border .1s;
-}
-
-.weui-switch-cp__box:before,
-.weui-switch:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 1rem;
-  height: 0.6rem;
-  border-radius: 0.3rem;
-  background-color: #fdfdfd;
-  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
-}
-
-.weui-switch-cp__box:after,
-.weui-switch:after {
-  content: " ";
-  position: absolute;
-  top: -0.01rem;
-  left: 0;
-  width: 0.6rem;
-  height: 0.6rem;
-  border-radius: 0.31rem;
-  background-color: #fff;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
-  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
-}
-
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box,
-.weui-switch:checked {
-  border-color: #04be02;
-  background-color: #04be02;
-}
-
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box:before,
-.weui-switch:checked:before {
-  -webkit-transform: scale(0);
-  transform: scale(0);
-}
-
-.weui-switch-cp__input:checked ~ .weui-switch-cp__box:after,
-.weui-switch:checked:after {
-  -webkit-transform: translateX(0.36rem);
-  transform: translateX(0.36rem);
-}
-
-.weui-switch-cp__input {
-  position: absolute;
-  left: -9999px;
-}
-
-.weui-switch-cp__box {
-  display: block;
-}
-
-#check {
-  position: absolute;
-  right: 0.3rem;
-  top: 0.2rem;
-width: 52px;
-}
+.hide{
+	display: none;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/register.css

@@ -1,39 +1,35 @@
 @charset "UTF-8";
 .register {
-  margin-top: 0.5rem;
+  margin-top: 20px;
+  padding: 0px 25px;
 }
 
-.register .registerMain{
-	padding: 0rem 0.5rem;
-}
 .register .code {
-  height: 1rem;
-  line-height: 1rem;
   display: table;
   width: 100%;
-  border-bottom: 1px solid #E6E6E6;
+  position: relative;
+  height: 50px;
+  line-height: 50px;
 }
-.register .code>* {
-	display: table-cell;
+.register .code>div:first-child{
+	position: relative;	
 }
-.register .code>div {
-	width: 65%;
+.register .code>div:first-child,.register .code>span {
+	display: table-cell;
 }
 .register .code>span {
-	width: 35%;
-	text-align: right;
+	width: 110px;
+	text-align: center;
 	position: relative;
 }
 .register .code input {
   padding-left: 0px;
   border: none;
-  width: 90%;
-  height: 0.9rem;
-  font-size: 0.32rem;
+  width: 100%;
+  font-size: 16px;
 }
 .register .code .captcha{
 	vertical-align: top;
-	line-height: 1rem;
 	text-align: center;
 }
 .register .code .captcha img{
@@ -42,51 +38,20 @@
 	height: 30px;
 }
 .register .code #btn {
-  font-size: 0.32rem;
-  text-align: right;
+  font-size: 16px;
+  text-align: center;
   color: #888888;
   background: #fff;
 }
 .register .code #btn>font {
 	margin-right: 10px;
 }
-
-.register strong {
-  color: #686868;
-  font-size: 0.28rem;
-  margin-left: 0.5rem;
-  margin-top: 0.3rem;
-}
-
-.register strong a {
-  color: #0987ff;
+.code input{
+	padding-right: 45px;
 }
-.register .line{
-    height: 100%;
-    width: 1px;
-    background-color: #E6E6E6;
-    position: absolute;
-    left: 0px;
-    top: 0px;
-}
-/*手机号错误弹窗*/
-.errorTc {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 99;
-  width: 5rem;
-  height: 1rem;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -2.5rem;
-  margin-top: -0.5rem;
-  background: rgba(0, 0, 0, 0.6);
-  color: #fff;
-  text-align: center;
-  line-height: 1rem;
-  border-radius: 0.2rem;
-  font-size: 0.34rem;
-  display: none;
+.closeQc{
+	right: 15px;
 }
+.registerMain>div:nth-child(1) .closeQc{
+	right: 0px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/reset.css

@@ -27,8 +27,7 @@ img{
     -webkit-tap-highlight-color:rgba(0,0,0,0);
 }
 html, body{
-    height: 100%;
-    font-size: 0.45rem;
+    font-size: 16px;
 	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 }
 .content{
@@ -65,19 +64,20 @@ input,button{
 	filter: alpha(opacity=65);
 	-webkit-box-shadow: none;
 	box-shadow: none;
+	color: rgba(255,255,255,.5) !important;
 }
 .btn{
 	display: block;
-    height: 1rem;
-    line-height: 1rem;
-    background-color: #24C0D7;
+    height: 47px;
+    line-height: 47px;
+    background-color: #2cb7ca;
     color: #fff;
     border: none;
-    border-radius: 0.06rem;
+    border-radius: 3px;
     text-align: center;
-    font-size: 0.34rem;
-    margin: 0.8rem auto;
-	width: 88%;
+    font-size: 17px;
+	margin-top: 40px;
+	width: 100%;
 	vertical-align: middle;
 	touch-action: manipulation;
 	background-image: none;
@@ -90,9 +90,57 @@ input,button{
 	box-shadow: none !important;
 }
 [type='text'],[type='password'],[type='number']{
-	color: #888888;
-	font-size: 0.36rem;
+	color: #1d1d1d;
+	font-size: 16px;
     border: none;
 	background-color: #ffffff;
 	border-radius: 0px;
+	box-sizing: border-box;
+}
+::-webkit-input-placeholder {
+    color: #888888;
+}
+.closeQc {
+  position: absolute;
+  right: 0px;
+  top: 50%;
+  margin-top: -9.5px;
+  width: 19px;
+  height: 19px;
+  right: 0px;
+  display: none;
+}
+.jyapp-icon-biyan{
+	position: absolute !important;
+    top: 50% !important;
+    margin-top: -4px;
+    font-size: 12px;
+    color: #c2c2c2;
+    right: 0px;
+}
+.jyapp-icon-zhengyan {
+	position: absolute !important;
+    top: 50% !important;
+    margin-top: -4px;
+    font-size: 16px;
+    right: 0px;
+ 	color: #2cb7ca !important;
+}
+/*竖线*/
+.vert-line{
+    width: 1px;
+    background-color: #E6E6E6;
+    position: absolute;
+    left: 0px;
+    top: 0px;
+	bottom: 0px;
+}
+/*横线*/
+.tran-line-bottom{
+	height: 1px;
+    background-color: #E6E6E6;
+    position: absolute;
+    bottom: 0px;
+	left: 0px;
+	right: 0px;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/set.css

@@ -3,147 +3,81 @@ body {
   background: #f4f4f9;
 }
 
-.header {
-  height: 0.9rem;
-  background: #fff;
-  position: relative;
-  line-height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-}
-
-.header a {
-  position: absolute;
-  left: 0.4rem;
-  top: 0;
-}
-
-.header a span {
-  font-size: 0.36rem;
-  color: #444;
-}
-
-.header h3 {
-  text-align: center;
-  width: 100%;
-  font-size: 0.36rem;
-}
-
 .modifyPass {
-  margin-top: 0.4rem;
-  height: 1.1rem;
-  border-top: 1px solid #E6E6E6;
+  margin-top: 13px;
+  height: 55px;
+  line-height: 55px;
   border-bottom: 1px solid #E6E6E6;
-  line-height: 1.1rem;
-  background: #fff;
   overflow: hidden;
   display: block;
+  position: relative;
+}
+#updatepwd,.message{
+	background: #fff;
 }
-
 .modifyPass strong {
-  font-size: 0.34rem;
-  color: #000000;
-  padding-left: 0.36rem;
+  font-size: 17px;
+  padding-left: 15px;
 }
 
 .modifyPass i {
-  font-size: 0.3rem;
+  font-size: 14px;
   float: right;
-  margin-right: 0.3rem;
+  margin-right: 33px;
   color: #686868;
 }
 
 .modifyPass span {
-  font-size: 0.34rem;
-  color: #C2C2C2;
-  float: right;
-  padding-right: 0.3rem;
-  margin-top: 0.44rem;
-}
-
-/*缓存*/
-.cache {
-  border-top: none;
-  margin-top: 0;
-}
-
-.cache i {
-  margin-right: 0.3rem;
+    font-size: 13px;
+    color: #C2C2C2;
+    position: absolute;
+    right: 15px;
+    top: 4px;
+    bottom: 0px;
+    margin: auto;
+    line-height: inherit;
 }
 
 .installList {
-  margin-top: 0.4rem;
+  margin-top: 13px;
   border-top: 1px solid #E6E6E6;
+  border-bottom: 1px solid #E6E6E6;
+  background-color: #fff;
+}
+.installList li{
+  padding-left: 15px;
+  height: 55px;
+  line-height: 55px;
 }
-
 .installList li .modifyPass {
   display: block;
-  border-top: none;
   margin-top: 0;
 }
+.installList li:last-child .modifyPass {
+	border-bottom: none;
+}
+.installList li .modifyPass strong{
+  padding-left: 0px;
+}
 
 /*退出登录*/
 .quit {
-  margin-top: 0.4rem;
+  margin-top: 13px;
   text-align: center;
-  height: 1.1rem;
-  line-height: 1.1rem;
+  height: 55px;
+  line-height: 55px;
   background: #fff;
-  font-size: 0.34rem;
+  font-size: 17px;
   border-top: 1px solid #E6E6E6;
   border-bottom: 1px solid #E6E6E6;
 }
 
 .quit a {
   display: block;
-  color: #000000;
-}
-
-/*清空缓存弹窗*/
-.cacheTc {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 99;
-  display: none;
-}
-
-.cacheTc .cacheMain {
-  width: 5.4rem;
-  height: 2.1rem;
-  background: #fff;
-  border-radius: 0.4rem;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin-left: -2.7rem;
-  margin-top: -1rem;
-}
-
-.cacheTc .cacheMain h2 {
-  text-align: center;
-  line-height: 1.2rem;
-  height: 1.2rem;
-  font-size: 0.34rem;
-  color: #000;
-  border-bottom: 1px solid #404040;
-}
-
-.cacheTc .cacheMain a {
-  width: 50%;
-  float: left;
-  text-align: center;
-  color: #157efb;
-  line-height: 0.9rem;
-  font-size: 0.34rem;
 }
-
-.cacheTc .cacheMain a.dump {
-  border-left: 1px solid #404040;
+.installMain a,.installMain strong{
+	color: #1d1d1d;
 }
-
 /*分享好友弹窗*/
 .share {
   position: fixed;
@@ -158,25 +92,24 @@ body {
 
 .share .shareMain {
   width: 100%;
-  height: 3.4rem;
   background: #f4f4f9;
   position: absolute;
   left: 0;
   bottom: 0;
 }
-
-.share .shareMain ul {
-  margin-top: 0.6rem;
+.share .shareMain ul{
+	background-color: #f4f4f9;
+	height: 120px;
+	padding-top: 32px;
 }
-
 .share .shareMain ul li {
-  width: 25%;
   float: left;
   text-align: center;
+  margin: 0px 15px;
 }
 
 .share .shareMain ul li span {
-  font-size: 1rem;
+    font-size: 50px;
 }
 
 .share .shareMain ul li span.jyapp-icon-weixin {
@@ -192,17 +125,15 @@ body {
 }
 
 .share .shareMain ul li p {
-  font-size: 0.28rem;
+  font-size: 14px;
   color: #1D1D1D;
 }
 
 .share .shareMain a.shareQx {
   display: block;
-  height: 1rem;
+  height: 50px;
+  line-height: 50px;
   text-align: center;
-  line-height: 1rem;
   background: #fff;
-  color: #1d1d1d;
-  font-size: 0.34rem;
-  margin-top: 0.3rem;
+  font-size: 17px;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/setPwd.css

@@ -1,40 +1,22 @@
-.cancle {
-  display: block;
-  padding-top: 0.2rem;
-}
-
 .jyapp-icon-zhengyan {
-  font-size: 0.3rem !important;
+  font-size: 12px !important;
   color: #2cb7ca !important;
 }
 
 .takeIn {
-  margin-top: 0.5rem;
+  margin-top: 20px;
+  padding: 0px 25px;
 }
 
 .takeIn div.pass {
-  width: 6.5rem;
-  height: 0.9rem;
-  margin-left: 0.5rem;
   position: relative;
-  margin-top: 0.2rem;
+  height: 50px;
+  line-height: 50px;
 }
 
 .takeIn div.pass input {
-  width: 6.5rem;
-  height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-}
-
-.takeIn div.pass span {
-  width: 0.5rem;
-  height: 0.9rem;
-  line-height: 0.9rem;
-  position: absolute;
-  right: 0;
-  top: 0.1rem;
-  font-size: 0.2rem;
-  color: #c2c2c2;
+  width: 100%;
+  padding-right: 75px;
 }
 
 .takeIn div.pass span span {
@@ -42,19 +24,6 @@
   left: 0;
   top: 0;
 }
-
-.takeIn .hint {
-  width: 3.4rem;
-  height: 0.96rem;
-  background: #4c4c4c;
-  color: #fff;
-  text-align: center;
-  line-height: 0.96rem;
-  position: fixed;
-  left: 2rem;
-  bottom: 4rem;
-  z-index: 99;
-  border-radius: 0.1rem;
-  font-size: 0.3rem;
-  display: none;
-}
+.closeQc{
+	right: 40px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/me/css/setpwdTwo.css

@@ -2,38 +2,8 @@ body {
   background: #f4f4f9;
 }
 
-.jyapp-icon-zhengyan {
-  font-size: 0.3rem !important;
-  color: #2cb7ca !important;
-}
-
-.header {
-  height: 0.9rem;
-  background: #fff;
-  position: relative;
-  line-height: 0.9rem;
-  border-bottom: 1px solid #E6E6E6;
-}
-
-.header a {
-  position: absolute;
-  left: 0.2rem;
-  top: 0;
-}
-
-.header a span {
-  font-size: 0.36rem;
-  color: #656565;
-}
-
-.header h3 {
-  text-align: center;
-  width: 100%;
-  font-size: 0.36rem;
-}
-
 .takeIn {
-  margin-top: 0.35rem;
+  margin-top: 13px;
   border-top: 1px solid #E6E6E6;
 }
 
@@ -41,27 +11,19 @@ body {
   width: 100%;
   position: relative;
   background: #fff;
+  height: 50px;
+  line-height: 50px;
+}
+.tran-line-bottom{
+	left: 15px;
 }
-
 .takeIn div.pass input {
-  width: 7.2rem;
-  height: 1rem;
-  margin-left: 0.3rem;
+  width: 100%;
   border: none;
-  border-bottom: 1px solid #E6E6E6;
-  font-size: 0.32rem;
+  font-size: 16px;
   background: #fff;
-}
-
-.takeIn div.pass span {
-  width: 0.5rem;
-  height: 1rem;
-  line-height: 1rem;
-  position: absolute;
-  right: 0.3rem;
-  top: 0.1rem;
-  font-size: 0.2rem;
-  color: #c2c2c2;
+  padding-right: 90px;
+  padding-left: 15px;
 }
 
 .takeIn div.againPass {
@@ -71,19 +33,12 @@ body {
 .takeIn div.againPass input {
   border-bottom: none;
 }
-
-.takeIn .hint {
-  width: 3.4rem;
-  height: 0.96rem;
-  background: #4c4c4c;
-  color: #fff;
-  text-align: center;
-  line-height: 0.96rem;
-  position: fixed;
-  left: 2rem;
-  bottom: 4rem;
-  z-index: 99;
-  border-radius: 0.1rem;
-  font-size: 0.3rem;
-  display: none;
+.pass>.jyapp-icon{
+	right: 15px;
+}
+.closeQc{
+	right: 55px;
 }
+center{
+	padding: 0px 15px;
+}

src/jfw/modules/app/src/web/templates/common/footer.html

@@ -1,28 +1,20 @@
 <div class="app-layout-footer">
 	<ul>
 		<li id="navbar-search">
-			<a href="javascript:;">
-				<span class="jyapp-icon jyapp-icon-sousuo"></span>
-				<p>搜索</p>
-			</a>
+			<span class="jyapp-icon jyapp-icon-sousuo"></span>
+			<p>搜索</p>
 		</li>
 		<li id="navbar-subscribe">
-			<a href="javascript:;">
-				<span class="jyapp-icon jyapp-icon-shoucang"></span>
-				<p>订阅</p>
-			</a>
+			<span class="jyapp-icon jyapp-icon-shoucang"></span>
+			<p>订阅</p>
 		</li>
 		<li id="navbar-laboratory">
-			<a href="javascript:;">
-				<span class="jyapp-icon jyapp-icon-shiyanshi"></span>
-				<p>实验室</p>
-			</a>
+			<span class="jyapp-icon jyapp-icon-shiyanshi"></span>
+			<p>实验室</p>
 		</li>
 		<li id="navbar-me">
-			<a href="javascript:;">
-				<span class="jyapp-icon jyapp-icon-wodewode"></span>
-				<p>我</p>
-			</a>
+			<span class="jyapp-icon jyapp-icon-wodewode"></span>
+			<p>我</p>
 		</li>
 	</ul>
 </div>

src/jfw/modules/app/src/web/templates/me/download.html

@@ -0,0 +1,46 @@
+<html lang="zh">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="X-UA-Compatible" content="ie=edge" />
+		<script src="/jyapp/js/rem.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
+		<title>招标订阅</title>
+	</head>
+	<style type="text/css">
+		body{
+			margin: 0px;
+		}
+		body>.bg{
+			width: 100%;
+		}
+		.download{
+			width: 222px;
+			position: absolute;
+			bottom: 181px;
+			left: 50%;
+			margin-left: -111px;
+		}
+		.jyicon{
+			width: 43px;
+			position: absolute;
+			bottom: 40px;
+			left: 50%;
+			margin-left: -21.5px;
+		}
+		.weixin .download{
+			top: 9.8rem;
+		}
+	</style>
+	<body class="{{.T.from}}">
+		{{if .T.from}}
+			<img class="bg" src="/jyapp/images/download-backage-weixin.jpg"/>
+		{{else}}
+			<img class="bg" src="/jyapp/images/download-backage.jpg"/>
+			<img class="jyicon" src="/jyapp/images/jyicon.png"/>
+		{{end}}
+		<img class="download" src="/jyapp/images/download.png" onclick="window.location.href='{{.T.apkurl}}'"/>
+		<script type="text/javascript">
+			
+		</script>
+	</body>
+</html>

src/jfw/modules/app/src/web/templates/me/forgetPwd.html

@@ -25,28 +25,29 @@
 			<div class="register">
 				<div class="registerMain">
 					<div class="code">
-						<div></div>
 						<div>
 							<input type="number" name="" id="tel" class="tel" value="" placeholder="手机号码" autofocus/>
+							<img class="closeQc" src="/jyapp/images/cancel.png"/>
 						</div>
+						<div class="tran-line-bottom"></div>
 					</div>
 					<div class="code">
-						<div></div>
 						<div>
 							<input type="number" name="code" id="code" value="" placeholder="图形验证码" />
+							<img class="closeQc" src="/jyapp/images/cancel.png"/>
 						</div>
-						<span class="captcha" onclick="reLoadCaptcha()"><div class="line"></div><img src="/jyapp/free/captcha"></span>
+						<span class="captcha" onclick="reLoadCaptcha()"><div class="vert-line"></div><img src="/jyapp/free/captcha"></span>
+						<div class="tran-line-bottom"></div>
 					</div>
 					<div class="code">
-						<div></div>
 						<div>
 							<input type="number" id="identCode" name="" value="" placeholder="手机验证码" />
+							<img class="closeQc" src="/jyapp/images/cancel.png"/>
 						</div>
-						<span><div class="line"></div><span id="btn">获取验证码</span></span>
+						<span><div class="vert-line"></div><span id="btn">获取验证码</span></span>
 					</div>
 				</div>
-	
-				<a href="javascrpit:;" id="nextStep" class="btn disabled">下一步</a>
+				<center><button id="nextStep" class="btn disabled">下一步</button></center>
 			</div>
 		</div>
 
@@ -60,10 +61,28 @@
 			$("#header a").click(function() {
 				history.go(-1);
 			})
+			$(".closeQc").click(function(){
+				if($(this).prev().val().length>0){
+					$(this).prev().val("");
+					$(this).hide();
+				}
+				commonMethod();
+			});
 			//获取用户输入的电话号码
-			 $("#tel,#code,#identCode").on("input propertychange blur",function(){
+			 $("#tel,#code,#identCode").on("input propertychange focus",function(){
+				if($(this).val().length>0){
+			   	 	$(this).next().show();
+			   	}else{
+					$(this).next().hide();
+				}
+				commonMethod();
+		     }).blur(function(){
+				var thisClass = $(this);
+				setTimeout(function(){
+					thisClass.next().hide();
+				},100);
 				commonMethod();
-		     });
+			});
 			//验证码倒计时
 
 			function time(o) {

src/jfw/modules/app/src/web/templates/me/forgetPwdTwo.html

@@ -24,14 +24,17 @@
 		<div class="app-layout-content-b">
 			<div class="takeIn">
 				<div class="onePass pass">
-					<input type="password" placeholder="设置密码（最少6位）" autofocus/>
+					<input type="password" placeholder="设置密码（最少6位）"/>
+					<img class="closeQc" src="/jyapp/images/cancel.png"/>
 					<span class="jyapp-icon jyapp-icon-biyan"></span>
+					<div class="tran-line-bottom"></div>
 				</div>
 				<div class="againPass pass">
 					<input type="password" placeholder="确认密码"/>
+					<img class="closeQc" src="/jyapp/images/cancel.png"/>
 					<span class="jyapp-icon jyapp-icon-biyan"></span>
 				</div>
-				<button type="button" id="btn" class="disabled btn">完成</button>
+				<center><button type="button" id="btn" class="disabled btn">完成</button></center>
 			</div>
 		</div>
 		
@@ -41,13 +44,26 @@
 				$("#header a").click(function() {
 					history.go(-1);
 				})
-
-				$(".onePass input,.againPass input").bind('input propertychange blur', function() {
-					if($.trim($(".onePass input").val()).length >= 6 && $.trim($(".againPass input").val()).length >= 6){
-						$("#btn").removeClass("disabled");
-					}else{
-						$("#btn").addClass("disabled");
+				$(".closeQc").click(function(){
+					if($(this).prev().val().length>0){
+						$(this).prev().val("");
+						$(this).hide();
+					}
+					commonMethod();
+				});
+				$(".onePass input,.againPass input").bind('input propertychange focus', function() {
+					if($(this).val().length>0){
+				   	 	$(this).next().show();
+				   	}else{
+						$(this).next().hide();
 					}
+					commonMethod();
+				}).blur(function(){
+					var thisClass = $(this);
+					setTimeout(function(){
+						thisClass.next().hide();
+					},100);
+					commonMethod();
 				});
 
 				//点击切换密码显示隐藏
@@ -96,6 +112,13 @@
 					});
 				})
 			})
+			function commonMethod(){
+				if($.trim($(".onePass input").val()).length >= 6 && $.trim($(".againPass input").val()).length >= 6){
+					$("#btn").removeClass("disabled");
+				}else{
+					$("#btn").addClass("disabled");
+				}
+			}
 		</script>
 	</body>
 

src/jfw/modules/app/src/web/templates/me/index.html

@@ -41,12 +41,13 @@
 			<!--个人中心end-->
 
 			<!--通知start-->
-			<div class="notice">
+			<div class="notice" id="notice">
 				<span class="jyapp-icon jyapp-icon-tongzhi"></span>
-				<a href="/jyapp/free/notice">
+				<a>
 					<strong>通知</strong>
-					<i id="noticeCount"></i>
+					<font id="noticeCount"></font>
 				</a>
+				<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 			</div>
 			<!--通知end-->
 
@@ -55,26 +56,29 @@
 				<ul>
 					<li class="listOne">
 						<span class="jyapp-icon jyapp-icon-guanzhuxiangmu"></span>
-						<a onclick="autoLogin('/jyapp/follow/list')">我关注的项目</a>
+						<a>我关注的项目</a>
+						<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 					</li>
 					<li class="listTwo">
 						<span class="jyapp-icon jyapp-icon-guanzhuqiye"></span>
-						<a onclick="autoLogin('/jyapp/followent/entList')">我关注的企业</a>
+						<a>我关注的企业</a>
+						<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 					</li>
 				</ul>
 			</div>
 			<!--我的关注end-->
 
 			<!--历史推送纪录start-->
-			<div class="notice history">
+			<!--<div class="notice history">
 				<a href="javascript:void(0);" onclick="autoLogin('/jyapp/swordfish/historypush')">历史推送记录 </a>
-			</div>
+			</div>-->
 			<!--历史推送记录end-->
 
 			<!--设置start-->
-			<div class="notice  install">
+			<div class="notice install">
 				<span class="jyapp-icon jyapp-icon-shezhi" style="color: #aebeff;"></span>
-				<a href="/jyapp/free/set">设置 </a>
+				<a>设置</a>
+				<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 			</div>
 			<!--设置end-->
 		</div>
@@ -83,6 +87,23 @@
 		<script type="text/javascript">
 			$("#navbar-me").addClass("active");
 			var openid = {{session "s_m_openid"}};
+			$("#notice").click(function(){
+				setLiActive(this);
+				window.location.href = "/jyapp/free/notice";
+			});
+			$(".install").click(function(){
+				setLiActive(this);
+				autoLogin('/jyapp/free/set');
+			});
+			$(".follow li").click(function(){
+				setLiActive(this);
+				var index = $(this).index();
+				if(index == 0){
+					autoLogin('/jyapp/follow/list');
+				}else if(index == 1){
+					autoLogin('/jyapp/followent/entList');
+				}
+			});
 			afterPageInit();
 			//JyObj初始化完成，回调
 			function afterPageInit(){

src/jfw/modules/app/src/web/templates/me/login.html

@@ -21,16 +21,20 @@
 </div>
 	
 	<div class="login">
-			<input type="number" name="" id="tel" class="tel" value="" placeholder="手机号码"/>
+			<div class="pass">
+				<input type="number" name="" id="tel" class="tel" value="" placeholder="手机号码"/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
+			</div>
 			<div class="onePass pass">
-				<input type="password"  placeholder="密码"/>
+				<input type="password" id="pwd" placeholder="密码"/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
-				<span class="closeQc"></span>
 			</div>	
 			<button type="button" id="btn" class="disabled btn" />登录</button>
 			<div class="forget">
 				<a href="/jyapp/free/forgetPwd">忘记密码？</a>
 				<a href="/jyapp/free/register" class="register">立即注册</a>
+				<div class="clearfix"></div>
 			</div>
 			
 			<!--微信登录start-->
@@ -49,23 +53,27 @@
 				window.history.back();
 			})
 			
-			//输入密码大于一位显示删除号
-			$("#tel").bind('input propertychange blur', function() {
-			    changeBtnStatus();
-			})
-			$(".onePass input").bind('input propertychange focus blur', function() {
+			$("#tel,#pwd").bind('input propertychange focus blur', function() {
 				changeBtnStatus();
 			   	if($(this).val().length>0){
-			   	 	$(".closeQc").show();
-			   	}
-			})
+			   	 	$(this).next().show();
+			   	}else{
+					$(this).next().hide();
+				}
+			}).blur(function(){
+				var thisClass = $(this);
+				setTimeout(function(){
+					thisClass.next().hide();
+				},100);
+				changeBtnStatus();
+			});
 			$(".closeQc").click(function(){
-				if($(".onePass input").val().length>0){
-					$(".onePass input").val("");
-					$(".closeQc").hide();
+				if($(this).prev().val().length>0){
+					$(this).prev().val("");
+					$(this).hide();
 				}
 				changeBtnStatus();
-			})
+			});
 			//点击切换密码显示隐藏
 			$(".pass span.jyapp-icon-biyan").click(function(){
 				if($(this).parent().find("input").hasClass("dcs")){
@@ -86,11 +94,11 @@
 				if($(this).hasClass("disabled")){
 					return
 				}
-				$.post("/jyapp/free/login",{reqType:"phoneLogin",phone:$("#tel").val(),password:$(".onePass input").val(),rid:JyObj.getPushRid()},function(r){
+				$.post("/jyapp/free/login",{reqType:"phoneLogin",phone:$("#tel").val(),password:$(".onePass input").val(),rid:11111},function(r){
 					if(r.status==1){
 						loginSuccess(r.sign);
 					}else{
-						EasyAlert.show("手机号或密码错误");
+						showTip("手机号或密码错误");
 					}		
 				});
 			})
@@ -126,11 +134,11 @@
 					if(r.status == 1){
 						loginSuccess(r.sign);
 					}else{
-						EasyAlert.show("登录失败");
+						showTip("登录失败");
 					}
 				},
 				error: function(){
-					EasyAlert.show("登录超时");
+					showTip("登录超时");
 				}
 			});
 		}
@@ -146,11 +154,11 @@
 					if(r.status == 1){
 						loginSuccess(r.sign);
 					}else{
-						EasyAlert.show("登录失败");
+						showTip("登录失败");
 					}
 				},
 				error: function(){
-					EasyAlert.show("登录超时");
+					showTip("登录超时");
 				}
 			});
 		}
@@ -178,6 +186,14 @@
 				}
 			});
 		}
+		function showTip(text){
+			EasyAlert.show(text);
+			var offsetTop = $(".forget").outerHeight()+$(".forget").offset().top;
+			if(offsetTop > 0){
+				offsetTop+=10;
+				$("#easyAlert").css({top: offsetTop+"px","margin-top": "0px"});
+			}
+		}
 	</script>
 	
 </body>

src/jfw/modules/app/src/web/templates/me/notice.html

@@ -85,8 +85,10 @@
 			if(list!=null&&list!=""){
 				list = eval('(' + list + ')');
 				for(var i=0;i<list.length;i++){
-					var time = new Date(Number(list[i].comeintime+"000")).Format("MM-dd");
+					var time = timeDiff(new Date(Number(list[i].comeintime+"000")));
 					var link = list[i].link?list[i].link:"";
+					var descript = list[i].descript;
+					descript = descript.replace(/\n/g,"<br/>")
 					var extend = list[i].extend;
 					var linkType = "";
 					if(extend!=null&&typeof(extend)!="undefined"){
@@ -101,8 +103,8 @@
 								+'</div>'
 								+'<div class="noticeListRight">'
 									+'<h3 class="clearfix"><strong>'+list[i].title+'</strong> <i>'+time+'</i></h3>'
-									+'<p>'+list[i].descript+'</p>';
-					if(list[i].category=="active"||list[i].category=="bid"||list[i].category=="project"||list[i].category=="entname"){
+									+'<p>'+descript+'</p>';
+					if(list[i].category=="active"){
 						html += '<a href="javascript:;">详情 <span class="jyapp-icon jyapp-icon-youjiantou"></span></a>';
 					}
 					html+='</div></li>';

src/jfw/modules/app/src/web/templates/me/pushMsgSet.html

@@ -27,11 +27,11 @@
 					<i class="messageClose">未开启</i>
 				</a>
 				<span class="warning">开启后，才可以收到剑鱼推送给您的招标信息</span>
-				<a class="modifyPass" href="javascript:JyObj.openSystemNotification();">
+				<a class="modifyPass hide" id="openSysNotice">
 					<strong>点击前往“设置”-“通知”中进行修改</strong>
 					<span class="jyapp-icon jyapp-icon-youjiantou"> </span>
 				</a>
-				<a class="modifyPass" href="/jyapp/free/solveWay">
+				<a class="modifyPass hide" id="solveWay">
 					<strong>安卓手机收不到推送通知的解决办法</strong>
 					<span class="jyapp-icon jyapp-icon-youjiantou"> </span>
 				</a>
@@ -40,6 +40,19 @@
 		</div>
 	</body>
 	<script type="text/javascript">
+		if(mySysIsIos()){
+			$("#openSysNotice").removeClass("hide");
+		}else{
+			$("#solveWay").removeClass("hide");
+		}
+		$("#openSysNotice").click(function(){
+			setLiActive(this);
+			JyObj.openSystemNotification();
+		});
+		$("#solveWay").click(function(){
+			setLiActive(this);
+			window.location.href = "/jyapp/free/solveWay";
+		});
 		//
 		updateNoticeSwitch();
 		//更新开关状态

src/jfw/modules/app/src/web/templates/me/register.html

@@ -25,24 +25,29 @@
 			<div class="registerMain">
 				<div class="code">
 					<input type="number" name="" id="tel" class="tel" value="" placeholder="手机号码" />
+					<img class="closeQc" src="/jyapp/images/cancel.png"/>
+					<div class="tran-line-bottom"></div>
 				</div>
 				<div class="code">
 					<div>
 						<input type="number" name="code" id="code" value="" placeholder="图形验证码" />
+						<img class="closeQc" src="/jyapp/images/cancel.png"/>
 					</div>
 					<span class="captcha" onclick="reLoadCaptcha()">
-						<div class="line"></div><img src="/jyapp/free/captcha">
+						<div class="vert-line"></div><img src="/jyapp/free/captcha">
 					</span>
+					<div class="tran-line-bottom"></div>
 				</div>
 				<div class="code">
 					<div>
 						<input type="number" name="identCode" id="identCode" value="" placeholder="手机验证码" />
+						<img class="closeQc" src="/jyapp/images/cancel.png"/>
 					</div>
-					<span><div class="line"></div><span id="btn">获取验证码</span></span>
+					<span><div class="vert-line"></div><span id="btn">获取验证码</span></span>
+					<div class="tran-line-bottom"></div>
 				</div>
 			</div>
-
-			<a href="javascript:void(0);" class="btn disabled" id="nextStep">下一步</a>
+			<center><button class="btn disabled" id="nextStep">下一步</button></center>
 		</div>
 		<script type="text/javascript">
 			var dcsOne = false;
@@ -53,11 +58,28 @@
 			$("#header a").click(function(){
 				history.go(-1);
 			})
-			
-		     //获取用户输入的电话号码
-		     $("#tel,#code,#identCode").on("input propertychange blur",function(){
+			$(".closeQc").click(function(){
+				if($(this).prev().val().length>0){
+					$(this).prev().val("");
+					$(this).hide();
+				}
 				commonMethod();
-		     });
+			});
+		    //获取用户输入的电话号码
+		    $("#tel,#code,#identCode").on("input propertychange focus",function(){
+				if($(this).val().length>0){
+			   	 	$(this).next().show();
+			   	}else{
+					$(this).next().hide();
+				}
+				commonMethod();
+		    }).blur(function(){
+				commonMethod();
+				var thisClass = $(this);
+				setTimeout(function(){
+					thisClass.next().hide();
+				},100);
+			});
 		
 			$("#btn").click(function(){
 				if(!dcsOne){

src/jfw/modules/app/src/web/templates/me/set.html

@@ -24,7 +24,7 @@
 				{{if session "i_type"}}
 				{{if eq (session "i_type") 1.0}}
 				<!--修改密码start-->
-				<a href="/jyapp/free/updatepwd" class="modifyPass">
+				<a class="modifyPass" id="updatepwd">
 					<strong>修改密码</strong>
 					<span class="jyapp-icon jyapp-icon-youjiantou">
 				</a>
@@ -32,7 +32,7 @@
 				{{end}}
 				{{end}}
 				<!--推送消息start-->
-				<a href="/jyapp/free/pushMsgSet" class="modifyPass message">
+				<a id="pushMsgSet" class="modifyPass message">
 					<strong>推送消息设置</strong>
 					<span class="jyapp-icon jyapp-icon-youjiantou"> </span>
 					<i class="messageClose">未开启</i>
@@ -46,25 +46,25 @@
 						<li class="shareOne">
 							<a class="modifyPass">
 								<strong>分享给好友</strong>
-								<span class="jyapp-icon jyapp-icon-youjiantou">
+								<span class="jyapp-icon jyapp-icon-youjiantou"></span>
 						</a>
 					</li>
 					<li>
-						<a class="modifyPass" href="/jyapp/free/swordfish/about">
+						<a class="modifyPass">
 							<strong>关于剑鱼</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou">
+							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
 						</a>
 					</li>
 					<li>
-						<a class="modifyPass" href="javascript:autoLogin('/jyapp/swordfish/feedback');">
+						<a class="modifyPass">
 							<strong>意见反馈</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou">
+							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
 						</a>
 					</li>
 					<li>
-						<a class="modifyPass" href="javascript:JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect');">
+						<a class="modifyPass">
 							<strong>使用帮助</strong>
-							<span class="jyapp-icon jyapp-icon-youjiantou">
+							<span class="jyapp-icon jyapp-icon-youjiantou"></span>
 						</a>
 					</li>
 				</ul>
@@ -118,31 +118,47 @@
 		//点击返回上一页
 		$("#header a").click(function(){
 			history.go(-1);
-		})
-		
+		});
+		$("#updatepwd").click(function(){
+			setLiActive(this);
+			window.location.href = "/jyapp/updatepwd";
+		});
+		$("#pushMsgSet").click(function(){
+			setLiActive(this);
+			window.location.href = "/jyapp/free/pushMsgSet";
+		});
+		$(".installList li").click(function(){
+			setLiActive(this);
+			var index = $(this).index();
+			if(index == 1){
+				window.location.href = "/jyapp/free/swordfish/about";
+			}else if(index == 2){
+				autoLogin('/jyapp/swordfish/feedback');
+			}else if(index == 3){
+				JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect');
+			}
+		});
 		//分享好友
 		$(".shareOne").click(function(){
-			var title = "测试";
-			var content= "分享";
-			var link = "http://www.baidu.com";
-			JyObj.share(title,content,link);
-		})
-		
+			$(".share").show();
+		});
+		$(".shareQx").click(function(){
+			$(".share").hide();
+			
+		});
+		$(".share li").click(function(){
+			var title = "4000+万条招标信息免费看，不遮挡";
+			var content= "剑鱼招标订阅，专注招标信息订阅和搜索";
+			var link = "{{Msg "seo" "ZBADDRESS"}}/jyapp/free/download";
+			var type = $(this).index()+1;
+			if(type!=2){
+				link = "{{Msg "seo" "ZBADDRESS"}}/jyapp/free/download?from=weixin";
+			}
+			JyObj.share(type,title,content,link);
+		});
 		$(".quit").click(function(){
-			$.ajax({
-				url: "/jyapp/free/signOut",
-				type: "post",
-				data: {},
-				dataType: "json",
-				success: function(r){
-					JyObj.removeUserToken();
-					window.location.href = "/jyapp/free/me";
-				},
-				error: function(){
-					JyObj.removeUserToken();
-					window.location.href = "/jyapp/free/me";
-				}
-			});
+			setLiActive(this);
+			appQuit();
 		})
 		afterPageInit();
 		//JyObj初始化完成，回调
@@ -152,6 +168,5 @@
 			}
 		}
 	</script>
-	
 </body>
 </html>

src/jfw/modules/app/src/web/templates/me/setpwd.html

@@ -27,18 +27,17 @@
 		<div class="takeIn">
 			<div class="onePass pass">
 				<input type="password" placeholder="设置密码（最少6位）" autofocus/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
+				<div class="tran-line-bottom"></div>
 			</div>
 			<div class="againPass pass">
 				<input type="password" placeholder="确认密码"/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
+				<div class="tran-line-bottom"></div>
 			</div>
-			<button type="button" name="btn" id="btn" class="disabled btn">完成</button>
-
-			<!--两次密码不一样提示-->
-			<div class="doubleDiff hint">
-				
-			</div>
+			<center><button type="button" name="btn" id="btn" class="disabled btn">完成</button></center>
 		</div>
 		<script type="text/javascript">
 			$(function() {
@@ -48,12 +47,26 @@
 					history.go(-1);
 				})
 
-				$(".onePass input,.againPass input").bind('input propertychange blur', function() {
-					if($.trim($(".onePass input").val()).length >= 6 && $.trim($(".againPass input").val()).length >= 6){
-						$("#btn").removeClass("disabled");
-					}else{
-						$("#btn").addClass("disabled");
+				$(".onePass input,.againPass input").bind('input propertychange focus', function() {
+					if($(this).val().length>0){
+				   	 	$(this).next().show();
+				   	}else{
+						$(this).next().hide();
+					}
+					commonMethod();
+				}).blur(function(){
+					commonMethod();
+					var thisClass = $(this);
+					setTimeout(function(){
+						thisClass.next().hide();
+					},100);
+				});
+				$(".closeQc").click(function(){
+					if($(this).prev().val().length>0){
+						$(this).prev().val("");
+						$(this).hide();
 					}
+					commonMethod();
 				});
 				//点击切换密码显示隐藏
 				$(".pass span").click(function() {
@@ -100,6 +113,13 @@
 					});
 				})
 			})
+			function commonMethod(){
+				if($.trim($(".onePass input").val()).length >= 6 && $.trim($(".againPass input").val()).length >= 6){
+					$("#btn").removeClass("disabled");
+				}else{
+					$("#btn").addClass("disabled");
+				}
+			}
 		</script>
 	</body>
 

src/jfw/modules/app/src/web/templates/me/updatepwd.html

@@ -22,18 +22,23 @@
 	<div class="app-layout-content-b">
 		<div class="takeIn">
 			<div class="onePass pass">
-				<input type="password" id="oldpwd" placeholder="当前密码" autofocus/>
+				<input type="password" id="oldpwd" placeholder="当前密码"/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
+				<div class="tran-line-bottom"></div>
 			</div>
 			<div class="onePass pass">
 				<input type="password" id="newpwd" placeholder="设置密码（最少6位）" />
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
+				<div class="tran-line-bottom"></div>
 			</div>
 			<div class="againPass pass">
 				<input type="password" id="newpwdAgain" placeholder="确认密码"/>
+				<img class="closeQc" src="/jyapp/images/cancel.png"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
 			</div>	
-			<button type="button" class="btn disabled" id="btn">完成</button>
+			<center><button type="button" class="btn disabled" id="btn">完成</button></center>
 		</div>
 	</div>
 	<script type="text/javascript">
@@ -41,18 +46,28 @@
 			//点击返回上一页
 			$("#header a").click(function(){
 				history.go(-1);
-			})
-			
-			$(".pass input").bind('input propertychange blur',function(){
-				var oldpwd = $.trim($("#oldpwd").val());
-				var newpwd = $.trim($("#newpwd").val());
-				var newpwdAgain = $.trim($("#newpwdAgain").val());
-				if(oldpwd.length > 0 && newpwd.length >= 6 && newpwdAgain.length >= 6){
-					$("#btn").removeClass("disabled");
-				}else{
-					$("#btn").addClass("disabled");
+			});
+			$(".closeQc").click(function(){
+				if($(this).prev().val().length>0){
+					$(this).prev().val("");
+					$(this).hide();
 				}
-			})
+				commonMethod();
+			});
+			$(".pass input").bind('input propertychange focus',function(){
+				if($(this).val().length>0){
+			   	 	$(this).next().show();
+			   	}else{
+					$(this).next().hide();
+				}
+				commonMethod();
+			}).blur(function(){
+				var thisClass = $(this);
+				setTimeout(function(){
+					thisClass.next().hide();
+				},100);
+				commonMethod();
+			});
 			
 			//点击切换密码显示隐藏
 			$(".pass span").click(function(){
@@ -81,7 +96,7 @@
 					EasyAlert.show("输入的密码不一致");
 					return;
 				}
-				$.post("/jyapp/free/updatepwd",{oldpwd:$("#oldpwd").val(),newpwd:$("#newpwd").val()},function(r){
+				$.post("/jyapp/updatepwd",{oldpwd:$("#oldpwd").val(),newpwd:$("#newpwd").val()},function(r){
 					if(r.status=="timeout"){
 						EasyAlert.show("页面超时，请重新进入");
 						setTimeout(function() {
@@ -92,11 +107,24 @@
 					}else if(r.status=="saveError"){
 						EasyAlert.show("数据提交失败");
 					}else if(r.status=="y"){
-						EasyAlert.show("修改成功");
+						EasyAlert.show("修改成功，请重新登录");
+						setTimeout(function(){
+							appQuit("/jyapp/free/login");
+						},1000);
 					}
 				});
 			})
 		})
+		function commonMethod(){
+			var oldpwd = $.trim($("#oldpwd").val());
+			var newpwd = $.trim($("#newpwd").val());
+			var newpwdAgain = $.trim($("#newpwdAgain").val());
+			if(oldpwd.length > 0 && newpwd.length >= 6 && newpwdAgain.length >= 6){
+				$("#btn").removeClass("disabled");
+			}else{
+				$("#btn").addClass("disabled");
+			}
+		}
 	</script>
 </body>
 </html>

src/jfw/modules/app/src/web/templates/weixin/feedback.html

@@ -78,11 +78,10 @@ button{
 .feedback-nav{
 	background-color: #F5F4F9;
 	position: fixed;
-	top: 1.1rem;
+	top: 65px;
 	left: 0px;
 	right: 0px;
 	z-index: 999;
-	margin-top: 20px;
 }
 .feedback-nav:after {
     content: " ";

src/jfw/modules/app/src/web/templates/weixin/jylab/lab-index.html

@@ -12,7 +12,10 @@
 </head>
 <style type="text/css">
 body{
-	background-size: 2.72rem 3.29rem;
+	background-size: 136px 164.5px;
+}
+.app-layout-content-a{
+	margin-top: 20px;
 }
 </style>
 <body>
@@ -69,7 +72,6 @@ body{
 	$(function(){
 		$("#navbar-laboratory").addClass("active");
         behaviorCollect();
-		$("body").css({"background-size":"2.72rem 3.29rem"})
 		/*实验室首页动画*/
 		var syzIndexMove = function(){
 			var $lists = $("#sys-main .content li"),

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

@@ -45,6 +45,7 @@
 		<div class="search-tontrol">
 			<div>
 				<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例：税务局 软件" readonly/>
+				<img src="/images/wx/jywxjs.png">
 			</div>
 			<!--点击关闭-->
 			<span id="seaClose" class="close"></span>
@@ -520,7 +521,7 @@
 <div id="advertscript" class="hidden">
 <span class="closeadv-bg"></span>
 <img src="/jyapp/images/wxqc.png" class="closeadv" onclick="SuperSearch.closeadv(this)">
-{{$s:=(Ad "jy-wxsearch-middle" 1)}}
+{{$s:=(Ad "jyapp-wxsearch-middle" 1)}}
 {{range $k,$v := $s}}
 	{{if $v.s_pic}}
 		{{if $v.s_link}}<a href="JyObj.openExternalLink('{{$v.s_link}}')"/>{{end}}

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -495,6 +495,8 @@ pre {
 		<!--此功能以去掉 end-->
 	</div>
 	<div class="adv">
+		{{$s:=(Ad "jyapp-wxcontent-bottom" 1)}}
+		{{if $s}}
 		<div class="adv-division">
 			<div class="sion-left"></div>
 			<div class="sion-center">{{.T.advertName}}</div>
@@ -510,12 +512,10 @@ pre {
 					</td>
 				</tr>
 			</table>
-			
 			<div class="onlyone hidden" id="onlyone">
 				<img src="{{.T.advertImg}}"/>
 			</div>
 			<div class="adv-wxcontent-bottom" id="C1">
-				{{$s:=(Ad "jy-wxcontent-bottom" 1)}}
 				{{range $k,$v := $s}}
 				{{if $v.s_pic}}
 					{{if $v.s_link}}<a href="JyObj.openExternalLink('{{$v.s_link}}')"/>{{end}}
@@ -527,6 +527,7 @@ pre {
 				{{end}}
 			</div>
 		</div>
+		{{end}}
 	</div>
 	<div class="jycontbottom hidden">
 		<div class="jydqreset">最多关注10个项目,去清理</div>

src/jfw/modules/app/src/web/templates/weixin/wxpush.html

@@ -614,9 +614,10 @@ a{
 		<img onClick="window.location.href='/jyapp/wxkeyset/keyset/index'" style="width: 200px;margin-top: 25px;" src="/jyapp/images/wx/jydyshz.png">
 		</div>
 		</span>
+		{{$s:=(Ad "jyapp-wxpush-bottom" 1)}}
+		{{if $s}}
 		<div style="padding:10px;">
 		<div class="adv-wxpush-bottom" id="D1">
-			{{$s:=(Ad "jy-wxpush-bottom" 1)}}
 			{{range $k,$v := $s}}
 			{{if $v.s_pic}}
 				{{if $v.s_link}}<a href="JyObj.openExternalLink('{{$v.s_link}}')"/>{{end}}
@@ -627,6 +628,7 @@ a{
 			{{end}}
 			{{end}}</div>
 		</div>
+		{{end}}
 		<div style="display:none;" class="onlyone"></div>
 	</div>
 {{include "/common/baiducc.html"}}

src/jfw/modules/app/src/web/templates/weixin/wxtsguide.html

@@ -28,6 +28,7 @@ if(localStorage && localStorage.tsGuide_status == "1"){
 	  </div>
 	</div>
 	<div class="app-layout-header">
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 		订阅向导
 	</div>
 	<div class="app-layout-content-b">

src/jfw/modules/push/src/jgpush.json

@@ -2,12 +2,13 @@
     "pushurl": "https://bjapi.push.jiguang.cn/v3/push",
     "appid": "5efa1257867cf5d77d007ce6",
     "appSecret": "d7a4e79978cd73cd61a5c7f7",
-    "alertlen": 20,
+    "alertlen": 100,
     "title": {
-        "bid": "剑鱼推送消息，最新的订阅内容",
-        "project": "剑鱼推送消息，我关注的项目",
-        "entname": "剑鱼推送消息，我关注的企业",
-        "message": "剑鱼推送消息"
+        "bid": "您有新的招标信息！",
+        "project": "您关注的项目有新的公告信息！",
+        "entname": "您关注的企业有新的公告信息！",
+		"bidopentip": "剑鱼推送消息，开标提醒",
+        "message": "剑鱼推送消息！"
     },
     "config": {
         "platform": "all",
@@ -40,4 +41,4 @@
             "apns_production": false
         }
     }
-}
+}

src/jfw/modules/push/src/qfw/push/dopush/dopush.go

@@ -52,7 +52,6 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 	str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下信息:</div>", strings.Join(k.Interest, ";"))
 	pushid := "" //推送记录id
 	mailContent := ""
-	jpushtitle := ""
 	//发送内容组合
 	i := 0
 	lastInfoDate := int64(0)
@@ -67,8 +66,6 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 	for _, ks := range sl {
 		k2 := *ks
 		title := strings.Replace(k2["title"].(string), "\n", "", -1)
-		otitle := strings.Replace(k2["otitle"].(string), "\n", "", -1)
-		jpushtitle += otitle + ","
 		if !publishTitle[title] {
 			if filterData.IsExists(util.BsonIdToSId(k2["_id"])) {
 				continue
@@ -195,7 +192,6 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 
 	//发送微信:1,3
 	//wid := ""
-	bsavewx := false
 	if k.Type == 0 && (k.PushMode == 1 || k.PushMode == 3) && len(k.Openid) > 0 && k.IsPush != 0 {
 		Tip1 := util.If(TmpTip == "", "", TmpTip+":\n").(string)
 		LastTip := ""
@@ -246,7 +242,6 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 		//-------------长度计算完成------------------
 		log.Println(k.Ratemode, "-----", k.PushMode, "-----", k.Openid)
 		pushid = SendWeixin(k, str, now, Tip1+WXTitle+LastTip, o_pushinfo, ratemode, infoTypeName)
-		bsavewx = true
 	}
 	//发送邮件
 	if bmail {
@@ -254,17 +249,24 @@ func DealSend(k *push.MemberInterest, l *list.List, now time.Time, MaxPushSize i
 		html := fmt.Sprintf(push.Mail_html, strings.Replace(strings.Join(k.Interest, ";"), "+", " ", -1), mailContent)
 		subject := fmt.Sprintf(push.Mail_title, infoTypeName)
 		SendFmail(k.Email, subject, html, k.Dataexport, fmdatas)
-		if !bsavewx { //保存信息
-			push.SaveSendInfo(k, now, html, o_pushinfo, ratemode)
-			bsavewx = true
+		if pushid == "" { //保存信息
+			pushid = push.SaveSendInfo(k, now, str, o_pushinfo, ratemode)
 		}
 	}
 	//app推送1,3
 	if (k.Type == 1 || k.Type == 2) && k.Jpushid != "" && (k.PushMode == 1 || k.PushMode == 3) {
-		if !bsavewx { //app,app+邮件，推送记录
+		if pushid == "" { //app,app+邮件，推送记录
 			pushid = push.SaveSendInfo(k, time.Now(), str, o_pushinfo, ratemode)
 		}
 		log.Println("极光推送", k.Ratemode, "-----", k.PushMode, "-----", k.Openid, "-----", k.Jpushid)
+		jpushtitle := strings.Replace((*sl[0])["otitle"].(string), "\n", "", -1)
+		ks_length := len(sl)
+		if ks_length > MaxPushSize {
+			ks_length = MaxPushSize
+		}
+		if ks_length > 1 {
+			jpushtitle = "1. " + jpushtitle + "\n...(共" + fmt.Sprint(ks_length) + "条)"
+		}
 		go jgpush.JgpushNc(jpushtitle, "bid", []string{k.Jpushid}, map[string]interface{}{
 			"url":    "/jyapp/free/sess/" + push.Se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + pushid,
 			"openid": k.Openid,

src/jfw/modules/pushent/src/jgpush.json

@@ -4,10 +4,11 @@
     "appSecret": "d7a4e79978cd73cd61a5c7f7",
     "alertlen": 20,
     "title": {
-        "bid": "剑鱼推送消息，最新的订阅内容",
-        "project": "剑鱼推送消息，我关注的项目",
-        "entname": "剑鱼推送消息，我关注的企业",
-        "message": "剑鱼推送消息"
+        "bid": "您有新的招标信息！",
+        "project": "您关注的项目有新的公告信息！",
+        "entname": "您关注的企业有新的公告信息！",
+		"bidopentip": "剑鱼推送消息，开标提醒",
+        "message": "剑鱼推送消息！"
     },
     "config": {
         "platform": "all",
@@ -40,4 +41,4 @@
             "apns_production": false
         }
     }
-}
+}

src/jfw/modules/pushproject/src/jgpush.json

@@ -4,10 +4,11 @@
     "appSecret": "d7a4e79978cd73cd61a5c7f7",
     "alertlen": 20,
     "title": {
-        "bid": "剑鱼推送消息，最新的订阅内容",
-        "project": "剑鱼推送消息，我关注的项目",
-        "entname": "剑鱼推送消息，我关注的企业",
-        "message": "剑鱼推送消息"
+        "bid": "您有新的招标信息！",
+        "project": "您关注的项目有新的公告信息！",
+        "entname": "您关注的企业有新的公告信息！",
+		"bidopentip": "剑鱼推送消息，开标提醒",
+        "message": "剑鱼推送消息！"
     },
     "config": {
         "platform": "all",
@@ -40,4 +41,4 @@
             "apns_production": false
         }
     }
-}
+}

src/jgpush.json

@@ -4,11 +4,11 @@
     "appSecret": "d7a4e79978cd73cd61a5c7f7",
     "alertlen": 20,
     "title": {
-        "bid": "剑鱼推送消息，最新的订阅内容",
-        "project": "剑鱼推送消息，我关注的项目",
-        "entname": "剑鱼推送消息，我关注的企业",
+        "bid": "您有新的招标信息！",
+        "project": "您关注的项目有新的公告信息！",
+        "entname": "您关注的企业有新的公告信息！",
 		"bidopentip": "剑鱼推送消息，开标提醒",
-        "message": "剑鱼推送消息"
+        "message": "剑鱼推送消息！"
     },
     "config": {
         "platform": "all",

src/web/staticres/js/common.js

@@ -57,7 +57,7 @@ function timeDiff(date){
 		if (days > 10) {
 			var date1year = date1.getFullYear();
 			var date2year = date2.getFullYear();
-			var date1month = date1.getUTCMonth()+1;
+			var date1month = date1.getMonth()+1;
 			var date1day = date1.getDate();
 			if(date1month < 10){
 				date1month ="0"+date1month;

src/web/staticres/js/wxSupersearch.js

@@ -502,8 +502,8 @@ var SuperSearch = {
 		if(flag){
 			$("#supersearchPage input[name=super_searchinput]").focus();
 			this.afterFocus();
-			this.getIndustry();
 		}
+		this.getIndustry();
 		this.resetSx();//重置筛选
 		$("#supersearchPage .shaixIndustry").addClass("shaixcl");
 		$("#supersearchPage .shaixIndustry").siblings().removeClass("shaixcl");