app-wx(v0.1.0 build 12)

1. F 短链接跳转功能

app-wx(v0.1.0 build 12)
1. F 短链接跳转功能
xu
1 parent 32926e46
Showing 4 changed files with 26 additions and 91 deletions Show diff stats
app-wx/config/params.php
app-wx/controllers/BaseController.php
app-wx/controllers/SiteController.php
app-wx/modules/order/controllers/DefaultController.php
 <?php
 return [
     'adminEmail'            => '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 是编译次数
 ];
@@ -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;
@@ -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);
     }
+
 }
@@ -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;
             }
         }
1	1	<?php
2	2	return [
3	3	'adminEmail' => 'admin@example.com',
4		- 'VERSION' => 'v0.1.0 build 11', // 当前发布版本号: v0.1.0 是版本号 \| build 1 是编译次数
	4	+ 'VERSION' => 'v0.1.0 build 12', // 当前发布版本号: v0.1.0 是版本号 \| build 1 是编译次数
5	5	];
...	...
...	...	@@ -183,6 +183,17 @@ class BaseController extends AppController
183	183	$baseURL = Yii::$app->request->getHostInfo();
184	184	}
185	185
	186	+ $path = $this->request->get('j_path');
	187	+ $model= $this->request->get('j_model');
	188	+ $paramOne= $this->request->get('pOne');
	189	+ if (!empty($path) && !empty($model)) {
	190	+ $locationUrl = Yii::$app->params["frontEndBaseUrl"].$model."#".$path;
	191	+ if (!empty($paramOne)) {
	192	+ $locationUrl .= "/".urldecode($paramOne);
	193	+ }
	194	+ header("Location: $locationUrl");exit;
	195	+ }
	196	+
