瀏覽代碼

Merge branch 'develop' into feature

scorpio 2 年之前
父節點
當前提交
05be4efeb1
共有 3 個文件被更改,包括 6 次插入6 次删除
  1. 2 2
      src/page/login.vue
  2. 3 1
      src/views/home/component/dash.vue
  3. 1 3
      src/views/invest/index.vue

+ 2 - 2
src/page/login.vue

@@ -226,8 +226,8 @@ export default {
     return {
       flag: false,
       form: {
-        name: 'adminzj',
-        pass: '123456'
+        name: '',
+        pass: ''
       },
       rules: {
         name: [

+ 3 - 1
src/views/home/component/dash.vue

@@ -472,8 +472,10 @@ export default {
             type: 'number',
             precision: 2,
             formatter: (val, value, label) => {
-              if (val && val.length > 0) {
+              if (value) {
                 return val.total_amount.toLocaleString()
+              } else {
+                return 0
               }
             }
           },

+ 1 - 3
src/views/invest/index.vue

@@ -43,9 +43,6 @@
                     placement="bottom"
                     raw-content
                   >
-                    <el-icon size="16">
-                      <Warning />
-                    </el-icon>
                   </el-tooltip>
                 </div>
                 <div
@@ -133,6 +130,7 @@ import { useStore } from '@/store/user.js'
 
 export default {
   name: 'index',
+  // eslint-disable-next-line vue/no-unused-components
   components: { BasicContainer, left, years, amount, chart, chart2, complete },
   setup() {
     const user = useStore()