瀏覽代碼

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

wangkaiyue 5 年之前
父節點
當前提交
c6fb4cf8b0
共有 35 個文件被更改,包括 2497 次插入58 次删除
  1. 6 3
      src/jfw/modules/app/src/app/front/me.go
  2. 44 0
      src/jfw/modules/app/src/app/front/myorder.go
  3. 228 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/common.css
  4. 7 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/index.css
  5. 340 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/mine.css
  6. 55 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/reset.css
  7. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/bigPhone.png
  8. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/book_icon.png
  9. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/close_icon.png
  10. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/closeline.png
  11. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/edit_icon.png
  12. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/email_icon.png
  13. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/house_icon.png
  14. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/i_icon.png
  15. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/notice_icon.png
  16. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/phone_icon.png
  17. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/right_icon.png
  18. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/share_icon.png
  19. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/success_icon.png
  20. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/successed(1).png
  21. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/successed.png
  22. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/tel_icon.png
  23. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/weixin_icon.png
  24. 二進制
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/why_icon.png
  25. 20 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/js/public.js
  26. 1587 0
      src/jfw/modules/app/src/web/staticres/jyapp/myemail/js/zepto.js
  27. 26 18
      src/jfw/modules/app/src/web/templates/me/index.html
  28. 74 20
      src/jfw/modules/app/src/web/templates/me/setemail/bind_email.html
  29. 71 6
      src/jfw/modules/app/src/web/templates/me/setemail/bind_success.html
  30. 8 6
      src/jfw/modules/app/src/web/templates/me/setemail/unbind_email.html
  31. 19 1
      src/jfw/modules/pushsubscribe/src/push/job/timetask.go
  32. 9 1
      src/jfw/modules/subscribepay/src/timetask/timetask.go
  33. 1 1
      src/web/templates/weixin/dataExport/dataExport_toMyOrder.html
  34. 1 1
      src/web/templates/weixin/vipsubscribe/vip_order_detail.html
  35. 1 1
      src/web/templates/weixin/vipsubscribe/vip_pay_success.html

+ 6 - 3
src/jfw/modules/app/src/app/front/me.go

@@ -42,13 +42,16 @@ func (m *Me) MeIndex() error {
 		m.T["pullnew"] = false
 	}
 	//检测用户是否绑定邮箱
