Merge branch 'dev_1.1.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

src/iframe/home.js

@@ -6,7 +6,7 @@ const app = createApp(App)
 // 引入路由对象实例
 import router from '@/router/popup.js'
 import "ant-design-vue/dist/antd.css"; // or 'ant-design-vue/dist/antd.less'
-import { Button, message, Tooltip } from "ant-design-vue";
+import { Button, message, Tooltip, Switch } from "ant-design-vue";
 
 message.config({
     top: `10px`,
@@ -15,10 +15,11 @@ message.config({
 });
 app.use(Tooltip);
 app.use(Button);
+app.use(Switch)
 app.use(message);
 app.use(router)
 app.mount('#app')
 
-window.onload= () => {
+window.onload = () => {
     document.title = 'DeNet'
 }

src/view/components/popup-transactions.vue

@@ -184,15 +184,14 @@
 
                                         <!--支出—— -2：零钱余额支付 、-3： NFT盲盒余额支付 -->
                                         <span class="amount" v-if="item.bizType == -2 || item.bizType == -3 || item.bizType == -4">
-                                            -
                                             <a-tooltip :title="'-' + item.trxAmountValue">
-                                                {{ getBit(item.trxAmountValue) || 0 }}
+                                                -{{ getBit(item.trxAmountValue) || 0 }}
                                             </a-tooltip>
                                         </span>
                                         <!-- 收入—— bizType：1、2、3、4 -->
                                         <span class="amount" v-else>
-                                            <a-tooltip :title="item.trxAmountValue">
-                                                {{ getBit(item.trxAmountValue) || 0 }}
+                                            <a-tooltip :title="'+'+item.trxAmountValue">
+                                                +{{ getBit(item.trxAmountValue) || 0 }}
                                             </a-tooltip>
                                         </span>
 
@@ -418,6 +417,7 @@ const listScroll = (e) => {
                         align-items: center;
 
                         .amount {
+                            color: #E86F00;
                             max-width: 110px;
                             min-width: 20px;
                             display: inline-block;
@@ -427,7 +427,6 @@ const listScroll = (e) => {
 
                         .name {
                             margin-left: 3px;
-                            color: #E86F00;
                             max-width: 130px;
                             line-height: 14px;
                             font-size: 13px;