2

www/webapp/o2o/css/pay.css

@@ -79,3 +79,11 @@
 	background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0i5Zu+5bGCXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgMTggMTgiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDE4IDE4OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojNDA0MDQwO30NCgkuc3Qxe2ZpbGw6IzhCQzM0QTt9DQo8L3N0eWxlPg0KPGcgaWQ9IlhNTElEXzFfIj4NCgk8cGF0aCBpZD0iWE1MSURfNF8iIGNsYXNzPSJzdDAiIGQ9Ik04Ljk5NiwxOC4wMTVjLTQuOTYyLDAtOS00LjAzNy05LTljMC00Ljk2Miw0LjAzNy05LDktOWM0Ljk2MywwLDksNC4wMzcsOSw5DQoJCUMxNy45OTYsMTMuOTc4LDEzLjk1OSwxOC4wMTUsOC45OTYsMTguMDE1eiBNOC45OTYsMC45NjNjLTQuNDQsMC04LjA1MiwzLjYxMi04LjA1Miw4LjA1MnMzLjYxMiw4LjA1Myw4LjA1Miw4LjA1Mw0KCQlzOC4wNTMtMy42MTMsOC4wNTMtOC4wNTNTMTMuNDM2LDAuOTYzLDguOTk2LDAuOTYzeiIvPg0KPC9nPg0KPHBhdGggaWQ9IlhNTElEXzlfIiBjbGFzcz0ic3QxIiBkPSJNOC45OTYsNC41MTVjLTIuNDgxLDAtNC41LDIuMDE5LTQuNSw0LjVzMi4wMTksNC41LDQuNSw0LjVzNC41LTIuMDE5LDQuNS00LjUNCglTMTEuNDc3LDQuNTE1LDguOTk2LDQuNTE1eiIvPg0KPC9zdmc+DQo=) no-repeat;
 	background-size: cover;
 }
+.spa-page-pay-success .btn-positive{
+		background-color: rgba(146,118,3,1);
+    border-color:rgba(146, 110, 3, 1);
+    color: white;
+    width: 33%;
+    float: left;
+    margin: 0 0 0 12%;
+}

www/webapp/o2o/css/recharge.css

@@ -22,7 +22,7 @@
   text-align: center;
 }
 .spa-page-recharge .media.on{
-  border: 1px solid red;
+  border: 2px solid rgba(146,118,3,1);
 }
 .spa-page-recharge .media input{
   margin: 0;

www/webapp/o2o/dist/js/page/success.js

@@ -1 +1 @@
-define(["template","user","config"],function(e,t,n){return{title:"壹管家上门服务",body:"",init:function(r,i){var s=this,o=$(document),u=e("success/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".my-order",function(e){e.preventDefault(),t.checkLogin(function(){o.trigger("spa:navigate",{hash:"myOrder/1",pushData:{animate:"slideOutDown",needReload:!0}})})},s),$.newTouch(".btn-home",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:""})},s),s.on("tapBackButton",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{animate:"slideOutDown"}})}),i.resolve()}}});
+define(["template","user","config"],function(e,t,n){return{title:"壹管家上门服务",body:"",init:function(r,i){var s=this,o=$(document),u=e("success/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(u),$.newTouch(".my-order",function(e){e.preventDefault(),t.checkLogin(function(){o.trigger("spa:navigate",{hash:"myOrder/1",pushData:{animate:"slideOutDown",needReload:!0}})})},s),$.newTouch(".my-home",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:""})},s),s.on("tapBackButton",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{animate:"slideOutDown"}})}),i.resolve()}}});

www/webapp/o2o/js/page/mine.js

@@ -51,7 +51,8 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 				$doc.trigger('spa:navigate', {
 					hash: 'myOrder/1',
 					pushData: {
-						needReload: true
+						needReload: true,
+						backHash:'mine'
 					}
 				});
 			}, $view);

www/webapp/o2o/js/page/myOrder.js

@@ -1,9 +1,11 @@
 define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, template, user, config, native, IScroll) {
+
+    var backHash;
     function back(event) {
         event.preventDefault();
 
         $(document).trigger('spa:navigate', {
-            hash: 'mine',
+            hash: backHash,
             pushData: {
                 dontNeedReload: true
             }
@@ -259,6 +261,10 @@ define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, te
         beforeopen: function (pageData, dtd) {
             var $view = this;
             var $doc = $(document);
+            /* 只有首页跳转来，才会带有needReset = true */
+            var pushData = pageData.pushData;
+            /*获取上一页跳转的路由名称*/
+            backHash = pushData.backHash ? pushData.backHash : '';
             var tpl = template('myOrder/index', {
                 showNavBar: !config.isWX && !config.isChubao,
                 type: t == 0 ? pageData.requestData[0] : t

www/webapp/o2o/js/page/success.js

@@ -25,7 +25,7 @@ define(['template', 'user', 'config'], function (template, user, config) {
 				});
 			}, $view);
 
-			$.newTouch('.btn-home', function (event) {
+			$.newTouch('.my-home', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 					hash: ''

www/webapp/o2o/tpl/success/index.html

@@ -10,7 +10,8 @@
 	<div class="box-center">
 		<p>订单支付成功，稍后会有壹管家工作人员联系你~</p>
 	</div>
-	<a class="btn btn-positive btn-block my-order">查看我的预约</a>
+	<a class="btn btn-positive btn-block my-home">返回首页</a>
+	<a class="btn btn-positive btn-block my-order">查看预约</a>
 </div>
 {{else}}
 <div class="content content-padded">
@@ -37,4 +38,4 @@
 		<a class="btn btn-positive btn-home">继续购买</a>
 	</div>
 </div>
-{{/if}}
+{{/if}}