From b86e0013261cd8e3ca2534665b3b7b2c9a27b5b1 Mon Sep 17 00:00:00 2001 From: shike <1284707383@qq.com> Date: Tue, 28 Jul 2020 20:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D/=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=A4=E6=98=93=E5=AF=B9=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=88=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=89=8D=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/other.css | 28 +++++ src/components/footer.vue | 6 +- src/components/header.vue | 3 + src/router.js | 35 ++++++ src/store/modules/trend.js | 3 - src/views/assets/exchange.vue | 8 +- .../coincoin/components/trade_data_update.vue | 8 +- src/views/coincoin/components/trade_depth.vue | 5 +- src/views/coincoin/components/trade_form.vue | 27 +++- src/views/contact/contact_us.vue | 79 ++++++++++++ src/views/contact/details.vue | 116 ++++++++++++++++++ src/views/contact/index.vue | 11 ++ src/views/contact/list.vue | 51 ++++++++ src/views/currency/currency_deal.vue | 23 +++- src/views/currency/currency_release.vue | 24 +++- .../release/components/release_depth.vue | 4 +- src/views/release/components/release_form.vue | 27 +++- 17 files changed, 434 insertions(+), 24 deletions(-) create mode 100644 src/views/contact/contact_us.vue create mode 100644 src/views/contact/details.vue create mode 100644 src/views/contact/index.vue create mode 100644 src/views/contact/list.vue diff --git a/src/assets/css/other.css b/src/assets/css/other.css index 42206b8..5b02e7a 100644 --- a/src/assets/css/other.css +++ b/src/assets/css/other.css @@ -6141,3 +6141,31 @@ otc-index-btn:hover { margin-left: 100px; margin-top: 30px; } + + +/*交谈*/ + +.conversation-box{ background: #fff; padding: 80px 0;} +.conversation-boxs{ padding: 40px 0; min-height: 500px;} +.conli{ width: 600px; margin: auto; margin-bottom: 20px; } +.conli label{ color: #66817f; font-size: 14px; float: left; line-height: 50px;} +.conli input{ line-height: 50px; width: 500px; background: #f6f6f6; padding: 0 10px; float: left; color: #66817f;} +.conli .problem{ line-height: 50px; width: 500px; background: #f6f6f6; padding: 0 10px; float: left; position: relative; font-size: 14px; color: #66817f; cursor: pointer;} +.conli .problem img{ display: inline-block;width: 15px;height: 15px;position: absolute; right: 20px; top: 18px;} +.conli textarea{float: left; background: #f6f6f6; height: 100px; padding: 10px; width: 500px; color: #66817f; font-size: 12px;} +.proul{ width: 500px; overflow: hidden; position: absolute; left: 0; background: #f6f6f6; display: none;} +.proul li{ line-height: 50px; width: 500px; border-top: 1px solid #fff; padding: 0 10px; color: #66817f; font-size: 14px; cursor: pointer;} +.proul li:hover{ color: #999; } +.conli button{ background: #5f97ff; width: 500px; height: 50px; line-height: 50px; display: block; margin-left: 71px; font-size: 14px; color: #fff; } +.tana{ float: right; font-size: 14px; color: #5f97ff; padding-right: 20px;} +.rec-ul{ width: 60%; margin: auto; } +.rec-ul li{ width: 100%; border-bottom: 1px solid #f2f2f2; padding: 20px 0; position: relative;} +.rec-ul li p{ color: #ccc; font-size: 12px; } +.rec-ul li p.rec-p{ font-size: 16px; color: #66817f;margin-bottom: 10px;} +.rec-ul li p span{ float: right; } +.rec-ul li span.no-re{ background: #f2f2f2; color: #fa5e6a; font-size: 12px; border-radius: 30px; padding:2px 12px; position: absolute; right: 0; top: 20px;} +.rec-ul li img{ margin:20px 0; width: 100%; } +.rec-ul li p.reply{ color: #66817f; font-size: 14px; } +.rec-ul li p.reply span{ font-size: 12px; color: #ccc; } +.rec-q h1{ border-radius: 50px; background: #2cbfa2; width: 35px; height: 35px; text-align: center; line-height: 35px; color: #fff; font-size: 20px; margin-bottom: 10px;} +.rec-a h1{ background: #5f97ff; } diff --git a/src/components/footer.vue b/src/components/footer.vue index bcff2e3..1af0c3f 100644 --- a/src/components/footer.vue +++ b/src/components/footer.vue @@ -16,9 +16,9 @@
-

24H {{$t('高')}}

- 0 +

24H {{$t('均价')}}

+ {{currentPair.avg}}
-

24H {{$t('低')}}

- 0 +

24H {{$t('交易量')}}

+ {{currentPair.dealCount || 0}}

24H {{$t('量')}}

diff --git a/src/views/coincoin/components/trade_depth.vue b/src/views/coincoin/components/trade_depth.vue index 5b72922..14213da 100644 --- a/src/views/coincoin/components/trade_depth.vue +++ b/src/views/coincoin/components/trade_depth.vue @@ -17,7 +17,7 @@
-
    +
    • {{item.price}}
    • {{item.remain}}
    • {{item.amount}}
      • @@ -38,7 +38,7 @@
      -
        +
        • {{item.price}}
        • {{item.remain}}
        • {{item.amount}}
          • @@ -114,7 +114,6 @@ list.push(item) } }); - console.log(JSON.stringify(list)+'卖卖卖') return list; }, }, diff --git a/src/views/coincoin/components/trade_form.vue b/src/views/coincoin/components/trade_form.vue index 11768b1..8304b74 100644 --- a/src/views/coincoin/components/trade_form.vue +++ b/src/views/coincoin/components/trade_form.vue @@ -109,7 +109,14 @@
      - + +
      {{$t('图形验证码')}}
      +
      + + + +
      +
      {{$t('动态验证')}}
      @@ -163,8 +170,15 @@ iTime: 60, //验证码倒计时 isCodeSend: false, verifyCode: '', //验证码 + + randomString: '', //图片验证码随机数 + imgVerifyCode: '', //图片验证码 + imagesUrl: '', //验证码图片地址 } }, + created() { + this.getImageCode(); + }, computed: { ...mapState('user', ['userInfoData']), ...mapState('trend', ['allPairList', 'allTrendList', 'myCollectList', 'currentPair']), @@ -208,6 +222,10 @@ } }, methods: { + getImageCode() { //获取图片验证码 + this.randomString = Math.floor(Math.random() * 4000 + 1000) + new Date().getTime(); + this.imagesUrl = this.common.baseURL + '/user/api/user/image/' + this.randomString; + }, chooseDealType(val) { //切换交易方式 this.dealType = val; if(val == 'E_I_P_T_MARKET') { @@ -322,6 +340,10 @@ this.$message.error(this.$t('请输入支付密码！')); return; } + if (!this.imgVerifyCode) { + this.$message.error(this.$t('请输入图片验证码！')); + return; + } if (!this.payPassword) { this.$message.error(this.$t('请输入验证码！')); return; @@ -338,6 +360,8 @@ triggerPrice: this.dealDirection == 'E_I_D_T_BUY' ? this.buyTriggerPrice : this.sellTriggerPrice, payPwd: this.payPassword, noteVerifyCode: this.verifyCode, + randomString: this.randomString, + imgVerifyCode: this.imgVerifyCode, } console.log(JSON.stringify(params)) @@ -358,6 +382,7 @@ this.showPassword = false; //清除数据 this.payPassword = ''; + this.imgVerifyCode = ''; this.verifyCode = ''; this.loading1 = false; diff --git a/src/views/contact/contact_us.vue b/src/views/contact/contact_us.vue new file mode 100644 index 0000000..6cd4c76 --- /dev/null +++ b/src/views/contact/contact_us.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/views/contact/details.vue b/src/views/contact/details.vue new file mode 100644 index 0000000..5de2847 --- /dev/null +++ b/src/views/contact/details.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/contact/index.vue b/src/views/contact/index.vue new file mode 100644 index 0000000..d19559f --- /dev/null +++ b/src/views/contact/index.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/views/contact/list.vue b/src/views/contact/list.vue new file mode 100644 index 0000000..ef3f71e --- /dev/null +++ b/src/views/contact/list.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/currency/currency_deal.vue b/src/views/currency/currency_deal.vue index 8fb37cb..cfd1616 100644 --- a/src/views/currency/currency_deal.vue +++ b/src/views/currency/currency_deal.vue @@ -175,6 +175,13 @@
      +
      {{$t('图形验证码')}}
      +
      + + + +
      +
      {{$t('动态验证')}}
      @@ -227,6 +234,10 @@ isCodeSend: false, loading: false, loading2: false, + + randomString: '', //图片验证码随机数 + imgVerifyCode: '', //图片验证码 + imagesUrl: '', //验证码图片地址 } }, computed: { @@ -244,6 +255,10 @@ } }, methods: { + getImageCode() { //获取图片验证码 + this.randomString = Math.floor(Math.random() * 4000 + 1000) + new Date().getTime(); + this.imagesUrl = this.common.baseURL + '/user/api/user/image/' + this.randomString; + }, getAdsInfo() { //获取广告详情 }, @@ -326,6 +341,10 @@ this.$message.error(this.$t('请输入交易密码！')); return; } + if (!this.imgVerifyCode) { + this.$message.error(this.$t('请输入图片验证码！')); + return; + } if(!this.noteVerifyCode) { this.$message.error(this.$t('请输入短信验证码！')); return; @@ -338,6 +357,8 @@ count: this.dealWay ? this.dealQuantity : this.dealTotalQuantity, //数量 payPwd: this.password, noteVerifyCode: this.noteVerifyCode, + randomString: this.randomString, + imgVerifyCode: this.imgVerifyCode, } let url; @@ -393,9 +414,9 @@ created() { this.id = this.$route.params.id; this.dealInfo = this.common.getItem('data'); - console.log(JSON.stringify(this.dealInfo)) //this.getAdsInfo(); this.getDealerInfo(); + this.getImageCode(); } } diff --git a/src/views/currency/currency_release.vue b/src/views/currency/currency_release.vue index 45adaaf..6b16ad4 100644 --- a/src/views/currency/currency_release.vue +++ b/src/views/currency/currency_release.vue @@ -208,6 +208,13 @@
      +
      {{$t('图形验证码')}}
      +
      + + + +
      +
      {{$t('短信验证码')}}
      @@ -268,6 +275,10 @@ isCodeSend: false, loading: false, loading2: false, + + randomString: '', //图片验证码随机数 + imgVerifyCode: '', //图片验证码 + imagesUrl: '', //验证码图片地址 } }, computed: { @@ -292,6 +303,10 @@ }, }, methods: { + getImageCode() { //获取图片验证码 + this.randomString = Math.floor(Math.random() * 4000 + 1000) + new Date().getTime(); + this.imagesUrl = this.common.baseURL + '/user/api/user/image/' + this.randomString; + }, getUserInfoData() { this.getAxios('/user/api/user/info') .then(data => { @@ -467,6 +482,10 @@ this.$message.error('请输入支付密码!'); return; } + if (!this.imgVerifyCode) { + this.$message.error(this.$t('请输入图片验证码！')); + return; + } if(!this.noteVerifyCode) { this.$message.error('请输入短信验证码!'); return; @@ -486,7 +505,9 @@ weixinpay: this.weixinpay, unionpay: this.unionpay, payPwd: this.payPwd, - noteVerifyCode: this.noteVerifyCode + noteVerifyCode: this.noteVerifyCode, + randomString: this.randomString, + imgVerifyCode: this.imgVerifyCode, } this.postAxios('/api/market/order/publish', params) @@ -509,6 +530,7 @@ this.getCoinList(); this.getUserInfoData(); this.getPayment(); + this.getImageCode(); } } diff --git a/src/views/release/components/release_depth.vue b/src/views/release/components/release_depth.vue index aa705d1..807c27e 100644 --- a/src/views/release/components/release_depth.vue +++ b/src/views/release/components/release_depth.vue @@ -17,7 +17,7 @@
      -
        +
        • {{item.price}}
        • {{item.remain}}
        • {{item.amount}}
          • @@ -38,7 +38,7 @@
          -
            +
            • {{item.price}}
            • {{item.remain}}
            • {{item.amount}}
              • diff --git a/src/views/release/components/release_form.vue b/src/views/release/components/release_form.vue index 0eafd6a..961efd3 100644 --- a/src/views/release/components/release_form.vue +++ b/src/views/release/components/release_form.vue @@ -158,7 +158,14 @@
          - + +
          {{$t('图形验证码')}}
          +
          + + + +
          +
          {{$t('动态验证')}}
          @@ -218,6 +225,10 @@ todayAmount: 0, unblockAmount: 0, yesterdayAmount: 0, + + randomString: '', //图片验证码随机数 + imgVerifyCode: '', //图片验证码 + imagesUrl: '', //验证码图片地址 } }, computed: { @@ -262,9 +273,13 @@ } }, methods: { + getImageCode() { //获取图片验证码 + this.randomString = Math.floor(Math.random() * 4000 + 1000) + new Date().getTime(); + this.imagesUrl = this.common.baseURL + '/user/api/user/image/' + this.randomString; + }, //获取解封交易信息 getDeblockInfo() { - this.$http.get(`/api/unblock/lock/up/info/${this.ws.dealCoin}-${this.ws.convertType}`).then(res => { + this.getAxios(`/api/unblock/lock/up/info/${this.currentPair.dealCoin}-${this.currentPair.convertType}`).then(res => { this.enableSellAmount = res.enableSellAmount this.todayAmount = res.todayAmount this.unblockAmount = res.unblockAmount @@ -403,6 +418,10 @@ this.$message.error(this.$t('请输入支付密码！')); return; } + if (!this.imgVerifyCode) { + this.$message.error(this.$t('请输入图片验证码！')); + return; + } if (!this.payPassword) { this.$message.error(this.$t('请输入验证码！')); return; @@ -420,6 +439,8 @@ triggerPrice: this.dealDirection == 'E_I_D_T_BUY' ? this.buyTriggerPrice : this.sellTriggerPrice, payPwd: this.payPassword, noteVerifyCode: this.verifyCode, + randomString: this.randomString, + imgVerifyCode: this.imgVerifyCode, } this.postAxios('/api/entrust/info/putup', params) @@ -457,6 +478,7 @@ //清除数据 this.payPassword = ''; this.verifyCode = ''; + this.verifyCode = ''; this.loading1 = false; this.loading2 = false; @@ -503,6 +525,7 @@ }, created() { this.getDeblockInfo() + this.getImageCode(); } }