186	197	if(YII_ENV_DEV && $appUser->isGuest){
187	198	//header("Location: " .$baseURL . "/user#login" );
188	199	//exit;
...	...
...	...	@@ -38,94 +38,16 @@ class SiteController extends BaseController
38	38	*/
39	39	public function actionIndex()
40	40	{
41		- //获取当前用户的模型model
42		- $engineerId = $this->getEngineerId();
43		- $engineer = new stdClass();
	41	+
44	42	/**
45	43	* 构造user的共用信息
46	44	*/
47		- $engineer = $this->buildEngineerResult($engineerId);
48		-
49		- return $this->render('index',
50		- [
51		- 'engineer' => $engineer,
52		- ]
53		- );
54		- }
55	45
56		- private function buildEngineerResult($engineerId)
57		- {
58		- $query = Engineer::find()
59		- ->select(['engineer.id', 'engineer_profile.headimgurl','engineer_profile.nickname'])
60		- ->leftJoin('engineer_profile', "engineer.id = engineer_profile.engineer_id")
61		- ->where(['engineer.id' => $engineerId]);
62		- $query->asArray();
63		- $engineerArray = $query->one();
64		-
65		- if(empty($engineerArray)){
66		- return false;
67		- }
68	46
69		- $engineer = new stdClass();
70		- $engineer->id = (int)$engineerArray['id'];
71		- $engineer->headimgurl = $engineerArray['headimgurl'];
72		- $engineer->nickname = $engineerArray['nickname'];
73		- return $engineer;
	47	+ return $this->render('index');
74	48	}
75	49
76	50
77		- /**
78		- *
79		- */
80		- public function actionAjaxJweixin()
81		- {
82		- // 设置微信分享内容
83		- $result = new stdClass();
84		-
85		- $engineerId = $this->getEngineerId();
86		-
87		- $baseUrl = $this->site->base_url;
88		- if (isset($_GET['from'])) {
89		- $url = $_GET['from'];
90		- } else {
91		- $url = $baseUrl;
92		- }
93		-
94		- $sign = WxHelper::getWxJSSDK()->getSignContext($url);
95		-
96		- $result->appid = $sign->appId;
97		- $result->timestamp = $sign->timestamp;
98		- $result->noncestr = $sign->nonceStr;
99		- $result->signature = $sign->signature;
100		-
101		-
102		- //$sn = $engineer ? urlencode(base64_encode($engineer->id)) : '';
103		- // 携带当前用户的邀请码参数，实现推荐用户功能
104		- $sn = '';
105		- $engineer = Engineer::findOne($engineerId);
106		- if ($engineer) {
107		- if (empty($engineer->invite_code)) {
108		- $engineer->invite_code = Engineer::createInviteCode($engineerId);
109		- $engineer->save();
110		- }
111		- $sn = $engineer->invite_code;
112		- }
113		- $result->user_bridge_url = $baseUrl . '/wechat/bridging?sn=' . $sn . '&tourl=' . urlencode($url);
114		- $result->sn = $sn;
115		-
116		- if ($engineer) {
117		- $profile = EngineerProfile::findOne(['engineer_id' => $engineer->id]);
118		- $result->title = $this->wx->name;
119		- $result->icon = $profile->headimgurl;
120		- } else {
121		- $result->title = $this->wx->name;
122		- $result->icon = '';
123		- }
124		- $result->desc = $this->wx->intro;
125		-
126		-
127		- return $this->renderJson($result);
128		- }
129	51
130	52	/*
131	53	* 错误页面
...	...	@@ -151,8 +73,8 @@ class SiteController extends BaseController
151	73	{
152	74	$this->layout = '/error';
153	75	$viewTpl = 'error/block.php';
154		- $service_phone = SysSetting::getServicePhone();
155		- return $this->render($viewTpl,['service_phone'=>$service_phone]);
	76	+ $service_phone = '4000000000';
	77	+ return $this->render($viewTpl,['service_phone'=> $service_phone]);
156	78	}
157	79
158	80	/** 关注提示
...	...	@@ -162,7 +84,7 @@ class SiteController extends BaseController
162	84	{
163	85	$this->layout = '/error';
164	86	$viewTpl = 'error/subscribe.php';
165		- $service_phone = SysSetting::getServicePhone();
	87	+ $service_phone = '4000000000';
166	88	return $this->render($viewTpl,['service_phone'=>$service_phone]);
167	89	}
168	90
...	...	@@ -174,7 +96,7 @@ class SiteController extends BaseController
174	96	$this->layout = '/error';
175	97	$viewTpl = 'error/block.php';
176	98	$id = $this->request->get('id');
177		- $service_phone = SysSetting::getServicePhone();
	99	+ $service_phone = '4000000000';
178	100	$errorMsg = '当前没有权限查看该内容';
179	101	if ($id == 1) {
180	102	$errorMsg = '请进行认证以后再来查看该页面';
...	...	@@ -184,16 +106,18 @@ class SiteController extends BaseController
184	106
185	107	public function actionIndex2()
186	108	{
187		-
188	109	return $this->renderPartial('index2');
189	110	}
190	111
191	112	/**
192		- * 跳转到接单教程界面
	113	+ * 推送给客户的短链接
	114	+ * @return \yii\web\Response
193	115	*/
194		- public function actionToTutorialPage()
	116	+ public function actionT()
195	117	{
196		- header("Location: http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNDc5ODMwOA==&hid=1&sn=4f8b8972dc5f471a85618dde0f6a5987&scene=18");
197		- exit;
	118	+ $shortUUID = $this->request->get('o');
	119	+ $locationUrl = Yii::$app->params["frontEndBaseUrl"]."order/customer#customer-order/".$shortUUID.'/1';
	120	+ return $this->redirect($locationUrl);
198	121	}
	122	+
199	123	}
...	...
...	...	@@ -308,7 +308,7 @@ class DefaultController extends BaseController
308	308	['name' => '奔驰E280'],
309	309	];
310	310	foreach ($models as $k => $v) {
311		- if (false !== strpos($v['name'], strtoupper($keyword))) {
	311	+ if (false !== strpos(strtoupper($v['name']), strtoupper($keyword))) {
312	312	$items[] = $v;
313	313	}
314	314	}
...	...