Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/o2o/views/web/index.php

@@ -10,7 +10,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017050902">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017051200">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <style>
@@ -76,7 +76,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017050902';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017051200';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

www/webapp/o2o/css/main.css

@@ -23,3 +23,4 @@
 @import url("./orderDetail.css");
 @import url("./beautician.css");
 @import url("./balanceLog.css");
+@import url("./recharge.css");

www/webapp/o2o/css/recharge.css

@@ -0,0 +1,43 @@
+.spa-page-recharge .btn-add-recharge{
+
+}
+
+.spa-page-recharge .rechange-input{
+
+}
+
+.spa-page-recharge .list-content{
+  align-content:flex-start;
+}
+
+.spa-page-recharge .media{
+  margin: 3%;
+  float: left;
+  height: 6rem;
+  padding: 15px;
+  width: 27.33%;
+  cursor: pointer;
+  font-size: 13px;
+  border: 1px solid;
+  text-align: center;
+}
+.spa-page-recharge .media.on{
+  border: 1px solid red;
+}
+.spa-page-recharge .media input{
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 45px;
+  margin-top: 10%;
+}
+.spa-page-recharge .media .input-title{
+
+}
+.spa-page-recharge .media .rechange-desc{
+  margin-top: 1rem;
+  font-size: 14px;
+}
+.spa-page-recharge .btn-add-recharge{
+  clear: both;
+}

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

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,value:"1",recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".media",function(t){t.preventDefault();if(e(this).hasClass("on"))return;e(this).addClass("on"),e(this).siblings().removeClass("on"),e(".rechange-input",i).blur()},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),e(".rechange-input",i).blur(),s.trigger("spa:openloader");var n=e(".media.on").attr("data-value"),u=e(".rechange-input").val();r.addRechargeorder({user_id:o.id,value:u,recharge_id:e(".media.on").attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/page/pay.js

@@ -130,6 +130,9 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     }
                 }
             }
+            if(orderType=='充值1元'){
+              orderType="其他数额充值";
+            }
             var tpl = template('pay/index', {
                 showNavBar: !config.isWX && !config.isChubao,
                 wxPub: true,

www/webapp/o2o/js/page/rechargee.js

@@ -58,15 +58,32 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 					}
 				});
 			}, $view);
+			// 样式切换
+			$.newTouch('.media',function (event) {
+				event.preventDefault();
+				/* on代表这一条的选中状态。如果已经选中了，就return。this的作用域是这一条extra。 */
+				if ($(this).hasClass('on')) return;
+				/* 如果没有on状态，加上on。 */
+				$(this).addClass('on');
+				/* 删掉其他选择框的on状态 */
+				$(this).siblings().removeClass('on');
+				// 使input失去焦点
+				$('.rechange-input', $view).blur();
+			},$view);
 			// 点击充值
 			$.newTouch('.btn-add-recharge', function (event) {
 				event.preventDefault();
+				// 使input失去焦点
+				$('.rechange-input', $view).blur();
+				// 加载过度动画
 				$doc.trigger('spa:openloader');
-				var value = $(this).attr('data-value');
+				var value = $('.media.on').attr('data-value');
+				// 获取input值
+				var inputVal=$('.rechange-input').val();
 				recharge.addRechargeorder({
 					user_id: user.id,
-					value:'1',
-					recharge_id: $(this).attr('data-id')
+					value:inputVal,
+					recharge_id: $('.media.on').attr('data-id')
 				}, function (res) {
 					$doc.trigger('spa:closeloader');
 					if (res.success) {

www/webapp/o2o/tpl/recharge/cell.html

@@ -1,29 +1,7 @@
-<!--
 {{ each recharges as recharge i }}
-<li class="table-view-cell media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
-    data-index="{{ i }}" style="margin: 10px">
-    <a class="address-item">
-        <div class="media-body">
-			<span class="denomination" style="font-size: 18px; color: rgb(233,233,216)">充值{{ recharge.denomination }}元</span>
-            <p class="detail" style="rgb(233,233,216)">
-                {{ if recharge.cash_back }}
-                返还{{ recharge.cash_back }}现金
-                {{ else if recharge.coupons }}
-                赠送价值{{ recharge.coupons }}元的优惠券
-                {{ /if }}
-            </p>
-        </div>
-    </a>
-    <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button>
-</li>
-{{ /each }}-->
-
-
-
-{{ each recharges as recharge i }}
-<li class="media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
-    data-index="{{ i }}">
-    <div></div>
-    <span>立即充值>>></span>
-</li>
+    <li class="media" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"  data-index="{{ i }}">
+        <div>{{ recharge.desc }}</div>
+        <div>{{ rechange.denomination }}</div>
+    </li>
 {{ /each }}
+<!-- <input type="text" class="rechange-input" name="" value=""> -->

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

@@ -13,8 +13,19 @@
                 <img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1.jpg"
                      style="width: 100%;">
                 <ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
-                    {{include './cell'}}
+                  {{ each recharges as recharge i }}
+                      <li class="media" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"  data-index="{{ i }}">
+                          {{ if recharge.denomination === 1 }}
+                            <div class="input-title">其他数额</div>
+                            <input type="text" name="" value="" class="rechange-input">
+                          {{ else }}
+                            <div>充值{{ recharge.denomination }}元</div>
+                            <div class="rechange-desc">{{ recharge.desc }}</div>
+                          {{ /if }}
+                      </li>
+                  {{ /each }}
                 </ul>
+                <div class="btn-add-recharge">立即去充值</div>
                 <div class="ad-hide" style="text-align: center;"><span
                         style="font-size: 0.6rem">点击立即充值，即表示您已经同意壹管家</span><span
                         style="font-size: 0.6rem;font-weight: 600;display: block;"></span>
@@ -27,4 +38,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>