sx
/
jiuyiUniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

This commit is contained in:
sx 2025-02-23 13:37:16 +08:00
parent 0a6bc47efe
commit c7f8afcde4
2 changed files with 0 additions and 8 deletions

4
jiuyi2/common/js/config.js
View File

@ -7,10 +7,6 @@ const config = {
// #endif // #endif
// #ifndef H5 // #ifndef H5
host: 'http://91f.xyz:8080', host: 'http://91f.xyz:8080',
<<<<<<< HEAD
// host: 'https://1a880cd5.r24.cpolar.top/',
=======
>>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
// #endif // #endif
// 支付方式配置 // 支付方式配置
payType: { payType: {

4
jiuyi2/vite.config.js
View File

@ -4,10 +4,6 @@ import {
import uni from '@dcloudio/vite-plugin-uni'; import uni from '@dcloudio/vite-plugin-uni';
let target = 'http://91f.xyz:8080' let target = 'http://91f.xyz:8080'
<<<<<<< HEAD
// let target = 'https://1a880cd5.r24.cpolar.top/'
=======
>>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
export default defineConfig({ export default defineConfig({
plugins: [uni()], plugins: [uni()],