Sfoglia il codice sorgente

Merge remote-tracking branch 'yudao/dev' into dev-crm

puhui999 10 mesi fa
parent
commit
e9510f50f8
100 ha cambiato i file con 287 aggiunte e 267 eliminazioni
  1. 33 33
      src/components/Crontab/src/Crontab.vue
  2. 2 2
      src/components/DiyEditor/components/ComponentContainerProperty.vue
  3. 6 6
      src/components/DiyEditor/components/mobile/Carousel/property.vue
  4. 3 3
      src/components/DiyEditor/components/mobile/CouponCard/property.vue
  5. 3 3
      src/components/DiyEditor/components/mobile/Divider/property.vue
  6. 2 2
      src/components/DiyEditor/components/mobile/FloatingActionButton/property.vue
  7. 2 2
      src/components/DiyEditor/components/mobile/MenuGrid/property.vue
  8. 7 7
      src/components/DiyEditor/components/mobile/MenuSwiper/property.vue
  9. 3 3
      src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue
  10. 6 6
      src/components/DiyEditor/components/mobile/NavigationBar/property.vue
  11. 2 2
      src/components/DiyEditor/components/mobile/Popover/property.vue
  12. 5 5
      src/components/DiyEditor/components/mobile/ProductCard/property.vue
  13. 3 3
      src/components/DiyEditor/components/mobile/ProductList/property.vue
  14. 2 2
      src/components/DiyEditor/components/mobile/PromotionCombination/property.vue
  15. 2 2
      src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue
  16. 4 4
      src/components/DiyEditor/components/mobile/SearchBar/property.vue
  17. 2 2
      src/components/DiyEditor/components/mobile/TabBar/property.vue
  18. 5 5
      src/components/DiyEditor/components/mobile/TitleBar/property.vue
  19. 3 3
      src/components/ShortcutDateRangePicker/index.vue
  20. 3 0
      src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
  21. 8 1
      src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
  22. 0 11
      src/styles/theme.scss
  23. 2 2
      src/utils/formatTime.ts
  24. 12 0
      src/views/Login/Login.vue
  25. 1 1
      src/views/Login/components/SSOLogin.vue
  26. 3 3
      src/views/Profile/components/BasicInfo.vue
  27. 1 1
      src/views/ai/model/apiKey/ApiKeyForm.vue
  28. 1 1
      src/views/ai/model/chatModel/ChatModelForm.vue
  29. 3 3
      src/views/ai/model/chatRole/ChatRoleForm.vue
  30. 7 13
      src/views/ai/music/index/mode/index.vue
  31. 1 1
      src/views/bpm/category/CategoryForm.vue
  32. 1 1
      src/views/bpm/form/editor/index.vue
  33. 1 1
      src/views/bpm/group/UserGroupForm.vue
  34. 1 1
      src/views/bpm/model/ModelForm.vue
  35. 1 1
      src/views/bpm/processExpression/ProcessExpressionForm.vue
  36. 1 1
      src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
  37. 1 1
      src/views/bpm/processListener/ProcessListenerForm.vue
  38. 1 1
      src/views/crm/contact/ContactForm.vue
  39. 2 2
      src/views/crm/contract/config/index.vue
  40. 4 4
      src/views/crm/customer/poolConfig/index.vue
  41. 4 4
      src/views/crm/permission/components/PermissionForm.vue
  42. 6 6
      src/views/crm/permission/components/TransferForm.vue
  43. 1 1
      src/views/erp/finance/account/AccountForm.vue
  44. 1 1
      src/views/erp/product/category/ProductCategoryForm.vue
  45. 1 1
      src/views/erp/product/product/ProductForm.vue
  46. 1 1
      src/views/erp/product/unit/ProductUnitForm.vue
  47. 1 1
      src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue
  48. 1 1
      src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue
  49. 1 1
      src/views/erp/purchase/supplier/SupplierForm.vue
  50. 1 1
      src/views/erp/sale/customer/CustomerForm.vue
  51. 1 1
      src/views/erp/sale/order/components/SaleOrderOutEnableList.vue
  52. 1 1
      src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue
  53. 1 1
      src/views/erp/stock/warehouse/WarehouseForm.vue
  54. 6 6
      src/views/infra/codegen/components/ColumInfoForm.vue
  55. 2 2
      src/views/infra/codegen/components/GenerateInfoForm.vue
  56. 1 1
      src/views/infra/config/ConfigForm.vue
  57. 1 1
      src/views/infra/demo/demo01/Demo01ContactForm.vue
  58. 1 1
      src/views/infra/demo/demo03/erp/Demo03StudentForm.vue
  59. 1 1
      src/views/infra/demo/demo03/inner/Demo03StudentForm.vue
  60. 1 1
      src/views/infra/demo/demo03/normal/Demo03StudentForm.vue
  61. 2 2
      src/views/infra/fileConfig/FileConfigForm.vue
  62. 1 1
      src/views/mall/home/components/TradeTrendCard.vue
  63. 1 1
      src/views/mall/product/brand/BrandForm.vue
  64. 1 1
      src/views/mall/product/category/CategoryForm.vue
  65. 1 1
      src/views/mall/product/spu/components/SkuTableSelect.vue
  66. 1 1
      src/views/mall/product/spu/components/SpuTableSelect.vue
  67. 1 1
      src/views/mall/product/spu/form/DeliveryForm.vue
  68. 4 4
      src/views/mall/product/spu/form/SkuForm.vue
  69. 3 3
      src/views/mall/promotion/article/ArticleForm.vue
  70. 1 1
      src/views/mall/promotion/article/category/ArticleCategoryForm.vue
  71. 2 2
      src/views/mall/promotion/banner/BannerForm.vue
  72. 5 5
      src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
  73. 1 1
      src/views/mall/promotion/diy/template/decorate.vue
  74. 12 12
      src/views/mall/promotion/kefu/components/KeFuConversationList.vue
  75. 3 2
      src/views/mall/promotion/kefu/components/KeFuMessageList.vue
  76. 1 1
      src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue
  77. 17 5
      src/views/mall/promotion/kefu/components/message/OrderItem.vue
  78. 6 5
      src/views/mall/promotion/kefu/components/message/ProductItem.vue
  79. 2 2
      src/views/mall/promotion/kefu/components/tools/emoji.ts
  80. 1 1
      src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
  81. 2 2
      src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
  82. 2 2
      src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
  83. 3 3
      src/views/mall/trade/config/index.vue
  84. 1 1
      src/views/mall/trade/delivery/express/ExpressForm.vue
  85. 1 1
      src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
  86. 1 1
      src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
  87. 1 1
      src/views/mall/trade/order/components/OrderTableColumn.vue
  88. 3 2
      src/views/mall/trade/order/detail/index.vue
  89. 2 2
      src/views/mall/trade/order/form/OrderDeliveryForm.vue
  90. 1 1
      src/views/member/group/GroupForm.vue
  91. 1 1
      src/views/member/level/LevelForm.vue
  92. 1 1
      src/views/member/signin/config/SignInConfigForm.vue
  93. 2 2
      src/views/member/user/UserForm.vue
  94. 2 2
      src/views/member/user/components/UserPointUpdateForm.vue
  95. 2 2
      src/views/member/user/detail/UserBrokerageList.vue
  96. 1 1
      src/views/pay/app/components/AppForm.vue
  97. 6 6
      src/views/pay/app/components/channel/AlipayChannelForm.vue
  98. 1 1
      src/views/pay/app/components/channel/MockChannelForm.vue
  99. 1 1
      src/views/pay/app/components/channel/WalletChannelForm.vue
  100. 3 3
      src/views/pay/app/components/channel/WeixinChannelForm.vue

