From 3b58c97bb9241c76352a0c53e3a782000c8d6fed Mon Sep 17 00:00:00 2001
From: caoming <604844710@qq.com>
Date: Sat, 21 Dec 2019 14:54:16 +0800
Subject: [PATCH] 1. 维修费用清单页面新增

---
 app-wx/modules/order/views/default/index.php                    |  1 +
 app-wx/modules/order/views/default/pages/cost-list-template.php | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app-wx/modules/order/views/default/pages/rank-template.php      |  4 ++--
 web/dist/js/order-app.js                                        |  2 +-
 web/i/order/add_pic.png                                         | Bin 0 -> 4412 bytes
 web/i/order/plus.png                                            | Bin 0 -> 1114 bytes
 web/src/js/order/app.js                                         |  5 +++++
 web/src/js/order/cost-list-controller.js                        | 30 ++++++++++++++++++++++++++++++
 web/src/js/order/index-controller.js                            |  2 +-
 9 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 app-wx/modules/order/views/default/pages/cost-list-template.php
 create mode 100644 web/i/order/add_pic.png
 create mode 100644 web/i/order/plus.png
 create mode 100644 web/src/js/order/cost-list-controller.js

diff --git a/app-wx/modules/order/views/default/index.php b/app-wx/modules/order/views/default/index.php
index da818da..e22a212 100644
--- a/app-wx/modules/order/views/default/index.php
+++ b/app-wx/modules/order/views/default/index.php
@@ -22,6 +22,7 @@ function img($file, $path = '/i/')
 
 <?=$this->render('pages/index-template', ['asset' => $asset])?>
 <?=$this->render('pages/rank-template', ['asset' => $asset])?>
+<?=$this->render('pages/cost-list-template', ['asset' => $asset])?>
 
 <script>
     require.config({baseUrl: $site.assets_url + '/js/',urlArgs : "v=" + require.version});
diff --git a/app-wx/modules/order/views/default/pages/cost-list-template.php b/app-wx/modules/order/views/default/pages/cost-list-template.php
new file mode 100644
index 0000000..174adc8
--- /dev/null
+++ b/app-wx/modules/order/views/default/pages/cost-list-template.php
@@ -0,0 +1,74 @@
+<?php
+use yii\helpers\Url;
+$baseUrl = Url::base(true);
+?>
+<style>
+    body,div,p,span,input{padding: 0;margin: 0}
+    input{-webkit-appearance: none;}
+    #cost-list .content-div { background: #fff; height: auto;padding: 1rem}
+    #cost-list .content-div-two { background: #fff; height: auto;padding: 1rem;margin-top: 0.63rem}
+    #cost-list .page-content{ background-color: #ECF0F2 }
+    #cost-list .cost-list-title { width:100%; font-size:1.07rem; font-weight:bold; color:rgba(0,0,0,1); line-height:1.81rem;}
+    #cost-list .title-tip{ font-size:1rem; font-weight:400; color:rgba(255,135,40,1); line-height:1.82rem; float: right}
+    #cost-list .cost-list-title-two { font-size:1rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.81rem;}
+    #cost-list .cost-list-div {width:100%;margin-top: 1rem; }
+    #cost-list .cost-list-add {width:100%;margin-top: 0.5rem; }
+    #cost-list .pic-div {width:100%;margin-top: 0.5rem; }
+    #cost-list .cost-total-list-div {width:100%;margin-top: 1rem; text-align: right}
+    #cost-list .cost-total-title {font-size:0.81rem;font-weight:400;color:rgba(85,85,85,1);line-height:1.69rem;}
+    #cost-list .cost-total-price { font-size:1.13rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.69rem;}
+    #cost-list .img-plus {width: 1rem; height: 1rem; vertical-align: text-top; margin-right: 0.2rem}
+    #cost-list .item-title { font-size:0.88rem;  font-weight:400; color:rgba(186,186,186,1); line-height:1.81rem;}
+    #cost-list .input-left {width:70%; padding: 0 0.5rem; height:2.47rem; background:rgba(255,255,255,1); border:1px solid rgba(221,221,221,1); border-radius:0rem 0rem 0rem 0rem;}
+    #cost-list .input-right {width:30%; height:2.47rem; padding: 0 0.5rem; text-align: center; background:rgba(255,255,255,1); border:1px solid rgba(221,221,221,1); border-radius:0rem 0rem 0rem 0rem; border-left: none}
+    #cost-list .two-tip{ font-size:0.75rem; font-weight:400; color:rgba(85,85,85,1); line-height:1.81rem;}
+    #cost-list .add-pic{width: 3.91rem;height: 3.91rem}
+    #cost-list .btn-submit{width:85%;text-align: center;line-height: 3.06rem;
+        height:3.06rem;
+        background:rgba(255,135,40,1);
+        border-radius:2rem;
+        font-size:1.06rem;
+        font-weight:400;
+        color:rgba(255,255,255,1);
+        margin: 0 auto;
+        margin-top: 9rem;
+        margin-bottom: 2rem;
+    }
+</style>
+<script id="cost-list-template" type="text/template">
+    <div class="pages">
+        <div class="page" id="cost-list" style="background: #fff">
+            <div class="page-content">
+                <div class="content-div">
+                    <div class="cost-list-title">维修费用清单
+                        <span class="title-tip">
+                            <img src="<?= $baseUrl . "/i/order/plus.png"?>" class="img-plus">添加
+                        </span>
+                    </div>
+                    <div class="cost-list-div">
+                        <p class="item-title">第1项</p>
+                        <div style="display: flex;width: 100%">
+                            <input type="text" class="input-left" placeholder="填写维修内容" value="更换车轮胎"/><input type="text" class="input-right" placeholder="填写价格" value="250"/>
+                        </div>
+                    </div>
+                    <div class="cost-list-add">
+                        <p class="item-title">第2项</p>
+                        <div style="display: flex;width: 100%">
+                            <input type="text" class="input-left" placeholder="填写维修内容"/><input type="text" class="input-right" placeholder="填写价格"/>
+                        </div>
+                    </div>
+                    <div class="cost-total-list-div">
+                        <span class="cost-total-title">总金额：</span><span class="cost-total-price">&yen;250</span>
+                    </div>
+                </div>
+                <div class="content-div-two">
+                    <div class="cost-list-title-two">维修完成照片 <span class="two-tip">（选传，最多9张）</span></div>
+                    <div class="pic-div">
+                        <img src="<?= $baseUrl . "/i/order/add_pic.png"?>" class="add-pic">
+                    </div>
+                </div>
+                <div class="btn-submit"> 提交 </div>
+            </div>
+        </div>
+    </div>
+</script>
diff --git a/app-wx/modules/order/views/default/pages/rank-template.php b/app-wx/modules/order/views/default/pages/rank-template.php
index c4ca14c..07f0013 100644
--- a/app-wx/modules/order/views/default/pages/rank-template.php
+++ b/app-wx/modules/order/views/default/pages/rank-template.php
@@ -12,7 +12,7 @@ $baseUrl = Url::base(true);
     #rank .star-div {margin-top: 1rem;display: flex;}
     #rank .img-start {width: 1.47rem; height: 1.47rem; float: left; vertical-align: middle; margin-right: 1rem}
     #rank .text-content {width: 100%;height: 7.5rem; resize: none;line-height: 1.2rem;padding: 0.5rem}
