Merge branch 'liuxiangxin' into jun

app/Http/Controllers/Admin/Business.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 /**
- * 商业公司管理
+ * 店铺管理
  *
  * @author    刘相欣
  *
@@ -22,7 +22,7 @@ class Business extends Auth{
 	protected function _initialize(){
 		parent::_initialize();
 		$this->assign('breadcrumb1','商家管理');
-		$this->assign('breadcrumb2','商业公司');
+		$this->assign('breadcrumb2','店铺');
 	}
 
 	/**
@@ -151,7 +151,7 @@ class Business extends Auth{
                     // 回滚事务
                     DB::rollBack();
                     // 失败提示
-                    return json_send(['code'=>'error','msg'=>'新增商业公司失败']);
+                    return json_send(['code'=>'error','msg'=>'新增店铺失败']);
                 }
                 // 写入数据表
                 $uid					 = $AdminUser->add($userData);

app/Http/Controllers/Admin/Orders.php

@@ -78,7 +78,7 @@ class Orders extends Auth{
         }
 		// 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-		// 是否存在对应的商业公司ID
+		// 是否存在对应的店铺ID
        	if ( $session['business_id'] ) $map[] = ['orders_product.business_id','=',$session['business_id']];
 		// 数据类型
 		$shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];
@@ -107,7 +107,7 @@ class Orders extends Auth{
 			// 重组
 			$list[$key]				= $value;
 		}
-		// 查询商业公司数据
+		// 查询店铺数据
         $businessList 			    = $Business->getListByAdmin();
 		// 分配数据
 		$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
@@ -409,7 +409,7 @@ class Orders extends Auth{
 		if( $status )			$map[] = ['orders_product.status','=',$status];
         // 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-        // 是否存在对应的商业公司ID
+        // 是否存在对应的店铺ID
         if ( $session['business_id'] ) $map[] = ['orders_product.business_id','=',$session['business_id']];
         // 数据类型
         $shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];

app/Http/Controllers/Admin/Producer.php

@@ -5,7 +5,7 @@ use App\Models\Producer as Model;
 use Illuminate\Support\Carbon;
 
 /**
- * 商业公司管理
+ * 店铺管理
  *
  * @author    刘相欣
  *

app/Http/Controllers/Admin/Product.php

@@ -59,7 +59,7 @@ class Product extends Auth{
 		if( !is_null($status) )	$map[] = ['product.status','=',$status];
 		// 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-		// 是否存在对应的商业公司ID
+		// 是否存在对应的店铺ID
        	if ( $session['business_id'] ) $map[] = ['product.business_id','=',$session['business_id']];
 		// 数据类型
 		$shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];
@@ -180,7 +180,7 @@ class Product extends Auth{
 			$fontPath						= public_path().'/fonts/msyh14.ttf';// 指定字体文件路径
 			// 生成小程序二维码
 			$qrcode							= Mini::getUnlimit($scene,['page'=>'pages/product/index','width'=>280,'is_hyaline'=>true]);
-			// 错误提示
+			// 错误提示 
 			if( isset($qrcode['error']) )	return $qrcode;
 			// 加载图片
 			$qrcode							= Image::make($qrcode)->resize(250,250);
@@ -195,13 +195,35 @@ class Product extends Auth{
 				$font->color('#333333');
 				$font->align('left');
 			});
-			// 给图片写入文字
-			$image->text($oldData['name'], 120,1380,function (Font $font) use ($fontPath) {
-				$font->file($fontPath);		// 字体文件地址
-				$font->size(48);			// 字体大小
-				$font->color('#333333');
-				$font->align('left');
-			});
+			if( mb_strlen($oldData['name']) > 44 ) {
+				// 显示截取后的文字
+				$oldData['name'] 			= mb_substr($oldData['name'],0,22).PHP_EOL.mb_substr($oldData['name'],22,22).PHP_EOL.mb_substr($oldData['name'],44,8);
+				// 给图片写入文字
+				$image->text($oldData['name'], 80,1480,function (Font $font) use ($fontPath) {
+					$font->file($fontPath);		// 字体文件地址
+					$font->size(48);			// 字体大小
+					$font->color('#333333');
+					$font->align('left');
+				});
+			}else if( mb_strlen($oldData['name']) > 22 )  {
+				// 显示截取后的文字
+				$oldData['name'] 			= mb_substr($oldData['name'],0,22).PHP_EOL.mb_substr($oldData['name'],22,22);
+				// 给图片写入文字
+				$image->text($oldData['name'], 80,1450,function (Font $font) use ($fontPath) {
+					$font->file($fontPath);		// 字体文件地址
+					$font->size(48);			// 字体大小
+					$font->color('#333333');
+					$font->align('left');
+				});
+			}else{
+				// 给图片写入文字
+				$image->text($oldData['name'], 120,1380,function (Font $font) use ($fontPath) {
+					$font->file($fontPath);		// 字体文件地址
+					$font->size(48);			// 字体大小
+					$font->color('#333333');
+					$font->align('left');
+				});
+			}
 			// 转码成字符串
 			$image							= $image->encode('jpg', 90)->__toString();
 			// 转base64

app/Http/Controllers/Admin/Regiment.php

@@ -54,7 +54,7 @@ class Regiment extends Auth{
         }
         // 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-		// 是否存在对应的商业公司ID
+		// 是否存在对应的店铺ID
        	if ( $session['business_id'] ) $map[] = ['regiment_active.business_id','=',$session['business_id']];
 		// 数据类型
 		$shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];

app/Http/Controllers/Admin/RegimentActive.php

@@ -54,7 +54,7 @@ class RegimentActive extends Auth{
         }
         // 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-		// 是否存在对应的商业公司ID
+		// 是否存在对应的店铺ID
        	if ( $session['business_id'] ) $map[] = ['regiment_active.business_id','=',$session['business_id']];
 		// 数据类型
 		$shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];

app/Http/Controllers/Admin/RegimentRecord.php

@@ -60,7 +60,7 @@ class RegimentRecord extends Auth{
         }
         // 当前登录的角色数据
         $session                = session('userRule') ? session('userRule') : ['business_id'=>0,'menu_type'=>0,'data_type'=>0];
-		// 是否存在对应的商业公司ID
+		// 是否存在对应的店铺ID
        	if ( $session['business_id'] ) $map[] = ['regiment_active.business_id','=',$session['business_id']];
 		// 数据类型
 		$shopIds				= ($session['menu_type'] == 1 && $session['data_type'] == 2)  ? Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray() : [];

app/Http/Controllers/Api/Orders.php

@@ -55,6 +55,8 @@ class Orders extends Api{
 		$addr							= $CustomAddr->getOne($addrId);
 		// 如果不存在数据
 		if( !$addr )					return json_send(['code'=>'error','msg'=>'地址有误，请核对','data'=>['error'=>'没有找到对应的地址']]);
+		// 如果不存在的话
+		if( !$addr['contact_shop'] )	return json_send(['code'=>'error','msg'=>'所用地址请补充店铺名称','data'=>['error'=>'所用地址请补充店铺名称']]);
 		// 重组数据
 		$addr							= ['contact_name'=>$addr['contact_name'],'contact_shop'=>$addr['contact_shop'],'shop_type'=>$addr['shop_type'],'contact_phone'=>$addr['contact_phone'],'contact_province'=>$addr['contact_province'],'contact_city'=>$addr['contact_city'],'contact_area'=>$addr['contact_area'],'contact_addr'=>$addr['contact_addr']];
 		// 获取客户城市ID
@@ -84,7 +86,7 @@ class Orders extends Api{
 		$skusList						= $ProductSkus->getListByIds(array_column($buyList,'product_skuid'));
 		// 当前时间
 		$time 							= time();
-		// 产品以商业公司分组，方便写入订单
+		// 产品以店铺分组，方便写入订单
 		$orderProduct					= [];
 		// 产品价格同级，用于优惠券计算
 		$productPrice					= [];
@@ -682,7 +684,7 @@ class Orders extends Api{
         $productList					= $Product->getListByIds(array_column($buyList,'product_id'));
         // 当前时间
         $time 							= time();
-        // 产品以商业公司分组，方便写入订单
+        // 产品以店铺分组，方便写入订单
         $orderProduct					= [];
         // 产品价格同级，用于优惠券计算
         $productPrice					= [];

app/Http/Controllers/Api/ShopCart.php

@@ -132,7 +132,7 @@ class ShopCart extends Api{
         $cityId                     = empty($custom['city_id']) ? 0 : $custom['city_id'];
 		// 循环处理数据
 		foreach ($list as $key => $value) {
-			// 获取商业公司名称
+			// 获取店铺名称
 			$value['business_name'] = $value['business_id'] ? (string) $Business->getOne($value['business_id'],'name') : '';
 			// 如果有sku
 			if( $value['skuid'] )	{
@@ -255,7 +255,7 @@ class ShopCart extends Api{
         $promoProductList           = [];
 		// 循环处理数据
 		foreach ($list as $key => $value) {
-			// 获取商业公司名称
+			// 获取店铺名称
 			$value['business_name'] = $value['business_id'] ? (string)$Business->getOne($value['business_id'],'name') : '';
 			// 如果有sku
 			if( $value['skuid'] )	{

app/Http/Requests/Admin/Business.php

@@ -4,7 +4,7 @@ use App\Http\Requests\BaseRequest;
 use Illuminate\Validation\Rule;
 
 /**
- * 商业公司验证器
+ * 店铺验证器
  * 
  */
 class Business extends BaseRequest