-	res, err := mongodb.FindOne("vip_keysnap", bson.M{"s_userid": qutil.ObjToString(m.GetSession("userId"))})
+	res, err := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(qutil.ObjToString(m.GetSession("userId")))})
 	if len(*res) > 0 && err {
-		if (*res)["s_email"] == nil {
+		if qutil.ObjToString((*res)["s_myemail"]) == "" {
 			m.T["isNoEmail"] = true
 		}
+		if qutil.Int64All((*res)["i_vip_status"]) == 1 || qutil.Int64All((*res)["i_vip_status"]) == 2 {
+			m.T["isVip"] = true
+		}
 	}
-	return m.Render("/me/index.html")
+	return m.Render("/me/index.html", &m.T)
 }
 func (m *Me) MeSet() error {
 	userid := qutil.ObjToString(m.GetSession("userId"))

+ 44 - 0
src/jfw/modules/app/src/app/front/myorder.go

@@ -9,6 +9,8 @@ import (
 	"strconv"
 	"strings"
 
+	"gopkg.in/mgo.v2/bson"
+
 	"github.com/go-xweb/xweb"
 )
 
@@ -23,6 +25,10 @@ type MyOrder struct {
 	deleteOrder   xweb.Mapper `xweb:"/jyapp/front/myorder/deleteOrder"`                //删除订单
 	getOneMore    xweb.Mapper `xweb:"/jyapp/front/myorder/getOneMore"`                 //获取额外一条数据
 	//	testPay       xweb.Mapper `xweb:"/jyapp/front/myorder/testPay"`                    //模拟去支付
+	//我的邮箱
+	myEmail    xweb.Mapper `xweb:"/jyapp/front/myorder/myEmail"`    //我的邮箱
+	setSuccess xweb.Mapper `xweb:"/jyapp/front/myorder/setSuccess"` //查询订单
+
 }
 
 func init() {
@@ -359,6 +365,44 @@ func (m *MyOrder) ToOrderDetail() error {
 	return nil
 }
 
+func (m *MyOrder) MyEmail() {
+	m.T["userId"] = util.ObjToString(m.GetSession("userId"))
+
+	name := m.GetString("name") //
+	//检测用户是否绑定邮箱
+	if util.ObjToString(m.GetSession("userId")) != "" {
+		m.T["userId"] = util.ObjToString(m.GetSession("userId"))
+	}
+	res, err := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(util.ObjToString(m.GetSession("userId")))})
+	if len(*res) > 0 && err {
+		if util.ObjToString((*res)["s_myemail"]) == "" || name != "" {
+			//未绑定邮箱 进入绑定邮箱界面
+			if name != "" && util.ObjToString((*res)["s_myemail"]) != "" {
+				m.T["text_email"] = util.ObjToString((*res)["s_myemail"])
+				//invoice 是从开发票跳转过来的
+				if name == "invoice" {
+					orderCode := m.GetString("orderCode")
+					if orderCode != "" {
+						m.T["orderCode"] = orderCode
+					}
+				}
+			}
+			m.Render("/me/setemail/bind_email.html", &m.T)
+		} else {
+			//绑定邮箱进入 更换解绑邮箱界面
+			if util.ObjToString((*res)["s_myemail"]) != "" {
+				m.T["text_email"] = util.ObjToString((*res)["s_myemail"])
+			}
+			m.Render("/me/setemail/unbind_email.html", &m.T)
+		}
+	}
+}
+
+func (m *MyOrder) SetSuccess() {
+	m.T["userId"] = util.ObjToString(m.GetSession("userId"))
+	m.Render("/me/setemail/bind_success.html", &m.T)
+}
+
 func (m *MyOrder) GetOrderCode(order_code string) error {
 	var status, order_status int64
 	queryMap := map[string]interface{}{

+ 228 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/common.css

@@ -0,0 +1,228 @@
+@charset "UTF-8";
+/* iPhone 6尺寸作为设计稿基准 */
+/* 浮动 */
+.fl {
+  float: left;
+}
+
+.fr {
+  float: right;
+}
+
+/* 清除浮动 */
+.clearfix {
+  zoom: 1;
+}
+
+.clearfix:after {
+  clear: both;
+  height: 0;
+  overflow: hidden;
+  display: block;
+  visibility: hidden;
+  content: "";
+}
+
+/* 文字超出显示省略号--单行 */
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* 多行文本溢出 */
+.mult_row_ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  background-color: cornflowerblue;
+}
+
+.mgT26 {
+  margin-top: 3.4666666667vw;
+}
+
+.mgB26 {
+  margin-bottom: 3.4666666667vw;
+}
+
+.borderT {
+  border-top: 0.1333333333vw solid #ddd;
+}
+
+.borderB {
+  border-bottom: 0.1333333333vw solid #ddd;
+}
+
+.text-algin {
+  text-align: center;
+}
+
+/* 自定义按钮 */
+.common_btn {
+  display: block;
+  height: 12.5333333333vw;
+  margin: 0 auto;
+  background: #2CB7CA;
+  color: #fff;
+  font-size: 4.5333333333vw;
+  text-align: center;
+  line-height: 12.5333333333vw;
+  border-radius: 0.6666666667vw;
+}
+
+/* 自定义弹窗组件样式 */
+/* 遮罩层 */
+.mask {
+  position: fixed;
+  z-index: 1000;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+
+/* toast 提示框组件*/
+.toast {
+  position: fixed;
+  z-index: 5000;
+  width: 45%;
+  top: 50%;
+  left: 50%;
+  padding: 4vw 2.6666666667vw;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  background: #000000;
+  opacity: 0.7;
+  color: #fff;
+  font-size: 3.7333333333vw;
+  border-radius: 1.0666666667vw;
+  overflow: hidden;
+  text-align: center;
+}
+
+/* confirm 弹窗组件 */
+.dialog_confirm .dialog {
+  position: fixed;
+  z-index: 5000;
+  width: 85%;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  background-color: #FAFAFC;
+  text-align: center;
+  border-radius: 1.0666666667vw;
+  overflow: hidden;
+}
+.dialog_confirm .dialog .dialog_hd {
+  font-size: 4.5333333333vw;
+  color: #1D1D1D;
+  font-weight: bold;
+  padding-top: 7.7333333333vw;
+  text-align: center;
+}
+.dialog_confirm .dialog .dialog_bd {
+  padding: 4.2666666667vw 0;
+  font-size: 4vw;
+  color: #1D1D1D;
+}
+.dialog_confirm .dialog .dialog_ft {
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  height: 13.3333333333vw;
+  line-height: 13.3333333333vw;
+  border-top: 0.1333333333vw solid #E0E0E0;
+}
+.dialog_confirm .dialog .dialog_ft a {
+  position: relative;
+  display: block;
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  font-size: 4.8vw;
+}
+.dialog_confirm .dialog .dialog_ft a:nth-child(1) {
+  border-right: 0.1333333333vw solid #E0E0E0;
+}
+.dialog_confirm .dialog .dialog_ft .default {
+  color: #000000;
+}
+.dialog_confirm .dialog .dialog_ft .primary {
+  color: #2CB7CA;
+}
+
+/* alert 弹窗组件 */
+.dialog_alert .dialog {
+  position: fixed;
+  z-index: 5000;
+  width: 85%;
+  top: 50%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  background-color: #FAFAFC;
+  text-align: center;
+  border-radius: 1.0666666667vw;
+  /* overflow: hidden; */
+}
+.dialog_alert .dialog .hd_img {
+  position: relative;
+  width: 100%;
+  height: 28vw;
+}
+.dialog_alert .dialog .hd_img .logo {
+  position: absolute;
+  width: 100%;
+  height: 46.6666666667vw;
+  z-index: 6000;
+  top: -18.6666666667vw;
+  left: 50%;
+  margin-left: -50%;
+}
+.dialog_alert .dialog .hd_img .close {
+  position: absolute;
+  width: 6.6666666667vw;
+  height: 13.0666666667vw;
+  top: -13.0666666667vw;
+  right: 0;
+  z-index: 6001;
+}
+.dialog_alert .dialog .dialog_hd {
+  font-size: 4.5333333333vw;
+  color: #1D1D1D;
+  font-weight: bold;
+  padding-top: 7.7333333333vw;
+  text-align: center;
+}
+.dialog_alert .dialog .dialog_bd {
+  padding: 4.2666666667vw 7.3333333333vw;
+  font-size: 4vw;
+  color: #1D1D1D;
+}
+.dialog_alert .dialog .dialog_ft {
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  height: 13.3333333333vw;
+  line-height: 13.3333333333vw;
+  padding: 0 5.3333333333vw;
+  border-top: 0.1333333333vw solid #E0E0E0;
+}
+.dialog_alert .dialog .dialog_ft a {
+  position: relative;
+  display: block;
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  font-size: 4.8vw;
+}
+.dialog_alert .dialog .dialog_title {
+  font-size: 5.8666666667vw;
+}

+ 7 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/index.css

@@ -0,0 +1,7 @@
+@charset "UTF-8";
+/* iPhone 6尺寸作为设计稿基准 */
+.index {
+  width: 100%;
+  height: 100%;
+  background: #F4F4F9;
+}

+ 340 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/mine.css

@@ -0,0 +1,340 @@
+@charset "UTF-8";
+/* iPhone 6尺寸作为设计稿基准 */
+/* mine */
+.mine .list {
+  height: 14.6666666667vw;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  background: #fff;
+  padding: 0 0 0 4.8vw;
+}
+.mine .list img {
+  width: 6.4vw;
+  height: 6.4vw;
+  margin-right: 2.6666666667vw;
+}
+.mine .list a {
+  position: relative;
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  height: 100%;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  padding-right: 4.2666666667vw;
+}
+.mine .list a span {
+  font-size: 4.5333333333vw;
+  color: #1D1D1D;
+}
+.mine .list a em {
+  font-size: 3.7333333333vw;
+  color: #686868;
+  margin-right: 2.6666666667vw;
+}
+.mine .list a .right_icon {
+  width: 1.6vw;
+  height: 2.9333333333vw;
+  position: absolute;
+  right: 0;
+  top: 50%;
+  margin-top: -1.4666666667vw;
+}
+
+/* bind_email 绑定邮箱 */
+/* bind_phone 手机绑定 */
+/* change_email 更换邮箱 */
+/* change_phone_2 更换手机号 第二步*/
+.bind_email,
+.bind_phone,
+.change_email,
+.change_phone_2,
+.change_phone_3 {
+  height: 100%;
+  overflow: hidden;
+  background: #F4F4F9;
+}
+.bind_email .input,
+.bind_phone .input,
+.change_email .input,
+.change_phone_2 .input,
+.change_phone_3 .input {
+  position: relative;
+  padding-left: 4vw;
+  background: #fff;
+  border-top: 0.1333333333vw solid #CECECE;
+  border-bottom: 0.1333333333vw solid #CECECE;
+}
+.bind_email .input input,
+.bind_phone .input input,
+.change_email .input input,
+.change_phone_2 .input input,
+.change_phone_3 .input input {
+  width: 100%;
+  height: 14.6666666667vw;
+  line-height: 14.6666666667vw;
+  padding-right: 4vw;
+  line-height: 14.6666666667vw;
+  background: transparent;
+  font-size: 4.2666666667vw;
+  color: #1D1D1D;
+}
+.bind_email .input input:first-child,
+.bind_phone .input input:first-child,
+.change_email .input input:first-child,
+.change_phone_2 .input input:first-child,
+.change_phone_3 .input input:first-child {
+  border-bottom: 0.1333333333vw solid #CECECE;
+}
+.bind_email .input .sendcode,
+.bind_phone .input .sendcode,
+.change_email .input .sendcode,
+.change_phone_2 .input .sendcode,
+.change_phone_3 .input .sendcode {
+  position: absolute;
+  top: 18.9333333333vw;
+  right: 4vw;
+  font-size: 4.2666666667vw;
+  color: #888;
+  z-index: 999;
+  background: transparent;
+}
+.bind_email .btn,
+.bind_phone .btn,
+.change_email .btn,
+.change_phone_2 .btn,
+.change_phone_3 .btn {
+  width: 90%;
+  margin-top: 10.6666666667vw;
+}
+.bind_email .btn[disabled],
+.bind_phone .btn[disabled],
+.change_email .btn[disabled],
+.change_phone_2 .btn[disabled],
+.change_phone_3 .btn[disabled] {
+  opacity: 0.7;
+}
+
+/* unbind_email 解绑邮箱 */
+/* change_phone_1 更换手机号 第一步*/
+.unbind_email,
+.change_phone_1 {
+  height: 100%;
+  overflow: hidden;
+  background: #F4F4F9;
+}
+.unbind_email .input_box,
+.change_phone_1 .input_box {
+  height: 14.6666666667vw;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  padding: 0 4vw;
+  background: #fff;
+  line-height: 14.6666666667vw;
+  border-top: 0.1333333333vw solid #CECECE;
+  border-bottom: 0.1333333333vw solid #CECECE;
+}
+.unbind_email .input_box label,
+.change_phone_1 .input_box label {
+  font-size: 4.5333333333vw;
+  color: #1D1D1D;
+  margin-right: 2.6666666667vw;
+}
+.unbind_email .input_box input,
+.change_phone_1 .input_box input {
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  height: 99.9%;
+  text-align: right;
+  font-size: 3.7333333333vw;
+  color: #686868;
+  background: transparent;
+}
+.unbind_email .choose_email,
+.unbind_email .choose_phone,
+.change_phone_1 .choose_email,
+.change_phone_1 .choose_phone {
+  display: block;
+  width: 90%;
+  margin: 10.6666666667vw auto 6.4vw;
+  letter-spacing: 2px;
+}
+.unbind_email .unbind,
+.change_phone_1 .unbind {
+  color: #2CB7CA;
+  font-size: 4vw;
+  text-align: center;
+}
+
+/* choose_bind 选择绑定信息 */
+.choose_bind {
+  position: relative;
+  height: 100%;
+  padding: 7.4666666667vw 4vw 5.3333333333vw;
+  background: #fff;
+}
+.choose_bind h3 {
+  font-size: 5.3333333333vw;
+  color: #1D1D1D;
+}
+.choose_bind .tip {
+  margin-top: 2.1333333333vw;
+  font-size: 3.7333333333vw;
+  color: #888;
+  text-align: justify;
+  line-height: 1.6;
+}
+.choose_bind .options {
+  padding: 0 2.4vw;
+}
+.choose_bind .options .options_list {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  padding: 5.3333333333vw 0;
+  border-bottom: 0.1333333333vw solid #CECECE;
+}
+.choose_bind .options .options_list .options_list_img {
+  width: 10.6666666667vw;
+  height: 10.6666666667vw;
+  border-radius: 50%;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+.choose_bind .options .options_list .wx_img {
+  background: #0AB70E;
+}
+.choose_bind .options .options_list .wx_img img {
+  width: 7.2vw;
+  height: 7.2vw;
+}
+.choose_bind .options .options_list .tel_img {
+  background: #FFB901;
+}
+.choose_bind .options .options_list .tel_img img {
+  width: 7.2vw;
+  height: 7.2vw;
+}
+.choose_bind .options .options_list .options_list_info .name {
+  color: #1D1D1D;
+  font-size: 4.2666666667vw;
+}
+.choose_bind .options .options_list .options_list_info .description {
+  font-size: 3.7333333333vw;
+  color: #686868;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.choose_bind .options .options_list .options_list_radio {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 6.4vw;
+  height: 6.4vw;
+  background: transparent;
+  border: 0.1333333333vw solid #888;
+  border-radius: 50%;
+}
+.choose_bind .options .options_list .options_list_radio img {
+  width: 3.4666666667vw;
+  height: 3.4666666667vw;
+  pointer-events: none;
+}
+.choose_bind .options .options_list .active {
+  background: #2CB7CA;
+  border: 0;
+}
+.choose_bind .options .options_list:last-child {
+  border: 0;
+}
+.choose_bind .enter {
+  position: absolute;
+  left: 50%;
+  bottom: 5.3333333333vw;
+  width: 90%;
+  height: 12.5333333333vw;
+  margin-left: -45%;
+  background: #2CB7CA;
+  color: #fff;
+  font-size: 4.5333333333vw;
+  text-align: center;
+  line-height: 12.5333333333vw;
+  border-radius: 0.6666666667vw;
+}
+.choose_bind .enter[disabled] {
+  opacity: 0.5;
+}
+
+/* 绑定成功 */
+.bind_success {
+  height: 100%;
+  padding: 0 4vw;
+  background: #fff;
+}
+.bind_success .success {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  padding: 17.0666666667vw 0;
+}
+.bind_success .success img {
+  width: 22.6666666667vw;
+  height: 22.6666666667vw;
+}
+.bind_success .success p {
+  font-size: 5.3333333333vw;
+  color: #1D1D1D;
+  padding-top: 4.6666666667vw;
+}
+.bind_success .back {
+  width: 100%;
+}

+ 55 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/css/reset.css

@@ -0,0 +1,55 @@
+* {
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    -webkit-overflow-scrolling: touch;
+}
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, sumary {
+    margin: 0;
+    padding: 0;
+}
+html,body {
+    /* max-width: 750px; */
+    -webkit-text-size-adjust: 100%;
+    margin: 0 auto;
+    height: 100%;
+    overflow-x: hidden;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background:rgba(245,244,249,1);
+    color: #3d3d3d;
+    font-family: "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+}
+
+ul,ol {
+    list-style: none;
+}
+/*清除输入框内阴影*/
+input,textarea,select,button{
+    outline: none;
+    border: 0;
+    -webkit-appearance: none;
+    appearance:none;
+}
+
+img {
+    border: 0;
+    vertical-align: middle;
+    max-width: 100%;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+a {
+    text-decoration: none;
+    color: #3d3d3d;
+	-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+	-webkit-user-select: none;
+	-moz-user-focus: none;
+	-moz-user-select: none;
+}
+/*禁用长按页面时的弹出菜单(iOS下有效) ,img和a标签都要加*/
+img,a{
+    -webkit-touch-callout:none;
+}
+em,i{
+	font-style: normal;
+}

二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/bigPhone.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/book_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/close_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/closeline.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/edit_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/email_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/house_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/i_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/notice_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/phone_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/right_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/share_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/success_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/successed(1).png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/successed.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/tel_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/weixin_icon.png


二進制
src/jfw/modules/app/src/web/staticres/jyapp/myemail/img/why_icon.png


+ 20 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/js/public.js

@@ -0,0 +1,20 @@
+/* 封装发送验证码函数 */
function sendCode(obj,time) {
		var that=obj;
		if (time == 0) {
			that.removeAttribute("disabled");
			that.innerHTML = "重新发送验证码";
			that.cssText = 'color: #888';
			return;
		} else {
			that.setAttribute("disabled", true);
			that.innerHTML = time + "s";
			time--;
		}
		var obj_=obj;
		setTimeout(function() {
			sendCode(obj_,time)
		}, 1000)
	}
/******* 获取url参数(正则)********/
+function getParam(name) {
+    var search = document.location.search;
+    // alert(search);
+    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+    var matcher = pattern.exec(search);
+    var items = null;
+    if (null != matcher) {
+        try {
+            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+        } catch (e) {
+            try {
+                items = decodeURIComponent(matcher[1]);
+            } catch (e) {
+                items = matcher[1];
+            }
+        }
+    }
+    return items;
+};

+ 1587 - 0
src/jfw/modules/app/src/web/staticres/jyapp/myemail/js/zepto.js

@@ -0,0 +1,1587 @@
+/* Zepto v1.1.6 - zepto event ajax form ie - zeptojs.com/license */
+
+var Zepto = (function() {
+  var undefined, key, $, classList, emptyArray = [], slice = emptyArray.slice, filter = emptyArray.filter,
+    document = window.document,
+    elementDisplay = {}, classCache = {},
+    cssNumber = { 'column-count': 1, 'columns': 1, 'font-weight': 1, 'line-height': 1,'opacity': 1, 'z-index': 1, 'zoom': 1 },
+    fragmentRE = /^\s*<(\w+|!)[^>]*>/,
+    singleTagRE = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+    tagExpanderRE = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+    rootNodeRE = /^(?:body|html)$/i,
+    capitalRE = /([A-Z])/g,
+
+    // special attributes that should be get/set via method calls
+    methodAttributes = ['val', 'css', 'html', 'text', 'data', 'width', 'height', 'offset'],
+
+    adjacencyOperators = [ 'after', 'prepend', 'before', 'append' ],
+    table = document.createElement('table'),
+    tableRow = document.createElement('tr'),
+    containers = {
+      'tr': document.createElement('tbody'),
+      'tbody': table, 'thead': table, 'tfoot': table,
+      'td': tableRow, 'th': tableRow,
+      '*': document.createElement('div')
+    },
+    readyRE = /complete|loaded|interactive/,
+    simpleSelectorRE = /^[\w-]*$/,
+    class2type = {},
+    toString = class2type.toString,
+    zepto = {},
+    camelize, uniq,
+    tempParent = document.createElement('div'),
+    propMap = {
+      'tabindex': 'tabIndex',
+      'readonly': 'readOnly',
+      'for': 'htmlFor',
+      'class': 'className',
+      'maxlength': 'maxLength',
+      'cellspacing': 'cellSpacing',
+      'cellpadding': 'cellPadding',
+      'rowspan': 'rowSpan',
+      'colspan': 'colSpan',
+      'usemap': 'useMap',
+      'frameborder': 'frameBorder',
+      'contenteditable': 'contentEditable'
+    },
+    isArray = Array.isArray ||
+      function(object){ return object instanceof Array }
+
+  zepto.matches = function(element, selector) {
+    if (!selector || !element || element.nodeType !== 1) return false
+    var matchesSelector = element.webkitMatchesSelector || element.mozMatchesSelector ||
+                          element.oMatchesSelector || element.matchesSelector
+    if (matchesSelector) return matchesSelector.call(element, selector)
+    // fall back to performing a selector:
+    var match, parent = element.parentNode, temp = !parent
+    if (temp) (parent = tempParent).appendChild(element)
+    match = ~zepto.qsa(parent, selector).indexOf(element)
+    temp && tempParent.removeChild(element)
+    return match
+  }
+
+  function type(obj) {
+    return obj == null ? String(obj) :
+      class2type[toString.call(obj)] || "object"
+  }
+
+  function isFunction(value) { return type(value) == "function" }
+  function isWindow(obj)     { return obj != null && obj == obj.window }
+  function isDocument(obj)   { return obj != null && obj.nodeType == obj.DOCUMENT_NODE }
+  function isObject(obj)     { return type(obj) == "object" }
+  function isPlainObject(obj) {
+    return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) == Object.prototype
+  }
+  function likeArray(obj) { return typeof obj.length == 'number' }
+
+  function compact(array) { return filter.call(array, function(item){ return item != null }) }
+  function flatten(array) { return array.length > 0 ? $.fn.concat.apply([], array) : array }
+  camelize = function(str){ return str.replace(/-+(.)?/g, function(match, chr){ return chr ? chr.toUpperCase() : '' }) }
+  function dasherize(str) {
+    return str.replace(/::/g, '/')
+           .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+           .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+           .replace(/_/g, '-')
+           .toLowerCase()
+  }
+  uniq = function(array){ return filter.call(array, function(item, idx){ return array.indexOf(item) == idx }) }
+
+  function classRE(name) {
+    return name in classCache ?
+      classCache[name] : (classCache[name] = new RegExp('(^|\\s)' + name + '(\\s|$)'))
+  }
+
+  function maybeAddPx(name, value) {
+    return (typeof value == "number" && !cssNumber[dasherize(name)]) ? value + "px" : value
+  }
+
+  function defaultDisplay(nodeName) {
+    var element, display
+    if (!elementDisplay[nodeName]) {
+      element = document.createElement(nodeName)
+      document.body.appendChild(element)
+      display = getComputedStyle(element, '').getPropertyValue("display")
+      element.parentNode.removeChild(element)
+      display == "none" && (display = "block")
+      elementDisplay[nodeName] = display
+    }
+    return elementDisplay[nodeName]
+  }
+
+  function children(element) {
+    return 'children' in element ?
+      slice.call(element.children) :
+      $.map(element.childNodes, function(node){ if (node.nodeType == 1) return node })
+  }
+
+  // `$.zepto.fragment` takes a html string and an optional tag name
+  // to generate DOM nodes nodes from the given html string.
+  // The generated DOM nodes are returned as an array.
+  // This function can be overriden in plugins for example to make
+  // it compatible with browsers that don't support the DOM fully.
+  zepto.fragment = function(html, name, properties) {
+    var dom, nodes, container
+
+    // A special case optimization for a single tag
+    if (singleTagRE.test(html)) dom = $(document.createElement(RegExp.$1))
+
+    if (!dom) {
+      if (html.replace) html = html.replace(tagExpanderRE, "<$1></$2>")
+      if (name === undefined) name = fragmentRE.test(html) && RegExp.$1
+      if (!(name in containers)) name = '*'
+
+      container = containers[name]
+      container.innerHTML = '' + html
+      dom = $.each(slice.call(container.childNodes), function(){
+        container.removeChild(this)
+      })
+    }
+
+    if (isPlainObject(properties)) {
+      nodes = $(dom)
+      $.each(properties, function(key, value) {
+        if (methodAttributes.indexOf(key) > -1) nodes[key](value)
+        else nodes.attr(key, value)
+      })
+    }
+
+    return dom
+  }
+
+  // `$.zepto.Z` swaps out the prototype of the given `dom` array
+  // of nodes with `$.fn` and thus supplying all the Zepto functions
+  // to the array. Note that `__proto__` is not supported on Internet
+  // Explorer. This method can be overriden in plugins.
+  zepto.Z = function(dom, selector) {
+    dom = dom || []
+    dom.__proto__ = $.fn
+    dom.selector = selector || ''
+    return dom
+  }
+
+  // `$.zepto.isZ` should return `true` if the given object is a Zepto
+  // collection. This method can be overriden in plugins.
+  zepto.isZ = function(object) {
+    return object instanceof zepto.Z
+  }
+
+  // `$.zepto.init` is Zepto's counterpart to jQuery's `$.fn.init` and
+  // takes a CSS selector and an optional context (and handles various
+  // special cases).
+  // This method can be overriden in plugins.
+  zepto.init = function(selector, context) {
+    var dom
+    // If nothing given, return an empty Zepto collection
+    if (!selector) return zepto.Z()
+    // Optimize for string selectors
+    else if (typeof selector == 'string') {
+      selector = selector.trim()
+      // If it's a html fragment, create nodes from it
+      // Note: In both Chrome 21 and Firefox 15, DOM error 12
+      // is thrown if the fragment doesn't begin with <
+      if (selector[0] == '<' && fragmentRE.test(selector))
+        dom = zepto.fragment(selector, RegExp.$1, context), selector = null
+      // If there's a context, create a collection on that context first, and select
+      // nodes from there
+      else if (context !== undefined) return $(context).find(selector)
+      // If it's a CSS selector, use it to select nodes.
+      else dom = zepto.qsa(document, selector)
+    }
+    // If a function is given, call it when the DOM is ready
+    else if (isFunction(selector)) return $(document).ready(selector)
+    // If a Zepto collection is given, just return it
+    else if (zepto.isZ(selector)) return selector
+    else {
+      // normalize array if an array of nodes is given
+      if (isArray(selector)) dom = compact(selector)
+      // Wrap DOM nodes.
+      else if (isObject(selector))
+        dom = [selector], selector = null
+      // If it's a html fragment, create nodes from it
+      else if (fragmentRE.test(selector))
+        dom = zepto.fragment(selector.trim(), RegExp.$1, context), selector = null
+      // If there's a context, create a collection on that context first, and select
+      // nodes from there
+      else if (context !== undefined) return $(context).find(selector)
+      // And last but no least, if it's a CSS selector, use it to select nodes.
+      else dom = zepto.qsa(document, selector)
+    }
+    // create a new Zepto collection from the nodes found
+    return zepto.Z(dom, selector)
+  }
+
+  // `$` will be the base `Zepto` object. When calling this
+  // function just call `$.zepto.init, which makes the implementation
+  // details of selecting nodes and creating Zepto collections
+  // patchable in plugins.
+  $ = function(selector, context){
+    return zepto.init(selector, context)
+  }
+
+  function extend(target, source, deep) {
+    for (key in source)
+      if (deep && (isPlainObject(source[key]) || isArray(source[key]))) {
+        if (isPlainObject(source[key]) && !isPlainObject(target[key]))
+          target[key] = {}
+        if (isArray(source[key]) && !isArray(target[key]))
+          target[key] = []
+        extend(target[key], source[key], deep)
+      }
+      else if (source[key] !== undefined) target[key] = source[key]
+  }
+
+  // Copy all but undefined properties from one or more
+  // objects to the `target` object.
+  $.extend = function(target){
+    var deep, args = slice.call(arguments, 1)
+    if (typeof target == 'boolean') {
+      deep = target
+      target = args.shift()
+    }
+    args.forEach(function(arg){ extend(target, arg, deep) })
+    return target
+  }
+
+  // `$.zepto.qsa` is Zepto's CSS selector implementation which
+  // uses `document.querySelectorAll` and optimizes for some special cases, like `#id`.
+  // This method can be overriden in plugins.
+  zepto.qsa = function(element, selector){
+    var found,
+        maybeID = selector[0] == '#',
+        maybeClass = !maybeID && selector[0] == '.',
+        nameOnly = maybeID || maybeClass ? selector.slice(1) : selector, // Ensure that a 1 char tag name still gets checked
+        isSimple = simpleSelectorRE.test(nameOnly)
+    return (isDocument(element) && isSimple && maybeID) ?
+      ( (found = element.getElementById(nameOnly)) ? [found] : [] ) :
+      (element.nodeType !== 1 && element.nodeType !== 9) ? [] :
+      slice.call(
+        isSimple && !maybeID ?
+          maybeClass ? element.getElementsByClassName(nameOnly) : // If it's simple, it could be a class
+          element.getElementsByTagName(selector) : // Or a tag
+          element.querySelectorAll(selector) // Or it's not simple, and we need to query all
+      )
+  }
+
+  function filtered(nodes, selector) {
+    return selector == null ? $(nodes) : $(nodes).filter(selector)
+  }
+
+  $.contains = document.documentElement.contains ?
+    function(parent, node) {
+      return parent !== node && parent.contains(node)
+    } :
+    function(parent, node) {
+      while (node && (node = node.parentNode))
+        if (node === parent) return true
+      return false
+    }
+
+  function funcArg(context, arg, idx, payload) {
+    return isFunction(arg) ? arg.call(context, idx, payload) : arg
+  }
+
+  function setAttribute(node, name, value) {
+    value == null ? node.removeAttribute(name) : node.setAttribute(name, value)
+  }
+
+  // access className property while respecting SVGAnimatedString
+  function className(node, value){
+    var klass = node.className || '',
+        svg   = klass && klass.baseVal !== undefined
+
+    if (value === undefined) return svg ? klass.baseVal : klass
+    svg ? (klass.baseVal = value) : (node.className = value)
+  }
+
+  // "true"  => true
+  // "false" => false
+  // "null"  => null
+  // "42"    => 42
+  // "42.5"  => 42.5
+  // "08"    => "08"
+  // JSON    => parse if valid
+  // String  => self
+  function deserializeValue(value) {
+    try {
+      return value ?
+        value == "true" ||
+        ( value == "false" ? false :
+          value == "null" ? null :
+          +value + "" == value ? +value :
+          /^[\[\{]/.test(value) ? $.parseJSON(value) :
+          value )
+        : value
+    } catch(e) {
+      return value
+    }
+  }
+
+  $.type = type
+  $.isFunction = isFunction
+  $.isWindow = isWindow
+  $.isArray = isArray
+  $.isPlainObject = isPlainObject
+
+  $.isEmptyObject = function(obj) {
+    var name
+    for (name in obj) return false
+    return true
+  }
+
+  $.inArray = function(elem, array, i){
+    return emptyArray.indexOf.call(array, elem, i)
+  }
+
+  $.camelCase = camelize
+  $.trim = function(str) {
+    return str == null ? "" : String.prototype.trim.call(str)
+  }
+
+  // plugin compatibility
+  $.uuid = 0
+  $.support = { }
+  $.expr = { }
+
+  $.map = function(elements, callback){
+    var value, values = [], i, key
+    if (likeArray(elements))
+      for (i = 0; i < elements.length; i++) {
+        value = callback(elements[i], i)
+        if (value != null) values.push(value)
+      }
+    else
+      for (key in elements) {
+        value = callback(elements[key], key)
+        if (value != null) values.push(value)
+      }
+    return flatten(values)
+  }
+
+  $.each = function(elements, callback){
+    var i, key
+    if (likeArray(elements)) {
+      for (i = 0; i < elements.length; i++)
+        if (callback.call(elements[i], i, elements[i]) === false) return elements
+    } else {
+      for (key in elements)
+        if (callback.call(elements[key], key, elements[key]) === false) return elements
+    }
+
+    return elements
+  }
+
+  $.grep = function(elements, callback){
+    return filter.call(elements, callback)
+  }
+
+  if (window.JSON) $.parseJSON = JSON.parse
+
+  // Populate the class2type map
+  $.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+    class2type[ "[object " + name + "]" ] = name.toLowerCase()
+  })
+
+  // Define methods that will be available on all
+  // Zepto collections
+  $.fn = {
+    // Because a collection acts like an array
+    // copy over these useful array functions.
+    forEach: emptyArray.forEach,
+    reduce: emptyArray.reduce,
+    push: emptyArray.push,
+    sort: emptyArray.sort,
+    indexOf: emptyArray.indexOf,
+    concat: emptyArray.concat,
+
+    // `map` and `slice` in the jQuery API work differently
+    // from their array counterparts
+    map: function(fn){
+      return $($.map(this, function(el, i){ return fn.call(el, i, el) }))
+    },
+    slice: function(){
+      return $(slice.apply(this, arguments))
+    },
+
+    ready: function(callback){
+      // need to check if document.body exists for IE as that browser reports
+      // document ready when it hasn't yet created the body element
+      if (readyRE.test(document.readyState) && document.body) callback($)
+      else document.addEventListener('DOMContentLoaded', function(){ callback($) }, false)
+      return this
+    },
+    get: function(idx){
+      return idx === undefined ? slice.call(this) : this[idx >= 0 ? idx : idx + this.length]
+    },
+    toArray: function(){ return this.get() },
+    size: function(){
+      return this.length
+    },
+    remove: function(){
+      return this.each(function(){
+        if (this.parentNode != null)
+          this.parentNode.removeChild(this)
+      })
+    },
+    each: function(callback){
+      emptyArray.every.call(this, function(el, idx){
+        return callback.call(el, idx, el) !== false
+      })
+      return this
+    },
+    filter: function(selector){
+      if (isFunction(selector)) return this.not(this.not(selector))
+      return $(filter.call(this, function(element){
+        return zepto.matches(element, selector)
+      }))
+    },
+    add: function(selector,context){
+      return $(uniq(this.concat($(selector,context))))
+    },
+    is: function(selector){
+      return this.length > 0 && zepto.matches(this[0], selector)
+    },
+    not: function(selector){
+      var nodes=[]
+      if (isFunction(selector) && selector.call !== undefined)
+        this.each(function(idx){
+          if (!selector.call(this,idx)) nodes.push(this)
+        })
+      else {
+        var excludes = typeof selector == 'string' ? this.filter(selector) :
+          (likeArray(selector) && isFunction(selector.item)) ? slice.call(selector) : $(selector)
+        this.forEach(function(el){
+          if (excludes.indexOf(el) < 0) nodes.push(el)
+        })
+      }
+      return $(nodes)
+    },
+    has: function(selector){
+      return this.filter(function(){
+        return isObject(selector) ?
+          $.contains(this, selector) :
+          $(this).find(selector).size()
+      })
+    },
+    eq: function(idx){
+      return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1)
+    },
+    first: function(){
+      var el = this[0]
+      return el && !isObject(el) ? el : $(el)
+    },
+    last: function(){
+      var el = this[this.length - 1]
+      return el && !isObject(el) ? el : $(el)
+    },
+    find: function(selector){
+      var result, $this = this
+      if (!selector) result = $()
+      else if (typeof selector == 'object')
+        result = $(selector).filter(function(){
+          var node = this
+          return emptyArray.some.call($this, function(parent){
+            return $.contains(parent, node)
+          })
+        })
+      else if (this.length == 1) result = $(zepto.qsa(this[0], selector))
+      else result = this.map(function(){ return zepto.qsa(this, selector) })
+      return result
+    },
+    closest: function(selector, context){
+      var node = this[0], collection = false
+      if (typeof selector == 'object') collection = $(selector)
+      while (node && !(collection ? collection.indexOf(node) >= 0 : zepto.matches(node, selector)))
+        node = node !== context && !isDocument(node) && node.parentNode
+      return $(node)
+    },
+    parents: function(selector){
+      var ancestors = [], nodes = this
+      while (nodes.length > 0)
+        nodes = $.map(nodes, function(node){
+          if ((node = node.parentNode) && !isDocument(node) && ancestors.indexOf(node) < 0) {
+            ancestors.push(node)
+            return node
+          }
+        })
+      return filtered(ancestors, selector)
+    },
+    parent: function(selector){
+      return filtered(uniq(this.pluck('parentNode')), selector)
+    },
+    children: function(selector){
+      return filtered(this.map(function(){ return children(this) }), selector)
+    },
+    contents: function() {
+      return this.map(function() { return slice.call(this.childNodes) })
+    },
+    siblings: function(selector){
+      return filtered(this.map(function(i, el){
+        return filter.call(children(el.parentNode), function(child){ return child!==el })
+      }), selector)
+    },
+    empty: function(){
+      return this.each(function(){ this.innerHTML = '' })
+    },
+    // `pluck` is borrowed from Prototype.js
+    pluck: function(property){
+      return $.map(this, function(el){ return el[property] })
+    },
+    show: function(){
+      return this.each(function(){
+        this.style.display == "none" && (this.style.display = '')
+        if (getComputedStyle(this, '').getPropertyValue("display") == "none")
+          this.style.display = defaultDisplay(this.nodeName)
+      })
+    },
+    replaceWith: function(newContent){
+      return this.before(newContent).remove()
+    },
+    wrap: function(structure){
+      var func = isFunction(structure)
+      if (this[0] && !func)
+        var dom   = $(structure).get(0),
+            clone = dom.parentNode || this.length > 1
+
+      return this.each(function(index){
+        $(this).wrapAll(
+          func ? structure.call(this, index) :
+            clone ? dom.cloneNode(true) : dom
+        )
+      })
+    },
+    wrapAll: function(structure){
+      if (this[0]) {
+        $(this[0]).before(structure = $(structure))
+        var children
+        // drill down to the inmost element
+        while ((children = structure.children()).length) structure = children.first()
+        $(structure).append(this)
+      }
+      return this
+    },
+    wrapInner: function(structure){
+      var func = isFunction(structure)
+      return this.each(function(index){
+        var self = $(this), contents = self.contents(),
+            dom  = func ? structure.call(this, index) : structure
+        contents.length ? contents.wrapAll(dom) : self.append(dom)
+      })
+    },
+    unwrap: function(){
+      this.parent().each(function(){
+        $(this).replaceWith($(this).children())
+      })
+      return this
+    },
+    clone: function(){
+      return this.map(function(){ return this.cloneNode(true) })
+    },
+    hide: function(){
+      return this.css("display", "none")
+    },
+    toggle: function(setting){
+      return this.each(function(){
+        var el = $(this)
+        ;(setting === undefined ? el.css("display") == "none" : setting) ? el.show() : el.hide()
+      })
+    },
+    prev: function(selector){ return $(this.pluck('previousElementSibling')).filter(selector || '*') },
+    next: function(selector){ return $(this.pluck('nextElementSibling')).filter(selector || '*') },
+    html: function(html){
+      return 0 in arguments ?
+        this.each(function(idx){
+          var originHtml = this.innerHTML
+          $(this).empty().append( funcArg(this, html, idx, originHtml) )
+        }) :
+        (0 in this ? this[0].innerHTML : null)
+    },
+    text: function(text){
+      return 0 in arguments ?
+        this.each(function(idx){
+          var newText = funcArg(this, text, idx, this.textContent)
+          this.textContent = newText == null ? '' : ''+newText
+        }) :
+        (0 in this ? this[0].textContent : null)
+    },
+    attr: function(name, value){
+      var result
+      return (typeof name == 'string' && !(1 in arguments)) ?
+        (!this.length || this[0].nodeType !== 1 ? undefined :
+          (!(result = this[0].getAttribute(name)) && name in this[0]) ? this[0][name] : result
+        ) :
+        this.each(function(idx){
+          if (this.nodeType !== 1) return
+          if (isObject(name)) for (key in name) setAttribute(this, key, name[key])
+          else setAttribute(this, name, funcArg(this, value, idx, this.getAttribute(name)))
+        })
+    },
+    removeAttr: function(name){
+      return this.each(function(){ this.nodeType === 1 && name.split(' ').forEach(function(attribute){
+        setAttribute(this, attribute)
+      }, this)})
+    },
+    prop: function(name, value){
+      name = propMap[name] || name
+      return (1 in arguments) ?
+        this.each(function(idx){
+          this[name] = funcArg(this, value, idx, this[name])
+        }) :
+        (this[0] && this[0][name])
+    },
+    data: function(name, value){
+      var attrName = 'data-' + name.replace(capitalRE, '-$1').toLowerCase()
+
+      var data = (1 in arguments) ?
+        this.attr(attrName, value) :
+        this.attr(attrName)
+
+      return data !== null ? deserializeValue(data) : undefined
+    },
+    val: function(value){
+      return 0 in arguments ?
+        this.each(function(idx){
+          this.value = funcArg(this, value, idx, this.value)
+        }) :
+        (this[0] && (this[0].multiple ?
+           $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') :
+           this[0].value)
+        )
+    },
+    offset: function(coordinates){
+      if (coordinates) return this.each(function(index){
+        var $this = $(this),
+            coords = funcArg(this, coordinates, index, $this.offset()),
+            parentOffset = $this.offsetParent().offset(),
+            props = {
+              top:  coords.top  - parentOffset.top,
+              left: coords.left - parentOffset.left
+            }
+
+        if ($this.css('position') == 'static') props['position'] = 'relative'
+        $this.css(props)
+      })
+      if (!this.length) return null
+      var obj = this[0].getBoundingClientRect()
+      return {
+        left: obj.left + window.pageXOffset,
+        top: obj.top + window.pageYOffset,
+        width: Math.round(obj.width),
+        height: Math.round(obj.height)
+      }
+    },
+    css: function(property, value){
+      if (arguments.length < 2) {
+        var computedStyle, element = this[0]
+        if(!element) return
+        computedStyle = getComputedStyle(element, '')
+        if (typeof property == 'string')
+          return element.style[camelize(property)] || computedStyle.getPropertyValue(property)
+        else if (isArray(property)) {
+          var props = {}
+          $.each(property, function(_, prop){
+            props[prop] = (element.style[camelize(prop)] || computedStyle.getPropertyValue(prop))
+          })
+          return props
+        }
+      }
+
+      var css = ''
+      if (type(property) == 'string') {
+        if (!value && value !== 0)
+          this.each(function(){ this.style.removeProperty(dasherize(property)) })
+        else
+          css = dasherize(property) + ":" + maybeAddPx(property, value)
+      } else {
+        for (key in property)
+          if (!property[key] && property[key] !== 0)
+            this.each(function(){ this.style.removeProperty(dasherize(key)) })
+          else
+            css += dasherize(key) + ':' + maybeAddPx(key, property[key]) + ';'
+      }
+
+      return this.each(function(){ this.style.cssText += ';' + css })
+    },
+    index: function(element){
+      return element ? this.indexOf($(element)[0]) : this.parent().children().indexOf(this[0])
+    },
+    hasClass: function(name){
+      if (!name) return false
+      return emptyArray.some.call(this, function(el){
+        return this.test(className(el))
+      }, classRE(name))
+    },
+    addClass: function(name){
+      if (!name) return this
+      return this.each(function(idx){
+        if (!('className' in this)) return
+        classList = []
+        var cls = className(this), newName = funcArg(this, name, idx, cls)
+        newName.split(/\s+/g).forEach(function(klass){
+          if (!$(this).hasClass(klass)) classList.push(klass)
+        }, this)
+        classList.length && className(this, cls + (cls ? " " : "") + classList.join(" "))
+      })
+    },
+    removeClass: function(name){
+      return this.each(function(idx){
+        if (!('className' in this)) return
+        if (name === undefined) return className(this, '')
+        classList = className(this)
+        funcArg(this, name, idx, classList).split(/\s+/g).forEach(function(klass){
+          classList = classList.replace(classRE(klass), " ")
+        })
+        className(this, classList.trim())
+      })
+    },
+    toggleClass: function(name, when){
+      if (!name) return this
+      return this.each(function(idx){
+        var $this = $(this), names = funcArg(this, name, idx, className(this))
+        names.split(/\s+/g).forEach(function(klass){
+          (when === undefined ? !$this.hasClass(klass) : when) ?
+            $this.addClass(klass) : $this.removeClass(klass)
+        })
+      })
+    },
+    scrollTop: function(value){
+      if (!this.length) return
+      var hasScrollTop = 'scrollTop' in this[0]
+      if (value === undefined) return hasScrollTop ? this[0].scrollTop : this[0].pageYOffset
+      return this.each(hasScrollTop ?
+        function(){ this.scrollTop = value } :
+        function(){ this.scrollTo(this.scrollX, value) })
+    },
+    scrollLeft: function(value){
+      if (!this.length) return
+      var hasScrollLeft = 'scrollLeft' in this[0]
+      if (value === undefined) return hasScrollLeft ? this[0].scrollLeft : this[0].pageXOffset
+      return this.each(hasScrollLeft ?
+        function(){ this.scrollLeft = value } :
+        function(){ this.scrollTo(value, this.scrollY) })
+    },
+    position: function() {
+      if (!this.length) return
+
+      var elem = this[0],
+        // Get *real* offsetParent
+        offsetParent = this.offsetParent(),
+        // Get correct offsets
+        offset       = this.offset(),
+        parentOffset = rootNodeRE.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset()
+
+      // Subtract element margins
+      // note: when an element has margin: auto the offsetLeft and marginLeft
+      // are the same in Safari causing offset.left to incorrectly be 0
+      offset.top  -= parseFloat( $(elem).css('margin-top') ) || 0
+      offset.left -= parseFloat( $(elem).css('margin-left') ) || 0
+
+      // Add offsetParent borders
+      parentOffset.top  += parseFloat( $(offsetParent[0]).css('border-top-width') ) || 0
+      parentOffset.left += parseFloat( $(offsetParent[0]).css('border-left-width') ) || 0
+
+      // Subtract the two offsets
+      return {
+        top:  offset.top  - parentOffset.top,
+        left: offset.left - parentOffset.left
+      }
+    },
+    offsetParent: function() {
+      return this.map(function(){
+        var parent = this.offsetParent || document.body
+        while (parent && !rootNodeRE.test(parent.nodeName) && $(parent).css("position") == "static")
+          parent = parent.offsetParent
+        return parent
+      })
+    }
+  }
+
+  // for now
+  $.fn.detach = $.fn.remove
+
+  // Generate the `width` and `height` functions
+  ;['width', 'height'].forEach(function(dimension){
+    var dimensionProperty =
+      dimension.replace(/./, function(m){ return m[0].toUpperCase() })
+
+    $.fn[dimension] = function(value){
+      var offset, el = this[0]
+      if (value === undefined) return isWindow(el) ? el['inner' + dimensionProperty] :
+        isDocument(el) ? el.documentElement['scroll' + dimensionProperty] :
+        (offset = this.offset()) && offset[dimension]
+      else return this.each(function(idx){
+        el = $(this)
+        el.css(dimension, funcArg(this, value, idx, el[dimension]()))
+      })
+    }
+  })
+
+  function traverseNode(node, fun) {
+    fun(node)
+    for (var i = 0, len = node.childNodes.length; i < len; i++)
+      traverseNode(node.childNodes[i], fun)
+  }
+
+  // Generate the `after`, `prepend`, `before`, `append`,
+  // `insertAfter`, `insertBefore`, `appendTo`, and `prependTo` methods.
+  adjacencyOperators.forEach(function(operator, operatorIndex) {
+    var inside = operatorIndex % 2 //=> prepend, append
+
+    $.fn[operator] = function(){
+      // arguments can be nodes, arrays of nodes, Zepto objects and HTML strings
+      var argType, nodes = $.map(arguments, function(arg) {
+            argType = type(arg)
+            return argType == "object" || argType == "array" || arg == null ?
+              arg : zepto.fragment(arg)
+          }),
+          parent, copyByClone = this.length > 1
+      if (nodes.length < 1) return this
+
+      return this.each(function(_, target){
+        parent = inside ? target : target.parentNode
+
+        // convert all methods to a "before" operation
+        target = operatorIndex == 0 ? target.nextSibling :
+                 operatorIndex == 1 ? target.firstChild :
+                 operatorIndex == 2 ? target :
+                 null
+
+        var parentInDocument = $.contains(document.documentElement, parent)
+
+        nodes.forEach(function(node){
+          if (copyByClone) node = node.cloneNode(true)
+          else if (!parent) return $(node).remove()
+
+          parent.insertBefore(node, target)
+          if (parentInDocument) traverseNode(node, function(el){
+            if (el.nodeName != null && el.nodeName.toUpperCase() === 'SCRIPT' &&
+               (!el.type || el.type === 'text/javascript') && !el.src)
+              window['eval'].call(window, el.innerHTML)
+          })
+        })
+      })
+    }
+
+    // after    => insertAfter
+    // prepend  => prependTo
+    // before   => insertBefore
+    // append   => appendTo
+    $.fn[inside ? operator+'To' : 'insert'+(operatorIndex ? 'Before' : 'After')] = function(html){
+      $(html)[operator](this)
+      return this
+    }
+  })
+
+  zepto.Z.prototype = $.fn
+
+  // Export internal API functions in the `$.zepto` namespace
+  zepto.uniq = uniq
+  zepto.deserializeValue = deserializeValue
+  $.zepto = zepto
+
+  return $
+})()
+
+window.Zepto = Zepto
+window.$ === undefined && (window.$ = Zepto)
+
+;(function($){
+  var _zid = 1, undefined,
+      slice = Array.prototype.slice,
+      isFunction = $.isFunction,
+      isString = function(obj){ return typeof obj == 'string' },
+      handlers = {},
+      specialEvents={},
+      focusinSupported = 'onfocusin' in window,
+      focus = { focus: 'focusin', blur: 'focusout' },
+      hover = { mouseenter: 'mouseover', mouseleave: 'mouseout' }
+
+  specialEvents.click = specialEvents.mousedown = specialEvents.mouseup = specialEvents.mousemove = 'MouseEvents'
+
+  function zid(element) {
+    return element._zid || (element._zid = _zid++)
+  }
+  function findHandlers(element, event, fn, selector) {
+    event = parse(event)
+    if (event.ns) var matcher = matcherFor(event.ns)
+    return (handlers[zid(element)] || []).filter(function(handler) {
+      return handler
+        && (!event.e  || handler.e == event.e)
+        && (!event.ns || matcher.test(handler.ns))
+        && (!fn       || zid(handler.fn) === zid(fn))
+        && (!selector || handler.sel == selector)
+    })
+  }
+  function parse(event) {
+    var parts = ('' + event).split('.')
+    return {e: parts[0], ns: parts.slice(1).sort().join(' ')}
+  }
+  function matcherFor(ns) {
+    return new RegExp('(?:^| )' + ns.replace(' ', ' .* ?') + '(?: |$)')
+  }
+
+  function eventCapture(handler, captureSetting) {
+    return handler.del &&
+      (!focusinSupported && (handler.e in focus)) ||
+      !!captureSetting
+  }
+
+  function realEvent(type) {
+    return hover[type] || (focusinSupported && focus[type]) || type
+  }
+
+  function add(element, events, fn, data, selector, delegator, capture){
+    var id = zid(element), set = (handlers[id] || (handlers[id] = []))
+    events.split(/\s/).forEach(function(event){
+      if (event == 'ready') return $(document).ready(fn)
+      var handler   = parse(event)
+      handler.fn    = fn
+      handler.sel   = selector
+      // emulate mouseenter, mouseleave
+      if (handler.e in hover) fn = function(e){
+        var related = e.relatedTarget
+        if (!related || (related !== this && !$.contains(this, related)))
+          return handler.fn.apply(this, arguments)
+      }
+      handler.del   = delegator
+      var callback  = delegator || fn
+      handler.proxy = function(e){
+        e = compatible(e)
+        if (e.isImmediatePropagationStopped()) return
+        e.data = data
+        var result = callback.apply(element, e._args == undefined ? [e] : [e].concat(e._args))
+        if (result === false) e.preventDefault(), e.stopPropagation()
+        return result
+      }
+      handler.i = set.length
+      set.push(handler)
+      if ('addEventListener' in element)
+        element.addEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
+    })
+  }
+  function remove(element, events, fn, selector, capture){
+    var id = zid(element)
+    ;(events || '').split(/\s/).forEach(function(event){
+      findHandlers(element, event, fn, selector).forEach(function(handler){
+        delete handlers[id][handler.i]
+      if ('removeEventListener' in element)
+        element.removeEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
+      })
+    })
+  }
+
+  $.event = { add: add, remove: remove }
+
+  $.proxy = function(fn, context) {
+    var args = (2 in arguments) && slice.call(arguments, 2)
+    if (isFunction(fn)) {
+      var proxyFn = function(){ return fn.apply(context, args ? args.concat(slice.call(arguments)) : arguments) }
+      proxyFn._zid = zid(fn)
+      return proxyFn
+    } else if (isString(context)) {
+      if (args) {
+        args.unshift(fn[context], fn)
+        return $.proxy.apply(null, args)
+      } else {
+        return $.proxy(fn[context], fn)
+      }
+    } else {
+      throw new TypeError("expected function")
+    }
+  }
+
+  $.fn.bind = function(event, data, callback){
+    return this.on(event, data, callback)
+  }
+  $.fn.unbind = function(event, callback){
+    return this.off(event, callback)
+  }
+  $.fn.one = function(event, selector, data, callback){
+    return this.on(event, selector, data, callback, 1)
+  }
+
+  var returnTrue = function(){return true},
+      returnFalse = function(){return false},
+      ignoreProperties = /^([A-Z]|returnValue$|layer[XY]$)/,
+      eventMethods = {
+        preventDefault: 'isDefaultPrevented',
+        stopImmediatePropagation: 'isImmediatePropagationStopped',
+        stopPropagation: 'isPropagationStopped'
+      }
+
+  function compatible(event, source) {
+    if (source || !event.isDefaultPrevented) {
+      source || (source = event)
+
+      $.each(eventMethods, function(name, predicate) {
+        var sourceMethod = source[name]
+        event[name] = function(){
+          this[predicate] = returnTrue
+          return sourceMethod && sourceMethod.apply(source, arguments)
+        }
+        event[predicate] = returnFalse
+      })
+
+      if (source.defaultPrevented !== undefined ? source.defaultPrevented :
+          'returnValue' in source ? source.returnValue === false :
+          source.getPreventDefault && source.getPreventDefault())
+        event.isDefaultPrevented = returnTrue
+    }
+    return event
+  }
+
+  function createProxy(event) {
+    var key, proxy = { originalEvent: event }
+    for (key in event)
+      if (!ignoreProperties.test(key) && event[key] !== undefined) proxy[key] = event[key]
+
+    return compatible(proxy, event)
+  }
+
+  $.fn.delegate = function(selector, event, callback){
+    return this.on(event, selector, callback)
+  }
+  $.fn.undelegate = function(selector, event, callback){
+    return this.off(event, selector, callback)
+  }
+
+  $.fn.live = function(event, callback){
+    $(document.body).delegate(this.selector, event, callback)
+    return this
+  }
+  $.fn.die = function(event, callback){
+    $(document.body).undelegate(this.selector, event, callback)
+    return this
+  }
+
+  $.fn.on = function(event, selector, data, callback, one){
+    var autoRemove, delegator, $this = this
+    if (event && !isString(event)) {
+      $.each(event, function(type, fn){
+        $this.on(type, selector, data, fn, one)
+      })
+      return $this
+    }
+
+    if (!isString(selector) && !isFunction(callback) && callback !== false)
+      callback = data, data = selector, selector = undefined
+    if (isFunction(data) || data === false)
+      callback = data, data = undefined
+
+    if (callback === false) callback = returnFalse
+
+    return $this.each(function(_, element){
+      if (one) autoRemove = function(e){
+        remove(element, e.type, callback)
+        return callback.apply(this, arguments)
+      }
+
+      if (selector) delegator = function(e){
+        var evt, match = $(e.target).closest(selector, element).get(0)
+        if (match && match !== element) {
+          evt = $.extend(createProxy(e), {currentTarget: match, liveFired: element})
+          return (autoRemove || callback).apply(match, [evt].concat(slice.call(arguments, 1)))
+        }
+      }
+
+      add(element, event, callback, data, selector, delegator || autoRemove)
+    })
+  }
+  $.fn.off = function(event, selector, callback){
+    var $this = this
+    if (event && !isString(event)) {
+      $.each(event, function(type, fn){
+        $this.off(type, selector, fn)
+      })
+      return $this
+    }
+
+    if (!isString(selector) && !isFunction(callback) && callback !== false)
+      callback = selector, selector = undefined
+
+    if (callback === false) callback = returnFalse
+
+    return $this.each(function(){
+      remove(this, event, callback, selector)
+    })
+  }
+
+  $.fn.trigger = function(event, args){
+    event = (isString(event) || $.isPlainObject(event)) ? $.Event(event) : compatible(event)
+    event._args = args
+    return this.each(function(){
+      // handle focus(), blur() by calling them directly
+      if (event.type in focus && typeof this[event.type] == "function") this[event.type]()
+      // items in the collection might not be DOM elements
+      else if ('dispatchEvent' in this) this.dispatchEvent(event)
+      else $(this).triggerHandler(event, args)
+    })
+  }
+
+  // triggers event handlers on current element just as if an event occurred,
+  // doesn't trigger an actual event, doesn't bubble
+  $.fn.triggerHandler = function(event, args){
+    var e, result
+    this.each(function(i, element){
+      e = createProxy(isString(event) ? $.Event(event) : event)
+      e._args = args
+      e.target = element
+      $.each(findHandlers(element, event.type || event), function(i, handler){
+        result = handler.proxy(e)
+        if (e.isImmediatePropagationStopped()) return false
+      })
+    })
+    return result
+  }
+
+  // shortcut methods for `.bind(event, fn)` for each event type
+  ;('focusin focusout focus blur load resize scroll unload click dblclick '+
+  'mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave '+
+  'change select keydown keypress keyup error').split(' ').forEach(function(event) {
+    $.fn[event] = function(callback) {
+      return (0 in arguments) ?
+        this.bind(event, callback) :
+        this.trigger(event)
+    }
+  })
+
+  $.Event = function(type, props) {
+    if (!isString(type)) props = type, type = props.type
+    var event = document.createEvent(specialEvents[type] || 'Events'), bubbles = true
+    if (props) for (var name in props) (name == 'bubbles') ? (bubbles = !!props[name]) : (event[name] = props[name])
+    event.initEvent(type, bubbles, true)
+    return compatible(event)
+  }
+
+})(Zepto)
+
+;(function($){
+  var jsonpID = 0,
+      document = window.document,
+      key,
+      name,
+      rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+      scriptTypeRE = /^(?:text|application)\/javascript/i,
+      xmlTypeRE = /^(?:text|application)\/xml/i,
+      jsonType = 'application/json',
+      htmlType = 'text/html',
+      blankRE = /^\s*$/,
+      originAnchor = document.createElement('a')
+
+  originAnchor.href = window.location.href
+
+  // trigger a custom event and return false if it was cancelled
+  function triggerAndReturn(context, eventName, data) {
+    var event = $.Event(eventName)
+    $(context).trigger(event, data)
+    return !event.isDefaultPrevented()
+  }
+
+  // trigger an Ajax "global" event
+  function triggerGlobal(settings, context, eventName, data) {
+    if (settings.global) return triggerAndReturn(context || document, eventName, data)
+  }
+
+  // Number of active Ajax requests
+  $.active = 0
+
+  function ajaxStart(settings) {
+    if (settings.global && $.active++ === 0) triggerGlobal(settings, null, 'ajaxStart')
+  }
+  function ajaxStop(settings) {
+    if (settings.global && !(--$.active)) triggerGlobal(settings, null, 'ajaxStop')
+  }
+
+  // triggers an extra global event "ajaxBeforeSend" that's like "ajaxSend" but cancelable
+  function ajaxBeforeSend(xhr, settings) {
+    var context = settings.context
+    if (settings.beforeSend.call(context, xhr, settings) === false ||
+        triggerGlobal(settings, context, 'ajaxBeforeSend', [xhr, settings]) === false)
+      return false
+
+    triggerGlobal(settings, context, 'ajaxSend', [xhr, settings])
+  }
+  function ajaxSuccess(data, xhr, settings, deferred) {
+    var context = settings.context, status = 'success'
+    settings.success.call(context, data, status, xhr)
+    if (deferred) deferred.resolveWith(context, [data, status, xhr])
+    triggerGlobal(settings, context, 'ajaxSuccess', [xhr, settings, data])
+    ajaxComplete(status, xhr, settings)
+  }
+  // type: "timeout", "error", "abort", "parsererror"
+  function ajaxError(error, type, xhr, settings, deferred) {
+    var context = settings.context
+    settings.error.call(context, xhr, type, error)
+    if (deferred) deferred.rejectWith(context, [xhr, type, error])
+    triggerGlobal(settings, context, 'ajaxError', [xhr, settings, error || type])
+    ajaxComplete(type, xhr, settings)
+  }
+  // status: "success", "notmodified", "error", "timeout", "abort", "parsererror"
+  function ajaxComplete(status, xhr, settings) {
+    var context = settings.context
+    settings.complete.call(context, xhr, status)
+    triggerGlobal(settings, context, 'ajaxComplete', [xhr, settings])
+    ajaxStop(settings)
+  }
+
+  // Empty function, used as default callback
+  function empty() {}
+
+  $.ajaxJSONP = function(options, deferred){
+    if (!('type' in options)) return $.ajax(options)
+
+    var _callbackName = options.jsonpCallback,
+      callbackName = ($.isFunction(_callbackName) ?
+        _callbackName() : _callbackName) || ('jsonp' + (++jsonpID)),
+      script = document.createElement('script'),
+      originalCallback = window[callbackName],
+      responseData,
+      abort = function(errorType) {
+        $(script).triggerHandler('error', errorType || 'abort')
+      },
+      xhr = { abort: abort }, abortTimeout
+
+    if (deferred) deferred.promise(xhr)
+
+    $(script).on('load error', function(e, errorType){
+      clearTimeout(abortTimeout)
+      $(script).off().remove()
+
+      if (e.type == 'error' || !responseData) {
+        ajaxError(null, errorType || 'error', xhr, options, deferred)
+      } else {
+        ajaxSuccess(responseData[0], xhr, options, deferred)
+      }
+
+      window[callbackName] = originalCallback
+      if (responseData && $.isFunction(originalCallback))
+        originalCallback(responseData[0])
+
+      originalCallback = responseData = undefined
+    })
+
+    if (ajaxBeforeSend(xhr, options) === false) {
+      abort('abort')
+      return xhr
+    }
+
+    window[callbackName] = function(){
+      responseData = arguments
+    }
+
+    script.src = options.url.replace(/\?(.+)=\?/, '?$1=' + callbackName)
+    document.head.appendChild(script)
+
+    if (options.timeout > 0) abortTimeout = setTimeout(function(){
+      abort('timeout')
+    }, options.timeout)
+
+    return xhr
+  }
+
+  $.ajaxSettings = {
+    // Default type of request
+    type: 'GET',
+    // Callback that is executed before request
+    beforeSend: empty,
+    // Callback that is executed if the request succeeds
+    success: empty,
+    // Callback that is executed the the server drops error
+    error: empty,
+    // Callback that is executed on request complete (both: error and success)
+    complete: empty,
+    // The context for the callbacks
+    context: null,
+    // Whether to trigger "global" Ajax events
+    global: true,
+    // Transport
+    xhr: function () {
+      return new window.XMLHttpRequest()
+    },
+    // MIME types mapping
+    // IIS returns Javascript as "application/x-javascript"
+    accepts: {
+      script: 'text/javascript, application/javascript, application/x-javascript',
+      json:   jsonType,
+      xml:    'application/xml, text/xml',
+      html:   htmlType,
+      text:   'text/plain'
+    },
+    // Whether the request is to another domain
+    crossDomain: false,
+    // Default timeout
+    timeout: 0,
+    // Whether data should be serialized to string
+    processData: true,
+    // Whether the browser should be allowed to cache GET responses
+    cache: true
+  }
+
+  function mimeToDataType(mime) {
+    if (mime) mime = mime.split(';', 2)[0]
+    return mime && ( mime == htmlType ? 'html' :
+      mime == jsonType ? 'json' :
+      scriptTypeRE.test(mime) ? 'script' :
+      xmlTypeRE.test(mime) && 'xml' ) || 'text'
+  }
+
+  function appendQuery(url, query) {
+    if (query == '') return url
+    return (url + '&' + query).replace(/[&?]{1,2}/, '?')
+  }
+
+  // serialize payload and append it to the URL for GET requests
+  function serializeData(options) {
+    if (options.processData && options.data && $.type(options.data) != "string")
+      options.data = $.param(options.data, options.traditional)
+    if (options.data && (!options.type || options.type.toUpperCase() == 'GET'))
+      options.url = appendQuery(options.url, options.data), options.data = undefined
+  }
+
+  $.ajax = function(options){
+    var settings = $.extend({}, options || {}),
+        deferred = $.Deferred && $.Deferred(),
+        urlAnchor
+    for (key in $.ajaxSettings) if (settings[key] === undefined) settings[key] = $.ajaxSettings[key]
+
+    ajaxStart(settings)
+
+    if (!settings.crossDomain) {
+      urlAnchor = document.createElement('a')
+      urlAnchor.href = settings.url
+      urlAnchor.href = urlAnchor.href
+      settings.crossDomain = (originAnchor.protocol + '//' + originAnchor.host) !== (urlAnchor.protocol + '//' + urlAnchor.host)
+    }
+
+    if (!settings.url) settings.url = window.location.toString()
+    serializeData(settings)
+
+    var dataType = settings.dataType, hasPlaceholder = /\?.+=\?/.test(settings.url)
+    if (hasPlaceholder) dataType = 'jsonp'
+
+    if (settings.cache === false || (
+         (!options || options.cache !== true) &&
+         ('script' == dataType || 'jsonp' == dataType)
+        ))
+      settings.url = appendQuery(settings.url, '_=' + Date.now())
+
+    if ('jsonp' == dataType) {
+      if (!hasPlaceholder)
+        settings.url = appendQuery(settings.url,
+          settings.jsonp ? (settings.jsonp + '=?') : settings.jsonp === false ? '' : 'callback=?')
+      return $.ajaxJSONP(settings, deferred)
+    }
+
+    var mime = settings.accepts[dataType],
+        headers = { },
+        setHeader = function(name, value) { headers[name.toLowerCase()] = [name, value] },
+        protocol = /^([\w-]+:)\/\//.test(settings.url) ? RegExp.$1 : window.location.protocol,
+        xhr = settings.xhr(),
+        nativeSetHeader = xhr.setRequestHeader,
+        abortTimeout
+
+    if (deferred) deferred.promise(xhr)
+
+    if (!settings.crossDomain) setHeader('X-Requested-With', 'XMLHttpRequest')
+    setHeader('Accept', mime || '*/*')
+    if (mime = settings.mimeType || mime) {
+      if (mime.indexOf(',') > -1) mime = mime.split(',', 2)[0]
+      xhr.overrideMimeType && xhr.overrideMimeType(mime)
+    }
+    if (settings.contentType || (settings.contentType !== false && settings.data && settings.type.toUpperCase() != 'GET'))
+      setHeader('Content-Type', settings.contentType || 'application/x-www-form-urlencoded')
+
+    if (settings.headers) for (name in settings.headers) setHeader(name, settings.headers[name])
+    xhr.setRequestHeader = setHeader
+
+    xhr.onreadystatechange = function(){
+      if (xhr.readyState == 4) {
+        xhr.onreadystatechange = empty
+        clearTimeout(abortTimeout)
+        var result, error = false
+        if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304 || (xhr.status == 0 && protocol == 'file:')) {
+          dataType = dataType || mimeToDataType(settings.mimeType || xhr.getResponseHeader('content-type'))
+          result = xhr.responseText
+
+          try {
+            // http://perfectionkills.com/global-eval-what-are-the-options/
+            if (dataType == 'script')    (1,eval)(result)
+            else if (dataType == 'xml')  result = xhr.responseXML
+            else if (dataType == 'json') result = blankRE.test(result) ? null : $.parseJSON(result)
+          } catch (e) { error = e }
+
+          if (error) ajaxError(error, 'parsererror', xhr, settings, deferred)
+          else ajaxSuccess(result, xhr, settings, deferred)
+        } else {
+          ajaxError(xhr.statusText || null, xhr.status ? 'error' : 'abort', xhr, settings, deferred)
+        }
+      }
+    }
+
+    if (ajaxBeforeSend(xhr, settings) === false) {
+      xhr.abort()
+      ajaxError(null, 'abort', xhr, settings, deferred)
+      return xhr
+    }
+
+    if (settings.xhrFields) for (name in settings.xhrFields) xhr[name] = settings.xhrFields[name]
+
+    var async = 'async' in settings ? settings.async : true
+    xhr.open(settings.type, settings.url, async, settings.username, settings.password)
+
+    for (name in headers) nativeSetHeader.apply(xhr, headers[name])
+
+    if (settings.timeout > 0) abortTimeout = setTimeout(function(){
+        xhr.onreadystatechange = empty
+        xhr.abort()
+        ajaxError(null, 'timeout', xhr, settings, deferred)
+      }, settings.timeout)
+
+    // avoid sending empty string (#319)
+    xhr.send(settings.data ? settings.data : null)
+    return xhr
+  }
+
+  // handle optional data/success arguments
+  function parseArguments(url, data, success, dataType) {
+    if ($.isFunction(data)) dataType = success, success = data, data = undefined
+    if (!$.isFunction(success)) dataType = success, success = undefined
+    return {
+      url: url
+    , data: data
+    , success: success
+    , dataType: dataType
+    }
+  }
+
+  $.get = function(/* url, data, success, dataType */){
+    return $.ajax(parseArguments.apply(null, arguments))
+  }
+
+  $.post = function(/* url, data, success, dataType */){
+    var options = parseArguments.apply(null, arguments)
+    options.type = 'POST'
+    return $.ajax(options)
+  }
+
+  $.getJSON = function(/* url, data, success */){
+    var options = parseArguments.apply(null, arguments)
+    options.dataType = 'json'
+    return $.ajax(options)
+  }
+
+  $.fn.load = function(url, data, success){
+    if (!this.length) return this
+    var self = this, parts = url.split(/\s/), selector,
+        options = parseArguments(url, data, success),
+        callback = options.success
+    if (parts.length > 1) options.url = parts[0], selector = parts[1]
+    options.success = function(response){
+      self.html(selector ?
+        $('<div>').html(response.replace(rscript, "")).find(selector)
+        : response)
+      callback && callback.apply(self, arguments)
+    }
+    $.ajax(options)
+    return this
+  }
+
+  var escape = encodeURIComponent
+
+  function serialize(params, obj, traditional, scope){
+    var type, array = $.isArray(obj), hash = $.isPlainObject(obj)
+    $.each(obj, function(key, value) {
+      type = $.type(value)
+      if (scope) key = traditional ? scope :
+        scope + '[' + (hash || type == 'object' || type == 'array' ? key : '') + ']'
+      // handle data in serializeArray() format
+      if (!scope && array) params.add(value.name, value.value)
+      // recurse into nested objects
+      else if (type == "array" || (!traditional && type == "object"))
+        serialize(params, value, traditional, key)
+      else params.add(key, value)
+    })
+  }
+
+  $.param = function(obj, traditional){
+    var params = []
+    params.add = function(key, value) {
+      if ($.isFunction(value)) value = value()
+      if (value == null) value = ""
+      this.push(escape(key) + '=' + escape(value))
+    }
+    serialize(params, obj, traditional)
+    return params.join('&').replace(/%20/g, '+')
+  }
+})(Zepto)
+
+;(function($){
+  $.fn.serializeArray = function() {
+    var name, type, result = [],
+      add = function(value) {
+        if (value.forEach) return value.forEach(add)
+        result.push({ name: name, value: value })
+      }
+    if (this[0]) $.each(this[0].elements, function(_, field){
+      type = field.type, name = field.name
+      if (name && field.nodeName.toLowerCase() != 'fieldset' &&
+        !field.disabled && type != 'submit' && type != 'reset' && type != 'button' && type != 'file' &&
+        ((type != 'radio' && type != 'checkbox') || field.checked))
+          add($(field).val())
+    })
+    return result
+  }
+
+  $.fn.serialize = function(){
+    var result = []
+    this.serializeArray().forEach(function(elm){
+      result.push(encodeURIComponent(elm.name) + '=' + encodeURIComponent(elm.value))
+    })
+    return result.join('&')
+  }
+
+  $.fn.submit = function(callback) {
+    if (0 in arguments) this.bind('submit', callback)
+    else if (this.length) {
+      var event = $.Event('submit')
+      this.eq(0).trigger(event)
+      if (!event.isDefaultPrevented()) this.get(0).submit()
+    }
+    return this
+  }
+
+})(Zepto)
+
+;(function($){
+  // __proto__ doesn't exist on IE<11, so redefine
+  // the Z function to use object extension instead
+  if (!('__proto__' in {})) {
+    $.extend($.zepto, {
+      Z: function(dom, selector){
+        dom = dom || []
+        $.extend(dom, $.fn)
+        dom.selector = selector || ''
+        dom.__Z = true
+        return dom
+      },
+      // this is a kludge but works
+      isZ: function(object){
+        return $.type(object) === 'array' && '__Z' in object
+      }
+    })
+  }
+
+  // getComputedStyle shouldn't freak out when called
+  // without a valid element as argument
+  try {
+    getComputedStyle(undefined)
+  } catch(e) {
+    var nativeGetComputedStyle = getComputedStyle;
+    window.getComputedStyle = function(element){
+      try {
+        return nativeGetComputedStyle(element)
+      } catch(e) {
+        return null
+      }
+    }
+  }
+})(Zepto)

+ 26 - 18
src/jfw/modules/app/src/web/templates/me/index.html

@@ -160,7 +160,7 @@
 				display: block;
 				margin-top: -63px;
 			}
-			.no_set_email{
+			.setEmail{
 				margin-left: 5.75rem !important;
 			    font-size: 14px !important;
 			    color: #686868 !important;
@@ -200,18 +200,18 @@
 		</div>
 		<!--通知end-->
 		
-		<!--vip订阅开始
-			<div class="vip">
-				<ul>
-					<li class="vip_">
-					<img src="/jyapp/me/images/vip.svg" class="vipimg"/>
-						<a class="vipa">VIP订阅</a>
-						<i class="redspot"></i>
-						<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-					</li>			
-				</ul>
-			</div>
-		-->
+		<!--vip订阅开始-->
+		<div class="vip">
+			<ul>
+				<li class="vip_">
+				<img src="/jyapp/me/images/vip.svg" class="vipimg"/>
+					<a class="vipa">VIP订阅</a>
+					<i class="redspot"></i>
+					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
+				</li>			
+			</ul>
+		</div>
+		
 		<!--vip订阅结束-->
 		
 		<!--我的订单-->
@@ -234,14 +234,12 @@
 					<i class="redspot"></i>
 					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 				</li>	
-			<!--				
 				<li class="myEmail">
 					<img src="/jyapp/me/images/email.svg" class="emailimg"/>
-					<a class="emaila">邮箱地址 {{if .T.isNoEmail}}<span class="no_set_email">未绑定</span>{{end}}</a>
+					<a class="emaila">邮箱地址 <span class="setEmail"></span></a>
 					<i class="redspot"></i>
 					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>	
-			-->		
+				</li>			
 			</ul>
 		</div>
 		<!--我的关注start-->
@@ -379,7 +377,7 @@
 		
 		//邮箱设置
 		$(".myEmail").click(function(){
-			window.location.href = "#";
+			window.location.href = "/jyapp/front/myorder/myEmail";
 		})
 		//vip订阅入口
 		$(".vip_").click(function(){
@@ -456,6 +454,16 @@
 		function person_infor(){
 			window.location.href="#";
 		}
+		$(function(){
+			var nowTimestamp= (new Date()).valueOf();
+			$.post("/subscribepay/orderListDetails/emailOperation?v="+nowTimestamp,{},function(r){
+				if (r.success){
+					$(".setEmail").html("未设置");
+				}else{
+					$(".setEmail").html("");
+				}
+			})
+		})
 	</script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}

+ 74 - 20
src/jfw/modules/app/src/web/templates/me/setemail/bind_email.html

@@ -2,12 +2,17 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
		{{if .T.text_email}}
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		{{if .T.text_email}}
 		<title>修改邮箱</title>
 		{{else}}
 		<title>我的邮箱</title>
-		{{end}}
		<meta name="Keywords" content="绑定邮箱"/>
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+		{{end}}
+		<meta name="Keywords" content="绑定邮箱"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/myemail/css/reset.css?v={{Msg "seo" "version"}}"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/myemail/css/common.css?v={{Msg "seo" "version"}}"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/myemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
 	</head>
 	<body>
@@ -23,24 +28,60 @@
 			    display: none;
 			}
 		</style>
-		<div class="bind_email">
			<div class="input mgT26">
				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
				<button class="sendcode" >获取验证码</button>
+		<div class="bind_email">
+			<div class="input mgT26">
+				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
+				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
+				<button class="sendcode" >获取验证码</button>
 				<button class="code_true"><i class="icon iconfont email_check_ok" style="display: inline;"></i></button>
-				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
			</div>
			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
			<div class="toast" style="display: none;">
				<div class="toast_content"></div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
		<script>
			$(function(){
				var emailVal,code;
-				var userId={{.T.userId}}
				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
+				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
+			</div>
+			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
+			<div class="toast" style="display: none;">
+				<div class="toast_content"></div>
+			</div>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/jyapp/myemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
+		<script src="{{Msg "seo" "cdn"}}/jyapp/myemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
+		<script>
+			$(function(){
+				var emailVal,code;
+				var userId={{.T.userId}}
+				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
 				//判断是否是更改邮箱;
 				var param = getParam('name');
+				var orderCode=getParam("orderCode");
 				if (param=="change"){
 					$(".email_input").attr("placeholder",{{.T.text_email}})
 					$("#bindBtn").html("确定");
 				}else if(param == "unbind"){
 					promptbox("解绑成功");
 				}
-				//
				$('.sendcode').on('click',function(){
-					var that =this;
					emailVal = $('.email_input').val();
					let isEmail = reg.test(emailVal);//正则验证邮箱号
					if($.trim(emailVal) === ''){
-						promptbox('邮箱号不能为空');
					}else if(isEmail === false){
						promptbox('邮箱格式不正确');
					}else{
+				
+				$(".email_input").bind('input propertychange',()=>{
+					if((sessionStorage.getItem("send_myemail_"+userId)!=null)&&(sessionStorage.getItem("send_myemail_"+userId)!="")){
+						if((sessionStorage.getItem("send_myemail_"+userId))!= $('.email_input').val()){
+							$('.sendcode').prop("disabled","disabled");
+						}else{
+							sessionStorage.removeItem("send_myemail_"+userId);
+							$('.sendcode').removeAttr("disabled");
+						}
+					}
+				})
+				
+				//
+				$('.sendcode').on('click',function(){
+					var that =this;
+					emailVal = $('.email_input').val();
+					let isEmail = reg.test(emailVal);//正则验证邮箱号
+					if($.trim(emailVal) === ''){
+						promptbox('邮箱号不能为空');
+					}else if(isEmail === false){
+						promptbox('邮箱格式不正确');
+					}else{
 						$.post("/subscribepay/orderListDetails/setEmail",{"email":emailVal},function(data){
 							userId=data.userId;
-							//发送成功
+							//发送成功
 							if(data.success){
 								sendCode(that,300);
 								$(".sendCode").prop("disabled","disabled");
@@ -55,12 +96,13 @@
 									sendCode(that,data.time);
 									$(".email_input").attr("readonly",true);
 									//发送验证码后 sessionStorage邮箱 
-									sessionStorage.setItem("send_email_"+userId, $(".email_input").val().replace(/\s*/g,""));
+								sessionStorage.setItem("send_myemail_"+userId, $(".email_input").val().replace(/\s*/g,""));
 								}
 								promptbox(data.errMsg);
-							}
-						})
-						//验证码校验
						$('.code_input').bind('input propertychange',()=>{
+							}
+						});
+						//验证码校验
+						$('.code_input').bind('input propertychange',()=>{
 							var verity=$(".code_input").val();
 							var email=$(".email_input").val().replace(/\s*/g,"");
 							if(verity.length==6){
@@ -79,7 +121,8 @@
 										promptbox("邮箱验证码错误");
 									}
 								});
-							}
						}).on("blur",()=>{
+							}
+						}).on("blur",()=>{
 							var code_input_len=$(".code_input").val().length
 							if((code_input_len!=6)&&(code_input_len!=0)){
 								$(".code_true").hide();
@@ -90,21 +133,28 @@
 						
 						//绑定
 						$("#bindBtn").on("click",function(){
-							
 							$.post("/subscribepay/orderListDetails/emailOperation",{
 								"operation":"binding",
 								"email":$(".email_input").val()
 								},function(data){
 								if(data.success){
 									if ($("#bindBtn").text()=="确定"){	//更改绑定
+										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 										window.location.replace("/front/wxMyOrder/setSuccess?name=changeEmail"); 
 									}else{
-										sessionStorage.setItem("setSuccess",userId+"_emailOk"); //我的页面
-										window.location.replace("/front/wxMyOrder/setSuccess?name=bindEmail"); 
+										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
+										if((param="invoice")&&(orderCode!=null)){
+											window.location.replace("/front/wxMyOrder/setSuccess?name=invoice&orderCode="+orderCode); 
+										}else{
+											window.location.replace("/front/wxMyOrder/setSuccess?name=bindEmail"); 
+										}
 									}
 								}
 							})
-						})
					}
				})
			})
+						})
+					}
+				})
+			})
 			
 			//提示框
 			function promptbox(str){
@@ -113,5 +163,9 @@
 				setTimeout(() =>{
 					$('.toast').hide(400);
 				},1500)
-			}
		</script>
	</body>
