From cd8ecd0a481a60f6a77b2f0f92b2897a88fac7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Tue, 12 Aug 2025 11:28:59 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=AD=BE=E5=90=8D=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/order.js | 83 +++++++---
pages/mine_package/mine_order/mine_order.vue | 142 +++++++++++++++--
.../mine_purse_log/mine_purse_log.vue | 147 +++++++++++++++---
utils/config.js | 16 +-
4 files changed, 320 insertions(+), 68 deletions(-)
diff --git a/api/order.js b/api/order.js
index eecc452..4188270 100644
--- a/api/order.js
+++ b/api/order.js
@@ -6,10 +6,10 @@ import request from '@/utils/request.js'; // 引入封装的方法
*/
export function getOrderList(params) {
return request({
- url: "/order/getList",
- method: "get",
- data:params,
- });
+ url: "/order/getList",
+ method: "get",
+ data: params,
+ });
}
/**
@@ -18,20 +18,20 @@ export function getOrderList(params) {
*/
export function getDetail(params) {
return request({
- url: "/order/getDetail",
- method: "get",
- data:params,
- });
+ url: "/order/getDetail",
+ method: "get",
+ data: params,
+ });
}
// 支付订单
export function payment(data) {
// data.appId = APPID;
return request({
- url: "/order/payment",
- method: "post",
- data,
- });
+ url: "/order/payment",
+ method: "post",
+ data,
+ });
}
/**
* 查询订单统计
@@ -39,10 +39,10 @@ export function payment(data) {
*/
export function getStatistics(params) {
return request({
- url: "/order/getStatistics",
- method: "get",
- data:params,
- });
+ url: "/order/getStatistics",
+ method: "get",
+ data: params,
+ });
}
/**
@@ -51,18 +51,53 @@ export function getStatistics(params) {
*/
export function getSupportPay(params) {
return request({
- url: "/cart/getSupportPay",
- method: "get",
- data:params,
- });
+ url: "/cart/getSupportPay",
+ method: "get",
+ data: params,
+ });
}
// 确认收货
export function confirmReceipt(data) {
// data.appId = APPID;
return request({
- url: "/order/confirmReceipt",
- method: "post",
- data,
+ url: "/order/confirmReceipt",
+ method: "post",
+ data,
});
-}
\ No newline at end of file
+}
+
+// 判断是否已经签名
+export function isSignContract() {
+ return request({
+ url: "/signature/isSignContract",
+ method: "get",
+ });
+}
+
+// 获取H5签署链接
+export function getSignUrl(data) {
+ return request({
+ url: "/signature/createFlowSignUrl",
+ method: "post",
+ data,
+ });
+}
+
+// 发起合同签章
+export function signContract(data) {
+ return request({
+ url: "/signature/contractSignature",
+ method: "post",
+ data,
+ });
+}
+
+// 获取跳转至腾讯电子签小程序的签署链接
+export function getMiniProgramSignUrl(data) {
+ return request({
+ url: "/signature/createSchemeUrl",
+ method: "post",
+ data,
+ });
+}
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 96375e0..731754f 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -73,11 +73,16 @@
去付款
- 确认收货
+
+ 去签署
+
+ 确认收货
+
+ v-if="[ORDER_TYPE.NOT_RECEIVE, ORDER_TYPE.UNSHIPPED].includes(item.status) && isCheckSigne"
+ @click="afterShow = true;">
申请售后
@@ -184,13 +189,16 @@
+
+
+
diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue
index f4d4d23..dfde6a1 100644
--- a/pages/mine_package/mine_purse_log/mine_purse_log.vue
+++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue
@@ -4,36 +4,38 @@
left-path="/pages/mine_package/mine_purse/mine_purse" />
-
-
- {{ item.name }}
-
+
+
+
+ {{ item.name }}
+
+
+
-
-
-
- 21
- 商城总挖矿数量
-
-
- 231
- 已兑换数量
+
+
+
+
+ 21
+ {{ item.name }}
+
+
-
-
+
+
-
-
+
{{ getValue(BALANCE_TYPE, item.type) }}
{{ formatDate(item.ctdate) }}
@@ -81,6 +83,7 @@ export default {
key: "lock"
},
],
+ source: [],
selInfo: "cur",
form: {
id: 0,
@@ -100,6 +103,68 @@ export default {
}
const lockId = option.lockId;
const curId = option.curId;
+
+ // 分红金额
+ if (category === 'bonus') {
+ this.source = [
+ {
+ name: "今日分红数量",
+ key: "cur"
+ },
+ {
+ name: "总分红数量",
+ key: "lock"
+ },
+ {
+ name: "平台总分红",
+ key: "lock"
+ },
+ {
+ name: "分红资金池剩余",
+ key: "lock"
+ },
+ ];
+ }
+
+ // TBC
+ if (category === 'vcoin') {
+ this.source = [
+ {
+ name: "商城总挖矿数量",
+ key: "cur"
+ },
+ {
+ name: "已兑换数量",
+ key: "lock"
+ },
+ ];
+
+ }
+ // 贡献值 expend
+ if (category === 'expend') {
+ this.source = [
+ {
+ name: "今日贡献值",
+ key: "cur"
+ },
+ {
+ name: "总贡献值",
+ key: "lock"
+ },
+ {
+ name: "今日商城贡献值",
+ key: "lock"
+ },
+ {
+ name: "我的占比",
+ key: "lock"
+ },
+ ];
+ }
+
+
+
+
if (lockId && lockId !== 'null') {
this.lockId = lockId;
// this.selectInfo(this.infoList[1]);
@@ -223,7 +288,7 @@ export default {
.info_center_warp {
display: flex;
justify-content: space-between;
- padding: 32rpx 100rpx;
+ padding: 32rpx;
.info_center_warp-item {
.info_center_warp-item-top {
@@ -242,15 +307,49 @@ export default {
}
}
+ .info_list_warp-mine {
+ padding: 44rpx 32rpx;
+
+ .purse_info_item-mine {
+ display: flex;
+ justify-content: space-between;
+ border: 0;
+ height: 128rpx;
+ margin-bottom: 0;
+ padding: 0;
+
+ .purse_data_warp {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-left: 20rpx;
+
+ .purse_info_name {
+ font-size: 28rpx;
+ color: #333333;
+ font-weight: normal;
+ }
+
+ .purse_info_value {
+ font-size: 24rpx;
+ color: #999999;
+ }
+ .purse_info_title {
+ font-weight: bold;
+ font-size: 32px;
+ color: #333333;
+ }
+ }
-
- .info_list_warp {
- margin-top: 30rpx;
- // height: calc(100vh - 500rpx);
- // overflow-y: auto;
+ .purse_info_left .ipurse_nfo_right {
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ }
+ }
}
}
diff --git a/utils/config.js b/utils/config.js
index 4dcf2c7..0248a8e 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,12 +1,14 @@
-export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
+// export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
-export const PRIVACY_EN="https://www.finecc.net/?Privacy-Agreement/";//隐私协议地址(英文版)
-export const PRIVACY_CN="https://www.finecc.net/?Privac |y/";//隐私协议地址(中文版)
+export const BASE_URL = "https://api.gtn9.art";
-export const USER_EN="https://www.finecc.net/?FAQ/3421.html";//用户协议(英文版)
-export const USER_CN="https://www.finecc.net/?wenti/3422.html";//用户协议(中文版)
+export const PRIVACY_EN = "https://www.finecc.net/?Privacy-Agreement/";//隐私协议地址(英文版)
+export const PRIVACY_CN = "https://www.finecc.net/?Privac |y/";//隐私协议地址(中文版)
+
+export const USER_EN = "https://www.finecc.net/?FAQ/3421.html";//用户协议(英文版)
+export const USER_CN = "https://www.finecc.net/?wenti/3422.html";//用户协议(中文版)
// 信任桥 测试环境
// export const Authorization = "JETZ/vKlEkgrxD4f14YBDNjmh2i2KoPF2ToNtDnIqtHV33tZdyZU8YfMBZV+5OT2cCc5URvFuhE9jCbnDScnjV/QtJMZK57dVWL9nmkByJ1epgDjkOO0w9gN8hVmcnDl8Rt415b2PDfagNmTZ6yThBGEjA+9w4rnkDQxec6SI/EcYDjX5EDQC8WQd3+1jyyfSrVpNOktB1/wlkP9B1VUATCD3agxQG5BrUvLWxiCPre12/mHv2N9cnNbgbu698RaWF2LsvULRGNciS0OJJYaKz7RPCZnA4C34C1m85beBgrrvJUaJtimlB9GU9c9NX5atdc3z/gRbVaEXhv24mpQVA==";
@@ -15,5 +17,5 @@ export const USER_CN="https://www.finecc.net/?wenti/3422.html";//用户协议(
// 信任桥 正式环境
export const Authorization = "bxboAtH04huysyO1DO2E4FNomvQaFItp0gzHRv0aM+Hx4Rb9pijiAlWdRPUtB4HUJrwa1yVGoKFyCmXGZYja9v+GPz+SFVnDJJk/yit2LLMxX85SpnzRzVySJSsDTBLSTrh5BhGPST2iymdcGvQAdNIW9gAQoeDGIr8o3ctgLF08cdJiEQc255Ql7LxdqiHgP/SgY2JUrlGxGzE5iXDETCmXCvBxqbxEzhe4JbgdEMlKjjA0jcFDam0ArHPD2CoHI7WemdJZDw2+OAokFnoSF8dMyt1G9+nHqD40iMcK5bG6BFUNJwVMFgIZvQz5OqotqaNKnq/80UNDyOyeaaj9Lw==";
-export const CUSTOMER_SERVICE_PHONE_NUMBER="138 8888 8888";// 客服联系方式
-export const CLOUD_SERVICE_PHONE_NUMBER="186 5566 5566";// 云仓客服联系方式
\ No newline at end of file
+export const CUSTOMER_SERVICE_PHONE_NUMBER = "138 8888 8888";// 客服联系方式
+export const CLOUD_SERVICE_PHONE_NUMBER = "186 5566 5566";// 云仓客服联系方式
\ No newline at end of file