Commit 1b830392d55521b8d8196f5fa0f36a68035bfb88

Authored by xu
2 parents f0f58ad7 a15f78da
Exists in master

Merge remote-tracking branch 'origin/master'

app-wx/config/main.php
... ... @@ -14,7 +14,9 @@ return [
14 14 'controllerNamespace' => 'app\wx\controllers',
15 15 'defaultRoute' => 'order',
16 16 'modules' => [
17   -
  17 + 'order' => [
  18 + 'class' => 'app\wx\modules\order\Module',
  19 + ],
18 20 'user' => [
19 21 'class' => 'app\wx\modules\user\Module',
20 22 ]
... ...
app-wx/modules/order/Module.php 0 → 100644
... ... @@ -0,0 +1,17 @@
  1 +<?php
  2 +
  3 +namespace app\wx\modules\order;
  4 +
  5 +use yii\base\Module as BaseModule;
  6 +
  7 +/**
  8 + * Class Module
  9 + * @package app\wx\modules
  10 + */
  11 +class Module extends BaseModule
  12 +{
  13 + public function init()
  14 + {
  15 + parent::init();
  16 + }
  17 +}
0 18 \ No newline at end of file
... ...
app-wx/modules/order/controllers/BaseController.php 0 → 100644
... ... @@ -0,0 +1,24 @@
  1 +<?php
  2 +
  3 +namespace app\wx\modules\order\controllers;
  4 +
  5 +use Yii;
  6 +use app\wx\controllers\BaseController as AppBaseController;
  7 +
  8 +/**
  9 + * Class BaseController
  10 + * @package app\wx\modules\toutiao\controllers
  11 + */
  12 +class BaseController extends AppBaseController
  13 +{
  14 + public $layout = 'main';
  15 +
  16 + /**
  17 + * @throws yii\web\BadRequestHttpException
  18 + */
  19 + public function init()
  20 + {
  21 + parent::init(); // TODO: Change the autogenerated stub
  22 +
  23 + }
  24 +}
0 25 \ No newline at end of file
... ...
app-wx/modules/order/controllers/DefaultController.php 0 → 100644
... ... @@ -0,0 +1,20 @@
  1 +<?php
  2 +
  3 +namespace app\wx\modules\order\controllers;
  4 +
  5 +use Yii;
  6 +use stdClass;
  7 +
  8 +/**
  9 + * 控制器
  10 + */
  11 +class DefaultController extends BaseController
  12 +{
  13 + /**
  14 + * 首页
  15 + */
  16 + public function actionIndex()
  17 + {
  18 + return $this->render('index');
  19 + }
  20 +}
0 21 \ No newline at end of file
... ...
app-wx/modules/order/views/default/index.php 0 → 100644
... ... @@ -0,0 +1,38 @@
  1 +<?php
  2 +
  3 +use yii\helpers\Url;
  4 +
  5 +$baseUrl = Url::base(true);
  6 +$assets = $this->getAssetManager();
  7 +$asset = $assets->getBundle('app\wx\assets\AppAsset');
  8 +
  9 +function img($file, $path = '/i/')
  10 +{
  11 + return \Yii::$app->request->baseUrl . $path.$file;
  12 +}
  13 +?>
  14 +<style>
  15 +
  16 +</style>
  17 +<div class="views">
  18 + <div class="view view-main">
  19 + <?=$this->render("@app/views/widgets/ui-loading")?>
  20 + </div>
  21 +</div>
  22 +
  23 +<?=$this->render('pages/index-template', ['asset' => $asset])?>
  24 +<?=$this->render('pages/rank-template', ['asset' => $asset])?>
  25 +
  26 +<script>
  27 + require.config({baseUrl: $site.assets_url + '/js/',urlArgs : "v=" + require.version});
  28 + require([
  29 + 'order-app'
  30 + ],
  31 + function(app){
  32 + app.bootstrap({
  33 + baseUrl: $site.base_url
  34 + });
  35 + });
  36 +</script>
  37 +
  38 +<?=$this->render("@app/views/widgets/stat-code")?>
... ...
app-wx/modules/order/views/default/pages/index-template.php 0 → 100644
... ... @@ -0,0 +1,141 @@
  1 +<?php
  2 +
  3 +use yii\helpers\Url;
  4 +
  5 +$baseUrl = Url::base(true);
  6 +?>
  7 +<style>
  8 + /***头部****/
  9 + #index .navbar-cls:after{content:'';width:100%;height: 0.0625rem;background: #e4e1e1;}
  10 + #index .navbar-cls{height: 46px;}
  11 + #index .top-tab{width:100%;display:flex;justify-content: center;align-content: center;box-sizing: border-box;background: #FFFFFF;height:2.75rem;}
  12 + #index .inner-plus {padding:0;background:initial;;box-shadow: 0 1px 2px 0 rgba(179,179,181,0.38);}
  13 + #index .top-tab .tab-cls{width:33%;display: inline-grid;text-align:center;color:#A9A9A9;position: relative; font-size: 1.06rem}
  14 + #index .top-tab .tab-a{font-size: 0.88rem;line-height:0.88rem;padding:0.6875rem 0;box-sizing: border-box;display: flex;flex-direction: row;justify-content: center;font-weight: 400}
  15 + #index .top-tab .active{color:#FF8728;position:relative; border-bottom: 0.19rem solid #ff8728; padding: 0 0 0.6875rem 0;}
  16 + #index .tab-b { width: 100%; border-left: 2px solid #E4E7E9; border-right: 2px solid #E4E7E9;}
  17 + #index .order-item {background-color: #fff; padding: 1rem;margin-top: 0.5rem;display: grid;}
  18 + #index .order-item-content {width: 100%;font-size:1.06rem;font-weight:400;color:rgba(9,9,9,1); line-height:1.37rem; padding-bottom: 0.2rem;}
  19 + #index .title-left{float: left}
  20 + #index .title-right{float: right; font-size:1rem; font-weight:400; color:rgba(255,135,40,1); line-height:0.75rem;margin-top: 2px;}
  21 + #index .order-doing-img{ width: 1rem; height: 1rem; vertical-align: text-top; margin-right: 0.5rem}
  22 + #index .order-list{width:100%;margin-top:0;margin-bottom:5rem}
  23 + #index .content-time { font-size:0.81rem;font-weight:400;color:rgba(146,146,146,1);line-height:0.75rem;}
  24 + #index .order-done {font-size:1rem; font-weight:400; color:rgba(193,193,193,1); line-height:0.75rem; float: right}
  25 +</style>
  26 +<script id="index-template" type="text/template">
  27 + <div class="pages" id="index">
  28 + <div class="page navbar-fixed">
  29 + <div class="navbar navbar-cls">
  30 + <div class="navbar-inner inner-plus">
  31 + <div class="top-tab g-block-set">
  32 + <div data-href="<?=$baseUrl?>/order#index" class="tab-cls">
  33 + <span id="all-device-btn" class="tab-a">
  34 + <span class="active">全部</span>
  35 + </span>
  36 + </div>
  37 + <div data-href="<?=$baseUrl?>/order#index/self" class="tab-cls">
  38 + <span id="selfOrder" class="tab-a">
  39 + <span class="tab-b">已完成</span>
  40 + </span>
  41 + </div>
  42 + <div data-href="<?=$baseUrl?>/order#index/forward" class="tab-cls">
  43 + <span id="forwardOrder" class="tab-a">
  44 + <span class="">进行中</span>
  45 + </span>
  46 + </div>
  47 + </div>
  48 + </div>
  49 + </div>
  50 + <div class="page-content" >
  51 + <div class="order-list" id="index-order-list-box">
  52 + <div class="order-item">
  53 + <div class="order-item-content">
  54 + <span class="title-left">车牌号码:粤A95582</span>
  55 + <span class="title-right">
  56 + <img src="<?=$baseUrl . "/i/order/order_timer.png"?>" class="order-doing-img"/>进行中
  57 + </span>
  58 + </div>
  59 + <div class="order-item-content">
  60 + <span class="title-left">车辆型号:宝马X6</span>
  61 + </div>
  62 + <div class="order-item-content">
  63 + <span class="title-left">客户名称:李先生</span>
  64 + </div>
  65 + <div class="order-item-content">
  66 + <span class="content-time">创建时间: 2019-10-01 11:42</span>
  67 + </div>
  68 + </div>
  69 + <div class="order-item">
  70 + <div class="order-item-content">
  71 + <span class="title-left">车牌号码:粤A95582</span>
  72 + <span class="title-right">
  73 + <img src="<?=$baseUrl . "/i/order/order_timer.png"?>" class="order-doing-img"/>进行中
  74 + </span>
  75 + </div>
  76 + <div class="order-item-content">
  77 + <span class="title-left">车辆型号:宝马X6</span>
  78 + </div>
  79 + <div class="order-item-content">
  80 + <span class="title-left">客户名称:李先生</span>
  81 + </div>
  82 + <div class="order-item-content">
  83 + <span class="content-time">创建时间: 2019-10-01 11:42</span>
  84 + </div>
  85 + </div>
  86 + <div class="order-item">
  87 + <div class="order-item-content">
  88 + <span class="title-left">车牌号码:粤A95582</span>
  89 + <span class="order-done">
  90 + 已完成
  91 + </span>
  92 + </div>
  93 + <div class="order-item-content">
  94 + <span class="title-left">车辆型号:宝马X6</span>
  95 + </div>
  96 + <div class="order-item-content">
  97 + <span class="title-left">客户名称:李先生</span>
  98 + </div>
  99 + <div class="order-item-content">
  100 + <span class="content-time">创建时间: 2019-10-01 11:42</span>
  101 + </div>
  102 + </div>
  103 + <div class="order-item">
  104 + <div class="order-item-content">
  105 + <span class="title-left">车牌号码:粤A95582</span>
  106 + <span class="order-done">
  107 + 已完成
  108 + </span>
  109 + </div>
  110 + <div class="order-item-content">
  111 + <span class="title-left">车辆型号:宝马X6</span>
  112 + </div>
  113 + <div class="order-item-content">
  114 + <span class="title-left">客户名称:李先生</span>
  115 + </div>
  116 + <div class="order-item-content">
  117 + <span class="content-time">创建时间: 2019-10-01 11:42</span>
  118 + </div>
  119 + </div>
  120 + <div class="order-item">
  121 + <div class="order-item-content">
  122 + <span class="title-left">车牌号码:粤A95582</span>
  123 + <span class="order-done">
  124 + 已完成
  125 + </span>
  126 + </div>
  127 + <div class="order-item-content">
  128 + <span class="title-left">车辆型号:宝马X6</span>
  129 + </div>
  130 + <div class="order-item-content">
  131 + <span class="title-left">客户名称:李先生</span>
  132 + </div>
  133 + <div class="order-item-content">
  134 + <span class="content-time">创建时间: 2019-10-01 11:42</span>
  135 + </div>
  136 + </div>
  137 + </div>
  138 + </div>
  139 + </div>
  140 + </div>
  141 +</script>
... ...
app-wx/modules/order/views/default/pages/rank-template.php 0 → 100644
... ... @@ -0,0 +1,39 @@
  1 +<?php
  2 +use yii\helpers\Url;
  3 +$baseUrl = Url::base(true);
  4 +?>
  5 +<style>
  6 + body,div,p,span,input{padding: 0;margin: 0}
  7 + input{-webkit-appearance: none;}
  8 + #rank .content-div { background: #fff; height: auto;padding: 1rem}
  9 + #rank .page-content{ background-color: #ECF0F2 }
  10 + #rank .rank-title { height:1.06rem; font-size:1.06rem; font-weight:400; color:rgba(9,9,9,1); line-height:0.75rem;}
  11 + #rank .rank-title-two { height:1.06rem; font-size:1.06rem; font-weight:400; color:rgba(9,9,9,1); line-height:0.75rem; padding-top: 2rem;}
  12 + #rank .star-div {margin-top: 1rem;display: flex;}
  13 + #rank .img-start {width: 1.47rem; height: 1.47rem; float: left; vertical-align: middle; margin-right: 1rem}
  14 + #rank .text-content {width: 100%;height: 7.5rem; resize: none;line-height: 1.2rem;padding: 0.5rem}
  15 +
  16 +</style>
  17 +<script id="rank-template" type="text/template">
  18 + <div class="pages">
  19 + <div class="page" id="rank" style="background: #fff">
  20 + <div class="page-content">
  21 + <div class="content-div">
  22 + <div class="rank-title">服务评价</div>
  23 + <div class="star-div">
  24 + <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
  25 + <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
  26 + <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
  27 + <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
  28 + <img src="<?= $baseUrl . "/i/order/rank/rank_no_select.png"?>" class="img-start">
  29 + <span style="line-height: 1.47rem">一般</span>
  30 + </div>
  31 + <div class="rank-title-two">说说你的感受</div>
  32 + <div class="star-div">
  33 + <textarea class="text-content" placeholder="说说此次服务的优点和不足的地方吧"></textarea>
  34 + </div>
  35 + </div>
  36 + </div>
  37 + </div>
  38 + </div>
  39 +</script>
... ...
app-wx/modules/order/views/layouts/main.php 0 → 100644
... ... @@ -0,0 +1,43 @@
  1 +<?php
  2 +
  3 +use app\wx\assets\AppAsset;
  4 +use yii\helpers\Html;
  5 +
  6 +AppAsset::register($this);
  7 +
  8 +$site = $this->params['site'];
  9 +
  10 +$this->title = \yii::$app->name;
  11 +$assets = $this->getAssetManager();
  12 +$asset = $assets->getBundle('app\wx\assets\AppAsset');
  13 +?>
  14 +<?php $this->beginPage() ?>
  15 +<!DOCTYPE HTML>
  16 +
  17 +<html lang="<?= \yii::$app->language ?>">
  18 +<head>
  19 +<meta charset="<?= \yii::$app->charset ?>">
  20 +<meta name="apple-mobile-web-app-capable" content="yes">
  21 +<meta name="apple-mobile-web-app-status-bar-style" content="black">
  22 +<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
  23 +<meta http-equiv="Pragma" content="no-cache">
  24 +<meta http-equiv="Expires" content="0">
  25 +<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  26 +<?= Html::csrfMetaTags() ?>
  27 +<title><?= Html::encode($this->title) ?></title>
  28 +<script>
  29 + <?=$this->render("@app/views/widgets/js-site", ['site' => $site])?>
  30 +</script>
  31 +<?php $this->head() ?>
  32 +<style>
  33 +
  34 +</style>
  35 +</head>
  36 +<body>
  37 +<?php $this->beginBody() ?>
  38 +<?=$content?>
  39 +<?php $this->endBody() ?>
  40 +</body>
  41 +</html>
  42 +<?php $this->endPage() ?>
  43 +
... ...
web/dist/js/order-app.js 0 → 100644
... ... @@ -0,0 +1 @@
  1 +define("order-app",["mk7/app"],function(n){var e=Dom7,i=function(){var n=e(".ui-loading-block");0==n.length&&(e(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var n=document.getElementById("loader-inner"),e=document.createElement("p");e.className="notice",n&&(e.innerHTML='加载速度太慢?试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',n.appendChild(e))},window.waitingTime))},r=!0;return n.name="order",n.routes={index:function(){return r=!1,i(),n.runController("index")},rank:function(){return r=!1,i(),n.runController("rank")},"*":function(){return n.runController("index")}},n}),define("order/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(n,e,i){var n=(Dom7,Template7,new n);return n.run=function(){var n=this;n.setPageTitle("首页"),n.hideAllNonBaseMenuItem(window.$site),n.render()},n.bindEvents=function(){console.log("bindEvents")},n}),define("order/rank-controller",["mk7/controller","mk7/url","mk7/utils"],function(n,e,i){var n=(Dom7,Template7,new n);return n.run=function(){var n=this;n.setPageTitle("评价"),n.render()},n.bindEvents=function(){console.log("bindEvents")},n});
0 2 \ No newline at end of file
... ...
web/dist/js/user-app.js 0 → 100644
... ... @@ -0,0 +1 @@
  1 +define("user-app",["mk7/app"],function(e){var n=Dom7,i=function(){var e=n(".ui-loading-block");0==e.length&&(n(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),n=document.createElement("p");n.className="notice",e&&(n.innerHTML='加载速度太慢?试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',e.appendChild(n))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,i(),e.runController("index")},register:function(){return r=!1,i(),e.runController("register")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,n,i){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,n,i){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("注册"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e});
0 2 \ No newline at end of file
... ...
web/gulpfile.js
... ... @@ -84,6 +84,14 @@ gulp.task(&#39;build&#39;, function () {
84 84 .pipe(gulp.dest(paths.dist.scripts));
85 85 //--------------------------------------------------
86 86  
  87 + //-----------------------------------------------
  88 + //order module (订单模块)
  89 + gulp.src([paths.source.scripts + 'order/*.js'])
  90 + .pipe(concat('order-app.js'))
  91 + .pipe(uglify())
  92 + .pipe(gulp.dest(paths.dist.scripts));
  93 + //--------------------------------------------------
  94 +
87 95  
88 96 //字体
89 97 gulp.src([paths.source.fonts + '*'])
... ...
web/i/order/order_enter.png 0 → 100644

15.4 KB

web/i/order/order_timer.png 0 → 100644

1.15 KB

web/i/order/rank/rank_no_select.png 0 → 100644

2.25 KB

web/i/order/rank/rank_star.png 0 → 100644

1.44 KB

web/src/js/order/app.js 0 → 100644
... ... @@ -0,0 +1,53 @@
  1 +/**
  2 + * 单页面应用
  3 + */
  4 +define(
  5 + "order-app",
  6 + [
  7 + 'mk7/app'
  8 + ],
  9 + function(app) {
  10 +
  11 + var $$ = Dom7;
  12 + var _autoLoading = function(){
  13 + var e = $$('.ui-loading-block');
  14 + if(0 == e.length){
  15 + //<!--预载入页面动画-->
  16 + $$('.view-main').html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>');
  17 + window['waitingTime'] = 10000; // 显示重新加载的等待时间,默认10s
  18 + if(window['loaderTimer']){
  19 + clearTimeout(window['loaderTimer']);
  20 + }
  21 + window['loaderTimer'] = setTimeout(function(){
  22 + var loaderTips = document.getElementById('loader-inner');
  23 + var tips = document.createElement('p');
  24 + tips.className = 'notice';
  25 + if(loaderTips){
  26 + tips.innerHTML = '加载速度太慢?试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>';
  27 + loaderTips.appendChild(tips);
  28 + }
  29 + },window['waitingTime']);
  30 + }
  31 + };
  32 +
  33 + var fromOutside = true; // 标记是否从外部进来
  34 +
  35 + app.name = 'order';
  36 + app.routes = {
  37 + 'index': function () {
  38 + fromOutside = false;
  39 + _autoLoading();
  40 + return app.runController('index');
  41 + },
  42 + 'rank': function () {
  43 + fromOutside = false;
  44 + _autoLoading();
  45 + return app.runController('rank');
  46 + },
  47 + '*': function(){
  48 + return app.runController('index');
  49 + }
  50 + }
  51 + return app;
  52 + }
  53 +);
... ...
web/src/js/order/index-controller.js 0 → 100644
... ... @@ -0,0 +1,36 @@
  1 +/**
  2 + * 首页
  3 + */
  4 +define(
  5 + "order/index-controller",
  6 + [
  7 + 'mk7/controller',
  8 + 'mk7/url',
  9 + 'mk7/utils',
  10 + ],
  11 +
  12 + function(ctrl, url, utils) {
  13 +
  14 + var $$ = Dom7;
  15 + var t7 = Template7;
  16 + var ctrl = new ctrl();
  17 +
  18 +
  19 + ctrl.run = function () {
  20 + var me = this;
  21 + me.setPageTitle("首页");
  22 + me.hideAllNonBaseMenuItem(window.$site);
  23 +
  24 + me.render();
  25 +
  26 +
  27 + }
  28 + ctrl.bindEvents = function () {
  29 + var me = this;
  30 + console.log("bindEvents");
  31 +
  32 + }
  33 +
  34 + return ctrl;
  35 + }
  36 +);
... ...
web/src/js/order/rank-controller.js 0 → 100644
... ... @@ -0,0 +1,30 @@
  1 +/**
  2 + * 订单评价-首页
  3 + */
  4 +define(
  5 + "order/rank-controller",
  6 + [
  7 + 'mk7/controller',
  8 + 'mk7/url',
  9 + 'mk7/utils',
  10 + ],
  11 +
  12 + function(ctrl, url, utils) {
  13 +
  14 + var $$ = Dom7;
  15 + var t7 = Template7;
  16 + var ctrl = new ctrl();
  17 +
  18 + ctrl.run = function () {
  19 + var me = this;
  20 + me.setPageTitle("评价");
  21 + me.render();
  22 + }
  23 + ctrl.bindEvents = function () {
  24 + var me = this;
  25 + console.log("bindEvents");
  26 + }
  27 +
  28 + return ctrl;
  29 + }
  30 +);
... ...