Merge branch '淮海科技' of http://47.103.65.67:3000/yeguodong/wxservice-web into 淮海科技

.gitignore

@@ -1,3 +1,4 @@
+.idea
 node_modules
 .DS_Store
 dist

src/router/index.js

@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router'
 
 export const constantRoutes = [
   {
@@ -567,7 +567,7 @@ export const constantRoutes = [
 ]
 
 const router = createRouter({
-  history: createWebHistory(),
+  history: createWebHashHistory('/wxservice/'),
   routes: constantRoutes,
 })
 

src/views/mine/patient-id-cards/BindPatientCard.vue

@@ -39,7 +39,7 @@
         @click="showArea = true"
     />
     <van-popup v-model:show="showArea" position="bottom">
-      <van-area :area-list="allArea" value="430105" @confirm="onConfirmArea" @cancel="showArea = false"/>
+      <van-area :area-list="allArea" value="430105" @confirm="onConfirmArea($event.selectedOptions)" @cancel="showArea = false"/>
     </van-popup>
     <van-field v-model="card.street" label="街道、小区" type="text" placeholder="请输入住址所在街道、小区"/>
     <div style="height: 10px"></div>
@@ -129,12 +129,12 @@ const cardNoHint = computed(() => {
 })
 const showArea = ref(false)
 const onConfirmArea = (values) => {
-  card.province = values[0].code
-  card.city = values[1].code
-  card.district = values[2].code
+  card.province = values[0].value
+  card.city = values[1].value
+  card.district = values[2].value
   card.address = values
       .filter((item) => !!item)
-      .map((item) => item.name)
+      .map((item) => item.text)
       .join('/')
   showArea.value = false
 }

vite.config.js

@@ -11,6 +11,7 @@ const alias = {
 }
 
 export default defineConfig({
+  base: '/wxservice/',
   resolve: {
     alias,
     extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']