DengTao 8 роки тому
батько
коміт
7ba91f91fe

+ 1 - 1
www/protected/modules/common/views/activity/getCoupon.php

@@ -46,7 +46,7 @@
 
             var userID = localStorage.getItem('wxUserID');
             var appToken = localStorage.getItem('appToken');
-            alert(userID);
+            alert(userID);alert(appToken);
             if (!userID || !appToken) {
                 localStorage.clear();
                 location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id=' . $coupon_id; ?>';

+ 1 - 1
www/protected/modules/common/views/activity/wxIndex.php

@@ -20,7 +20,7 @@
         var wxUserID = localStorage.getItem('wxUserID');
 
         if (wxUserID) {
-            location.href = appURI;
+            location.href = appURI+'userId'+wxUserID;
         } else {
             location.href = codeURI;
         }

+ 11 - 33
www/protected/views/couponCode/index.php

@@ -36,7 +36,7 @@
                                             <span>状态:</span>
                                         </div>
                                         <div class="box_flex f_content">
-                                            <input id="setStatus" name="status" />
+                                            <input id="addStatus" name="status" />
                                         </div>
                                     </div>
                                 </li>
@@ -62,33 +62,6 @@
                 </div>
             </div>
         </div>
-        <div region="center" title="查询兑换码状态">
-            <div class="detail_layout">
-                <div data-options="region:'center'" class="detail_center">
-                    <div class="detail_main">
-                        <form id="code_form" method="post">
-                            <ul>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>兑换码: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input name="exchange_code" id="exchange_code" class="easyui-textbox" required="true" style="width: 300px">
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </form>
-                    </div>
-                </div>
-                <div data-options="region:'south'" class="detail_south">
-                    <div class="detail_toolbar">
-                        <a href="#" class="easyui-linkbutton set_button" iconCls="icon-save" onclick="send_code();return false;">发送</a>
-                    </div>
-                </div>
-            </div>
-        </div>
     </div>
     <div style="display: none;">
         <div id="add_dialog" style="padding: 15px 0;">
@@ -98,10 +71,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="name" style="width: 250px;"/>
+                                <input type="text" name="id" style="width: 250px;"/>
                             </div>
                         </div>
                     </li>
@@ -129,6 +102,7 @@
             </form>
         </div>
     </div>
+
 <script type="text/javascript">
 var jq_dg_content = $('#dg_content');
 var w_width = $(window).width();
@@ -141,7 +115,7 @@ var jq_acc = $('#acc_container');
 var jq_filter_status = $('#filter_status');
 var jq_setStatus = $('#setStatus');
 var jq_add_dialog = $('#add_dialog');
-
+var jq_addStatus = $('#addStatus');
 var jq_action_info = $('#action_info');
 var status_data = <?php echo json_encode($status); ?>;
 
@@ -168,6 +142,10 @@ $(function(){
         editable: false,
         data: status_data,
     });
+    jq_addStatus.combobox({
+        editable: false,
+        data: status_data,
+    });
 
     $('#editType').combobox({
         editable: false,
@@ -435,7 +413,7 @@ function add_content(){
 }
 
 function checkTimelimit(start, end) {
-    var arr = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18'];
+   /* var arr = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18'];
 
     if (start != '' && $.inArray(start, arr) == -1) {
         $.messager.alert('提示', '请检查开始时间是否为9-18的数字');
@@ -450,7 +428,7 @@ function checkTimelimit(start, end) {
     if (start != '' && end != '' && parseInt(start) >= parseInt(end)) {
         $.messager.alert('提示', '开始时间必须小于结束时间');
         return false;
-    }
+    }*/
 
     return true;
 }