+ 33 - 33
src/components/Crontab/src/Crontab.vue

@@ -548,10 +548,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.second.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.second.type == '1'" label="范围">
@@ -607,10 +607,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.minute.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.minute.type == '1'" label="范围">
@@ -666,10 +666,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.hour.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.hour.type == '1'" label="范围">
@@ -725,12 +725,12 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.day.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
-                <el-radio-button label="4">本月最后一天</el-radio-button>
-                <el-radio-button label="5">不指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button value="4">本月最后一天</el-radio-button>
+                <el-radio-button value="5">不指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.day.type == '1'" label="范围">
@@ -786,10 +786,10 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.month.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.month.type == '1'" label="范围">
@@ -846,12 +846,12 @@ const inputChange = () => {
             <el-form>
               <el-form-item label="类型">
                 <el-radio-group v-model="cronValue.week.type">
-                  <el-radio-button label="0">任意值</el-radio-button>
-                  <el-radio-button label="1">范围</el-radio-button>
-                  <el-radio-button label="2">间隔</el-radio-button>
-                  <el-radio-button label="3">指定</el-radio-button>
-                  <el-radio-button label="4">本月最后一周</el-radio-button>
-                  <el-radio-button label="5">不指定</el-radio-button>
+                  <el-radio-button value="0">任意值</el-radio-button>
+                  <el-radio-button value="1">范围</el-radio-button>
+                  <el-radio-button value="2">间隔</el-radio-button>
+                  <el-radio-button value="3">指定</el-radio-button>
+                  <el-radio-button value="4">本月最后一周</el-radio-button>
+                  <el-radio-button value="5">不指定</el-radio-button>
                 </el-radio-group>
               </el-form-item>
               <el-form-item v-if="cronValue.week.type == '1'" label="范围">
@@ -925,11 +925,11 @@ const inputChange = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.year.type">
-                <el-radio-button label="-1">忽略</el-radio-button>
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="-1">忽略</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.year.type == '1'" label="范围">

+ 2 - 2
src/components/DiyEditor/components/ComponentContainerProperty.vue

@@ -11,8 +11,8 @@
         <el-form :model="formData" label-width="80px">
           <el-form-item label="组件背景" prop="bgType">
             <el-radio-group v-model="formData.bgType">
-              <el-radio label="color">纯色</el-radio>
-              <el-radio label="img">图片</el-radio>
+              <el-radio value="color">纯色</el-radio>
+              <el-radio value="img">图片</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="选择颜色" prop="bgColor" v-if="formData.bgType === 'color'">

+ 6 - 6
src/components/DiyEditor/components/mobile/Carousel/property.vue

@@ -5,12 +5,12 @@
         <el-form-item label="样式" prop="type">
           <el-radio-group v-model="formData.type">
             <el-tooltip class="item" content="默认" placement="bottom">
-              <el-radio-button label="default">
+              <el-radio-button value="default">
                 <Icon icon="system-uicons:carousel" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="卡片" placement="bottom">
-              <el-radio-button label="card">
+              <el-radio-button value="card">
                 <Icon icon="ic:round-view-carousel" />
               </el-radio-button>
             </el-tooltip>
@@ -18,8 +18,8 @@
         </el-form-item>
         <el-form-item label="指示器" prop="indicator">
           <el-radio-group v-model="formData.indicator">
-            <el-radio label="dot">小圆点</el-radio>
-            <el-radio label="number">数字</el-radio>
+            <el-radio value="dot">小圆点</el-radio>
+            <el-radio value="number">数字</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否轮播" prop="autoplay">
@@ -43,8 +43,8 @@
           <template #default="{ element }">
             <el-form-item label="类型" prop="type" class="m-b-8px!" label-width="40px">
               <el-radio-group v-model="element.type">
-                <el-radio label="img">图片</el-radio>
-                <el-radio label="video">视频</el-radio>
+                <el-radio value="img">图片</el-radio>
+                <el-radio value="video">视频</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item

+ 3 - 3
src/components/DiyEditor/components/mobile/CouponCard/property.vue

@@ -26,17 +26,17 @@
         <el-form-item label="列数" prop="type">
           <el-radio-group v-model="formData.columns">
             <el-tooltip class="item" content="一列" placement="bottom">
-              <el-radio-button :label="1">
+              <el-radio-button :value="1">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="二列" placement="bottom">
-              <el-radio-button :label="2">
+              <el-radio-button :value="2">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button :label="3">
+              <el-radio-button :value="3">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

+ 3 - 3
src/components/DiyEditor/components/mobile/Divider/property.vue

@@ -11,7 +11,7 @@
           :key="index"
           :content="item.text"
         >
-          <el-radio-button :label="item.type">
+          <el-radio-button :value="item.type">
             <Icon :icon="item.icon" />
           </el-radio-button>
         </el-tooltip>
@@ -24,12 +24,12 @@
       <el-form-item label="左右边距" prop="paddingType">
         <el-radio-group v-model="formData!.paddingType">
           <el-tooltip content="无边距" placement="top">
-            <el-radio-button label="none">
+            <el-radio-button value="none">
               <Icon icon="tabler:box-padding" />
             </el-radio-button>
           </el-tooltip>
           <el-tooltip content="左右留边" placement="top">
-            <el-radio-button label="horizontal">
+            <el-radio-button value="horizontal">
               <Icon icon="vaadin:padding" />
             </el-radio-button>
           </el-tooltip>

+ 2 - 2
src/components/DiyEditor/components/mobile/FloatingActionButton/property.vue

@@ -3,8 +3,8 @@
     <el-card header="按钮配置" class="property-group" shadow="never">
       <el-form-item label="展开方向" prop="direction">
         <el-radio-group v-model="formData.direction">
-          <el-radio label="vertical">垂直</el-radio>
-          <el-radio label="horizontal">水平</el-radio>
+          <el-radio value="vertical">垂直</el-radio>
+          <el-radio value="horizontal">水平</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="显示文字" prop="showText">

+ 2 - 2
src/components/DiyEditor/components/mobile/MenuGrid/property.vue

@@ -4,8 +4,8 @@
     <el-form label-width="80px" :model="formData" class="m-t-8px">
       <el-form-item label="每行数量" prop="column">
         <el-radio-group v-model="formData.column">
-          <el-radio :label="3">3个</el-radio>
-          <el-radio :label="4">4个</el-radio>
+          <el-radio :value="3">3个</el-radio>
+          <el-radio :value="4">4个</el-radio>
         </el-radio-group>
       </el-form-item>
 

+ 7 - 7
src/components/DiyEditor/components/mobile/MenuSwiper/property.vue

@@ -4,21 +4,21 @@
     <el-form label-width="80px" :model="formData" class="m-t-8px">
       <el-form-item label="布局" prop="layout">
         <el-radio-group v-model="formData.layout">
-          <el-radio label="iconText">图标+文字</el-radio>
-          <el-radio label="icon">仅图标</el-radio>
+          <el-radio value="iconText">图标+文字</el-radio>
+          <el-radio value="icon">仅图标</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="行数" prop="row">
         <el-radio-group v-model="formData.row">
-          <el-radio :label="1">1行</el-radio>
-          <el-radio :label="2">2行</el-radio>
+          <el-radio :value="1">1行</el-radio>
+          <el-radio :value="2">2行</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="列数" prop="column">
         <el-radio-group v-model="formData.column">
-          <el-radio :label="3">3列</el-radio>
-          <el-radio :label="4">4列</el-radio>
-          <el-radio :label="5">5列</el-radio>
+          <el-radio :value="3">3列</el-radio>
+          <el-radio :value="4">4列</el-radio>
+          <el-radio :value="5">5列</el-radio>
         </el-radio-group>
       </el-form-item>
 

+ 3 - 3
src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue

@@ -14,9 +14,9 @@
     <template v-if="selectedHotAreaIndex === cellIndex">
       <el-form-item label="类型" :prop="`cell[${cellIndex}].type`">
         <el-radio-group v-model="cell.type">
-          <el-radio label="text">文字</el-radio>
-          <el-radio label="image">图片</el-radio>
-          <el-radio label="search">搜索框</el-radio>
+          <el-radio value="text">文字</el-radio>
+          <el-radio value="image">图片</el-radio>
+          <el-radio value="search">搜索框</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 1. 文字 -->

+ 6 - 6
src/components/DiyEditor/components/mobile/NavigationBar/property.vue

@@ -2,27 +2,27 @@
   <el-form label-width="80px" :model="formData" :rules="rules">
     <el-form-item label="样式" prop="styleType">
       <el-radio-group v-model="formData!.styleType">
-        <el-radio label="normal">标准</el-radio>
+        <el-radio value="normal">标准</el-radio>
         <el-tooltip
           content="沉侵式头部仅支持微信小程序、APP,建议页面第一个组件为图片展示类组件"
           placement="top"
         >
-          <el-radio label="inner">沉浸式</el-radio>
+          <el-radio value="inner">沉浸式</el-radio>
         </el-tooltip>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'inner'">
       <el-radio-group v-model="formData!.alwaysShow">
-        <el-radio :label="false">关闭</el-radio>
+        <el-radio :value="false">关闭</el-radio>
         <el-tooltip content="常驻显示关闭后,头部小组件将在页面滑动时淡入" placement="top">
-          <el-radio :label="true">开启</el-radio>
+          <el-radio :value="true">开启</el-radio>
         </el-tooltip>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="背景类型" prop="bgType">
       <el-radio-group v-model="formData.bgType">
-        <el-radio label="color">纯色</el-radio>
-        <el-radio label="img">图片</el-radio>
+        <el-radio value="color">纯色</el-radio>
+        <el-radio value="img">图片</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="背景颜色" prop="bgColor" v-if="formData.bgType === 'color'">

+ 2 - 2
src/components/DiyEditor/components/mobile/Popover/property.vue

@@ -11,10 +11,10 @@
         <el-form-item label="显示次数" :prop="`list[${index}].showType`">
           <el-radio-group v-model="element.showType">
             <el-tooltip content="只显示一次,下次打开时不显示" placement="bottom">
-              <el-radio label="once">一次</el-radio>
+              <el-radio value="once">一次</el-radio>
             </el-tooltip>
             <el-tooltip content="每次打开时都会显示" placement="bottom">
-              <el-radio label="always">不限</el-radio>
+              <el-radio value="always">不限</el-radio>
             </el-tooltip>
           </el-radio-group>
         </el-form-item>

+ 5 - 5
src/components/DiyEditor/components/mobile/ProductCard/property.vue

@@ -8,17 +8,17 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列大图" placement="bottom">
-              <el-radio-button label="oneColBigImg">
+              <el-radio-button value="oneColBigImg">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="单列小图" placement="bottom">
-              <el-radio-button label="oneColSmallImg">
+              <el-radio-button value="oneColSmallImg">
                 <Icon icon="fluent:text-column-two-left-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="双列" placement="bottom">
-              <el-radio-button label="twoCol">
+              <el-radio-button value="twoCol">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
@@ -74,8 +74,8 @@
       <el-card header="按钮" class="property-group" shadow="never">
         <el-form-item label="按钮类型" prop="btnBuy.type">
           <el-radio-group v-model="formData.btnBuy.type">
-            <el-radio-button label="text">文字</el-radio-button>
-            <el-radio-button label="img">图片</el-radio-button>
+            <el-radio-button value="text">文字</el-radio-button>
+            <el-radio-button value="img">图片</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <template v-if="formData.btnBuy.type === 'text'">

+ 3 - 3
src/components/DiyEditor/components/mobile/ProductList/property.vue

@@ -8,17 +8,17 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="双列" placement="bottom">
-              <el-radio-button label="twoCol">
+              <el-radio-button value="twoCol">
                 <Icon icon="fluent:text-column-two-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button label="threeCol">
+              <el-radio-button value="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="水平滑动" placement="bottom">
-              <el-radio-button label="horizSwiper">
+              <el-radio-button value="horizSwiper">
                 <Icon icon="system-uicons:carousel" />
               </el-radio-button>
             </el-tooltip>

+ 2 - 2
src/components/DiyEditor/components/mobile/PromotionCombination/property.vue

@@ -17,12 +17,12 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列" placement="bottom">
-              <el-radio-button label="oneCol">
+              <el-radio-button value="oneCol">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button label="threeCol">
+              <el-radio-button value="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

+ 2 - 2
src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue

@@ -17,12 +17,12 @@
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
             <el-tooltip class="item" content="单列" placement="bottom">
-              <el-radio-button label="oneCol">
+              <el-radio-button value="oneCol">
                 <Icon icon="fluent:text-column-one-24-filled" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip class="item" content="三列" placement="bottom">
-              <el-radio-button label="threeCol">
+              <el-radio-button value="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>

+ 4 - 4
src/components/DiyEditor/components/mobile/SearchBar/property.vue

@@ -13,12 +13,12 @@
         <el-form-item label="框体样式">
           <el-radio-group v-model="formData!.borderRadius">
             <el-tooltip content="方形" placement="top">
-              <el-radio-button :label="0">
+              <el-radio-button :value="0">
                 <Icon icon="tabler:input-search" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="圆形" placement="top">
-              <el-radio-button :label="10">
+              <el-radio-button :value="10">
                 <Icon icon="iconoir:input-search" />
               </el-radio-button>
             </el-tooltip>
@@ -30,12 +30,12 @@
         <el-form-item label="文本位置" prop="placeholderPosition">
           <el-radio-group v-model="formData!.placeholderPosition">
             <el-tooltip content="居左" placement="top">
-              <el-radio-button label="left">
+              <el-radio-button value="left">
                 <Icon icon="ant-design:align-left-outlined" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="居中" placement="top">
-              <el-radio-button label="center">
+              <el-radio-button value="center">
                 <Icon icon="ant-design:align-center-outlined" />
               </el-radio-button>
             </el-tooltip>

+ 2 - 2
src/components/DiyEditor/components/mobile/TabBar/property.vue

@@ -27,8 +27,8 @@
       </el-form-item>
       <el-form-item label="导航背景">
         <el-radio-group v-model="formData!.style.bgType">
-          <el-radio-button label="color">纯色</el-radio-button>
-          <el-radio-button label="img">图片</el-radio-button>
+          <el-radio-button value="color">纯色</el-radio-button>
+          <el-radio-button value="img">图片</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="选择颜色" v-if="formData!.style.bgType === 'color'">

+ 5 - 5
src/components/DiyEditor/components/mobile/TitleBar/property.vue

@@ -10,12 +10,12 @@
         <el-form-item label="标题位置" prop="textAlign">
           <el-radio-group v-model="formData!.textAlign">
             <el-tooltip content="居左" placement="top">
-              <el-radio-button label="left">
+              <el-radio-button value="left">
                 <Icon icon="ant-design:align-left-outlined" />
               </el-radio-button>
             </el-tooltip>
             <el-tooltip content="居中" placement="top">
-              <el-radio-button label="center">
+              <el-radio-button value="center">
                 <Icon icon="ant-design:align-center-outlined" />
               </el-radio-button>
             </el-tooltip>
@@ -88,9 +88,9 @@
         <template v-if="formData.more.show">
           <el-form-item label="样式" prop="more.type">
             <el-radio-group v-model="formData.more.type">
-              <el-radio label="text">文字</el-radio>
-              <el-radio label="icon">图标</el-radio>
-              <el-radio label="all">文字+图标</el-radio>
+              <el-radio value="text">文字</el-radio>
+              <el-radio value="icon">图标</el-radio>
+              <el-radio value="all">文字+图标</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="更多文字" prop="more.text" v-show="formData.more.type !== 'icon'">

+ 3 - 3
src/components/ShortcutDateRangePicker/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-row items-center gap-2">
     <el-radio-group v-model="shortcutDays" @change="handleShortcutDaysChange">
-      <el-radio-button :label="1">昨天</el-radio-button>
-      <el-radio-button :label="7">最近7天</el-radio-button>
-      <el-radio-button :label="30">最近30天</el-radio-button>
+      <el-radio-button :value="1">昨天</el-radio-button>
+      <el-radio-button :value="7">最近7天</el-radio-button>
+      <el-radio-button :value="30">最近30天</el-radio-button>
     </el-radio-group>
     <el-date-picker
       v-model="times"

+ 3 - 0
src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

@@ -45,17 +45,20 @@
           <el-checkbox
             v-model="loopInstanceForm.asyncBefore"
             label="异步前"
+            value="异步前"
             @change="updateLoopAsync('asyncBefore')"
           />
           <el-checkbox
             v-model="loopInstanceForm.asyncAfter"
             label="异步后"
+            value="异步后"
             @change="updateLoopAsync('asyncAfter')"
           />
           <el-checkbox
             v-model="loopInstanceForm.exclusive"
             v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
             label="排除"
+            value="排除"
             @change="updateLoopAsync('exclusive')"
           />
         </el-form-item>

+ 8 - 1
src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue

@@ -6,13 +6,20 @@
         <el-checkbox
           v-model="taskConfigForm.asyncBefore"
           label="异步前"
+          value="异步前"
+          @change="changeTaskAsync"
+        />
+        <el-checkbox
+          v-model="taskConfigForm.asyncAfter"
+          label="异步后"
+          value="异步后"
           @change="changeTaskAsync"
         />
-        <el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />
         <el-checkbox
           v-model="taskConfigForm.exclusive"
           v-if="taskConfigForm.asyncAfter || taskConfigForm.asyncBefore"
           label="排除"
+          value="排除"
           @change="changeTaskAsync"
         />
       </el-form-item>

+ 0 - 11
src/styles/theme.scss

@@ -4,14 +4,3 @@
 // .dark .dark\:text-color {
 //   color: rgba(255, 255, 255, var(--dark-text-color));
 // }
-
-// 登录页
-.dark .login-form {
-  .el-divider__text {
-    background-color: var(--login-bg-color);
-  }
-
-  .el-card {
-    background-color: var(--login-bg-color);
-  }
-}

+ 2 - 2
src/utils/formatTime.ts

@@ -66,10 +66,10 @@ export const defaultShortcuts = [
 export function formatDate(date: Date, format?: string): string {
   // 日期不存在,则返回空
   if (!date) {
-    return ''
+    return '';
   }
   // 日期存在,则进行格式化
-  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
+  return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '';
 }
 
 /**

+ 12 - 0
src/views/Login/Login.vue

@@ -104,3 +104,15 @@ $prefix-cls: #{$namespace}-login;
   }
 }
 </style>
+
+<style lang="scss">
+.dark .login-form {
+  .el-divider__text {
+    background-color: var(--login-bg-color);
+  }
+
+  .el-card {
+    background-color: var(--login-bg-color);
+  }
+}
+</style>

+ 1 - 1
src/views/Login/components/SSOLogin.vue

@@ -14,7 +14,7 @@
             <el-checkbox
               v-for="scope in queryParams.scopes"
               :key="scope"
-              :label="scope"
+              :value="scope"
               style="display: block; margin-bottom: -10px"
             >
               {{ formatScope(scope) }}

+ 3 - 3
src/views/Profile/components/BasicInfo.vue

@@ -2,8 +2,8 @@
   <Form ref="formRef" :labelWidth="200" :rules="rules" :schema="schema">
     <template #sex="form">
       <el-radio-group v-model="form['sex']">
-        <el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
-        <el-radio :label="2">{{ t('profile.user.woman') }}</el-radio>
+        <el-radio :value="1">{{ t('profile.user.man') }}</el-radio>
+        <el-radio :value="2">{{ t('profile.user.woman') }}</el-radio>
       </el-radio-group>
     </template>
   </Form>
@@ -27,7 +27,7 @@ defineOptions({ name: 'BasicInfo' })
 
 const { t } = useI18n()
 const message = useMessage() // 消息弹窗
-const userStore = useUserStore() 
+const userStore = useUserStore()
 // 表单校验
 const rules = reactive<FormRules>({
   nickname: [{ required: true, message: t('profile.rules.nickname'), trigger: 'blur' }],

+ 1 - 1
src/views/ai/model/apiKey/ApiKeyForm.vue

@@ -31,7 +31,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/ai/model/chatModel/ChatModelForm.vue

@@ -41,7 +41,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 3 - 3
src/views/ai/model/chatRole/ChatRoleForm.vue

@@ -37,7 +37,7 @@
           <el-radio
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -51,7 +51,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -69,7 +69,7 @@ import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ChatRoleApi, ChatRoleVO } from '@/api/ai/model/chatRole'
 import { CommonStatusEnum } from '@/utils/constants'
 import { ChatModelApi, ChatModelVO } from '@/api/ai/model/chatModel'
-import {FormRules} from "element-plus";
+import { FormRules } from 'element-plus'
 
 /** AI 聊天角色 表单 */
 defineOptions({ name: 'ChatRoleForm' })

+ 7 - 13
src/views/ai/music/index/mode/index.vue

@@ -1,20 +1,14 @@
 <template>
   <ContentWrap class="w-300px h-full mb-[0!important]">
     <el-radio-group v-model="generateMode" class="mb-15px">
-      <el-radio-button label="desc">
-        描述模式
-      </el-radio-button>
-      <el-radio-button label="lyric">
-        歌词模式
-      </el-radio-button>
+      <el-radio-button value="desc"> 描述模式 </el-radio-button>
+      <el-radio-button value="lyric"> 歌词模式 </el-radio-button>
     </el-radio-group>
 
     <!-- 描述模式/歌词模式 切换 -->
-    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef"/>
+    <component :is="generateMode === 'desc' ? desc : lyric" ref="modeRef" />
 
-    <el-button type="primary" round class="w-full" @click="generateMusic">
-      创作音乐
-    </el-button>
+    <el-button type="primary" round class="w-full" @click="generateMusic"> 创作音乐 </el-button>
   </ContentWrap>
 </template>
 
@@ -34,8 +28,8 @@ const modeRef = ref<Nullable<{ formData: Recordable }>>(null)
  *@Description: 根据信息生成音乐
  *@MethodAuthor: xiaohong
  *@Date: 2024-06-27 16:40:16
-*/
-function generateMusic () {
-  emits('generate-music', {formData: unref(modeRef)?.formData})
+ */
+function generateMusic() {
+  emits('generate-music', { formData: unref(modeRef)?.formData })
 }
 </script>

+ 1 - 1
src/views/bpm/category/CategoryForm.vue

@@ -18,7 +18,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/bpm/form/editor/index.vue

@@ -22,7 +22,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/bpm/group/UserGroupForm.vue

@@ -28,7 +28,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/bpm/model/ModelForm.vue

@@ -62,7 +62,7 @@
             <el-radio
               v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_FORM_TYPE)"
               :key="dict.value"
-              :label="dict.value"
+              :value="dict.value"
             >
               {{ dict.label }}
             </el-radio>

+ 1 - 1
src/views/bpm/processExpression/ProcessExpressionForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="减签任务" prop="id">
         <el-radio-group v-model="formData.id">
-          <el-radio-button v-for="item in childrenTaskList" :key="item.id" :label="item.id">
+          <el-radio-button v-for="item in childrenTaskList" :key="item.id" :value="item.id">
             {{ item.name }}
             ({{ item.assigneeUser?.deptName || item.ownerUser?.deptName }} -
             {{ item.assigneeUser?.nickname || item.ownerUser?.nickname }})

+ 1 - 1
src/views/bpm/processListener/ProcessListenerForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/crm/contact/ContactForm.vue

@@ -90,7 +90,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 2 - 2
src/views/crm/contract/config/index.vue

@@ -27,8 +27,8 @@
             @change="changeNotifyEnable"
             class="ml-4"
           >
-            <el-radio :label="false" size="large">不提醒</el-radio>
-            <el-radio :label="true" size="large">提醒</el-radio>
+            <el-radio :value="false" size="large">不提醒</el-radio>
+            <el-radio :value="true" size="large">提醒</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.notifyEnabled">

+ 4 - 4
src/views/crm/customer/poolConfig/index.vue

@@ -27,8 +27,8 @@
         <!-- 表单 -->
         <el-form-item label="客户公海规则设置" prop="enabled">
           <el-radio-group v-model="formData.enabled" @change="changeEnable" class="ml-4">
-            <el-radio :label="false" size="large">不启用</el-radio>
-            <el-radio :label="true" size="large">启用</el-radio>
+            <el-radio :value="false" size="large">不启用</el-radio>
+            <el-radio :value="true" size="large">启用</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.enabled">
@@ -44,8 +44,8 @@
               @change="changeNotifyEnable"
               class="ml-4"
             >
-              <el-radio :label="false" size="large">不提醒</el-radio>
-              <el-radio :label="true" size="large">提醒</el-radio>
+              <el-radio :value="false" size="large">不提醒</el-radio>
+              <el-radio :value="true" size="large">提醒</el-radio>
             </el-radio-group>
           </el-form-item>
           <div v-if="formData.notifyEnabled">

+ 4 - 4
src/views/crm/permission/components/PermissionForm.vue

@@ -23,7 +23,7 @@
             v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PERMISSION_LEVEL)"
             :key="dict.value"
           >
-            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :label="dict.value">
+            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :value="dict.value">
               {{ dict.label }}
             </el-radio>
           </template>
@@ -34,9 +34,9 @@
         label="同时添加至"
       >
         <el-checkbox-group v-model="formData.toBizTypes">
-          <el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
-          <el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
-          <el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
     </el-form>

+ 6 - 6
src/views/crm/permission/components/TransferForm.vue

@@ -20,8 +20,8 @@
       </el-form-item>
       <el-form-item label="老负责人">
         <el-radio-group v-model="oldOwnerHandler" @change="handleOwnerChange">
-          <el-radio :label="false" size="large">移除</el-radio>
-          <el-radio :label="true" size="large">加入团队</el-radio>
+          <el-radio :value="false" size="large">移除</el-radio>
+          <el-radio :value="true" size="large">加入团队</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="oldOwnerHandler" label="老负责人权限级别" prop="oldOwnerPermissionLevel">
@@ -30,7 +30,7 @@
             v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PERMISSION_LEVEL)"
             :key="dict.value"
           >
