Merge remote-tracking branch 'origin/feature/v4.10.2' into feature/v4.10.2

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -5,7 +5,10 @@ function calcBackOrderTime(filterObjNew) {
     var cycle = ''
     var cmap={1:"天",2:"月",3:"年",4:"季"}
     if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-        cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+        var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+        if (cycleNum>0) {
+            cycle = cycleNum +cmap[filterObjNew.buy_type]
+        }
     }else{
         if (filterObjNew.buy_cycle>0){
             cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]
@@ -439,6 +442,10 @@ $(function () {
                 } else {
                     $('.cyclecount').parents('.l-item').hide()
                 }
+            } else {
+                if (!filterObj.cyclecount) {
+                    $('.cyclecount').parents('.l-item').hide()
+                }
             }
 
             //升级续费
@@ -460,7 +467,9 @@ $(function () {
                     $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                   }
                 }
-                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                if (r.data.order.pay_money) {
+                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                }
                 //未支付
                 $("#card-header-bg").addClass("bg nopay-bg")
                 $("#pageTitle").addClass("status")
@@ -475,6 +484,7 @@ $(function () {
                             window.location.href = "/jyapp/pay/checkout_subvip?orderCode=" + orderCode + "&t=3";
                         })
                     }
+                    $(".payWay").text("公对公转账");
                     if (filterObj.transferV) {
                         initImgView(filterObj.transferV)
                         $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
@@ -541,10 +551,14 @@ $(function () {
                     $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                   }
                 }
-                $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                if (r.data.order.pay_money) {
+                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                }
 				//P307 权益码兑换 支付金额 0
                 if(filterObj.badge=="exchange"){
-                  $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    if (r.data.order.pay_money) {
+                        $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    }
                 }
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").text("已完成");

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

@@ -579,6 +579,7 @@
                             window.location.href = "/jyapp/pay/checkout_member?orderCode=" + orderCode;
                         })
                     }
+                    $(".payWay").html("公对公转账");
                     if (filterObj.transferV) {
                         initImgView(filterObj.transferV)
                         $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");

src/jfw/modules/app/src/web/templates/commonPay/medical/orderDetail.html

@@ -172,7 +172,7 @@
             </p>
             <p class="l-item">
               <span class="label" id="price">实付金额：</span>
-              <span class="payPrice value">0</span>
+              <span class="payPrice value">-</span>
 
               <em class="qingdan valuationList" style="display:none">计费清单</em>
             </p>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

@@ -134,7 +134,7 @@
                     </p>
 										<p class="l-item paymoney">
 											<span class="label" id="price">实付金额：</span>
-											<span class="payPrice value price"></span><em class="qingdan valuationList" style="display:none">计费清单</em>
+											<span class="payPrice value">-</span><em class="qingdan valuationList" style="display:none">计费清单</em>
                       <span style="display: none;" class="refund-success-tip">退款成功</span>
 										</p>
 										<!-- 订单状态为已完成时显示支付时间、支付方式和订单号，状态为待付款时不显示 -->

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

@@ -655,6 +655,15 @@ func (e *EquityCode) UseEquityCodeAndAuthority() (m string, flag bool) {
 					return false
 				}
 				//TODO 写入产品
+				var buyType int
+				switch cycleType {
+				case 0:
+					buyType = 2
+				case 1:
+					buyType = 1
+				default:
+					buyType = cycleType
+				}
 				if flag = util.Mysql.InsertByTx(tx, "jy_order_detail", g.Map{
 					"order_code":        e.OrderCode,
 					"product_type":      "大会员",
@@ -672,7 +681,7 @@ func (e *EquityCode) UseEquityCodeAndAuthority() (m string, flag bool) {
 					"filter": gconv.String(g.Map{
 						"comboId":           level,
 						"buy_cycle":         productInfo.Num,
-						"buy_type":          3, // 类型 1天 2月 3年 4季度
+						"buy_type":          buyType, // 类型 1天 2月 3年 4季度
 						"finalAccountCount": 1,
 						"finalAreaCount":    -1,
 					}),

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1797,7 +1797,10 @@ var vm = new Vue({
       var cmap={1:"天",2:"月",3:"年",4:"季"}
       var cycle = ''
       if (filterNewObj.buy_type && filterNewObj.buy_type==filterNewObj.give_type){
-        cycle = parseInt(filterNewObj.buy_cycle||0) +parseInt(filterNewObj.give_cycle||0) +cmap[filterNewObj.buy_type]
+        var cycleNum = parseInt(filterNewObj.buy_cycle||0) +parseInt(filterNewObj.give_cycle||0)
+        if (cycleNum>0) {
+          cycle = cmap[filterNewObj.buy_type]
+        }
       }else{
         if (filterNewObj.buy_cycle>0){
           cycle+=filterNewObj.buy_cycle+cmap[filterNewObj.buy_type]

src/web/templates/frontRouter/wx/vipIntro/free/order_detail.html

@@ -209,7 +209,10 @@
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-            cycle = parseInt(filterObjNew.buy_cycle||0) +cmap[filterObjNew.buy_type]
+            var cycleNum = parseInt(filterObjNew.buy_cycle||0)
+            if (cycleNum>0) {
+                cycle = cycleNum +cmap[filterObjNew.buy_type]
+            }
         }else{
             if (filterObjNew.buy_cycle>0){
                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]
@@ -663,7 +666,9 @@
                           $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                       }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                    if (r.data.order.pay_money) {
+                        $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    }
                     //未支付
                     $("#card-header-bg").addClass("bg nopay-bg")
                     $("#pageTitle").addClass("status")
@@ -740,7 +745,9 @@
                         $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                       }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                    if (r.data.order.pay_money) {
+                        $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    }
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").text("已完成");

src/web/templates/pc/vip_orderDetail.html

@@ -284,7 +284,10 @@
                         var cycle = ''
                         var cmap={1:"天",2:"月",3:"年",4:"季"}
                         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-                            cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+                            var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+                            if (cycleNum>0) {
+                                cycle = cycleNum +cmap[filterObjNew.buy_type]
+                            }
                         }else{
                             if (filterObjNew.buy_cycle>0){
                                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]

src/web/templates/weixin/commonPay/integral/integralDetail.html

@@ -269,6 +269,7 @@
                                 window.location.href = "/weixin/pay/checkout_member?orderCode=" + orderCode;
                             })
                         }
+                        $(".payWay").text("公对公转账");
                         if (filterObj.transferV) {
                             initImgView(filterObj.transferV)
                             $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");

src/web/templates/weixin/commonPay/medical/orderDetail.html

@@ -168,7 +168,7 @@
                             </p>
                             <p class="l-item">
                                 <span class="label" id="price">实付金额：</span>
-                                <span class="payPrice value"></span>
+                                <span class="payPrice value">-</span>
 
                                 <em class="qingdan valuationList" style="display:none">计费清单</em>
                             </p>
@@ -213,7 +213,10 @@
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-            cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+            var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+            if (cycleNum > 0) {
+                cycle = cycleNum +cmap[filterObjNew.buy_type]
+            }
         }else{
             if (filterObjNew.buy_cycle>0){
                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]

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

@@ -275,7 +275,10 @@
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-            cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+            var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+            if (cycleNum>0) {
+                cycle = cycleNum +cmap[filterObjNew.buy_type]
+            }
         }else{
             if (filterObjNew.buy_cycle>0){
                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]

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

@@ -154,7 +154,10 @@
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-            cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+            var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+            if (cycleNum>0) {
+                cycle = cycleNum +cmap[filterObjNew.buy_type]
+            }
         }else{
             if (filterObjNew.buy_cycle>0){
                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -179,7 +179,7 @@
                         </p>
                         <p class="l-item paymoney">
                             <span class="label" id="price">实付金额：</span>
-                            <span class="payPrice value price">-</span><em class="qingdan valuationList"
+                            <span class="payPrice value">-</span><em class="qingdan valuationList"
                                                                  style="display:none">计费清单</em>
                             <span style="display: none;" class="refund-success-tip">退款成功</span>
                         </p>
@@ -230,7 +230,10 @@
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
         if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
-            cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
+            var cycleNum = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0)
+            if (cycleNum) {
+                cycle = cycleNum +cmap[filterObjNew.buy_type]
+            }
         }else{
             if (filterObjNew.buy_cycle>0){
                 cycle+=filterObjNew.buy_cycle+cmap[filterObjNew.buy_type]
@@ -720,6 +723,10 @@
                     } else {
                         $('.cyclecount').parents('.l-item').hide()
                     }
+                } else {
+                    if (!filterObj.cyclecount) {
+                        $('.cyclecount').parents('.l-item').hide()
+                    }
                 }
 
                 if (r.data.order.order_status == 0) {
@@ -731,7 +738,9 @@
                           $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                       }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                    if (r.data.order.pay_money) {
+                        $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    }
                     //未支付
                     $("#card-header-bg").addClass("bg nopay-bg")
                     $("#pageTitle").addClass("status")
@@ -746,6 +755,7 @@
                             window.location.href = "/weixin/pay/checkout_subvip?orderCode=" + orderCode + "&t=3";
                         })
                     }
+                    $(".payWay").text("公对公转账");
                     if (filterObj.transferV) {
                         initImgView(filterObj.transferV)
                         $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>")
@@ -827,10 +837,14 @@
                         $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                       }
                     }
-                    $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
+                    if (r.data.order.pay_money) {
+                        $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                    }
                     //P307 权益码兑换 支付金额 0
                     if(filterObj.badge=="exchange"){
-                      $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                        if (r.data.order.pay_money) {
+                            $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
+                        }
                     }
                     $("#card-header-bg").addClass("bg finish-bg")