app/shop/controller/order/OrderRenew.php

@@ -25,6 +25,11 @@ class OrderRenew extends ShopBase
             return JsonServer::success('', OrderRenewLogic::lists($get));
         }
 
+        //自动取消订单
+        $shop_id = $this->shop_id;
+        OrderRenewLogic::cancelOrder($shop_id);
+
+
         return view('');
     }
 
@@ -111,7 +116,11 @@ class OrderRenew extends ShopBase
         $get['shop_id'] = $this->shop_id;
         $data = OrderRenewLogic::payPage($get);
 
-        return view('', ['detail' => $data]);
+        if($data[0] === 1){
+            return JsonServer::error($data[1]);
+        }
+
+        return view('', ['detail' => $data[1]]);
     }
 
     public function payWay()

app/shop/logic/order/OrderRenewLogic.php

@@ -94,7 +94,25 @@ class OrderRenewLogic extends Logic
         return $info->toArray();
     }
 
-
+    public static function cancelOrder($shop_id)
+    {
+        //dump("dffd");
+        //查找未付款 待支付
+        //获取1个小时前的时间戳
+        $oneHourAgo = strtotime("-1 hour", time());
+        $where = [
+            ['shop_id','=',$shop_id],
+            ['del', '=', 0],
+            ['pay_status', '=', 0],
+            ['order_status', '=', 0],
+            ['create_time', '<', $oneHourAgo]
+        ];
+        OrderRenew::where($where)->update([
+                'order_status' => 4,
+                'cancel_time' => time(),
+                'update_time' => time(),
+            ]);
+    }
     public static function cancel($post)
     {
         try {
@@ -164,12 +182,28 @@ class OrderRenewLogic extends Logic
         ];
 
         $info = OrderRenew::where($where)->find();
+
+        //dump($info->toArray());
+        $good = ShopGoodsRenew::where([
+                ['id', '=', $info['renew_id']],
+            ])->find();
+
+        if(empty($good)){
+            $msg = '商品已删除';
+            return [1,$msg];
+        }
+
+        if((int)$good['status'] === 0){
+            $msg = '商品已下架';
+            return [1,$msg];
+        }
+
         if (!$info) {
-            static::$error = '数据不存在';
-            return false;
+            $msg = '数据不存在';
+            return [1,$msg];
         }
 
-        return $info->toArray();
+        return [0,$info->toArray()];
     }
 
     private static function aliPay($info, $time_expire)
@@ -225,6 +259,18 @@ class OrderRenewLogic extends Logic
             return false;
         }
 
+        //计算是否已过期
+        $oneHourAgo = strtotime("-1 hour", time());
+        if(strtotime($info->create_time) < $oneHourAgo){
+            //已过期
+            $info->order_status = 4;
+            $info->cancel_time = time();
+            $info->update_time = time();
+            $info->save();
+            self::$error = '订单已过期';
+            return false;
+        }
+
         $time_expire = time() + 3600 * 2;
 
         $info->pay_way = $post['pay_way'];