+			}
+		</script>
+		
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

+ 71 - 6
src/jfw/modules/app/src/web/templates/me/setemail/bind_success.html

@@ -1,14 +1,79 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<meta charset="utf-8">
		<title>绑定成功</title>
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta charset="utf-8">
+		<title>绑定成功</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>    
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>   
+		{{include "/common/weixin.html"}}
+		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>    
 	</head>
 	<body>
-		<div class="bind_success">
			<div class="success">
				<img src="{{Msg "seo" "cdn"}}/wxmyemail/img/successed.png" >
				<p></p>
			</div>
			<button class="common_btn back">返回 <time class="time">()</time> </button>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
		<script>
			$(function(){
				let param = getParam('name');//获取url传来的参数 判断显示成功的字幕
				console.log(param)
				var time = 6;
				function countDown(){
					if(time == 0){
						$('.time').html('');
						window.location.replace('/front/wxMyOrder/myEmail');
					}else{
						$('.time').html('(' + time + ')');
						time--;
						setTimeout(()=>{
							countDown()
						},1000)
					}
				}
				if(param == 'bindEmail'){
					$('.success>p').html('邮箱绑定成功')
					countDown()
				}else if(param == 'bindPhoe'){
					$('.success>p').html('手机号绑定成功')
					countDown()
				}else if(param == 'changeEmail'){
					$('.success>p').html('邮箱更换成功')
					countDown()
				}else if(param == 'choosePhone'){
					$('.success>p').html('手机号更换成功')
					countDown()
				}else if(param =="unbind"){
-					$('.success>p').html('邮箱解绑成功')
-					countDown()
-				}
				/* 返回 */
				$('.back').on('click',() =>{
					window.location.replace('/front/wxMyOrder/myEmail');
				})
			})
		</script>
	</body>
