Your Name пре 3 година
родитељ
комит
294cc1cd36
3 измењених фајлова са 115 додато и 47 уклоњено
  1. 96 40
      learn/active/assets/pc/html/off_code.html
  2. 3 3
      learn/active/database/order.php
  3. 16 4
      learn/active/lib/Manage.php

+ 96 - 40
learn/active/assets/pc/html/off_code.html

@@ -35,7 +35,7 @@ td {
 .layui-input {
     /*position: relative;*/
     /*padding: 30px;*/
-    margin-top: 50px;
+    margin-top: 20px;
     /*line-height: 24px;*/
 }
  .container{
@@ -66,49 +66,90 @@ td {
     color: blue;
     margin-left: 80px;
   }
+  .layui-col-xs4{
+    font-size: 18px;
+  }
+  .layui-col-xs6{
+    margin-top: 15px;
+    font-size: 15px;
+  }
+  .layui-col-xs3{
+    margin-top: 15px;
+    font-size: 15px;
+  }
 </style>
 
 </head>
 <body>
-<div class="layui-container">
-<div class="layui-card">
-     <!-- <blockquote class="layui-elem-quote"><input type="text" value="<{$start}> ~ <{$end}>" autocomplete="off" id="date" class="layui-input" style="width: auto;display: inline;" placeholder="选择日期"><a href="javascript:;" class="layui-btn" id="search">搜索</a><a href="javascript:;" class="layui-btn" id="excel">数据导出</a></blockquote> -->
 
-  <div class="layui-card-header" style="font-size: 15px">
-    <!-- <ul> -->
-      <li><{$active_name}><span class = 'layui-span'><{$status}></span></li>
-      <li>活动时间:<{$act_time}></li>
-    <!-- </ul> -->
+<div class="layui-card">
+<div class="layui-container">
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;"> </fieldset>
+<div class="layui-row">
+    <div class="layui-col-xs4">
+      <div class="grid-demo grid-demo-bg1"><{$active_name}></div>
+    </div>
+    <div class="layui-col-xs4">
+      <div class="grid-demo"><span class = 'layui-span'><{$status}></span></div>
+    </div>
+  </div>
+  <div class="layui-row">
+    <div class="layui-col-xs6">
+      <div class="grid-demo">活动时间:<{$act_time}></div>
+    </div>
   </div>
-   <!-- <div class = 'layui-input'> -->
     <input type="text" value="<{$write_code}>" autocomplete="off" id="date" class="layui-input" style="width: auto;display: inline;" placeholder="输入核销码">
     <!-- <a href="javascript:;" class="layui-btn" id="search">搜索</a> -->
   <!-- </div> -->
-  <div class="layui-card-body">
-      <{if(isset($write_code)):}>
-     <div class="container">
-        <div class="lefttitle">
-            <h5>参会人</h5>
-            <p><{$join_avatar}></p>
-        </div>
-        <div class="leftname">
-            <li data-priority="1">姓名:<{$join_name}></li>
-            <li data-priority="1">电话:<{$join_mobile}></li>
-            <li data-priority="1">核销码:<{$write_code}></li>
-        </div>
-        <div class="righttitle">
-            <h5>邀请人</h5>
-            <p><{$buy_avatar}></p>
-        </div>
-        <div class="rightname">
-            <li data-priority="1"><{$buy_name}></li>
-            <li data-priority="1"><{$buy_mobile}></li>
-            <li data-priority="1"><{$role_name}></li>
-            <li data-priority="1"><{$title_name}></li>
-        </div>
+  <!-- <div class="layui-row">
+  <{if(isset($write_code)):}>
+    <div class="layui-col-xs3">
+    <h5>参会人</h5>
+      <div class="grid-demo grid-demo-bg1"><{$join_avatar}></div>
     </div>
-  
+    <div class="layui-col-xs2">
+      <div class="grid-demo">姓名:<{$join_name}></div>
+      <div class="grid-demo">电话:<{$join_mobile}></div>
+      <div class="grid-demo">核销码:<{$write_code}></div>
+    </div>
+    <div class="layui-col-xs3">
+    <h5>邀请人</h5>
+      <div class="grid-demo grid-demo-bg1"><{$buy_avatar}></div>
+    </div>
+    <div class="layui-col-xs3">
+      <div class="grid-demo"><{$buy_name}></div>
+      <div class="grid-demo"><{$buy_mobile}>></div>
+      <div class="grid-demo"><{$role_name}></div>
+      <div class="grid-demo"><{$title_name}></div>
+    </div>
+  </div> -->
+  <div class="layui-card-body">
+<{if(isset($write_code)):}>
     <table class="table layui-table layui-table-body" id="table">
+      <thead>
+    <tr>
+      <th>参会人</th>
+      <th>邀请人</th>
+    </tr> 
+  </thead>
+  <tbody>
+    <tr>
+      <td>姓名:<{$join_name}></td>
+      <td><{$buy_name}></td>
+      
+      
+    </tr>
+    <tr>
+      <td>电话:<{$join_mobile}></td>
+      <td><{$buy_mobile}></td>
+     
+      
+    </tr>
+    <tr>
+    <td>核销码:<{$write_code}></td>
+     <td><{$role_name}><br/><{$title_name}></td>
+    </tr>
+  </tbody>
       </table>
       <div><a  href="javascript:;" class="layui-btn" id="hexiao" onclick="hexiao();">确认核销</a></div>
       <{endif}>
@@ -116,10 +157,15 @@ td {
 	</div>
 </div>
 </div>
-      
+  <!-- <button data-method="offset" data-type="auto" type='hidden' class="layui-btn layui-btn-normal">居中弹出</button> -->
+
 <input id="id" name="id" value="<{$id}>" type='hidden'/>
 </div>
 <script>
+var layer;
+layui.use('layer', function(){
+  layer = layui.layer;
+});
 // function search()
 // {
 //   var date = $('#date').val();
@@ -147,14 +193,19 @@ $('#date').bind('keydown',function(event){
         if (data.msg == 'success'){
            location.href = config.host + 'lib/manage.code&type=1&code=' + $('#date').val() +'&id=<{$active_id}>';
         } else {
-          alert('填写错误');
+          layer.alert('填写错误');
+          // alert('填写错误');
         }
       },
       error: function(data){
-        alert('核销码不存在或已核销');
+        layer.alert('核销码不存在或已核销', function(){
+        // layer.alert(data.data.msg, function(){
+        location.href = config.host + "lib/manage.code&id=<{$active_id}>";
+        layer.close();
+    });
         var code = '';
       $('#id').val('');
-      location.href = config.host + "lib/manage.code&id=<{$active_id}>";
+      //location.href = config.host + "lib/manage.code&id=<{$active_id}>";
      }
     });
    }
@@ -172,11 +223,16 @@ function hexiao() {
     dataType: "json",
 
     success: function (data) {
-
-      alert(data.data.msg);
+      // var index = config.host + "lib/manage.code&id=<{$active_id}>";
+        layer.alert(data.data.msg, function(){
+        location.href = config.host + "lib/manage.code&id=<{$active_id}>";
+        layer.close();
+    });
+      // layer.alert(data.data.msg);
+      // alert(data.data.msg);
       var code = '';
       $('#id').val('');
-      location.href = config.host + "lib/manage.code&id=<{$active_id}>";
+      // location.href = config.host + "lib/manage.code&id=<{$active_id}>";
      },
      error: function(data){
       console.log('error',data);

+ 3 - 3
learn/active/database/order.php

@@ -2,10 +2,10 @@
 $excel = false;
 $excel[] = array('数据导出','数据导出','active/lib/excel.out_active_order');
 $list_button = array();
-if (Dever::load('manage/auth')->checkFunc('active.order', 'editRefund', '全额退款')) {
+// if (Dever::load('manage/auth')->checkFunc('active.order', 'editRefund', '全额退款')) {
     // $list_button['fast'] = array('退款', '"info_refund&project=active&search_option_order_id={id}"');
-    $list_button['oper'] = array('全额退款', '"active/lib/manage.refund?id={id}"', '"{status}" == 2 && "{code_num}" < 0');
-}
+    // $list_button['oper'] = array('全额退款', '"active/lib/manage.refund?id={id}"', '"{status}" == 2 && "{code_num}" < 0');
+// }
 $list_button['list'] = array('查看详情','"info_code&project=active&id={id}&page_type=1&[refer]"');
 $pay_type = array
 (

+ 16 - 4
learn/active/lib/Manage.php

@@ -328,10 +328,21 @@ Class Manage
                 ),
             );
         }
-        
         $button = array();
-        if ($info['status'] > 1 && $no_code > 0 && $info['status'] != 3) {
-            if (Dever::load('manage/auth')->checkFunc('active.order', 'editrefund', '未使用退款')) {
+        if ($info['status'] == 2 && $info['code_num'] < 1 && time() < $active['act_start'] ) {
+            
+            if (Dever::load('manage/auth')->checkFunc('active.order', 'editrefund', '全额退款')) {
+                $purl = Dever::url('active/lib/manage.refund&id='.$id);
+                $button[] = array
+                (
+                    'type' => 'edit',
+                    'link' => $purl,
+                    'name' => '全额退款',
+                );
+            }
+        }
+        if ($info['status'] > 1 && $no_code > 0 && $info['status'] != 3 && time()<$active['act_start']) {
+            if (Dever::load('manage/auth')->checkFunc('active.order', 'editrefund1', '未使用退款')) {
                 $purl = Dever::url('project/database/update?project=active&table=info_refund&search_option_order_id='.$info['id'].'&col=num,order_id', 'manage');
                 $button[] = array
                 (
@@ -396,8 +407,9 @@ Class Manage
                 if ($v['offdate']) {
                     $offdate = date('Y-m-d H:i',$v['offdate']);
                 }
+                $active = Dever::db('active/info')->find($v['active_id']);
                 $m = '';
-                if ($v['status'] == 1) {
+                if ($v['status'] == 1 && time()<$active['act_start']) {
                     $url = Dever::url('lib/manage.setOrder&order_id=' . $v['order_id'].'&code_id='.$v['id'], 'active');
                     $m = '<a href="javascript:;" onclick="load( \''.$url.'\')" class="layui-btn">退款</a>';
                 }