-
+    #rank .rank-text { font-size:0.94rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.75rem;}
 </style>
 <script id="rank-template" type="text/template">
     <div class="pages">
@@ -26,7 +26,7 @@ $baseUrl = Url::base(true);
                         <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
                         <img src="<?= $baseUrl . "/i/order/rank/rank_star.png"?>" class="img-start">
                         <img src="<?= $baseUrl . "/i/order/rank/rank_no_select.png"?>" class="img-start">
-                        <span style="line-height: 1.47rem">一般</span>
+                        <span class="rank-text">一般</span>
                     </div>
                     <div class="rank-title-two">说说你的感受</div>
                     <div class="star-div">
diff --git a/web/dist/js/order-app.js b/web/dist/js/order-app.js
index 710633a..09d35f2 100644
--- a/web/dist/js/order-app.js
+++ b/web/dist/js/order-app.js
@@ -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});
\ No newline at end of file
+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")},"cost-list":function(){return r=!1,i(),n.runController("cost-list")},"*":function(){return n.runController("index")}},n}),define("order/cost-list-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}),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});
\ No newline at end of file
diff --git a/web/i/order/add_pic.png b/web/i/order/add_pic.png
new file mode 100644
index 0000000..a9600ad
Binary files /dev/null and b/web/i/order/add_pic.png differ
diff --git a/web/i/order/plus.png b/web/i/order/plus.png
new file mode 100644
index 0000000..88c1340
Binary files /dev/null and b/web/i/order/plus.png differ
diff --git a/web/src/js/order/app.js b/web/src/js/order/app.js
index bb90237..bc70a5c 100644
--- a/web/src/js/order/app.js
+++ b/web/src/js/order/app.js
@@ -44,6 +44,11 @@ define(
                 _autoLoading();
                 return app.runController('rank');
             },
+            'cost-list': function () {
+                fromOutside = false;
+                _autoLoading();
+                return app.runController('cost-list');
+            },
             '*': function(){
                 return app.runController('index');
             }
diff --git a/web/src/js/order/cost-list-controller.js b/web/src/js/order/cost-list-controller.js
new file mode 100644
index 0000000..dcbe972
--- /dev/null
+++ b/web/src/js/order/cost-list-controller.js
@@ -0,0 +1,30 @@
+/**
+ * 订单评价-首页
+ */
+define(
+    "order/cost-list-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;
+    }
+);
diff --git a/web/src/js/order/index-controller.js b/web/src/js/order/index-controller.js
index 49a9767..b6d29e5 100644
--- a/web/src/js/order/index-controller.js
+++ b/web/src/js/order/index-controller.js
@@ -18,7 +18,7 @@ define(
 
         ctrl.run = function () {
             var me = this;
-            me.setPageTitle("首页");
+            me.setPageTitle("订单列表");
             me.hideAllNonBaseMenuItem(window.$site);
 
             me.render();
--
libgit2 0.21.0