e 8 年 前
コミット
d711034ae3

ファイルの差分が大きいため隠しています
+ 18 - 17
www/webapp/o2o/css/ratchetOverloading.css


ファイルの差分が大きいため隠しています
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


ファイルの差分が大きいため隠しています
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
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 u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},i),i.on("tapBackButton",function(e){history.go(-1)}),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,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){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),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 u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},i),i.on("tapBackButton",function(e){history.go(-1)}),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,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){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){console.log(r.data);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++);console.log(f),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 16 - 4
www/webapp/o2o/js/build/template.js

@@ -1797,10 +1797,11 @@ $out+=' </div> </li> ';
 });
 $out+=' ';
 return new String($out);
-});/*v:17*/
+});/*v:22*/
 template('recharge/cell',function($data,$filename
 /**/) {
-'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,recharges=$data.recharges,recharge=$data.recharge,i=$data.i,$escape=$utils.$escape,$out='';$each(recharges,function(recharge,i){
+'use strict';var $utils=this,$helpers=$utils.$helpers,$each=$utils.$each,recharges=$data.recharges,recharge=$data.recharge,i=$data.i,$escape=$utils.$escape,$out='';$out+='<!-- ';
+$each(recharges,function(recharge,i){
 $out+=' <li class="table-view-cell media btn-add-recharge" data-id="';
 $out+=$escape(recharge.id);
 $out+='" data-value="';
@@ -1827,8 +1828,19 @@ $out+='" data-index="';
 $out+=$escape(i);
 $out+='" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button> </li> ';
 });
+$out+='--> ';
+$each(recharges,function(recharge,i){
+$out+=' <li class="media btn-add-recharge" data-id="';
+$out+=$escape(recharge.id);
+$out+='" data-value="';
+$out+=$escape(recharge.denomination);
+$out+='" data-index="';
+$out+=$escape(i);
+$out+='"> <div></div> <span>立即充值>>></span> </li> ';
+});
+$out+=' ';
 return new String($out);
-});/*v:3*/
+});/*v:5*/
 template('recharge/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,include=function(filename,data){data=data||$data;var text=$utils.$include(filename,data,$filename);$out+=text;return $out;},$out='';if(showNavBar ){
@@ -1836,7 +1848,7 @@ $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div cl
 $out+=$escape(title);
 $out+='</h1> </header> ';
 }
-$out+=' <div class="content"> <div class="box-container box box-vertical"> <div id="rechargeScroll" class="scroll-container box-flex-1"> <ul class="table-view list-content" style="padding-top: 5px;padding-bottom: 5px"> ';
+$out+=' <div class="content"> <div class="box-container box box-vertical"> <div id="rechargeScroll" class="scroll-container box-flex-1"> <img src="http://odulvej8l.bkt.clouddn.com/1101%E5%85%85%E5%80%BC%E5%8D%A1.jpg" style="width: 100%;"> <ul class="table-view list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px"> ';
 include('./cell');
 $out+=' </ul> </div> </div> </div>';
 return new String($out);

+ 99 - 91
www/webapp/o2o/js/page/rechargee.js

@@ -1,104 +1,112 @@
 define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
 
-    function back(event) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: '',
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: '',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
 
-    return {
-        title: '充值卡',
-        body: '',
-        init: function (pageData, dtd) {
-            /* this是什么? */
-            var $view = this;
-            var $doc = $(document);
+	return {
+		title: '充值卡',
+		body: '',
+		init: function (pageData, dtd) {
+			/* this是什么? */
+			var $view = this;
+			var $doc = $(document);
 
-            /* 定义按钮事件。
-             * 为什么不是$(selector).onclick(function)呢?
-             */
+			/* 定义按钮事件。
+			 * 为什么不是$(selector).onclick(function)呢?
+			 */
 
-            // 返回
-            $view.on('swipeRight', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            });
+			// 返回
+			$view.on('swipeRight', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			});
 
-            $.newTouch('.back-button', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            }, $view);
+			$.newTouch('.back-button', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			}, $view);
 
-            $view.on('tapBackButton', function (event) {
-                //back.call(this, event);
-                history.go(-1);
-            });
+			$view.on('tapBackButton', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			});
 
