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

@@ -171,7 +171,8 @@ const hasPersonNum = ref(0)
 const lform = ref({})
 const lform = ref({})
 const scenicItem = ref({})
 const scenicItem = ref({})
 const form = ref({
 const form = ref({
-  contacts: user?.nickName || '',
+  // contacts: user?.nickName || '',
+  contacts: '',
   phone: user?.phonenumber || '',
   phone: user?.phonenumber || '',
   touristList: []
   touristList: []
 })
 })

@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },
         '/dev-api': {
         '/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://jijin.wtwuxicenter.com/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api/',
           // target: 'https://wdsfwuxicenter.com/stage-api/',
           changeOrigin: true,
           changeOrigin: true,