1. 新增验证首页和扫码次数页

曹明
1 parent 73d5dea8
Showing 210 changed files with 1325 additions and 783 deletions Show diff stats
app-ht/modules/user/controllers/UserController.php
app-wx/config/main.php
app-wx/controllers/BaseController.php
app-wx/controllers/SiteController.php
app-wx/controllers/WechatController.php
app-wx/exts/User.php
app-wx/modules/check/Module.php
app-wx/modules/check/controllers/BaseController.php
app-wx/modules/check/controllers/DefaultController.php
app-wx/modules/check/views/default/index.php
app-wx/modules/check/views/default/pages/index-template.php
app-wx/modules/check/views/default/pages/scan-count-template.php
app-wx/modules/check/views/layouts/main.php
app-wx/modules/smart/controllers/DefaultController.php
app-wx/modules/smart/helpers/UserOrderHelper.php
app-wx/web/gulpfile.js
app-wx/web/i/check/check_btn.png
app-wx/web/i/check/check_count.png
app-wx/web/i/check/check_scan.png
app-wx/web/i/device/add.png
@@ -4,8 +4,8 @@ namespace app\ht\modules\user\controllers;
  
 use Yii;
 use yii\data\Pagination;
-use domain\user\User;
-use domain\user\UserRepository;
+use domain\smart\User;
+use domain\smart\UserRepository;
 use common\models\SysUser       as SysUserModel;
 use app\ht\controllers\BaseController;
  
