Merge branch 'test' of https://git.yidian-inc.com:8021/bp/op-web-service into test

server/config.js

@@ -19,7 +19,7 @@ module.exports = {
   API_INTERNAL_URI: API_INTERNAL_URI[env],
   PANDORA_URI: PANDORA_URI[env],
   GOODS_URI: API_INTERNAL_URI[env],
-  ACTIVITY_URI: API_INTERNAL_URI['production'],
+  ACTIVITY_URI: API_INTERNAL_URI[env],
   WITHDRAWAL_URI: API_INTERNAL_URI[env],
-  GROUPMEAL_URI: API_INTERNAL_URI['production'],
+  GROUPMEAL_URI: API_INTERNAL_URI[env],
 };

src/pages/Groupmeal/Distrib/index.vue

@@ -363,14 +363,14 @@ export default {
     // 下载路线
     handleDownload(url) {
       // url && window.open("http://bp-dev.ini.yidian-inc.com" + url);
-      var ENV = "http://bp.int.yidian-inc.com/";
-      // if (process.env.NODE_ENV == "development") {
-      //   ENV = "http://bp-dev.ini.yidian-inc.com/";
-      // } else if (process.env.NODE_ENV == "test") {
-      //   ENV = "http://bp-test.ini.yidian-inc.com/";
-      // } else {
-      //   ENV = "http://bp.ini.yidian-inc.com/";
-      // }
+      var ENV;
+      if (process.env.NODE_ENV == "development") {
+        ENV = "http://bp-dev.ini.yidian-inc.com/";
+      } else if (process.env.NODE_ENV == "test") {
+        ENV = "http://bp-test.ini.yidian-inc.com/";
+      } else {
+        ENV = "http://bp.ini.yidian-inc.com/";
+      }
       url && window.open(ENV + url);
     },
     // 分配保存

src/service/Groupmeal/groupmeal.js

@@ -106,14 +106,14 @@ export async function orderRefundReject(params) {
 
 // 导出订单
 export function getOrderExportURL(eventId, type) {
-  var ENV = "http://bp.int.yidian-inc.com/";
-  // if(process.env.NODE_ENV == "development"){
-  //   ENV = "http://bp-dev.ini.yidian-inc.com/"
-  // }else if(process.env.NODE_ENV == "test"){
-  //   ENV = "http://bp-test.ini.yidian-inc.com/"
-  // }else{
-  //   ENV = "http://bp.ini.yidian-inc.com/"
-  // }
+  var ENV;
+  if(process.env.NODE_ENV == "development"){
+    ENV = "http://bp-dev.ini.yidian-inc.com/"
+  }else if(process.env.NODE_ENV == "test"){
+    ENV = "http://bp-test.ini.yidian-inc.com/"
+  }else{
+    ENV = "http://bp.ini.yidian-inc.com/"
+  }
   return `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
 }
 
@@ -184,13 +184,13 @@ export async function newOrderRefundReject(params) {
 
 // 导出订单
 export function newGetOrderExportURL(eventId, type) {
-  var ENV = 'http://bp.int.yidian-inc.com/'
-  // if(process.env.NODE_ENV == "development"){
-  //   ENV = "http://bp-dev.ini.yidian-inc.com/"
-  // }else if(process.env.NODE_ENV == "test"){
-  //   ENV = "http://bp-test.ini.yidian-inc.com/"
-  // }else{
-  //   ENV = "http://bp.ini.yidian-inc.com/"
-  // }
+  var ENV;
+  if(process.env.NODE_ENV == "development"){
+    ENV = "http://bp-dev.ini.yidian-inc.com/"
+  }else if(process.env.NODE_ENV == "test"){
+    ENV = "http://bp-test.ini.yidian-inc.com/"
+  }else{
+    ENV = "http://bp.ini.yidian-inc.com/"
+  }
   return `${ENV}order/background/order_export?marketing_id=${eventId}&type=${type}`;
 }