From def69bf6aa9cee7b9951f3d2f2aa66aaef279bbb Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 29 Oct 2020 16:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E6=8E=A8=E5=B9=BF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=AD=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php    | 5 ++---
 .../Admin/View/MarketPercentage/addcompanybelonggame.html    | 4 ++--
 .../Admin/View/MarketPercentage/editcompanybelonggame.html   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 92cd6bba5..2d7ed2861 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -1442,15 +1442,14 @@ class MarketPercentageController extends ThinkController
 
         foreach ($data as $key => $value) {
 
-            $data[$key]["begin_time"] = date("Y-m-d",$value['begin_time']);
+            $data[$key]["begin_time"] = date("Y.m.d",$value['begin_time']);
 
             if($value['end_time'] == 0) {
                 $data[$key]["end_time"] = "永久";
             } else{
-                $data[$key]["end_time"] = date("Y-m-d",$value['end_time']);
+                $data[$key]["end_time"] = date("Y.m.d",$value['end_time']);
             }
 
-
             $where_game = $value['game_ids'];
 
             if ($_REQUEST['relation_game_id']) {
diff --git a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
index d4488923a..85da6ddbe 100644
--- a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
+++ b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
@@ -91,7 +91,7 @@
 	</style>
 	<div class="cf main-place top_nav_list navtab_list">
 		<h3 class="page_title">新增</h3>
-		<!--    <p class="description_text">说明：此功是创建推广员时所需填写信息</p>-->
+		    <p class="description_text">说明：选择仅内团推广的游戏，选中的游戏推广员将不进行业绩提成</p>
 	</div>
 
 	<!-- 标签页导航 -->
@@ -148,7 +148,7 @@
 				<div class="pro_promot_main">
 					<div class="pro_promot_title">
 						<div class="fl pro_promot_title_text">
-							<div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
+							<div class="fl pro_promot_title_bigtext"> 可申请游戏</div> </div>
 						<div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
 					</div>
 					<div class="pro_promot_con">
diff --git a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
index 41401706c..718e36536 100644
--- a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
+++ b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
@@ -91,7 +91,7 @@
 	</style>
 	<div class="cf main-place top_nav_list navtab_list">
 		<h3 class="page_title">编辑</h3>
-		<!--    <p class="description_text">说明：此功是创建推广员时所需填写信息</p>-->
+		    <p class="description_text">说明：选择仅内团推广的游戏，选中的游戏推广员将不进行业绩提成</p>
 	</div>
 
 	<!-- 标签页导航 -->
@@ -149,7 +149,7 @@
 				<div class="pro_promot_main">
 					<div class="pro_promot_title">
 						<div class="fl pro_promot_title_text">
-							<div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
+							<div class="fl pro_promot_title_bigtext"> 可申请游戏</div> </div>
 						<div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
 					</div>
 					<div class="pro_promot_con">