地址

packageA/orderForm/index.js

@@ -212,11 +212,6 @@ Page({
     }, 300);
   },
   createOrder() {
-<<<<<<< HEAD
-    wx.navigateTo({
-      url: '/packageA/orderForm/add/add?type=标准订单',
-    })
-=======
     let orderList = this.data.orderList;
     if (this.data.brandList.length == 1 && this.data.filtratelist[1].list.length == 1 && orderList.length == 1) {
       wx.showModal({
@@ -258,6 +253,5 @@ Page({
         url: '/packageA/orderForm/add/add?type=标准订单',
       })
     }
->>>>>>> 德莱宝测试除了手机登录不合并
   }
 })

utils/Http.js

@@ -5,8 +5,8 @@ class HTTP {
 			// this.baseUrl = "https://lsa.cnyunl.com";
 			this.baseUrl = "https://www.cnyunl.com";
 		} else {
-			// this.baseUrl = "https://www.cnyunl.com";
-			this.baseUrl = "http://61.164.207.46:8200";
+			this.baseUrl = "https://www.cnyunl.com";
+			// this.baseUrl = "http://61.164.207.46:8200";
 			// this.baseUrl = "https://cucu.cnyunl.com:8079";
 		}
 		console.log("接口地址:", this.baseUrl)