-            // 点击充值
-            $.newTouch('.btn-add-recharge', function (event) {
-                event.preventDefault();
-                $doc.trigger('spa:openloader');
-                var value = $(this).attr('data-value');
-                recharge.addRechargeorder({
-                    user_id: user.id,
-                    recharge_id: $(this).attr('data-id')
-                }, function (res) {
-                    $doc.trigger('spa:closeloader');
-                    if (res.success) {
-                        // 更新user的订单
-                        user.orders[1].data.push({
-                            id: res.data._id.$id,
-                            products: [{ product:{name: '充值' + value + '元'}}],
-                            final_price: res.data.price
-                        });
-                        // 只能用现金支付,跳转到pay页面
-                        $doc.trigger('spa:navigate', {
-                            hash: 'pay',
-                            pushData: {
-                                isRecharge: true,
-                                orderID: res.data._id.$id,
-                                backHash: 'recharge'
-                            }
-                        });
-                    }
-                });
-            }, $view);
+			// 点击充值
+			$.newTouch('.btn-add-recharge', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:openloader');
+				var value = $(this).attr('data-value');
+				recharge.addRechargeorder({
+					user_id: user.id,
+					recharge_id: $(this).attr('data-id')
+				}, function (res) {
+					$doc.trigger('spa:closeloader');
+					if (res.success) {
+						// 更新user的订单
+						user.orders[1].data.push({
+							id: res.data._id.$id,
+							products: [{product: {name: '充值' + value + '元'}}],
+							final_price: res.data.price
+						});
+						// 只能用现金支付,跳转到pay页面
+						$doc.trigger('spa:navigate', {
+							hash: 'pay',
+							pushData: {
+								isRecharge: true,
+								orderID: res.data._id.$id,
+								backHash: 'recharge'
+							}
+						});
+					}
+				});
+			}, $view);
 
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            dtd.resolve();
-        },
-        afteropen: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
+			dtd.resolve();
+		},
+		beforeopen: function (pageData, dtd) {
+			dtd.resolve();
+		},
+		afteropen: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
 
-            if (!pageData.pushData.dontNeedReload) {
-                $doc.trigger('spa:openloader');
-                recharge.getRechargeList(function (res) {
-                    $doc.trigger('spa:closeloader');
-                    if (res.success) {
-                        var tpl = template('recharge/index', {
-                            showNavBar: !config.isWX,
-                            recharges: res.data
-                        });
-                        $('.spa-page-body', $view).html(tpl);
+			if (!pageData.pushData.dontNeedReload) {
+				$doc.trigger('spa:openloader');
+				recharge.getRechargeList(function (res) {
+					$doc.trigger('spa:closeloader');
+					if (res.success) {
+						console.log(res.data);
+						var tpl = template('recharge/index', {
+							showNavBar: !config.isWX,
+							recharges: res.data
+						});
+						$('.spa-page-body', $view).html(tpl);
 
-                        setTimeout(function () {
-                            pageData.scroll = new IScroll('#rechargeScroll');
-                        }, 500);
-                    }
-                });
-            }
+						//var value = $(this).attr('data-value');
+						var value = $('.btn-add-recharge').attr('data-index');
+						for(var i=value;i<2;i++){
 
-            dtd.resolve();
-        },
-        beforeclose: function (pageData, dtd) {
-            dtd.resolve();
-        }
-    }
+						}
+						console.log(value);
+						setTimeout(function () {
+
+							pageData.scroll = new IScroll('#rechargeScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
 })

+ 12 - 1
www/webapp/o2o/tpl/recharge/cell.html

@@ -1,3 +1,4 @@
+<!--
 {{ 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">
@@ -15,4 +16,14 @@
     </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 }}-->
+
+
+
+{{ 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>
+{{ /each }}

+ 2 - 1
www/webapp/o2o/tpl/recharge/index.html

@@ -9,7 +9,8 @@
 <div class="content">
     <div class="box-container box box-vertical">
         <div id="rechargeScroll" class="scroll-container box-flex-1">
-            <ul class="table-view list-content" style="padding-top: 5px;padding-bottom: 5px">
+            <img src="http://odulvej8l.bkt.clouddn.com/1101%E5%85%85%E5%80%BC%E5%8D%A1.jpg" style="width: 100%;">
+            <ul class="table-view list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
                 {{include './cell'}}
             </ul>
         </div>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません