feat:第二版ppt修改

.env.dev

@@ -6,6 +6,8 @@ VITE_DEV=true
 # 请求路径
 VITE_BASE_URL='https://yffzpapi.zianxin.com'
 
+VITE_CHAT_URL='http://localhost:8080/#/home/chat'
+
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
 

.env.local

@@ -8,6 +8,8 @@ VITE_DEV=true
 
 VITE_BASE_URL='http://localhost:48083'
 
+VITE_CHAT_URL='http://localhost:8080/#/home/chat'
+
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
 

.env.prod

@@ -4,8 +4,9 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://chatapi.zianxin.com'
-# symy.asset-cloud.com.cn'
+VITE_BASE_URL='https://chatapi.zianxin.com'
+
+VITE_CHAT_URL='http://chatmsgpc.zianxin.com/#/home/chat'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server

.env.stage

@@ -6,6 +6,8 @@ VITE_DEV=false
 # 请求路径
 VITE_BASE_URL='https://yffzpapi.zianxin.com'
 
+VITE_CHAT_URL='http://localhost:8080/#/home/chat'
+
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
 

.env.test

@@ -6,6 +6,8 @@ VITE_DEV=false
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
 
+VITE_CHAT_URL='http://localhost:8080/#/home/chat'
+
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
 

src/layout/components/ServiceDialog/src/ServiceDialog.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="size-full flex justify-center items-center p-x-10px cursor-pointer" @click="dialogVisible = true">
+  <div class="h-full flex justify-center items-center p-x-10px cursor-pointer" @click="dialogVisible = true">
     <el-icon>
       <BellFilled />
     </el-icon>
   </div>
-  <el-dialog v-model="dialogVisible" width="70%" :before-close="dialogClose">
+  <el-dialog v-model="dialogVisible" width="70%" :before-close="dialogClose" :close-on-click-modal="false">
     <template #header>
       <div class="flex justify-between items-center">
         <div>客服</div>
@@ -26,7 +26,7 @@ import { BellFilled } from '@element-plus/icons-vue'
 const dialogVisible = ref(false)
 
 const dialogClose = () => {
-
+  dialogVisible.value = false
 }
 </script>
 

src/views/member/config/index.vue

@@ -110,8 +110,7 @@
         </el-tab-pane>
         <el-tab-pane label="举报">
           <el-form-item label-width="200px" label="举报类型" prop="reportTypeList">
-            <el-select
-style="width: 80%" v-model="formData.reportTypeList" allow-create filterable multiple
+            <el-select style="width: 80%" v-model="formData.reportTypeList" allow-create filterable multiple
               placeholder="请直接输入举报类型">
               <el-option v-for="reason in formData.reportTypeList" :key="reason" :label="reason" :value="reason" />
             </el-select>
@@ -152,6 +151,13 @@ style="width: 80%" v-model="formData.reportTypeList" allow-create filterable mul
             </el-text>
           </el-form-item>
         </el-tab-pane>
+        <el-tab-pane label="审核">
+          <el-form-item label-width="200px" label="修改微信是否自动通过审核" prop="pointTradeDeductUnitPrice">
+            <el-switch v-model="formData.autoWechatNumAuth"
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="自动通过审核"
+              inactive-text="需要人工审核" />
+          </el-form-item>
+        </el-tab-pane>
       </el-tabs>
 
       <el-form-item>
@@ -183,7 +189,8 @@ const formData = ref({
   newPersonDays: 0,
   giftCashRatio: 0,
   pointTradeGivePoint: 0,
-  reportTypeList: []
+  reportTypeList: [],
+  autoWechatNumAuth: false
 })
 
 // 创建一个计算属性，用于将 pointTradeDeductUnitPrice 显示为带两位小数的形式

src/views/pay/app/components/channel/WeixinChannelForm.vue

@@ -19,8 +19,7 @@
             <el-input v-model="formData.config.appId" :style="{ width: '100%' }" clearable placeholder="请输入微信 APPID" />
           </el-form-item>
           <el-form-item label-width="180px">
-            <a
-href="https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage"
+            <a href="https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage"
               target="_blank">
               前往微信商户平台查看 APPID
             </a>
@@ -39,8 +38,7 @@ href="https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/a
         <!-- start 合作商户 start -->
         <div v-if="state.currentTab === 'Cooperate'">
           <el-form-item label="微信平台 APPID" label-width="180px" prop="config.appId">
-            <el-input
-v-model="formData.config.appId" :style="{ width: '100%' }" clearable
+            <el-input v-model="formData.config.appId" :style="{ width: '100%' }" clearable
               placeholder="请输入微信平台 APPID" />
           </el-form-item>
           <el-form-item label="微信平台商户号" label-width="180px" prop="config.mchId">
