合并代码
This commit is contained in:
parent
0a6bc47efe
commit
c7f8afcde4
|
@ -7,10 +7,6 @@ const config = {
|
|||
// #endif
|
||||
// #ifndef H5
|
||||
host: 'http://91f.xyz:8080',
|
||||
<<<<<<< HEAD
|
||||
// host: 'https://1a880cd5.r24.cpolar.top/',
|
||||
=======
|
||||
>>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
|
||||
// #endif
|
||||
// 支付方式配置
|
||||
payType: {
|
||||
|
|
|
@ -4,10 +4,6 @@ import {
|
|||
import uni from '@dcloudio/vite-plugin-uni';
|
||||
|
||||
let target = 'http://91f.xyz:8080'
|
||||
<<<<<<< HEAD
|
||||
// let target = 'https://1a880cd5.r24.cpolar.top/'
|
||||
=======
|
||||
>>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [uni()],
|
||||
|
|
Loading…
Reference in New Issue