From fe6986f3676a943414dd852fc0da2a0fbff890ca Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Fri, 11 Oct 2019 10:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=A4=BC=E5=88=B8=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/MarketingStrategyController.php | 6 ++++--
 frontend/views/marketing-strategy/edit.php           | 9 +++++----
 frontend/views/marketing-strategy/gifts.php          | 6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php
index 308b60a..1a97366 100644
--- a/frontend/controllers/MarketingStrategyController.php
+++ b/frontend/controllers/MarketingStrategyController.php
@@ -386,15 +386,17 @@ class MarketingStrategyController extends UserBaseController
         $request = Yii::$app->request;
         $celuo_id = $request->get('celuo_id');
         $fanxian_id = $request->get('fanxian_id');
+        $type = $request->get('type',1);
 
         $items = GiftT::find()
-            ->where(['type_id'=>1])
+            ->where(['type_id'=>$type])
             ->all();
 
         return $this->render('gifts',[
             'celuo_id'=>$celuo_id,
             'fanxian_id'=>$fanxian_id,
-            'items'=>$items
+            'items'=>$items,
+            'type' => $type
         ]);
     }
 
diff --git a/frontend/views/marketing-strategy/edit.php b/frontend/views/marketing-strategy/edit.php
index f5830d5..761199c 100644
--- a/frontend/views/marketing-strategy/edit.php
+++ b/frontend/views/marketing-strategy/edit.php
@@ -93,10 +93,10 @@ use \common\libs\MyLib;
                     html += '<div class="ibox-title">';
                     html += '<label>客户返现：' + item.fanxian_rate + '%，最高返现：' + item.max_cashback + '元</label>';
                     html += '<div class="ibox-tools">';
-                    html += '<a class="btn btn-primary btn-xs btn-users" data-id="0" href="javascript:void(0);" onclick="gifts(' + item.id + ')">';
+                    html += '<a class="btn btn-primary btn-xs btn-users" data-id="0" href="javascript:void(0);" onclick="gifts(' + item.id + ',1)">';
                     html += '<i class="fa fa-users"></i> 添加礼品';
                     html += '</a>';
-                    html += '<a class="btn btn-primary btn-xs btn-users" data-id="0" href="javascript:void(0);" onclick="users()">';
+                    html += '<a class="btn btn-primary btn-xs btn-users" data-id="0" href="javascript:void(0);" onclick="gifts(' + item.id + ',2)">';
                     html += '<i class="fa fa-users"></i> 添加礼券';
                     html += '</a>';
                     html += '<button class="btn btn-danger btn-xs" style="margin-left: 8px;" onclick="deleteFanxian(' + item.id + ')">';
@@ -159,9 +159,10 @@ use \common\libs\MyLib;
             //
         });
     }
-    function gifts(fanxian_id) {
+    function gifts(fanxian_id, type) {
         title = '添加礼品';
-        layer_show(title, '/marketing-strategy/gifts?celuo_id=<?=$info->id?>&fanxian_id=' + fanxian_id);
+        if(type == 2) title = '添加礼券';
+        layer_show(title, '/marketing-strategy/gifts?celuo_id=<?=$info->id?>&fanxian_id=' + fanxian_id + '&type=' + type);
     }
     function deleteGift(id) {
         layer.confirm('是否确认删除礼品/礼券？', {
diff --git a/frontend/views/marketing-strategy/gifts.php b/frontend/views/marketing-strategy/gifts.php
index d51a05a..2a22bda 100644
--- a/frontend/views/marketing-strategy/gifts.php
+++ b/frontend/views/marketing-strategy/gifts.php
@@ -10,9 +10,9 @@ use \common\libs\MyLib;
             <form role="form" class="form-horizontal" id="theFrm" onsubmit="return false;">
                 <input type="hidden" name="celuo_id" value="<?=$celuo_id?>">
                 <input type="hidden" name="fanxian_id" value="<?=$fanxian_id?>">
-                <input type="hidden" name="gift_type" value="1">
+                <input type="hidden" name="gift_type" value="<?=$type?>">
                 <div class="form-group">
-                    <label class="col-sm-2 control-label">礼品类型</label>
+                    <label class="col-sm-2 control-label">模式</label>
                     <div class="col-sm-4">
                         <select name="free_type" id="type" class="form-control">
                             <option value="3">M选N模式</option>
@@ -29,7 +29,7 @@ use \common\libs\MyLib;
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-2 control-label">选择礼品</label>
+                    <label class="col-sm-2 control-label">选择礼品/礼券</label>
                     <div class="col-sm-9">
                         <div class="row">
                             <?php foreach($items as $item) { ?>