-            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :label="dict.value">
+            <el-radio v-if="dict.value != PermissionLevelEnum.OWNER" :value="dict.value">
               {{ dict.label }}
             </el-radio>
           </template>
@@ -38,9 +38,9 @@
       </el-form-item>
       <el-form-item v-if="bizType === BizTypeEnum.CRM_CUSTOMER" label="同时转移">
         <el-checkbox-group v-model="formData.toBizTypes">
-          <el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
-          <el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
-          <el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
+          <el-checkbox :value="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
     </el-form>

+ 1 - 1
src/views/erp/finance/account/AccountForm.vue

@@ -21,7 +21,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/erp/product/category/ProductCategoryForm.vue

@@ -31,7 +31,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/erp/product/product/ProductForm.vue

@@ -50,7 +50,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 1 - 1
src/views/erp/product/unit/ProductUnitForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :label="scope.row.id"
+              :value="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

+ 1 - 1
src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :label="scope.row.id"
+              :value="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

+ 1 - 1
src/views/erp/purchase/supplier/SupplierForm.vue

@@ -44,7 +44,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 1 - 1
src/views/erp/sale/customer/CustomerForm.vue

@@ -44,7 +44,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 1 - 1
src/views/erp/sale/order/components/SaleOrderOutEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :label="scope.row.id"
+              :value="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

