From 1e0b7b4dd2f421837e503ed422d99568024e9969 Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao@zte-its.com>
Date: Fri, 14 Jun 2019 14:28:56 +0800
Subject: [PATCH] add license码 add 会员卡续费加一天 add 黄石facicon更新 app下载icon更新

---
 admin/favicon.ico                                       | Bin 1556 -> 0 bytes
 admin/login.html                                        |  30 +++++++++++++++++++++++++++++-
 assets/layouts/layout/img/quickMarkhs.png               | Bin 8639 -> 0 bytes
 assets/pages/scripts/home/index.js                      |  57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 assets/pages/scripts/login.min.js                       |  91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 assets/pages/scripts/vipmanageFile/cardRule/cardrule.js | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------
 6 files changed, 293 insertions(+), 151 deletions(-)

diff --git a/admin/favicon.ico b/admin/favicon.ico
index eebe6c4..28cab9b 100644
Binary files a/admin/favicon.ico and b/admin/favicon.ico differ
diff --git a/admin/login.html b/admin/login.html
index 6d48af7..2d79ec1 100644
--- a/admin/login.html
+++ b/admin/login.html
@@ -17,11 +17,13 @@
 
     <!-- END PAGE LEVEL PLUGINS -->
     <!-- BEGIN THEME GLOBAL STYLES -->
-    <!--<link href="../assets/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />-->
+    <link href="../assets/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
     <link href="../assets/pages/css/common.css?a=1" rel="stylesheet" type="text/css" />
     <link href="../assets/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
     <!-- END THEME GLOBAL STYLES -->
     <!-- BEGIN PAGE LEVEL STYLES -->
+    <link rel="stylesheet" type="text/css" href="../assets/pages/css/commonsetcss/commonsetcss.css?a=3"/>
+    <link rel="stylesheet" type="text/css" href="../assets/pages/css/theme/blue.css?a=3"/>
     <link href="../assets/pages/css/login.css?a=1" rel="stylesheet" type="text/css" />
     <!-- END PAGE LEVEL STYLES -->
     <!-- BEGIN THEME LAYOUT STYLES -->
@@ -85,6 +87,32 @@
 <!--&lt;!&ndash;版权所有&ndash;&gt;-->
 <!--<div class="zteitslogin_foot">版权所有:  中兴智能交通股份有限公司  ©  2008-2016.ZTE ITS LIMITED. All Rights Reserved </div>-->
 <!--</div>-->
+<div class="modal fade in" id="login_licensemodel" style="display: none;" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="ITD-modal-dialog blue-modal">
+        <div class="modal-content ITD-common-color070">
+            <div class="modal-header ITD-model-header">
+                <button type="button" class="close ITD-model-close" data-dismiss="modal" aria-hidden="true">×</button>
+                <span class="ITD-common-fontsize16 colorbig ITD-ztree-headername">License授权码</span>
+                <input type="text" id="login-licenseID" hidden="hidden">
+            </div>
+            <div class="modal-body" style="padding:15px;padding-top: 0">
+                <!--错误提示 sta-->
+                <div id="login_error" class="ITD-model-errormsg display-none"></div>
+                <!--错误提示 end-->
+                <div class="">
+                    <textarea name="" id="login-licenseMsg" cols="46" rows="5" class="licenseMsg ITD-input-bordercolor" placeholder="请输入License授权码"></textarea>
+                </div>
+                <!--底部 sta-->
+                <div class="modal-footer ITD-model-footer">
+                    <button type="button" class="btn ITD-model-btn ITD-bgcolor-c2cad8" data-dismiss="modal" style="line-height: 0">取消</button>
+                    <button type="button" class="btn ITD-model-btn ITD-bgcolor-green textTrue" style="line-height: 0" id="loginl-submit">确定</button>
+                </div>
+                <!--底部 end-->
+            </div>
+
+        </div>
+    </div>
+</div>
 <!--[if lt IE 9]>
 <script src="../assets/global/plugins/respond.min.js"></script>
 <script src="../assets/global/plugins/excanvas.min.js"></script>
