tangning 4 tháng trước cách đây
mục cha
commit
e74267751b

+ 13 - 1
src/views/account/details/data.ts

@@ -269,7 +269,19 @@ export const equityColumns: BasicColumn[] = [
   },
   {
     title: '充值方式',
-    dataIndex: 'payMethod',
+    dataIndex: 'payType',
+    customRender: ({ record }) => {
+      // 支付方式 付款方式,0表示微信,1表示支付宝,2表示paypal,3表示其他,4表示货到付款
+      const obj = {
+        0: '微信',
+        1: '支付宝',
+        2: 'paypal',
+        3: '其他',
+        4: '货到付款',
+      };
+
+      return obj[record.payType] || '-';
+    },
     width: 100,
   },
   {

+ 4 - 16
src/views/device/putModal.vue

@@ -109,7 +109,7 @@
             span: 18,
           },
           componentProps: {
-            options: getWifilist(1),
+            options: [],
           },
         },
         {
@@ -117,36 +117,23 @@
           component: 'Select',
           label: '设备颜色',
           required: true,
-          defaultValue: '黑色',
           colProps: {
             span: 18,
           },
           componentProps: {
-            options: getColor(1),
+            options: [],
           },
         },
         {
           field: 'version',
           component: 'Select',
-          defaultValue: '标准版',
           required: true,
           label: '设备版本',
           colProps: {
             span: 18,
           },
           componentProps: {
-            options: [
-              {
-                label: '标准版',
-                value: '标准版',
-                key: '1',
-              },
-              {
-                label: 'RTK版',
-                value: 'RTK版',
-                key: '2',
-              },
-            ],
+            options: [],
           },
         },
       ];
@@ -172,6 +159,7 @@
         modelRef.value = data;
         resetFields();
         let wifiNamePrefix = data.wifiName && data.wifiName.split('_')[0];
+        if (!data.id) return
         updateSchema([
           { field: 'colour', componentProps: { options: getColor(data.type || 1) } },
           {

+ 2 - 2
src/views/empower/modal/api/AddApiModal.vue

@@ -179,9 +179,9 @@
           createSuccessModal({
             title: t('layout.setting.operatingTitle'),
             content: h('div', {}, [
-              h('p', `授权Key:${res || fileFlow.key}`)
+              h('p', `API KEY:${res || fileFlow.key}`)
             ]),
-            okText: '复制授权Key',
+            okText: '复制',
             onOk: async () => {
               // 双击复制
               copyTextToClipboard(res || fileFlow.key);

+ 1 - 1
src/views/sys/login/LoginForm.vue

@@ -144,7 +144,7 @@
   async function handleLogin() {
     const data = await validForm();
     if (!data) return;
-    try {
+    try {overviewInfo.incrementCount
       loading.value = true;
       const userInfo = await userStore.login({
         password: data.password,