@@ -16,12 +16,15 @@ return [
     'modules' => [
         'smart' => [
             'class' => 'app\wx\modules\smart\Module',
+        ],
+        'check' => [
+            'class' => 'app\wx\modules\check\Module',
         ]
     ],
     'components' => [
         'user' => [
             'class'=> 'app\wx\exts\User',
-            'identityClass' => 'domain\user\models\User',
+            'identityClass' => 'domain\smart\models\User',
             'enableAutoLogin' => true,//是否启用自动登录
         ],
         'errorHandler' => [
@@ -15,7 +15,7 @@ use common\models\SysSetting;
 use domain\engineer\EngineerRole;
 use domain\engineer\EngineerStatus;
 use domain\engineer\EngineerSkillTagsRepository;
-use domain\user\UserRepository;
+use domain\smart\UserRepository;
 use stdClass;
 use function header;
 use function in_array;
@@ -2,7 +2,7 @@
 namespace app\wx\controllers;
  
 use Yii;
-use domain\user\models\User as UserModel;
+use domain\smart\models\User as UserModel;
 use common\helpers\WxHelper;
 use common\models\SysSetting;
  
@@ -5,11 +5,11 @@ namespace app\wx\controllers;
 use Yii;
 use yii\base\Exception;
 use yii\helpers\Url;
-use domain\user\UserRepository;
+use domain\smart\UserRepository;
 use common\helpers\AppErrorLog;
 use common\helpers\Log as AppLog;
 use common\helpers\WechatMessageHelper;
-use domain\user\models\User as UserModel;
+use domain\smart\models\User as UserModel;
 use common\exts\wechat\PHPSDK as WxPHPSDK;
 use common\helpers\WxHelper;
 use common\helpers\ImageManager;
@@ -4,7 +4,7 @@ namespace app\wx\exts;
 use Yii;
 use yii\web\Cookie;
 use yii\web\User as AppUser;
-use domain\user\models\User as UserModel;
+use domain\smart\models\User as UserModel;
  
 /**
  * Class User
@@ -0,0 +1,15 @@
+<?php namespace app\wx\modules\check;
+
+use yii\base\Module as BaseModule;
+
+/**
+ * Class Module
+ * @package app\wx\modules
+ */
+class Module extends BaseModule
+{
+    public function init()
+    {
+        parent::init();
+    }
+}
 \ No newline at end of file
@@ -0,0 +1,24 @@
+<?php
+namespace app\wx\modules\check\controllers;
+
+use Yii;
+use app\wx\controllers\BaseController as AppBaseController;
+
+/**
+ * Class BaseController
+ * @package app\wx\modules\user\controllers
+ */
+class BaseController extends AppBaseController
+{
+    public $layout = 'main';
+
+    /**
+     * @throws yii\web\BadRequestHttpException
+     */
+    public function init()
+    {
+        parent::init(); // TODO: Change the autogenerated stub
+        $this->checkClientStatus();
+        $this->handleMallAccessCtrl();
+    }
+}
 \ No newline at end of file
@@ -0,0 +1,52 @@
+<?php
+
+namespace app\wx\modules\check\controllers;
+
+use Yii;
+use domain\smart\ScanRecords;
+use domain\smart\SellerInputRecordRepository;
+use stdClass;
+
+/**
+ * 校验-控制器
+ */
+class DefaultController extends BaseController
+{
+    /**
+     * 校验
+     */
+    public function actionIndex()
+    {
+        return $this->render('index');
+    }
+
+    /**
+     * 查询是否激活
+     * @return string
+     */
+    public function actionCheckActive()
+    {
+        $e = new stdClass();
+        $e->success = 2;
+        $e->message = "";
+        $uuid = Yii::$app->request->post("uuid");
+        if (empty($uuid)) {
+            $e->message = '缺少必要参数！';
+            return $this->renderJson($e);
+        }
+        // @todo 校验UUID是否有效 2 无效  0 有效未激活  1 有效已激活
+        $hasRecord = SellerInputRecordRepository::findOne(["uuid" => $uuid]);
+        // 记录扫码次数
+        ScanRecords::updateCount($uuid);
+        if (empty($hasRecord)) {
+            $e->success = 0;
+            $e->message = '暂无激活！';
+            return $this->renderJson($e);
+        } else {
+            $e->success = 1;
+            $e->message = '已激活';
+        }
+        return $this->renderJson($e);
+
+    }
+} 
 \ No newline at end of file
@@ -0,0 +1,43 @@
+<?php
+use yii\helpers\Url;
+use common\models\SysSetting;
+use common\models\RepairOrderRateTag;
+use app\wx\modules\user\helpers\UserOrderHelper;
+
+$baseUrl = Url::base(true);
+
+$assets = $this->getAssetManager();
+$asset = $assets->getBundle('app\wx\assets\AppAsset');
+function img($file, $path = '/i/check/')
+{   $baseUrl = Url::base(true);
+    return $baseUrl . $path. $file;
+}
+$order_polling_interval = SysSetting::getOrderPollingInterval();
+$redirectInfo=$this->context->checkUserLevel('', true, "none");
+?>
+<div class="views">
+    <div class="view view-main">
+        <?=$this->render("@app/views/widgets/ui-loading")?>
+    </div>
+</div>
+
+<?=$this->render('pages/index-template', ['asset' => $asset])?>
+<?=$this->render('pages/scan-count-template', ['asset' => $asset])?>
+
+<script>
+    var redirect="<?=$redirectInfo['redirect_url']?>";
+    var redirectStatus="<?=$redirectInfo['success']?>";
+    window.pollingTimer=null;
+</script>
+<script>
+    require.config({baseUrl: $site.assets_url + '/js/',urlArgs : "v=" + require.version});
+    require([
+            'check-app'
+        ],
+        function(app){
+            app.bootstrap({
+                baseUrl: $site.base_url
+            });
+        });
+</script>
+<?=$this->render("@app/views/widgets/stat-code")?>
@@ -0,0 +1,46 @@
+<?php
+
+use yii\helpers\Url;
+
+$baseUrl = Url::base(true);
+?>
+<style>
+    #index .page-content {
+        background-color: #fff;
+    }
+    #index .scan-image-div {
+        padding-top: 6.69rem;
+        text-align: center;
+    }
+    #index .scan-image {
+        width: 7.78rem;
+        height: 7.78rem;
+        margin: 0 auto;
+    }
+    #index .scan-button {
+        margin: 0 auto;
+        margin-top: 3rem;
+        width: 15.75rem;
+        height: 2.81rem;
+        background: url(<?=$baseUrl?>/i/check/check_btn.png) center no-repeat #ffffff;
+        color: #FFF;
+        text-align: center;
+        line-height: 2.81rem;
+        font-size:1.06rem;
+        font-weight:400;
+    }
+</style>
+<script id="index-template" type="text/template">
+    <div class="pages" id="index">
+        <div class="page">
+            <div class="page-content">
+                <div class="scan-image-div">
+                    <img src="<?=$baseUrl?>/i/check/check_scan.png" class="scan-image"/>
+                </div>
+                <div class="scan-button">
+                    点击扫描标签
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
@@ -0,0 +1,80 @@
+<?php
+
+use yii\helpers\Url;
+
+$baseUrl = Url::base(true);
+?>
+<style>
+    #scan-count .page-content {
+        background-color: #fff;
+    }
+    #scan-count .scan-image-div {
+        text-align: center;
+        width: 12.19rem;
+        height: 12.19rem;
+        margin: 0 auto;
+        margin-top: 2rem;
+        background: url( <?=$baseUrl?>/i/check/check_count.png) center no-repeat #ffffff;
+        background-size: 100% 100%;
+    }
+    #scan-count .count-title {
+        height: 1rem;
+        font-size: 1rem;
+        font-weight: 400;
+        color: rgba(51,51,51,1);
+        line-height: 1.5rem;
+        padding-top: 3.5rem;
+    }
+    #scan-count .count-num {
+        font-size:3.3rem;
+        font-weight:400;
+        color:rgba(51,51,51,1);
+        line-height:3.17rem;
+    }
+    #scan-count .count-div {
+        margin-top: 1.78rem;
+    }
+    #scan-count .scan-button {
+        margin: 0 auto;
+        margin-top: 3rem;
+        width: 15.75rem;
+        height: 2.81rem;
+        background: url(<?=$baseUrl?>/i/check/check_btn.png) center no-repeat #ffffff;
+        color: #FFF;
+        text-align: center;
+        line-height: 2.81rem;
+        font-size:1.06rem;
+        font-weight:400;
+    }
+    #scan-count .tip-div {
+        font-size:1rem;
+        font-weight:400;
+        color:rgba(51,51,51,1);
+        line-height:1.5rem;
+        text-align: left;
+        margin: 0 auto;
+        margin-top: 2.81rem;
+        max-width: 18rem;
+    }
+</style>
+<script id="scan-count-template" type="text/template">
+    <div class="pages" id="scan-count">
+        <div class="page">
+            <div class="page-content">
+                <div class="scan-image-div">
+                    <div class="count-title">二维码被扫描次数</div>
+                    <div class="count-div">
+                        <span class="count-num">0</span><span>次</span>
+                    </div>
+                </div>
+                <div class="tip-div">
+                    亲爱的用户：<br/>
+                    如果二维码扫描次数过多，您购买的产品存在假冒的风险，请点击【验证标签】进行校验。
+                </div>
+                <div class="scan-button">
+                    验证标签
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
@@ -0,0 +1,42 @@
+<?php
+use app\wx\assets\AppAsset;
+use yii\helpers\Html;
+
+AppAsset::register($this);
+
+$site = $this->params['site'];
+
+$this->title = ''; //\yii::$app->name;
+$assets = $this->getAssetManager();
+$asset = $assets->getBundle('app\wx\assets\AppAsset');
+?>
+<?php $this->beginPage() ?>
+<!DOCTYPE HTML>
+
+<html lang="<?= \yii::$app->language ?>">
+<head>
+<meta charset="<?= \yii::$app->charset ?>">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Expires" content="0">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+<?= Html::csrfMetaTags() ?>
+<title><?= Html::encode($this->title) ?></title>
+<script>
+    <?=$this->render("@app/views/widgets/js-site", ['site' => $site])?>
+</script>
+<?php $this->head() ?>
+<style>
+    
+</style>
+</head>
+<body>
+<?php $this->beginBody() ?>
+<?=$content?>
+<?php $this->endBody() ?>
+</body>
+</html>
+<?php $this->endPage() ?>
+
@@ -6,9 +6,9 @@ use Yii;
 use common\helpers\ImageManager;
 use common\helpers\ImageUtils;
 use common\helpers\WxHelper;