diff --git a/assets/layouts/layout/img/quickMarkhs.png b/assets/layouts/layout/img/quickMarkhs.png
index b20861c..55f8ebd 100644
Binary files a/assets/layouts/layout/img/quickMarkhs.png and b/assets/layouts/layout/img/quickMarkhs.png differ
diff --git a/assets/pages/scripts/home/index.js b/assets/pages/scripts/home/index.js
index 37e9d85..e304d71 100644
--- a/assets/pages/scripts/home/index.js
+++ b/assets/pages/scripts/home/index.js
@@ -681,7 +681,6 @@ var specialAccount = ['10122','10014','10050'];
 
             var data = [];
 
-            debugger
             //赤峰账号特殊处理
             if((specialAccount.indexOf(fn.getUserId()) >= 0) && fn.getOrgId() ==10003){
                 data = fn.getParkLot(3);
@@ -766,6 +765,62 @@ var specialAccount = ['10122','10014','10050'];
 
 })();
 
+//license码 右下角弹窗
+function licensepopInit(title,content) {
+    //取当前浏览器窗口大小
+    var windowWidth=$(document).width();
+    var windowHeight=$(document).height();
+    //弹窗的大小
+    var weight=320;
+    var height=240;
+    $("body").append(
+        "<div id='pop_div'style='display:none;position:absolute;background-color:#fff;z-index:99;width:"+weight+"px;height:"+height+"px;bottom: 10px;right:10px'>"+
+        "<div style='line-height:32px;background:#1E95CD;color:#fff;font-size:14px;padding:0 0 0 10px;'>" +
+        "<div style='float:left;'><b>"+title+"</b></div><div style='float:right;cursor:pointer;'>" +
+        // "<b onclick='pop_close()' style='width: 15px;display: inline-block;'>×</b>" +
+        "</div>" +
+        "<div style='clear:both'></div>"+
+        "</div>" +
+        "<div id='content' style='padding-top: 60px;color:red '>您的License授权码将于" +
+        content+
+        "过期，请尽快更新</div>"+
+        "</div>"
+    );
+}
+//关闭提示
+function pop_close(){
+    $('#pop_div').fadeOut(400);
+};
+//倒计时函数
+var licennseTimer = window.setTimeout("pop_close()",6000);
+
+//license 函数
+function updateSysLicense() {
+    var req = {
+        orgId: fn.getOrgId(),
+    };
+    var licenseAjax = {
+        method: "post",
+        url: dataUrl.util.querySysLicense(),
+        data: JSON.stringify(req),
+        contentType: 'application/json; charset=utf-8',
+        dataType: 'json',
+        success: function (res) {
+            if (res.code == '8888') {
+                var ext=res.data.ext
+                licensepopInit("提示",ext);
+                $('#pop_div').fadeIn(400);
+            } else {
+                console.log(res);
+            }
+        }
+    };
+    sysAjax(licenseAjax);
+};
+
+updateSysLicense();
+
+
 
 //获取获取和时间状态
 function userName() {
diff --git a/assets/pages/scripts/login.min.js b/assets/pages/scripts/login.min.js
index bb0cf1c..1654a98 100644
--- a/assets/pages/scripts/login.min.js
+++ b/assets/pages/scripts/login.min.js
@@ -84,7 +84,7 @@ slide();
 
 
 /**
- *  输入框内容检测插件
+ *  输入框内容检测插件  $('#login_licensemodel').modal('show');
  */
 var $imageCodeValue = $('#login_imgCode_value');
 var $imageCode = $('#login_imgCode');
@@ -188,8 +188,8 @@ $('#password').on("blur", function() { //验证邮箱地址
 $('#login-btn').on('click',function () {
     var obj1 = $('#userName');
     var obj2 = $('#password');
-     username(obj1);
-     password(obj2);
+    username(obj1);
+    password(obj2);
     //verification($('#login_imgCode_value'));
     if(flagAjax){
         var verificationText =  $('#slide_xbox').text();
@@ -227,7 +227,7 @@ $('#login-btn').on('click',function () {
 
     }
 
-   // window.location.href='index.html';
+    // window.location.href='index.html';
 });
 //回车事件
 $('#login_imgCode_value').keyup(function(event){
@@ -237,12 +237,12 @@ $('#login_imgCode_value').keyup(function(event){
     }
 });
 $('#login_imgCode_value').on('input',function () {
-     var val = $('#login_imgCode_value').val();
-     if(val){
-         $('.verification-logo').addClass('glyphicon glyphicon-remove');
-     }else{
-         $('.verification-logo').removeClass('glyphicon glyphicon-remove');
-     }
+    var val = $('#login_imgCode_value').val();
+    if(val){
+        $('.verification-logo').addClass('glyphicon glyphicon-remove');
+    }else{
+        $('.verification-logo').removeClass('glyphicon glyphicon-remove');
+    }
 
 });
 $('.verification-logo').on('click',function () {
@@ -272,6 +272,7 @@ function imgCodeSuccess(res) {
     }
 
 }
+var loginorgID = '';//loginorgID
 //登录成功的函数
 function loginSuccess(res) {
     if (res.code === '8888') {
@@ -308,18 +309,74 @@ function loginSuccess(res) {
         // $('.verification-logo').addClass('glyphicon glyphicon-remove');
         $('#login_error_ifo').text("验证码错误");
         //return false;
-       // $imageCodeValue.focus();
-       //  getImgCode();
+        // $imageCodeValue.focus();
+        //  getImgCode();
     } else if(res.code == "2010"){
-    	  $('#login_error_ifo').text("用户没有关联停车场");
+        $('#login_error_ifo').text("用户没有关联停车场");
         // getImgCode();
+    }else if(res.code == "2012"){
+        // $('#login_error_ifo').text("License不存在");
+        loginorgID=res.data.orgId;
+        $('#login_error').addClass('display-none').text('');
+        $('#login-licenseMsg').val('');
+        $('#login_licensemodel').modal('show');
+        $('#login_error').removeClass('display-none').text('License不存在');
+
+    }else if(res.code == "2013"){
+        // $('#login_error_ifo').text("License已经过期");
+        loginorgID=$('#login-licenseID').val(res.data.orgId);
+        $('#login_error').addClass('display-none').text('');
+        $('#login-licenseMsg').val('');
+        $('#login_licensemodel').modal('show');
+        $('#login_error').removeClass('display-none').text('License已经过期');
+
+    }else if(res.code == "2014"){
+        // $('#login_error_ifo').text("License不合法");
+        loginorgID=$('#login-licenseID').val(res.data.orgId);
+        $('#login_error').addClass('display-none').text('');
+        $('#login-licenseMsg').val('');
+        $('#login_licensemodel').modal('show');
+        $('#login_error').removeClass('display-none').text('License不合法');
     }
     else {
-    	console.log(res.code);
+        console.log(res.code);
         $('.verification-logo').removeClass('glyphicon glyphicon-remove').addClass('glyphicon glyphicon-ok');
         $('#login_error_ifo').text("系统错误");
-       // $error.text(res.msg);
-       //  getImgCode();
+        // $error.text(res.msg);
+        //  getImgCode();
     }
 
-}
\ No newline at end of file
+}
+//确定 事件 （上报license 授权码）
+documentBindFunc.on('click','#loginl-submit',function () {
+    updateSysLicense();
+})
+//上报license 授权码
+function updateSysLicense() {
+    var licenseID=$('#login-licenseMsg').val();
+    if(licenseID==null||licenseID==''||licenseID==undefined){
+        $('#login_error').removeClass('display-none').text('License授权码不能为空');
+        return;
+    }
+    var req = {
+        sysCode:sysComm.sysCode,
+        orgId: loginorgID,
+        license: licenseID
+    };
+    var licenseAjax = {
+        method: "post",
+        url: dataUrl.util.updateSysLicenseByOrgId(),
+        data: JSON.stringify(req),
+        contentType: 'application/json; charset=utf-8',
+        dataType: 'json',
+        success: function (res) {
+            if (res.code == '8888') {
+                $('#login-licenseMsg').val('');
+                $('#login_licensemodel').modal('hide');
+            } else {
+                console.log(res);
+            }
+        }
+    };
+    sysAjax(licenseAjax);
+};
diff --git a/assets/pages/scripts/vipmanageFile/cardRule/cardrule.js b/assets/pages/scripts/vipmanageFile/cardRule/cardrule.js
index 11dcab2..9cf94fd 100644
--- a/assets/pages/scripts/vipmanageFile/cardRule/cardrule.js
+++ b/assets/pages/scripts/vipmanageFile/cardRule/cardrule.js
@@ -98,28 +98,28 @@ var cardruleFun={
                 if(res.code == '8888') {
                     var data = res.data;
                     if(data != null){
-                       $.each(data,function(index,row){
-                           cardActAmountTotal+= row.cardActAmount;
-                           carNumTotalTotal +=  row.carNumTotal;
-                           recentExpcarNumTotalTotal += row.recentExpcarNumTotal;
-                           if(row.cardType == 1 || row.cardType == 6){//年卡
-                               cardActAmountTotalYears +=row.cardActAmount;
-                               carNumTotalTotalYears  += row.carNumTotal;
-                               recentExpcarNumTotalYears += row.recentExpcarNumTotal;
-                           }else if(row.cardType == 3){//季卡
-                               cardActAmountTotalSeason +=row.cardActAmount;
-                               carNumTotalTotalSeason  += row.carNumTotal;
-                               recentExpcarNumTotalSeason += row.recentExpcarNumTotal;
-                           }else if(row.cardType == 4 || row.cardType == 7 ){//月卡
-                               cardActAmountTotalMonth +=row.cardActAmount;
-                               carNumTotalTotalMonth  += row.carNumTotal;
-                               recentExpcarNumTotalMonth += row.recentExpcarNumTotal;
-                           }else{
-                               cardActAmountTotalOthers +=row.cardActAmount;
-                               carNumTotalTotalOthers  += row.carNumTotal;
-                               recentExpcarNumTotalOthers += row.recentExpcarNumTotal;
-                           }
-                       });
+                        $.each(data,function(index,row){
+                            cardActAmountTotal+= row.cardActAmount;
+                            carNumTotalTotal +=  row.carNumTotal;
+                            recentExpcarNumTotalTotal += row.recentExpcarNumTotal;
+                            if(row.cardType == 1 || row.cardType == 6){//年卡
+                                cardActAmountTotalYears +=row.cardActAmount;
+                                carNumTotalTotalYears  += row.carNumTotal;
+                                recentExpcarNumTotalYears += row.recentExpcarNumTotal;
+                            }else if(row.cardType == 3){//季卡
+                                cardActAmountTotalSeason +=row.cardActAmount;
+                                carNumTotalTotalSeason  += row.carNumTotal;
+                                recentExpcarNumTotalSeason += row.recentExpcarNumTotal;
+                            }else if(row.cardType == 4 || row.cardType == 7 ){//月卡
+                                cardActAmountTotalMonth +=row.cardActAmount;
+                                carNumTotalTotalMonth  += row.carNumTotal;
+                                recentExpcarNumTotalMonth += row.recentExpcarNumTotal;
+                            }else{
+                                cardActAmountTotalOthers +=row.cardActAmount;
+                                carNumTotalTotalOthers  += row.carNumTotal;
+                                recentExpcarNumTotalOthers += row.recentExpcarNumTotal;
+                            }
+                        });
                         $("#cardActAmountTotal").text(cardruleFun.moneyFormatter(cardActAmountTotal)); //总金额
                         $("#carNumTotalTotal").text(carNumTotalTotal);  //总授权车辆数
                         $("#recentExpcarNumTotalTotal").text(recentExpcarNumTotalTotal); //近期失效总数
@@ -152,14 +152,14 @@ var cardruleFun={
         fn.getCarType(function (data){
             var html="<option value='ALL'>所有车型</option>";
             if(data != null){
-             $.each(data,function(index,row){
-                 if("大型车" == row.codeValueName){
-                     html += "<option value='1'>" + row.codeValueName + "</option>";
-                 }else{
-                     html += "<option value='2'>" + row.codeValueName + "</option>";
-                 }
-
-             });
+                $.each(data,function(index,row){
+                    if("大型车" == row.codeValueName){
+                        html += "<option value='1'>" + row.codeValueName + "</option>";
+                    }else{
+                        html += "<option value='2'>" + row.codeValueName + "</option>";
+                    }
+
+                });
                 $('#carType').html(html);
                 $('#carType').selectpicker('refresh');
             }
@@ -623,30 +623,30 @@ var cardruleFun={
                 if (res.code=='8888') {
                     var data = res.data;
                     var html ="";
-                        if(data != null && data.length >0){
-                            $('#error-ifo-add').removeClass('display-none').text('');
-
-                            $.each(data,function(index,row){
-                                if(index == 0){
-                                    $("#cardTypeAdd").removeAttr("value");
-                                    $("#cardTypeAdd").attr("value",row.cardType);
-                                    $("#carTypeAdd").text(cardruleFun.carTypeFormatter(row.carType));
-                                    $("#effExDateAdd").text(cardruleFun.inDatatimeFormatter(row.effDate)+" - "+cardruleFun.inDatatimeFormatter(row.expDate));
-                                    $("#priceAdd").text(cardruleFun.moneyFormatter(row.price));
-                                    $("#disCountValueAdd").text((row.discValue == null || row.discValue =="" || row.discValue == undefined) ? "无折扣" : row.discValue +"折");
-                                    $("#cardTypeAdd").text(cardruleFun.cardTypeFormatter(row.cardType));
-                                }
-                                html += "<option value='"+row.cardNo+"' carType='"+row.carType+"' effDate='"+cardruleFun.inDatatimeFormatter(row.effDate)+"' expDate='"+cardruleFun.inDatatimeFormatter(row.expDate)+"' " +
-                                    " price='"+row.price+"' discValue='"+row.discValue+"' cardType='"+row.cardType+"'>"
-                                    + row.cardName + "</option>";
-                            });
-                            $('#cardrulepop-cardName').html(html);
-                            $('#cardrulepop-cardName').selectpicker('refresh');
+                    if(data != null && data.length >0){
+                        $('#error-ifo-add').removeClass('display-none').text('');
+
+                        $.each(data,function(index,row){
+                            if(index == 0){
+                                $("#cardTypeAdd").removeAttr("value");
+                                $("#cardTypeAdd").attr("value",row.cardType);
+                                $("#carTypeAdd").text(cardruleFun.carTypeFormatter(row.carType));
+                                $("#effExDateAdd").text(cardruleFun.inDatatimeFormatter(row.effDate)+" - "+cardruleFun.inDatatimeFormatter(row.expDate));
+                                $("#priceAdd").text(cardruleFun.moneyFormatter(row.price));
+                                $("#disCountValueAdd").text((row.discValue == null || row.discValue =="" || row.discValue == undefined) ? "无折扣" : row.discValue +"折");
+                                $("#cardTypeAdd").text(cardruleFun.cardTypeFormatter(row.cardType));
+                            }
+                            html += "<option value='"+row.cardNo+"' carType='"+row.carType+"' effDate='"+cardruleFun.inDatatimeFormatter(row.effDate)+"' expDate='"+cardruleFun.inDatatimeFormatter(row.expDate)+"' " +
+                                " price='"+row.price+"' discValue='"+row.discValue+"' cardType='"+row.cardType+"'>"
+                                + row.cardName + "</option>";
+                        });
+                        $('#cardrulepop-cardName').html(html);
+                        $('#cardrulepop-cardName').selectpicker('refresh');
                     }else{
-                            $("#carTypeAdd").removeAttr("value");
-                            $('#cardrulepop-cardName').html("<option>所有卡名称</option>");
-                            $('#error-ifo-add').removeClass('display-none').text('该停车场没有创建会员卡,请在【卡规则设置】页面创建会员卡');
-                            return;
+                        $("#carTypeAdd").removeAttr("value");
+                        $('#cardrulepop-cardName').html("<option>所有卡名称</option>");
+                        $('#error-ifo-add').removeClass('display-none').text('该停车场没有创建会员卡,请在【卡规则设置】页面创建会员卡');
+                        return;
                     }
                 }
 
@@ -691,7 +691,7 @@ var cardruleFun={
         $(document).on('click','#alert_sure',function(){
             $("#alert_sure").attr("disabled","disabled");
             var checkFlg = false;
-           //1.判断是否添加会员卡
+            //1.判断是否添加会员卡
             var ulDocument = $("#card-list-main").find('ul');
             var cardNames=$("#cardrulepop-cardName").find("option:selected").val();
             if(cardNames== '' || cardNames == undefined || cardNames == null){
@@ -705,13 +705,13 @@ var cardruleFun={
             }
             //2.先判断是否每条都做校验
             $.each(ulDocument,function(index,row){
-               var  verificationName = $(this).find('li').find('.verification-btn').text();
-               if("校验" == verificationName){
-                   $("#alert_sure").removeAttr("disabled");
-                   checkFlg = true;
-                   $('#error-ifo-add').removeClass('display-none').text('未校验,请先校验');
-                   return;
-               }
+                var  verificationName = $(this).find('li').find('.verification-btn').text();
+                if("校验" == verificationName){
+                    $("#alert_sure").removeAttr("disabled");
+                    checkFlg = true;
+                    $('#error-ifo-add').removeClass('display-none').text('未校验,请先校验');
+                    return;
+                }
             });
             if(checkFlg){
                 return ;
@@ -761,11 +761,11 @@ var cardruleFun={
             });
 
             var carData = [];
-           $.each(detailList,function(index,rows){
-               var datas= rows.carNumber;
+            $.each(detailList,function(index,rows){
+                var datas= rows.carNumber;
 
-               carData.push(datas);
-           });
+                carData.push(datas);
+            });
             console.log(carData);
             var nary=carData.sort();
             for(var i=0;i<carData.length;i++){
@@ -777,7 +777,7 @@ var cardruleFun={
 
             }
 
-           //保存数据
+            //保存数据
             var req = {
                 sysCode: sysComm.sysCode,
                 cardNo: cardNo,
@@ -898,9 +898,9 @@ documentBindFunc.on('click','#card-add-btn',function () {
         // $(this).find('.verification-btn').text('校验').css('color','#1E95CD');
         var d = new Date(ev.date);
         var nums=$(this).parent().parent('ul').find('.car-num-inp').val();
-       /* if(nums=='' ||nums==undefined || nums==null ||nums==NaN){
-            return nums=0;
-        }*/
+        /* if(nums=='' ||nums==undefined || nums==null ||nums==NaN){
+             return nums=0;
+         }*/
         var cardTypeAddValue = $('#cardTypeAdd').attr("value");
         if(cardTypeAddValue=='1' || cardTypeAddValue == '6' ){
             $(this).parent().parent().find('.enddate-inp').text(moment(d).add('month', (12*nums)).format('YYYY-MM-DD'));
@@ -1018,34 +1018,34 @@ $('#card-list-main').delegate('.verification-btn','click',function () {
     }else {
         // //;
         //
-                var getdisVal = $("#cardrulepop-cardName").find("option:selected").attr("discValue");
-                if(getdisVal == null || getdisVal == "" || getdisVal == undefined){
-                    getdisVal=10;
-                }
-                var disVal=(getdisVal)/10;//折扣
-                var timeVal=$(this).parent().parent('ul').find(".card-daterange-btnsta").val()+" 00:00:00";//生效时间
-                var d = new Date(timeVal);
-                $(this).parent().parent().find('.car-money-inp').text(numinp*($("#priceAdd").text())*disVal);//实收金额
-                //失效时间
-
-                var cardTypeAddValue = $('#cardTypeAdd').attr("value");
-                if(cardTypeAddValue=='1' || cardTypeAddValue == '6' ){
-                    $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (12*numinp))).format('YYYY-MM-DD'));
-                }else if(cardTypeAddValue == '2'){
-                    $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (6*numinp))).format('YYYY-MM-DD'));
-                }else if(cardTypeAddValue == '3'){
-                    $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (3*numinp))).format('YYYY-MM-DD'));
-                }else if(cardTypeAddValue == '4' || cardTypeAddValue == '7'){
-                    $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (1*numinp))).format('YYYY-MM-DD'));
-                }else if(cardTypeAddValue =='5'){
-                    $(this).parent().parent().find('.enddate-inp').text((moment(d).add('day', (1*numinp))).format('YYYY-MM-DD'));
-                }
+        var getdisVal = $("#cardrulepop-cardName").find("option:selected").attr("discValue");
+        if(getdisVal == null || getdisVal == "" || getdisVal == undefined){
+            getdisVal=10;
+        }
+        var disVal=(getdisVal)/10;//折扣
+        var timeVal=$(this).parent().parent('ul').find(".card-daterange-btnsta").val()+" 00:00:00";//生效时间
+        var d = new Date(timeVal);
+        $(this).parent().parent().find('.car-money-inp').text(numinp*($("#priceAdd").text())*disVal);//实收金额
+        //失效时间
+
+        var cardTypeAddValue = $('#cardTypeAdd').attr("value");
+        if(cardTypeAddValue=='1' || cardTypeAddValue == '6' ){
+            $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (12*numinp))).format('YYYY-MM-DD'));
+        }else if(cardTypeAddValue == '2'){
+            $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (6*numinp))).format('YYYY-MM-DD'));
+        }else if(cardTypeAddValue == '3'){
+            $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (3*numinp))).format('YYYY-MM-DD'));
+        }else if(cardTypeAddValue == '4' || cardTypeAddValue == '7'){
+            $(this).parent().parent().find('.enddate-inp').text((moment(d).add('month', (1*numinp))).format('YYYY-MM-DD'));
+        }else if(cardTypeAddValue =='5'){
+            $(this).parent().parent().find('.enddate-inp').text((moment(d).add('day', (1*numinp))).format('YYYY-MM-DD'));
+        }
         var expDate = $.trim(_ul.find('.enddate-inp').text());//结束时间
         console.log(expDate)
         var todayDate= moment().subtract('days', 0).format('YYYY-MM-DD');
         //失效时间 校验
         if(expDate =="" || expDate == null || expDate == undefined){
-             $('#error-ifo-add').removeClass('display-none').text('失效时间不能为空,请重新选择失效时间');
+            $('#error-ifo-add').removeClass('display-none').text('失效时间不能为空,请重新选择失效时间');
             return;
         }
 
@@ -1320,7 +1320,9 @@ documentBindFunc.on('click','.renewMon',function () {
     if(new Date(parkInfo.effDate)>new Date(parkInfo.expDate)){
         $("#card-daterangesta-renew").text(cardruleFun.datetimeFormatter(parkInfo.effDate));
     }else {
-        $("#card-daterangesta-renew").text(cardruleFun.datetimeFormatter(parkInfo.expDate));
+        var sdate=new Date(cardruleFun.datetimeFormatter(parkInfo.expDate)+' 00:00:00');
+        sdate=sdate.setDate(sdate.getDate()+1);
+        $("#card-daterangesta-renew").text(cardruleFun.datetimeFormatter(sdate));
     }
 
     var renewDate= $("#card-daterangesta-renew").text()+' 00:00:00';
@@ -1645,33 +1647,33 @@ documentBindFunc.on('click','#renewlicesen-sure',function (){
         detailList:detailList
     };
     if(flg){
-       flg = false;
+        flg = false;
         $("#renewlicesen-sure").attr("disabled","disabled");
-    var opt = {
-        method: 'post',
-        url: dataUrl.util.changeVipCardCustInfoCarNumberById(),
-        data: JSON.stringify(req),
-        contentType: 'application/json; charset=utf-8',
-        dataType: 'json',
-        success: function (res) {
-            if(res.code=='8888'){
-                flg = true;
-                $("#renewlicesen-sure").removeAttr("disabled");
-                $('#error-ifo-licesen').addClass('display-none').text("");
-                $('#renewlicesen_alertmodel').modal('hide');
-                $("#cardrule-table").bootstrapTable('refresh');
-                //汇总查询
-                cardruleFun.queryVipCardOrderDetailTotal();
-            }else{
-                flg = true;
-                $("#renewlicesen-sure").removeAttr("disabled");
-                $('#error-ifo-licesen').removeClass('display-none').text(res.msg);
-                return;
-            }
+        var opt = {
+            method: 'post',
+            url: dataUrl.util.changeVipCardCustInfoCarNumberById(),
+            data: JSON.stringify(req),
+            contentType: 'application/json; charset=utf-8',
+            dataType: 'json',
+            success: function (res) {
+                if(res.code=='8888'){
+                    flg = true;
+                    $("#renewlicesen-sure").removeAttr("disabled");
+                    $('#error-ifo-licesen').addClass('display-none').text("");
+                    $('#renewlicesen_alertmodel').modal('hide');
+                    $("#cardrule-table").bootstrapTable('refresh');
+                    //汇总查询
+                    cardruleFun.queryVipCardOrderDetailTotal();
+                }else{
+                    flg = true;
+                    $("#renewlicesen-sure").removeAttr("disabled");
+                    $('#error-ifo-licesen').removeClass('display-none').text(res.msg);
+                    return;
+                }
 
-        }
-    };
-    sysAjax(opt);
+            }
+        };
+        sysAjax(opt);
     }
 
 });
@@ -1958,7 +1960,7 @@ documentBindFunc.on('click', '#excleTemplate', function() {
 
 //上传filestr.................................................
 $('#uplate_sure').on('click', function() {
-         var url =dataUrl.util.batchImportVipCardCustInfo();
+    var url =dataUrl.util.batchImportVipCardCustInfo();
     ajaxSubmit("form1",url,function(res){
         if(res.code == '8888') {
             var data = res.data;
@@ -2045,19 +2047,19 @@ $('#uplate_sure').on('click', function() {
             });
         }
     });
-        function ajaxSubmit(formId,url,callback){
-            $("#"+formId).ajaxSubmit({
-                url: url, //后台方法的路径
-                type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                beforeSend: function (xhr) {
-                    xhr.setRequestHeader("x-auth-token", fn.getToken());
-                },
-                success: function(data) { // data 保存提交后返回的数据，一般为 json 数据
-                    callback(data);
-                }
-            });
-        };
+    function ajaxSubmit(formId,url,callback){
+        $("#"+formId).ajaxSubmit({
+            url: url, //后台方法的路径
+            type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+            dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+            beforeSend: function (xhr) {
+                xhr.setRequestHeader("x-auth-token", fn.getToken());
+            },
+            success: function(data) { // data 保存提交后返回的数据，一般为 json 数据
+                callback(data);
+            }
+        });
+    };
 
 
 
--
libgit2 0.21.4