+ 1 - 1
src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue

@@ -64,7 +64,7 @@
         <el-table-column align="center" width="65">
           <template #default="scope">
             <el-radio
-              :label="scope.row.id"
+              :value="scope.row.id"
               v-model="currentRowValue"
               @change="handleCurrentChange(scope.row)"
             >

+ 1 - 1
src/views/erp/stock/warehouse/WarehouseForm.vue

@@ -19,7 +19,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 6 - 6
src/views/infra/codegen/components/ColumInfoForm.vue

@@ -37,26 +37,26 @@
     </el-table-column>
     <el-table-column label="插入" min-width="4%">
       <template #default="scope">
-        <el-checkbox v-model="scope.row.createOperation" false-label="false" true-label="true" />
+        <el-checkbox v-model="scope.row.createOperation" false-value="false" true-value="true" />
       </template>
     </el-table-column>
     <el-table-column label="编辑" min-width="4%">
       <template #default="scope">
-        <el-checkbox v-model="scope.row.updateOperation" false-label="false" true-label="true" />
+        <el-checkbox v-model="scope.row.updateOperation" false-value="false" true-value="true" />
       </template>
     </el-table-column>
     <el-table-column label="列表" min-width="4%">
       <template #default="scope">
         <el-checkbox
           v-model="scope.row.listOperationResult"
