From 7d8e731ea6920371b780eafeedf4e9ffaf3573f7 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Mon, 4 Nov 2024 11:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 11 -
pages/chat/components/messageList.vue | 9 +-
pages/chat/components/messageListItem.vue | 2 +-
pages/chat/index.vue | 4 +-
pages/commission/commission-ranking.vue | 433 +++++------
pages/commission/components/account-info.vue | 233 +++++-
.../commission/components/commission-info.vue | 94 +--
.../commission/components/commission-log.vue | 2 +-
.../commission/components/commission-menu.vue | 49 +-
pages/commission/goods.vue | 15 +-
pages/commission/index.vue | 2 +-
pages/commission/order.vue | 4 +-
pages/commission/wallet.vue | 4 +-
pages/goods/sales.vue | 433 -----------
pages/goods/seckill.vue | 40 +-
pages/pay/index.vue | 71 +-
pages/user/goods_details_store/index.vue | 37 +-
pages/user/user_vip/index.vue | 14 +-
sheep/platform/pay.js | 679 +++++++++---------
19 files changed, 927 insertions(+), 1209 deletions(-)
delete mode 100644 pages/goods/sales.vue
diff --git a/pages.json b/pages.json
index bd4cef5..868e051 100644
--- a/pages.json
+++ b/pages.json
@@ -240,17 +240,6 @@
"group": "商品"
}
},
- {
- "path": "sales",
- "style": {
- "navigationBarTitleText": "促销商品"
- },
- "meta": {
- "sync": true,
- "title": "促销商品",
- "group": "商品"
- }
- },
{
"path": "list",
"style": {
diff --git a/pages/chat/components/messageList.vue b/pages/chat/components/messageList.vue
index 457717e..e06c473 100644
--- a/pages/chat/components/messageList.vue
+++ b/pages/chat/components/messageList.vue
@@ -18,7 +18,7 @@
>
-
+
@@ -48,7 +48,12 @@
import { reactive, ref } from 'vue';
import KeFuApi from '@/sheep/api/promotion/kefu';
import { isEmpty } from '@/sheep/helper/utils';
-
+const props = defineProps({
+ hei: {
+ type: [Object, String, Number],
+ default() {},
+ },
+ });
const messageList = ref([]); // 消息列表
const showNewMessageTip = ref(false); // 显示有新消息提示
const backToTopStyle = reactive({
diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue
index 9a98169..d32eced 100644
--- a/pages/chat/components/messageListItem.vue
+++ b/pages/chat/components/messageListItem.vue
@@ -93,7 +93,7 @@
class="chat-avatar ss-m-l-24"
:src="
sheep.$url.cdn(message.senderAvatar) ||
- sheep.$url.static('/static/img/shop/chat/default.png')
+ sheep.$url.static('https://zysc.fjptzykj.com:3000/shangcheng/d1e722fb4a257a9ab28c7aca2df004d0159a8ee9cc1d02bccf7ef27b55fcc526.png')
"
mode="aspectFill"
>
diff --git a/pages/chat/index.vue b/pages/chat/index.vue
index 969c63d..f673927 100644
--- a/pages/chat/index.vue
+++ b/pages/chat/index.vue
@@ -7,7 +7,7 @@
-
+
+ .CommissionRank .wrapper .list .item .people {
+ width: 175rpx;
+ text-align: right;
+ }
+
\ No newline at end of file
diff --git a/pages/commission/components/account-info.vue b/pages/commission/components/account-info.vue
index 5700fcd..dfe71bf 100644
--- a/pages/commission/components/account-info.vue
+++ b/pages/commission/components/account-info.vue
@@ -2,32 +2,71 @@
+
+
+
+
+
+
+ 累计收益(元)
+
+
+ {{
+ fen2yuan(state.summary2.withdrawPrice || 0)
+ }}
+
+
+
+
+
+
+
+
+ 我的团队
+
+
+ {{
+ state.arr2.firstBrokerageUserCount + state.arr2.secondBrokerageUserCount ||
+ 0
+ }}
+
+
+
+
+
-
-
+
-
+ -->
-
+
可提现(元)
{{ state.showMoney ? fen2yuan(state.brokerageInfo.brokeragePrice) : '***' }}
-
立即提现
+ -->
+
+
+
@@ -51,15 +90,24 @@
+
+ 立即提现
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index e7724b9..5f5df63 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -201,24 +201,28 @@
});
}
- // 分享信息 TODO 芋艿:待接入
- const shareInfo = computed(() => {
- // if (isEmpty(activity)) return {};
- // return sheep.$platform.share.getShareInfo({
- // title: activity.value.name,
- // image: sheep.$url.cdn(state.goodsInfo.picUrl),
- // params: {
- // page: '4',
- // query: activity.value.id,
- // },
- // }, {
- // type: 'goods', // 商品海报
- // title: activity.value.name, // 商品标题
- // image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
- // price: state.goodsInfo.price, // 商品价格
- // marketPrice: state.goodsInfo.marketPrice, // 商品原价
- // }, );
- });
+// TODO 芋艿:待测试
+ const shareInfo = computed(() => {
+ if (isEmpty(state.goodsInfo)) return {};
+ return sheep.$platform.share.getShareInfo(
+ {
+ title: state.goodsInfo.name,
+ image: sheep.$url.cdn(state.goodsInfo.picUrl),
+ desc: state.goodsInfo.introduction,
+ params: {
+ page: '2',
+ query: state.goodsInfo.id,
+ },
+ },
+ {
+ type: 'goods', // 商品海报
+ title: state.goodsInfo.name, // 商品名称
+ image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+ price: fen2yuan(state.goodsInfo.price), // 商品价格
+ original_price: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
+ },
+ );
+ });
const activity = ref();
const timeStatusEnum = ref('');
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 0a61ad2..3946031 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -1,7 +1,7 @@
-
+