From f076a06808275f8a955c5545cf73553997b4bf00 Mon Sep 17 00:00:00 2001
From: 李凌 <344137771@qq.com>
Date: Mon, 08 Sep 2025 16:01:10 +0800
Subject: [PATCH] 1
---
src/views/C2C/c2c-trade/components/TradeSuccessDetail.vue | 9 +-
src/views/advertiserDetail/index.vue | 10 ++-
src/views/C2C/c2c-trade/page/SellGenerate.vue | 12 +++
src/views/C2C/withdraw/withdrawalSecurityVerification.vue | 1
src/service/withdraw.js | 2
src/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue | 5 +
src/views/C2C/c2cOrder/payment/PaymentBuy.vue | 1
src/views/C2C/c2cOrder/payment/PaymentDetail.vue | 18 ++++-
src/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue | 3
src/router/index.js | 28 +++++++++
src/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue | 2
src/views/C2C/c2c-trade/components/TradeSuccess.vue | 6 +-
src/views/C2C/c2c-trade/page/c2cHelp.vue | 3
postcss.config.cjs | 3 +
src/service/otc.js | 11 +++
src/views/C2C/c2cOrder/payment/ConfirmedPaid.vue | 3
src/views/C2C/wantBuy.vue | 5 +
src/views/advertiserDetail/detail.vue | 1
18 files changed, 95 insertions(+), 28 deletions(-)
diff --git a/postcss.config.cjs b/postcss.config.cjs
index eb21dee..6c6d01f 100644
--- a/postcss.config.cjs
+++ b/postcss.config.cjs
@@ -38,6 +38,9 @@
if(file.indexOf('src/views/chat')> -1 ){
return false
}
+ if(file.indexOf('src/views/advertiserDetail')> -1 ){
+ return false
+ }
return true
}
},
diff --git a/src/router/index.js b/src/router/index.js
index 78be28a..1b4606e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1137,6 +1137,22 @@
name: 'tradeOrderDetail',
component: () => import(/* webpackChunkName: "tradeOrderDetail" */ /* webpackPrefetch: true */"@/views/C2C/c2c-order-list/tradeOrderDetail.vue"),
},
+ {// 买家交易成功
+ path: '/tradeSuccessBuyer',
+ component: () => import(/* webpackChunkName: "tradeSuccessBuyer" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue")
+ },
+ {// 卖家交易
+ path: '/tradeSuccessSell',
+ component: () => import(/* webpackChunkName: "tradeSuccessSell" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/TradeSuccessSell.vue")
+ },
+ {// 买家交易成功详情
+ path: '/tradeSuccessDetailBuyer',
+ component: () => import(/* webpackChunkName: "tradeSuccessDetailBuyer" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue")
+ },
+ {// 卖家交易成功详情
+ path: '/tradeSuccessDetailSell',
+ component: () => import(/* webpackChunkName: "tradeSuccessDetailSell" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue")
+ },
{// c2c出售订单生成
path: '/sellGenerate',
component: () => import(/* webpackChunkName: "sellGenerate" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/SellGenerate.vue"),
@@ -1160,6 +1176,12 @@
...route.query,
}
},
+ },
+ {// c2c帮助
+ path: '/c2cHelp',
+ name: 'C2cHelp',
+ meta: { requireAuth: true },
+ component: () => import(/* webpackChunkName: "c2cHelp" */ /* webpackPrefetch: true */"@/views/C2C/c2c-trade/page/c2cHelp.vue")
},
{
// 取消订单
@@ -1242,6 +1264,12 @@
/* webpackChunkName: "SecurityVerification" */ /* webpackPrefetch: true */"@/views/C2C/withdraw/withdrawalSecurityVerification.vue"
),
},
+ {
+ // 付款详情
+ path: '/paymentDetail',
+ name: 'paymentDetail',
+ component: () => import(/* webpackChunkName: "paymentDetail" */ /* webpackPrefetch: true */'@/views/C2C/c2cOrder/payment/PaymentDetail.vue'),
+ },
// {// 收款方式
// path: "/paymentMethod",
// name: 'paymentMethod',
diff --git a/src/service/otc.js b/src/service/otc.js
index b44a202..77106f9 100644
--- a/src/service/otc.js
+++ b/src/service/otc.js
@@ -83,6 +83,7 @@
const ctcUserGet = (params) => {
return httpJson({
url: "/api/c2cUser!get.action",
+ // url: "/c2cUser/getDesc",
method: "get",
isLoading: false
}, params)
@@ -479,6 +480,14 @@
isLoading: false
}, params)
};
+//订单放行
+const ctcOrderPass= (params) => {
+ return httpJson({
+ url: "/api/c2cOrder!order_pass.action",
+ method: "get",
+ isLoading: false
+ }, params)
+};
const otcApi = {
@@ -492,7 +501,7 @@
paymentMethodConfigDetail, getUserName,
c2cGetPayCurrencyList,
c2cAppeal,
- c2cgetBestPrice, ctcOrderPayFinish
+ c2cgetBestPrice, ctcOrderPayFinish, ctcOrderPass
}
export default otcApi
diff --git a/src/service/withdraw.js b/src/service/withdraw.js
index 6a03dbf..54f0c17 100644
--- a/src/service/withdraw.js
+++ b/src/service/withdraw.js
@@ -12,7 +12,7 @@
//提现，进入页面，获取session_token
const GetSessionToken = (params) => {
return httpJson({
- url: "api/withdraw!withdraw_open.action",
+ url: "api/withdraw/withdrawOpen",
method: "get",
isLoading: false
}, params)
diff --git a/src/views/C2C/c2c-trade/components/TradeSuccess.vue b/src/views/C2C/c2c-trade/components/TradeSuccess.vue
index 26eeae7..1cebe59 100644
--- a/src/views/C2C/c2c-trade/components/TradeSuccess.vue
+++ b/src/views/C2C/c2c-trade/components/TradeSuccess.vue
@@ -16,7 +16,7 @@
<van-button class="w-360 h-92 rounded-lg bg-blue" type="info"
@click="$router.push('/tradeSuccessDetailBuyer')">{{ $t('完成') }}</van-button>
</div>
- <div class="mt-46 font-32 font-400 text-blue " @click="$router.push('/funds')">{{ $t('查看资产') }}</div>
+ <div class="mt-46 font-32 font-400 text-blue " @click="$router.push('/my/assets')">{{ $t('查看资产') }}</div>
</div>
<!-- <div class="absolute bottom-0 left-0 w-full text-center">-->
<!-- <van-divider />-->
@@ -34,8 +34,8 @@
Button,
Divider,
} from "vant";
-import OrderNav from "@/components/order-nav/OrderNav";
-import Evaluation from "@/page/c2cOrder/payment/components/Evaluation";
+import OrderNav from "@/components/order-nav/OrderNav.vue";
+import Evaluation from "../../c2cOrder/payment/components/Evaluation.vue";
export default {
name: "TradeSuccess",
components: {
diff --git a/src/views/C2C/c2c-trade/components/TradeSuccessDetail.vue b/src/views/C2C/c2c-trade/components/TradeSuccessDetail.vue
index 76901fb..43a7e96 100644
--- a/src/views/C2C/c2c-trade/components/TradeSuccessDetail.vue
+++ b/src/views/C2C/c2c-trade/components/TradeSuccessDetail.vue
@@ -88,10 +88,10 @@
CellGroup,
Icon,
} from "vant";
-import OrderNav from "@/components/order-nav/OrderNav";
-import OrderData from "@/page/c2cOrder/components/order-data/OrderData";
-import Evaluation from "@/page/c2cOrder/payment/components/Evaluation";
-import otcApi from "@/API/otc";
+import OrderNav from "@/components/order-nav/OrderNav.vue";
+import OrderData from "../../c2cOrder/components/order-data/OrderData.vue";
+import Evaluation from "../../c2cOrder/payment/components/Evaluation.vue";
+import otcApi from "@/service/otc";
export default {
name: "TradeSuccessDetail",
props: ['title', 'back'],
@@ -153,6 +153,7 @@
<style lang="scss" scoped>
@import "@/assets/init.scss";
+@import "@/assets/css/copy2.scss";
.tradeSuccessDetail {
.arrow-left-icon {
diff --git a/src/views/C2C/c2c-trade/page/SellGenerate.vue b/src/views/C2C/c2c-trade/page/SellGenerate.vue
index 1b3f2e5..366f342 100644
--- a/src/views/C2C/c2c-trade/page/SellGenerate.vue
+++ b/src/views/C2C/c2c-trade/page/SellGenerate.vue
@@ -81,7 +81,7 @@
<van-button class="disable flex-1 h-80 enter" color="#CCCFD6" type="primary">{{ $t('我已确认收款') }}
</van-button>
</div>
- <van-popup class="w-full h-full" position="right" v-model="isShowCancelOrder">
+ <van-popup class="w-full h-full" position="right" v-model:show="isShowCancelOrder">
<cancel-success v-if="!timeout" :title="$t('出售')" :count="orderDetail.coinAmount"
:total-price="orderDetail.amount" :order-number="orderDetail.orderNo"
:create-order-time="fullTime(orderDetail.createTime)" :seller-name="orderDetail.c2cUserNickName"
@@ -106,7 +106,7 @@
import OtcCircle from "@/components/otcCircle/index.vue";
import CancelSuccess from "../../c2cOrder/components/order-generation/CancelSuccess.vue";
import loading from "@/components/loading/index.vue";
-
+import { onBeforeUnmount } from "vue";
import otcApi from "@/service/otc";
import { formatTime } from "@/utils/utis";
@@ -140,6 +140,14 @@
clearTimeout(this.timeStatus)
}
},
+ setup() {
+ onBeforeUnmount(()=>{
+ let end = setInterval(function () { }, 10000);
+ for (let i = 1; i <= end; i++) {
+ clearInterval(i);
+ }
+ })
+ },
methods: {
async getOrderDetail() {
console.log(this.orderNumber)
diff --git a/src/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue b/src/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue
index 588f86b..e2ec8de 100644
--- a/src/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue
+++ b/src/views/C2C/c2c-trade/page/TradeSuccessBuyer.vue
@@ -19,8 +19,8 @@
</template>
<script>
-import TradeSuccess from "@/page/c2c-trade/components/TradeSuccess";
-import otcApi from '@/API/otc';
+import TradeSuccess from "../components/TradeSuccess.vue";
+import otcApi from '@/service/otc';
export default {
name: "TradeSuccessBuyer",
@@ -42,6 +42,7 @@
</script>
<style scoped lang="scss">
+@import "@/assets/css/copy2.scss";
.info-tilte {
color: $text_color;
}
diff --git a/src/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue b/src/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue
index bf24e7f..4ede88b 100644
--- a/src/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue
+++ b/src/views/C2C/c2c-trade/page/TradeSuccessDetailBuyer.vue
@@ -9,7 +9,7 @@
</template>
<script>
-import TradeSuccessDetail from "@/page/c2c-trade/components/TradeSuccessDetail";
+import TradeSuccessDetail from "../components/TradeSuccessDetail.vue";
export default {
name: "TradeSuccessDetailBuyer",
components: {
diff --git a/src/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue b/src/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue
index a888eed..3e4bbbd 100644
--- a/src/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue
+++ b/src/views/C2C/c2c-trade/page/TradeSuccessDetailSell.vue
@@ -14,7 +14,7 @@
import {
mapState
} from "vuex";
-import TradeSuccessDetail from "@/page/c2c-trade/components/TradeSuccessDetail";
+import TradeSuccessDetail from "../components/TradeSuccessDetail.vue";
export default {
name: "TradeSuccessDetailSell",
computed: {
@@ -27,6 +27,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
::v-deep .order-data {
.title {
padding-left: 32px;
diff --git a/src/views/C2C/c2c-trade/page/c2cHelp.vue b/src/views/C2C/c2c-trade/page/c2cHelp.vue
index c9578fb..054c09b 100644
--- a/src/views/C2C/c2c-trade/page/c2cHelp.vue
+++ b/src/views/C2C/c2c-trade/page/c2cHelp.vue
@@ -51,7 +51,7 @@
Badge,
CountDown
} from "vant";
-import assetsHead from "@/components/assets-head";
+import assetsHead from "@/components/normal-head/index.vue";
export default {
props: ['expireTimeRemain'],
computed: {
@@ -87,6 +87,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
.currentColor {
color: $color_main;
}
diff --git a/src/views/C2C/c2cOrder/payment/ConfirmedPaid.vue b/src/views/C2C/c2cOrder/payment/ConfirmedPaid.vue
index 384f2e5..73173a7 100644
--- a/src/views/C2C/c2cOrder/payment/ConfirmedPaid.vue
+++ b/src/views/C2C/c2cOrder/payment/ConfirmedPaid.vue
@@ -120,7 +120,7 @@
</div>
<!-- 弹窗 -->
- <van-popup v-model="show" round position="bottom">
+ <van-popup v-model:show="show" round position="bottom">
<div class="pt-44">
<div class="mb-42 font-600 font-32 text-center">
{{ $t("您是否已收到款项？") }}
@@ -255,6 +255,7 @@
type: "sell",
},
});
+ // this.$router.go(-1)
},
back() {
this.show = false;
diff --git a/src/views/C2C/c2cOrder/payment/PaymentBuy.vue b/src/views/C2C/c2cOrder/payment/PaymentBuy.vue
index b4c5173..bb18364 100644
--- a/src/views/C2C/c2cOrder/payment/PaymentBuy.vue
+++ b/src/views/C2C/c2cOrder/payment/PaymentBuy.vue
@@ -178,7 +178,6 @@
onPayed() {
// 我已支付
this.$router.push("/withdraw/securityVerification?type=buy");
- // this.$router.push("/cryptos/withdraw/securityVerification?type=buy");
},
async copy(text) {
await toClipboard(text);
diff --git a/src/views/C2C/c2cOrder/payment/PaymentDetail.vue b/src/views/C2C/c2cOrder/payment/PaymentDetail.vue
index 3a8e14f..c629241 100644
--- a/src/views/C2C/c2cOrder/payment/PaymentDetail.vue
+++ b/src/views/C2C/c2cOrder/payment/PaymentDetail.vue
@@ -62,12 +62,13 @@
<script>
import { mapState } from "vuex"
import { Badge, Collapse, CollapseItem, Divider, } from "vant"
-import OrderNav from "@/components/order-nav/OrderNav";
-import OtcCircle from "@/components/otcCircle";
+import OrderNav from "@/components/order-nav/OrderNav.vue";
+import OtcCircle from "@/components/otcCircle/index.vue";
// import TradeSuccess from "@/page/c2c-trade/components/TradeSuccess";
// import TradeSuccessDetail from "@/page/c2c-trade/components/TradeSuccessDetail";
-import TradeData from "@/page/c2cOrder/components/trade-data/TradeData";
-import otcApi from '@/API/otc';
+import TradeData from "../components/trade-data/TradeData.vue";
+import otcApi from '@/service/otc';
+import { onBeforeUnmount } from "vue";
export default {
name: "PaymentDetail",
@@ -133,6 +134,14 @@
beforeDestroy() {
clearTimeout(this.timeout)
},
+ setup() {
+ onBeforeUnmount(()=>{
+ let end = setInterval(function () { }, 10000);
+ for (let i = 1; i <= end; i++) {
+ clearInterval(i);
+ }
+ })
+ },
components: {
[Badge.name]: Badge,
[Divider.name]: Divider,
@@ -146,6 +155,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
::v-deep {
.order-msg-divider {
margin: 48px 0;
diff --git a/src/views/C2C/wantBuy.vue b/src/views/C2C/wantBuy.vue
index 11b3aec..74cb63a 100644
--- a/src/views/C2C/wantBuy.vue
+++ b/src/views/C2C/wantBuy.vue
@@ -4,9 +4,10 @@
class="w-full h-122 pl-40 pr-31 box-border flex items-center"
>
<van-icon name="arrow-left" @click="goback"/>
- <div class="flex-1 text-right mr-100" @click="showPopup">
+ <!-- <div class="flex-1 text-right mr-100" @click="showPopup"> -->
+ <div class="flex-1 text-right mr-100">
<span class="font-35 mr-8">{{ $t('自选区') }}</span>
- <van-icon name="arrow-down" />
+ <!-- <van-icon name="arrow-down" /> -->
</div>
<van-popup round position="top" class="pt-30" v-model:show="show" :closeable="true">
<div class="flex justify-around mt-40 pb-48">
diff --git a/src/views/C2C/withdraw/withdrawalSecurityVerification.vue b/src/views/C2C/withdraw/withdrawalSecurityVerification.vue
index d0d6cef..6109ef0 100644
--- a/src/views/C2C/withdraw/withdrawalSecurityVerification.vue
+++ b/src/views/C2C/withdraw/withdrawalSecurityVerification.vue
@@ -130,6 +130,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
.withdraw_verify {
width: 100%;
box-sizing: border-box;
diff --git a/src/views/advertiserDetail/detail.vue b/src/views/advertiserDetail/detail.vue
index dd93ef2..17c9485 100644
--- a/src/views/advertiserDetail/detail.vue
+++ b/src/views/advertiserDetail/detail.vue
@@ -85,6 +85,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
.main {
//padding: 0 30px;
color: #868d9a;
diff --git a/src/views/advertiserDetail/index.vue b/src/views/advertiserDetail/index.vue
index 8516d7b..5fc2ad6 100644
--- a/src/views/advertiserDetail/index.vue
+++ b/src/views/advertiserDetail/index.vue
@@ -45,7 +45,7 @@
<div class="main-box">
<div class="main-nav">
<span class="info">{{ $t('信息') }}</span>
- <span class="gen" style="color: #868d9a" @click="linkToDetail">
+ <span class="gen flex justify-center items-center" style="color: #868d9a" @click="linkToDetail">
{{ $t('更多数据') }}
<img class="right" src="@/assets/image/icon-right.png" alt="" />
</span>
@@ -93,11 +93,11 @@
<span class="textColor">$</span><span class="textColor">{{ item.symbolValue }}</span>
</p>
<p class="mar-9">
- {{ $t('数量') }}<span style="color: #fff">{{ item.coinAmount }} USDT</span>
+ {{ $t('数量') }}<span style="color: #666">{{ item.coinAmount }} USDT</span>
</p>
<p class="mar-30">
{{ $t('限额') }}
- <span style="color: #fff">${{ item.investmentMin }} - ${{ item.investmentMax }}</span>
+ <span style="color: #666">${{ item.investmentMin }} - ${{ item.investmentMax }}</span>
</p>
<div class="flex">
<div class="flex items-center mar-23">
@@ -134,7 +134,7 @@
</div>
</van-dialog>
- <van-popup class="w-full h-full" v-model="showDetail" position="right">
+ <van-popup class="w-full h-full" v-model:show="showDetail" position="right">
<detail :detail="c2cUser" @back="back" />
</van-popup>
</div>
@@ -190,6 +190,7 @@
created() {
console.log(this.uid);
otcApi.ctcUserGet({ c2c_user_id: this.uid, language: this.$i18n.locale }).then(res => {
+ // otcApi.ctcUserGet({ id: this.uid, language: this.$i18n.locale }).then(res => {
this.userInfo = res.data;
})
},
@@ -240,6 +241,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/css/copy2.scss";
.box-radius {
border-radius: 40px;
}
--
Gitblit v1.9.3