+		<div class="bind_success">
+			<div class="success">
+				<img src="{{Msg "seo" "cdn"}}/wxmyemail/img/successed.png" >
+				<p></p>
+			</div>
+			<button class="common_btn back">返回 <time class="time">()</time> </button>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
+		<script>
+			$(function(){
+				//分享
+				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+				
+				let param = getParam('name');//获取url传来的参数 判断显示成功的字幕
+				var orderCode=getParam("orderCode"); //开发票的订单
+				console.log(param)
+				var time = 6;
+				function countDown(){
+					if(time == 0){
+						$('.time').html('');
+						if((param="invoice")&&(orderCode!="")){
+							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
+						}else{
+							window.location.replace('/front/wxMyOrder/myEmail');
+						}
+					}else{
+						$('.time').html('(' + time + ')');
+						time--;
+						setTimeout(()=>{
+							countDown()
+						},1000)
+					}
+				}
+				if(param == 'bindEmail'){
+					$('.success>p').html('邮箱绑定成功');
+					countDown();
+				}else if(param == 'bindPhoe'){
+					$('.success>p').html('手机号绑定成功');
+					countDown();
+				}else if(param == 'changeEmail'){
+					$('.success>p').html('邮箱更换成功');
+					countDown();
+				}else if(param == 'choosePhone'){
+					$('.success>p').html('手机号更换成功');
+					countDown();
+				}else if(param =="unbind"){
+					$('.success>p').html('邮箱解绑成功');
+					countDown();
+				}else if(param=="invoice"){
+					$('.success>p').html('邮箱绑定成功');
+					countDown();
+				}
+				/* 返回 */
+				$('.back').on('click',() =>{
+					if((param="invoice")&&(orderCode!=null)){
+							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
+						}else{
+							window.location.replace('/jyapp/front/myorder/myEmail');
+						}
+				})
+			})
+		</script>
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