-use domain\user\SellerInputRecord;
-use domain\user\SellerInputRecordRepository;
-use domain\user\UserAddressRepository;
+use domain\smart\SellerInputRecord;
+use domain\smart\SellerInputRecordRepository;
+use domain\smart\UserAddressRepository;
 use yii\base\Exception;
 use stdClass;
  
@@ -1,15 +0,0 @@
-<?php
-
-namespace app\wx\modules\smart\helpers;
-
-use Yii;
-use yii\base\Object;
-
-/**
- * Class UserOrderHelper
- * @package app\wx\helpers
- */
-class UserOrderHelper extends Object
-{
-
-}
 \ No newline at end of file
@@ -70,14 +70,14 @@ gulp.task(&#39;build&#39;, function () {
  
     //-----------------------------------------------
     //default module (默认模块)
-    gulp.src([paths.source.scripts + 'site/*.js'])
-        .pipe(concat('site-app.js'))
+    gulp.src([paths.source.scripts + 'check/*.js'])
+        .pipe(concat('check-app.js'))
         .pipe(uglify())
         .pipe(gulp.dest(paths.dist.scripts));
     //--------------------------------------------------
  
     //-----------------------------------------------
-    //smart module (防伪模块)
+    //smart module (校验模块)
     gulp.src([paths.source.scripts + 'smart/*.js'])
         .pipe(concat('smart-app.js'))
         .pipe(uglify())
...	...	@@ -4,8 +4,8 @@ namespace app\ht\modules\user\controllers;
4	4
5	5	use Yii;
6	6	use yii\data\Pagination;
7		-use domain\user\User;
8		-use domain\user\UserRepository;
	7	+use domain\smart\User;
	8	+use domain\smart\UserRepository;
9	9	use common\models\SysUser as SysUserModel;
10	10	use app\ht\controllers\BaseController;
11	11
...	...
...	...	@@ -16,12 +16,15 @@ return [
16	16	'modules' => [
17	17	'smart' => [
18	18	'class' => 'app\wx\modules\smart\Module',
	19	+ ],
	20	+ 'check' => [
	21	+ 'class' => 'app\wx\modules\check\Module',
19	22	]
20	23	],
21	24	'components' => [
22	25	'user' => [
23	26	'class'=> 'app\wx\exts\User',
24		- 'identityClass' => 'domain\user\models\User',
	27	+ 'identityClass' => 'domain\smart\models\User',
25	28	'enableAutoLogin' => true,//是否启用自动登录
26	29	],
27	30	'errorHandler' => [
...	...
...	...	@@ -15,7 +15,7 @@ use common\models\SysSetting;
15	15	use domain\engineer\EngineerRole;
16	16	use domain\engineer\EngineerStatus;
17	17	use domain\engineer\EngineerSkillTagsRepository;
18		-use domain\user\UserRepository;
	18	+use domain\smart\UserRepository;
19	19	use stdClass;
20	20	use function header;
21	21	use function in_array;
...	...
...	...	@@ -2,7 +2,7 @@
2	2	namespace app\wx\controllers;
3	3
4	4	use Yii;
5		-use domain\user\models\User as UserModel;
	5	+use domain\smart\models\User as UserModel;
6	6	use common\helpers\WxHelper;
7	7	use common\models\SysSetting;
8	8
...	...
...	...	@@ -5,11 +5,11 @@ namespace app\wx\controllers;
5	5	use Yii;
6	6	use yii\base\Exception;
7	7	use yii\helpers\Url;
8		-use domain\user\UserRepository;
	8	+use domain\smart\UserRepository;
9	9	use common\helpers\AppErrorLog;
10	10	use common\helpers\Log as AppLog;
11	11	use common\helpers\WechatMessageHelper;
12		-use domain\user\models\User as UserModel;
	12	+use domain\smart\models\User as UserModel;
13	13	use common\exts\wechat\PHPSDK as WxPHPSDK;
14	14	use common\helpers\WxHelper;
15	15	use common\helpers\ImageManager;
...	...
...	...	@@ -4,7 +4,7 @@ namespace app\wx\exts;
4	4	use Yii;
5	5	use yii\web\Cookie;
6	6	use yii\web\User as AppUser;
7		-use domain\user\models\User as UserModel;
	7	+use domain\smart\models\User as UserModel;
8	8
9	9	/**
10	10	* Class User
...	...
...	...	@@ -0,0 +1,15 @@
	1	+<?php namespace app\wx\modules\check;
	2	+
	3	+use yii\base\Module as BaseModule;
	4	+
	5	+/**
	6	+ * Class Module
	7	+ * @package app\wx\modules
	8	+ */
	9	+class Module extends BaseModule
	10	+{
	11	+ public function init()
	12	+ {
	13	+ parent::init();
	14	+ }
	15	+}
0	16	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,24 @@
	1	+<?php
	2	+namespace app\wx\modules\check\controllers;
	3	+
	4	+use Yii;
	5	+use app\wx\controllers\BaseController as AppBaseController;
	6	+
	7	+/**
	8	+ * Class BaseController
	9	+ * @package app\wx\modules\user\controllers
	10	+ */
	11	+class BaseController extends AppBaseController
	12	+{
	13	+ public $layout = 'main';
	14	+
	15	+ /**
	16	+ * @throws yii\web\BadRequestHttpException
	17	+ */
	18	+ public function init()
	19	+ {
	20	+ parent::init(); // TODO: Change the autogenerated stub
	21	+ $this->checkClientStatus();
	22	+ $this->handleMallAccessCtrl();
	23	+ }
	24	+}
0	25	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,52 @@
	1	+<?php
	2	+
	3	+namespace app\wx\modules\check\controllers;
	4	+
	5	+use Yii;
	6	+use domain\smart\ScanRecords;
	7	+use domain\smart\SellerInputRecordRepository;
	8	+use stdClass;
	9	+
	10	+/**
	11	+ * 校验-控制器
	12	+ */
	13	+class DefaultController extends BaseController
	14	+{
	15	+ /**
	16	+ * 校验
	17	+ */
	18	+ public function actionIndex()
	19	+ {
	20	+ return $this->render('index');
	21	+ }
	22	+
	23	+ /**
	24	+ * 查询是否激活
	25	+ * @return string
	26	+ */
	27	+ public function actionCheckActive()
	28	+ {
	29	+ $e = new stdClass();
	30	+ $e->success = 2;
	31	+ $e->message = "";
	32	+ $uuid = Yii::$app->request->post("uuid");
	33	+ if (empty($uuid)) {
	34	+ $e->message = '缺少必要参数！';
	35	+ return $this->renderJson($e);
	36	+ }
	37	+ // @todo 校验UUID是否有效 2 无效 0 有效未激活 1 有效已激活
	38	+ $hasRecord = SellerInputRecordRepository::findOne(["uuid" => $uuid]);
	39	+ // 记录扫码次数
	40	+ ScanRecords::updateCount($uuid);
	41	+ if (empty($hasRecord)) {
	42	+ $e->success = 0;
	43	+ $e->message = '暂无激活！';
	44	+ return $this->renderJson($e);
	45	+ } else {
	46	+ $e->success = 1;
	47	+ $e->message = '已激活';
	48	+ }
	49	+ return $this->renderJson($e);
	50	+
	51	+ }
	52	+}
0	53	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,43 @@
	1	+<?php
	2	+use yii\helpers\Url;
	3	+use common\models\SysSetting;
	4	+use common\models\RepairOrderRateTag;
	5	+use app\wx\modules\user\helpers\UserOrderHelper;
	6	+
	7	+$baseUrl = Url::base(true);
	8	+
	9	+$assets = $this->getAssetManager();
	10	+$asset = $assets->getBundle('app\wx\assets\AppAsset');
	11	+function img($file, $path = '/i/check/')
	12	+{ $baseUrl = Url::base(true);
	13	+ return $baseUrl . $path. $file;
	14	+}
	15	+$order_polling_interval = SysSetting::getOrderPollingInterval();
	16	+$redirectInfo=$this->context->checkUserLevel('', true, "none");
	17	+?>
	18	+<div class="views">
	19	+ <div class="view view-main">
	20	+ <?=$this->render("@app/views/widgets/ui-loading")?>
	21	+ </div>
	22	+</div>
	23	+
	24	+<?=$this->render('pages/index-template', ['asset' => $asset])?>
	25	+<?=$this->render('pages/scan-count-template', ['asset' => $asset])?>
	26	+
	27	+<script>
	28	+ var redirect="<?=$redirectInfo['redirect_url']?>";
	29	+ var redirectStatus="<?=$redirectInfo['success']?>";
	30	+ window.pollingTimer=null;
	31	+</script>
	32	+<script>
	33	+ require.config({baseUrl: $site.assets_url + '/js/',urlArgs : "v=" + require.version});
	34	+ require([
	35	+ 'check-app'
	36	+ ],
	37	+ function(app){
	38	+ app.bootstrap({
	39	+ baseUrl: $site.base_url
	40	+ });
	41	+ });
	42	+</script>
	43	+<?=$this->render("@app/views/widgets/stat-code")?>
...	...