wupengfei 1 year ago
parent
commit
ba9b0b0197

+ 3 - 3
.idea/workspace.xml

@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/LevelOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Level.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Level.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/level/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/level/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -388,7 +388,7 @@
       <workItem from="1690764472148" duration="16055000" />
       <workItem from="1690851419503" duration="20529000" />
       <workItem from="1690938001930" duration="13294000" />
-      <workItem from="1691040879419" duration="3644000" />
+      <workItem from="1691040879419" duration="3844000" />
     </task>
     <servers />
   </component>

+ 1 - 2
application/user/controller/Level.php

@@ -115,8 +115,7 @@ class Level extends Controller
             $renew= input('post.renew');
             $price_param = [];
             foreach ($title_arr as $k=>$t){
-                $renew_discount = $renew[$k] > 0  && $renew[$k]<=100 ? $renew[$k] :100;
-                $price_param[] = ['title'=>$t,'time'=>intval($time_arr[$k]),'price'=>bcadd($price_arr[$k],0,2),'level_key'=>$k,'renew'=>$renew_discount];
+                $price_param[] = ['title'=>$t,'time'=>intval($time_arr[$k]),'price'=>bcadd($price_arr[$k],0,2),'level_key'=>$k,'renew'=>bcadd($renew[$k],0,2)];
             }
             $data['price'] = json_encode($price_param);
         }

+ 1 - 1
application/user/view/level/form.html

@@ -40,7 +40,7 @@
                             <th class="text-left"   width="20%">标题</th>
                             <th class="text-center" width="10%">时间(月)</th>
                             <th class="text-center" width="20%">价格(元)</th>
-                            <th class="text-center" width="20%">续费折扣(%)</th>
+                            <th class="text-center" width="20%">续费价格</th>
                             <th class="text-center">
                                 <a class="layui-btn layui-btn-sm layui-btn-normal"  onclick="add_param()">添 加</a>
                             </th>