diff --git a/src/components/Icon/index.vue b/src/components/Icon/index.vue
index 57da369ca1a03ee71c70e8b2f63eb6229936c7d4..b0c2585adac564d6e3587cf05c369dabccb404b0 100644
--- a/src/components/Icon/index.vue
+++ b/src/components/Icon/index.vue
@@ -1,5 +1,6 @@
diff --git a/src/interface/icon.ts b/src/interface/icon.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e32c086b871b26996eea7eb021eec32e9867b3f1
--- /dev/null
+++ b/src/interface/icon.ts
@@ -0,0 +1,8 @@
+export interface IconOption {
+ type?: string // 图标类型
+ style?: object // 图标的样式
+ spin?: boolean // 旋转动画
+ rotate?: number // 旋转角度
+ twoToneColor?: string // 十六进制字符串 双色图标主要颜色
+ [propName: string]: any // 动态类型
+}
diff --git a/src/views/order/all-order/components/AllOrderTable.vue b/src/views/order/all-order/components/AllOrderTable.vue
index 972b98fcb95036fbf1ad4dbabdb7c0e7858ad84a..71fb7b75bc733a0678c1404ce62827dbdfe58864 100644
--- a/src/views/order/all-order/components/AllOrderTable.vue
+++ b/src/views/order/all-order/components/AllOrderTable.vue
@@ -14,9 +14,9 @@
-
-
- {{ orderPayMethod[data || 0].text }}
+
+
+ {{ orderPayMethod[data || 0].text }}
@@ -61,14 +61,12 @@
import { defineComponent, reactive, inject, watch, toRefs, ref } from 'vue'
import { useRoute } from 'vue-router'
import { ParamsData } from '@/model/order/AllOrder'
-import { SafetyOutlined } from '@ant-design/icons-vue'
import OrderTable from '@/components/OrderTable/index.vue'
import { columns, filterBtns, rowTop, tableEnum1, tableEnum2, tableEnum3 } from './tableConfig'
export default defineComponent({
components: {
OrderTable,
- SafetyOutlined,
},
props: {
tableRes: {
@@ -93,6 +91,13 @@ export default defineComponent({
current: 1,
size: 5,
},
+ icons: [
+ 'ExclamationCircleFilled',
+ 'AlipayCircleFilled',
+ 'WechatFilled',
+ 'CreditCardFilled',
+ 'TransactionFilled',
+ ],
slotName: 'name1',
})
const starOrder = ref(false)
@@ -190,18 +195,16 @@ export default defineComponent({
background: #fff;
}
}
+ .table-contain {
+ .paySpan {
+ .i-icon {
+ // border: 1px solid red;
+ }
+ }
+ }
.table-bottom {
text-align: right;
}
- .alipay-color {
- color: #3a78f6;
- }
- .wechat-color {
- color: #63c742;
- }
- .bank-color {
- color: #ce4646;
- }
.frist-td {
display: flex;
width: 100%;