From cf0d36bbe155ecdfd8bca429666405e830d0dc7a Mon Sep 17 00:00:00 2001
From: XIGUASSR <623844246@qq.com>
Date: Sat, 12 Nov 2022 04:22:49 +0800
Subject: [PATCH] 最新
---
package-lock.json | 65 +++++++++------
src/page/transfer/index.vue | 2
package.json | 1
src/components/loginDialog.vue | 20 ++++-
src/page/kline/index.vue | 4
src/page/authentication/index.vue | 2
src/page/newUser/index.vue | 27 ++----
src/page/wallet/index.vue | 11 +-
src/page/kline/components/kLine.vue | 57 +++++++++++---
9 files changed, 119 insertions(+), 70 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1d0377a..2611dfa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,19 +8,19 @@
"name": "vue-liang-rong-wap",
"version": "1.0.0",
"dependencies": {
- "animate.css": "^3.5.1",
+ "animate.css": "^3.7.2",
"axios": "^0.19.0",
"bootstrap": "^4.4.1",
"chokidar": "^3.3.0",
"clipboard": "^2.0.4",
"echarts": "^4.5.0",
+ "element-resize-detector": "^1.2.4",
"element-ui": "^2.13.0",
"express": "^4.18.2",
"hqchart": "^1.1.8763",
"jquery": "^3.4.1",
"js-md5": "^0.7.3",
"lib-flexible": "^0.3.2",
- "lodash": "^4.17.21",
"mint-ui": "^2.2.13",
"pdfjs-dist": "2.2.228",
"qrcode": "^1.4.4",
@@ -62,7 +62,6 @@
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
"friendly-errors-webpack-plugin": "^1.6.1",
- "hqchart": "^1.1.10722",
"html-webpack-plugin": "^2.30.1",
"less": "^3.10.3",
"less-loader": "^5.0.0",
@@ -482,9 +481,9 @@
}
},
"node_modules/animate.css": {
- "version": "3.5.1",
- "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.5.1.tgz",
- "integrity": "sha512-DOdcY8JQdh4jChVqVRwu0WbTXtHzK/wJE6nYIx8CAz8LiuGDmbzWUxzguF6dG2R63n5WcFIcfXkzAcuc3fvjoQ=="
+ "version": "3.7.2",
+ "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.7.2.tgz",
+ "integrity": "sha512-0bE8zYo7C0KvgOYrSVfrzkbYk6IOTVPNqkiHg2cbyF4Pq/PXzilz4BRWA3hwEUBoMp5VBgrC29lQIZyhRWdBTw=="
},
"node_modules/ansi-escapes": {
"version": "3.2.0",
@@ -1819,6 +1818,11 @@
"version": "0.6.1",
"resolved": "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz",
"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+ },
+ "node_modules/batch-processor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz",
+ "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA=="
},
"node_modules/bfj-node4": {
"version": "5.3.1",
@@ -4475,6 +4479,14 @@
"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
},
+ "node_modules/element-resize-detector": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
+ "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==",
+ "dependencies": {
+ "batch-processor": "1.0.0"
+ }
+ },
"node_modules/element-ui": {
"version": "2.15.10",
"resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz",
@@ -6447,7 +6459,6 @@
"version": "1.1.11504",
"resolved": "https://registry.npmmirror.com/hqchart/-/hqchart-1.1.11504.tgz",
"integrity": "sha512-7BMn7+nrFd8ljoQodkE/DrBPfVWvjHrGTmio2CVOeef095u6ngyet7K9N42vvZzeuBwYJaOiZGofjTDwxMkIYA==",
- "dev": true,
"dependencies": {
"axios": "^0.16.2",
"echarts": "^4.8.0",
@@ -6468,7 +6479,6 @@
"resolved": "https://registry.npmmirror.com/axios/-/axios-0.16.2.tgz",
"integrity": "sha512-IMYFDrcVbUksQhsMYtWCM6KdNaDpr1NY56dpzaIgj92ecPVI29bf2sOgAf8aGTiq8UoixJD61Pj0Ahej5DPv7w==",
"deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
- "dev": true,
"dependencies": {
"follow-redirects": "^1.2.3",
"is-buffer": "^1.1.5"
@@ -6478,7 +6488,6 @@
"version": "1.4.13",
"resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-1.4.13.tgz",
"integrity": "sha512-EGdw/qC2RUmCDzAy3X06LL+jDWmrMezMndviE5CnUDi2XcZz/uZUVVj6bJ6piY+Flw7HNO+Ed81LXrdZ2v+nXA==",
- "dev": true,
"dependencies": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -6492,8 +6501,7 @@
"node_modules/hqchart/node_modules/vue-router": {
"version": "2.8.1",
"resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-2.8.1.tgz",
- "integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==",
- "dev": true
+ "integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA=="
},
"node_modules/hsl-regex": {
"version": "1.0.0",
@@ -12390,8 +12398,7 @@
"node_modules/promise-polyfill": {
"version": "6.1.0",
"resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
- "integrity": "sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ==",
- "dev": true
+ "integrity": "sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ=="
},
"node_modules/proxy-addr": {
"version": "2.0.7",
@@ -15161,7 +15168,6 @@
"version": "6.3.2",
"resolved": "https://registry.npmmirror.com/vue-class-component/-/vue-class-component-6.3.2.tgz",
"integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
- "dev": true,
"peer": true
},
"node_modules/vue-clipboard2": {
@@ -15318,7 +15324,6 @@
"version": "0.1.6",
"resolved": "https://registry.npmmirror.com/vue-plugin-timers/-/vue-plugin-timers-0.1.6.tgz",
"integrity": "sha512-RuWFHgyiY4Cc5rFIdEqLQ/dFkcYF+a0iurbC6Kv2w+hQC+mmi8ElU4Aw/2KJgxZhYd2CHQ3WpNnbXWRAhVx76g==",
- "dev": true,
"peerDependencies": {
"vue-class-component": "^6.2.0"
}
@@ -17826,9 +17831,9 @@
"integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
},
"animate.css": {
- "version": "3.5.1",
- "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.5.1.tgz",
- "integrity": "sha512-DOdcY8JQdh4jChVqVRwu0WbTXtHzK/wJE6nYIx8CAz8LiuGDmbzWUxzguF6dG2R63n5WcFIcfXkzAcuc3fvjoQ=="
+ "version": "3.7.2",
+ "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.7.2.tgz",
+ "integrity": "sha512-0bE8zYo7C0KvgOYrSVfrzkbYk6IOTVPNqkiHg2cbyF4Pq/PXzilz4BRWA3hwEUBoMp5VBgrC29lQIZyhRWdBTw=="
},
"ansi-escapes": {
"version": "3.2.0",
@@ -19030,6 +19035,11 @@
"version": "0.6.1",
"resolved": "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz",
"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+ },
+ "batch-processor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz",
+ "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA=="
},
"bfj-node4": {
"version": "5.3.1",
@@ -21272,6 +21282,14 @@
"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
},
+ "element-resize-detector": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
+ "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==",
+ "requires": {
+ "batch-processor": "1.0.0"
+ }
+ },
"element-ui": {
"version": "2.15.10",
"resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz",
@@ -22889,7 +22907,6 @@
"version": "1.1.11504",
"resolved": "https://registry.npmmirror.com/hqchart/-/hqchart-1.1.11504.tgz",
"integrity": "sha512-7BMn7+nrFd8ljoQodkE/DrBPfVWvjHrGTmio2CVOeef095u6ngyet7K9N42vvZzeuBwYJaOiZGofjTDwxMkIYA==",
- "dev": true,
"requires": {
"axios": "^0.16.2",
"echarts": "^4.8.0",
@@ -22906,7 +22923,6 @@
"version": "0.16.2",
"resolved": "https://registry.npmmirror.com/axios/-/axios-0.16.2.tgz",
"integrity": "sha512-IMYFDrcVbUksQhsMYtWCM6KdNaDpr1NY56dpzaIgj92ecPVI29bf2sOgAf8aGTiq8UoixJD61Pj0Ahej5DPv7w==",
- "dev": true,
"requires": {
"follow-redirects": "^1.2.3",
"is-buffer": "^1.1.5"
@@ -22916,7 +22932,6 @@
"version": "1.4.13",
"resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-1.4.13.tgz",
"integrity": "sha512-EGdw/qC2RUmCDzAy3X06LL+jDWmrMezMndviE5CnUDi2XcZz/uZUVVj6bJ6piY+Flw7HNO+Ed81LXrdZ2v+nXA==",
- "dev": true,
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -22927,8 +22942,7 @@
"vue-router": {
"version": "2.8.1",
"resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-2.8.1.tgz",
- "integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==",
- "dev": true
+ "integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA=="
}
}
},
@@ -27652,8 +27666,7 @@
"promise-polyfill": {
"version": "6.1.0",
"resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
- "integrity": "sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ==",
- "dev": true
+ "integrity": "sha512-g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ=="
},
"proxy-addr": {
"version": "2.0.7",
@@ -29961,7 +29974,6 @@
"version": "6.3.2",
"resolved": "https://registry.npmmirror.com/vue-class-component/-/vue-class-component-6.3.2.tgz",
"integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
- "dev": true,
"peer": true
},
"vue-clipboard2": {
@@ -30100,7 +30112,6 @@
"version": "0.1.6",
"resolved": "https://registry.npmmirror.com/vue-plugin-timers/-/vue-plugin-timers-0.1.6.tgz",
"integrity": "sha512-RuWFHgyiY4Cc5rFIdEqLQ/dFkcYF+a0iurbC6Kv2w+hQC+mmi8ElU4Aw/2KJgxZhYd2CHQ3WpNnbXWRAhVx76g==",
- "dev": true,
"requires": {}
},
"vue-router": {
diff --git a/package.json b/package.json
index d9731b1..41bc764 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"chokidar": "^3.3.0",
"clipboard": "^2.0.4",
"echarts": "^4.5.0",
+ "element-resize-detector": "^1.2.4",
"element-ui": "^2.13.0",
"express": "^4.18.2",
"hqchart": "^1.1.8763",
diff --git a/src/components/loginDialog.vue b/src/components/loginDialog.vue
index f521f0a..730711c 100644
--- a/src/components/loginDialog.vue
+++ b/src/components/loginDialog.vue
@@ -30,6 +30,8 @@
</template>
<script>
+import * as api from "@/axios/api";
+
export default {
name: "dialogVisible",
data() {
@@ -40,9 +42,7 @@
},
mounted() {
if (!this.routeShowPathArr.includes(this.$route.path)) { // 查找不弹出的path
- setTimeout(() => {
- this.dialogVisible = true;
- }, 1000);
+ this.getUserInfo();
}
},
methods: {
@@ -53,7 +53,19 @@
goToReg() {
this.dialogVisible = false;
this.$router.push('/register');
- }
+ },
+ async getUserInfo() {
+ // 获取用户信息
+ let data = await api.getUserInfo();
+ if (data.status === 0) {
+ // 判断是否登录
+ this.dialogVisible = false;
+ } else {
+ setTimeout(() => {
+ this.dialogVisible = true;
+ }, 1000);
+ }
+ },
}
};
</script>
diff --git a/src/page/authentication/index.vue b/src/page/authentication/index.vue
index 967843a..a90fd01 100644
--- a/src/page/authentication/index.vue
+++ b/src/page/authentication/index.vue
@@ -37,6 +37,7 @@
:on-success="handleAvatarSuccess"
:on-error="handleError"
:before-upload="beforeAvatarUpload"
+ :disabled="!showBtn"
>
<img v-if="form.img1key" :src="form.img1key" class="id-img avatar" />
<i v-else class="iconfont icon-zhaopian"></i>
@@ -55,6 +56,7 @@
:on-success="handleAvatarSuccess2"
:on-error="handleError2"
:before-upload="beforeAvatarUpload2"
+ :disabled="!showBtn"
>
<img v-if="form.img2key" :src="form.img2key" class="id-img avatar" />
<i v-else class="iconfont icon-zhaopian"></i>
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index 25824cb..9a121ab 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -52,15 +52,15 @@
<div class="btnGroup">
<div class="btn" v-for="(item) in KLineIndexMenu" :key="item.ID"
@click="ChangeKLineIndex(item)">{{ item.Name }}</div>
- </div>
+ </div>:class="{ active: KLinePeriodIndex == index }"
</div>-->
<div class="periodWrap kline_periodWrap" ref="kline_periodWrap">
<!-- DWM 分 -->
<div class="btnGroup" style="position:relative">
<div
class="btn2"
- :class="{ active: KLinePeriodIndex == index }"
v-for="(item, index) in KLinePeriodMenu"
+ :class="{ active: KLinePeriodIndex == index }"
:key="item.ID"
@click="index == 0 ? changeRightContent('minute') : OnClickKLinePeriodMenu(index, item, 'kline')"
>
@@ -1060,26 +1060,56 @@
created() {
const { query } = this.$route;
console.log(query, "33333");
- console.log(query.if_zhishu!= '0', "44444");
- if(query.if_zhishu== '0'){
+ console.log(query.if_zhishu != "0", "44444");
+ if (query.if_zhishu == "0") {
this.Symbol = `${query.code}_${query.sok}.${query.type}`;
- }else{
+ } else {
this.Symbol = `${query.if_zhishu}_${query.sok}.${query.type}`;
}
-
+
console.log(this.Symbol);
},
mounted() {
- console.log(this.NavMenuAry, "333333333");
+ this.offHeight = this.$refs["rightContent"].offsetHeight;
this.OnSize();
this.SetChartStyle();
this.$nextTick(() => {
this.CreateMinuteChart();
this.CreateKLineChart();
});
-
+ let that = this;
window.onresize = _.debounce(this.OnSize, 200);
+ // 自适应K线图
+ var elementResizeDetectorMaker = require("element-resize-detector");
+
+ // 创建实例，无参数
+ var erd = elementResizeDetectorMaker(); //使用默认选项（将使用基于对象的方法）。
+
+ // 创建实例带参数
+ // 使用基于超快速滚动的方法。
+ // 这是推荐的策略。
+ var erdUltraFast = elementResizeDetectorMaker({
+ strategy: "scroll",
+ callOnAdd: true, //callOnAdd选项，用于确定在添加侦听器时是否应调用它们。默认为true。
+ //如果为true，则确保在添加侦听器后将对其进行调用。如果为false，则在添加侦听器时将不保证其
+ //被调用（不会阻止其被调用）
+ debug: true
+ });
+ //监听class为staticNextMain的元素 大小变化
+ var self = this;
+ //侦听元素的调整大小事件，并使用元素作为调整大小事件的参数来调用侦听器函数。传递给函数的选项将
+ //覆盖实例选项
+ erd.listenTo(this.$refs["rightContent"], function(
+ element
+ ) {
+ var width = element.offsetWidth;
+ var height = element.offsetHeight;
+ self.tableHeight = height - 100; //将监听到的宽高进行赋值
+ self.tableWidth = width - 20;
+ that.offHeight = height;
+ that.OnSize();
+ });
},
methods: {
@@ -1090,18 +1120,14 @@
var indexWrap = this.$refs.minute_indexWrap;
var statementWrap = this.$refs.minute_statementWrap;
// var chartHeight = window.innerHeight - rightTab.offsetHeight - periodWrap.offsetHeight - indexWrap.offsetHeight;
- var chartHeight = 280;
+ var chartHeight = this.offHeight;
var kline = this.$refs.kline;
kline.style.width = width + "px";
kline.style.height = chartHeight + "px";
- console.log(width, chartHeight, '333333333333333333333');
-
- var chartHeight = 280;
var kline2 = this.$refs.kline2;
kline2.style.width = width + "px";
kline2.style.height = chartHeight + "px";
-
if (this.Chart) this.Chart.OnSize();
if (this.KLineChart) this.KLineChart.OnSize();
@@ -1453,6 +1479,11 @@
width: 0.5rem;
height: 0.5rem;
}
+ .active {
+ color: rgb(2, 99, 226);
+ font-weight: 800;
+ background: rgb(245, 245, 245);
+ }
}
canvas {
height: 100% !important;
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index b6561b0..933266b 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -211,7 +211,7 @@
</div>
</div>
</div>
- <div class="jianjie" :class="acseFlag ? 'isjj' : ''">
+ <div class="jianjie" :class="acseFlag ? 'isjj' : ''" ref="isjj" id="isjj">
<div class="top_jj">
<span>{{ '简介' }}</span>
</div>
@@ -228,7 +228,7 @@
<img src="../../assets/img/shoucangle.png" alt v-else />
</div>
<div class="right_xx" @click="handleJj()">
- <img src="../../assets/img/xiaoxi.png" alt />
+ <a href="#isjj"><img src="../../assets/img/xiaoxi.png" alt /></a>
</div>
</div>
<div class="rights">
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 47468ba..92f5396 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -4,10 +4,10 @@
<div class="top_icon">
<div class="right_icon">
<div @click="goToTopUp()">
- <img src="../../assets/img/qiandai.png" alt />
+ <img src="@/assets/img/qianbao.png" alt />
</div>
<div>
- <img src="../../assets/img/kefu.png" alt />
+ <img src="@/assets/img/kefu.png" alt />
</div>
</div>
</div>
@@ -15,15 +15,15 @@
<div class="left_tou">
<div class="left_tx">
<div>
- <img src="../../assets/img/eslogo.png" alt />
+ <img src="@/assets/img/eslogo.png" alt />
</div>
</div>
- <div class="right_name">
+ <div class="right_name" @click="$router.push('/wallet')">
<span>{{ userInfo.realName ? userInfo.realName : userInfo.phone }}</span>
</div>
</div>
<div class="right_go">
- <img src="../../assets/img/youjiantou.png" alt />
+ <img src="@/assets/img/youjiantou.png" alt />
</div>
</div>
<div class="center_card">
@@ -75,23 +75,11 @@
</div>
<div>
<span class="bzz" v-if="!selectUserFlag">{{ '¥ ' + $store.state.userInfo.userIndexAmt }}</span>
+ <span class="bzz" v-else>{{ '¥ ' + $store.state.userInfo.userAmt }}</span>
</div>
</div>
<div class="btns" @click="handleZh()" :class="selectUserFlag ? '' : 'active'">
<span>{{ selectUserFlag ? '切换指数账户' : '切换沪深账户' }}</span>
- </div>
- </div>
- <div class="jy">
- <div class="left_gn">
- <div class="l_icon">
- <img src="../../assets/img/shezhi.png" alt />
- </div>
- <div class="r_title">
- <span>{{ '设置' }}</span>
- </div>
- </div>
- <div class="right_gos">
- <img src="../../assets/img/youjiantou.png" alt />
</div>
</div>
<div class="jy" @click="goToSettings()">
@@ -160,7 +148,7 @@
</div>
</div>
</div>
- <van-popup v-model="settingDialog" position="bottom" :style="{ height: '35%' }">
+ <van-popup v-model="settingDialog" position="bottom" :style="{ height: '40%' }">
<div class="setting_content">
<div class="old_password">
<div class="left_titles">
@@ -574,4 +562,5 @@
}
}
}
+
</style>
\ No newline at end of file
diff --git a/src/page/transfer/index.vue b/src/page/transfer/index.vue
index b515864..ce2ed4b 100644
--- a/src/page/transfer/index.vue
+++ b/src/page/transfer/index.vue
@@ -222,7 +222,7 @@
border-radius: .15rem;
}
.is-selected {
- background: rgb(245, 245, 245) !important;
+ background: rgb(235, 235, 235) !important;
border-radius: .15rem;
}
.mint-navbar {
diff --git a/src/page/wallet/index.vue b/src/page/wallet/index.vue
index 5c05aaa..16e1cc0 100644
--- a/src/page/wallet/index.vue
+++ b/src/page/wallet/index.vue
@@ -3,14 +3,14 @@
<div class="content">
<div class="top_icon">
<div class="left_back" @click="handleBack()">
- <img src="../../assets/img/zuojiantou.png" alt />
+ <img src="@/assets/img/zuojiantou.png" alt />
</div>
<div class="right_icon">
<div @click="goToTopUp()">
- <img src="../../assets/img/qianbao.png" alt />
+ <img src="@/assets/img/qiandai.png" alt />
</div>
<div>
- <img src="../../assets/img/kefu.png" alt />
+ <img src="@/assets/img/kefu.png" alt />
</div>
</div>
</div>
@@ -233,7 +233,7 @@
messShow: false,
mess: "",
messDialog: false,
- withdrawalValue: "",
+ withdrawalValue: 0,
settingInfo: {}
};
},
@@ -761,4 +761,7 @@
font-weight: 600;
}
}
+.bank_1:last-child {
+ border: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3