init

application/admin/controller/MobileFlow.php

@@ -42,7 +42,7 @@ class MobileFlow extends Backend
 
     public function import()
     {
-        MobileImport::import(input('file'),$this->auth->id);
+        MobileImport::import(input('file'),$this->auth->id,2);
         $this->success();
     }
 

application/admin/view/mobile_flow/index.html

@@ -7,7 +7,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="/lh_export.xlsx" class="btn btn-info" target="_blank">号码上架模版下载</a>
+                        <a href="/flow_export.xlsx" class="btn btn-info" target="_blank">号码上架模版下载</a>
                         <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('mobile/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('mobile/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         -->

application/api/controller/MobileController.php

@@ -57,7 +57,6 @@ class MobileController extends UserApi
      * @ApiReturnParams (name="info.content",description="详细内容|注意事项")
      * @ApiReturnParams (name="info.flow_year",description="每年流量(G)")
      * @ApiReturnParams (name="info.fee",description="资费")
-     * @ApiReturnParams (name="info.fee_unit",description="资费单位月还是年")
      * @ApiReturnParams (name="info.first_month_free",description="首月是否免月租")
      * @ApiReturnParams (name="info.discount_title",description="简要优惠介绍")
      */

application/common/model/Mobile.php

@@ -73,6 +73,12 @@ class Mobile extends Model
     public static function init()
     {
         self::beforeWrite(function (self $mobile){
+            if(!isset($mobile['amount_base'])){
+                $mobile['amount_base']=0;
+            }
+            if(!isset($mobile['amount_charge'])){
+                $mobile['amount_charge']=0;
+            }
             $mobile['amount']=$mobile['amount_base']+$mobile['amount_charge'];
 
             if(isset($mobile['top_time']) && $mobile['top_time']==1){

application/common/service/MobileImport.php

@@ -71,12 +71,11 @@ class MobileImport{
     $infoArr=[
         '免流APP'=>'free_app',
         '套餐信息'=>'describe',
-        '详细内容|注意事项'=>'content',
+        '注意事项'=>'content',
         '每年流量(G'=>'flow_year',
         '费用'=>'fee',
-        '费用单位'=>'fee_unit',
         '首月免月租'=>'first_month_free',
-        '简要优惠介绍'=>'discount_title',
+        '前多少名免单'=>'flow_free_limit',
     ];
         //加载文件
         $insert = [];