From 2a1dfce526b5e74e793a0b140d56dd71aba86c6e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 11 Jan 2019 13:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Appminialipaylist.php | 10 ++++++++++
 application/admin/controller/Appminiweixinlist.php | 10 ++++++++++
 application/service/AppMiniService.php             |  8 +++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/application/admin/controller/Appminialipaylist.php b/application/admin/controller/Appminialipaylist.php
index a15e40903..25c6296f4 100755
--- a/application/admin/controller/Appminialipaylist.php
+++ b/application/admin/controller/Appminialipaylist.php
@@ -76,7 +76,17 @@ class AppMiniAlipayList extends Common
 			$this->error('非法访问');
 		}
 
+		// 配置内容
+        $app_mini_title = MyC('common_app_mini_alipay_title');
+        $app_mini_describe = MyC('common_app_mini_alipay_describe');
+        if(empty($app_mini_title) || empty($app_mini_describe))
+        {
+            return DataReturn('配置信息不能为空', -1);
+        }
+
 		// 开始操作
+		$this->params['app_mini_title'] = $app_mini_title;
+		$this->params['app_mini_describe'] = $app_mini_describe;
 		return AppMiniService::Created($this->params);
 	}
 
diff --git a/application/admin/controller/Appminiweixinlist.php b/application/admin/controller/Appminiweixinlist.php
index 60ea42463..7abbd9983 100755
--- a/application/admin/controller/Appminiweixinlist.php
+++ b/application/admin/controller/Appminiweixinlist.php
@@ -76,7 +76,17 @@ class AppMiniWeixinList extends Common
 			$this->error('非法访问');
 		}
 
+		// 配置内容
+        $app_mini_title = MyC('common_app_mini_weixin_title');
+        $app_mini_describe = MyC('common_app_mini_weixin_describe');
+        if(empty($app_mini_title) || empty($app_mini_describe))
+        {
+            return DataReturn('配置信息不能为空', -1);
+        }
+
 		// 开始操作
+		$this->params['app_mini_title'] = $app_mini_title;
+		$this->params['app_mini_describe'] = $app_mini_describe;
 		return AppMiniService::Created($this->params);
 	}
 
diff --git a/application/service/AppMiniService.php b/application/service/AppMiniService.php
index 36c65d6be..34b9dc91f 100755
--- a/application/service/AppMiniService.php
+++ b/application/service/AppMiniService.php
@@ -104,9 +104,7 @@ class AppMiniService
         self::Init($params);
 
         // 配置内容
-        $app_mini_alipay_title = MyC('common_app_mini_alipay_title');
-        $app_mini_alipay_describe = MyC('common_app_mini_alipay_describe');
-        if(empty($app_mini_alipay_title) || empty($app_mini_alipay_describe))
+        if(empty($params['app_mini_title']) || empty($params['app_mini_describe']))
         {
             return DataReturn('配置信息不能为空', -1);
         }
@@ -141,14 +139,14 @@ class AppMiniService
 
         // 替换内容
         // app.js
-        $status = file_put_contents($new_dir.DS.'app.js', str_replace(['{{request_url}}', '{{application_title}}', '{{application_describe}}'], [__MY_URL__, $app_mini_alipay_title, $app_mini_alipay_describe], file_get_contents($new_dir.DS.'app.js')));
+        $status = file_put_contents($new_dir.DS.'app.js', str_replace(['{{request_url}}', '{{application_title}}', '{{application_describe}}'], [__MY_URL__, $params['app_mini_title'], $params['app_mini_describe']], file_get_contents($new_dir.DS.'app.js')));
         if($status === false)
         {
             return DataReturn('基础配置替换失败', -4);
         }
 
         // app.json
-        $status = file_put_contents($new_dir.DS.'app.json', str_replace(['{{application_title}}'], [$app_mini_alipay_title], file_get_contents($new_dir.DS.'app.json')));
+        $status = file_put_contents($new_dir.DS.'app.json', str_replace(['{{application_title}}'], [$params['app_mini_title']], file_get_contents($new_dir.DS.'app.json')));
         if($status === false)
         {
             return DataReturn('基础配置替换失败', -4);