Merge branch 'feature/cart' into 'release/5.4.1'

支付相关配置添加



See merge request !219

@@ -9,6 +9,22 @@
 const isProduction = process.env.NODE_ENV === 'production';
 const isTest = process.env.NODE_ENV === 'test';
 
+const domains = {
+    api: 'http://api-test3.yohops.com:9999/',
+    service: 'http://service-test3.yohops.com:9999/',
+    liveApi: 'http://testapi.live.yohops.com:9999/',
+    singleApi: 'http://api-test3.yohops.com:9999/',
+
+    // api: 'http://dev-api.yohops.com:9999/',
+    // service: 'http://dev-service.yohops.com:9999/',
+    // liveApi: 'http://api.live.yoho.cn/',
+    // singleApi: 'http://single.yoho.cn/',
+
+    imSocket: 'wss://imsocket.yohobuy.com:443',
+    imCs: 'https://imhttp.yohobuy.com/api',
+    imServer: 'https://imhttp.yohobuy.com/server'
+};
+
 module.exports = {
     app: 'h5',
     appVersion: '5.4', // 调用api的版本
@@ -16,21 +32,7 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     testCode: 'yoho4946abcdef#$%&!@',
-    domains: {
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        liveApi: 'http://testapi.live.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/',
-
-        // api: 'http://dev-api.yohops.com:9999/',
-        // service: 'http://dev-service.yohops.com:9999/',
-        // liveApi: 'http://api.live.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/',
-
-        imSocket: 'wss://imsocket.yohobuy.com:443',
-        imCs: 'https://imhttp.yohobuy.com/api',
-        imServer: 'https://imhttp.yohobuy.com/server'
-    },
+    domains: domains,
     subDomains: {
         host: '.m.yohobuy.com',
         default: '//m.yohobuy.com',
@@ -91,20 +93,20 @@ module.exports = {
         service: 'alipay.wap.create.direct.pay.by.user',
         partner: '2088701661478015',
         inputCharset: 'utf-8',
-        notifyUrl: 'payment/alipay_notify',
+        notifyUrl: domains.service + 'payment/alipay_notify',
         returnUrl: '/shopping/pay/aliwapreturn',
         signType: 'MD5',
         paymentType: '1',
         alipayKey: 'kcxawi9bb07mzh0aq2wcirsf9znusobw',
         sellerMail: 'zfb@yoho.cn',
-        merchantUrl: 'http://m.yohobuy.com/home/orders/detail?order_code='
+        merchantUrl: 'http://m.yohobuy.com/home/orderDetail?order_code='
     },
     WxPayConfig: {
         appId: 'wx75e5a7c0c88e45c2',
         mchId: '1227694201',
         key: '7e6f3307b64cc87c79c472814b88f7fb',
         appSecret: 'ce21ae4a3f93852279175a167e54509b',
-        notifyUrl: 'payment/alipay_notify',
+        notifyUrl: domains.service + 'payment/weixin_notify',
     }
 };
 
@@ -135,7 +137,27 @@ if (isProduction) {
             open: false,
             url: 'http://123.206.2.55/strategy'
         },
-        zookeeperServer: 'web.zookeeper.yohoops.org:2181'
+        zookeeperServer: 'web.zookeeper.yohoops.org:2181',
+        alipayConfig: {
+            payUrl: 'https://mapi.alipay.com/gateway.do',
+            service: 'alipay.wap.create.direct.pay.by.user',
+            partner: '2088701661478015',
+            inputCharset: 'utf-8',
+            notifyUrl: 'http://service.yoho.yohoops.org/payment/alipay_notify',
+            returnUrl: '/shopping/pay/aliwapreturn',
+            signType: 'MD5',
+            paymentType: '1',
+            alipayKey: 'kcxawi9bb07mzh0aq2wcirsf9znusobw',
+            sellerMail: 'zfb@yoho.cn',
+            merchantUrl: 'http://m.yohobuy.com/home/orderDetail?order_code='
+        },
+        WxPayConfig: {
+            appId: 'wx75e5a7c0c88e45c2',
+            mchId: '1227694201',
+            key: '7e6f3307b64cc87c79c472814b88f7fb',
+            appSecret: 'ce21ae4a3f93852279175a167e54509b',
+            notifyUrl: 'http://service.yoho.yohoops.org/payment/weixin_notify',
+        }
     });
 } else if (isTest) {
     Object.assign(module.exports, {
@@ -158,6 +180,26 @@ if (isProduction) {
             reconnect: 5000,
             retries: 0
         },
-        useCache: true
+        useCache: true,
+        alipayConfig: {
+            payUrl: 'https://mapi.alipay.com/gateway.do',
+            service: 'alipay.wap.create.direct.pay.by.user',
+            partner: '2088701661478015',
+            inputCharset: 'utf-8',
+            notifyUrl: (process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/') + 'payment/alipay_notify',
+            returnUrl: '/shopping/pay/aliwapreturn',
+            signType: 'MD5',
+            paymentType: '1',
+            alipayKey: 'kcxawi9bb07mzh0aq2wcirsf9znusobw',
+            sellerMail: 'zfb@yoho.cn',
+            merchantUrl: 'http://m.yohobuy.com/home/orderDetail?order_code='
+        },
+        WxPayConfig: {
+            appId: 'wx75e5a7c0c88e45c2',
+            mchId: '1227694201',
+            key: '7e6f3307b64cc87c79c472814b88f7fb',
+            appSecret: 'ce21ae4a3f93852279175a167e54509b',
+            notifyUrl: (process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/') + 'payment/weixin_notify',
+        }
     });
 }

@@ -81,7 +81,7 @@ $addressForm.on('submit', function() {
     isSubmiting = true;
     loading.showLoadingMask();
     $submit.css('background', '#777');
-    console.log(window.queryString.refer);
+
     $.ajax({
         method: 'POST',
         url: '/home/saveAddress',