DengTao 8 жил өмнө
parent
commit
0a2cb880f8

+ 2 - 2
www/protected/modules/common/controllers/ActivityController.php

@@ -99,8 +99,8 @@ class ActivityController extends O2oBaseController  {
                 'version' => '2015111601',
                 'debug' => 'false',
                 'signPackage' => $signPackage,
-                'userId' => $userId,
-                'appToken' => $appToken,
+                'userId' => '',
+                'appToken' => '',
                 'coupon_id' => $coupon_id,
             ));
         }

+ 0 - 9
www/protected/views/couponCode/couponFactory.php

@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<meta charset="UTF-8" />
-<form id="count" method="post">
-           生成数量:<input name="count" ></br></br>
-           优惠码ID:<input name="coupons" size="120" >(*ID之间请用逗号隔开,最多5张)</br>
-    <input type="submit" value="生成" />
-</form>
-           
-

+ 6 - 156
www/protected/views/couponCode/index.php

@@ -30,95 +30,6 @@
                                         </div>
                                     </div>
                                 </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>名字: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="text" name="name" style="width: 250px;"/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>别名: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="text" name="alias_name" style="width: 250px;"/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>面额: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="text" name="value" style="width: 250px;"/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>最低消费(不限制可以设置0): </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input type="text" name="min_price" style="width: 250px;"/>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>备注: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <textarea  name="memo" rows="6" style="width: 250px;"></textarea>
-                                        </div>
-                                    </div>
-                                </li>
-
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>服务项目:</span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input id="editType" name="type" />
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>工作日限制:</span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="workday_limit" value="0" type="radio"/>无限制
-                                            <input name="workday_limit" value="1" type="radio"/>限工作日
-                                            <input name="workday_limit" value="2" type="radio"/>限周末
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>时间限制:</span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input id="time_limit_start" name="time_limit_start" style="width: 50px;"/>
-                                            -
-                                            <input id="time_limit_end" name="time_limit_end" style="width: 50px;"/>
-                                            <br>
-                                            <span style="color: green;font-size: 10px;">例如输入9、14,则限制为9点至下午2点</span>
-                                            <br>
-                                            <span style="color: green;font-size: 10px;">留空不作限制</span>
-                                        </div>
-                                    </div>
-                                </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -197,68 +108,10 @@
                     <li class="f_item">
                         <div class="box">
                             <div class="f_label">
-                                <span>别名: </span>
+                                <span>状态:</span>
                             </div>
                             <div class="box_flex f_content">
-                                <input type="text" name="alias_name" style="width: 250px;"/>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="f_item">
-                        <div class="box">
-                            <div class="f_label">
-                                <span>面额: </span>
-                            </div>
-                            <div class="box_flex f_content">
-                                <input type="text" name="value" style="width: 250px;"/>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="f_item">
-                        <div class="box">
-                            <div class="f_label">
-                                <span>最低消费: </span>
-                            </div>
-                            <div class="box_flex f_content">
-                                <input type="text" name="min_price" style="width: 250px;"/>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="f_item">
-                        <div class="box">
-                            <div class="f_label">
-                                <span>服务项目:</span>
-                            </div>
-                            <div class="box_flex f_content">
-                                <input id="addType" name="type" />
-                            </div>
-                        </div>
-                    </li>
-                    <li class="f_item">
-                        <div class="box">
-                            <div class="f_label">
-                                <span>工作日限制:</span>
-                            </div>
-                            <div class="box_flex f_content">
-                                <input name="workday_limit" value="0" type="radio" id="workday_limit_none_add"/>无限制
-                                <input name="workday_limit" value="1" type="radio"/>限工作日
-                                <input name="workday_limit" value="2" type="radio"/>限周末
-                            </div>
-                        </div>
-                    </li>
-                    <li class="f_item">
-                        <div class="box">
-                            <div class="f_label">
-                                <span>时间限制:</span>
-                            </div>
-                            <div class="box_flex f_content">
-                                <input name="time_limit_start" id="time_limit_start_add" style="width: 50px;"/>
-                                -
-                                <input name="time_limit_end" id="time_limit_end_add" style="width: 50px;"/>
-                                <br>
-                                <span style="color: green;">例如输入9、14,则限制为9点至下午2点</span>
-                                <br>
-                                <span style="color: green;">留空不作限制</span>
+                                <input id="setStatus" name="status" />
                             </div>
                         </div>
                     </li>
@@ -296,7 +149,7 @@ var type_data = <?php echo json_encode($type); ?>;
 
 var jq_search = $('#search');
 
-var module_router = site_root + '/index.php?r=coupon';
+var module_router = site_root + '/index.php?r=couponCode';
 $(function(){
 
     $('#main').css({width: w_width - 25, height: w_height - 18}).layout();
@@ -356,11 +209,8 @@ $(function(){
             {field:'ck',checkbox:true}
         ]],
         columns:[[
-            {field:'name', title:'名字', width:140},
-            {field:'alias_name', title:'别名', width:40},
-            {field:'value', title:'面额', width:50},
-            {field:'min_price', title:'最低消费', width:50},
-            {field:'type_str', title:'服务项目', width:150},
+            {field:'id', title:'兑换码', width:140},
+
             {field:'status', title:'状态', width:60, sortable: true,
                 formatter: function(value, row){
                     return get_filed_text(value, status_data);
@@ -391,7 +241,7 @@ $(function(){
 
     //查询兑换码状态
     jq_code_form.form({
-        url: site_root + '/index.php?r=coupon/couponCodeStates',
+        url: site_root + '/index.php?r=couponCode/couponCodeStates',
         onSubmit: function(param){
             if (!$('#exchange_code').val()){
                 return false;