Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
86fbd5f7 by zhangmeng
Options

Merge remote-tracking branch 'origin/dev' into dev

2 parents e4dc1f49 ad7887fb
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
src/viewsPc/booking/travelOrder.vue
......@@ -171,7 +171,8 @@ const hasPersonNum = ref(0)
const lform = ref({})
const scenicItem = ref({})
const form = ref({
contacts: user?.nickName || '',
// contacts: user?.nickName || '',
contacts: '',
phone: user?.phonenumber || '',
touristList: []
})
......
vite.config.js
......@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
// target: 'http://192.168.1.118:8081/',
target: 'http://192.168.1.242:8081',
target: 'http://192.168.1.118:8081/',
// target: 'http://192.168.1.242:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!