物流单号

@@ -22,7 +22,7 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('店铺属性')}:</label>
         <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">
-            {:Form::checkboxs('row[property]', ['供货商'=>'供货商', '一级代理'=>'一级代理','厂家直销'=>'厂家直销'],$row.property,['data-rule'=>'required'])}
+            {:Form::checkboxs('row[property]', ['普通供货商'=>'普通供货商', '一级代理'=>'一级代理','厂家直销'=>'厂家直销'],$row.property,['data-rule'=>'required'])}
         </div>
         </div>
     </div>
     </div>
     {if condition="!empty($row.svip_passtime)"}
     {if condition="!empty($row.svip_passtime)"}

@@ -90,7 +90,7 @@
         <div class="form-group">
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('店铺属性')}:</label>
             <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">
-                {:Form::checkboxs('row[property]', ['供货商'=>'供货商', '一级代理'=>'一级代理','厂家直销'=>'厂家直销'],['data-rule'=>'required'])}
+                {:Form::checkboxs('row[property]', ['普通供货商'=>'普通供货商', '一级代理'=>'一级代理','厂家直销'=>'厂家直销'],['data-rule'=>'required'])}
             </div>
             </div>
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">

@@ -331,7 +331,7 @@ class Goods extends Frontend
                     $ids[] = $vo['id'];
                     $ids[] = $vo['id'];
                 }
                 }
             }
             }
-            $data[$key]['distance'] = $encrypt == '1' ? $distance : '';
+            $data[$key]['distance'] = $distance;
         }
         }
         if(!empty($param['sort'])){
         if(!empty($param['sort'])){
             if($param['sort'] == 2){
             if($param['sort'] == 2){

@@ -767,7 +767,7 @@
                     });
                     });
                     var distance = '';
                     var distance = '';
                     if(vo.distance != ''){
                     if(vo.distance != ''){
-                        distance = "（"+vo.distance+"km）";
+                        distance = "（距您"+vo.distance+"KM）";
                     }
                     }
                     var str = "<tr onclick=\"window.location.href='{:url('index/goods/detail',array('goods_id'=>'GOODS_ID'))}'\">\n" +
                     var str = "<tr onclick=\"window.location.href='{:url('index/goods/detail',array('goods_id'=>'GOODS_ID'))}'\">\n" +
                         "                            <td>"+vo.id+"</td>\n" +
                         "                            <td>"+vo.id+"</td>\n" +