卡券和订单核销码调整

application/admin/view/order/add.html

@@ -111,12 +111,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Package_endtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-package_endtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[package_endtime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             

application/admin/view/order/edit.html

@@ -111,12 +111,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Package_endtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-package_endtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[package_endtime]" type="text" value="{:$row.package_endtime?datetime($row.package_endtime):''}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             

application/api/controller/Order.php

@@ -185,7 +185,7 @@ class Order extends Api
             $text = 'hexiaoorder_'.$id;
             $logo = '';
             $filRoute = '/uploads/temp/';
-            $saveDir = ROOT_PATH.'public/uploads/temp'.DS;
+            $saveDir = ROOT_PATH.'public'.DS.'uploads'.DS.'temp'.DS;
             $fileStr = md5('order_'.$id);
             $localpng = $saveDir.$fileStr.'.png';
             //验证存在直接返回

application/api/controller/UserCoupons.php

@@ -79,7 +79,7 @@ class UserCoupons extends Api
             $text = 'hexiaocoupon_'.$id;
             $logo = '';
             $filRoute = '/uploads/temp/';
-            $saveDir = ROOT_PATH.'public\uploads\temp'.DS;
+            $saveDir = ROOT_PATH.'public'.DS.'uploads'.DS.'temp'.DS;
             $fileStr = md5('coupon_'.$id);
             $localpng = $saveDir.$fileStr.'.png';
             //验证存在直接返回
@@ -95,25 +95,4 @@ class UserCoupons extends Api
             $this->error($e->getMessage());
         }
     }
-
-    public function newtest()
-    {
-            $id = 5;
-            $text = 'hexiaocoupon_'.$id;
-            $logo = '';
-            $filRoute = '/uploads/temp/';
-            $saveDir = ROOT_PATH.'public\uploads\temp'.DS;
-            $fileStr = md5('coupon_'.$id);
-            $localpng = $saveDir.$fileStr.'.png';
-            //验证存在直接返回
-            $userCouponsUrl = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$filRoute.$fileStr.'.png';
-            if (!file_exists($localpng)) {
-                build_qrcode($text, $logo, $saveDir,$fileStr);
-            }
-            $result = [
-                'url' => $userCouponsUrl,
-            ];
-            $this->success('获取成功',$result);
-
-    }
 }

application/common.php

@@ -1026,7 +1026,6 @@ if(!function_exists('build_qrcode')) {
         }
         //输出图片
         $res = imagepng($QR, $filename);
-        dump($res);
         imagedestroy($QR);
         if($res === false) {
             return $res;

public/assets/js/backend/order.js

@@ -49,7 +49,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'server_info', title: __('Server_info'), operate: 'LIKE'},
                         {field: 'server_images', title: __('Server_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'package_id', title: __('Package_id'), operate:false, visible:false},
-                        {field: 'package_endtime', title: __('Package_endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'status', title: __('Status'), searchList: {"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4')}, formatter: Table.api.formatter.status},
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'paytype', title: __('Paytype'), searchList: {"1":__('Paytype 1'),"2":__('Paytype 2'),"3":__('Paytype 3')}, formatter: Table.api.formatter.normal},