feature: 接口修改

src/App.vue

@@ -31,7 +31,7 @@
   }
   const { proxy } = getCurrentInstance()
   // 注册全局弹窗组件
-  const $pigeon = new Pigeon(proxy)
+  const $pigeon = new Pigeon()
   provide('reload', reload)
   provide('pigeon', $pigeon)
   provide('session', Session)

src/i18n/locales/cn.json

@@ -7437,6 +7437,11 @@
   "ShopManage": {
     "add": "新增商户",
     "edit": "编辑商户",
-    "t1": "商户名称"
+    "t1": "商户名称",
+    "t2": "邮箱",
+    "t3": "手机号码",
+    "p1": "请输入商户名称",
+    "p2": "请输入邮箱",
+    "p3": "请输入手机号码"
   }
 }

src/lib/pigeon.js

@@ -10,9 +10,6 @@ const base = {
 }
 
 export default class Pigeon {
-  constructor(vue) {
-    this.vue = vue
-  }
   /**
    * 系统提醒
    * @param {string} msg 提醒信息

src/routers/modules/system.ts

@@ -22,14 +22,6 @@ const systemRoute = {
       name: 'R-Refusal',
       component: () => import('@/views/system/Refusal/index.vue'),
     },
-    {
-      meta: {
-        OnBreadCrumb: true,
-      },
-      path: 'shopManage',
-      name: 'R-ShopManage',
-      component: () => import('@/views/system/ShopManage/index.vue'),
-    },
   ],
 }
 

src/routers/modules/user.ts

@@ -23,6 +23,14 @@ const userRoute = {
       name: 'R-Role',
       component: () => import('@/views/user/userRole/index.vue'),
     },
+    {
+      meta: {
+        OnBreadCrumb: true,
+      },
+      path: 'shopManage',
+      name: 'R-ShopManage',
+      component: () => import('@/views/user/ShopManage/index.vue'),
+    },
   ],
 }
 export default userRoute

src/service/ucard.ts

@@ -23,7 +23,7 @@ class UCardService extends Service {
   }
   // 银行卡下拉框
   async cardNumberDropdown(params = {}) {
-    return await this.post('/wasabi/card/number/dropdown', params)
+    return await this.post('/ucard/number/dropdown', params)
   }
   // 国家城市
   async ucardCountryCity(params = {}) {
@@ -31,23 +31,23 @@ class UCardService extends Service {
   }
   // 银行卡激活
   async ucardActivate(params = {}) {
-    return await this.post('/wasabi/card/activate', params)
+    return await withLoading(() => this.post('/wasabi/card/activate', params))
   }
   // 冻结卡片
   async ucardFreeze(params = {}) {
-    return await this.post('/wasabi/card/freeze', params)
+    return await withLoading(() => this.post('/wasabi/card/freeze', params))
   }
   // 解冻卡片
   async ucardUnfreeze(params = {}) {
-    return await this.post('/wasabi/card/unfreeze', params)
+    return await withLoading(() => this.post('/wasabi/card/unfreeze', params))
   }
   // 银行卡充值
   async ucardRecharge(params = {}) {
-    return await this.post('/wasabi/card/recharge', params)
+    return await withLoading(() => this.post('/wasabi/card/recharge', params))
   }
   // 银行卡扣款
   async ucardRithdraw(params = {}) {
-    return await this.post('/wasabi/card/withdraw', params)
+    return await withLoading(() => this.post('/wasabi/card/withdraw', params))
   }
   //获取卡片类型列表
   async cardTypesList(params = {}) {
@@ -56,58 +56,58 @@ class UCardService extends Service {
 
   // 开卡审批
   async applyApprove(params = {}) {
-    return await this.post('/wasabi/card/apply/approve', params)
+    return await withLoading(() => this.post('/wasabi/card/apply/approve', params))
   }
   // 申请卡片更新地址
   async addressUpdate(params = {}) {
-    return await this.post('/wasabi/merchant/user/address/update', params)
+    return await withLoading(() => this.post('/wasabi/merchant/user/address/update', params))
   }
 
   // 申请开卡
   async ucardApply(params = {}) {
-    return await this.post('/wasabi/card/apply', params)
+    return await withLoading(() => this.post('/wasabi/card/apply', params))
   }
   // 充值审批
   async rechargeApprove(params = {}) {
-    return await this.post('/wasabi/card/recharge/approve', params)
+    return await withLoading(() => this.post('/wasabi/card/recharge/approve', params))
   }
 
   // 找回密码
   async ucardResetPassword(params = {}) {
-    return await this.post('/wasabi/card/password/reset', params)
+    return await withLoading(() => this.post('/wasabi/card/password/reset', params))
   }
 
   // 提交KYC认证
   async kycSubmit(params = {}) {
-    return await this.post('/wasabi/merchant/kyc/manual/submit', params)
+    return await withLoading(() => this.post('/wasabi/merchant/kyc/manual/submit', params))
   }
 
   // 卡片是否可用
   async numberVerify(params = {}) {
-    return await this.post('/wasabi/card/number/verify', params)
+    return await withLoading(() => this.post('/ucard/number/verify', params))
   }
 
   // 获取激活卡
   async getActivationCode(params = {}) {
-    return await this.post('/wasabi/get/activation/code', params)
+    return await withLoading(() => this.post('/wasabi/get/activation/code', params))
   }
 
   // 调整余额
   async balanceUpdate(params = {}) {
-    return await this.post('/wasabi/card/wallet/balance/update', params)
+    return await withLoading(() => this.post('/wasabi/card/wallet/balance/update', params))
   }
   // 更新卡片类型配置
   async updateCardTypesConfig(params = {}) {
-    return await this.post('/wasabi/card/type/config/update', params)
+    return await withLoading(() => this.post('/wasabi/card/type/config/update', params))
   }
   // 更新卡片类型列表
   async updateCardTypes(params = {}) {
-    return await this.post('/wasabi/card/types', params)
+    return await withLoading(() => this.post('/wasabi/card/types', params))
   }
 
   // 上传KYC附件
   async kycUpload(params = {}) {
-    return await this.post('/wasabi/merchant/kyc/upload', params)
+    return await withLoading(() => this.post('/wasabi/merchant/kyc/upload', params))
   }
   // 证件类型配置列表
   async idTypesConfigList(params = {}) {
@@ -115,7 +115,7 @@ class UCardService extends Service {
   }
   // 是否手动上传证件照
   async photoManually(params = {}) {
-    return await this.post('/wasabi/card/photo/manually', params)
+    return await withLoading(() => this.post('/wasabi/card/photo/manually', params))
   }
   // 商户用户分页列表
   async merchantList(params = {}) {
@@ -123,15 +123,15 @@ class UCardService extends Service {
   }
   // 商户用户注册
   async merchantRegister(params = {}) {
-    return await this.post('/wasabi/merchant/user/register', params)
+    return await withLoading(() => this.post('/wasabi/merchant/user/register', params))
   }
   // 更新商户用户信息
   async merchantUpdate(params = {}) {
-    return await this.post('/wasabi/merchant/user/update', params)
+    return await withLoading(() => this.post('/wasabi/merchant/user/update', params))
   }
   // 商户注册选择用户列表
   async merchantSearch(params = {}) {
-    return await this.post('/custom/search/ucard', params)
+    return await withLoading(() => this.post('/custom/search/ucard', params))
   }
   // 查询职业信息
   async getOccupationList(params = {}) {
@@ -139,15 +139,15 @@ class UCardService extends Service {
   }
   // 文件上传
   async ucardUpload(params = {}) {
-    return await this.post('/wasabi/upload/file', params)
+    return await withLoading(() => this.post('/ucard/file/upload', params))
   }
   // 人脸详情
   async kycSearchSingle(params = {}) {
-    return await this.post('/wasabi/kyc/status/single', params)
+    return await withLoading(() => this.post('/wasabi/kyc/status/single', params))
   }
   // 查询KYC认证状态
   async kycStatus(params = {}) {
-    return await this.post('/wasabi/merchant/kyc/status', params)
+    return await withLoading(() => this.post('/wasabi/merchant/kyc/status', params))
   }
 
   // kyc列表
@@ -156,21 +156,21 @@ class UCardService extends Service {
   }
   // 查询卡片余额
   async ucardBalance(params = {}) {
-    return await this.post('/wasabi/card/balance', params)
+    return await await withLoading(() => this.post('/wasabi/card/balance', params))
   }
 
   // 更新银行卡信息
   async getCardInfo(params = {}) {
-    return await this.post('/wasabi/card/info/refresh', params)
+    return await withLoading(() => this.post('/wasabi/card/info/refresh', params))
   }
 
   // 查看cvv
   async queryCvv(params = {}) {
-    return await this.post('/wasabi/card/query/cvv', params)
+    return await withLoading(() => this.post('/wasabi/card/query/cvv', params))
   }
   // 重新充值默认金额
   async rechargeUpdate(params = {}) {
-    return await this.post('/wasabi/recharge/default/amount', params)
+    return await withLoading(() => this.post('/wasabi/recharge/default/amount', params))
   }
   // 获取卡片列表
   async cardList(params = {}) {
@@ -182,27 +182,27 @@ class UCardService extends Service {
   }
   //查询最新汇率
   async globalLatestExchangeRate(params = {}) {
-    return await this.post('/wasabi/global/query/latest/exchange/rate', params)
+    return await withLoading(() => this.post('/ucard/global/query/latest/exchange/rate', params))
   }
   //更新手续费率
   async updateGlobalFee(params = {}) {
-    return await this.post('/wasabi/global/currencies/config', params)
+    return await withLoading(() => this.post('/ucard/global/currencies/config', params))
   }
   //币种更新
   async globalCurrenciesSave(params = {}) {
-    return await this.post('/wasabi/global/currencies/save', params)
+    return await withLoading(() => this.post('/ucard/global/currencies/save', params))
   }
   //币种下拉列表
   async globalCurrenciesDropdown(params = {}) {
-    return await this.post('/wasabi/global/currencies/dropdown', params)
+    return await this.post('/ucard/global/currencies/dropdown', params)
   }
   //查询币种全局配置
   async globalCurrenciesConfig(params = {}) {
-    return await this.post('/wasabi/global/query/currencies/config', params)
+    return await withLoading(() => this.post('/ucard/global/query/currencies/config', params))
   }
   //币种列表
   async globalCurrenciesList(params = {}) {
-    return await this.post('/wasabi/global/currencies/list', params)
+    return await this.post('/ucard/global/currencies/list', params)
   }
   // 钱包记录分页列表
   async getRecordPage(params = {}) {
@@ -214,59 +214,59 @@ class UCardService extends Service {
   }
   // 正则更新删除
   async permissionDelete(params = {}) {
-    return await this.post('/wasabi/card/permission/delete', params)
+    return await withLoading(() => this.post('/ucard/permission/delete', params))
   }
   // 正则更新
   async permissionUpdate(params = {}) {
-    return await this.post('/wasabi/card/permission/update', params)
+    return await withLoading(() => this.post('/ucard/permission/update', params))
   }
   // 正则add
   async permissionAdd(params = {}) {
-    return await this.post('/wasabi/card/permission/add', params)
+    return await withLoading(() => this.post('/ucard/permission/add', params))
   }
   // 正则列表
   async permissionPage(params = {}) {
-    return await this.post('/wasabi/card/permission/page', params)
+    return await this.post('/ucard/permission/page', params)
   }
   // 证件类型配置删除
   async idTypesConfigDelete(params = {}) {
-    return await this.post('/wasabi/card/id/type/config/delete', params)
+    return await withLoading(() => this.post('/ucard/id/type/config/delete', params))
   }
   // 证件类型配置新增
   async idTypesConfigAdd(params = {}) {
-    return await this.post('/wasabi/card/id/type/config/add', params)
+    return await withLoading(() => this.post('/ucard/id/type/config/add', params))
   }
   // 银行卡删除
   async cardNumberDelete(params = {}) {
-    return await this.post('/wasabi/card/number/delete', params)
+    return await withLoading(() => this.post('/ucard/number/delete', params))
   }
   // 银行卡列表
   async cardNumberList(params = {}) {
-    return await this.post('/wasabi/card/number/list', params)
+    return await this.post('/ucard/number/list', params)
   }
   // 银行卡修改
   async cardNumberUpdate(params = {}) {
-    return await this.post('/wasabi/card/number/update/status', params)
+    return await withLoading(() => this.post('/ucard/number/update/status', params))
   }
   // 操作记录
   async operatePage(params = {}) {
-    return await this.post('/wasabi/card/operate/page', params)
+    return await this.post('/ucard/operate/page', params)
   }
   //列表
   async cardFileList(params = {}) {
-    return await this.post('/wasabi/card/file/search/list', params)
+    return await this.post('/ucard/file/search/list', params)
   }
   //激活操作指南
   async cardFileAdd(params = {}) {
-    return await this.post('/wasabi/card/file/add', params)
+    return await withLoading(() => this.post('/ucard/file/add', params))
   }
   //更新
   async cardFileUpdate(params = {}) {
-    return await this.post('/wasabi/card/file/update', params)
+    return await withLoading(() => this.post('/ucard/file/update', params))
   }
   //删除
   async cardFileDelete(params = {}) {
-    return await this.post('/wasabi/card/file/delete', params)
+    return await withLoading(() => this.post('/ucard/file/delete', params))
   }
   //查询已认证用户列表
   async cardUserList(params = {}) {
@@ -274,19 +274,19 @@ class UCardService extends Service {
   }
   //查询手续费率和汇率
   async globalExchangeRate(params = {}) {
-    return await this.post('/wasabi/global/query/exchange/rate', params)
+    return await withLoading(() => this.post('/ucard/global/query/exchange/rate', params))
   }
   // 最近收款人列表
   async globalReceiverList(params = {}) {
-    return await this.post('/wasabi/global/receiver/user/list', params)
+    return await this.post('/ucard/global/receiver/user/list', params)
   }
   //币种字段和可选值列表
   async globalCurrenciesField(params = {}) {
-    return await this.post('/wasabi/global/currencies/field/list', params)
+    return await this.post('/ucard/global/currencies/field/list', params)
   }
   //查询支持的城市列表
   async globalQueryBankCities(params = {}) {
-    return await this.post('/wasabi/global/query/bank/cities', params)
+    return await withLoading(() => this.post('/ucard/global/query/bank/cities', params))
   }
   //查询ucard账户信息
   async cardAccountDropdown(params = {}) {
@@ -294,71 +294,71 @@ class UCardService extends Service {
   }
   // 订单详情
   async globalOrdersDetail(params = {}) {
-    return await this.post('/wasabi/global/order/details', params)
+    return await withLoading(() => this.post('/ucard/global/order/details', params))
   }
   //取消交易订单
   async globalCancelOrder(params = {}) {
-    return await this.post('/wasabi/global/cancel/order', params)
+    return await withLoading(() => this.post('/ucard/global/cancel/order', params))
   }
   // 速汇订单审批
   async globalOrderApprove(params = {}) {
-    return await this.post('/wasabi/global/order/approve', params)
+    return await withLoading(() => this.post('/ucard/global/order/approve', params))
   }
   // 补充资料
   async globalSupplementary(params = {}) {
-    return await this.post('/wasabi/global/supplementary/data', params)
+    return await withLoading(() => this.post('/ucard/global/supplementary/data', params))
   }
   //速汇订单分页列表
   async globalOrdersList(params = {}) {
-    return await this.post('/wasabi/global/order/page/list', params)
+    return await this.post('/ucard/global/order/page/list', params)
   }
   //创建订单
   async globalOrdersCreate(params = {}) {
-    return await this.post('/wasabi/global/create/order', params)
+    return await withLoading(() => this.post('/ucard/global/create/order', params))
   }
   // 区块链配置列表
   async getBlockchainPage(params = {}) {
-    return await this.post('/wasabi/card/blockchain/config/page', params)
+    return await this.post('/ucard/blockchain/config/page', params)
   }
   // 区块链列表
   async getBlockchains(params = {}) {
-    return await this.post('/wasabi/card/blockchain/dropdown', params)
+    return await this.post('/ucard/blockchain/dropdown', params)
   }
   // 更新区块链
   async updateBlockchain(params = {}) {
-    return await this.post('/wasabi/card/blockchain/config/update', params)
+    return await withLoading(() => this.post('/ucard/blockchain/rate/config/update', params))
   }
   // 新增区块链
   async addBlockchain(params = {}) {
-    return await this.post('/wasabi/card/blockchain/config/add', params)
+    return await await withLoading(() => this.post('/ucard/blockchain/config/add', params))
   }
   // 删除区块链
   async deleteBlockchain(params = {}) {
-    return await this.post('/wasabi/card/blockchain/config/delete', params)
+    return await withLoading(() => this.post('/ucard/blockchain/config/delete', params))
   }
   // 区块链汇率列表
   async getBlockchainRatePage(params = {}) {
-    return await this.post('/wasabi/card/blockchain/rate/config/page', params)
+    return await this.post('/ucard/blockchain/rate/config/page', params)
   }
   // 修改区块链汇率
   async updateBlockchainRate(params = {}) {
-    return await this.post('/wasabi/card/blockchain/rate/config/update', params)
+    return await withLoading(() => this.post('/ucard/blockchain/rate/config/update', params))
   }
   // 新增区块链汇率
   async addBlockchainRate(params = {}) {
-    return await this.post('/wasabi/card/blockchain/rate/config/add', params)
+    return await withLoading(() => this.post('/ucard/blockchain/rate/config/add', params))
   }
   // 删除区块链汇率
   async deleteBlockchainRate(params = {}) {
-    return await this.post('/wasabi/card/blockchain/rate/config/delete', params)
+    return await withLoading(() => this.post('/ucard/blockchain/rate/config/delete', params))
   }
   // 加密货币交易记录列表
   async getBlockchainTransactionPage(params = {}) {
-    return await this.post('/wasabi/encrypted/wallet/transaction/page', params)
+    return await this.post('/ucard/encrypted/wallet/transaction/page', params)
   }
   // 银行卡详情
   async getCardDetails(params = {}) {
-    return await this.post('/wasabi/card/info/query', params)
+    return await withLoading(() => this.post('/wasabi/card/info/query', params))
   }
   // 充值记录分页查询
   async rechargeList(params = {}) {

src/service/user.ts

@@ -151,7 +151,7 @@ class UserService extends Service {
   async shopManageEdit(params = {}) {
     return await this.post('/merchant/edit', params)
   }
-  // 商户管理 -add
+  // 商户管理 -删除
   async shopManageDel(params = {}) {
     return await this.post('/merchant/delete', params)
   }

src/views/card/CardBlockchainTransaction/index.vue

@@ -73,7 +73,7 @@
             <el-form-item>
               <el-button
                 class="crm-border-radius-no crm-border-left-no"
-                icon="el-icon-search"
+                :icon="Search"
                 @click="toSearch"
               ></el-button>
             </el-form-item>
@@ -157,6 +157,7 @@
   import Config from '@/config/index'
   import { exportExcel } from '@/utils/export'
   import PagePagination from '@/components/pagePagination/index.vue'
+  import { Search } from '@element-plus/icons-vue'
 
   const { t } = useI18n()
   const { Code } = Config

src/views/card/CardOperate/index.vue

@@ -317,7 +317,7 @@
         pigeon.MessageError(res.msg)
       }
     } catch (error) {
-      pigeon.MessageError(t('Msg.SearchFailed'))
+      console.log(error)
     } finally {
       pictLoading.value = false
     }

src/views/card/CardUserOrder/index.vue

@@ -306,7 +306,7 @@
         pigeon.error(res.msg)
       }
     } catch (error) {
-      pigeon.error(t('Msg.SearchFailed'))
+      console.log(error)
     } finally {
       pictLoading.value = false
     }

src/views/home2/Home.vue

@@ -39,8 +39,8 @@
             </el-dropdown>
             <el-dropdown v-if="info.roteCode == 'ROLE_SALE'" trigger="click" class="role-switch">
               <span class="el-dropdown-link">
-                <span>{{ currentRoleName }}</span
-                ><el-icon><ArrowDown /></el-icon>
+                <span>{{ currentRoleName }}</span>
+                <el-icon><ArrowDown /></el-icon>
               </span>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -67,12 +67,14 @@
               </span>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item @click="updatePwd"
-                    ><span>
+                  <el-dropdown-item @click="updatePwd">
+                    <span>
                       {{ $t('Label.UpdatePwd') }}
-                    </span></el-dropdown-item
-                  >
-                  <el-dropdown-item @click="beforeLogout">Logout</el-dropdown-item>
+                    </span>
+                  </el-dropdown-item>
+                  <!--                  商户个人信息，商户管理员可以看到，可以修改-->
+                  <el-dropdown-item @click="beforeLogout"> 个人信息 </el-dropdown-item>
+                  <el-dropdown-item @click="beforeLogout"> Logout </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
@@ -164,7 +166,15 @@
   } from 'vue'
   import { useRouter, useRoute } from 'vue-router'
   import { useStore } from 'vuex'
-  import { FullScreen, Refresh, ArrowDown, RefreshRight, Bell } from '@element-plus/icons-vue'
+  import {
+    FullScreen,
+    Refresh,
+    ArrowDown,
+    RefreshRight,
+    Bell,
+    Fold,
+    Expand,
+  } from '@element-plus/icons-vue'
   import axios from 'axios'
   import { useI18n } from 'vue-i18n'
 

src/views/system/ShopManage/index.vue → src/views/user/ShopManage/index.vue

@@ -86,11 +86,17 @@
       width="500px"
       :close-on-click-modal="false"
     >
-      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="120px">
+      <el-form ref="addFormRef" :model="addForm" :rules="formRules" label-width="120px">
         <el-form-item :label="`${t('ShopManage.t1')}:`" prop="merchantName">
           <el-input v-model.trim="addForm.merchantName" :placeholder="t('Placeholder.Input')">
           </el-input>
         </el-form-item>
+        <el-form-item :label="`${t('ShopManage.t2')}:`" prop="email">
+          <el-input v-model.trim="addForm.email" :placeholder="t('Placeholder.Input')"> </el-input>
+        </el-form-item>
+        <el-form-item :label="`${t('ShopManage.t3')}:`" prop="phone">
+          <el-input v-model.trim="addForm.phone" :placeholder="t('Placeholder.Input')"> </el-input>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -105,7 +111,6 @@
 </template>
 <script setup lang="ts">
   import { Delete, Edit, Plus, Search } from '@element-plus/icons-vue'
-  import { departmentNames } from '@/views/user/userRole/const'
   import { computed, inject, onMounted, reactive, ref } from 'vue'
   import PagePagination from '@/components/pagePagination/index.vue'
   import Service from '@/service/user'
@@ -135,6 +140,30 @@
     const displayData = Session.Get('display', true)
     return displayData ? JSON.parse(displayData) : {}
   })
+
+  const formRules = computed(() => ({
+    merchantName: [
+      {
+        required: true,
+        message: t('ShopManage.p1'),
+        trigger: 'blur',
+      },
+    ],
+    email: [
+      {
+        required: true,
+        message: t('ShopManage.p2'),
+        trigger: 'blur',
+      },
+    ],
+    phone: [
+      {
+        required: true,
+        message: t('ShopManage.p3'),
+        trigger: 'blur',
+      },
+    ],
+  }))
   const pagerInfo = reactive({
     row: 10,
     current: 1,

src/views/user/userList/components/UserAdd.vue

@@ -560,7 +560,7 @@
       visible.value = newVal
       if (!newVal && formRef.value) {
         formRef.value?.resetFields()
-        Object.assign(form, {})
+        Object.keys(form).forEach((key) => (form[key] = ''))
       }
       if (newVal) {
         getDepartmentState()

src/views/user/userRole/components/RoleAdd/index.vue

@@ -780,7 +780,7 @@
       code: 'ROLE_USER',
       ...form,
     })
-    addLoading.value = false
+
     if (res.code == Code.StatusOK) {
       roleTreeDate.value = []
       defaultSelect.value = []
@@ -791,6 +791,7 @@
     } else {
       pigeon.error(res.msg)
     }
+    addLoading.value = false
   }
   //提交成功后回调
   const confirmToReload = () => {
@@ -812,12 +813,15 @@
     async (newVal) => {
       loading.value = true
       visible.value = newVal
+
       if (newVal) {
         if (props.editor) {
           await getRoleDetailUpdate()
         } else {
           await getRoleDetailAdd()
         }
+      } else {
+        Object.keys(form).forEach((key) => (form[key] = ''))
       }
     }
   )