From 7d60e23d54c9c0050ff51a221b143c6c4ce3052b Mon Sep 17 00:00:00 2001 From: xu Date: Fri, 27 Dec 2019 16:32:25 +0800 Subject: [PATCH] app-wx(v0.1.0 build 12) 1. F 短链接跳转功能 --- app-wx/config/params.php | 2 +- app-wx/controllers/BaseController.php | 11 +++++++++++ app-wx/controllers/SiteController.php | 102 +++++++++++++----------------------------------------------------------------------------------------- app-wx/modules/order/controllers/DefaultController.php | 2 +- 4 files changed, 26 insertions(+), 91 deletions(-) diff --git a/app-wx/config/params.php b/app-wx/config/params.php index beab61d..7b2c63a 100644 --- a/app-wx/config/params.php +++ b/app-wx/config/params.php @@ -1,5 +1,5 @@ 'admin@example.com', - 'VERSION' => 'v0.1.0 build 11', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数 + 'VERSION' => 'v0.1.0 build 12', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数 ]; diff --git a/app-wx/controllers/BaseController.php b/app-wx/controllers/BaseController.php index ee61e95..fd98f17 100644 --- a/app-wx/controllers/BaseController.php +++ b/app-wx/controllers/BaseController.php @@ -183,6 +183,17 @@ class BaseController extends AppController $baseURL = Yii::$app->request->getHostInfo(); } + $path = $this->request->get('j_path'); + $model= $this->request->get('j_model'); + $paramOne= $this->request->get('pOne'); + if (!empty($path) && !empty($model)) { + $locationUrl = Yii::$app->params["frontEndBaseUrl"].$model."#".$path; + if (!empty($paramOne)) { + $locationUrl .= "/".urldecode($paramOne); + } + header("Location: $locationUrl");exit; + } + if(YII_ENV_DEV && $appUser->isGuest){ //header("Location: " .$baseURL . "/user#login" ); //exit; diff --git a/app-wx/controllers/SiteController.php b/app-wx/controllers/SiteController.php index b35088f..85d49ab 100644 --- a/app-wx/controllers/SiteController.php +++ b/app-wx/controllers/SiteController.php @@ -38,94 +38,16 @@ class SiteController extends BaseController */ public function actionIndex() { - //获取当前用户的模型model - $engineerId = $this->getEngineerId(); - $engineer = new stdClass(); + /** * 构造user的共用信息 */ - $engineer = $this->buildEngineerResult($engineerId); - - return $this->render('index', - [ - 'engineer' => $engineer, - ] - ); - } - private function buildEngineerResult($engineerId) - { - $query = Engineer::find() - ->select(['engineer.id', 'engineer_profile.headimgurl','engineer_profile.nickname']) - ->leftJoin('engineer_profile', "engineer.id = engineer_profile.engineer_id") - ->where(['engineer.id' => $engineerId]); - $query->asArray(); - $engineerArray = $query->one(); - - if(empty($engineerArray)){ - return false; - } - $engineer = new stdClass(); - $engineer->id = (int)$engineerArray['id']; - $engineer->headimgurl = $engineerArray['headimgurl']; - $engineer->nickname = $engineerArray['nickname']; - return $engineer; + return $this->render('index'); } - /** - * - */ - public function actionAjaxJweixin() - { - // 设置微信分享内容 - $result = new stdClass(); - - $engineerId = $this->getEngineerId(); - - $baseUrl = $this->site->base_url; - if (isset($_GET['from'])) { - $url = $_GET['from']; - } else { - $url = $baseUrl; - } - - $sign = WxHelper::getWxJSSDK()->getSignContext($url); - - $result->appid = $sign->appId; - $result->timestamp = $sign->timestamp; - $result->noncestr = $sign->nonceStr; - $result->signature = $sign->signature; - - - //$sn = $engineer ? urlencode(base64_encode($engineer->id)) : ''; - // 携带当前用户的邀请码参数，实现推荐用户功能 - $sn = ''; - $engineer = Engineer::findOne($engineerId); - if ($engineer) { - if (empty($engineer->invite_code)) { - $engineer->invite_code = Engineer::createInviteCode($engineerId); - $engineer->save(); - } - $sn = $engineer->invite_code; - } - $result->user_bridge_url = $baseUrl . '/wechat/bridging?sn=' . $sn . '&tourl=' . urlencode($url); - $result->sn = $sn; - - if ($engineer) { - $profile = EngineerProfile::findOne(['engineer_id' => $engineer->id]); - $result->title = $this->wx->name; - $result->icon = $profile->headimgurl; - } else { - $result->title = $this->wx->name; - $result->icon = ''; - } - $result->desc = $this->wx->intro; - - - return $this->renderJson($result); - } /* * 错误页面 @@ -151,8 +73,8 @@ class SiteController extends BaseController { $this->layout = '/error'; $viewTpl = 'error/block.php'; - $service_phone = SysSetting::getServicePhone(); - return $this->render($viewTpl,['service_phone'=>$service_phone]); + $service_phone = '4000000000'; + return $this->render($viewTpl,['service_phone'=> $service_phone]); } /** 关注提示 @@ -162,7 +84,7 @@ class SiteController extends BaseController { $this->layout = '/error'; $viewTpl = 'error/subscribe.php'; - $service_phone = SysSetting::getServicePhone(); + $service_phone = '4000000000'; return $this->render($viewTpl,['service_phone'=>$service_phone]); } @@ -174,7 +96,7 @@ class SiteController extends BaseController $this->layout = '/error'; $viewTpl = 'error/block.php'; $id = $this->request->get('id'); - $service_phone = SysSetting::getServicePhone(); + $service_phone = '4000000000'; $errorMsg = '当前没有权限查看该内容'; if ($id == 1) { $errorMsg = '请进行认证以后再来查看该页面'; @@ -184,16 +106,18 @@ class SiteController extends BaseController public function actionIndex2() { - return $this->renderPartial('index2'); } /** - * 跳转到接单教程界面 + * 推送给客户的短链接 + * @return \yii\web\Response */ - public function actionToTutorialPage() + public function actionT() { - header("Location: http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNDc5ODMwOA==&hid=1&sn=4f8b8972dc5f471a85618dde0f6a5987&scene=18"); - exit; + $shortUUID = $this->request->get('o'); + $locationUrl = Yii::$app->params["frontEndBaseUrl"]."order/customer#customer-order/".$shortUUID.'/1'; + return $this->redirect($locationUrl); } + } diff --git a/app-wx/modules/order/controllers/DefaultController.php b/app-wx/modules/order/controllers/DefaultController.php index b12afde..06b9001 100644 --- a/app-wx/modules/order/controllers/DefaultController.php +++ b/app-wx/modules/order/controllers/DefaultController.php @@ -308,7 +308,7 @@ class DefaultController extends BaseController ['name' => '奔驰E280'], ]; foreach ($models as $k => $v) { - if (false !== strpos($v['name'], strtoupper($keyword))) { + if (false !== strpos(strtoupper($v['name']), strtoupper($keyword))) { $items[] = $v; } } -- libgit2 0.21.0