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

www/protected/modules/common/controllers/ActivityController.php

@@ -19,9 +19,8 @@ class ActivityController extends O2oBaseController  {
         $code = Yii::app()->getRequest()->getParam("code");
         $state = Yii::app()->getRequest()->getParam("state");
         $home_page = Yii::app()->getRequest()->getParam("home_page",'');
-        $userId = '';
+        $userId = Yii::app()->request->getParam('userId','');
         $appToken = '';
-        var_dump($code);
         if($code && $state){
             $accessInfo = CommonWeixin::getAccessInfo($code);
             $userId = '';
@@ -87,17 +86,17 @@ class ActivityController extends O2oBaseController  {
         $coupon_id =new MongoId($coupon_id);
         $start_time = time();                 //发放优惠券可用开始时间
         $end_time = $start_time + 86400*30;   //发放优惠券过期时间
-        if (CommonFn::isMongoId($coupon_id) && !$coupon_id) {
-            if (CommonFn::isMongoId($userId) && !$userId) {
-                Service::factory('CouponService')->giveCoupon($userId, $coupon_id, $start_time, $end_time);//发放代金券
-                $this->render('index');exit;
+        if ($userId != ""){
+            if (!CommonFn::isMongoId($userId)) {
+                $userId = new MongoId($userId);
             }
+            Service::factory('CouponService')->giveCoupon($userId, $coupon_id, $start_time, $end_time);//发放代金券
+
         }
+
         if($home_page){
-            var_dump($user->_id);exit;
             $this->renderpartial('index');
         }else{
-            var_dump($coupon_id);
             $this->renderpartial('getCoupon', array(
                 'version' => '2015111601',
                 'debug' => 'false',
@@ -114,7 +113,6 @@ class ActivityController extends O2oBaseController  {
 
     //检查微信登录页
     public function actionWxIndex() {
-
         $wxConfig = Yii::app()->params['wxConfig'];
         $home_page = Yii::app()->getRequest()->getParam("home_page",'');
         $coupon_id = Yii::app()->request->getParam('coupon_id', '');

www/protected/modules/common/views/activity/getCoupon.php

@@ -30,6 +30,7 @@
         <div class="bg"></div>
         <span class="ball"></span>
         <span class="ball"></span>
+
     </div>
 </div>
 
@@ -47,6 +48,7 @@
             }
         }
         ?>
+
         if (ua.match(/MicroMessenger/i) == 'micromessenger') {
             <?php
             if(!empty($userId) && !empty($appToken)){
@@ -56,17 +58,8 @@
           ';
             }
             ?>
-            var userID = localStorage.getItem('wxUserID');
-            var appToken = localStorage.getItem('appToken');
-
-            if (!userID || !appToken) {
-                localStorage.clear();
-                location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id='.$coupon_id; ?>';
-            } else {
-                localStorage.clear();
-                location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id='.$coupon_id; ?>';
-
-            }
+            location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id='.$coupon_id; ?>';
+            
             document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
         }
         if (location.hash == '#rd') {

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

@@ -17,9 +17,10 @@
     (function(){
         var codeURI = '<?php echo $codeURI; ?>';
         var appURI = '<?php echo $appURI; ?>';
+
         var wxUserID = localStorage.getItem('wxUserID');
         if (wxUserID) {
-            location.href = appURI;
+            location.href = appURI+'&userId='+wxUserID;
         } else {
             location.href = codeURI;
         }

www/webapp/common/js/native.js

@@ -11,6 +11,7 @@ var NativeDataAdapter;
 define(function (require) {
     var helper = require('helper');
     var config = require('config');
+    var pingpp = require('pingpp');
     //客户端接口类
     function NativeApi() {
         if (typeof NativeApi.instance === 'object') {
@@ -212,19 +213,18 @@ define(function (require) {
                 },
                 wx: function () {
                     if (config.test) {
-                        require(['pingpp'], function () {
-                            pingpp.createPayment(params.charge, function (result, err) {
-                                if (result) {
-                                    var res = {
-                                        success: true
-                                    }
-                                    callback(res);
-                                }
+                        console.log(params)
+                        pingpp.createPayment(params.charge, function (result, err) {
+                            if (result) {
+                                var res = {
+                                    success: true
+                                };
+                                callback(res);
+                            }
+                            if (err) {
                                 console.log(err);
-                                // 处理错误信息
-                            });
-                            return;
-                        })
+                            }
+                        });
                     }
                     var option = params['charge'].credential.wx_pub;
                     var prepay = option["package"].replace('prepay_id=', '');

www/webapp/common/js/ping_pay.js

@@ -1,316 +0,0 @@
-(function(){
-var
-  version = "2.0.6",
-  hasOwn = {}.hasOwnProperty,
-  PingppSDK = function(){},
-  cfg = {
-    PINGPP_NOTIFY_URL: 'https://api.pingxx.com/notify/charges/',
-    UPACP_WAP_URL: 'https://gateway.95516.com/gateway/api/frontTransReq.do',
-    ALIPAY_WAP_URL: 'http://wappaygw.alipay.com/service/rest.htm',
-    UPMP_WAP_URL: 'uppay://uppayservice/?style=token&paydata=',
-    JDPAY_WAP_URL: 'https://m.jdpay.com/wepay/web/pay',
-    BFB_SUCCESS: '<html><head><meta name="VIP_BFB_PAYMENT" content="BAIFUBAO"></head><body></body></html>',
-    YEEPAY_WAP_URL: 'https://ok.yeepay.com/paymobile/api/pay/request',
-    YEEPAY_WAP_TEST_URL: 'http://mobiletest.yeepay.com/paymobile/api/pay/request',
-    PINGPP_MOCK_URL: 'http://sissi.pingxx.com/mock.php'
-  },
-  channels = {
-    alipay_wap: 'alipay_wap',
-    upmp_wap: 'upmp_wap',
-    upacp_wap: 'upacp_wap',
-    bfb_wap: 'bfb_wap',
-    wx_pub: 'wx_pub',
-    yeepay_wap: 'yeepay_wap',
-    jdpay_wap: 'jdpay_wap'
-  };
-
-PingppSDK.prototype = {
-
-  version: version,
-
-  _resultCallback: undefined,
-
-  _jsApiParameters: {},
-
-  _debug: false,
-
-  _signature: undefined,
-
-  createPayment: function(charge_json, callback, signature, debug) {
-    if (typeof callback == "function") {
-      this._resultCallback = callback;
-    }
-    if (typeof signature != "undefined") {
-      this._signature = signature;
-    }
-    if (typeof debug == "boolean") {
-      this._debug = debug;
-    }
-    var charge;
-    if(typeof charge_json == "string"){
-      try{
-        charge = JSON.parse(charge_json);
-      }catch(err){
-        this._innerCallback("fail", this._error("json_decode_fail"));
-        return;
-      }
-    }else{
-      charge = charge_json;
-    }
-    if(typeof charge == "undefined"){
-      this._innerCallback("fail", this._error("json_decode_fail"));
-      return;
-    }
-    if(!hasOwn.call(charge, 'id')){
-      this._innerCallback("fail", this._error("invalid_charge", "no_charge_id"));
-      return;
-    }
-    if(!hasOwn.call(charge, 'channel')){
-      this._innerCallback("fail", this._error("invalid_charge", "no_channel"));
-      return;
-    }
-    var channel = charge['channel'];
-    if(!hasOwn.call(charge, 'credential')){
-      this._innerCallback("fail", this._error("invalid_charge", "no_credential"));
-      return;
-    }
-    if (!charge['credential']) {
-      this._innerCallback("fail", this._error("invalid_credential", "credential_is_undefined"));
-      return;
-    }
-    if (!hasOwn.call(channels, channel)) {
-      this._innerCallback("fail", this._error("invalid_charge", "no_such_channel:" + channel));
-      return;
-    }
-    if (!hasOwn.call(charge['credential'], channel)) {
-      this._innerCallback("fail", this._error("invalid_credential", "no_valid_channel_credential"));
-      return;
-    }
-    if(!hasOwn.call(charge, 'livemode')){
-      this._innerCallback("fail", this._error("invalid_charge", "no_livemode"));
-      return;
-    }
-    if (charge['livemode'] == false) {
-      this._testModeNotify(charge);
-      return;
-    }
-    var credential = charge['credential'][channel];
-    if (channel == channels.upmp_wap) {  // 调起银联支付控件，客户端需要安装银联支付控件才能调起
-      location.href = cfg.UPMP_WAP_URL + credential['paydata'];
-    } else if (channel == channels.upacp_wap) {
-      form_submit(cfg.UPACP_WAP_URL, 'post', credential);
-    } else if (channel == channels.alipay_wap) {  // 调起支付宝手机网页支付
-      credential['_input_charset'] = 'utf-8';
-      if (typeof _AP != "undefined") {
-        var query = stringify_data(credential, channel, true);
-        _AP.pay(cfg.ALIPAY_WAP_URL + "?" + query);
-      } else {
-        form_submit(cfg.ALIPAY_WAP_URL, 'get', credential);
-      }
-    } else if (channel == channels.bfb_wap) {
-      if (!hasOwn.call(credential, 'url')) {
-        this._innerCallback("fail", this._error("invalid_credential", "missing_field:url"));
-        return;
-      }
-      location.href = credential['url'] + '?' + stringify_data(credential, channel);
-    } else if (channel == channels.yeepay_wap) {
-      var fields = ["merchantaccount", "encryptkey", "data"];
-      for(var k in fields){
-        if(typeof fields[k] !== "function" && !hasOwn.call(credential, fields[k])){
-          this._innerCallback("fail", this._error("invalid_credential", "missing_field_"+fields[k]));
-          return;
-        }
-      }
-      if (hasOwn.call(credential, "mode") && credential["mode"] == "test") {
-        location.href = cfg.YEEPAY_WAP_TEST_URL + '?' + stringify_data(credential, channel, true);
-      } else {
-        location.href = cfg.YEEPAY_WAP_URL + '?' + stringify_data(credential, channel, true);
-      }
-    } else if (channel == channels.wx_pub) {
-      var fields = ["appId", "timeStamp", "nonceStr", "package", "signType", "paySign"];
-      for (var k in fields) {
-        if (typeof fields[k] !== "function" && !hasOwn.call(credential, fields[k])) {
-          this._innerCallback("fail", this._error("invalid_credential", "missing_field_"+fields[k]));
-          return;
-        }
-      }
-      this._jsApiParameters = credential;
-      this._callpay();
-    } else if (channel == channels.jdpay_wap) {
-      form_submit(cfg.JDPAY_WAP_URL, 'post', credential);
-    }
-  },
-
-  _jsApiCall: function(){
-    var self = this;
-    if(self._jsApiParameters != {}){
-      WeixinJSBridge.invoke(
-        'getBrandWCPayRequest',
-        self._jsApiParameters,
-        function(res){
-          if(res.err_msg == 'get_brand_wcpay_request:ok'){
-            self._innerCallback("success");
-          }else if(res.err_msg == 'get_brand_wcpay_request:cancel'){
-            self._innerCallback("cancel");
-          }else{
-            self._innerCallback("fail", self._error("wx_result_fail", res.err_msg));
-          }
-        }
-      );
-    }
-  },
-
-  _callpay: function(){
-    var self = this;
-    if (typeof wx != "undefined" && typeof self._signature != "undefined") {
-      var wxConfigFailed = false;
-      wx.config({
-        debug: self._debug,
-        appId: self._jsApiParameters["appId"],
-        timestamp: self._jsApiParameters["timeStamp"],
-        nonceStr: self._jsApiParameters["nonceStr"],
-        signature: self._signature,
-        jsApiList: ['chooseWXPay']
-      });
-      wx.ready(function(){
-        if (wxConfigFailed) {
-          return;
-        }
-        wx.chooseWXPay({
-          timestamp: self._jsApiParameters["timeStamp"],
-          nonceStr: self._jsApiParameters["nonceStr"],
-          "package": self._jsApiParameters["package"],
-          signType: self._jsApiParameters["signType"],
-          paySign: self._jsApiParameters["paySign"],
-          success: function(res) {
-            if (res.errMsg == "chooseWXPay:ok") {
-              self._innerCallback("success");
-            } else {
-              self._innerCallback("fail", self._error("wx_result_fail", res.errMsg));
-            }
-          },
-          cancel: function(res) {
-            self._innerCallback("cancel");
-          },
-          fail: function(res) {
-            self._innerCallback("fail", self._error("wx_result_fail", res.errMsg));
-          }
-        });
-      });
-      wx.error(function(res){
-        wxConfigFailed = true;
-        self._innerCallback("fail", self._error("wx_config_error", res.errMsg));
-      });
-    } else if (typeof WeixinJSBridge == "undefined") {
-      function eventCallback(){
-        self._jsApiCall();
-      }
-      if (document.addEventListener) {
-        document.addEventListener('WeixinJSBridgeReady', eventCallback, false);
-      } else if(document.attachEvent) {
-        document.attachEvent('WeixinJSBridgeReady', eventCallback);
-        document.attachEvent('onWeixinJSBridgeReady', eventCallback);
-      }
-    }else{
-      this._jsApiCall();
-    }
-  },
-
-  _error: function(msg, extra) {
-    msg = (typeof msg == "undefined") ? "" : msg;
-    extra = (typeof extra == "undefined") ? "" : extra;
-    return {
-      msg:msg,
-      extra:extra
-    };
-  },
-
-  _innerCallback: function(result, err) {
-    if (typeof this._resultCallback == "function") {
-      if (typeof err == "undefined") {
-        err = this._error();
-      }
-      this._resultCallback(result, err);
-    }
-  },
-
-  _testModeNotify: function(charge) {
-    var self = this;
-    if (charge['channel'] == channels.wx_pub) {
-      var dopay = confirm("模拟付款？");
-      if (dopay) {
-        var request = new XMLHttpRequest();
-        request.open('GET', cfg.PINGPP_NOTIFY_URL+charge['id']+'?livemode=false', true);
-        request.onload = function() {
-          if (request.status >= 200 && request.status < 400 && request.responseText == "success"){
-            self._innerCallback("success");
-          } else {
-            var extra = 'http_code:'+request.status+';response:'+request.responseText;
-            self._innerCallback("fail", self._error("testmode_notify_fail", extra));
-          }
-        };
-        request.onerror = function() {
-          self._innerCallback("fail", self._error("network_err"));
-        };
-        request.send();
-      } else {
-        self._innerCallback("cancel");
-      }
-    } else {
-      var params = {
-        'ch_id': charge['id'],
-        'scheme': 'http',
-        'channel': charge['channel']
-      };
-      if (hasOwn.call(charge, 'order_no')) {
-        params['order_no'] = charge['order_no'];
-      }
-      if (hasOwn.call(charge, 'extra')) {
-        params['extra'] = encodeURIComponent(JSON.stringify(charge['extra']));
-      }
-      location.href = cfg.PINGPP_MOCK_URL+'?'+stringify_data(params);
-    }
-  }
-};
-
-function form_submit(url, method, params) {
-  var form = document.createElement("form");
-  form.setAttribute("method", method);
-  form.setAttribute("action", url);
-
-  for (var key in params) {
-    if (hasOwn.call(params, key)) {
-      var hiddenField = document.createElement("input");
-      hiddenField.setAttribute("type", "hidden");
-      hiddenField.setAttribute("name", key);
-      hiddenField.setAttribute("value", params[key]);
-      form.appendChild(hiddenField);
-    }
-  }
-
-  document.body.appendChild(form);
-  form.submit();
-}
-
-function stringify_data(data, channel, urlencode) {
-  if (typeof urlencode == "undefined") {
-    urlencode = false;
-  }
-  var output = [];
-  for (var i in data) {
-    if (channel == "bfb_wap" && i == "url") {
-      continue;
-    }
-    if (channel == "yeepay_wap" && i == "mode") {
-      continue;
-    }
-    output.push(i + '=' + (urlencode ? encodeURIComponent(data[i]) : data[i]));
-  }
-  return output.join('&');
-}
-
-PingppSDK.prototype.payment = PingppSDK.prototype.createPayment;
-window.pingpp = new PingppSDK();
-// aliases
-window.PINGPP_PAY_SDK = window.PINGPP_WX_PUB = window.pingpp;
-})();

www/webapp/o2o/css/home.css

@@ -18,7 +18,7 @@
 .spa-page-home .main-service-box .the-main-figure img {
     width: 100%;
     /*width: 100%;*/
-    margin: -30px 0 -15px 0;
+    margin: -4% 0 -6% 0;
 }
 
 .spa-page-home .global-msg {

www/webapp/o2o/dist/js/build.txt

@@ -3,6 +3,7 @@ main.js
 ----------------
 config.js
 helper.js
+pingpp.js
 storage.js
 base.js
 api.js

www/webapp/o2o/js/model/product.js

@@ -77,6 +77,36 @@ define(['base', '$', 'api'], function (base, $, api) {
                         url: "http://oduj3utzz.bkt.clouddn.com/ada69b8adb17b1475912214579.png",
                         width: 720,
                         height: 1129
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/rcqj_xqy_03.jpg",
+                        width: 720,
+                        height: 1127
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/03c6e0266e4661475977941220.png",
+                        width: 720,
+                        height: 1178
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/1e3638af93cab1475977951089.jpg",
+                        width: 720,
+                        height: 1246
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/cfd996a3783d11475977959884.png",
+                        width: 720,
+                        height: 520
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/d67ff4fcad4bc1475977977827.png",
+                        width: 720,
+                        height: 644
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/78ce92ec0d52d1475977966417.png",
+                        width: 720,
+                        height: 644
                     }
                 ]
             },
@@ -146,6 +176,16 @@ define(['base', '$', 'api'], function (base, $, api) {
                         url: "http://oduj3utzz.bkt.clouddn.com/0ef470cf13ea51475914131334.jpg",
                         width: 720,
                         height: 786
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/341746e8065381475978339748.jpg",
+                        width: 720,
+                        height: 832
+                    },
+                    {
+                        url: "http://oduj3utzz.bkt.clouddn.com/beb99ec9850041475978342874.jpg",
+                        width: 720,
+                        height: 1178
                     }
                 ]
             },

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function(ba
     }
     User.instance = this;
     this.storagePrefix = 'user_';
-    this.id = '57e22bb59f5160c2048b456c'; //57e22bb59f5160c2048b456c
+    this.id = ''; //57e22bb59f5160c2048b456c
     this.lastID = this.getCache('lastID', null, '');
     this.name = '';
     this.mobile = '';

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

@@ -131,9 +131,9 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
             if (pageData.pushData && pageData.pushData.needReset) {
                 var addressStr = '';
                 var defaultAddress = address.defaultAddress;
-                if (defaultAddress.address.poi) {
+                if (defaultAddress && defaultAddress.address && defaultAddress.address.poi) {
                     addressStr = defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.poi.name + defaultAddress.address.detail
-                } else {
+                } else if (defaultAddress && defaultAddress.address) {
                     addressStr = defaultAddress.address.province + defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail
                 }
 

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

@@ -20,7 +20,7 @@
                             <div class="title-column-left box-container">
                                 <div class="title-container-square">
                                     <div class="the-main-figure">
-                                        <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/>
+                                        <img src="http://odulvej8l.bkt.clouddn.com/Home_image_3.jpg" alt=""/>
                                     </div>
                                 </div>
                             </div>

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

@@ -11,7 +11,7 @@
         <div id="mineScroll" class="scroll-container box-flex-1">
             <div style="color: #59616c; font-size:18px;">
                 <div style="width: 100%;">
-                    <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" style="width: 100%;"/>
+                    <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" style="width: 100%;margin-top: -10%;"/>
                     <div style="width: 100%; padding-top: 20px; padding-bottom: 20px; text-align: center;">{{userName}}</div>
                     <div style="width: 100%; padding-bottom: 20px; text-align: center;">余额：{{userBalance}}元</div>
                 </div>
@@ -47,14 +47,14 @@
                             <!--帮助中心-->
                         <!--</a>-->
                     <!--</li>-->
-                    <!--<li class="table-view-cell">
+                    <li class="table-view-cell">
                         <a class="navigate-right btn-about">
                             <img src="http://oduj3utzz.bkt.clouddn.com/7uo8i7o98ui78o97u89iouio789.png" width="20px" height="20px" style="position: relative; top: 4px;"/>
                             关于壹管家
                         </a>
-                    </li>-->
+                    </li>
                 </ul>
-                <div style="width: 100%; padding-top: 80px;text-align: center; color: #b6bbc2; font-size:16px;">专属管家 服务无忧</div>
+                <div style="width: 100%; padding-top: 12%;text-align: center; color: #b6bbc2; font-size:16px;">专属管家 服务无忧</div>
             </div>
         </div>
     </div>

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

@@ -14,7 +14,7 @@
           <div class="">
             <ul class="table-view">
               <li id="product-pic-bg" class="table-view-cell">
-                <a class="navigate-right product-pic" style="background-image: url({{imgSrc}});">
+                <a class="navigate-right product-pic" style="background-image: url({{imgSrc}});min-height: 250px;background-position: 27% 0;">
                   <div class="product-name">{{title}}详情及评价 <span>&gt;&gt;&gt;</span></div>
                 </a>
               </li>