init

application/admin/controller/Mobile.php

@@ -40,7 +40,7 @@ class Mobile extends Backend
 
     public function import()
     {
-        MobileImport::import(input('file'));
+        MobileImport::import(input('file'),$this->auth->id);
         $this->success();
     }
 
@@ -175,6 +175,29 @@ class Mobile extends Backend
         }
     }
 
+    public function edit($ids=null){
+        $mobile=$this->model->find($ids);
+        if($this->request->isGet()){
+            $this->assign('row',$mobile);
+            return view();
+        }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']);
+            }
+            $mobile->allowField(true)->save($data);
+            $describe=$data['describe']??'';
+            $mobile->info()->update(compact('describe'));
+            Db::commit();
+            $this->success();
+        }
+    }
+
     protected function buildindexparams($searchfields = null, $relationSearch = null)
     {
         $searchfields = is_null($searchfields) ? $this->searchFields : $searchfields;

application/admin/view/mobile/add.html

@@ -1,100 +0,0 @@
-<form id="add-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">{:__('Logo')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-logo" class="form-control" name="row[logo]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-no" class="form-control" name="row[no]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-type" min="0" class="form-control" name="row[type]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Network')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-network" data-rule="required" min="0" class="form-control" name="row[network]" type="number">
-        </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"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_exists')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_exists" min="0" class="form-control" step="0.01" name="row[amount_exists]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_original')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_original" min="0" class="form-control" step="0.01" name="row[amount_original]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_base')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_base" min="0" class="form-control" step="0.01" name="row[amount_base]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount_charge')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_charge" min="0" class="form-control" step="0.01" name="row[amount_charge]" type="number" value="0.00">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-amount" min="0" class="form-control" step="0.01" name="row[amount]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Summary')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-summary" class="form-control" name="row[summary]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Saled')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-saled" min="0" class="form-control" name="row[saled]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_activity')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[is_activity]',[0=>'否',1=>'是'],0)}
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Activity_time_end')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_time_end" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[activity_time_end]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
-        </div>
-    </div>
-</form>

application/admin/view/mobile/edit.html

@@ -1,387 +1,114 @@
 <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">{:__('Logo')}:</label>