app/Http/Requests/Admin/Producer.php

@@ -4,7 +4,7 @@ use App\Http\Requests\BaseRequest;
 use Illuminate\Validation\Rule;
 
 /**
- * 商业公司验证器
+ * 店铺验证器
  * 
  */
 class Producer extends BaseRequest

app/Http/Requests/Api/CustomAddr.php

@@ -34,8 +34,8 @@ class CustomAddr extends BaseRequest
 
     // 场景列表
     protected   $scenes         = [
-        'add'                   => ['contact_province','contact_city','contact_area','contact_name','contact_phone'],
-        'edit'                  => ['id','contact_province','contact_city','contact_area','contact_name','contact_phone'],
+        'add'                   => ['contact_province','contact_city','contact_area','contact_name','contact_phone','contact_shop'],
+        'edit'                  => ['id','contact_province','contact_city','contact_area','contact_name','contact_phone','contact_shop'],
         'del'                   => ['id'],
         'set_default'           => ['id'],
         'get_guess_addr'        => ['contact_shop'],
@@ -58,7 +58,8 @@ class CustomAddr extends BaseRequest
             'contact_area.max'   	    => '区县超长啦',
             'contact_addr.max'   	    => '地址超长啦',
             'contact_name.required'   	=> '请填写收件人',
-            'contact_shop.required'   	=> '请填写终端名称',
+            'contact_shop.required'   	=> '请填写店铺名称',
+            'contact_shop.max'   	    => '店铺最多20字',
             'contact_phone.required'    => '请填写收件人手机号',
             'contact_phone.phone'       => '请填写正确的手机号',
             'id.required'               => '请选择地址',

app/Models/Business.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 商业公司模型
+ * 店铺模型
  * 
  */
 class Business extends Model

app/Models/Company.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 商业公司模型
+ * 店铺模型
  * 
  */
 class Company extends Model

resources/views/admin/admin_user/index.blade.php

@@ -24,7 +24,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>用户账号</th>
 						<th>用户手机</th>
 						<th>商户名称</th>
-						<th>商业公司名称</th>
+						<th>店铺名称</th>
 						<th>用户角色</th>
 						<th>用户权限</th>
 						<th>创建时间</th>

resources/views/admin/auth_manager/index.blade.php

@@ -17,7 +17,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>用户组</th> 	
 						<th>描述</th> 	
 						<th>商户名称</th>
-						<th>商业公司名称</th>
+						<th>店铺名称</th>
 						<th>授权</th>
 						<th>操作</th>	
 					</tr>

resources/views/admin/business/add.blade.php

@@ -5,8 +5,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 @section('content')
 <form class="post-form" action="" method="post">
 	<div class="form-group col-sm-12">
-		<label class="control-label">商业公司</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司" name="name" maxlength="20" value="" />
+		<label class="control-label">店铺</label>
+		<input class="form-control" required="required" type="text" placeholder="店铺" name="name" maxlength="20" value="" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">Logo图</label>
@@ -34,8 +34,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<input class="form-control" required="required" type="text" placeholder="详细地址" maxlength="255" name="address" value="" />
 	</div>
 	<div class="form-group col-sm-12">
-		<label class="control-label">商业公司介绍</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司简介说明" maxlength="255" name="desc" value="" />
+		<label class="control-label">店铺介绍</label>
+		<input class="form-control" required="required" type="text" placeholder="店铺简介说明" maxlength="255" name="desc" value="" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">上级代表</label>

resources/views/admin/business/edit.blade.php

@@ -6,7 +6,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 <form class="post-form" action="" method="post">
 	<div class="form-group col-sm-12">
 		<label class="control-label">商店名称</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司名称" name="name" maxlength="20" value="{{$oldData['name']}}" />
+		<input class="form-control" required="required" type="text" placeholder="店铺名称" name="name" maxlength="20" value="{{$oldData['name']}}" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">Logo图</label>
@@ -38,8 +38,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<input class="form-control" required="required" type="text" placeholder="详细地址" maxlength="255" name="address" value="{{$oldData['address']}}" />
 	</div>
 	<div class="form-group col-sm-12">
-		<label class="control-label">商业公司介绍</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司简介说明" maxlength="255" name="desc" value="{{$oldData['desc']}}" />
+		<label class="control-label">店铺介绍</label>
+		<input class="form-control" required="required" type="text" placeholder="店铺简介说明" maxlength="255" name="desc" value="{{$oldData['desc']}}" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">上级代表</label>

resources/views/admin/business/index.blade.php

@@ -12,7 +12,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 
 <form action="" method="get" class="form-horizontal form-line">
 	<div class="form-group col col-lg-2 col-md-4 col-sm-6 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="business_code" value="{{request('business_code','')}}" placeholder="请输入商业公司编码查询" />
+		<input type="text" class="form-control" name="business_code" value="{{request('business_code','')}}" placeholder="请输入店铺编码查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-4 col-sm-6 col-xs-12" style="margin-right: 2px;">
 		<input type="text" class="form-control" name="phone" value="{{request('phone','')}}" placeholder="请输入联系方式查询" />
@@ -38,7 +38,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 				<thead>
 					<tr>
 						<th>编码</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>图片</th>
 						<th>状态</th>
 						<th>联系方式</th>

resources/views/admin/custom/add.blade.php

@@ -13,8 +13,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<input class="form-control" required="required" type="text" placeholder="联系方式，请填写手机号" name="phone" value="" />
 	</div>
 	<div class="form-group col-sm-12">
-		<label class="control-label">所属商业公司</label>
-		<input class="form-control" type="text" placeholder="所属商业公司" maxlength="20" name="business_name" value="" />
+		<label class="control-label">所属店铺</label>
+		<input class="form-control" type="text" placeholder="所属店铺" maxlength="20" name="business_name" value="" />
 	</div>
 	<div class="form-group col-sm-12">
 		@csrf

resources/views/admin/orders/index.blade.php

@@ -87,7 +87,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>订单编号</th>
 						<th>产品编码</th>
 						<th>下单用户</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>产品名称</th>
 						<th>产品规格</th>
 						<th>产品数量</th>

resources/views/admin/product/add.blade.php

@@ -131,8 +131,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		</select>
 	</div>
 	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
+		<label class="control-label">店铺</label>
+		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索店铺" data-none-results-text="未搜索到 {0}" title="选择店铺">
 			@foreach ($businessList as $value)
 				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
 			@endforeach

resources/views/admin/product/copy.blade.php

@@ -131,8 +131,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		</select>
 	</div>
 	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
+		<label class="control-label">店铺</label>
+		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索店铺" data-none-results-text="未搜索到 {0}" title="选择店铺">
 			@foreach ($businessList as $value)
 				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
 			@endforeach

resources/views/admin/product/edit.blade.php

@@ -131,8 +131,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		</select>
 	</div>
 	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
+		<label class="control-label">店铺</label>
+		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索店铺" data-none-results-text="未搜索到 {0}" title="选择店铺">
 			@foreach ($businessList as $value)
 				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
 			@endforeach

resources/views/admin/product/index.blade.php

@@ -38,7 +38,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="business_id" class="form-control">
-			<option value="" >商业公司</option>
+			<option value="" >店铺</option>
 			@foreach ($businessList as $business)
 			<option value="{{$business['id']}}" @if (request('business_id') === $business['id'] ) selected="selected" @endif >{{$business['name']}}</option>
 			@endforeach
@@ -64,7 +64,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>产品销量</th>
 						<th>产品库存</th>
 						<th>服务城市</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>排序</th>
 						<th>限购数量</th>
 						<th>产品状态</th>

resources/views/admin/regiment/index.blade.php

@@ -43,7 +43,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>参与活动/活动编码</th>
 						<th>产品名称/产品编码</th>
 						<th>发起客户昵称/发起客户编码</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>拼团状态</th>
 						<th>开始时间</th>
 						<th>结束时间</th>

resources/views/admin/regiment_active/index.blade.php

@@ -50,7 +50,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>拼团人数（人）</th>
 						<th>活动价格（元）</th>
 						<th>拼团有效期</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>状态</th>
 						<th>活动时间</th>
 						<th>创建时间</th>

resources/views/admin/regiment_record/index.blade.php

@@ -40,7 +40,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>参与活动/活动编码</th>
 						<th>产品名称/产品编码</th>
 						<th>发起客户昵称/发起客户编码</th>
-						<th>商业公司</th>
+						<th>店铺</th>
 						<th>拼团状态</th>
 						<th>订单生成时间</th>
 					</tr>

resources/views/admin/work_sync/add.blade.php

@@ -6,7 +6,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 <form class="post-form" action="" method="post">
 	<div class="form-group col-sm-12">
 		<label class="control-label">商店名称</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司名称" name="name" maxlength="20" value="" />
+		<input class="form-control" required="required" type="text" placeholder="店铺名称" name="name" maxlength="20" value="" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">Logo图</label>

resources/views/admin/work_sync/edit.blade.php

@@ -6,7 +6,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 <form class="post-form" action="" method="post">
 	<div class="form-group col-sm-12">
 		<label class="control-label">商店名称</label>
-		<input class="form-control" required="required" type="text" placeholder="商业公司名称" name="name" maxlength="20" value="{{$oldData['name']}}" />
+		<input class="form-control" required="required" type="text" placeholder="店铺名称" name="name" maxlength="20" value="{{$oldData['name']}}" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">Logo图</label>

resources/views/work/contact_department/index.blade.php

@@ -26,7 +26,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>联系方式</th>
 						<th>客户来源</th>
 						<th>资质状态</th>
-						<th>所属商业公司</th>
+						<th>所属店铺</th>
 						<th>创建时间</th>
 						<th>操作</th>									
 					</tr>