@@ -48,13 +46,11 @@ v-model="formData.config.appId" :style="{ width: '100%' }" clearable
           </el-form-item>
 
           <el-form-item label="微信合作伙伴 APPID" label-width="180px" prop="config.subAppId">
-            <el-input
-v-model="formData.config.subAppId" :style="{ width: '100%' }" clearable
+            <el-input v-model="formData.config.subAppId" :style="{ width: '100%' }" clearable
               placeholder="请输入微信平台 APPID" />
           </el-form-item>
           <el-form-item label="微信合作伙伴商户号" label-width="180px" prop="config.subMchId">
-            <el-input
-v-model="formData.config.subMchId" :style="{ width: '100%' }" clearable
+            <el-input v-model="formData.config.subMchId" :style="{ width: '100%' }" clearable
               placeholder="请输入微信平台商户号" />
           </el-form-item>
         </div>
@@ -62,8 +58,7 @@ v-model="formData.config.subMchId" :style="{ width: '100%' }" clearable
 
         <el-form-item label="渠道状态" label-width="180px" prop="status">
           <el-radio-group v-model="formData.status">
-            <el-radio
-v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
+            <el-radio v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
               :value="parseInt(dict.value)">
               {{ dict.label }}
             </el-radio>
@@ -81,13 +76,11 @@ v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.valu
             <el-input v-model="formData.config.mchKey" clearable placeholder="请输入商户密钥" />
           </el-form-item>
           <el-form-item label="apiclient_cert.p12 证书" label-width="180px" prop="config.keyContent">
-            <el-input
-v-model="formData.config.keyContent" :autosize="{ minRows: 8, maxRows: 8 }"
+            <el-input v-model="formData.config.keyContent" :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }" placeholder="请上传 apiclient_cert.p12 证书" readonly type="textarea" />
           </el-form-item>
           <el-form-item label="" label-width="180px">
-            <el-upload
-:before-upload="p12FileBeforeUpload" :http-request="keyContentUpload" :limit="1" accept=".p12"
+            <el-upload :before-upload="p12FileBeforeUpload" :http-request="keyContentUpload" :limit="1" accept=".p12"
               action="">
               <el-button type="primary">
                 <Icon class="mr-5px" icon="ep:upload" />
@@ -101,13 +94,11 @@ v-model="formData.config.keyContent" :autosize="{ minRows: 8, maxRows: 8 }"
             <el-input v-model="formData.config.apiV3Key" clearable placeholder="请输入 API V3 密钥" />
           </el-form-item>
           <el-form-item label="apiclient_key.pem 证书" label-width="180px" prop="config.privateKeyContent">
-            <el-input
-v-model="formData.config.privateKeyContent" :autosize="{ minRows: 8, maxRows: 8 }"
+            <el-input v-model="formData.config.privateKeyContent" :autosize="{ minRows: 8, maxRows: 8 }"
               :style="{ width: '100%' }" placeholder="请上传 apiclient_key.pem 证书" readonly type="textarea" />
           </el-form-item>
           <el-form-item label="" label-width="180px" prop="privateKeyContentFile">
-            <el-upload
-ref="privateKeyContentFile" :before-upload="pemFileBeforeUpload"
+            <el-upload ref="privateKeyContentFile" :before-upload="pemFileBeforeUpload"
               :http-request="privateKeyContentUpload" :limit="1" accept=".pem" action="">
               <el-button type="primary">
                 <Icon class="mr-5px" icon="ep:upload" />

vite.config.ts

@@ -1,8 +1,8 @@
-import {resolve} from 'path'
-import type {ConfigEnv, UserConfig} from 'vite'
-import {loadEnv} from 'vite'
-import {createVitePlugins} from './build/vite'
-import {exclude, include} from "./build/vite/optimize"
+import { resolve } from 'path'
+import type { ConfigEnv, UserConfig } from 'vite'
+import { loadEnv } from 'vite'
+import { createVitePlugins } from './build/vite'
+import { exclude, include } from "./build/vite/optimize"
 // 当前执行node命令时文件夹的地址(工作目录)
 const root = process.cwd()
 
@@ -12,7 +12,7 @@ function pathResolve(dir: string) {
 }
 
 // https://vitejs.dev/config/
-export default ({command, mode}: ConfigEnv): UserConfig => {
+export default ({ command, mode }: ConfigEnv): UserConfig => {
     let env = {} as any
     const isBuild = command === 'build'
     if (!isBuild) {
@@ -81,6 +81,6 @@ export default ({command, mode}: ConfigEnv): UserConfig => {
                 },
             },
         },
-        optimizeDeps: {include, exclude}
+        optimizeDeps: { include, exclude }
     }
 }