diff --git a/admin-web-master/vue.config.js b/admin-web-master/vue.config.js
index 4ddea8d..f95de4c 100644
--- a/admin-web-master/vue.config.js
+++ b/admin-web-master/vue.config.js
@@ -33,7 +33,7 @@ module.exports = {
   productionSourceMap: false,
   devServer: {
     port: port,
-    open: false,
+    open: false, 
     overlay: {
       warnings: false,
       errors: true
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 09e491c..e930eac 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -9,8 +9,8 @@
 // const DOMAIN_PREFIX = 'http://172.16.61.126:8080/meserver/api'
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
-const DOMAIN_PREFIXPING = 'http://192.168.2.43:9003' 
-const DOMAIN_PREFIX = 'http://192.168.2.43:9007'
+// const DOMAIN_PREFIXPING = 'http://192.168.2.43:9003' 
+// const DOMAIN_PREFIX = 'http://192.168.2.43:9007'
 // const DOMAIN_PREFIXPING = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/api'
 // const DOMAIN_PREFIXPING = 'https://zhld.028wlkj.com:1443/meserver/admin-server'
@@ -325,15 +325,12 @@ module.exports = {
 	wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add', 
 	//新优惠券
 	couponnew: 'http://8.130.38.56:9007/coupon/myCoupons', 
-<<<<<<< HEAD
 	//商家优惠券
 	cereCouponMainTablequeryByPage: 'http://8.130.38.56:9003/cereCouponMainTable/queryByPage', 
 	//领取商家优惠券
 	receiveCoupons: 'http://8.130.38.56:9007/coupon/receiveCoupons', 
 	//获取订单的优惠券
 	cereCouponKeyUse: 'http://8.130.38.56:9007/order/cereCouponKeyUse',
-=======
 	//问卷解析token
 	jietoken: WX_API_BASE  + '/cereQuestionnaireAnswering/get/token', 
->>>>>>> ab818baa133495fd4a2214a885b1c16d4f36b531
 }