diff --git a/app-wx/config/main.php b/app-wx/config/main.php index c4e5686..3e299c9 100644 --- a/app-wx/config/main.php +++ b/app-wx/config/main.php @@ -14,7 +14,9 @@ return [ 'controllerNamespace' => 'app\wx\controllers', 'defaultRoute' => 'order', 'modules' => [ - + 'order' => [ + 'class' => 'app\wx\modules\order\Module', + ], 'user' => [ 'class' => 'app\wx\modules\user\Module', ] diff --git a/app-wx/modules/order/Module.php b/app-wx/modules/order/Module.php new file mode 100644 index 0000000..f535d21 --- /dev/null +++ b/app-wx/modules/order/Module.php @@ -0,0 +1,17 @@ +render('index'); + } +} \ No newline at end of file diff --git a/app-wx/modules/order/views/default/index.php b/app-wx/modules/order/views/default/index.php new file mode 100644 index 0000000..da818da --- /dev/null +++ b/app-wx/modules/order/views/default/index.php @@ -0,0 +1,38 @@ +getAssetManager(); +$asset = $assets->getBundle('app\wx\assets\AppAsset'); + +function img($file, $path = '/i/') +{ + return \Yii::$app->request->baseUrl . $path.$file; +} +?> + +
+
+ render("@app/views/widgets/ui-loading")?> +
+
+ +render('pages/index-template', ['asset' => $asset])?> +render('pages/rank-template', ['asset' => $asset])?> + + + +render("@app/views/widgets/stat-code")?> diff --git a/app-wx/modules/order/views/default/pages/index-template.php b/app-wx/modules/order/views/default/pages/index-template.php new file mode 100644 index 0000000..0c9e080 --- /dev/null +++ b/app-wx/modules/order/views/default/pages/index-template.php @@ -0,0 +1,20 @@ + + + diff --git a/app-wx/modules/order/views/default/pages/rank-template.php b/app-wx/modules/order/views/default/pages/rank-template.php new file mode 100644 index 0000000..c4ca14c --- /dev/null +++ b/app-wx/modules/order/views/default/pages/rank-template.php @@ -0,0 +1,39 @@ + + + diff --git a/app-wx/modules/order/views/layouts/main.php b/app-wx/modules/order/views/layouts/main.php new file mode 100644 index 0000000..eb1fd57 --- /dev/null +++ b/app-wx/modules/order/views/layouts/main.php @@ -0,0 +1,43 @@ +params['site']; + +$this->title = \yii::$app->name; +$assets = $this->getAssetManager(); +$asset = $assets->getBundle('app\wx\assets\AppAsset'); +?> +beginPage() ?> + + + + + + + + + + + + +<?= Html::encode($this->title) ?> + +head() ?> + + + +beginBody() ?> + +endBody() ?> + + +endPage() ?> + diff --git a/web/gulpfile.js b/web/gulpfile.js index 0b01c82..2e425e4 100644 --- a/web/gulpfile.js +++ b/web/gulpfile.js @@ -84,6 +84,14 @@ gulp.task('build', function () { .pipe(gulp.dest(paths.dist.scripts)); //-------------------------------------------------- + //----------------------------------------------- + //order module (订单模块) + gulp.src([paths.source.scripts + 'order/*.js']) + .pipe(concat('order-app.js')) + .pipe(uglify()) + .pipe(gulp.dest(paths.dist.scripts)); + //-------------------------------------------------- + //字体 gulp.src([paths.source.fonts + '*']) diff --git a/web/i/order/rank/rank_no_select.png b/web/i/order/rank/rank_no_select.png new file mode 100644 index 0000000..9fea2be Binary files /dev/null and b/web/i/order/rank/rank_no_select.png differ diff --git a/web/i/order/rank/rank_star.png b/web/i/order/rank/rank_star.png new file mode 100644 index 0000000..5aacced Binary files /dev/null and b/web/i/order/rank/rank_star.png differ diff --git a/web/src/js/order/app.js b/web/src/js/order/app.js new file mode 100644 index 0000000..bb90237 --- /dev/null +++ b/web/src/js/order/app.js @@ -0,0 +1,53 @@ +/** + * 单页面应用 + */ +define( + "order-app", + [ + 'mk7/app' + ], + function(app) { + + var $$ = Dom7; + var _autoLoading = function(){ + var e = $$('.ui-loading-block'); + if(0 == e.length){ + // + $$('.view-main').html('

'); + window['waitingTime'] = 10000; // 显示重新加载的等待时间,默认10s + if(window['loaderTimer']){ + clearTimeout(window['loaderTimer']); + } + window['loaderTimer'] = setTimeout(function(){ + var loaderTips = document.getElementById('loader-inner'); + var tips = document.createElement('p'); + tips.className = 'notice'; + if(loaderTips){ + tips.innerHTML = '加载速度太慢?试试重新加载'; + loaderTips.appendChild(tips); + } + },window['waitingTime']); + } + }; + + var fromOutside = true; // 标记是否从外部进来 + + app.name = 'order'; + app.routes = { + 'index': function () { + fromOutside = false; + _autoLoading(); + return app.runController('index'); + }, + 'rank': function () { + fromOutside = false; + _autoLoading(); + return app.runController('rank'); + }, + '*': function(){ + return app.runController('index'); + } + } + return app; + } +); diff --git a/web/src/js/order/index-controller.js b/web/src/js/order/index-controller.js new file mode 100644 index 0000000..49a9767 --- /dev/null +++ b/web/src/js/order/index-controller.js @@ -0,0 +1,36 @@ +/** + * 首页 + */ +define( + "order/index-controller", + [ + 'mk7/controller', + 'mk7/url', + 'mk7/utils', + ], + + function(ctrl, url, utils) { + + var $$ = Dom7; + var t7 = Template7; + var ctrl = new ctrl(); + + + ctrl.run = function () { + var me = this; + me.setPageTitle("首页"); + me.hideAllNonBaseMenuItem(window.$site); + + me.render(); + + + } + ctrl.bindEvents = function () { + var me = this; + console.log("bindEvents"); + + } + + return ctrl; + } +); diff --git a/web/src/js/order/rank-controller.js b/web/src/js/order/rank-controller.js new file mode 100644 index 0000000..8eb9b64 --- /dev/null +++ b/web/src/js/order/rank-controller.js @@ -0,0 +1,30 @@ +/** + * 订单评价-首页 + */ +define( + "order/rank-controller", + [ + 'mk7/controller', + 'mk7/url', + 'mk7/utils', + ], + + function(ctrl, url, utils) { + + var $$ = Dom7; + var t7 = Template7; + var ctrl = new ctrl(); + + ctrl.run = function () { + var me = this; + me.setPageTitle("评价"); + me.render(); + } + ctrl.bindEvents = function () { + var me = this; + console.log("bindEvents"); + } + + return ctrl; + } +); -- libgit2 0.21.0