-          false-label="false"
-          true-label="true"
+          false-value="false"
+          true-value="true"
         />
       </template>
     </el-table-column>
     <el-table-column label="查询" min-width="4%">
       <template #default="scope">
-        <el-checkbox v-model="scope.row.listOperation" false-label="false" true-label="true" />
+        <el-checkbox v-model="scope.row.listOperation" false-value="false" true-value="true" />
       </template>
     </el-table-column>
     <el-table-column label="查询方式" min-width="10%">
@@ -75,7 +75,7 @@
     </el-table-column>
     <el-table-column label="允许空" min-width="5%">
       <template #default="scope">
-        <el-checkbox v-model="scope.row.nullable" false-label="false" true-label="true" />
+        <el-checkbox v-model="scope.row.nullable" false-value="false" true-value="true" />
       </template>
     </el-table-column>
     <el-table-column label="显示类型" min-width="12%">

+ 2 - 2
src/views/infra/codegen/components/GenerateInfoForm.vue

@@ -285,8 +285,8 @@
             </span>
           </template>
           <el-radio-group v-model="formData.subJoinMany" placeholder="请选择">
-            <el-radio :label="true">一对多</el-radio>
-            <el-radio :label="false">一对一</el-radio>
+            <el-radio :value="true">一对多</el-radio>
+            <el-radio :value="false">一对一</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>

