o2o配送改价格相关接口

backend/config/urlmanager.php

@@ -250,6 +250,8 @@ return [
                     'extraPatterns'=>[
                         'GET,OPTIONS o2o-delivery-list' => 'o2o-delivery-list',
                         'PUT,OPTIONS o2o-delivery-update' => 'o2o-delivery-update',
+                        'GET,OPTIONS o2o-delivery-export' => 'o2o-delivery-export',
+                        'GET,OPTIONS o2o-delivery-view' => 'o2o-delivery-view',
                     ],
                 ],
                 //配送方式

backend/models/v1/branch/ShopCityDistributionSetting.php

@@ -66,12 +66,12 @@ class ShopCityDistributionSetting extends BaseModel
             [['BRANCH_INFO'],'match', 'pattern' => '/^[\x{4e00}-\x{9fa5}A-Za-z0-9_]+$/u','message'=>'只能包含中文汉字，字母，数字','on' => 'search'],
             [['GUID','REGION_TYPE'], 'required','on'=>['o2o_update'],'message'=>'{attribute}不能为空'],
             [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE','DELIVERY_PRICE'], 'double','on'=>['o2o_update']],
-            [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE'], 'required','on'=>['o2o_update'],'when' => function($model) {
+            [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE'], 'required','when' => function($model) {
                 return $model->REGION_TYPE == '2';
-            },'message' => '{attribute}不能为空'],
-            [['DELIVERY_PRICE'], 'required','on'=>['o2o_update'],'when' => function($model) {
+            },'message' => '{attribute}不能为空','on'=>['o2o_update']],
+            [['DELIVERY_PRICE'], 'required','when' => function($model) {
                 return $model->REGION_TYPE == '1';
-            },'message' => '{attribute}不能为空'],
+            },'message' => '{attribute}不能为空','on'=>['o2o_update']],
         ];
     }
 
@@ -94,8 +94,8 @@ class ShopCityDistributionSetting extends BaseModel
             'SIMPLE_DISTR_PIC' => 'Simple Distr Pic',
             'SIMPLE_DISTR_INITIAL_PRICE' => 'Simple Distr Initial Price',
             'SIMPLE_DISTR_DELIVERY_PRICE	' => 'Simple Distr Delivery Price',
-            'REGION_DISTR_DISTANCE' => '不同距离不同配送费**公里内数值',
-            'REGION_DISTR_PRICE' => '不同距离不同配送费*公里内*元数值',
+            'REGION_DISTR_DISTANCE' => '基础公里',
+            'REGION_DISTR_PRICE' => '基础运费',
             'INCREASE_DISTANCE' => '不同距离不同配送费增加*公里数值',
             'INCREASE_PRICE' => '不同距离不同配送费增加*公里*元数值',
             'LAT' => 'Lat',