Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods_upload

data/config/config.ini.php

@@ -8,7 +8,8 @@ const stanley_host = 'http://192.168.1.105';
 const stanley_home = 'http://192.168.1.4';
 const boss_host = 'http://172.40.2.14';
 
-$SRV_HOST = stanley_home;
+const jeff_office = 'http://192.168.1.128';
+$SRV_HOST = jeff_office;
 
 $config['base_site_url']        = $SRV_HOST;
 $config['shop_site_url'] 		= $SRV_HOST.'/shop';
@@ -27,7 +28,7 @@ $config['version'] 		= '201502020388';
 $config['setup_date'] 	= '2015-08-22 15:52:34';
 $config['gip'] 			= 0;
 $config['dbdriver'] 	= 'mysqli';
-$config['tablepre']		= 'lrlz_';
+$config['tablepre']		= '33hao_';
 $config['db']['1']['dbhost']       = '127.0.0.1';
 $config['db']['1']['dbport']       = '3306';
 $config['db']['1']['dbuser']       = 'root';

mobile/control/app_pay.php

@@ -16,6 +16,7 @@ require_once (WXPAY_PATH . '/lib/WxPay.Notify.php');
 
 class app_payControl extends mobileHomeControl
 {
+
     public function uniorderOp()
     {
 //        $desc = $_POST['desc'];
@@ -34,7 +35,31 @@ class app_payControl extends mobileHomeControl
         $input->SetTrade_type("APP");//JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里,MICROPAY--刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
         $order = WxPayApi::unifiedOrder($input);
 
-        joutput_data($order);
+        $ret = $this->handle_order($order);
+
+        //$ret['sign'] = $order['sign'];
+        $ret['prepayid'] = $order['prepay_id'];
+        $ret['partnerid'] = WxPayConfig::MCHID;
+
+        joutput_data($ret);
+    }
+
+    private function handle_order($order)
+    {
+        $jsapi = new WxPayJsApiPay();
+        $jsapi->SetAppid($order["appid"]);
+        $timeStamp = time();
+        $jsapi->SetTimeStamp("$timeStamp");
+        $jsapi->SetNonceStr(WxPayApi::getNonceStr());
+        //$jsapi->SetPackage('Sign=WXPay');
+        $jsapi->SetPackage("prepay_id=" . $order['prepay_id']);
+        $jsapi->SetSignType("MD5");
+        //$sign = $jsapi->MakeSign();
+        $jsapi->SetSign();
+
+        $jsapi->SetPaySign($jsapi->MakeSign());
+
+        return $jsapi->GetValues();
     }
 
     public function notifyOp()