+ 1 - 1
src/views/infra/config/ConfigForm.vue

@@ -24,7 +24,7 @@
           <el-radio
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
             :key="dict.value as string"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/infra/demo/demo01/Demo01ContactForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/infra/demo/demo03/erp/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/infra/demo/demo03/inner/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/infra/demo/demo03/normal/Demo03StudentForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 2 - 2
src/views/infra/fileConfig/FileConfigForm.vue

@@ -66,8 +66,8 @@
       </el-form-item>
       <el-form-item v-if="formData.storage === 11" label="连接模式" prop="config.mode">
         <el-radio-group v-model="formData.config.mode">
-          <el-radio key="Active" label="Active">主动模式</el-radio>
-          <el-radio key="Passive" label="Passive">被动模式</el-radio>
+          <el-radio key="Active" value="Active">主动模式</el-radio>
+          <el-radio key="Passive" value="Passive">被动模式</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- S3 -->

+ 1 - 1
src/views/mall/home/components/TradeTrendCard.vue

@@ -6,7 +6,7 @@
         <!-- 查询条件 -->
         <div class="flex flex-row items-center gap-2">
           <el-radio-group v-model="timeRangeType" @change="handleTimeRangeTypeChange">
-            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :label="key">
+            <el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :value="key">
               {{ value.name }}
             </el-radio-button>
           </el-radio-group>

+ 1 - 1
src/views/mall/product/brand/BrandForm.vue

@@ -21,7 +21,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/mall/product/category/CategoryForm.vue

@@ -33,7 +33,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/mall/product/spu/components/SkuTableSelect.vue

@@ -3,7 +3,7 @@
     <el-table v-loading="loading" :data="list" show-overflow-tooltip>
       <el-table-column label="#" width="55">
         <template #default="{ row }">
-          <el-radio :label="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
+          <el-radio :value="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
             >&nbsp;
           </el-radio>
         </template>

+ 1 - 1
src/views/mall/product/spu/components/SpuTableSelect.vue

@@ -70,7 +70,7 @@
         <!-- 2. 单选模式 -->
         <el-table-column label="#" width="55" v-else>
           <template #default="{ row }">
-            <el-radio :label="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
+            <el-radio :value="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
               <!-- 空格不能省略,是为了让单选框不显示label,如果不指定label不会有选中的效果 -->
               &nbsp;
             </el-radio>

+ 1 - 1
src/views/mall/product/spu/form/DeliveryForm.vue

@@ -6,7 +6,7 @@
         <el-checkbox
           v-for="dict in getIntDictOptions(DICT_TYPE.TRADE_DELIVERY_TYPE)"
           :key="dict.value"
-          :label="dict.value"
+          :value="dict.value"
         >
           {{ dict.label }}
         </el-checkbox>

+ 4 - 4
src/views/mall/product/spu/form/SkuForm.vue

@@ -14,14 +14,14 @@
         class="w-80"
         @change="changeSubCommissionType"
       >
-        <el-radio :label="false">默认设置</el-radio>
-        <el-radio :label="true" class="radio">单独设置</el-radio>
+        <el-radio :value="false">默认设置</el-radio>
+        <el-radio :value="true" class="radio">单独设置</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item label="商品规格" props="specType">
       <el-radio-group v-model="formData.specType" class="w-80" @change="onChangeSpec">
-        <el-radio :label="false" class="radio">单规格</el-radio>
-        <el-radio :label="true">多规格</el-radio>
+        <el-radio :value="false" class="radio">单规格</el-radio>
+        <el-radio :value="true">多规格</el-radio>
       </el-radio-group>
     </el-form-item>
     <!-- 多规格添加-->

+ 3 - 3
src/views/mall/promotion/article/ArticleForm.vue

@@ -51,7 +51,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -64,7 +64,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -77,7 +77,7 @@
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 1 - 1
src/views/mall/promotion/article/category/ArticleCategoryForm.vue

@@ -20,7 +20,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 2 - 2
src/views/mall/promotion/banner/BannerForm.vue

@@ -34,7 +34,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -47,7 +47,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 5 - 5
src/views/mall/promotion/coupon/template/CouponTemplateForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -40,7 +40,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -101,8 +101,8 @@
       </el-form-item>
       <el-form-item label="领取方式" prop="takeType">
         <el-radio-group v-model="formData.takeType">
-          <el-radio :key="1" :label="1">直接领取</el-radio>
-          <el-radio :key="2" :label="2">指定发放</el-radio>
+          <el-radio :key="1" :value="1">直接领取</el-radio>
+          <el-radio :key="2" :value="2">指定发放</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formData.takeType === 1" label="发放数量" prop="totalCount">
@@ -130,7 +130,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/mall/promotion/diy/template/decorate.vue

@@ -18,7 +18,7 @@
         @change="handleTemplateItemChange"
       >
         <el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
-          <el-radio-button :label="index">
+          <el-radio-button :value="index">
             <Icon :icon="item.icon" :size="24" />
           </el-radio-button>
         </el-tooltip>

+ 12 - 12
src/views/mall/promotion/kefu/components/KeFuConversationList.vue

@@ -22,17 +22,16 @@
         <div class="ml-10px w-100%">
           <div class="flex justify-between items-center w-100%">
             <span class="username">{{ item.userNickname }}</span>
-            <span class="color-[#989EA6]">
-              {{ formatPast(item.lastMessageTime, 'YYYY-mm-dd') }}
+            <span class="color-[var(--left-menu-text-color)]" style="font-size: 13px;">
+              {{ formatPast(item.lastMessageTime, 'YYYY-MM-DD') }}
             </span>
           </div>
           <!-- 最后聊天内容 -->
           <div
