Merge branch 'dev4.6.2.17' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.17

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/base.css

@@ -169,3 +169,10 @@ button{
 @media (min-width: 608px){html{font-size: 81.0667px;} }
 @media (min-width: 640px){html{font-size: 85.3333px;} }
 @media (min-width: 750px){html{font-size: 100px;} }
+.weui-dialog__hd{
+  text-align: center!important;
+  padding: 26px 0 0 0!important;
+}
+.weui-dialog__title{
+  font-size: 20px!important;
+}

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/base.css

@@ -111,3 +111,21 @@ em,i{
     padding-bottom: constant(safe-area-inset-bottom) !important; /* iOS 11.0 */
     padding-bottom: env(safe-area-inset-bottom) !important; /* iOS 11.2 */
 }
+.weui-dialog__hd{
+  text-align: center!important;
+  padding: 26px 0 0!important;
+}
+.weui-dialog__title{
+  font-weight: 700;
+  font-size: 18px!important;
+  line-height: 26px!important;
+  color: #171826;
+}
+.weui-dialog__bd{
+  padding: 16px 24px 26px!important;
+  margin: 0!important;
+  font-size: .3rem!important;
+  line-height: .44rem!important;
+  color: #5F5E64!important;
+  text-align: justify!important;
+}

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

@@ -748,6 +748,13 @@ function checkinvoice(flag) {
 
 //开发票
 function invoiceAdd() {
+  return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+    title: '温馨提示',
+    buttons: [{
+        label: '我知道了',
+        type: 'primary'
+    }]
+  });
     var orderCode_ = decodeURIComponent(getParam("orderCode"));
     $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode_}, function (data) {
         if (data.status == 1) {

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

@@ -366,6 +366,13 @@
 
     //开发票
     function invoiceAdd() {
+        return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;

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

@@ -452,6 +452,13 @@
             });
             return
         }
+        return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;

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

@@ -356,6 +356,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;

src/jfw/modules/app/src/web/templates/commonPay/bidfile/bidfileDetail.html

@@ -334,6 +334,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;

src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html

@@ -352,6 +352,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -205,6 +205,24 @@
         align-self: center;
         margin: 6px 0px;
     }
+    .weui-dialog__hd{
+      text-align: center!important;
+      padding: 26px 0 0!important;
+    }
+    .weui-dialog__title{
+      font-weight: 700;
+      font-size: 18px!important;
+      line-height: 26px!important;
+      color: #171826;
+    }
+    .weui-dialog__bd{
+      padding: 16px 24px 26px!important;
+      margin: 0!important;
+      font-size: .3rem!important;
+      line-height: .44rem!important;
+      color: #5F5E64!important;
+      text-align: justify!important;
+    }
 </style>
 <script>
     var pay_way = "wx_app";
@@ -666,6 +684,13 @@
     }
 
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code":{{.T.o.order_code}}}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/jyapp/front/invoice/showpage?order_code=" +{{.T.o.order_code}}

src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html

@@ -570,6 +570,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         orderCode = decodeURIComponent(getParam("order_code"))
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {

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

@@ -114,6 +114,14 @@
           overflow: hidden;
           margin: 0 auto;
       }
+      #h_content table{
+        /* border: 1px solid #EBEBEB; */
+        border-collapse: collapse!important;
+        border-spacing: 0px !important;
+      }
+      #h_content table tr td,.h_content table th{ 
+        border: 1px solid #EBEBEB;
+      }
     </style>
 </head>
 <body>

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

