xxxrrrdddd 2 年之前
父節點
當前提交
3140f20610

+ 0 - 9
application/admin/controller/Mobile.php

@@ -161,17 +161,8 @@ class Mobile extends Backend
         }else{
             Db::startTrans();
             $data=input('row/a');
-            $city=$data['city'];
-            if($city){
-                $ex=explode('/',$city);
-                list($data['province'],$data['city'])=$ex;
-                $data['province_id']=\app\common\model\Area::getIdByName($data['province']);
-                $data['city_id']=\app\common\model\Area::getIdByName($data['city']);
-            }
             (new MobilePriceLogService)->setMobile($mobile)->setAdminId($this->auth->id)->setBeforePrice($mobile['amount_base'])->setAfterPrice($data['amount_base'])->log();
             $mobile->allowField(true)->save($data);
-            $describe=$data['describe']??'';
-            $mobile->info()->update(compact('describe'));
             Db::commit();
             $this->success();
         }

+ 4 - 2
application/admin/view/mobile/edit.html

@@ -80,7 +80,7 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-8" style="font-size: 20px;">
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.95"/>95折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.9"/>9折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.88"/>8.8折</label>
@@ -88,7 +88,9 @@
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.8"/>8折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.75"/>75折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.7"/>7折</label>
-            自定义<input type="number" value="" class="kill-discount" style="width: 100px;"/>
+            <div>
+                自定义<input type="number" value="" class="kill-discount" style="width: 150px;"/>
+            </div>
         </div>
     </div>
     <div class="form-group">

+ 10 - 71
application/admin/view/mobile/takeit.html

@@ -1,53 +1,4 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-logo" class="form-control" name="row[id]" type="text" value="{$row.id}" readonly>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('手机号')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-no" class="form-control" name="row[no]" type="text" value="{$row.no}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" data-level="city" type="text" value="{$row.province}/{$row.city}"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('运营商')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-network" class="form-control" name="row[network]" type="text" value="{$row.network}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('代理商')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-proxy_id" data-field="nickname" data-params='{"custom[proxy]":1}' data-rule="required" data-source="auth/proxy/selectpage" class="form-control selectpage" name="row[proxy_id]" type="text" value="{$row.proxy_id}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('卡品牌')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-brand" class="form-control" name="row[brand]" type="text" value="{$row.brand}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('套餐信息')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea id="c-describe" class="form-control" name="row[describe]" type="text">{$row.info.describe}</textarea>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('原价')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -80,11 +31,17 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-8" style="font-size: 20px;">
+            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.95"/>95折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.9"/>9折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.88"/>8.8折</label>
             <label><input type="radio" class="kill-discount-radio" name="discount" value="0.85"/>8.5折</label>
-             自定义<input type="number" value="" class="kill-discount" style="width: 100px;"/>
+            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.8"/>8折</label>
+            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.75"/>75折</label>
+            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.7"/>7折</label>
+            <div>
+                自定义<input type="number" value="" class="kill-discount" style="width: 150px;"/>
+            </div>
         </div>
     </div>
     <div class="form-group">
@@ -94,27 +51,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('是否置顶')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[top_time]',[1=>'是',0=>'否'],$row['top_time']?1:0)}
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('是否推荐')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[rec_time]',[1=>'是',0=>'否'],$row['rec_time']?1:0)}
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('状态')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[status]',[0=>'正常',1=>'已售',2=>'已下架'],$row['status'])}
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('秒杀倒计时(分钟)')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sort" min="0" class="form-control" name="row[sort]" type="number" value="{$row.sort|htmlentities}">
+            <input type="number" min="0" class="form-control" name="row[activity_time_end]" value="{$row.activity_time_end}"/>
         </div>
     </div>
     <div class="form-group layer-footer">

+ 1 - 1
commands/mobile_activity.php

@@ -21,4 +21,4 @@ class MobileActivity extends Com{
         };
     }
 }
-MobileActivity::run();
+//MobileActivity::run();

+ 1 - 1
public/assets/js/backend/mobile.js

@@ -103,7 +103,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     text: __('预占'),
                                     title: __('预占'),
                                     classname: 'btn btn-xs btn-info btn-dialog',
-                                    url: $.fn.bootstrapTable.defaults.extend.edit_url,
+                                    url: 'mobile/takeit',
                                     callback: function (data) {
                                     },
                                     visible: function (row) {