-            v-dompurify-html="
-              getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)
-            "
-            class="last-message flex items-center color-[#989EA6]"
-          ></div>
+            v-dompurify-html="getConversationDisplayText(item.lastMessageContentType, item.lastMessageContent)"
+            class="last-message flex items-center color-[var(--left-menu-text-color)]"
+          >
+          </div>
         </div>
       </div>
     </div>
@@ -182,7 +181,7 @@ watch(showRightMenu, (val) => {
   &-conversation {
     height: 60px;
     padding: 10px;
-    background-color: #fff;
+    //background-color: #fff;
     transition: border-left 0.05s ease-in-out; /* 设置过渡效果 */
 
     .username {
@@ -196,6 +195,7 @@ watch(showRightMenu, (val) => {
     }
 
     .last-message {
+      font-size: 13px;
       width: 200px;
       overflow: hidden; // 隐藏超出的文本
       white-space: nowrap; // 禁止换行
@@ -205,16 +205,16 @@ watch(showRightMenu, (val) => {
 
   .active {
     border-left: 5px #3271ff solid;
-    background-color: #eff0f1;
+    background-color: var(--left-menu-bg-active-color);
   }
 
   .pinned {
-    background-color: #eff0f1;
+    background-color: var(--left-menu-bg-active-color);
   }
 
   .right-menu-ul {
     position: absolute;
-    background-color: #fff;
+    background-color: var(--app-content-bg-color);
     padding: 10px;
     margin: 0;
     list-style-type: none; /* 移除默认的项目符号 */
@@ -228,7 +228,7 @@ watch(showRightMenu, (val) => {
       border-radius: 12px;
       transition: background-color 0.3s; /* 平滑过渡 */
       &:hover {
-        background-color: #e0e0e0; /* 悬停时的背景颜色 */
+        background-color: var(--left-menu-bg-active-color); /* 悬停时的背景颜色 */
       }
     }
   }

+ 3 - 2
src/views/mall/promotion/kefu/components/KeFuMessageList.vue

@@ -369,9 +369,10 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
       position: absolute;
       bottom: 35px;
       right: 35px;
-      background-color: #fff;
+      background-color: var(--app-content-bg-color);
       padding: 10px;
       border-radius: 30px;
+      font-size: 12px;
       box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
     }
 
@@ -445,7 +446,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
       border-radius: 12rpx;
       padding: 8rpx 16rpx;
       margin-bottom: 16rpx;
-      background-color: #e8e8e8;
+      //background-color: #e8e8e8;
       color: #999;
       font-size: 24rpx;
     }

+ 1 - 1
src/views/mall/promotion/kefu/components/history/MemberBrowsingHistory.vue

@@ -7,7 +7,7 @@
       <el-tab-pane label="订单列表" name="b" />
     </el-tabs>
     <div>
-      <el-scrollbar ref="scrollbarRef" always height="calc(100vh - 400px)" @scroll="handleScroll">
+      <el-scrollbar ref="scrollbarRef" always height="calc(115vh - 400px)" @scroll="handleScroll">
         <!-- 最近浏览 -->
         <ProductBrowsingHistory v-if="activeName === 'a'" ref="productBrowsingHistoryRef" />
         <!-- 订单列表 -->

+ 17 - 5
src/views/mall/promotion/kefu/components/message/OrderItem.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isObject(getMessageContent)">
     <div :key="getMessageContent.id" class="order-list-card-box mt-14px">
-      <div class="order-card-header flex items-center justify-between p-x-20px">
+      <div class="order-card-header flex items-center justify-between p-x-5px">
         <div class="order-no">订单号:{{ getMessageContent.no }}</div>
         <div :class="formatOrderColor(getMessageContent)" class="order-state font-16">
           {{ formatOrderStatus(getMessageContent) }}
@@ -16,7 +16,7 @@
           :title="item.spuName"
         />
       </div>
-      <div class="pay-box flex justify-end pr-20px">
+      <div class="pay-box flex justify-end pr-5px">
         <div class="flex items-center">
           <div class="discounts-title pay-color"
             >共 {{ getMessageContent?.productCount }} 件商品,总金额:
@@ -97,18 +97,21 @@ function formatOrderStatus(order: any) {
 .order-list-card-box {
   border-radius: 10px;
   padding: 10px;
-  background-color: #e2e2e2;
+  border: 1px #6a6a6a solid;
+  background-color: var(--app-content-bg-color);
 
   .order-card-header {
     height: 28px;
 
     .order-no {
-      font-size: 16px;
+      font-size: 10px;
       font-weight: 500;
     }
   }
 
   .pay-box {
+    padding-top: 10px;
+
     .discounts-title {
       font-size: 16px;
       line-height: normal;
@@ -123,24 +126,33 @@ function formatOrderStatus(order: any) {
     }
 
     .pay-color {
-      color: #333;
+      font-size: 13px;
+      color: var(--left-menu-text-color);
     }
   }
 }
 
 .warning-color {
   color: #faad14;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .danger-color {
   color: #ff3000;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .success-color {
   color: #52c41a;
+  font-size: 11px;
+  font-weight: bold;
 }
 
 .info-color {
   color: #999999;
+  font-size: 11px;
+  font-weight: bold;
 }
 </style>

+ 6 - 5
src/views/mall/promotion/kefu/components/message/ProductItem.vue

@@ -113,7 +113,8 @@ const skuString = computed(() => {
 .ss-order-card-warp {
   padding: 20px;
   border-radius: 10px;
-  background-color: #e2e2e2;
+  border: 1px #6a6a6a solid;
+  background-color: var(--app-content-bg-color);
 
   .img-box {
     width: 80px;
@@ -139,13 +140,13 @@ const skuString = computed(() => {
   }
 
   .title-text {
-    font-size: 16px;
+    font-size: 13px;
     font-weight: 500;
     line-height: 20px;
   }
 
   .spec-text {
-    font-size: 16px;
+    font-size: 10px;
     font-weight: 400;
     color: #999999;
     min-width: 0;
@@ -157,13 +158,13 @@ const skuString = computed(() => {
   }
 
   .price-text {
-    font-size: 16px;
+    font-size: 11px;
     font-weight: 500;
     font-family: OPPOSANS;
   }
 
   .total-text {
-    font-size: 16px;
+    font-size: 10px;
     font-weight: 400;
     line-height: 16px;
     color: #999999;

+ 2 - 2
src/views/mall/promotion/kefu/components/tools/emoji.ts

@@ -80,8 +80,8 @@ export const useEmoji = () => {
   /**
    * 将文本中的表情替换成图片
    *
-   * @param data 文本
    * @return 替换后的文本
+   * @param content 消息内容
    */
   const replaceEmoji = (content: string) => {
     let newData = content
@@ -93,7 +93,7 @@ export const useEmoji = () => {
           const emojiFile = getEmojiFileByName(item)
           newData = newData.replace(
             item,
-            `<img class="chat-img" style="width: 24px;height: 24px;margin: 0 3px;" src="${emojiFile}"/>`
+            `<img class="chat-img" style="width: 24px;height: 24px;margin: 0 3px;" src="${emojiFile}" alt=""/>`
           )
         })
       }

+ 1 - 1
src/views/mall/promotion/seckill/config/SeckillConfigForm.vue

@@ -32,7 +32,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 2 - 2
src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue

@@ -12,8 +12,8 @@
         <el-form-item label="用户类型" prop="level">
           <el-radio-group v-model="queryParams.level" @change="handleQuery">
             <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button label="1">一级推广人</el-radio-button>
-            <el-radio-button label="2">二级推广人</el-radio-button>
+            <el-radio-button value="1">一级推广人</el-radio-button>
+            <el-radio-button value="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">

+ 2 - 2
src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue

@@ -12,8 +12,8 @@
         <el-form-item label="用户类型" prop="level">
           <el-radio-group v-model="queryParams.level" @change="handleQuery">
             <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button label="1">一级推广人</el-radio-button>
-            <el-radio-button label="2">二级推广人</el-radio-button>
+            <el-radio-button value="1">一级推广人</el-radio-button>
+            <el-radio-button value="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="绑定时间" prop="bindUserTime">

+ 3 - 3
src/views/mall/trade/config/index.vue

@@ -82,7 +82,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -99,7 +99,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>
@@ -182,7 +182,7 @@
               <el-checkbox
                 v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-checkbox>

+ 1 - 1
src/views/mall/trade/delivery/express/ExpressForm.vue

@@ -25,7 +25,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue

@@ -20,7 +20,7 @@
               <el-radio
                 v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.value"
-                :label="dict.value"
+                :value="dict.value"
               >
                 {{ dict.label }}
               </el-radio>

+ 1 - 1
src/views/mall/trade/order/components/OrderTableColumn.vue

@@ -41,7 +41,7 @@
           <template #header>
             <div
               class="mr-[20px] h-[35px] flex items-center pl-[10px] pr-[10px]"
-              style="background-color: #f7f7f7"
+              style="background-color: var(--app-content-bg-color)"
             >
               <span class="mr-20px">订单号:{{ scope.row.no }} </span>
               <span class="mr-20px">下单时间:{{ formatDate(scope.row.createTime) }}</span>

+ 3 - 2
src/views/mall/trade/order/detail/index.vue

@@ -397,13 +397,14 @@ onMounted(async () => {
     align-items: center;
     min-height: 30px;
     padding: 10px;
-    background-color: #f7f8fa;
+    border-radius: var(--el-card-border-radius);
+    background-color: var(--app-content-bg-color);
 
     &::before {
       position: absolute;
       top: 10px;
       left: 13px; /* 将伪元素水平居中 */
-      border-color: transparent #f7f8fa transparent transparent; /* 尖角颜色,左侧朝向 */
+      border-color: transparent var(--app-content-bg-color) transparent transparent; /* 尖角颜色,左侧朝向 */
       border-style: solid;
       border-width: 8px; /* 调整尖角大小 */
       content: ''; /* 必须设置 content 属性 */

+ 2 - 2
src/views/mall/trade/order/form/OrderDeliveryForm.vue

@@ -3,8 +3,8 @@
     <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
       <el-form-item label="发货方式">
         <el-radio-group v-model="expressType">
-          <el-radio border label="express">快递物流</el-radio>
-          <el-radio border label="none">无需发货</el-radio>
+          <el-radio border value="express">快递物流</el-radio>
+          <el-radio border value="none">无需发货</el-radio>
         </el-radio-group>
       </el-form-item>
       <template v-if="expressType === 'express'">

+ 1 - 1
src/views/member/group/GroupForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/member/level/LevelForm.vue

@@ -67,7 +67,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 1 - 1
src/views/member/signin/config/SignInConfigForm.vue

@@ -24,7 +24,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 2 - 2
src/views/member/user/UserForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -35,7 +35,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 2 - 2
src/views/member/user/components/UserPointUpdateForm.vue

@@ -18,8 +18,8 @@
       </el-form-item>
       <el-form-item label="变动类型" prop="changeType">
         <el-radio-group v-model="formData.changeType">
-          <el-radio :label="1">增加</el-radio>
-          <el-radio :label="-1">减少</el-radio>
+          <el-radio :value="1">增加</el-radio>
+          <el-radio :value="-1">减少</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="变动积分" prop="changePoint">

+ 2 - 2
src/views/member/user/detail/UserBrokerageList.vue

@@ -11,8 +11,8 @@
       <el-form-item label="用户类型" prop="level">
         <el-radio-group v-model="queryParams.level" @change="handleQuery">
           <el-radio-button checked>全部</el-radio-button>
-          <el-radio-button label="1">一级推广人</el-radio-button>
-          <el-radio-button label="2">二级推广人</el-radio-button>
+          <el-radio-button value="1">一级推广人</el-radio-button>
+          <el-radio-button value="2">二级推广人</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="绑定时间" prop="bindUserTime">

+ 1 - 1
src/views/pay/app/components/AppForm.vue

@@ -18,7 +18,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
           >
             {{ dict.label }}
           </el-radio>

+ 6 - 6
src/views/pay/app/components/channel/AlipayChannelForm.vue

@@ -21,7 +21,7 @@
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               :key="parseInt(dict.value)"
-              :label="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
             >
               {{ dict.label }}
             </el-radio>
@@ -29,21 +29,21 @@
         </el-form-item>
         <el-form-item label="网关地址" label-width="180px" prop="config.serverUrl">
           <el-radio-group v-model="formData.config.serverUrl">
-            <el-radio label="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
-            <el-radio label="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
+            <el-radio value="https://openapi.alipay.com/gateway.do">线上环境</el-radio>
+            <el-radio value="https://openapi-sandbox.dl.alipaydev.com/gateway.do">
               沙箱环境
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="算法类型" label-width="180px" prop="config.signType">
           <el-radio-group v-model="formData.config.signType">
-            <el-radio key="RSA2" label="RSA2">RSA2</el-radio>
+            <el-radio key="RSA2" value="RSA2">RSA2</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="公钥类型" label-width="180px" prop="config.mode">
           <el-radio-group v-model="formData.config.mode">
-            <el-radio key="公钥模式" :label="1">公钥模式</el-radio>
-            <el-radio key="证书模式" :label="2">证书模式</el-radio>
+            <el-radio key="公钥模式" :value="1">公钥模式</el-radio>
+            <el-radio key="证书模式" :value="2">证书模式</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.config.mode === 1">

+ 1 - 1
src/views/pay/app/components/channel/MockChannelForm.vue

@@ -13,7 +13,7 @@
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               :key="parseInt(dict.value)"
-              :label="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
             >
               {{ dict.label }}
             </el-radio>

+ 1 - 1
src/views/pay/app/components/channel/WalletChannelForm.vue

@@ -13,7 +13,7 @@
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               :key="parseInt(dict.value)"
-              :label="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
             >
               {{ dict.label }}
             </el-radio>

+ 3 - 3
src/views/pay/app/components/channel/WeixinChannelForm.vue

@@ -34,7 +34,7 @@
             <el-radio
               v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
               :key="parseInt(dict.value)"
-              :label="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
             >
               {{ dict.label }}
             </el-radio>
@@ -42,8 +42,8 @@
         </el-form-item>
         <el-form-item label="API 版本" label-width="180px" prop="config.apiVersion">
           <el-radio-group v-model="formData.config.apiVersion">
-            <el-radio label="v2">v2</el-radio>
-            <el-radio label="v3">v3</el-radio>
+            <el-radio value="v2">v2</el-radio>
+            <el-radio value="v3">v3</el-radio>
           </el-radio-group>
         </el-form-item>
         <div v-if="formData.config.apiVersion === 'v2'">

Some files were not shown because too many files changed in this diff