+ 8 - 6
src/jfw/modules/app/src/web/templates/me/setemail/unbind_email.html

@@ -4,15 +4,19 @@
 		<meta charset="utf-8">
 		<title>我的邮箱</title>
		<meta name="keywords" content="更换邮箱 解绑邮箱"/>
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>    
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/> 
+		{{include "/common/weixin.html"}}
+		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>   
 	</head>
 	<body>
-		<div class="unbind_email">
			<div class="input_box mgT26">
				<label>邮箱</label>
				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly"/>
			</div>
			<button type="button" class="common_btn choose_email">更换邮箱</button>
			<p class="text-algin">
				<a href="javascript:;" class="unbind">解绑</a>
			</p>
			
			<!-- 更换邮箱弹框 -->
			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
					<div class="dialog_bd">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
					</div>
				</div>
			</div>
			<!-- 解绑邮箱弹框 -->
			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
					</div>
				</div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script>
			$(function(){
				/* 更换邮箱 */
				$('.choose_email').on('click',() =>{
+		<div class="unbind_email">
			<div class="input_box mgT26">
				<label>邮箱</label>
				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly"/>
			</div>
			<button type="button" class="common_btn choose_email">更换邮箱</button>
			<p class="text-algin">
				<a href="javascript:;" class="unbind">解绑</a>
			</p>
			
			<!-- 更换邮箱弹框 -->
			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
					<div class="dialog_bd">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
					</div>
				</div>
			</div>
			<!-- 解绑邮箱弹框 -->
			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
					</div>
				</div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script>
+			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
			$(function(){
				/* 更换邮箱 */
				$('.choose_email').on('click',() =>{
 					$('#choose_email_dialog').show(400);
 					$("#cancel_choose").on('click',() =>{
 						$('#choose_email_dialog').hide(400);
 					});
 					$('#sure_choose').on('click',() =>{
+						//sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 						window.location.replace("/front/wxMyOrder/myEmail?name=change");
 					});
 				})
@@ -20,10 +24,8 @@
 				
				/* 解绑邮箱 */
				$('.unbind').on('click',() =>{
					$('#unbind_email_dialog').show(4);
					$("#cancel_unbind").on('click',() =>{
						$('#unbind_email_dialog').hide(400);
					});
					$('#sure_unbind').on('click',() =>{
 						$.post("/subscribepay/orderListDetails/emailOperation",{"operation":"unbind","email":{{.T.text_email}}},function(data){
 							if(data.success){
-								//window.location.href="/front/wxMyOrder/setSuccess?name=unbind"; 
-								//window.location.href="/front/wxMyOrder/myEmail?name=unbind";
-								sessionStorage.removeItem("setSuccess");
 								window.location.replace("/front/wxMyOrder/myEmail?name=unbind");
 							}
-						})
					});
				})
				$('.mask').on('click',()=>{
					$('#choose_email_dialog').hide(400);
					$('#unbind_email_dialog').hide(400);
				})
			})
		</script>
	</body>
+						})
					});
				})
				$('.mask').on('click',()=>{
					$('#choose_email_dialog').hide(400);
					$('#unbind_email_dialog').hide(400);
				})
			})
		</script>
