修改后台小问题

app/api/controller/ShopContent.php

@@ -91,6 +91,7 @@ class ShopContent extends Api
         }
     }
 
+
     /*
      * 验证秘钥
      *
@@ -107,7 +108,8 @@ class ShopContent extends Api
         if($data['status'] == 100){
             //通过
             $respon = [
-                    'is_gi' => $data['is_gi']  //是否到期  0未到期 或者 1 是到期(但评论数量存在>10条)
+                    'is_gi' => $data['is_gi'], //是否到期  0未到期 或者 1 是到期(但评论数量存在>10条)
+                    'count' => $data['count']
                 ];
             return JsonServer::success($data['msg'], $respon);
         }else{

app/api/logic/ShopContentLogic.php

@@ -33,6 +33,7 @@ use think\facade\Event;
 
 class ShopContentLogic extends Logic
 {
+
     /*
      * 获取机器秘钥
      */

app/shop/logic/order/OrderRenewLogic.php

@@ -345,8 +345,14 @@ class OrderRenewLogic extends Logic
         $where[] = ['shop_id', '=', $get['shop_id']];
         $type_id = $get['type_id'] ?? 1;
         if ($type_id == 1) {
-            $where[] = ['source_type', '>=', 100];
-            $where[] = ['source_type', '<', 200];
+            //搜索
+            $source_type = $get['source_type'] ?? 0;
+            if($source_type != 0){
+                $where[] = ['source_type', '=', $source_type];
+            }else{
+                $where[] = ['source_type', '>=', 100];
+                $where[] = ['source_type', '<', 200];
+            }
         } else {
             $where[] = ['source_type', '>=', 200];
             $where[] = ['source_type', '<', 300];

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

@@ -14,12 +14,16 @@
         秒
         </span>
 
+        <?php
+        //var_dump($extend['c1_1']);
+        ?>
+
         <span class="ks">
-        评论数:<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="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{else/}{$extend.c1_1[1]}{/if}">
         观看
-        <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_2[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.c1_2[1]) || empty($extend.c1_2[1])}5{else/}{$extend.c1_2[1]}{/if}">
         秒到
-        <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}">
+        <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{else/}{$extend.c1_3[1]}{/if}">
         秒
         </span>
 

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

@@ -13,11 +13,11 @@
         </span>
         <span class="ks">
 
-        评论数:<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="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{else/}{$extend.d1_1[1]}{/if}">
         观看
-        <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_2[]" id="" autocomplete="off" class="layui-input w30" value="{if !isset($extend.d1_2[1]) || empty($extend.d1_2[1])}5{else/}{$extend.d1_2[1]}{/if}">
         秒到
-        <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}">
+        <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{else/}{$extend.d1_3[1]}{/if}">
         秒
         </span>
 

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

@@ -25,19 +25,24 @@
 {php}
 $date1 = time();
 $date2 = strtotime($end_time);
-
 // 将时间戳转换为天数
 $days = abs($date2 - $date1) / (60 * 60 * 24);
-              $days = intval($days);
-
+$days = intval($days); //取整
+if($date1 > $date2){
+    $days_desc = "已过期".$days."天";
+}else if($days == 0){
+    $days_desc = "今天已到期";
+}else{
+    $days_desc = "剩余".$days."天";
+}
 //echo "相差天数：".intval($days); // 输出相差天数，使用intval确保得到整数结果
 {/php}
 
-              <b>套餐包含：</b> 电脑{$server_info.pc_num}台，每台电脑可添加手机{$server_info.mobile_num}台，可同时运行手机{$server_info.run_num}台。
+                <b>套餐包含：</b> 电脑 <b style="color:#000;">{$server_info.pc_num}</b> 台，每台电脑可添加手机 <b style="color:#000;">{$server_info.mobile_num}</b> 台，可同时运行手机 <b style="color:#000;">{$server_info.run_num}</b> 台。
               <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/>
+              总电脑数量：<b style="color:#000;">{$edui_info[0][0]??"0"}</b> 台 &nbsp;&nbsp;&nbsp;&nbsp;<b style="color:red;">服务到期时间:</b>  <span style="color:red;">{$end_time} （{$days_desc}）</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/>
+                第 <b style="color:#000;">{$vo[1]}</b> 台电脑，总共 <b style="color:#000;">{$vo[2]}</b> 台手机设备，已启用 <b style="color:#000;">{$vo[3]}</b> 台手机设备，未启用 <b style="color:#000;">{$vo[4]}</b> 台手机设备，可同时运行手机 <b style="color:#000;">{$server_info.run_num}</b> 台。 <br/>
               {/volist}
 
             </p>

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

