@@ -1,11 +1,11 @@
// const BaseApi = 'http://192.168.2.190:8080' //汪瑶
// const BaseApi = 'http://192.168.2.205:8080' //汪辉
// const BaseApi = 'http://192.168.2.19:8080' //李勇
-// const BaseApi = 'http://192.168.3.13:8080' //徐涛
+const BaseApi = 'http://192.168.3.13:8080' //徐涛
// const BaseApi = 'http://192.168.2.39:8080' //肖添伟
// const BaseApi = 'http://192.168.3.6:8080' //朱壮波
-const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
+//const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
export {
BaseApi
@@ -125,7 +125,7 @@
// if(opt.merchantName ){
// this.merchantName =opt.merchantName ;
// }
- this.merchantType=opt.merchantType:4;
+ this.merchantType=opt.merchantType||4;
this.getData();
this.getList();
this.getType()