+	{{include "/common/baiducc.html"}}
	</body>
 </html>

+ 19 - 1
src/jfw/modules/pushsubscribe/src/push/job/timetask.go

@@ -2,10 +2,14 @@ package job
 
 import (
 	"log"
+	. "public"
 	. "push/config"
 	"qfw/util"
+	"qfw/util/mongodb"
 	"strings"
 	"time"
+
+	"github.com/donnie4w/go-logger/logger"
 )
 
 type TimeTask struct{}
@@ -13,7 +17,21 @@ type TimeTask struct{}
 func (t *TimeTask) Run() {
 	go t.push() //推送
 	go t.move() //迁移数据
-
+	go t.crontab("01:00", func() {
+		logger.Error("开始每天1点删除过期关联项目数据错误。。。")
+		sess := mongodb.GetMgoConn()
+		defer mongodb.DestoryMongoConn(sess)
+		_, err := sess.DB(DbName).C(Pushspace_project).RemoveAll(map[string]interface{}{
+			"createtime": map[string]interface{}{
+				"$lt": time.Now().AddDate(0, -3, 0).Unix(),
+			},
+		})
+		if err != nil {
+			logger.Error("每天1点删除过期关联项目数据错误", err)
+		} else {
+			logger.Error("每天1点删除过期关联项目数据错误结束。。。")
+		}
+	})
 }
 func (t *TimeTask) push() {
 	for _, v := range Config.OtherPushTimes {

+ 9 - 1
src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -99,8 +99,16 @@ func checkIsExpire() {
 						"i_vip_expire_tip": 2,
 					},
 				})
