jmx преди 8 години
родител
ревизия
200e17ecd3

+ 1 - 0
www/webapp/common/js/config.js

@@ -24,6 +24,7 @@ define(function (require) {
   } else {
     apiPath = 'http://api.yiguanjia.me';
   }
+  apiPath = 'http://api.yiguanjia.me';
 
   var ua = navigator.userAgent.toLowerCase();
 

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/config.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
www/webapp/o2o/dist/js/page/mine.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"home",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mineScroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(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){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mineScroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/page/pay.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/page/placeOrder.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){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader"),r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&console.log(e)})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);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:"mine",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader"),r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(t){s.trigger("spa:closeloader"),t.success&&(o.orders[1].data.push({id:t.data._id.$id,products:[{name:e(".denomination",i).text()}],final_price:t.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:t.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()}}});

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

@@ -1370,16 +1370,16 @@ $out+=' </div> </div> </li> <li class="table-view-cell tip">退款将退至您
 $out+=$escape(order.id);
 $out+='">申请退款</div> </div> </div> </div> </div> </div> ';
 return new String($out);
-});/*v:5*/
+});/*v:6*/
 template('pay/index',function($data,$filename
 /**/) {
-'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,orderType=$data.orderType,orderprice=$data.orderprice,chubao=$data.chubao,wxPub=$data.wxPub,showWX=$data.showWX,$out='';if(showNavBar ){
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,orderType=$data.orderType,orderPrice=$data.orderPrice,chubao=$data.chubao,wxPub=$data.wxPub,showWX=$data.showWX,$out='';if(showNavBar ){
 $out+=' <header class="bar bar-nav"> <a class="cancel-button left-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">收银台</h1> </header> ';
 }
 $out+=' <div class="content"> <ul class="table-view "> <li class="table-view-cell order-info"> <a><span>订单类型:</span>';
 $out+=$escape(orderType);
 $out+='</a> <a><span>支付金额:</span>';
-$out+=$escape(orderprice);
+$out+=$escape(orderPrice);
 $out+='元</a> </li> </ul> ';
 if(chubao){
 $out+=' ';
@@ -1396,7 +1396,13 @@ $out+=' </ul> ';
 }
 $out+=' ';
 }
-$out+=' <div class="content-padded "> <a class="btn btn-main btn-block btn-pay" data-pay-channel="alipay">确认支付</a> </div> </div> ';
+$out+=' <div class="content-padded "> <a class="btn btn-main btn-block btn-pay" data-pay-channel="';
+if(wxPub){
+$out+='wx_pub';
+}else{
+$out+='alipay';
+}
+$out+='">确认支付</a> </div> </div> ';
 return new String($out);
 });/*v:1*/
 template('picker/cell',function($data,$filename

+ 1 - 1
www/webapp/o2o/js/page/mine.js

@@ -3,7 +3,7 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config'], function ($, te
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: 'home',
+            hash: '',
             pushData: {
                 dontNeedReload: true
             }

+ 145 - 136
www/webapp/o2o/js/page/pay.js

@@ -1,147 +1,156 @@
 define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, template, api, native, config, user) {
-  function back(backHash) {
-    $(document).trigger('spa:navigate', {
-      hash: backHash,
-      pushData: {
-        dontNeedReload: true,
-        animate: 'slideOutDown' //强制设置动画为落下
-      }
-    });
-  }
 
-  return {
-    title: '壹管家上门服务',
-    body: '',
-    init: function (pageData, dtd) {
-      var $view = this;
-      var $doc = $(document);
-
-      $.newTouch('.pay-option', function (event) {
-        event.preventDefault();
-        var payChannel = $(this).data('value');
-        $('.btn-pay', $view).attr('data-pay-channel', payChannel);
-        $(this).addClass('checked').parent().siblings().find('a').removeClass('checked');
-      }, $view);
+    var backHash; // 回退页面
+    var orderID; // 订单ID
+    var orderType; // 订单类型
+    var orderPrice; // 订单价格
+    var isRecharge = false; // 是否是充值
+
+    function back() {
+        $(document).trigger('spa:navigate', {
+            hash: backHash,
+            pushData: {
+                dontNeedReload: true,
+                animate: 'slideOutDown' //强制设置动画为落下
+            }
+        });
+    }
 
-      $.newTouch('.btn-pay', function (event) {
-        event.preventDefault();
-        var orderID = $view.data('orderID');
-        var orderprice = $view.data('orderprice');
-        var payChannel = $(this).attr('data-pay-channel');
-          if (config.isWX) {
-            payChannel = 'wx_pub';
-          }
-          if (!payChannel) return;
-          $doc.trigger('spa:openloader');
-          api.getPayCharge({
-            user_id: user.id,
-            order_id: orderID,
-            pay_channel: payChannel
-          }, function (res) {
-            $doc.trigger('spa:closeloader');
-            if (res.success) {
-              var orderInfo = user.getOrderInfo(orderID);
-              var params = {
-                orderInfo: orderInfo,
-                charge: res.data
-              }
-                native.pay(params, function (resA) {
-                  if (resA.success) {
-                    $doc.trigger('spa:navigate', {
-                      hash: 'paySuccess'
+    return {
+        title: '壹管家上门服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            // 充值的回调
+            function payResult(res) {
+                $doc.trigger('spa:closeloader');
+                if (res.success) {
+                    var orderInfo = user.getOrderInfo(orderID);
+                    var params = {
+                        orderInfo: orderInfo,
+                        charge: res.data
+                    };
+                    native.pay(params, function (resA) {
+                        if (resA.success) {
+                            $doc.trigger('spa:navigate', {
+                                hash: 'paySuccess'
+                            });
+                        } else {
+                            $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                message: resA.message
+                            }]);
+                        }
                     });
-                  } else {
+                } else {
                     $doc.trigger('spa:openpanel', ['simpleAlert', {
-                      message: resA.message
+                        message: res.message
                     }]);
-                  }
-                });
-              // }
-            } else {
-              $doc.trigger('spa:openpanel', ['simpleAlert', {
-                message: res.message
-              }]);
+                }
             }
-          });
-      }, $view);
-
-      //返回
-      $.newTouch('.cancel-button', function (event) {
-        event.preventDefault();
-
-        back($view.data('backHash'));
-      }, $view);
-
-      $view.on('tapBackButton', function(event) {
-        event.preventDefault();
-
-        back($view.data('backHash'));
-      });
-
-      dtd.resolve();
-    },
-    beforeopen: function(pageData, dtd){
-      var $view = this;
-      var pushData = pageData.pushData;
-      var orderID = pushData.orderID;
-      var backHash = pushData.backHash ? pushData.backHash : '';
-
-      $view.data('backHash', backHash);
-      $view.data('orderID', orderID);
-
-      var orders = user.orders[1].data;
-      var orderType, orderprice;
-      for (var i = 0, len = orders.length; i < len; i++) {
-        if (orders[i].id == orderID) {
-          orderType = orders[i].products[0].name;
-          orderprice = orders[i].final_price;
-        };
-      };
-
-      $view.data('orderprice', orderprice);
-
-      if (config.isAndroid || config.isIOS) {
-        native.isWxAppInstalled(function(res){
-          var showWX = true;
-          if (res.success && !res.isInstalled) {
-            showWX = false;
-          }
-          if (config.appVersion < '2.2') {
-            //微信支付2.2版本以下有问题 隐藏按钮
-            showWX = false;
-          }
-          var tpl = template('pay/index', {
-            showWX: showWX,
-            showNavBar: !config.isWX && !config.isChubao,
-            orderType: orderType,
-            orderprice: orderprice
-          });
-          $('.spa-page-body', $view).html(tpl);
-
-          dtd.resolve();
-        })
-      } else if (config.isChubao) {
-        var tpl = template('pay/index', {
-          showNavBar: !config.isWX && !config.isChubao,
-          orderType: orderType,
-          orderprice: orderprice,
-          chubao: true
-        });
-        $('.spa-page-body', $view).html(tpl);
-        dtd.resolve();
-      } else {
-        var tpl = template('pay/index', {
-          showNavBar: !config.isWX && !config.isChubao,
-          wxPub: true,
-          orderType: orderType,
-          orderprice: orderprice
-        });
-        $('.spa-page-body', $view).html(tpl);
-
-        dtd.resolve();
-      }
 
+            $.newTouch('.pay-option', function (event) {
+                event.preventDefault();
+                var payChannel = $(this).data('value');
+                $('.btn-pay', $view).attr('data-pay-channel', payChannel);
+                $(this).addClass('checked').parent().siblings().find('a').removeClass('checked');
+            }, $view);
+
+            $.newTouch('.btn-pay', function (event) {
+                event.preventDefault();
+                var payChannel = $(this).attr('data-pay-channel');
+                if (config.isWX) {
+                    payChannel = 'wx_pub';
+                }
+                if (!payChannel) return;
+                $doc.trigger('spa:openloader');
+                var params = {
+                    user_id: user.id,
+                    order_id: orderID,
+                    pay_channel: payChannel
+                };
+                if (isRecharge){
+                    api.payRecharge(params, function (res) {
+                        payResult(res)
+                    });
+                }else {
+                    api.getPayCharge(params, function (res) {
+                        payResult(res)
+                    });
+                }
+            }, $view);
+
+            //返回
+            $.newTouch('.cancel-button', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            }, $view);
+            $view.on('tapBackButton', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            });
+
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            var $view = this;
+            var pushData = pageData.pushData;
+            orderID = pushData.orderID;
+            backHash = pushData.backHash ? pushData.backHash : '';
+            isRecharge = pushData.isRecharge;
+
+            // 在用户的所有订单中找出这个订单
+            var orders = user.orders[1].data;
+            for (var i = 0, len = orders.length; i < len; i++) {
+                if (orders[i].id == orderID) {
+                    orderType = orders[i].products[0].name;
+                    orderPrice = orders[i].final_price;
+                }
+            }
 
+            var tpl = template('pay/index', {
+                showNavBar: !config.isWX && !config.isChubao,
+                wxPub: true,
+                orderType: orderType,
+                orderPrice: orderPrice
+            });
+            $('.spa-page-body', $view).html(tpl);
+
+            dtd.resolve();
+
+            // if (config.isAndroid || config.isIOS) {
+            //   native.isWxAppInstalled(function(res){
+            //     var showWX = true;
+            //     if (res.success && !res.isInstalled) {
+            //       showWX = false;
+            //     }
+            //     if (config.appVersion < '2.2') {
+            //       //微信支付2.2版本以下有问题 隐藏按钮
+            //       showWX = false;
+            //     }
+            //     var tpl = template('pay/index', {
+            //       showWX: showWX,
+            //       showNavBar: !config.isWX && !config.isChubao,
+            //       orderType: orderType,
+            //       orderprice: orderprice
+            //     });
+            //     $('.spa-page-body', $view).html(tpl);
+            //
+            //     dtd.resolve();
+            //   })
+            // } else if (config.isChubao) {
+            //   var tpl = template('pay/index', {
+            //     showNavBar: !config.isWX && !config.isChubao,
+            //     orderType: orderType,
+            //     orderprice: orderprice,
+            //     chubao: true
+            //   });
+            //   $('.spa-page-body', $view).html(tpl);
+            //   dtd.resolve();
+            // } else {
+            //
+            // }
+        }
     }
-  }
 })

