Merge branch 'liuxiangxin' into jun

app/Http/Controllers/Api/WechatWork.php

@@ -91,7 +91,7 @@ class WechatWork extends Api{
 		// 跳转链接
 		$link						= Mini::getUrlLink('pages/coupon/active',http_build_query(['id'=>1,'kailin_uid'=>Hashids::encodeHex($id),'work_userid'=>$message['UserID']]));
 		// 欢迎语
-		$welcome					= $link ? ['link'=>['title'=>'请点此填写表单','desc'=>'填写表单信息为了给您提供更优服务','url'=>$link]] : ['text'=>['content'=>'请联系您的对接人员为您录入信息']];
+		$welcome					= $link ? ['link'=>['title'=>'请点此返回小程序领取优惠券','desc'=>'家长好，我是您的专属客服，有问题请联系我','url'=>$link]] : ['text'=>['content'=>'请联系您的对接人员为您录入信息']];
 		// 发送欢迎语
 		ExternalContact::sendWelcome($message['WelcomeCode'],$welcome);
 		// 循环跟进人员

app/Http/Controllers/Api/WorkBind.php

@@ -135,10 +135,8 @@ class WorkBind extends Api{
 		$followUser['remark_mobiles']	= implode(',',$remarkMobiles);
 		// 修改或者添加跟进人员客户画像
 		empty($followUser['id']) ? $WorkUser->add($followUser) : $WorkUser->edit($followUser['id'],$followUser);
-		// 进行登录
-		$token							= $Model->createLoginAuthcode($uid,time());
 		// 返回结果
-		return							json_send(['code'=>'success','msg'=>'登录成功','data'=>$token]);
+		return							json_send(['code'=>'success','msg'=>'登录成功','data'=>['uid'=>$uid]]);
 	}
 
 }

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

@@ -7,9 +7,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	@if(check_auth('admin/product/add'))
 	<a href="{{url('admin/product/add')}}" class="btn btn-primary">新增</a>
 	@endif
-	@if( check_auth('admin/product/import_execl') )
+	<!-- @if( check_auth('admin/product/import_execl') )
 	<a href="javascript:;" class="btn btn-primary upload"> <span class="fa fa-upload"></span> 导入产品</a>
-	@endif
+	@endif -->
 </div>
 <form action="" method="get" class="form-horizontal form-line">
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">