Commit d48836ba878110d142ad78b8bf171e90edc42fa6
1 parent
33a8c74c
1
Showing
2 changed files
with
3 additions
and
6 deletions
admin-web-master/vue.config.js
| @@ -33,7 +33,7 @@ module.exports = { | @@ -33,7 +33,7 @@ module.exports = { | ||
| 33 | productionSourceMap: false, | 33 | productionSourceMap: false, |
| 34 | devServer: { | 34 | devServer: { |
| 35 | port: port, | 35 | port: port, |
| 36 | - open: false, | 36 | + open: false, |
| 37 | overlay: { | 37 | overlay: { |
| 38 | warnings: false, | 38 | warnings: false, |
| 39 | errors: true | 39 | errors: true |
ceres-uniapp-master/config/api.js
| @@ -9,8 +9,8 @@ | @@ -9,8 +9,8 @@ | ||
| 9 | // const DOMAIN_PREFIX = 'http://172.16.61.126:8080/meserver/api' | 9 | // const DOMAIN_PREFIX = 'http://172.16.61.126:8080/meserver/api' |
| 10 | // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' | 10 | // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' |
| 11 | // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' | 11 | // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' |
| 12 | -const DOMAIN_PREFIXPING = 'http://192.168.2.43:9003' | ||
| 13 | -const DOMAIN_PREFIX = 'http://192.168.2.43:9007' | 12 | +// const DOMAIN_PREFIXPING = 'http://192.168.2.43:9003' |
| 13 | +// const DOMAIN_PREFIX = 'http://192.168.2.43:9007' | ||
| 14 | // const DOMAIN_PREFIXPING = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' | 14 | // const DOMAIN_PREFIXPING = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' |
| 15 | // const DOMAIN_PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/api' | 15 | // const DOMAIN_PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/api' |
| 16 | // const DOMAIN_PREFIXPING = 'https://zhld.028wlkj.com:1443/meserver/admin-server' | 16 | // const DOMAIN_PREFIXPING = 'https://zhld.028wlkj.com:1443/meserver/admin-server' |
| @@ -325,15 +325,12 @@ module.exports = { | @@ -325,15 +325,12 @@ module.exports = { | ||
| 325 | wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add', | 325 | wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add', |
| 326 | //新优惠券 | 326 | //新优惠券 |
| 327 | couponnew: 'http://8.130.38.56:9007/coupon/myCoupons', | 327 | couponnew: 'http://8.130.38.56:9007/coupon/myCoupons', |
| 328 | -<<<<<<< HEAD | ||
| 329 | //商家优惠券 | 328 | //商家优惠券 |
| 330 | cereCouponMainTablequeryByPage: 'http://8.130.38.56:9003/cereCouponMainTable/queryByPage', | 329 | cereCouponMainTablequeryByPage: 'http://8.130.38.56:9003/cereCouponMainTable/queryByPage', |
| 331 | //领取商家优惠券 | 330 | //领取商家优惠券 |
| 332 | receiveCoupons: 'http://8.130.38.56:9007/coupon/receiveCoupons', | 331 | receiveCoupons: 'http://8.130.38.56:9007/coupon/receiveCoupons', |
| 333 | //获取订单的优惠券 | 332 | //获取订单的优惠券 |
| 334 | cereCouponKeyUse: 'http://8.130.38.56:9007/order/cereCouponKeyUse', | 333 | cereCouponKeyUse: 'http://8.130.38.56:9007/order/cereCouponKeyUse', |
| 335 | -======= | ||
| 336 | //问卷解析token | 334 | //问卷解析token |
| 337 | jietoken: WX_API_BASE + '/cereQuestionnaireAnswering/get/token', | 335 | jietoken: WX_API_BASE + '/cereQuestionnaireAnswering/get/token', |
| 338 | ->>>>>>> ab818baa133495fd4a2214a885b1c16d4f36b531 | ||
| 339 | } | 336 | } |