分支合并

README.md

@@ -4,4 +4,5 @@ weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
 
 v3.12
-P21.2大会员子账号版本
+1.P21.2大会员子账号版本
+2.pc端首页弹窗做成广告位

src/jfw/front/big-member.go

@@ -32,6 +32,7 @@ func (s *BigMemberAction) PcVIPViewPage(htmlName string) {
 	userid, _ := s.GetSession("userId").(string)
 	power, _ := Power(userid)
 	s.T["member_status"] = power
+	s.T["hasAccountsOrder"] = HasAccountsOrder(userid)
 	s.Render("/big-member/pc/page_"+htmlName+".html", &s.T)
 }
 
@@ -43,6 +44,7 @@ func (s *BigMemberAction) WxVIPViewPage(htmlName string) error {
 		htmlName = "index"
 	}
 	s.T["member_status"] = power
+	s.T["hasAccountsOrder"] = HasAccountsOrder(userid)
 	return s.Render("/big-member/wx/page_"+htmlName+".html", &s.T)
 }
 
@@ -61,3 +63,16 @@ func Power(userid string) (int, int) {
 	}
 	return i_member_status, isused
 }
+
+//是否有正在审核中的订单
+func HasAccountsOrder(userId string) bool {
+	if userId == "" {
+		return false
+	}
+	num := public.Mysql.Count("dataexport_order", map[string]interface{}{
+		"user_id":       userId,
+		"order_status":  0,
+		"course_status": 2,
+	})
+	return num > 0
+}

src/jfw/front/supsearch.go

@@ -480,6 +480,7 @@ func Newbids(p string) []interface{} {
 			pages = append(pages, list)
 		}
 		redis.Put("other", "index_list"+p, pages, 60*60*24*2)
+		pages, _ = redis.Get("other", "index_list"+p).([]interface{})
 	}
 	return pages
 }

src/jfw/modules/app/src/app/front/big-member.go

@@ -39,6 +39,12 @@ func (s *BigMemberAction) VIPViewPage(htmlName string) error {
 			return s.Redirect("/jyapp/big/page/init")
 		}
 	}
+	if htmlName == "buy_commit" {
+		userid, _ := s.GetSession("userId").(string)
+		power, _ := Power(userid)
+		s.T["member_status"] = power
+		s.T["hasAccountsOrder"] = HasAccountsOrder(userid)
+	}
 	return s.Render("/big-member/page_" + htmlName + ".html")
 }
 
@@ -57,3 +63,16 @@ func Power(userid string) (int, int) {
 	}
 	return i_member_status, isused
 }
+
+//是否有正在审核中的订单
+func HasAccountsOrder(userId string) bool {
+	if userId == "" {
+		return false
+	}
+	num := public.Mysql.Count("dataexport_order", map[string]interface{}{
+		"user_id":       userId,
+		"order_status":  0,
+		"course_status": 2,
+	})
+	return num > 0
+}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/bigvip_detail.js