@@ -27,11 +27,13 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">类型</label>
                 <div class="layui-input-inline">
-                    <select name="type_id">
-                        <option value=""></option>
+                    <select name="source_type">
+                        <option value="">请选择</option>
+                        <option value="101">使用扣减次数</option>
+                        <option value="100">充值次数</option>
                     </select>
                 </div>
-                <div class="layui-inline">
+                <div class="layui-inline" style="margin-top: 5px;">
                     <a class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="search">搜索</a>
                     <a class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="clear-search">重置</a>
                 </div>
@@ -43,6 +45,28 @@
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
         </div>
 
+        <script type="text/html" id="table-count">
+            {{# if(0 - d.change_count > 0){ }}
+            <span style="color: red;">{{ d.change_count }}</span>
+            {{#  }else{ }}
+            <span style="color: blue;">+{{ d.change_count }}</span>
+            {{#  } }}
+        </script>
+
+        <script type="text/html" id="table-type">
+            {{# if(d.source_type == 101){ }}
+            <span style="color: red;">使用扣减次数</span>
+            {{#  } }}
+
+            {{# if(d.source_type == 100){ }}
+            <span style="color: blue;">充值次数</span>
+            {{#  } }}
+        </script>
+
+        <script type="text/html" id="table-num">
+            <span style="color: #000;"><b>{{ d.left_count }}</b></span>
+        </script>
+
     </div>
 </div>
 
@@ -54,10 +78,11 @@
 
         like.tableLists("#like-table-lists", "{:url()}", [
             { field: "id", width: 80, title: "ID" }
-            , { field: "change_count", width: 200, align: "center", title: "变动数量" }
-            , { field: "left_count", width: 200, align: "center", title: "变动后总数" }
-            , { field: "remark", width: 400, align: "center", title: "备注" }
-            , { field: "create_time", width: 200, align: "center", title: "变动时间" }
+            , { field: "source_type", width: 120, align: "center", title: "变动类型",templet:"#table-type"}
+            , { field: "change_count", width: 120, align: "center", title: "变动数量",templet:"#table-count"}
+            , { field: "left_count", width: 120, align: "center", title: "变动后总数",templet:"#table-num" }
+            , { field: "remark", align: "center", title: "备注" }
+            , { field: "create_time", width: 200, align: "center", title: "更新时间" }
         ]);
 
         form.on("submit(search)", function (data) {

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

@@ -23,7 +23,7 @@
         </div>
 
          <!-- 搜索区域 -->
-         <div class="layui-card-body layui-form">
+         <div class="layui-card-body layui-form" style="display:none;">
             <div class="layui-form-item">
                 <label class="layui-form-label">类型</label>
                 <div class="layui-input-inline">
@@ -43,6 +43,19 @@
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
         </div>
 
+
+        <script type="text/html" id="table-count">
+
+            {{# if(0 - d.change_count > 0){ }}
+                <span style="color: blue;">{{ d.change_count }}</span>
+            {{#  }else{ }}
+                <span style="color: red;">+{{ d.change_count }}</span>
+            {{#  } }}
+
+
+
+        </script>
+
     </div>
 </div>
 
@@ -54,11 +67,11 @@
 
         like.tableLists("#like-table-lists", "{:url()}", [
             { field: "id", width: 80, title: "ID" }
-            , { field: "change_count", width: 200, align: "center", title: "变动数量" }
-            , { field: "before_date", width: 200, align: "center", title: "变动前到期时间" }
-            , { field: "after_date", width: 200, align: "center", title: "变动后到期时间" }
-            , { field: "remark", width: 400, align: "center", title: "备注" }
-            , { field: "create_time", width: 200, align: "center", title: "变动时间" }
+            , { field: "change_count", width: 100, align: "center", title: "续费月数",templet:"#table-count"}
+            , { field: "before_date", width: 200, align: "center", title: "续费前到期时间" }
+            , { field: "after_date", width: 200, align: "center", title: "续费后到期时间" }
+            , { field: "remark",align: "center", title: "备注" }
+            , { field: "create_time", width: 200, align: "center", title: "更新时间" }
         ]);
 
         form.on("submit(search)", function (data) {