@@ -77,68 +77,68 @@ func (this *baskPackStruct) defaultConsume() (r map[string]interface{}, m string
 
 //附件下载消费 fui：免费赠送已使用次数；pui：付费权限已使用次数
 func (this *baskPackStruct) fileConsume() (r map[string]interface{}, m string) {
-	//查询当月附件下载历史记录-如是已下载过的附件不再扣除次数
-	this.Month = jy.GetMonth(time.Now().Month().String())
-	this.Year = time.Now().Year()
-	_, retList, _ := this.perPackRechargeApi()
 	_fileName := this.Remarks["fileName"].(string)
 	_id := this.Remarks["id"].(string)
-	_downUrl := ""
-	_size := ""
-	isExists := false
-	for _, item := range retList {
-		itemData := qutil.ObjToMap(item)
-		if itemData == nil || len(*itemData) == 0 {
-			continue
-		}
-		remarks_str := qutil.ObjToString((*itemData)["remarks"])
-		if remarks_str == "" {
-			continue
-		}
-		remarks := make(map[string]interface{})
-		err := json.Unmarshal([]byte(remarks_str), remarks)
-		if err != nil {
-			fmt.Printf("Unmarshal err")
-			continue
-		}
-		if remarks["fileName"] == _fileName && remarks["id"] == _id {
-			// _downUrl = remarks["downUrl"]
-			// _size = remarks["size"]
-			r = remarks
-			isExists = true
-			break
-		}
-	}
-	//当月未有消费记录
-	if !isExists {
-		isCanConsume_f := false
-		isCanConsume_p := false
-		//免费赠送已使用次数
-		mon := fmt.Sprintf(jy.VipFileUploadNumKey, this.UserId, fmt.Sprint(time.Now().Month()))
-		fui := redis.GetInt(jy.PowerCacheDb, mon)
-		if fui < config.BidfileConfig.File_number {
-			isCanConsume_f = true
-		} else if payCount := this.accountPack(); payCount > 0 { //付费未使用次数
-			isCanConsume_p = true
-		}
-		if isCanConsume_f || isCanConsume_p {
-			// 调用rpc 获取附件信息
-			req := util.JyFileRequest{qutil.DecodeArticleId2ByCheck(_id)[0]}
-			rep, err := util.Attachment(&req)
+	// _downUrl := ""
+	// _size := ""
+	BaseMsg := jy.GetBigVipUserBaseMsg(this.UserId, util.Mysql, util.MQFW)
+	if BaseMsg.Status > 0 && BaseMsg.PowerMap[3] {
+		r = fileAttachRpc(_fileName, _id)
+		go func(this *baskPackStruct, r map[string]interface{}) {
+			data := make(map[string]interface{})
+			data["p_type"] = "大会员用户附件下载"
+			data["p_userid"] = this.UserId
+			data["p_infoId"] = this.Remarks["id"].(string)
+			data["s_platform"] = this.Platform
+			data["p_create_time"] = time.Now().Unix()
+			data["p_rep"] = r
+			//存库记录
+			if util.MQFW.Save("filehistroy", data) == "" {
+				log.Println("大会员附件下载-历史记录异常：" + this.UserId)
+			}
+		}(this, r)
+	} else if BaseMsg.VipStatus > 0 {
+		//查询当月附件下载历史记录-如是已下载过的附件不再扣除次数
+		this.Month = jy.GetMonth(time.Now().Month().String())
+		this.Year = time.Now().Year()
+		_, retList, _ := this.perPackRechargeApi()
+		isExists := false
+		for _, item := range retList {
+			itemData := qutil.ObjToMap(item)
+			if itemData == nil || len(*itemData) == 0 {
+				continue
+			}
+			remarks_str := qutil.ObjToString((*itemData)["remarks"])
+			if remarks_str == "" {
+				continue
+			}
+			remarks := make(map[string]interface{})
+			err := json.Unmarshal([]byte(remarks_str), remarks)
 			if err != nil {
-				m = "attachment  rpc调用失败"
-			} else {
-				if rep.Rep != nil && len(rep.Rep) > 0 {
-					//获取当前附件下载地址
-					for _, v := range rep.Rep {
-						if qutil.ObjToString(v["filename"]) == _fileName {
-							_downUrl = qutil.ObjToString(v["downUrl"])
-							_size = qutil.ObjToString(v["size"])
-						}
-					}
-					//api 消费记录
-					this.Remarks["downUrl"] = _downUrl
-					this.Remarks["size"] = _size
+				fmt.Printf("Unmarshal err")
+				continue
+			}
+			if remarks["fileName"] == _fileName && remarks["id"] == _id {
+				r = remarks
+				isExists = true
+				break
+			}
+		}
+		//当月未有消费记录
+		if !isExists {
+			isCanConsume_f := false
+			isCanConsume_p := false
+			//免费赠送已使用次数
+			mon := fmt.Sprintf(jy.VipFileUploadNumKey, this.UserId, fmt.Sprint(time.Now().Month()))
+			fui := redis.GetInt(jy.PowerCacheDb, mon)
+			if fui < config.BidfileConfig.File_number {
+				isCanConsume_f = true
+			} else if payCount := this.accountPack(); payCount > 0 { //付费未使用次数
+				isCanConsume_p = true
+			}
+			if isCanConsume_f || isCanConsume_p {
+				r = fileAttachRpc(_fileName, _id)
+				if len(r) > 0 {
 					rb, rm := this.consumePackApi()
 					if !rb {
 						m = fmt.Sprintf("消费异常：%s", rm)
@@ -153,6 +153,44 @@ func (this *baskPackStruct) fileConsume() (r map[string]interface{}, m string) {
 							}
 						}
 					}
+				} else {
+					m = "获取附件异常"
+				}
+			} else {
+				m = "该用户下载权限当前月已用完"
+			}
+		}
+	} else {
+		//判断免费用户是否有留资下载权限
+		if _, _, freeFileNum := jy.FreeExperience(this.UserId); freeFileNum == 1 {
+			//免费用户下载后取消下载权限
+			redis.PutKV(fmt.Sprintf(jy.PowerCacheFileKey, this.UserId), -1)
+		} else {
+			m = "该用户没有下载权限"
+		}
+	}
+	return
+}
+
+//
+func fileAttachRpc(fileName, id string) (r map[string]interface{}) {
+	r = make(map[string]interface{})
+	// 调用rpc 获取附件信息
+	req := util.JyFileRequest{qutil.DecodeArticleId2ByCheck(id)[0]}
+	rep, err := util.Attachment(&req)
+	if err != nil {
+		log.Println("attachment  rpc调用失败")
+	} else {
+		if rep.Rep != nil && len(rep.Rep) > 0 {
+			//获取当前附件下载地址
+			for _, v := range rep.Rep {
+				if qutil.ObjToString(v["filename"]) == fileName {
+					r = map[string]interface{}{
+						"downurl":  qutil.ObjToString(v["downUrl"]),
+						"filename": qutil.ObjToString(v["filename"]),
+						"size":     qutil.ObjToString(v["size"]),
+					}
+					break
 				}
 			}
 		}

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

@@ -15,8 +15,8 @@ import (
 
 type BaskPack struct {
 	*xweb.Action
-	recordList  xweb.Mapper `xweb:"/basePack/recordList"`  //“包”的使用记录
-	consumePack xweb.Mapper `xweb:"/basePack/consumePack"` //“包”的消费
+	recordList  xweb.Mapper `xweb:"/basePack/recordList"`  //“资源包”使用记录
+	consumePack xweb.Mapper `xweb:"/basePack/consumePack"` //“资源包”消费
 }
 
 //“包”的消费

src/jfw/modules/subscribepay/src/a/jylog.go → src/jfw/modules/subscribepay/src/util/jylog.go

@@ -1,4 +1,4 @@
-package initxweb
+package util
 
 /**
 日志文件自动切换，默认保留15天内日志
@@ -30,7 +30,7 @@ var LogPath = "./jylog"
 func init() {
 	os.Mkdir(LogPath, os.ModePerm)
 	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
+	// initLog(15)
 }
 
 func initLog(saveDay int) {

src/web/staticres/common-module/order-list/css/order-detail.css

@@ -188,3 +188,32 @@
 .j-card-item.text-red .card-item-r {
   color: #FB483D;
 }
+/* vant-reset */
+.van-dialog {
+  width: 6rem;
+  border-radius: .16rem;
+}
+.van-dialog__header {
+  font-weight: 700;
+  font-size: 18px;
+  line-height: 26px;
+  color: #171826;
+}
+.van-dialog__content {
+  padding: .16rem .6rem;
+}
+.van-dialog__message {
+  padding-left: 0;
+  padding-right: 0;
+  font-size: .3rem;
+  line-height: .44rem;
+  color: #5F5E64;
+}
+.van-dialog .van-button {
+  font-size: 18px;
+  line-height: 26px;
+}
+
+.van-dialog  .van-button--default {
+  color: #171826;
+}

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

@@ -384,6 +384,15 @@ var vm = new Vue({
         })
       }
 
+      // 临时需求 未开发票提示当前时期不能开具发票
+      return this.showDialog({
+        title: '温馨提示',
+        message: '因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！',
+        className: 'j-confirm-dialog text-center',
+        showCancelButton: false,
+        confirmButtonText: '我知道了'
+      })
+
       var loading = this.showLoading()
       $.ajax({
         type: 'POST',

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

@@ -967,6 +967,15 @@ var vm = new Vue({
         })
       }
 
+      // 临时需求 未开发票提示当前时期不能开具发票
+      return this.showDialog({
+        title: '温馨提示',
+        message: '因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！',
+        className: '',
+        showCancelButton: false,
+        confirmButtonText: '我知道了'
+      })
+
       var loading = this.showLoading()
       $.ajax({
         type: 'POST',

src/web/staticres/vipsubscribe/css/base.css

@@ -125,4 +125,30 @@ em,i{
     display: -webkit-box;
     -webkit-line-clamp: 3;
     -webkit-box-orient: vertical;
+}
+/* weui重置dialog */
+.weui-dialog {
+  width: 300px!important;
+  /* left: 0.72rem!important;
+  right: 0.72rem!important;
+  transform: translateY(-50%)!important; */
+  border-radius: 0.16rem;
+}
+.weui-dialog__hd{
+  text-align: center!important;
+  padding: 26px 0 0!important;
+}
+.weui-dialog__title{
+  font-weight: 700;
+  font-size: 18px!important;
+  line-height: 26px!important;
+  color: #171826;
+}
+.weui-dialog__bd{
+  padding: 16px 24px 26px!important;
+  margin: 0!important;
+  font-size: .3rem!important;
+  line-height: .44rem!important;
+  color: #5F5E64!important;
+  text-align: justify!important;
 }

src/web/templates/areaPack/pc/page_order.html

@@ -20,6 +20,8 @@
     <link rel="stylesheet" type="text/css"
           href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}"/>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}3"></script>
+    <link href="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.css?v={{Msg "seo" "version"}}"
+          rel="stylesheet">
     <!--[if lt IE 9]>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/respond-js/1.4.2/respond.min.js"></script>
@@ -45,6 +47,24 @@
         .qxBgFont {
             color: #686868;
         }
+        .custom-alert-title{
+          text-align: center;
+          font-size: 18px!important;
+          padding-top: 16px;
+        }
+        .jconfirm-content{
+          font-size: 15px;
+          padding: 0 16px;
+          line-height: 22px;
+        }
+        .jconfirm-buttons{
+          float: none!important;
+          text-align: center;
+        }
+        .custom-alert-btn{
+          margin-bottom: 16px!important;
+          text-align: center;
+        }
     </style>
 </head>
 <body>
@@ -119,6 +139,7 @@
     {{include "/common/baiducc.html"}}
     <script src="{{Msg "seo" "cdn"}}/course/js/jquery-2.1.4.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/course/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/dataExport/jquery-confirm/jquery-confirm.min.js?v={{Msg "seo" "version"}}"></script>
     <!-- footer -->
     <script>
         $(function () {
@@ -285,6 +306,7 @@
 
 
             $(".openinvoice").on("click", function () {
+                return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/common/pcbottom.html

@@ -770,6 +770,62 @@ if (location.href.indexOf('jyblog') === -1) {
         </div>
     </div>
 </div>
+<!-- 暂无法开发票弹框 -->
+<style>
+  #cantOpenInvoiceDialog.modal{
+    /* display: none; */
+    overflow-x: hidden!important;
+    overflow-y: auto!important;
+    /* width: 400px; */
+    background-color: transparent;
+  }
+  #cantOpenInvoiceDialog .modal-dialog{
+    width: 400px;
+  }
+  #cantOpenInvoiceDialog .modal-title{
+    text-align: center;
+    font-size: 18px;
+    font-weight: 600;
+  }
+  #cantOpenInvoiceDialog .modal-header{
+    padding: 30px 34px 0px;
+  }
+  #cantOpenInvoiceDialog .modal-content{
+    border: 0;
+  }
+  #cantOpenInvoiceDialog .modal-body {
+    line-height: 22px;
+    font-size: 15px;
+    text-align: justify;
+  }
+  #cantOpenInvoiceDialog .modal-footer{
+    text-align: center!important;
+  }
+  #cantOpenInvoiceDialog .btn-default, 
+  #cantOpenInvoiceDialog .btn-default:hover, 
+  #cantOpenInvoiceDialog .btn-default:focus, 
+  #cantOpenInvoiceDialog .btn-default:active {
+    background-color: #24C0D7;
+    border: none;
+    color: #fff;
+    font-size: 16px;
+  }
+</style>
+<div class="modal fade" id="cantOpenInvoiceDialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+      <div class="modal-content">
+          <div class="modal-header">
+              <!-- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> -->
+              <h4 class="modal-title" id="myModalLabel">温馨提示</h4>
+          </div>
+          <div class="modal-body">因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！</div>
+          <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">我知道了</button>
+              <!-- <button type="button" class="btn btn-primary">提交更改</button> -->
+          </div>
+      </div><!-- /.modal-content -->
+  </div><!-- /.modal -->
+</div>
 <!--E-侧边栏-->
 
 <script type="text/javascript">
@@ -1058,3 +1114,21 @@ $("#b-clear").click(function(){
 		$("#cnzz_stat_icon_1261815924 a").text("");
 	},1000)
 </script>
+<script>;
+  /* 能开发票时删除以下代码 及详情页开发票点击事件里的return false */
+  $('#order_detail .openinvoice').css({
+    'background': '#EDEFF2',
+    'color': '#5F5E64'
+  })
+  $('#order_detail .openinvoice').unbind('click').bind('click', function(e) {
+    return $('#cantOpenInvoiceDialog').modal()
+  })
+  $('#order_two .openinvoice').css({
+    'background': '#EDEFF2',
+    'color': '#5F5E64'
+  })
+  $('#order_two .openinvoice').unbind('click').bind('click', function(e) {
+    return $('#cantOpenInvoiceDialog').modal()
+  })
+  
+</script>

src/web/templates/course/pc/order_detail.html

@@ -211,6 +211,7 @@
                 }, 3000);
             })
             $(".openinvoice").on("click",function(){
+                return false // 待可开发票时删除
                  window.open("/front/course/applyInvoice?orderCode="+orderId,'_self');
             })
             $(".lookinvoice").on("click",function(){

src/web/templates/order/pc/bidfile/bidfileDetail.html

@@ -222,6 +222,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/order/pc/datareport/detail.html

@@ -197,6 +197,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     var hash = escape("超级订阅");
                     if (r.status != 1) {

src/web/templates/order/pc/integral/integralDetail.html

@@ -244,6 +244,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/pc/aiPack_orderDetail.html

@@ -283,6 +283,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/pc/biddetail_rec.html

@@ -41,6 +41,13 @@
 			color: #1D1D1D;
 			line-height: 24px;
 		}
+    .com-detail table tr{
+      border: 1px solid #EBEBEB;
+    }
+    .com-detail table tr td,.com-detail table th{ 
+      border-right: 1px solid #EBEBEB;
+      padding: 10px;
+    }
 	</style>
 </head>
 <body>
@@ -3666,6 +3673,15 @@ function fromwhere(text){
       // 弹窗留资弹框，第一个参数为source，第二个是留资成功后是否需要刷新页面 可不传，不传即为不刷新
       vm.noCallApiFn('article_attach_freeuser', true)
     })
+    // 控制正文下table里没有内容 但有标签时取消其样式
+    $('.com-detail table').each(function(){
+      var tableText = $(this).text()
+      if (tableText.trim() == '') {
+        $(this).children().children().children('td').css({
+          'padding': '0'
+        })
+      }
+    })
   })
 </script>
 <!--百度统计start-->