+ 0 - 1
www/webapp/o2o/js/page/placeOrder.js

@@ -744,7 +744,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 /* 向服务器下订单 */
                 $doc.trigger('spa:openloader');
                 order.balance = user.balance;
-                console.log(user);
                 order.addOrder(user.id, payChannel, function (res) {
                     $doc.trigger('spa:closeloader');
                     if (res.success) {

+ 32 - 16
www/webapp/o2o/js/page/rechargee.js

@@ -3,7 +3,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: '',
+            hash: 'mine',
             pushData: {
                 dontNeedReload: true
             }
@@ -45,7 +45,21 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
                 }, function (res) {
                     $doc.trigger('spa:closeloader');
                     if (res.success) {
-                        console.log(res);
+                        // 更新user的订单
+                        user.orders[1].data.push({
+                            id: res.data._id.$id,
+                            products: [{ name: $('.denomination', $view).text() }],
+                            final_price: res.data.price
+                        });
+                        // 只能用现金支付,跳转到pay页面
+                        $doc.trigger('spa:navigate', {
+                            hash: 'pay',
+                            pushData: {
+                                isRecharge: true,
+                                orderID: res.data._id.$id,
+                                backHash: 'recharge'
+                            }
+                        });
                     }
                 });
             }, $view);
@@ -59,21 +73,23 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
             var $view = this;
             var $doc = $(document);
 