+				delSess := util.MQFW.GetMgoConn()
+				defer util.MQFW.DestoryMongoConn(delSess)
 				for _, pushColl := range []string{"pushspace", "pushspace_temp", "pushspace_vip", "pushspace_fail", "pushspace_project"} {
-					util.MQFW.Del(pushColl, map[string]interface{}{"userid": _id})
+					log.Println("用户", _id, "已到期开始删除", pushColl, "表数据。。。")
+					_, err := delSess.DB("qfw").C(pushColl).RemoveAll(map[string]interface{}{"userid": _id})
+					if err != nil {
+						log.Println("用户", _id, "已到期删除", pushColl, "表数据出错", err)
+					} else {
+						log.Println("用户", _id, "已到期删除", pushColl, "表数据结束。。。")
+					}
 				}
 				log.Println("用户", _id, i_vip_status, l_vip_endtime, "修改已到期状态")
 			} else if l_vip_endtime-now_unix <= threeday && i_vip_expire_tip != 1 && i_vip_expire_tip != -1 {

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -906,7 +906,7 @@
 								var month = 0;
 								if(end_year > start_year){
 						    		if(end_month > start_month){
-					    				year = enend_yeardYear - start_year;
+					    				year = end_year - start_year;
 					    				month = end_month - start_month;
 						    		}else{
 					    				year = end_year - start_year-1;

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -277,7 +277,7 @@ try{
 			var month = 0;
 			if(end_year > start_year){
 	    		if(end_month > start_month){
-    				year = enend_yeardYear - start_year;
+    				year = end_year - start_year;
     				month = end_month - start_month;
 	    		}else{
     				year = end_year - start_year-1;

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_pay_success.html

@@ -34,7 +34,7 @@
 			</div>
 			<div class="bottom_button">
         <button class="left_btn" >查看订单</button>
-        <button class="right_btn" >设置关键词</button>
+        <button class="right_btn" >VIP设置</button>
 			</div>
 		</div>
 	</body>