@@ -241,6 +287,7 @@ class OrderRenewLogic extends Logic
 
     private static function changeHkCount($info, $time)
     {
+        // 添加用户套餐时间或者数量
         // 操作数量
         $op_count = $info['renew_op_count'] * $info['total_num'];
         $shop = Shop::find($info['shop_id']);
@@ -273,7 +320,10 @@ class OrderRenewLogic extends Logic
             // 按量付费
             // 添加数量记录
             $old_hksy_count = $shop->hksy_count;
-
+            //$hk = new ShopHkLog();
+            //$hk->shop_id = $shop['id'];
+            //$hk->source_id = $info->id;
+            //$hk->change_count = $op_count;
             $hk->left_count = $op_count + $old_hksy_count;
             $hk->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn . '，增加总数：' . $op_count;
             $hk->save();

app/shop/view/content/closure/edit/04.html

@@ -15,11 +15,11 @@
         </span>
 
         <span class="ks">
-        评论数:<input type="text" name="c1_1[]" id="" autocomplete="off" class="layui-input w100" value="{$extend.c1_1[1]??'default'}">
+        评论数:<input type="text" name="c1_1[]" id="" autocomplete="off" class="layui-input w100" value="{if !isset($extend.c1_1[1]) || empty($extend.c1_1[1])}5-9{/if}">
         观看
-        <input type="number" name="c1_2[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.c1_2[1]??'5'}">
+        <input type="number" name="c1_2[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.c1_2[1]) || empty($extend.c1_2[1])}5{/if}">
         秒到
-        <input type="number" name="c1_3[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.c1_3[1]??'9'}">
+        <input type="number" name="c1_3[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.c1_3[1]) || empty($extend.c1_3[1])}9{/if}">
         秒
         </span>
 

app/shop/view/content/closure/edit/05.html

@@ -12,11 +12,12 @@
         秒
         </span>
         <span class="ks">
-        评论数:<input type="text" name="d1_1[]" id="" autocomplete="off" class="layui-input w100" value="{$extend.d1_1[1]??'default'}">
+
+        评论数:<input type="text" name="d1_1[]" id="" autocomplete="off" class="layui-input w100" value="{if !isset($extend.d1_1[1]) || empty($extend.d1_1[1])}5-9{/if}">
         观看
-        <input type="number" name="d1_2[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.d1_2[1]??'5'}">
+        <input type="number" name="d1_2[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.d1_2[1]) || empty($extend.d1_2[1])}5{/if}">
         秒到
-        <input type="number" name="d1_3[]" id="" autocomplete="off" class="layui-input w30" value="{$extend.d1_3[1]??'9'}">
+        <input type="number" name="d1_3[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.d1_3[1]) || empty($extend.d1_3[1])}9{/if}">
         秒
         </span>
 

app/shop/view/content/equi_category/add.html

@@ -4,6 +4,7 @@
 <style>
   html,body{
     height: 100% !important;
+
   }
   .layui-form-label {
     color: #6a6f6c;

app/shop/view/content/equi_category/edit.html

@@ -2,6 +2,7 @@
 <style>
   html,body{
     height: 100% !important;
+    background: #fff;
   }
   .layui-form-label {
     color: #6a6f6c;
@@ -26,7 +27,7 @@
 
   <div class="layui-form-item">
     <label class="layui-form-label"></label>
-    <span style="color: #a3a3a3;font-size: 9px">与影刀手机管理器 自定义名称 一致 (英文字母+数字)</span>
+    <span style="color: #a3a3a3;font-size: 12px">与影刀手机管理器 自定义名称 一致 (英文字母+数字)</span>
   </div>
 
   <div class="layui-form-item">
@@ -157,7 +158,7 @@
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label"></label>
-    <span style="color: #a3a3a3;font-size: 9px">根据教程: 复制到目标机器指定的文件内容即可;</span>
+    <span style="color: #a3a3a3;font-size: 12px">根据教程: 复制到目标机器指定的文件内容即可;</span>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">机器码：</label>
@@ -175,7 +176,7 @@
 
   <div class="layui-form-item">
     <label class="layui-form-label"></label>
-    <span style="color: #a3a3a3;font-size: 9px">如需更换机器,这里清空绑定的机器码后保存即可;</span>
+    <span style="color: #a3a3a3;font-size: 12px">如需更换机器,这里清空绑定的机器码后保存即可;</span>
   </div>
   {/if}
 

app/shop/view/content/equi_category/lists.html

@@ -22,11 +22,22 @@
           <div class="layui-colla-content layui-show">
             <p>
 
-              <b>套餐包含:</b> 电脑{$server_info.pc_num}台,每台电脑可添加手机{$server_info.mobile_num}台,可同时运行手机{$server_info.run_num}台.
+{php}
+$date1 = time();
+$date2 = strtotime($end_time);
+
+// 将时间戳转换为天数
+$days = abs($date2 - $date1) / (60 * 60 * 24);
+              $days = intval($days);
+
+//echo "相差天数：".intval($days); // 输出相差天数，使用intval确保得到整数结果
+{/php}
+
+              <b>套餐包含：</b> 电脑{$server_info.pc_num}台，每台电脑可添加手机{$server_info.mobile_num}台，可同时运行手机{$server_info.run_num}台。
               <br/>
-              总电脑数量: {$edui_info[0][0]??"0"}台 &nbsp;&nbsp;&nbsp;&nbsp;<b>服务到期时间:</b>  {$end_time} &nbsp;&nbsp;&nbsp;&nbsp;<b>评论剩余数量:</b>  {$hksy_count}<br/>
+              总电脑数量：{$edui_info[0][0]??"0"}台 &nbsp;&nbsp;&nbsp;&nbsp;<b style="color:red;">服务到期时间:</b>  <span style="color:red;">{$end_time} （剩余{$days}天）</span> &nbsp;&nbsp;&nbsp;&nbsp;<b style="color:red;">评论次数剩余数量:</b>  <span style="color:red;">{$hksy_count}</span> <br/>
               {volist name="edui_info" id="vo"}
-              第{$vo[1]}台电脑,总共{$vo[2]}台手机设备,已启用{$vo[3]}台手机设备,未启用{$vo[4]}台手机设备,可同时运行手机{$server_info.run_num}台. <br/>
+              第{$vo[1]}台电脑，总共{$vo[2]}台手机设备，已启用{$vo[3]}台手机设备，未启用{$vo[4]}台手机设备，可同时运行手机{$server_info.run_num}台。 <br/>
               {/volist}
 
             </p>

app/shop/view/order/order_renew/lists.html

@@ -49,7 +49,29 @@
                 <b style="color:red;">￥{{ d.renew_price }}</b>
             </script>
 
+            <script type="text/html" id="table-order">
 
+                {{#  if(d.order_status_str == "待支付"){ }}
+                <b style="color:red;">{{ d.order_status_str }}</b>
+                {{#  } }}
+                {{#  if(d.order_status_str == "已完成"){ }}
+                <b style="color:blue;">{{ d.order_status_str }}</b>
+                {{#  } }}
+                {{#  if(d.order_status_str == "已关闭"){ }}
+                <b style="color:#000;">{{ d.order_status_str }}</b>
+                {{#  } }}
+
+            </script>
+
+            <script type="text/html" id="table-pay">
+                {{#  if(d.pay_status_str == "待支付"){ }}
+                <b style="color:red;">{{ d.pay_status_str }}</b>
+                {{#  } }}
+
+                {{#  if(d.pay_status_str == "已支付"){ }}
+                <b style="color:blue;">{{ d.pay_status_str }}</b>
+                {{#  } }}
+            </script>
         </div>
 
     </div>
@@ -65,16 +87,16 @@
             { field: "id", width: 80, title: "ID" }
             , { field: "order_sn", width: 200, align: "center", title: "订单编号" }
             , { field: "renew_name", width: 180, align: "center", title: "商品名称" }
-            , { field: "renew_price", width: 100, align: "center", title: "套餐总价", templet: "#table-price"  }
-            , { field: "total_num", width: 100, align: "center", title: "套餐数量" }
-            , { field: "order_status_str", width: 100, align: "center", title: "订单状态" , templet: "#table-pay" }
-            , { field: "pay_status_str", width: 100, align: "center", title: "支付状态" }
+            , { field: "total_num", width: 100, align: "center", title: "商品数量" }
+            , { field: "renew_price", width: 100, align: "center", title: "订单总价", templet: "#table-price"  }
+            , { field: "order_status_str", width: 100, align: "center", title: "订单状态" , templet: "#table-order" }
             , { field: "pay_way_str", width: 100, align: "center", title: "支付方式" }
+            , { field: "pay_status_str", width: 100, align: "center", title: "支付状态"  , templet: "#table-pay"}
             , { field: "pay_time_str", width: 200, align: "center", title: "支付时间" }
-            , { title: "操作", width: 300, align: "center", fixed: "right", toolbar: "#table-operation" }
+            , { field: "trade_no", width: 250, align: "center", title: "支付流水号" }
+            , { title: "操作", width: 100, align: "center", fixed: "right", toolbar: "#table-operation" }
         ]);
 
-
         var active = {
             pay: function (obj) {
                 window.open("{:url('order.OrderRenew/payPage')}?id=" + obj.data.id);