libin il y a 1 an
Parent
commit
5d48bb2f68

+ 5 - 3
.env.dev

@@ -4,13 +4,15 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='https://api.guideclub.net'
+# VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 # VITE_BASE_URL='http://dofast.demo.huizhizao.vip:20001'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 VITE_UPLOAD_TYPE=server
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://api.guideclub.net/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
@@ -37,4 +39,4 @@ VITE_OUT_DIR=dist
 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=false
+VITE_APP_CAPTCHA_ENABLE=true

+ 1 - 1
.env.local

@@ -33,4 +33,4 @@ VITE_BASE_PATH=/
 VITE_MALL_H5_DOMAIN='http://localhost:3000'
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=false
+VITE_APP_CAPTCHA_ENABLE=true

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
     "dev-server": "vite --mode dev",
     "ts:check": "vue-tsc --noEmit",
     "build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
-    "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
+    "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
     "build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
     "build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
     "build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",

+ 16 - 8
src/api/system/user/profile.ts

@@ -40,10 +40,14 @@ export interface ProfileVO {
   startDate: Date // 导游服务开始日
   endDate: Date // 导游服务终了日
   bankInfo: string // 银行信息(后期需要扩展,平台和导游月底结账用)
-  wechat: string //wechat QR
-  facebook: string //facebook QR
-  whatsapp: string //whatsapp QR
-  line: string //line QR
+  wechatQrcode: string //wechat QR
+  facebookQrcode: string //facebook QR
+  whatsappQrcode: string //whatsapp QR
+  lineQrcode: string //line QR
+  wechatLink: string //wechat QR
+  facebookLink: string //facebook QR
+  whatsappLink: string //whatsapp QR
+  lineLink: string //line QR
 
 }
 
@@ -65,10 +69,14 @@ export interface UserProfileUpdateGuideInfoReqVO {
   startDate: Date // 导游服务开始日
   endDate: Date // 导游服务终了日
   bankInfo: string // 银行信息(后期需要扩展,平台和导游月底结账用)
-  wechat: string //wechat QR
-  facebook: string //facebook QR
-  whatsapp: string //whatsapp QR
-  line: string //line QR
+  wechatLink: string //wechat QR
+  facebookLink: string //facebook QR
+  whatsappLink: string //whatsapp QR
+  lineLink: string //line QR
+  wechatQrcode: string //wechat QR
+  facebookQrcode: string //facebook QR
+  whatsappQrcode: string //whatsapp QR
+  lineQrcode: string //line QR
 }
 // 查询用户个人信息
 export const getUserProfile = () => {

+ 39 - 12
src/views/guide/profile/components/BasicInfo.vue

@@ -67,17 +67,29 @@
           为了方便客户及时和您联络,请上传您常用的SNS社交软件用的QR图,客户会随时通过社交软件和您取得联系。
         </span>
     </template>
-    <template #wechat="form">
-      <UploadImg v-model="form['wechat']" />
+    <template #wechatLink="form">
+      <el-input v-model="form['wechatLink']" style="width: 440px" />
+    </template>
+    <template #wechatQrcode="form">
+      <UploadImg v-model="form['wechatQrcode']" />
+    </template>
+    <!-- <template #facebook="form">
+      <UploadImg v-model="form['facebook']" />
     </template>
     <template #facebook="form">
       <UploadImg v-model="form['facebook']" />
+    </template> -->
+    <template #whatsappLink="form">
+      <el-input v-model="form['whatsappLink']" style="width: 440px" />
     </template>
-    <template #whatsapp="form">
-      <UploadImg v-model="form['whatsapp']" />
+    <template #whatsappQrcode="form">
+      <UploadImg v-model="form['whatsappQrcode']" />
     </template>
-    <template #line="form">
-      <UploadImg v-model="form['line']" />
+    <template #lineLink="form">
+      <el-input v-model="form['lineLink']" style="width: 440px" />
+    </template>
+    <template #lineQrcode="form">
+      <UploadImg v-model="form['lineQrcode']" />
     </template>
   </Form>
   <div style="text-align: center">
@@ -230,22 +242,37 @@ const schema = reactive<FormSchema[]>([
     label: t('guide.sight.attractionCarouselImages'),
     field: 'picUrls',
   },
-
+  {
+    label: '微信 Link',
+    field: 'wechatLink',
+  },
   {
     label: '微信 QR图',
-    field: 'wechat',
+    field: 'wechatQrcode',
   },
+  // {
+  //   label: 'Facebook Link',
+  //   field: 'facebookLink',
+  // },
+  // {
+  //   label: 'Facebook QR图',
+  //   field: 'facebookQrcode',
+  // },
   {
-    label: 'Facebook QR图',
-    field: 'facebook',
+    label: 'Whatsapp Link',
+    field: 'whatsappLink',
   },
   {
     label: 'Whatsapp QR图',
-    field: 'whatsapp',
+    field: 'whatsappQrcode',
+  },
+  {
+    label: 'Line Link',
+    field: 'lineLink',
   },
   {
     label: 'Line QR图',
-    field: 'line',
+    field: 'lineQrcode',
   }
 ])
 const formRef = ref<FormExpose>() // 表单 Ref

+ 1 - 1
src/views/guide/sightscategory/index.vue

@@ -67,7 +67,7 @@
           <Icon icon="ep:download" class="mr-5px" /> {{t('guide.common.export')}}
         </el-button>
         <el-button type="danger" plain @click="toggleExpandAll">
-          <Icon icon="ep:sort" class="mr-5px" /> {{t('guide.common.actions.expandexpandCollapse')}}
+          <Icon icon="ep:sort" class="mr-5px" /> {{t('guide.common.expandCollapse')}}
         </el-button>
       </el-form-item>
     </el-form>