+        <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[logo]" type="text" value="{$row.logo|htmlentities}">
+            <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">{:__('Name')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('手机号')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-no" class="form-control" name="row[no]" type="text" value="{$row.no|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-type" min="0" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Network')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-network" data-rule="required" min="0" class="form-control" name="row[network]" type="number" value="{$row.network|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('City_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-city_id" min="0" data-rule="required" data-source="city/index" class="form-control selectpage" name="row[city_id]" type="text" value="{$row.city_id|htmlentities}">
+            <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]" type="text" value="{$row.city|htmlentities}"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-province_id" min="0" data-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-province" class="form-control" name="row[province]" type="text" value="{$row.province|htmlentities}">
+            <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">{:__('Amount_exists')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('运营商')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_exists" min="0" class="form-control" step="0.01" name="row[amount_exists]" type="number" value="{$row.amount_exists|htmlentities}">
+            <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">{:__('Amount_original')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('代理商')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_original" min="0" class="form-control" step="0.01" name="row[amount_original]" type="number" value="{$row.amount_original|htmlentities}">
+            <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">{:__('Amount_base')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('卡品牌')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_base" min="0" class="form-control" step="0.01" name="row[amount_base]" type="number" value="{$row.amount_base|htmlentities}">
+            <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">{:__('Amount_charge')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('套餐信息')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-amount_charge" min="0" class="form-control" step="0.01" name="row[amount_charge]" type="number" value="{$row.amount_charge|htmlentities}">
+            <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">{:__('Amount')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-amount" min="0" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
+            <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">{:__('Create_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('原价')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+            <input id="c-amount_original" class="form-control" name="row[amount_original]" type="number" value="{$row.amount_original}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('底价')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+            <input id="c-amount_di" class="form-control" name="row[amount_di]" type="number" value="{$row.amount_di}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Top_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('售价')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-top_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[top_time]" type="text" value="{:$row.top_time?datetime($row.top_time):''}">
+            <input id="c-amount_base" class="form-control" name="row[amount_base]" type="number" value="{$row.amount_base}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Rec_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('预充')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-rec_time" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[rec_time]" type="text" value="{:$row.rec_time?datetime($row.rec_time):''}">
+            <input id="c-amount_charge" class="form-control" name="row[amount_charge]" type="number" value="{$row.amount_charge}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Summary')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('秒杀价')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-summary" class="form-control" name="row[summary]" type="text" value="{$row.summary|htmlentities}">
+            <input id="c-amount_kill" class="form-control" name="row[amount_kill]" type="number" value="{$row.amount_kill}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Saled')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-saled" min="0" class="form-control" name="row[saled]" type="number" value="{$row.saled|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_activity')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-is_activity" class="form-control" name="row[is_activity]" type="number" value="{$row.is_activity|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Activity_time_end')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_time_end" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[activity_time_end]" type="text" value="{$row.activity_time_end}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_0')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_0" min="0" class="form-control" name="row[filter_exists_0]" type="number" value="{$row.filter_exists_0|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_2')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_2" min="0" class="form-control" name="row[filter_exists_2]" type="number" value="{$row.filter_exists_2|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_3')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_3" min="0" class="form-control" name="row[filter_exists_3]" type="number" value="{$row.filter_exists_3|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_4')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_4" min="0" class="form-control" name="row[filter_exists_4]" type="number" value="{$row.filter_exists_4|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_5')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_5" min="0" class="form-control" name="row[filter_exists_5]" type="number" value="{$row.filter_exists_5|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_6')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_6" min="0" class="form-control" name="row[filter_exists_6]" type="number" value="{$row.filter_exists_6|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_7')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_7" min="0" class="form-control" name="row[filter_exists_7]" type="number" value="{$row.filter_exists_7|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_8')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_8" min="0" class="form-control" name="row[filter_exists_8]" type="number" value="{$row.filter_exists_8|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_exists_9')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_exists_9" min="0" class="form-control" name="row[filter_exists_9]" type="number" value="{$row.filter_exists_9|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_0')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_0" min="0" class="form-control" name="row[filter_num_0]" type="number" value="{$row.filter_num_0|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_1')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_1" min="0" class="form-control" name="row[filter_num_1]" type="number" value="{$row.filter_num_1|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_2')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_2" min="0" class="form-control" name="row[filter_num_2]" type="number" value="{$row.filter_num_2|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_3')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_3" min="0" class="form-control" name="row[filter_num_3]" type="number" value="{$row.filter_num_3|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_4')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_4" min="0" class="form-control" name="row[filter_num_4]" type="number" value="{$row.filter_num_4|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_5')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_5" min="0" class="form-control" name="row[filter_num_5]" type="number" value="{$row.filter_num_5|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_6')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_6" min="0" class="form-control" name="row[filter_num_6]" type="number" value="{$row.filter_num_6|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_7')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_7" min="0" class="form-control" name="row[filter_num_7]" type="number" value="{$row.filter_num_7|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_8')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_8" min="0" class="form-control" name="row[filter_num_8]" type="number" value="{$row.filter_num_8|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_num_9')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_num_9" min="0" class="form-control" name="row[filter_num_9]" type="number" value="{$row.filter_num_9|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_3a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_3a" min="0" class="form-control" name="row[filter_3a]" type="number" value="{$row.filter_3a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_4a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_4a" min="0" class="form-control" name="row[filter_4a]" type="number" value="{$row.filter_4a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_5a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_5a" min="0" class="form-control" name="row[filter_5a]" type="number" value="{$row.filter_5a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_6a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_6a" min="0" class="form-control" name="row[filter_6a]" type="number" value="{$row.filter_6a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_7a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_7a" min="0" class="form-control" name="row[filter_7a]" type="number" value="{$row.filter_7a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_8a')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_8a" min="0" class="form-control" name="row[filter_8a]" type="number" value="{$row.filter_8a|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_abc')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_abc" min="0" class="form-control" name="row[filter_abc]" type="number" value="{$row.filter_abc|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_abcd')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_abcd" min="0" class="form-control" name="row[filter_abcd]" type="number" value="{$row.filter_abcd|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_abcde')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_abcde" min="0" class="form-control" name="row[filter_abcde]" type="number" value="{$row.filter_abcde|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_abcdef')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_abcdef" min="0" class="form-control" name="row[filter_abcdef]" type="number" value="{$row.filter_abcdef|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_3ab')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_3ab" min="0" class="form-control" name="row[filter_3ab]" type="number" value="{$row.filter_3ab|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_4ab')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_4ab" min="0" class="form-control" name="row[filter_4ab]" type="number" value="{$row.filter_4ab|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_5ab')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_5ab" min="0" class="form-control" name="row[filter_5ab]" type="number" value="{$row.filter_5ab|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_2')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_2" min="0" class="form-control" name="row[filter_no_pos_2]" type="number" value="{$row.filter_no_pos_2|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_3')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_3" min="0" class="form-control" name="row[filter_no_pos_3]" type="number" value="{$row.filter_no_pos_3|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_4')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_4" min="0" class="form-control" name="row[filter_no_pos_4]" type="number" value="{$row.filter_no_pos_4|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_5')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_5" min="0" class="form-control" name="row[filter_no_pos_5]" type="number" value="{$row.filter_no_pos_5|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_6')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_6" min="0" class="form-control" name="row[filter_no_pos_6]" type="number" value="{$row.filter_no_pos_6|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_7')}:</label>
+        <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_7" min="0" class="form-control" name="row[filter_no_pos_7]" type="number" value="{$row.filter_no_pos_7|htmlentities}">
+            <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;"/>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_8')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('是否秒杀')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_8" min="0" class="form-control" name="row[filter_no_pos_8]" type="number" value="{$row.filter_no_pos_8|htmlentities}">
+            {:build_radios('row[is_activity]',[1=>'是',0=>'否'],$row['is_activity'])}
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Filter_no_pos_9')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('是否置顶')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_9" min="0" class="form-control" name="row[filter_no_pos_9]" type="number" value="{$row.filter_no_pos_9|htmlentities}">
+            {: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">{:__('Filter_no_pos_10')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('是否推荐')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_10" min="0" class="form-control" name="row[filter_no_pos_10]" type="number" value="{$row.filter_no_pos_10|htmlentities}">
+            {: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">{:__('Filter_no_pos_11')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('状态')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-filter_no_pos_11" min="0" class="form-control" name="row[filter_no_pos_11]" type="number" value="{$row.filter_no_pos_11|htmlentities}">
+            {:build_radios('row[status]',[0=>'正常',1=>'已售',2=>'已下架'],$row['status'])}
         </div>
     </div>
     <div class="form-group">

application/admin/view/mobile/index.html

@@ -26,9 +26,9 @@
 
 
 
-
+-->
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('mobile/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
-                      --><!--  <div class="dropdown btn-group {:$auth->check('mobile/multi')?'':'hide'}">
+                      <!--  <div class="dropdown btn-group {:$auth->check('mobile/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>

application/common/model/Mobile.php

@@ -87,6 +87,13 @@ class Mobile extends Model
             if(empty($mobile['city_id'])){
                 $mobile['city_id']=Area::getIdByName($mobile['city']);
             }
+
+            if(!empty($mobile['province_id'])){
+                $mobile['province']=Area::where('id',$mobile['province_id'])->value('name');
+            }
+            if(!empty($mobile['city_id'])){
+                $mobile['city']=Area::where('id',$mobile['city_id'])->value('name');
+            }
         });
     }
 

application/common/model/MobileInfo.php

@@ -19,7 +19,7 @@ class MobileInfo extends Model
     protected static function init()
     {
         self::beforeWrite(function (self $info){
-            if(!is_numeric($info['first_month_free'])){
+            if(isset($info['first_month_free']) && !is_numeric($info['first_month_free'])){
                 $info['first_month_free']=Str::contains($info['first_month_free'],'是')?1:0;
             }
         });

application/common/service/MobileImport.php

@@ -2,6 +2,7 @@
 namespace app\common\service;
 
 use app\admin\library\Auth;
+use app\admin\model\Admin;
 use app\common\model\Mobile;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
@@ -12,7 +13,7 @@ use think\Exception;
 use think\exception\PDOException;
 
 class MobileImport{
-    public static function import($file){
+    public static function import($file,$admin_id){
         if (!$file) {
             throw_user(__('Parameter %s can not be empty', 'file'));
         }
@@ -69,7 +70,7 @@ class MobileImport{
         }
     $infoArr=[
         '免流APP'=>'free_app',
-        '套餐说明|资费详情'=>'describe',
+        '套餐信息'=>'describe',
         '详细内容|注意事项'=>'content',
         '每年流量(G'=>'flow_year',
         '费用'=>'fee',
@@ -118,6 +119,8 @@ class MobileImport{
                 }
 
                 Db::startTrans();
+                $row['proxy_id']=Admin::where('nickname',$row['proxy_id'])->value('id');
+                $row['admin_id']=$admin_id;
                 $mobile=Mobile::create($row);
                 if(!$mobile){
                     Db::rollback();

public/assets/js/backend/mobile.js

@@ -43,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'info.describe', title: __('套餐信息'),operate: "like",formatter: Table.api.formatter.content,width: 300},
                         {field: 'amount_original', title: __('Amount_original'), operate:'BETWEEN'},
                         {field: 'amount_di', title: __('底价'), operate:'BETWEEN'},
-                        {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
+                        {field: 'amount_base', title: __('Amount'), operate:'BETWEEN'},
                         {field: 'amount_charge', title: __('预存话费'), operate:'BETWEEN'},
                         {field: 'remark', title: __('备注'), operate:'BETWEEN'},
                         {field: 'top_time', title: __('Top_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false,formatter(a,b,c){
@@ -90,7 +90,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'sort', title: __('Sort'),operate: "BETWEEN"},
                         {field: 'hold_chan', title: __('预占通道'),operate: "="},
                         {field: 'hold_user', title: __('预占用户ID'),operate: "="},
-                        {field: 'proxy_id', title: __('上传用户'),operate: "="},
+                        {field: 'admin_id', title: __('上传用户'),operate: "="},
 
                         /*{field: 'name', title: __('Name')},
                         {field: 'type', title: __('Type'),formatter: Table.api.formatter.label,searchList:no_type},