From 69adcbabf8bf9b73e1271338d404f14fb0018e52 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 15 Jul 2020 19:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteCompanyController.class.php        |  2 +-
 .../Admin/View/PromoteCompany/add.html        | 66 ++++++++-----------
 .../Admin/View/PromoteCompany/edit.html       | 66 ++++++++-----------
 Data/update.sql                               | 14 ++++
 Public/static/czinputcheck.js                 | 32 +++++++++
 5 files changed, 101 insertions(+), 79 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 7ddf2000f..cf4fe869a 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -221,7 +221,7 @@ class PromoteCompanyController extends ThinkController
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
-        $page = set_pagination($count, $row, $parameter);
+        $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);
         }
diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html
index 34fbf450b..0d41aa0c8 100644
--- a/Application/Admin/View/PromoteCompany/add.html
+++ b/Application/Admin/View/PromoteCompany/add.html
@@ -19,7 +19,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script>
     <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
-    <script src="__STATIC__/czinputcheck.js?v=0527" type="text/javascript"></script>
+    <script src="__STATIC__/czinputcheck.js?v=07151710" type="text/javascript"></script>
     <style>
         .coin-detail{
             display: block;
@@ -42,7 +42,7 @@
 
         <div class="tab-content tabcon1711">
             <!-- 表单 -->
-            <!-- <form id="form" action="{:U('add')}" method="post" class="form-horizontal"> -->
+            <form id="form" >
                 <!-- 基础 -->
                 <div id="tab1" class="tab-pane in tab1 ">
                     <table  border="0" cellspacing="0" cellpadding="0">
@@ -250,14 +250,12 @@
                     </table>
                 </div>
                 <div class="form-item cf" style="margin-bottom: 40px;">
-                    <button class="submit_btn " id="submit" style="margin-left:210px;">
-                        保存
-                    </button>
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:history.back(-1);" >
+                    <input class="submit_btn" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
                         返回
                     </a>
                 </div>
-            <!-- </form> -->
+            </form>
         </div>
     </div>
     <div class="common_settings">
@@ -314,6 +312,12 @@
             language: "zh-CN",
             minView: 2,
             autoclose: true
+        }).change(function(){
+            var start = new Date($(this).val()).getTime();
+            var end = new Date($('#contact_end').val()).getTime();
+            if(isNaN(end)) {return false;}
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');$("#contact_begin").val('');return false;}
+            return false;
         });
 
         $('#datetimepicker').datetimepicker({
@@ -322,7 +326,14 @@
             minView: 2,
             autoclose: true,
             pickerPosition: 'bottom-left'
-        })
+        }).change(function(){
+            var end = new Date($("#contact_end").val()).getTime();
+            var start = new Date($('#contact_begin').val()).getTime();
+            if(isNaN(start)) {return false;}
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');$("#contact_end").val('');return false;}
+            return false;
+        });
+
         $(".coin-detail").click(function () {
             var url = $(this).data('url');
             var title =  '文档添加';
@@ -337,45 +348,22 @@
         });
         $("#submit").on("click",function(){
             var obj = {
-                "company_name":["required","推广公司名称不允许为空"],
-                "platform_name":["nocheck"],
-                "contact_begin":["nocheck","合同开始时间不能为空"],
-                "contact_end":["nocheck","合同结束时间不能为空"],
-                "fax_ratio":[["number",true],"开票税率必须是数字，如果无此项请填0"],
-                "company_type":["nocheck","公司性质不能为空","select"],
-                "is_sign_contact":["nocheck","是否签署合同项不能为空","select"],
-                "company_belong":["nocheck","团体归属不能为空","select"],
-                "settlement_contact":["nocheck","结算联系人不能为空"],
-                "contact_phone":[["phone",true],"联系人电话格式不对"],
-                "address":["nocheck","联系人地址不能为空"],
-                "bank_card":[["bankid",true],"银行卡格式错误"],
-                "bank_name":["nocheck","银行名称不能为空"],
-                "bank_address":["nocheck","帐户名不能为空"],
-                "ali_user":["nocheck","支付宝真实姓名不能为空"],
-                "ali_account":["nocheck","支付宝登陆账号不能为空"],
-                "content":["nocheck"],
-                "service_agreement_show":["nocheck","","select"],
-                "marketing_director_show":["nocheck","","radio"],
-                "status":["nocheck","","radio"],
-                "develop_type":["nocheck","开发类型不能为空","select"]
-            }
-            var cres = CIC.checkAddInput(obj);
-            if(!cres){
-                return false;
-            }
-            if (Date.parse(cres.contact_begin) > Date.parse(cres.contact_end)) {
-                layer.msg('开始时间必须小于等于结束时间');
-                return false;
+                "company_name":["required",false,"推广公司名称不允许为空"],
+                "fax_ratio":["number",true,"开票税率必须是数字，如果无此项请填0"],
+                "contact_phone":["phone",true,"联系人电话格式不对"],
+                "bank_card":["bankid",true,"银行卡格式错误"]
             }
+            if(!CIC.checkInput(obj)){ return false; }
+            var senddata = $("#form").serializeArray();
             //验证通过
             if(doc.length > 0){
-                cres.resources = doc;
+                senddata.push({"name":"resources", "value":JSON.stringify(doc)});
             }
             //添加
             $.ajax({
                 url:"{:U('PromoteCompany/add')}",
                 type:"post",
-                data:cres,
+                data:senddata,
                 dataType:"json",
                 success:function(data){
                     if(data.status == 1){
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 30be1cfa6..f9ea0cd0c 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -42,7 +42,7 @@
 
         <div class="tab-content tabcon1711">
             <!-- 表单 -->
-            <!-- <form id="form" action="{:U('add')}" method="post" class="form-horizontal"> -->
+            <form id="form">
                 <!-- 基础 -->
                 <div id="tab1" class="tab-pane in tab1 ">
                     <table  border="0" cellspacing="0" cellpadding="0">
@@ -261,14 +261,12 @@
                     </table>
                 </div>
                 <div class="form-item cf" style="margin-bottom: 40px;">
-                    <button class="submit_btn " id="submit" style="margin-left:210px;">
-                        保存
-                    </button>
+                    <input class="submit_btn" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
                     <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:history.back(-1);" >
                         返回
                     </a>
                 </div>
-            <!-- </form> -->
+            </form>
         </div>
     </div>
     <div class="common_settings">
@@ -385,6 +383,12 @@
             language: "zh-CN",
             minView: 2,
             autoclose: true
+        }).change(function(){
+            var start = new Date($(this).val()).getTime();
+            var end = new Date($('#contact_end').val()).getTime();
+            if(isNaN(end)) {return false;}
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');$("#contact_begin").val('');return false;}
+            return false;
         });
 
         $('#datetimepicker').datetimepicker({
@@ -393,7 +397,15 @@
             minView: 2,
             autoclose: true,
             pickerPosition: 'bottom-left'
-        })
+        }).change(function(){
+            var end = new Date($("#contact_end").val()).getTime();
+            var start = new Date($('#contact_begin').val()).getTime();
+            if(isNaN(start)) {return false;}
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');$("#contact_end").val('');return false;}
+            return false;
+        });
+
+
         $(".coin-detail").click(function () {
             var url = $(this).data('url');
             var title =  '文档添加';
@@ -408,46 +420,22 @@
         });
         $("#submit").on("click",function(){
             var obj = {
-                "company_name":["required","推广公司名称不允许为空"],
-                "platform_name":[["nocheck",true]],
-                "contact_begin":[["nocheck",true],"合同开始时间不能为空"],
-                "contact_end":[["nocheck",true],"合同结束时间不能为空"],
-                "fax_ratio":[["number",true],"开票税率必须是数字，如果无此项请填0"],
-                "company_type":["nocheck","公司性质不能为空","select"],
-                "is_sign_contact":["nocheck","是否签署合同项不能为空","select"],
-                "company_belong":["nocheck","团体归属不能为空","select"],
-                "settlement_contact":[["nocheck",true],"结算联系人不能为空"],
-                "contact_phone":[["phone",true],"联系人电话格式不对"],
-                "address":[["nocheck",true],"联系人地址不能为空"],
-                "bank_card":[["bankid",true],"银行卡格式错误"],
-                "bank_name":[["nocheck",true],"银行名称不能为空"],
-                "bank_address":[["nocheck",true],"帐户名不能为空"],
-                "ali_user":[["nocheck",true],"支付宝真实姓名不能为空"],
-                "ali_account":[["nocheck",true],"支付宝登陆账号不能为空"],
-                "content":[["nocheck",true]],
-                "develop_type":["nocheck","开发类型不能为空","select"],
-                "status":["nocheck","","radio"],
-                "service_agreement_show":["nocheck","","select"],
-                "marketing_director_show":["nocheck","","radio"],
-            }
-            var cres = CIC.checkAddInput(obj);
-            if(!cres){
-                return false;
-            }
-            if (Date.parse(cres.contact_begin) > Date.parse(cres.contact_end)) {
-                layer.msg('开始时间必须小于等于结束时间');
-                return false;
+                "company_name":["required",false,"推广公司名称不允许为空"],
+                "fax_ratio":["number",true,"开票税率必须是数字，如果无此项请填0"],
+                "contact_phone":["phone",true,"联系人电话格式不对"],
+                "bank_card":["bankid",true,"银行卡格式错误"]
             }
+            if(!CIC.checkInput(obj)){ return false; }
+            var senddata = $("#form").serializeArray();
+            senddata.push({"name":"resources", "value":JSON.stringify(doc)});
+            senddata.push({"name":"id", "value":id});
                 //资源不需要二次修改
-            cres.resources = doc;
-            cres.id = id;
             
-            console.log(cres);
             //添加
             $.ajax({
                 url:"{:U('PromoteCompany/edit')}",
                 type:"post",
-                data:cres,
+                data:senddata,
                 dataType:"json",
                 success:function(data){
                     if(data.status == 1){
diff --git a/Data/update.sql b/Data/update.sql
index 12abda002..e228aaffe 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2110,3 +2110,17 @@ CREATE TABLE `tab_partner_verify` (
   KEY `partner_name` (`partner_name`) USING BTREE,
   KEY `verify_status` (`verify_status`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+
+ALTER TABLE `tab_promote_company`
+ADD COLUMN `validity_start_time`  int(11) NOT NULL DEFAULT 0 COMMENT '生效开始时间' AFTER `company_type`,
+ADD COLUMN `validity_end_time`  int(11) NOT NULL DEFAULT 0 COMMENT '生效结算时间' AFTER `validity_start_time`,
+ADD COLUMN `reg_address`  varchar(255) NULL DEFAULT NULL COMMENT '注册地址' AFTER `validity_end_time`,
+ADD COLUMN `reg_phone`  varchar(24) NULL DEFAULT NULL COMMENT '注册电话' AFTER `reg_address`,
+ADD COLUMN `has_ratio`  tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否有比例增量 1是 0否' AFTER `reg_phone`,
+ADD COLUMN `turnover_ratio` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '流水分成比例= turnover:流水,ratio:比例,instanceof:1>= || 2>' AFTER `has_ratio`,
+ADD COLUMN `has_server_fee`  tinyint(1) NOT NULL DEFAULT 0 COMMENT '承担服务费1是 0否' AFTER `turnover_ratio`,
+ADD COLUMN `server_fee`  decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '服务器费用' AFTER `has_server_fee`,
+ADD COLUMN `cooperation_status`  tinyint(1) NOT NULL DEFAULT 1 COMMENT '合作关系1合作中 0暂停合作' AFTER `server_fee`;
+
+
diff --git a/Public/static/czinputcheck.js b/Public/static/czinputcheck.js
index 64ad70367..fa0a1993a 100644
--- a/Public/static/czinputcheck.js
+++ b/Public/static/czinputcheck.js
@@ -73,6 +73,38 @@
 		    }   
 	    	return rearr;
         };
+        /**
+         * 
+         * var obj = {
+                "type": ["required",fale,"点击事件不能为空",'select'], //1 true:为空不验证 false 为空报错
+            }
+         */
+        cic.checkInput=function(arr){
+	    	for(var i in arr) {
+                var name  = "input";
+                var selecttypename='';
+                if(typeof arr[i][3] !== "undefined") name = arr[i][3];	 
+                if(name == "radio") {
+                    name="input";
+                    selecttypename=":checked";
+                }
+                var reg = cic.verify[arr[i][0]][0];
+
+                var val = $(name+"[name='"+i+"']"+selecttypename).val();
+                if(arr[i][1] && val == ''){
+                    continue;
+                }
+                if(!reg.test(val)) {
+
+                    layer.alert(arr[i][2], {
+                        icon: 2,
+                        skin: 'layer-ext-moon'
+                    });
+                    return false;
+                }
+		    }   
+	    	return true;
+        };
         cic.setEditData=function(ydata,ndata){
             var data = {};
             for (var i in ndata) {