-            $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) {
+                        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);
-                }
-            });
+                        setTimeout(function () {
+                            pageData.scroll = new IScroll('#rechargeScroll');
+                        }, 500);
+                    }
+                });
+            }
 
             dtd.resolve();
         },

+ 2 - 3
www/webapp/o2o/tpl/pay/index.html

@@ -6,12 +6,11 @@
 	<h1 class="title">收银台</h1>
 </header>
 {{ /if }}
-
 <div class="content">
 	<ul class="table-view ">
 		<li class="table-view-cell order-info">
 			<a><span>订单类型:</span>{{orderType}}</a>
-			<a><span>支付金额:</span>{{orderprice}}元</a>
+			<a><span>支付金额:</span>{{orderPrice}}元</a>
 		</li>
 	</ul>
 	{{if chubao}}
@@ -48,6 +47,6 @@
 		{{/if}}
 	{{/if}}
 	<div class="content-padded ">
-		<a class="btn btn-main btn-block btn-pay" data-pay-channel="alipay">确认支付</a>
+		<a class="btn btn-main btn-block btn-pay" data-pay-channel="{{if wxPub}}wx_pub{{else}}alipay{{/if}}">确认支付</a>
 	</div>
 </div>

Някои файлове не бяха показани, защото твърде много файлове са промени