src/web/templates/pc/dataPack/packDetail.html

@@ -236,6 +236,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/pc/entniche_orderDetail.html

@@ -179,6 +179,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     var hash = escape("超级订阅");
                     if (r.status != 1) {

src/web/templates/pc/member_orderDetail.html

@@ -272,6 +272,8 @@
                             if(r.data.is_backstage_order!==1){ //发票
                                 if (r.data.applybill_status === 0) {
                                     $(".openinvoice").css("display", "").on("click", function () {
+                                        return false // 待可开发票时删除
+                                        
                                         if (window.isTransferPay) {
                                             checkinvoice(2, '', '请联系客服开票<br>客服热线：400-108-6670')
                                             return

src/web/templates/pc/myOrder.html

@@ -205,6 +205,24 @@
             padding: 0 24px;
             box-sizing: border-box;
         }
+        /* .custom-alert-title{
+          text-align: center;
+          font-size: 18px!important;
+          padding-top: 16px;
+        }
+        .jconfirm-content{
+          font-size: 15px;
+          padding: 0 16px;
+          line-height: 22px;
+        }
+        .jconfirm-buttons{
+          float: none!important;
+          text-align: center;
+        }
+        .custom-alert-btn{
+          margin-bottom: 16px!important;
+          text-align: center;
+        } */
     </style>
 </head>
 <body style="background-color: #fff !important;">
@@ -985,6 +1003,10 @@
                 href = '/front/datapackage/orderPay/' + item.order_code + "?total=" + tempTotal
                 break
             }
+            case '省份订阅包': {
+              href = '/front/areapack/orderPay/' + item.order_code
+              break
+            }
           }
           location.href = href
         },
@@ -1039,6 +1061,18 @@
         },
         goInvoice: function (item) {
           if (item.applybill_status === 0) {
+            return $('#cantOpenInvoiceDialog').modal() 
+            // $.alert({
+            //     title: '温馨提示',
+            //     titleClass: 'custom-alert-title',
+            //     content: '因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！',
+            //     buttons: {
+            //       "我知道了": {
+            //         btnClass: 'custom-alert-btn'
+            //       }
+            //     },
+            //     bgOpacity: 0.5
+            // })
             if (item.product_type === '中标必听课') {
               var href = ''
               if (item.filter.i_drawer === 1) {

src/web/templates/pc/orderDetail.html

@@ -508,6 +508,7 @@
         })
 
         $(".openinvoice").on("click", function () {
+          return false // 待可开发票时删除
             $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                 if (r.status != 1) {
                     window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/pc/subAccount_orderDetail.html

@@ -265,6 +265,7 @@
 
 
             $(".openinvoice").on("click", function () {
+              return false // 待可开发票时删除
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/pc/vip_orderDetail.html

@@ -427,6 +427,7 @@
 
 
             $(".openinvoice").on("click", function () {
+                return false
                 $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
                     if (r.status != 1) {
                         window.open("/front/order/invoicetimeOut", '_self');

src/web/templates/weixin/commonPay/bidfile/bidfiledetail.html

@@ -323,6 +323,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

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

@@ -341,6 +341,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -49,6 +49,32 @@
     .weui-dialog__bd {
         font-weight: normal !important;
     }
+    /* weui重置dialog */
+    .weui-dialog {
+      width: 300px!important;
+      /* left: 0.72rem!important;
+      right: 0.72rem!important;
+      transform: translateY(-50%)!important; */
+      border-radius: 0.16rem;
+    }
+    .weui-dialog__hd{
+      text-align: center!important;
+      padding: 26px 0 0!important;
+    }
+    .weui-dialog__title{
+      font-weight: 700;
+      font-size: 18px!important;
+      line-height: 26px!important;
+      color: #171826;
+    }
+    .weui-dialog__bd{
+      padding: 16px 24px 26px!important;
+      margin: 0!important;
+      font-size: .3rem!important;
+      line-height: .44rem!important;
+      color: #5F5E64!important;
+      text-align: justify!important;
+    }
 </style>
 <script>
     //调用微信支付接口
@@ -605,6 +631,13 @@
     }
 
     function invoiceAdd(order_code) {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": order_code}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + order_code;

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

@@ -369,6 +369,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

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

@@ -443,6 +443,13 @@
 
     //开发票
     function invoiceAdd() {
+        return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         if (window.isTransferPay) {
             weui.alert('请联系客服开票<br>客服热线：400-108-6670', {
                 buttons: [{
@@ -452,7 +459,6 @@
             });
             return
         }
-
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

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

@@ -362,6 +362,13 @@
 
     //开发票
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

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

@@ -927,6 +927,13 @@
     var orderCode = getParam("orderCode")
 
     function invoiceAdd() {
+      return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
+            title: '温馨提示',
+            buttons: [{
+                label: '我知道了',
+                type: 'primary'
+            }]
+        });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
                 window.location.href = "/front/invoice/showpage?order_code=" + orderCode;

src/web/templates/weixin/wxinfocontent_rec.html

@@ -710,6 +710,14 @@ em {
           overflow: hidden;
           margin: 0 auto;
       }
+      #h_content table{
+        /* border: 1px solid #EBEBEB; */
+        border-collapse: collapse!important;
+        border-spacing: 0px !important;
+      }
+      #h_content table tr td,.h_content table th{ 
+        border: 1px solid #EBEBEB;
+      }
 </style>
 </head>
 <body>