Merge branch 'liuxiangxin' into jun

app/Http/Controllers/Api/OrdersReceive.php

@@ -28,7 +28,7 @@ class OrdersReceive extends Api{
 		// 不存在订单
 		if( !$orderData )				return json_send(['code'=>'error','msg'=>'您还未下单','data'=>'']);
         $receiveInfo                    =   $Model->query()->where([['custom_uid','=',$uid]])->first();
-        if ($receiveInfo)               return json_send(['code'=>'error','msg'=>'您已领取过了 请耐性等待发货','data'=>'']);
+        if ($receiveInfo)               return json_send(['code'=>'error','msg'=>'您已领取过了 请耐心等待发货','data'=>'']);
 		// 写入领取
 		$res                            = $Model->add(['custom_uid'=>$uid,'name'=>'玩具']);
         if(!$res)                       return json_send(['code'=>'error','msg'=>'领取失败','data'=>'']);

app/Http/Controllers/Api/WechatWork.php

@@ -88,10 +88,10 @@ class WechatWork extends Api{
 		$id 						= $external ? $external['id'] : $WorkExternal->workAdd($extUser['external_contact']);
 		// 如果添加失败
 		if( !$id )					return ['error'=>'新用户添加失败'];
-		// 跳转链接
-		$link						= Mini::getUrlLink('pages/coupon/active',http_build_query(['id'=>1,'kailin_uid'=>Hashids::encodeHex($id),'work_userid'=>$message['UserID']]));
+		// 跳转链接pages/user/bind
+		$link						= Mini::getUrlLink('pages/user/bind',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

@@ -103,12 +103,14 @@ class WorkBind extends Api{
 		if( empty($id) )			    return json_send(['code'=>'error','msg'=>'用户不存在','data'=>['error'=>'用户ID有误']]);
 		// 通过手机号查询账号
 		$custom 						= $Model->getOne($uid);
+		// 用户不存在
+		if( empty($custom) )			return json_send(['code'=>'error','msg'=>'用户不存在','data'=>['error'=>'未查询到用户信息']]);
 		// 查询用户
 		$external						= $WorkExternal->getOne($id);
 		// 用户不存在
 		if( empty($external) )			return json_send(['code'=>'error','msg'=>'用户不存在','data'=>['error'=>'用户不存在']]);
         // 如果手机号已经存在
-        if( $external['custom_uid'] )   return json_send(['code'=>'error','msg'=>'用户已绑定','data'=>['error'=>'用户已绑定']]);
+        if( $external['custom_uid'] )   return json_send(['code'=>'success','msg'=>'用户已绑定','data'=>['uid'=>$custom['uid']]]);
 		// 获取不包含区号的手机号(因为绑定手机号字段会有国际区号)
 		$phone							= $custom['phone'];
 		// 新用户信息