@@ -195,7 +195,7 @@ var vNode = {
         // 采购单位行业
         linkInstury:function () {
             sessionStorage.setItem('big-setCate',JSON.stringify(this.insturyarr))
-            var title = encodeURIComponent('采购行业单位')
+            var title = encodeURIComponent('采购单位行业')
             location.href = './set_cate?header='+title+'&callback=setting_save'
         },
         // 关键词

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/page_init.js

@@ -69,7 +69,16 @@ var vNode = {
         searchRival: [],
         listRival: [],
         nowPage: (history.state && history.state.title) || false,
-        ajaxInitData: null,
+        ajaxInitData: {
+            entname: '',
+            industry: {},
+            buyerclass: [],
+            area: {},
+            a_items: [{
+                'a_key': []
+            }],
+            competitor: []
+        },
         sendInitData: {},
         localInitData: {
             entname: '',
@@ -490,6 +499,9 @@ var vNode = {
                 this.initLocalData()
                 this.step.now -= 1
             }
+            if (this.step.now === 2 && i > 0) {
+                this.localInitData.entname = this.inputArr[1].value
+            }
             for(var j = 0;j<this.inputArr.length;j++) {
                 var v = this.inputArr[j]
                 console.log(v, j, v.key, this.step.now, i, (j < this.step.now ? '本机': '重置'))

src/jfw/modules/app/src/web/staticres/jyapp/js/check-bind-phone.js

@@ -231,8 +231,8 @@
                     if (isBindStatus) {
                         sessionStorage.setItem('bind-phone', r.data.phone.trim())
                         dBingNode.hide()
-                        $('*[data-need-bind-phone][data-active-bind]').off('click', checkShow)
-                        $('*[data-need-bind-phone][data-active-bind]').off('touchstart', RefreshBindStatus)
+                        $('*[data-need-bind-phone]').off('click', checkShow)
+                        $('*[data-need-bind-phone]').off('touchstart', RefreshBindStatus)
                         if (e) {
                             $('*[data-need-bind-phone][data-active-bind]').trigger('click')
                         }

src/jfw/modules/app/src/web/templates/big-member/page_buy_commit.html

@@ -124,6 +124,9 @@
 
 <!--小于100行同css，减少请求数-->
 <script>
+    var numberStatus = {{.T.member_status}}
+    var hasAccountsOrder ={{.T.hasAccountsOrder}}
+    console.log({{.T.member_status}},{{.T.hasAccountsOrder}})
    var vNode = {
         delimiters: ['${', '}'],
         el: '#v-commit',
@@ -200,7 +203,7 @@
         },
         computed: {
             confirmDisabled: function () {
-                return !this.checked
+                return !this.checked || (numberStatus > 0 || hasAccountsOrder)
             }
         },
         created () {

src/jfw/modules/app/src/web/templates/big-member/page_memberdetail.html

@@ -170,10 +170,6 @@
                 }
                 //价格
                 $(".price").text("￥ " + formatMoney((r.data.order_money / 100)));
-                if (r.data.pay_money) {
-                    $(".l-item.paymoney").css("display", "");
-                    $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                }
             }
             //
             $(".level_value").text(level_map.get(filterObj.level).get("level"));
@@ -182,16 +178,10 @@
             //
             $(".date_value").text(member_endtime);
             //
-            if (r.data.order_status == 1) {
+            if (r.data.order_status === 1) {
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-                //支付时间
-
-                if (r.data.pay_time) {
-                    $(".line_paytime").css("display", "");
-                    $(".payTime").css("display", "").text(r.data.pay_time.replace("-", "/").replace("-", "/"));
-                }
 
                 //有效周期
                 $(".line_cycle").css("display", "");
@@ -199,7 +189,7 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status == 0) {
+                if (r.data.applybill_status === 0) {
                     //已支付未申请发票
                     pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
                 } else {
@@ -218,12 +208,20 @@
                 } else if (r.data.pay_way === "transferAccounts" && r.data.course_status === 4) {//试用用户
                     $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
                     $(".line_payway").css("display", "");
+
+                    $(".l-item.paymoney").css("display", "");
+                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
                     return
                 } else {//试用用户
                     $(".invoice").css("display", "none");
                     return
                 }
 
+                if (r.data.pay_time) {
+                    $(".line_paytime").css("display", "");
+                    $(".payTime").css("display", "").text(r.data.pay_time.replace("-", "/").replace("-", "/"));
+                }
+
                 $(".line_transaction").css("display", "");
                 if (r.data.prepay_id) $(".transaction_id").text(r.data.prepay_id);
             }
@@ -241,6 +239,9 @@
                     }
                     $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
                     $(".line_payway").css("display", "");
+
+                    $(".l-item.paymoney").css("display", "");
+                    $(".paymoney .price").text("-");
                     return
                 }
 
@@ -406,7 +407,7 @@
         } else if (window.location.host.indexOf("com") > -1) {
             imgSrc = "https://www.qmx.top" + imgSrc
         }
-        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;"><img src="' + imgSrc + '"></div>')
+        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;align-items: center;"><img src="' + imgSrc + '"></div>')
     }
 </script>
 {{include "/common/baiducc.html"}}

src/jfw/modules/app/src/web/templates/commonPay/checkout.html

@@ -243,7 +243,7 @@
                         content: '加载中...',
                     })
                     if (checkout.mode === 'transferAccounts') {
-                        window.location.href = '/jyapp/pay/transferAccounts_{{.T.doType}}?orderCode=' + checkout.orderInfo.ordercode
+                        window.location.replace('/jyapp/pay/transferAccounts_{{.T.doType}}?orderCode=' + checkout.orderInfo.ordercode)
                         return
                     }
                     $.ajax({

src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -676,20 +676,17 @@
                     if (data && data["success"]) {
                         var self = $(obj).parent().parent();
                         var parent = self.parent();
-                        if (self.next().find("a").attr("courseOrder") == "true") {
-                            self.parent().remove();
-                        } else {
-                            deleteIndex = self.index();
-                            dataCache.splice(deleteIndex, 1)
-                            //删除索引存入缓存
-                            sessionStorage.setItem("deleteIndex", deleteIndex);
-                            if (data.res != null) {
-                                dataCache.push(data.res[0])
-                                //hasNextPage=data.hasNextPage;
-                                hasNextPage = data.nextPage;
-                            }
-                            self.remove();
+
+                        deleteIndex = self.index();
+                        dataCache.splice(deleteIndex, 1)
+                        //删除索引存入缓存
+                        sessionStorage.setItem("deleteIndex", deleteIndex);
+                        if (data.res != null) {
+                            dataCache.push(data.res[0])
+                            //hasNextPage=data.hasNextPage;
+                            hasNextPage = data.nextPage;
                         }
+                        parent.remove();
 
                         weui.toast('删除成功', {
                             duration: 1500,
@@ -1107,8 +1104,8 @@
                 if (orderStatus === 0) {
                     orderHtml = ""
                     orderStatus = "待付款"
-                    orderHtml += '<span class="status notpay">' + orderStatus + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>";
+                    orderHtml += '<span class="status notpay">' + orderStatus
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>" + '</span>'
                     iconHtml = ""
                     iconHtml += '<div class="card-footer">'
                         + '<a  class="btn cancle gray-btn" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
@@ -1117,8 +1114,8 @@
                 } else if (orderStatus === 1) {
                     orderStatus = "已完成";
                     orderHtml = ""
-                    orderHtml += '<span class="status finish">' + orderStatus + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>";
+                    orderHtml += '<span class="status finish">' + orderStatus
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>" + '</span>'
                     iconHtml = ""
                     iconHtml += '<div class="card-footer">'
                     //已完成订单 开发票判断  0未申请  1已申请
@@ -1135,8 +1132,8 @@
                 } else if (orderStatus === -2 || orderStatus === -3) {
                     orderStatus = "已取消";
                     orderHtml = "";
-                    orderHtml += '<span class="status status-text">' + orderStatus + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>";
+                    orderHtml += '<span class="status status-text">' + orderStatus
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id + ",this)\"></a>" + '</span>'
                     iconHtml = "";
                     iconHtml += '<div class="card-footer">'
                         + '<a onclick="onceMore(this)" class="btn cancle green-btn">再次购买</a>'
@@ -1487,8 +1484,8 @@
                 if (orderStatus_vip === 0) {
                     orderStatus_vip = "待付款"
                     orderHtml = ""
-                    orderHtml += '<span class="status notpay">' + orderStatus_vip + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>";
+                    orderHtml += '<span class="status notpay">' + orderStatus_vip
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>" + '</span>'
                     iconHtml = ""
                     iconHtml += '<div class="card-footer">'
                         + '<a  class="btn cancle" onclick="cancelOrder(' + id_vip + ',this)">取消订单</a>'
@@ -1497,8 +1494,8 @@
                 } else if (orderStatus_vip === 1) {
                     orderStatus_vip = "已完成";
                     orderHtml = ""
-                    orderHtml += '<span class="status finish">' + orderStatus_vip + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>";
+                    orderHtml += '<span class="status finish">' + orderStatus_vip
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>" + '</span>'
                     iconHtml = ""
                     //最后一次购买完 1:试用 2:正式 -1:试用到期 -2:正式到期
                     if ((vip_status === -2) && (obj.lastbuy_code !== undefined)) {
@@ -1552,8 +1549,8 @@
                 } else if (orderStatus_vip === -2 || orderStatus_vip === -3) {
                     orderStatus_vip = "已取消";
                     orderHtml = "";
-                    orderHtml += '<span class="status">' + orderStatus_vip + '</span>'
-                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>";
+                    orderHtml += '<span class="status">' + orderStatus_vip
+                    orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_vip + ",this)\"></a>" + '</span>'
                     iconHtml = "";
                     iconHtml += '<div class="card-footer">'
                         + '</div>'
@@ -1877,8 +1874,9 @@
                 listhtml += '<div class="card">'
                     + '<div class="card-header">'
                     + '<span class="time">' + createTime + '</span>'
-                    + '<span class="status ' + orderStatusHtmls + '">' + orderStatusHtml + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '">' + orderStatusHtml
                     + '<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>'
+                    + '</span>'
                     + '</div>'
                     + '<div class="card-content">'
                     + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + courseId + '" vid="' + orderCode + '" class="media" courseOnlineOrder="true">'
@@ -1956,8 +1954,9 @@
                 listhtml += '<div class="card">'
                     + '<div class="card-header">'
                     + '<span class="time">' + createTime + '</span>'
-                    + '<span class="status ' + orderStatusHtmls + '">' + orderStatusHtml + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '">' + orderStatusHtml
                     + '<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>'
+                    + '</span>'
                     + '</div>'
                     + '<div class="card-content">'
                     + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + orderCode + '" class="media" datareportOrder="true">'
@@ -2028,12 +2027,14 @@
                 var orderUrl = "/jyapp/big/page/memberdetail?order_code=" + orderCode;
 
                 if (orderStatus === 0) {
+                    var payNameTmp = "去支付"
                     if (obj.pay_way === "transferAccounts") {
                         orderStatusHtmls = "refund";
                         if (obj.course_status === 2) {
                             orderStatusHtml = "转账审核中";
                         } else if (obj.course_status === 3) {
                             orderStatusHtml = "未收到转账";
+                            payNameTmp = "再次支付"
                         }
                     } else {
                         orderStatusHtml = "待付款";
@@ -2042,7 +2043,7 @@
                     if (!(obj.pay_way === "transferAccounts" && (obj.course_status === 2 || obj.course_status === 4))) {
                         lastHtml = '<div class="card-footer">'
                             + '<a class="btn cancle" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
-                            + '<a onclick="setSessionStorage()" href="/jyapp/pay/checkout_member?orderCode=' + orderCode + '" class="btn green-btn">去支付</a>'
+                            + '<a onclick="setSessionStorage()" href="/jyapp/pay/checkout_member?orderCode=' + orderCode + '" class="btn green-btn">' + payNameTmp + '</a>'
                             + '</div>';
                     }
                 } else if (orderStatus === 1) {
@@ -2232,8 +2233,8 @@
         if (order_status_ent === 0) {
             order_status_ent_str = "待付款"
             orderHtml = ""
-            orderHtml += '<span class="status notpay">' + order_status_ent_str + '</span>'
-            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>";
+            orderHtml += '<span class="status notpay">' + order_status_ent_str
+            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>" + '</span>'
             iconHtml = ""
             iconHtml += '<div class="card-footer">'
                 + '<a  class="btn cancle gray-btn" onclick="cancelOrder(' + id_ent + ',this)">取消订单</a>'
@@ -2242,8 +2243,8 @@
         } else if (order_status_ent === 1) {
             order_status_ent_str = "已完成";
             orderHtml = ""
-            orderHtml += '<span class="status finish">' + order_status_ent_str + '</span>'
-            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>";
+            orderHtml += '<span class="status finish">' + order_status_ent_str
+            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>" + '</span>'
             iconHtml = ""
             if (ent_status === false) {
                 iconHtml += '<div class="card-footer">'
@@ -2274,8 +2275,8 @@
         } else if (order_status_ent === -2 || order_status_ent === -3) {
             order_status_ent_str = "已取消";
             orderHtml = "";
-            orderHtml += '<span class="status status-text">' + order_status_ent_str + '</span>'
-            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>";
+            orderHtml += '<span class="status status-text">' + order_status_ent_str
+            orderHtml += "<a class=\"delete_icon\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent + ",this)\"></a>" + '</span>'
             iconHtml = "";
             /* iconHtml+='<div class="card-footer">'
 								+'<a  onclick="renewalOrBuyAgain_ent(1,this)" class="btn cancle">再次购买</a>'*/

src/jfw/modules/app/src/web/templates/commonPay/transferAccountsResult.html

@@ -20,6 +20,12 @@
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet"
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/css/transferAccountsResult.css?v={{Msg "seo" "version"}}">
+    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <style>
+        .weui-toast {
+            width: 7.6em;
+        }
+    </style>
 </head>
 
 <body>
@@ -63,5 +69,7 @@
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 </body>
-
+<script>
+    weui.toast("提交成功")
+</script>
 </html>

src/jfw/modules/app/src/web/templates/structeddata/write_infor.html

@@ -196,11 +196,6 @@ $(function(){
   $('.kf .ipt_name').val('')
   $('.kf .ipt_phone').val('')
 
-  //获取用户手机号
-  var bindPhone = sessionStorage.getItem('bind-phone') || ''
-  if (bindPhone.length === 11) {
-    $("input.ipt_phone").val(bindPhone);
-  }
 
   $(".write_run_now").on("click",function(){
     window.location.href="/jyapp/front/dataExport/toSieve?from=structed"
@@ -474,6 +469,12 @@ $(function(){
       }
 
   })
+
+    //获取用户手机号
+    var bindPhone = sessionStorage.getItem('bind-phone') || ''
+    if (bindPhone.length === 11) {
+        $("input.ipt_phone").val(bindPhone).trigger('blur');
+    }
 })
 
 // 倒计时

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

@@ -502,8 +502,10 @@
           //一分钟缓存 防止重复 请求
           if(localStorage.reportTipTime==undefined||new Date().getTime() - Number(localStorage.reportTipTime)>60*1000||localStorage.reportData==undefined){
             $.post("/subscribepay/report/tip?t=" + new Date().getTime(), null, function (r) {
-              localStorage.reportTipTime = new Date().getTime();
-              localStorage.reportData = JSON.stringify(r);
+              if (r.tip){
+                localStorage.reportTipTime = new Date().getTime();
+                localStorage.reportData = JSON.stringify(r);
+              }
               reportHtml(r);
             });
           }else{

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

@@ -1692,7 +1692,6 @@
                                     console.log(err)
                                 }
                             })
-
                         }
                     }
                 })

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -119,9 +119,16 @@ func (this *Invoice) Addinvoice() error {
 		pos := qutil.IntAllDef(last, 0)
 		locks[pos].Lock()
 		defer locks[pos].Unlock()
-		u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId}, "order_money,product_type", "")
+		u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId}, "order_money,product_type,pay_way", "")
 		if u != nil {
-			prices := qutil.Float64All((*u)["order_money"]) / float64(100)
+			var prices float64
+			//公对公转账 账单金额可以修改 开发票应取实付金额 pay_money
+			//微信支付宝支付 pay_money为订单金额减去微信or支付包红包
+			if qutil.ObjToString((*u)["pay_way"]) == "transferAccounts" {
+				prices = qutil.Float64All((*u)["pay_money"]) / float64(100)
+			} else {
+				prices = qutil.Float64All((*u)["order_money"]) / float64(100)
+			}
 			price = strconv.FormatFloat(prices, 'f', -1, 64)
 			product_name = (*u)["product_type"].(string)
 			applyBill_status = 1

src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -625,6 +625,12 @@ func (o *OrderListDetails) Datas(queryM map[string]interface{}, pageNum, pagesiz
 				}
 			}
 
+			if qutil.ObjToString(result[i]["pay_way"]) == "transferAccounts" {
+				if qutil.IntAll(result[i]["course_status"]) == 2 || qutil.IntAll(result[i]["course_status"]) == 4 {
+					continue
+				}
+			}
+
 			//超时关闭订单
 			create_time_str := qutil.ObjToString(result[i]["create_time"])
 			create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
@@ -683,8 +689,6 @@ func FortyEightHoursCancel(order string, create_time_stamp, now_time_stamp int64
 		"order_code":   order,
 		"order_status": 0,
 	}
-	flag := false
-	//order := util.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
 	res := util.Mysql.FindOne(tableName_order, queryM, "id,order_code,create_time,pay_way,out_trade_no,prepay_time,order_status,user_id", "")
 	if res != nil {
 		id := qutil.Int64All((*res)["id"])
@@ -694,10 +698,9 @@ func FortyEightHoursCancel(order string, create_time_stamp, now_time_stamp int64
 		}
 		//如果超过48小时 取消订单  创建48小时后的时间戳<当前时间戳
 		if create_time_stamp < now_time_stamp {
+			flag := false
 			if qutil.IntAll((*res)["order_status"]) == 0 && qutil.ObjToString((*res)["pay_way"]) != "transferAccounts" && qutil.ObjToString((*res)["out_trade_no"]) != "" { //未支付状态下 删除订单需要先关闭订单
 				flag = pay.CloseDataExportOrder(qutil.ObjToString((*res)["pay_way"]), qutil.ObjToString((*res)["out_trade_no"]), qutil.ObjToString((*res)["prepay_time"]))
-			} else {
-				flag = true
 			}
 			if flag {
 				flag = util.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -2})

src/web/staticres/js/check-bind-phone.js

@@ -231,8 +231,8 @@
                     if (isBindStatus) {
                         sessionStorage.setItem('bind-phone', r.data.phone.trim())
                         dBingNode.hide()
-                        $('*[data-need-bind-phone][data-active-bind]').off('click', checkShow)
-                        $('*[data-need-bind-phone][data-active-bind]').off('touchstart', RefreshBindStatus)
+                        $('*[data-need-bind-phone]').off('click', checkShow)
+                        $('*[data-need-bind-phone]').off('touchstart', RefreshBindStatus)
                         if (e) {
                             $('*[data-need-bind-phone][data-active-bind]').trigger('click')
                         }

src/web/staticres/js/login.js

@@ -1351,8 +1351,8 @@ $(function () {
         handlers.splice(0, 0, handler);
     };
     window.callBindPhoneSuccess = function (e) {
-        $('*[data-need-bind-phone][data-active-bind]').off('click', checkShow)
-        $('*[data-need-bind-phone][data-active-bind]').off('mousemove', RefreshBindStatus)
+        $('*[data-need-bind-phone]').off('click', checkShow)
+        $('*[data-need-bind-phone]').off('mousemove', RefreshBindStatus)
         if (e) {
             $('*[data-need-bind-phone][data-active-bind]').trigger('click')
         }

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

@@ -19,16 +19,10 @@ if (s_myemail!=""&&s_myemail!=null){
   $('.ipt_code').val('')
   $('.write_ipt_name').val('')
   $('.write_ipt_phone').val('')
-    //获取用户手机号
-    var bindPhone = sessionStorage.getItem('bind-phone') || ''
-    if (bindPhone.length === 11) {
-        $("input.ipt_phone").val(bindPhone);
-        $('.write_ipt_phone').val(bindPhone)
-    }
 
-$(".write_run_now").on("click",function(){
-window.location.href="/front/dataExport/toSieve?from=structed"
-})
+    $(".write_run_now").on("click",function(){
+        window.location.href="/front/dataExport/toSieve?from=structed"
+    })
     // tab切换
     $('#tit span').click(function() {
         var i = $(this).index();//下标第一种写法
@@ -359,6 +353,17 @@ window.location.href="/front/dataExport/toSieve?from=structed"
         }
     }
 
+    //获取用户手机号
+    var bindPhone = sessionStorage.getItem('bind-phone') || ''
+    if (bindPhone.length === 11) {
+        var tempValue = $("input.ipt_phone").attr('value')
+        var canSuccess = isPoneAvailable(tempValue)
+
+        $("input.ipt_phone").val(canSuccess ? tempValue : bindPhone).trigger('blur');
+        $('.write_ipt_phone').val(canSuccess ? tempValue : bindPhone).trigger('blur')
+
+    }
+
     // 联系人必须是两个汉字以上
     function isname($nameInput) {
         // var myreg=/^\s*$/g;

src/web/templates/big-member/pc/page_buy_commit.html

@@ -13,8 +13,10 @@
     <link href='{{Msg "seo" "cdn"}}/css/subscribe.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
     <link href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css' rel="stylesheet" type="text/css"/>
     <link href='{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}' rel="stylesheet"/>
-    <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
-    <link href='{{Msg "seo" "cdn"}}/big-member/css/pc_buy_commit.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
+    <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet"
+          type="text/css"/>
+    <link href='{{Msg "seo" "cdn"}}/big-member/css/pc_buy_commit.css?v={{Msg "seo" "version"}}' rel="stylesheet"
+          type="text/css"/>
 </head>
 <body>
 {{include "/common/pchead.html"}}
@@ -169,7 +171,7 @@
                         </div>
                     </div>
                     <div class="read_agren">
-                        <input type="checkbox" name="" value="1" id="" class="agren_ipt" />
+                        <input type="checkbox" name="" value="1" id="" class="agren_ipt"/>
                         <span class="agren_text">我已阅读，理解并接受<span class="agren_link">《剑鱼标讯线上购买与服务条款》</span></span>
                     </div>
                     <div class="go_pay">
@@ -186,139 +188,145 @@
     $(function () {
         try {
             haslogin({{.T.logid}});
-        } catch (e) {}
+        } catch (e) {
+        }
     });
     ;(function ($) {
         var isMember = -1
+        var hasAccountsOrder = {{.T.hasAccountsOrder}}
         try {
             isMember = Number({{.T.member_status}})
         } catch (e) {
             isMember = -1
         }
-        if (isMember > 0) {
+        if (isMember > 0 || hasAccountsOrder) {
             $('.pay_btn').text('已购买').off('click').attr('disabled', 'disabled')
         }
     })(jQuery);
     $("#public-nav").css('background-color', '#fff')
-    $(function() {
+    $(function () {
         // 参数
         var getParams = {
-            level:3,
-            cycle:1
+            level: 3,
+            cycle: 1
         }
         // 选择会员等级
-        $('.setmeal').on('click', function() {
+        $('.setmeal').on('click', function () {
             $(this).addClass('active')
             $(this).siblings('.setmeal').removeClass('active')
             var numbers = parseInt($(this).attr('mealdata'))
             getParams.level = numbers
-            if(numbers == 1){
-                sessionStorage.setItem('pc_big_buy_type','2')
-            }else if(numbers == 2){
-                sessionStorage.setItem('pc_big_buy_type','1')
-            }else if(numbers == 3){
-                sessionStorage.setItem('pc_big_buy_type','0')
+            if (numbers == 1) {
+                sessionStorage.setItem('pc_big_buy_type', '2')
+            } else if (numbers == 2) {
+                sessionStorage.setItem('pc_big_buy_type', '1')
+            } else if (numbers == 3) {
+                sessionStorage.setItem('pc_big_buy_type', '0')
             }
-            $('.should_num').html('¥'+numFormat(getDisPrice(getParams.level,getParams.cycle)))
-            $('.original_price').html('原价：¥'+numFormat(getPayPrice(getParams.level,getParams.cycle)))
+            $('.should_num').html('¥' + numFormat(getDisPrice(getParams.level, getParams.cycle)))
+            $('.original_price').html('原价：¥' + numFormat(getPayPrice(getParams.level, getParams.cycle)))
         })
         var buyType = sessionStorage.getItem('pc_big_buy_type') || '1'
         sessionStorage.removeItem('pc_big_buy_type')
         $(".setmeal").eq(buyType).trigger('click')
         // 选择购买年数
-        $('.setyear').on('click', function() {
+        $('.setyear').on('click', function () {
             $(this).addClass('active_year')
             $(this).siblings('.setyear').removeClass('active_year')
             var cycles = parseInt($(this).attr('mealnum'))
             getParams.cycle = cycles
-            if(cycles == 1){
-                sessionStorage.setItem('pc_big_buy_year','0')
-            }else if(cycles == 2){
-                sessionStorage.setItem('pc_big_buy_year','1')
-            }else if(cycles == 3){
-                sessionStorage.setItem('pc_big_buy_year','2')
+            if (cycles == 1) {
+                sessionStorage.setItem('pc_big_buy_year', '0')
+            } else if (cycles == 2) {
+                sessionStorage.setItem('pc_big_buy_year', '1')
+            } else if (cycles == 3) {
+                sessionStorage.setItem('pc_big_buy_year', '2')
             }
-            $('.should_num').html('¥'+numFormat(getDisPrice(getParams.level,getParams.cycle)))
-            $('.original_price').html('原价：¥'+numFormat(getPayPrice(getParams.level,getParams.cycle)))
+            $('.should_num').html('¥' + numFormat(getDisPrice(getParams.level, getParams.cycle)))
+            $('.original_price').html('原价：¥' + numFormat(getPayPrice(getParams.level, getParams.cycle)))
         })
         var buyYears = sessionStorage.getItem('pc_big_buy_year') || '0'
         sessionStorage.removeItem('pc_big_buy_year')
         $(".setyear").eq(buyYears).trigger('click')
         // 控制支付按钮是否可以点击
-        if($('.agren_ipt').prop('checked')){
-            $('.agren_ipt').prop('checked',true)
-            $('.pay_btn').attr("disabled",false)
-        }else{
-            $('.agren_ipt').prop('checked',false)
-            $('.pay_btn').attr("disabled",true)
+        if ($('.agren_ipt').prop('checked')) {
+            $('.agren_ipt').prop('checked', true)
+            $('.pay_btn').attr("disabled", false)
+        } else {
+            $('.agren_ipt').prop('checked', false)
+            $('.pay_btn').attr("disabled", true)
         }
-        $('.agren_ipt').on('click', function(){
-            if($('.agren_ipt').prop('checked')){
-                $('.agren_ipt').prop('checked',true)
+        $('.agren_ipt').on('click', function () {
+            if ($('.agren_ipt').prop('checked')) {
+                $('.agren_ipt').prop('checked', true)
                 if ($('.pay_btn').text() !== '已购买') {
-                    $('.pay_btn').attr("disabled",false)
+                    $('.pay_btn').attr("disabled", false)
                 }
-            }else{
-                $('.agren_ipt').prop('checked',false)
-                $('.pay_btn').attr("disabled",true)
+            } else {
+                $('.agren_ipt').prop('checked', false)
+                $('.pay_btn').attr("disabled", true)
             }
         })
+
         // 确定购买原价
-        function getPayPrice(n,m){
+        function getPayPrice(n, m) {
             var beforeprice = 0
             var beforeall = 0
-            console.log(n,m)
-            if(n==3){
+            console.log(n, m)
+            if (n == 3) {
                 beforeprice = 7999
-            }else if(n== 2){
+            } else if (n == 2) {
                 beforeprice = 19999
-            }else if(n==1){
+            } else if (n == 1) {
                 beforeprice = 27999
             }
-            return beforeall = beforeprice*m
+            return beforeall = beforeprice * m
         }
+
         // 确定折扣价格
-        function getDisPrice(n,m){
+        function getDisPrice(n, m) {
             var afterprice = 0
             var afterall = 0
-            if(n==3){
+            if (n == 3) {
                 afterprice = 5999
-            }else if(n== 2){
+            } else if (n == 2) {
                 afterprice = 15999
-            }else if(n==1){
+            } else if (n == 1) {
                 afterprice = 21999
             }
-            return afterall = afterprice*m
+            return afterall = afterprice * m
         }
+
         // 金额用逗号隔开
         function numFormat(num) {
-            var c = (num.toString().indexOf ('.') !== -1) ? num.toLocaleString() : num.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
+            var c = (num.toString().indexOf('.') !== -1) ? num.toLocaleString() : num.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
             return c;
         }
+
         // 确认支付
-        $('.pay_btn').on('click',function(){
+        $('.pay_btn').on('click', function () {
             if (!loginflag) {
                 return openLoginDig()
             }
             $.ajax({
-                type:'POST',
-                url:'/jypay/bigmember/createOrder',
-                data:{
-                    level:getParams.level,
-                    cycle:getParams.cycle
+                type: 'POST',
+                url: '/jypay/bigmember/createOrder',
+                data: {
+                    level: getParams.level,
+                    cycle: getParams.cycle
                 },
-                success:function(res){
-                    console.log(res)
-                    location.href = '/front/member/orderPay/'+res.data.order_code
+                success: function (res) {
+                    history.replaceState({"flag": "pay"}, '', '/front/member/memberDetail?order_code=' + res.data.order_code);
+                    location.href = '/front/member/orderPay/' + res.data.order_code
                 }
             })
         })
         // 查看清单
-        $('.com_text').on('click',function(){
+        $('.com_text').on('click', function () {
             location.href = './index#jy-table'
         })
         // 条款
-        $('.agren_link').on('click',function(){
+        $('.agren_link').on('click', function () {
             location.href = '/front/staticPage/serviceterms.html'
         })
     })

src/web/templates/big-member/pc/page_index.html

@@ -446,7 +446,7 @@
                 if (canBindPhone) {
                     sessionStorage.setItem('bind-phone', r.data.phone.trim())
                     $("#bidLogin").modal("hide")
-                    typeof window.callBindPhoneSuccess === 'function' && window.callBindPhoneSuccess(e)
+                    typeof window.callBindPhoneSuccess === 'function' && window.callBindPhoneSuccess(true)
                 }
             } catch (e) {
                 console.log('获取状态失败: ', e)

src/web/templates/big-member/wx/page_buy_commit.html

@@ -104,7 +104,11 @@
     <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
     <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
 <script>
-   var vNode = {
+
+    var numberStatus = {{.T.member_status}}
+    var hasAccountsOrder ={{.T.hasAccountsOrder}}
+
+    var vNode = {
         delimiters: ['${', '}'],
         el: '#v-commit',
         data: {
@@ -180,7 +184,7 @@
         },
         computed: {
             confirmDisabled: function () {
-                return !this.checked
+                return !this.checked || (numberStatus > 0 || hasAccountsOrder)
             }
         },
         created () {

src/web/templates/big-member/wx/page_open_app.html

@@ -244,7 +244,6 @@
                     })
                 }
             }
-
         },
         // 5秒后，浏览器没隐藏(没有打开app)就下载
         tryToOpenApp: function (e) {
@@ -253,18 +252,33 @@
                 _this.loadingShow()
                 clearInterval(_this.tryToOpenTimer)
                 _this.tryToOpenTimer = setTimeout(function () {
-                    _this.loadingHide()
-                    if (!_this.hasApp) {
-                        location.href = _this.conf.appDownloadLink
-                        console.log('下载app')
-                    }
-                }, 5000)
+                    _this.loadingHide(function () {
+                        if (!_this.hasApp) {
+                            _this.downloadApp()
+                        }
+                    })
+                }, 4500)
             }
             
             if (this.isIos) {
-                e.preventDefault()
+                if (e) {
+                    e.preventDefault()
+                }
+                this.downloadApp()
+            }
+        },
+        // 执行下载操作
+        downloadApp: function () {
+            if (this.isAndroid) {
+                var iframe = document.createElement('iframe')
+                iframe.src = this.conf.appDownloadLink
+                iframe.style.display = 'none'
+                document.body.appendChild(iframe)
+            }
+            if (this.isIos) {
                 location.href = _this.conf.appDownloadLink
             }
+            console.log('下载app')
         },
         getUserInfo: function () {
             var _this = this
@@ -287,8 +301,10 @@
             loading.fadeIn(100);
             return loading
         },
-        loadingHide: function () {
-            $('#loadingToast').fadeOut(100)
+        loadingHide: function (callback) {
+            $('#loadingToast').fadeOut(100, function () {
+                callback && callback()
+            })
         },
         getWxSdkSign: function () {
             var _this = this

src/web/templates/order/pc/orderPay.html

@@ -15,6 +15,12 @@
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/publicToPublic.js?v={{Msg "seo" "version"}}"></script>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/upload.js"></script>
+    <style>
+        .modal-dialog {
+            width: 800px;
+            margin: 30px auto;
+        }
+    </style>
 </head>
 <body>
 <!-- header -->
@@ -126,7 +132,9 @@
                             </div>
                             <div class="btn_handle">
                                 <button class="submit_btn" disabled>确认已转账</button>
-                                <button class="cancel_btn" onclick="window.history.go(-1);">取消</button>
+                                <button class="cancel_btn" onclick="window.location.href='/front/swordfish/toMyOrder'">
+                                    取消
+                                </button>
                             </div>
                         </div>
                     </div>
@@ -239,7 +247,7 @@
                     }, function (r) {
                         if (r.success) {
                             //页面跳转
-                            window.location.href = "/front/{{.T.orderType}}/paySuccess/{{.T.orderCode}}?payway=" + r.pay_way + "&payTime=" + r.payTime + "&email=" + r.email + "&price=" + price;
+                            window.location.replace("/front/{{.T.orderType}}/paySuccess/{{.T.orderCode}}?payway=" + r.pay_way + "&payTime=" + r.payTime + "&email=" + r.email + "&price=" + price)
                         }
                     })
                 }
@@ -293,9 +301,10 @@
             return money;
         }
 
-
         $('.submit_btn').click(function () {
-            var imgPath = $(".upload_box").find("img").attr("src")
+            $('.submit_btn').attr("disabled", "disabled")
+            submiting = true
+            var imgPath = $(".upload_box").find("img").attr("src");
             $.ajax({
                 type: 'post',
                 url: '/jypay/common/saveTransferAccounts?t=' + new Date().getTime(),
@@ -306,14 +315,19 @@
                     if (r.success) {
                         $('.toast').show("linear");
                         setTimeout(function () {
-                            window.location.href = "/front/{{.T.orderType}}/memberDetail?order_code=" + orderCode
+                            window.location.replace("/front/{{.T.orderType}}/memberDetail?order_code=" + orderCode)
+                            submiting = false
                             $('.toast').hide();
                         }, 2000)
                     } else {
                         alert(r.errMsg)
                     }
+                    $('.submit_btn').removeClass("disabled")
                 }
             })
+            setTimeout(function () {
+                $('.submit_btn').removeClass("disable")
+            }, 1000)
         })
     })
 

src/web/templates/pc/createOrderPage.html

@@ -256,6 +256,13 @@
     var email_lastVerity ={{.T.timeSpaceing}}
 
     var phone_lastInput ={{.T.phone}}
+    if (!phone_lastInput) {
+        //获取用户手机号
+        var bindPhone = sessionStorage.getItem('bind-phone') || ''
+        if (bindPhone.length === 11) {
+            phone_lastInput = bindPhone
+        }
+    }
     var isEntUser = {{.T.isEntUser}}
         $(function () {
             haslogin({{.T.logid}});
@@ -295,7 +302,7 @@
             $(".fl.left p:eq(2) span:eq(0)").text(unitPrice_senior);
             $(".fl.left p:eq(2) span:eq(1)").text(discount*10);
             $(".fl.left p:eq(2) span:eq(2)").text(discount*unitPrice_senior);
-            
+
             //企业数据导出开始
             if (isEntUser) {
                 // $("#guige").hide();
@@ -356,7 +363,7 @@
                             timeout: 2000000,
                             success: function (r) {
                                 if (r) {
-                                    sessionStorage.entExportCount = r.count;         
+                                    sessionStorage.entExportCount = r.count;
                                     sessionStorage.entExportNewCount = r.newCount;
                                     sessionStorage.entExportid = id;
                                     $("#guige").hide();
@@ -829,7 +836,7 @@
             $(".remind").fadeOut();
         }
     });
-    
+
     $("#backbtn").on("click", function(){
         window.history.back();
     });

src/web/templates/pc/member_orderDetail.html

@@ -45,6 +45,14 @@
         .qxBgFont {
             color: #686868;
         }
+
+        .show_pay_pic {
+            background: #2CB7CA;
+            padding: 1px 8px 1px 8px;
+            border-radius: 2px;
+            color: #fff;
+            cursor: pointer;
+        }
     </style>
 </head>
 <body>
@@ -66,6 +74,8 @@
                 <span class="redFont hide" id="status_wait_pay">待付款</span>
                 <span class="qxBgFont hide" id="status_cancelled">已取消</span>
 
+                <span class="customerTel"
+                      style="display:none;font-weight: normal;font-size: 14px;color: #686868;margin-left: 50px;">客服电话：400-108-6670</span>
                 <a class="go_pay payOrder" style="display: none;">去支付</a>
 
                 <!-- 当状态为已完成时显示开发票 或 查看发票 -->
@@ -100,9 +110,10 @@
                         <p>产品类型：大会员<span class="vip_type"></span></p>
                         <p class="pay_way_p" style="display:none">支付方式：<span class="pay_way"></span></p>
                         <p class="pay_num_p" style="display:none">支付单号：<span class="pay_num"></span></p>
-                        <p class="price_p">实付金额：￥<span class="price"></span>元 &nbsp; <span class="valuationList"
-                                                                                           style="color:#2CB7CA;display:none;cursor:pointer">计费清单</span>
+                        <p class="price_p">实付金额：<span class="price"></span>&nbsp; <span class="valuationList"
+                                                                                        style="color:#2CB7CA;display:none;cursor:pointer">计费清单</span>
                         </p>
+                        <p class="pay_pic" style="display:none">转账凭证：<span class="show_pay_pic">查看凭证</span></p>
                     </div>
                 </div>
             </div>
@@ -142,7 +153,9 @@
                     if (r.data.create_time) {
                         $(".order_time").text(r.data.create_time.replace("-", ".").replace("-", "."));
                     }
-                    $(".price").text(formatMoney(r.data.order_money / 100));
+
+                    $(".price").text("￥ " + formatMoney(r.data.order_money / 100) + "元");
+
                     $(".level").text(level_map.get(r.data.level));
                     $(".cycle").text(r.data.cycle);
                     var member_endtime = "-";
@@ -151,7 +164,7 @@
                     }
                     console.log(member_endtime)
                     $(".real_cycle").text(member_endtime);
-                    if (r.data.order_status == 1) {
+                    if (r.data.order_status === 1) {
                         $("#status_success").removeClass("hide");
                         $(".pay_time_p").css("display", "");
                         if (r.data.pay_time) $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
@@ -163,31 +176,53 @@
                             $(".pay_way").text("支付宝支付");
                             $(".pay_way_p").css("display", "");
                         } else if (r.data.pay_way === "transferAccounts") {
-                            $(".pay_way").text("转账");
+                            $(".pay_time_p").css("display", "none");
+                            $(".pay_num_p").css("display", "none");
+                            if (filterObj.transferV) {
+                                $(".pay_pic").css("display", "")
+                                $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
+                            }
+                            $(".pay_way").text("公对公转账");
                             $(".pay_way_p").css("display", "");
+
+                            $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
                         }
-                        $(".pay_num_p").css("display", "");
+
                         if (r.data.prepay_id) $(".pay_num").text(r.data.prepay_id);
                         //发票
-                        if (r.data.applybill_status == 0) {
+                        if (r.data.applybill_status === 0) {
                             $(".openinvoice").css("display", "");
                         } else {
                             $(".lookinvoice").css("display", "");
                         }
                     }
-                    if (r.data.order_status == -2) {
+                    if (r.data.order_status === -2) {
                         $("#status_cancelled").removeClass("hide");
                         $("#bg").addClass("qxBg").removeClass("greenBg");
                     }
-                    if (r.data.order_status == 0) {
-                        if (r.data.course_status === 2) {
-                            $(".order_state .greenFont").text("汇款审核中").removeClass("hide");
+                    if (r.data.order_status === 0) {
+                        $("#bg").addClass("redBg").removeClass("greenBg");
+                        if (r.data.pay_way === "transferAccounts") {
+                            if (filterObj.transferV) {
+                                $(".pay_pic").css("display", "")
+                                $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
+                            }
+                            $(".pay_way").text("公对公转账");
+                            $(".pay_way_p").css("display", "");
+                            if (r.data.course_status === 2) {
+                                $(".order_state .redFont").removeClass("hide").text("转账审核中");
+                            } else if (r.data.course_status === 3) {
+                                $(".order_state .redFont").removeClass("hide").text("未收到转账！");
+                                $(".customerTel").css("display", "");
+                                $(".payOrder").show();
+                            }
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                            $(".line_payway").css("display", "");
+
+                            $(".price").text("-");
                             return
-                        } else if (r.data.course_status === 3) {
-                            $(".order_state .redFont").text("汇款审核失败").removeClass("hide");
                         }
                         $("#status_wait_pay").removeClass("hide");
-                        $("#bg").addClass("redBg").removeClass("greenBg");
                         $(".payOrder").show();
                     }
                 }
@@ -212,6 +247,17 @@
             })
         })
 
+        function showImg(imgSrc) {
+            if (!imgSrc) {
+                retunn
+            }
+            if (window.location.host.indexOf("test") > -1) {
+                imgSrc = "https://web2-qmxtest.jianyu360.cn" + imgSrc
+            } else if (window.location.host.indexOf("com") > -1) {
+                imgSrc = "https://www.qmx.top" + imgSrc
+            }
+            $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: fixed;z-index: 9999;padding: 20px;top: 0px;box-sizing: border-box;align-items: center;justify-content: center;"><img src="' + imgSrc + '"></div>')
+        }
 
         /******* 获取url参数（正则）********/
         function getParam(name) {

src/web/templates/pc/myOrder.html

@@ -670,13 +670,25 @@
                                 + '<p style="line-height: 24px;">订阅周期：' + filter_.cycle + ' 年</p>'
                                 + '<p style="line-height: 24px;">有效日期：' + member_endtime + '</p>'
                             if (orderStatus === 0) {//0：待付款；
-                                if (!(obj.course_status === 2 || obj.course_status === 4)) { //审核中不能修改状态
+                                var payNameTmp = "去支付"
+                                if (obj.pay_way === "transferAccounts") {
+
+                                    if (obj.course_status === 2) {
+                                        m_status_html = "<span style='color: #FE737A'>转账审核中<span>";
+                                    } else if (obj.course_status === 3) {
+                                        m_status_html = "<span style='color: #FE737A'>未收到转账<span>";
+                                        payNameTmp = "再次支付"
+                                    }
+                                } else {
+                                    orderStatusHtml = "待付款";
                                     orderStatusClassOne = "blueColor"
-                                    orderStatusClassTwo = "blueBg"
-                                    m_status_html += '待付款'
-                                    m_handle_html += '<p><a href="/front/member/orderPay/' + orderCode + '" class="go_pay">去支付</a></p>'
+                                }
+                                orderStatusClassTwo = "blueBg"
+                                if (!(obj.pay_way === "transferAccounts" && (obj.course_status === 2 || obj.course_status === 4))) {
+                                    m_handle_html += '<p><a href="/front/member/orderPay/' + orderCode + '" class="go_pay">' + payNameTmp + '</a></p>'
                                         + '<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id + ',this,\'\',7)">取消订单</a></p>'
                                 }
+
                             } else if (orderStatus === 1) {//已完成
                                 m_status_html += '<p class="finish_status">已完成</p>'
                                 if (obj.applybill_status === 1) {

src/web/templates/pc/supsearch.html

@@ -990,6 +990,8 @@ $(function(){
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script type="text/javascript">
+// 侧边客服距离底部位置
+window.goBackTop_disBottom = 600
 $(function(){
     $(".shade_table .more").on('click', toPaydataExport)
 	$(".control-tabBtn>a").hover(function(){

src/web/templates/structuredata/mobile/write_infor_wx.html

@@ -177,11 +177,6 @@ $(function(){
   $('.mf .ipt_code').val('')
   $('.kf .ipt_name').val('')
   $('.kf .ipt_phone').val('')
-  //获取用户手机号
-  var bindPhone = sessionStorage.getItem('bind-phone') || ''
-  if (bindPhone.length === 11) {
-    $("input.ipt_phone").val(bindPhone);
-  }
 
   $(".write_run_now").on("click",function(){
     window.location.href="/front/wx_dataExport/toSieve?from=structed"
@@ -444,6 +439,11 @@ $(function(){
       }
 
   })
+    //获取用户手机号
+    var bindPhone = sessionStorage.getItem('bind-phone') || ''
+    if (bindPhone.length === 11) {
+        $("input.ipt_phone").val(bindPhone).trigger('blur');
+    }
 })
 
 

src/web/templates/weixin/commonPay/checkout.html

@@ -145,8 +145,9 @@
             },
             loading: null,
             init: function () {
-                this.getOrderPay()
+                this.getOrderPrice()
                 this.clickEventsWithPayMode()
+                this.confirmPayEvent()
             },
             clickEventsWithPayMode: function () {
                 var that = this
@@ -157,6 +158,36 @@
                     console.log(that.mode);
                 })
             },
+            getOrderPrice: function () {
+                this.loading = checkout.jLoading({
+                    content: '加载中...',
+                })
+                $.ajax({
+                    url: '/jypay/common/getOrderPrice',
+                    type: 'POST',
+                    data: {
+                        orderCode: checkout.orderInfo.ordercode,
+                    },
+                    contentType: 'application/x-www-form-urlencoded',
+                    success: function (res) {
+                        checkout.loading.hide(function () {
+                            checkout.loading = null
+                            if (res.success) {
+                                $(".price-container .price").text(checkout.formatMoney(res.data.price / 100));
+                            } else {
+                                checkout.jLoading({
+                                    content: res.errMsg,
+                                    iconHide: true,
+                                    duration: 1500
+                                })
+                            }
+                        })
+                    },
+                    error: function (err) {
+                        console.log(err);
+                    }
+                })
+            },
             getOrderPay: function () {
                 this.loading = this.jLoading({
                     content: '加载中...',
@@ -176,7 +207,6 @@
                                 $(".price-container .price").text(checkout.formatMoney(res.data.price / 100));
                                 try {
                                     checkout.orderInfo.payObj = JSON.parse(res.data.res);
-                                    checkout.confirmPayEvent()//支付点击事件
                                 } catch (e) {
                                     checkout.jLoading({
                                         content: "支付创建异常",
@@ -203,7 +233,7 @@
                     // 如果loading有值说明正在请求中
                     if (checkout.loading) return
                     if (checkout.mode === 'transferAccounts') {
-                        window.location.href = '/weixin/pay/transferAccounts_{{.T.doType}}?orderCode=' + checkout.orderInfo.ordercode
+                        window.location.replace('/weixin/pay/transferAccounts_{{.T.doType}}?orderCode=' + checkout.orderInfo.ordercode)
                         return
                     }
                     checkout.onBridgeReady(checkout.orderInfo.payObj)

src/web/templates/weixin/commonPay/myOrder.html

@@ -1554,12 +1554,14 @@
                 var orderUrl = "/front/wxMyOrder/memberDetail/" + orderCode;
 
                 if (orderStatus === 0) {
+                    var payNameTmp = "去支付"
                     if (obj.pay_way === "transferAccounts") {
                         orderStatusHtmls = "refund";
                         if (obj.course_status === 2) {
                             orderStatusHtml = "转账审核中";
                         } else if (obj.course_status === 3) {
                             orderStatusHtml = "未收到转账";
+                            payNameTmp = "再次支付"
                         }
                     } else {
                         orderStatusHtml = "待付款";
@@ -1568,7 +1570,7 @@
                     if (!(obj.pay_way === "transferAccounts" && (obj.course_status === 2 || obj.course_status === 4))) {
                         lastHtml = '<div class="card-footer">'
                             + '<a class="btn cancle" onclick="cancelOrder(' + id + ',this)">取消订单</a>'
-                            + '<a onclick="window.location.href=\'' + '/weixin/pay/checkout_member?orderCode=' + orderCode + '\'" class="btn green-btn">去支付</a>'
+                            + '<a onclick="window.location.href=\'' + '/weixin/pay/checkout_member?orderCode=' + orderCode + '\'" class="btn green-btn">' + payNameTmp + '</a>'
                             + '</div>';
                     }
                 } else if (orderStatus === 1) {

src/web/templates/weixin/commonPay/transferAccountsResult.html

@@ -17,6 +17,7 @@
           href="{{Msg "seo" "cdn"}}/wxCommonPay/css/transferAccountsResult.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/public.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/wxCommonPay/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 </head>
 
 <body>
@@ -52,4 +53,7 @@
     </div>
 </div>
 </body>
+<script>
+    weui.toast("提交成功")
+</script>
 </html>

src/web/templates/weixin/member/memberdetail.html

@@ -7,6 +7,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>订单详情</title>
     <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/weui/1.1.2/style/weui.css"/>
@@ -172,11 +174,6 @@
                 }
                 //价格
                 $(".price").text("￥ " + formatMoney((r.data.order_money / 100)));
-                if (r.data.pay_money) {
-                    $(".l-item.paymoney").css("display", "");
-                    $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                }
-
             }
             //
             $(".level_value").text(level_map.get(filterObj.level).get("level"));
@@ -189,11 +186,6 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-                //支付时间
-                if (r.data.pay_time) {
-                    $(".line_paytime").css("display", "");
-                    $(".payTime").text(r.data.pay_time.replace("-", ".").replace("-", "."));
-                }
 
                 //有效周期
                 $(".line_cycle").css("display", "");
@@ -219,12 +211,20 @@
                 } else if (r.data.pay_way === "transferAccounts" && r.data.course_status === 4) {//试用用户
                     $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
                     $(".line_payway").css("display", "");
+
+                    $(".l-item.paymoney").css("display", "");
+                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
                     return
                 } else {//试用用户
                     $(".invoice").css("display", "none");
                     return
                 }
 
+                if (r.data.pay_time) {
+                    $(".line_paytime").css("display", "");
+                    $(".payTime").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                }
+
                 $(".line_transaction").css("display", "");
                 if (r.data.prepay_id) $(".transaction_id").text(r.data.prepay_id);
 
@@ -235,6 +235,8 @@
                 $("#pageTitle").addClass("status")
 
                 if (r.data.pay_way === "transferAccounts") {
+                    $(".l-item.paymoney").css("display", "");
+                    $(".paymoney .price").text("-");
                     if (r.data.course_status === 2) {
                         $("#pageTitle").text("转账审核中");
                     } else if (r.data.course_status === 3) {
@@ -315,12 +317,11 @@
     //开发票
     function invoiceAdd() {
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
-            if (data.status == 1) {
+            if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
             } else {
                 window.location.href = "/front/invoice/cantInvoice";
             }
-            ;
         })
     }
 
@@ -331,7 +332,6 @@
 
     //查看发票
     function checkInvoice() {
-        orderCode = getParam("orderCode")
         window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
     }
 
@@ -397,7 +397,7 @@
         } else if (window.location.host.indexOf("com") > -1) {
             imgSrc = "https://www.qmx.top" + imgSrc
         }
-        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;"><img src="' + imgSrc + '"></div>')
+        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background:rgba(0 ,0, 0 ,44%);height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;align-items: center;"><img src="' + imgSrc + '"></div>')
     }
 
 </script>