diff --git a/App.vue b/App.vue
index b9ecc033..9f8b1f5c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,46 +1,39 @@
\ No newline at end of file
+ @import '@/sheep/scss/index.scss';
+
diff --git a/pages/commission/components/account-info.vue b/pages/commission/components/account-info.vue
index d0463e61..686fa7e2 100644
--- a/pages/commission/components/account-info.vue
+++ b/pages/commission/components/account-info.vue
@@ -1,108 +1,117 @@
-
-
-
-
-
-
- 总收益(元)
-
- {{ state.showMoney ? agentInfo.total_income || '0.00' : '***' }}
-
-
-
- 我的佣金(元)
-
- {{ state.showMoney ? userInfo.commission || '0.00' : '***' }}
-
-
-
- 我的消费(元)
-
- {{ state.showMoney ? userInfo.total_consume || '0.00' : '***' }}
-
-
-
-
-
+
+
+
+
+
+
+ 当前佣金(元)
+
+ {{ state.showMoney ? userInfo.brokeragePrice || '0.00' : '***' }}
+
+
+
+ 昨天的佣金(元)
+
+ {{ state.showMoney ? userInfo.yesterdayPrice || '0.00' : '***' }}
+
+
+
+ 累计已提(元)
+
+ {{ state.showMoney ? userInfo.withdrawPrice || '0.00' : '***' }}
+
+
+
+
+
+ .account-card {
+ width: 694rpx;
+ margin: 0 auto;
+ padding: 2rpx;
+ background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%);
+ border-radius: 12rpx;
+ z-index: 3;
+ position: relative;
+
+ .account-card-box {
+ background: #ffefd6;
+
+ .card-box-header {
+ padding: 0 30rpx;
+ height: 72rpx;
+ box-shadow: 0px 2px 6px #f2debe;
+
+ .header-title {
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #a17545;
+ line-height: 30rpx;
+ }
+
+ .cicon-play-arrow {
+ color: #a17545;
+ font-size: 24rpx;
+ line-height: 30rpx;
+ }
+ }
+
+ .card-content {
+ height: 190rpx;
+ background: #fdfae9;
+
+ .item-title {
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #cba67e;
+ line-height: 30rpx;
+ margin-bottom: 24rpx;
+ }
+
+ .item-detail {
+ font-size: 36rpx;
+ font-family: OPPOSANS;
+ font-weight: bold;
+ color: #692e04;
+ line-height: 30rpx;
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
index fea225fd..e2ad24eb 100644
--- a/pages/commission/components/commission-info.vue
+++ b/pages/commission/components/commission-info.vue
@@ -1,126 +1,126 @@
-
-
-
-
-
-
-
-
- {{ userInfo.nickname }}
-
-
-
-
- {{ agentInfo.level_info?.name }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ userInfo.nickname }}
+
+
+
+
+ {{ agentInfo.level_info?.name }}
+
+
+
+
+
+
+
+
+ .tag-img {
+ width: 36rpx;
+ height: 36rpx;
+ border-radius: 50%;
+ margin-left: -2rpx;
+ }
+
+ .tag-title {
+ font-size: 24rpx;
+ padding: 0 10rpx;
+ font-weight: 500;
+ line-height: 36rpx;
+ color: #fff;
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/commission/goods.vue b/pages/commission/goods.vue
index 7b186f02..1d4ce36d 100644
--- a/pages/commission/goods.vue
+++ b/pages/commission/goods.vue
@@ -1,137 +1,123 @@
-
-
-
-
-
- 预计佣金:¥{{ item.commission }}
-
-
-
-
-
-
-
-
+
+
+
+
+ 预计佣金:¥{{ item.commission }}
+
+
+
+
+
+
+
+
-
+ }" @tap="loadmore" />
+
+ .share-btn {
+ width: 120rpx;
+ height: 50rpx;
+ border-radius: 25rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/commission/order.vue b/pages/commission/order.vue
index 4e92e778..56ceb786 100644
--- a/pages/commission/order.vue
+++ b/pages/commission/order.vue
@@ -1,417 +1,411 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
- 佣金:
- {{ item.rewards[0]?.commission }}
-
-
- {{ item.commission_order_status_text }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 佣金:
+ {{ item.rewards[0]?.commission }}
+
+
+ {{ item.commission_order_status_text }}
+
+
+
+
+
+
+
+
+
+
-
-
-
+ }" @tap="loadmore" />
+
+
+
+ &::before {
+ content: '¥';
+ font-size: 22rpx;
+ }
+ }
+
+ .order-status {
+ line-height: 30rpx;
+ padding: 0 10rpx;
+ border-radius: 30rpx;
+ margin-left: 20rpx;
+ font-size: 24rpx;
+ color: var(--ui-BG-Main);
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3e398c12..66dbc464 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,3 +1,4 @@
+
当前积分
-
{{ userInfo.point || 0 }}
@@ -100,7 +99,6 @@
name: '全部',
value: 'all',
},
-
// {
// name: '收入',
// value: 'income',
@@ -147,6 +145,7 @@
// }
}
}
+
onLoad(async (options) => {
state.today = dayjs().format('YYYY-MM-DD');
state.date = [state.today, state.today];
@@ -166,10 +165,6 @@
getLogList();
}
- function appendTimeHMS(arr) {
- return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59'];
- }
-
function onLoadMore() {
// if (state.loadStatus !== 'noMore') {
getLogList(pagination.current_page + 1);
diff --git a/sheep/api/app.js b/sheep/api/app.js
index a456039a..05081248 100644
--- a/sheep/api/app.js
+++ b/sheep/api/app.js
@@ -13,19 +13,6 @@ export default {
showLoading: false,
},
}),
- // 同步客户端页面到后端
- pageSync: (pages) =>
- request({
- url: 'pageSync',
- method: 'POST',
- data: {
- pages,
- },
- custom: {
- showError: false,
- showLoading: false,
- },
- }),
// 自定义页面
page: (id) =>
request({
diff --git a/sheep/api/commission.js b/sheep/api/commission.js
index e3b44c75..35c18d3b 100644
--- a/sheep/api/commission.js
+++ b/sheep/api/commission.js
@@ -1,65 +1,71 @@
import request from '@/sheep/request';
export default {
- // 分销商详情
- agent: () =>
- request({
- url: 'commission/agent',
- method: 'GET',
- custom: {
- showLoading: false,
- showError: false,
- },
- }),
- // 分销表单
- form: () =>
- request({
- url: 'commission/agent/form',
- method: 'GET',
- }),
- // 申请分销商
- apply: (data) =>
- request({
- url: 'commission/agent/apply',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- // 分销动态
- log: (params) =>
- request({
- url: 'commission/log',
- method: 'GET',
- params,
- }),
- // 分销订单
- order: (params) =>
- request({
- url: 'commission/order',
- method: 'GET',
- params,
- }),
- // 分销商品
- goods: (params) =>
- request({
- url: 'commission/goods',
- method: 'GET',
- params,
- }),
- // 我的团队
- team: (params) =>
- request({
- url: 'commission/agent/team',
- method: 'GET',
- params,
- }),
- // 佣金转余额
- transfer: (data) =>
- request({
- url: 'commission/agent/transfer',
- method: 'POST',
- data,
- }),
-};
+ // 分销商详情
+ agent: () =>
+ request({
+ url: 'commission/agent',
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ showError: false,
+ },
+ }),
+ // 分销表单
+ form: () =>
+ request({
+ url: 'commission/agent/form',
+ method: 'GET',
+ }),
+ // 申请分销商
+ apply: (data) =>
+ request({
+ url: 'commission/agent/apply',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ // 分销动态
+ log: (params) =>
+ request({
+ url: 'commission/log',
+ method: 'GET',
+ params,
+ }),
+ // 分销订单
+ order: (params) =>
+ request({
+ url: 'commission/order',
+ method: 'GET',
+ params,
+ }),
+
+ // 分销商品
+ goods: (params) =>
+ request({
+ url: '/app-api/product/spu/page',
+ method: 'GET',
+ params,
+ }),
+ // 我的团队
+ team: (params) =>
+ request({
+ url: 'commission/agent/team',
+ method: 'GET',
+ params,
+ }),
+ // 佣金转余额
+ transfer: (data) =>
+ request({
+ url: 'commission/agent/transfer',
+ method: 'POST',
+ data,
+ }),
+ getSummary: (data) =>
+ request({
+ url: '/app-api/trade/brokerage-user/get-summary',
+ method: 'GET',
+ }),
+};
\ No newline at end of file
diff --git a/sheep/api/member/auth.js b/sheep/api/member/auth.js
index 92ec829f..1cb96b4b 100644
--- a/sheep/api/member/auth.js
+++ b/sheep/api/member/auth.js
@@ -37,6 +37,20 @@ const AuthUtil = {
method: 'POST',
});
},
+ // 创建微信 JS SDK 初始化所需的签名
+ createWeixinMpJsapiSignature: (url) => {
+ return request({
+ url: '/app-api/member/auth/create-weixin-jsapi-signature',
+ method: 'POST',
+ params: {
+ url
+ },
+ custom: {
+ showError: false,
+ showLoading: false,
+ },
+ })
+ },
};
export default AuthUtil;
diff --git a/sheep/api/third.js b/sheep/api/third.js
index 72b83bff..7cd35669 100644
--- a/sheep/api/third.js
+++ b/sheep/api/third.js
@@ -75,18 +75,6 @@ export default {
},
}),
- // 网页jssdk
- jssdk: (data) =>
- request({
- url: 'third/wechat/jssdk',
- method: 'GET',
- data,
- custom: {
- showError: false,
- showLoading: false,
- },
- }),
-
// 小程序订阅消息
subscribeTemplate: (params) =>
request({
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index 52052689..df51cbd9 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -51,7 +51,7 @@
+ />
diff --git a/sheep/components/s-block/s-block.vue b/sheep/components/s-block/s-block.vue
index 19638fca..152b8a67 100644
--- a/sheep/components/s-block/s-block.vue
+++ b/sheep/components/s-block/s-block.vue
@@ -1,3 +1,4 @@
+
diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index af29c097..22a7731f 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,4 +1,4 @@
-
+
diff --git a/sheep/components/s-coupon-card/s-coupon-card.vue b/sheep/components/s-coupon-card/s-coupon-card.vue
index 5be18c85..bd5705bb 100644
--- a/sheep/components/s-coupon-card/s-coupon-card.vue
+++ b/sheep/components/s-coupon-card/s-coupon-card.vue
@@ -1,3 +1,4 @@
+
@@ -79,7 +80,7 @@
:titleColor="data.fields.name?.color"
:titleWidth="(750 - marginRight * 2 - data.space * 4 - marginLeft * 2) / 3"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
- >
+ />
diff --git a/sheep/components/s-hotzone-block/s-hotzone-block.vue b/sheep/components/s-hotzone-block/s-hotzone-block.vue
index 983ceb74..246d6d47 100644
--- a/sheep/components/s-hotzone-block/s-hotzone-block.vue
+++ b/sheep/components/s-hotzone-block/s-hotzone-block.vue
@@ -1,3 +1,4 @@
+
diff --git a/sheep/components/s-image-banner/s-image-banner.vue b/sheep/components/s-image-banner/s-image-banner.vue
index 64feffd4..478e7af7 100644
--- a/sheep/components/s-image-banner/s-image-banner.vue
+++ b/sheep/components/s-image-banner/s-image-banner.vue
@@ -1,3 +1,4 @@
+
-
+
diff --git a/sheep/components/s-image-cube/s-image-cube.vue b/sheep/components/s-image-cube/s-image-cube.vue
index a56669fa..9794d8f1 100644
--- a/sheep/components/s-image-cube/s-image-cube.vue
+++ b/sheep/components/s-image-cube/s-image-cube.vue
@@ -1,3 +1,4 @@
+
diff --git a/sheep/components/s-line-block/s-line-block.vue b/sheep/components/s-line-block/s-line-block.vue
index 97e14f59..c0628f97 100644
--- a/sheep/components/s-line-block/s-line-block.vue
+++ b/sheep/components/s-line-block/s-line-block.vue
@@ -1,3 +1,4 @@
+
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 110c492f..375a5913 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -1,3 +1,4 @@
+
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index 8ed36473..a5f0eb08 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -1,3 +1,4 @@
+