From fcf8cd39b78aa1c03bf0da0155e0522c2c90c3e1 Mon Sep 17 00:00:00 2001
From: zengjunhong <1213276609@qq.com>
Date: Wed, 16 Apr 2025 16:00:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 +-
pages/activity/groupon/detail.vue | 2 +-
pages/activity/groupon/list.vue | 10 ++--
pages/activity/point/exchange_detail.vue | 2 +-
pages/activity/point/exchange_list.vue | 2 +-
pages/activity/point/exchange_success.vue | 2 +-
pages/app/sign.vue | 10 ++--
pages/chat/components/messageListItem.vue | 2 +-
pages/chat/components/toolsPopup.vue | 6 +--
.../components/account-info-tow.vue | 2 +-
pages/commission/components/account-info.vue | 6 +--
.../commission/components/commission-auth.vue | 2 +-
.../components/commission-info-tow.vue | 8 +--
.../commission/components/commission-info.vue | 4 +-
.../commission/components/commission-log.vue | 4 +-
.../commission/components/commission-menu.vue | 30 +++++------
.../components/commission-menu2.vue | 30 +++++------
pages/commission/team.vue | 2 +-
.../components/detail/detail-activity-tip.vue | 4 +-
.../goods/components/detail/detail-tabbar.vue | 2 +-
pages/goods/groupon.vue | 2 +-
pages/goods/point.vue | 6 +--
pages/index/components/second-second.vue | 2 +-
pages/index/index.vue | 51 +++++++++++++++----
pages/order/confirm.vue | 4 +-
pages/order/detail.vue | 16 +++---
pages/pay/index.vue | 4 +-
pages/pay/result.vue | 2 +-
.../reservation_record/reservation_record.vue | 2 +-
pages/seeding/seeding.vue | 6 +--
pages/subscribe/subscribe.vue | 16 +++---
pages/subscribe/success_tolse.vue | 2 +-
pages/user/goods_details_store/index.vue | 6 +--
pages/user/user_vip/index.vue | 18 +++----
pages/user/user_vip/list.vue | 4 +-
pages/user/wallet/score.vue | 12 ++---
.../s-address-item/s-address-item.vue | 10 ++--
.../components/s-block-item/s-block-item.vue | 2 +-
.../s-coupon-block/s-coupon-block.vue | 2 +-
.../s-goods-column/s-goods-column.vue | 4 +-
.../s-groupon-block/s-groupon-block.vue | 2 +-
.../components/s-menu-tools/s-menu-tools.vue | 14 ++---
sheep/components/s-mof-block/s-mof-block.vue | 30 +++++------
.../components/s-order-card/s-order-card.vue | 50 +++++++++---------
.../s-seckill-block/s-seckill-block.vue | 4 +-
.../s-select-seckill-sku.vue | 2 +-
sheep/components/s-tabbar/s-tabbar.vue | 32 ++++++------
sheep/components/s-user-card/s-user-card.vue | 14 ++---
sheep/store/app.js | 4 ++
sheep/ui/su-navbar/su-navbar.vue | 10 ++--
sheep/ui/su-status-bar/su-status-bar.vue | 2 +-
sheep/ui/su-swiper/su-swiper.vue | 19 ++++++-
52 files changed, 269 insertions(+), 219 deletions(-)
diff --git a/manifest.json b/manifest.json
index d4665ed..e262f57 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
- "name": "芋道商城",
- "appid": "__UNI__460BC4C",
+ "name": "众悦商城",
+ "appid": "__UNI__DABE0F9",
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
"versionName": "2.1.0",
"versionCode": 183,
diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index bade0a3..7317a7d 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -27,7 +27,7 @@
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/2dc59ec207f1c5bd04d0f4734a4600c5e2dce8e5d740bb7ddfce75e9012a4b04.png" />
diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index b3c81b9..9944247 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -120,23 +120,23 @@
width: 100%;
height: 458rpx;
margin-top: -88rpx;
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/60fc2b85464857c82643d346c4ef6b387e4e4d3d923b4816b717e0d645454491.jpg');
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/60fc2b85464857c82643d346c4ef6b387e4e4d3d923b4816b717e0d645454491.jpg');
background-size: 100% 100%;
}
.lvv{
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/d7527e651cf2aef01871872e3e808f30ccddcb9a59c4db1e6d8f038216515d15.jpg') !important;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d7527e651cf2aef01871872e3e808f30ccddcb9a59c4db1e6d8f038216515d15.jpg') !important;
background-size: 100% 100% !important;
}
.bluev{
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/27d4737ae9482948b0336d0e6f63e887dd70ad192f4c727cdd6ff37409a94765.jpg') !important;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/27d4737ae9482948b0336d0e6f63e887dd70ad192f4c727cdd6ff37409a94765.jpg') !important;
background-size: 100% 100% !important;
}
.pinkv{
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/4934eb152ba1302ce28963b1bc554caff9b31bac04596dfc04058435e48cbf8f.jpg') !important;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/4934eb152ba1302ce28963b1bc554caff9b31bac04596dfc04058435e48cbf8f.jpg') !important;
background-size: 100% 100% !important;
}
.orangev{
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/d317e16aa7a7497e5bf410ca7f8b8d96698bd83ed6b382aa9d40229dddac7060.jpg') !important;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d317e16aa7a7497e5bf410ca7f8b8d96698bd83ed6b382aa9d40229dddac7060.jpg') !important;
background-size: 100% 100% !important;
}
.list-content {
diff --git a/pages/activity/point/exchange_detail.vue b/pages/activity/point/exchange_detail.vue
index 27d2213..e78ef8b 100644
--- a/pages/activity/point/exchange_detail.vue
+++ b/pages/activity/point/exchange_detail.vue
@@ -12,7 +12,7 @@
{{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
diff --git a/pages/activity/point/exchange_list.vue b/pages/activity/point/exchange_list.vue
index e6b4a27..bd265f3 100644
--- a/pages/activity/point/exchange_list.vue
+++ b/pages/activity/point/exchange_list.vue
@@ -19,7 +19,7 @@
-{{item.usePoint}} 积分
diff --git a/pages/activity/point/exchange_success.vue b/pages/activity/point/exchange_success.vue
index 80bec6b..a6b42d2 100644
--- a/pages/activity/point/exchange_success.vue
+++ b/pages/activity/point/exchange_success.vue
@@ -2,7 +2,7 @@
-
+
商品兑换成功
diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index 5c719bc..feec45e 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -3,7 +3,7 @@
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/56024e3b60810cc781cbed30ebfe4568a8b721dae5e15aab848f760574558843.png">
签到有礼
@@ -38,10 +38,10 @@
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d1dd98b6a37ea9ea90c49898024d3669a54ee2a48f028b671609937b6b1250af.png">
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b41e27f0f1c392777e86e37715abbede504c64ef0354b0bedffed6a6d428763c.png">
@@ -56,10 +56,10 @@
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d1dd98b6a37ea9ea90c49898024d3669a54ee2a48f028b671609937b6b1250af.png">
+ src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b41e27f0f1c392777e86e37715abbede504c64ef0354b0bedffed6a6d428763c.png">
diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue
index baa4514..9ba06e9 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('https://zysc.fjptzykj.com:3000/shangcheng/d1e722fb4a257a9ab28c7aca2df004d0159a8ee9cc1d02bccf7ef27b55fcc526.png')
+ sheep.$url.static('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d1e722fb4a257a9ab28c7aca2df004d0159a8ee9cc1d02bccf7ef27b55fcc526.png')
"
mode="aspectFill"
>
diff --git a/pages/chat/components/toolsPopup.vue b/pages/chat/components/toolsPopup.vue
index 8c4c094..11c0da1 100644
--- a/pages/chat/components/toolsPopup.vue
+++ b/pages/chat/components/toolsPopup.vue
@@ -37,7 +37,7 @@
>
@@ -46,7 +46,7 @@
商品
@@ -54,7 +54,7 @@
订单
diff --git a/pages/commission/components/account-info-tow.vue b/pages/commission/components/account-info-tow.vue
index 5700fcd..4343f6d 100644
--- a/pages/commission/components/account-info-tow.vue
+++ b/pages/commission/components/account-info-tow.vue
@@ -117,7 +117,7 @@
border-radius: 12rpx 12rpx 0 0;
z-index: 3;
position: relative;
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/423af1ff70d4e80ca7bd4ede17b9fe63800aaffd2e4e8b5b7584ab5bf5884996.png') no-repeat;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/423af1ff70d4e80ca7bd4ede17b9fe63800aaffd2e4e8b5b7584ab5bf5884996.png') no-repeat;
background-size: cover;
diff --git a/pages/commission/components/account-info.vue b/pages/commission/components/account-info.vue
index dfe71bf..64f7b97 100644
--- a/pages/commission/components/account-info.vue
+++ b/pages/commission/components/account-info.vue
@@ -5,7 +5,7 @@
@@ -21,7 +21,7 @@
@@ -267,7 +267,7 @@
// border-radius: 12rpx 12rpx 0 0;
z-index: 3;
position: relative;
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/cbbe23772e68ed5fc5c18d193f9f674d6e87ccddd422e0df6af6cab5dfea6c27.png') no-repeat;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/cbbe23772e68ed5fc5c18d193f9f674d6e87ccddd422e0df6af6cab5dfea6c27.png') no-repeat;
background-size: 100%;
padding-bottom: 25px;
border-radius: 18px;
diff --git a/pages/commission/components/commission-auth.vue b/pages/commission/components/commission-auth.vue
index 1b348fe..bf2850a 100644
--- a/pages/commission/components/commission-auth.vue
+++ b/pages/commission/components/commission-auth.vue
@@ -12,7 +12,7 @@
diff --git a/pages/commission/components/commission-info-tow.vue b/pages/commission/components/commission-info-tow.vue
index e78e57e..1e32ae6 100644
--- a/pages/commission/components/commission-info-tow.vue
+++ b/pages/commission/components/commission-info-tow.vue
@@ -18,7 +18,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -145,8 +145,8 @@
width: 100%;
height: 580rpx;
// margin: -88rpx 20rpx 0 20rpx;
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/c4f941683d41701ac7f182824791ff43b5f7e70fb527b4d4d153416d6065c44f.png') no-repeat;
- // background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/c4f941683d41701ac7f182824791ff43b5f7e70fb527b4d4d153416d6065c44f.png') no-repeat;
+ // background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
// background:#ff3000;
background-size: 100% 100%;
display: flex;
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
index 0b883fa..c559e51 100644
--- a/pages/commission/components/commission-info.vue
+++ b/pages/commission/components/commission-info.vue
@@ -63,8 +63,8 @@
width: 100%;
height: 580rpx;
// margin: -88rpx 20rpx 0 20rpx;
- background: url('https://zysc.fjptzykj.com:3000/shangcheng/ae736076156e99710f417fe5619cd0be47a2fad082a192dbbd6dcbc2bbc65eea.png') no-repeat;
- // background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
+ background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/ae736076156e99710f417fe5619cd0be47a2fad082a192dbbd6dcbc2bbc65eea.png') no-repeat;
+ // background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
// background:#ff3000;
background-size: 100% 100%;
display: flex;
diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
index 81a6206..01d6847 100644
--- a/pages/commission/components/commission-log.vue
+++ b/pages/commission/components/commission-log.vue
@@ -2,7 +2,7 @@
@@ -187,6 +196,7 @@
import { showAuthModal } from '@/sheep/hooks/useModal';
import FileApi from '@/sheep/api/infra/file';
import UserApi from '@/sheep/api/member/user';
+ import AuthUtil from '@/sheep/api/member/auth';
const state = reactive({
model: {}, // 个人信息
@@ -195,7 +205,7 @@
});
const placeholderStyle = 'color:#BBBBBB;font-size:28rpx;line-height:normal';
-
+const isLogin = computed(() => sheep.$store('user').isLogin);
const sexRadioMap = [
{
name: '男',
@@ -300,7 +310,27 @@
state.thirdInfo = result || {};
}
};
-
+
+ // 退出账号
+ function onLogout() {
+ uni.showModal({
+ title: '提示',
+ content: '确认退出账号？',
+ success: async function (res) {
+ if (!res.confirm) {
+ return;
+ }
+ const { code } = await AuthUtil.logout();
+ if (code !== 0) {
+ return;
+ }
+ sheep.$store('user').logout();
+ sheep.$router.go('/pages/index/user');
+ },
+ });
+ }
+
+
onBeforeMount(() => {
getUserInfo();
});
diff --git a/pages/user/invoices/addInvoiceHeader.vue b/pages/user/invoices/addInvoiceHeader.vue
new file mode 100644
index 0000000..bcbe3ad
--- /dev/null
+++ b/pages/user/invoices/addInvoiceHeader.vue
@@ -0,0 +1,380 @@
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/invoices/addInvoiceInfo.vue b/pages/user/invoices/addInvoiceInfo.vue
new file mode 100644
index 0000000..b91ea95
--- /dev/null
+++ b/pages/user/invoices/addInvoiceInfo.vue
@@ -0,0 +1,387 @@
+
+
+
+
+
+ 温馨提示：
+ 1、应国家税务总局要求，您若开具增值税普通发票，须同时提供企业抬头及纳税人识别号，否则发票将无法用于企业报销;
+ 2，发票将由订单所属城市的公司为您开具;
+ 3、配合国家税务总局推进全面数字化的电子发票，部分城市已转为全电发票，发票处理时长为1-3个工作日，请耐心等待。
+
+
+
+ 提交申请
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/invoices/invoiceCenter.vue b/pages/user/invoices/invoiceCenter.vue
new file mode 100644
index 0000000..5337708
--- /dev/null
+++ b/pages/user/invoices/invoiceCenter.vue
@@ -0,0 +1,472 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.spuName}}
+
+
+
+ {{item.invoice_type}}
+ 申请时间:{{item.createTime}}
+
+
+ ￥{{ fen2yuan(item.price) }}
+
+
+
+ {{ item.status === 1 ? "已开票" : "开票中" }}
+ 查看发票信息
+
+
+
+
+
+
+ 没有发票信息呦~
+
+
+
+
+
+
+ {{item.name}}
+ 默认
+
+ 联系邮箱：{{ item.email }}
+ 联系电话：{{ item.companyTel }}
+
+
+ {{item.type?"企业":'个人'}}普通发票
+
+ 编辑
+ 删除
+
+
+
+
+
+
+ 没有发票信息呦~
+
+ 添加新发票
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/invoices/invoicePreviews.vue b/pages/user/invoices/invoicePreviews.vue
new file mode 100644
index 0000000..65c7a53
--- /dev/null
+++ b/pages/user/invoices/invoicePreviews.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+ 点击预览发票
+
+
+ 复制pdf地址去浏览器下载
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sheep/api/product/category.js b/sheep/api/product/category.js
index 3b6f8f0..0812cb1 100644
--- a/sheep/api/product/category.js
+++ b/sheep/api/product/category.js
@@ -16,6 +16,27 @@ const CategoryApi = {
params: { ids },
});
},
+
+ // 查询评论分类列表
+ getCommentLists: () => {
+ return request({
+ url: '/promotion/article-category/list',
+ method: 'GET',
+ });
+ },
+
+ // 查询评论详情
+ getCommentListByIds: (id) => {
+ return request({
+ url: '/promotion/article/getArtical?id='+id,
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ showError: false,
+ },
+ });
+ },
+
};
export default CategoryApi;
diff --git a/sheep/api/seedComm/seedComm.js b/sheep/api/seedComm/seedComm.js
new file mode 100644
index 0000000..f63329c
--- /dev/null
+++ b/sheep/api/seedComm/seedComm.js
@@ -0,0 +1,82 @@
+import request from '@/sheep/request';
+
+
+const SeedApi = {
+ //获取种草列表
+ getSeedList: (data) => {
+ return request({
+ url: '/promotion/circle/page',
+ method: 'GET',
+ data
+ });
+ },
+
+ //发布种草
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/create',
+ method: 'POST',
+ data
+ });
+ },
+
+ //修改种草
+ updateSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doCircleUpdate',
+ method: 'PUT',
+ data
+ });
+ },
+
+ //浏览量叠加
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doBrowse',
+ method: 'PUT',
+ data
+ });
+ },
+
+ //点赞/取消点赞
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doLike',
+ method: 'PUT',
+ data
+ });
+ },
+
+ //删除评论
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doReviewDelete',
+ method: 'DELETE',
+ data
+ });
+ },
+
+ //删除动态
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doCircleDelete',
+ method: 'DELETE',
+ data
+ });
+ },
+
+ //评论/回复
+ createSeed: (data) => {
+ return request({
+ url: '/promotion/circle/doReview',
+ method: 'POST',
+ data
+ });
+ },
+
+};
+
+
+
+
+export default SeedApi;
diff --git a/sheep/api/trade/invoices.js b/sheep/api/trade/invoices.js
new file mode 100644
index 0000000..cec0d14
--- /dev/null
+++ b/sheep/api/trade/invoices.js
@@ -0,0 +1,84 @@
+import request from '@/sheep/request';
+
+const InvoiceApi = {
+ // 获得发票抬头列表
+ getInvoicesHeadList: (params) => {
+ return request({
+ url: `/trade/invoice-header/list`,
+ method: 'GET',
+ params,
+ custom: {
+ showLoading: true,
+ },
+ });
+
+ },
+ // 获得当前用户发票列表
+ getInvoicesList: (params) => {
+ return request({
+ url: `/trade/invoice/page`,
+ method: 'GET',
+ params,
+ custom: {
+ showLoading: true,
+ },
+ });
+ },
+ // 获得发票抬头详情
+ getInvoicesheadDetail: (params) => {
+ return request({
+ url: `/trade/invoice-header/get?id=${params}`,
+ method: 'GET',
+ params,
+ custom: {
+ showLoading: false,
+ },
+ });
+ },
+ // 创建发票抬头
+ createInvoicehead: (data) => {
+ return request({
+ url: `/trade/invoice-header/create`,
+ method: 'POST',
+ data,
+ custom: {
+ showLoading: true,
+ },
+ });
+ },
+ // 修改发票抬头
+ updateInvoicehead: (data) => {
+ return request({
+ url: `/trade/invoice-header/update`,
+ method: 'PUT',
+ data,
+ custom: {
+ showLoading: true,
+ },
+ });
+ },
+ // 删除发票抬头
+ deleteInvoicehead: (data) => {
+ return request({
+ url: `/trade/invoice-header/delete?id=${data}`,
+ method: 'DELETE',
+ data,
+ custom: {
+ showLoading: false,
+ },
+ });
+ },
+ // 创建新发票
+ createInvoicenew: (data) => {
+ return request({
+ url: `/trade/invoice/create`,
+ method: 'POST',
+ data,
+ custom: {
+ showLoading: false,
+ },
+ });
+ },
+}
+
+export default InvoiceApi;
\ No newline at end of file
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index 14e89aa..8728b13 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -156,7 +156,23 @@
}
const loginRes = await sheep.$platform.useProvider(provider).login();
if (loginRes) {
- closeAuthModal();
+
+ const userInfo = await sheep.$store('user').getInfo();
+ closeAuthModal();
+ console.log("用户数据",userInfo)
+ // #ifdef MP-WEIXIN
+ const regex = /^用户/;
+ if(regex.test(userInfo.nickname) || !userInfo.avatar){
+ showAuthModal('mpAuthorization');
+ return
+ }
+ // #endif
+
+ if (userInfo.avatar && userInfo.nickname) {
+ return;
+ }
+
+
// 触发小程序授权信息弹框
// #ifdef MP-WEIXIN
showAuthModal('mpAuthorization');
@@ -172,7 +188,17 @@
}
let result = await sheep.$platform.useProvider().mobileLogin(e.detail);
if (result) {
- closeAuthModal();
+ const userInfo = await sheep.$store('user').getInfo();
+ closeAuthModal();
+ if (userInfo.avatar && userInfo.nickname) {
+ return;
+ }
+ console.log("用户数据",userInfo)
+
+
+ // #ifdef MP-WEIXIN
+ showAuthModal('mpAuthorization');
+ // #endif
}
};
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 5ce0e91..9a3f44c 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -19,6 +19,8 @@
+
+
@@ -34,6 +36,8 @@
+
+
@@ -67,14 +71,14 @@
-
已开通
立即开通
-
+ -->
diff --git a/sheep/components/s-image-banner-long/s-image-banner-long.vue b/sheep/components/s-image-banner-long/s-image-banner-long.vue
new file mode 100644
index 0000000..7b56f83
--- /dev/null
+++ b/sheep/components/s-image-banner-long/s-image-banner-long.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index f07abf5..54b8e84 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -55,7 +55,7 @@
} from '@dcloudio/uni-app';
// #ifdef MP-WEIXIN
import {
- onShareAppMessage
+ onShareAppMessage,onShareTimeline
} from '@dcloudio/uni-app';
// #endif
@@ -198,6 +198,10 @@
});
// #ifdef MP-WEIXIN
+ uni.showShareMenu({
+ withShareTicket: true,
+ menus: ['shareAppMessage', 'shareTimeline'],
+ });
// 微信小程序分享
onShareAppMessage(() => {
return {
@@ -206,6 +210,13 @@
imageUrl: shareInfo.value.image,
};
});
+ onShareTimeline(() => {
+ return {
+ title: shareInfo.value.title,
+ query: shareInfo.value.path,
+ imageUrl: shareInfo.value.image,
+ };
+ });
// #endif
onShow(() => {
@@ -222,6 +233,7 @@
background-color: var(--ui-BG-1) !important;
z-index: 2;
display: flex;
+ // overflow-x: hidden;
width: 100%;
height: 100vh;
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index c98ebe5..65fe1a6 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -1,6 +1,6 @@
-
+
订单中心
diff --git a/sheep/components/s-richtextnew-block/s-richtextnew-block.vue b/sheep/components/s-richtextnew-block/s-richtextnew-block.vue
new file mode 100644
index 0000000..20134e1
--- /dev/null
+++ b/sheep/components/s-richtextnew-block/s-richtextnew-block.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 15de5c6..4069a8b 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -20,7 +20,7 @@
- {{ userInfo?.nickname || nickname }}
+ {{ displayedNickname }}
@@ -87,6 +87,20 @@
// 是否登录
const isLogin = computed(() => sheep.$store('user').isLogin);
+
+ const displayedNickname = computed(()=> {
+ // console.log("用户信息及登录情况",userInfo,isLogin)
+ if (!isLogin.value) {
+ // 用户未登录
+ return props.nickname;
+ }
+ if (userInfo.value.nickname && userInfo.value.nickname.trim() !== '') {
+ // 用户已登录且 nickname 不为空字符串
+ return userInfo.value.nickname;
+ }
+ // 用户已登录但 nickname 为空字符串
+ return '未设置昵称';
+ })
// 接收参数
const props = defineProps({
background: {
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index d21db79..47f40ae 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,6 +1,6 @@
-
+
+
+ 分销规则
+ 查看规则
+
+
@@ -130,7 +136,9 @@
summary2: {},
arr2: {}
});
-
+ const goToRule = () => {
+ sheep.$router.go('/pages/index/page?id=26');
+ };
async function getAgentInfo() {
const {
code,
@@ -190,7 +198,7 @@
padding: 12px 0;
border-radius: 20px;
color: white;
- font-weight:700;
+ font-weight: 700;
}
.new-ljsy {
@@ -212,6 +220,32 @@
align-items: center;
justify-content: left;
+ &.rule-btn {
+ width: 30%;
+ /* 根据布局调整宽度，保持三列布局 */
+ // background: rgba(245, 235, 220, 0.5);
+ /* 浅色背景，与原有区块区分 */
+ border-radius: 12px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .l-text {
+ text-align: center;
+
+ .l-text-b {
+ font-size: 24rpx;
+ color: #8E9091;
+ }
+
+ .l-text-t {
+ font-size: 24rpx;
+ color: #B26643;
+ font-weight: 500;
+ }
+ }
+ }
+
&.dd {
margin-right: 5%;
}
@@ -280,14 +314,17 @@
display: flex;
justify-content: space-between;
margin-top: 13px;
- .sss{
- display:flex;
- height:20px;
- align-items:center;
- .header-title{
- color:rgba(194,194,194);
+
+ .sss {
+ display: flex;
+ height: 20px;
+ align-items: center;
+
+ .header-title {
+ color: rgba(194, 194, 194);
}
}
+
.new-btn {
background: rgba(178, 102, 67);
border-radius: 22px;
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
index c559e51..b2f58e3 100644
--- a/pages/commission/components/commission-info.vue
+++ b/pages/commission/components/commission-info.vue
@@ -15,7 +15,6 @@
-
@@ -29,35 +28,37 @@
onBeforeMount
} from 'vue';
import {
- fen2yuan
+ fen2yuan
} from '@/sheep/hooks/useGoods';
const userInfo = computed(() => sheep.$store('user').userInfo);
const headerBg = sheep.$url.css('/static/img/shop/commission/background.png');
-
+
const state = reactive({
showMoney: false,
});
-
+
async function getAgentInfo() {
- const { code, data } = await BrokerageApi.getBrokerageUserSummary();
- if (code !== 0) {
- return;
- }
- state.summary = data;
+ const {
+ code,
+ data
+ } = await BrokerageApi.getBrokerageUserSummary();
+ if (code !== 0) {
+ return;
+ }
+ state.summary = data;
}
- onBeforeMount(async() => {
- getAgentInfo();
- // 概要数据
- let { data } = await BrokerageApi.getBrokerageUserSummary();
- state.arr = data;
+ onBeforeMount(async () => {
+ getAgentInfo();
+ // 概要数据
+ let {
+ data
+ } = await BrokerageApi.getBrokerageUserSummary();
+ state.arr = data;
});
+ :deep(.page-main) {
+ background-size: 100% 100% !important;
+ }
+
\ No newline at end of file
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 1a9821e..9d0976f 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -32,6 +32,18 @@
@tap.stop="onOrderGroupon(order)">
拼团详情
+
+
+
+
+
+ {{ appInfo.copyright }}
+ {{ appInfo.copytime }}
+
+
+
+
+
+
+
+ :deep(.uni-list-item__extra-text) {
+ color: #bbbbbb;
+ font-size: 28rpx;
+ }
+
\ No newline at end of file
diff --git a/pages/seeding/seeding.vue b/pages/seeding/seeding.vue
index 6af5651..98a6d9d 100644
--- a/pages/seeding/seeding.vue
+++ b/pages/seeding/seeding.vue
@@ -1,62 +1,69 @@
+
+
+ 关注
+ 发现
+
+
+
+
+
+ {{ item }}
+
+
+
-
+
- {{ item.content }}
+
+ {{ item.content }}
+
+
+
+ {{ item.likeCount !== null ? item.likeCount : 0 }}
+
+
+
+
-
+
- {{ item.content }}
+
+ {{ item.content }}
+
+
+
+ {{ item.likeCount !== null ? item.likeCount : 0 }}
+
+
+
+
{{ loadingText }}
-
+
+ 发布
@@ -74,66 +81,145 @@
nextTick,
onMounted,
ref
- } from 'vue'
+ } from 'vue';
import {
onShow,
onReachBottom
} from '@dcloudio/uni-app';
-
// 响应式数据
- const windowHeight = ref(0)
- const allData = ref([])
- const leftList = ref([])
- const rightList = ref([])
- const page = ref(1)
- const loadingText = ref('加载中...')
+ const windowHeight = ref(0);
+ const allData = ref([]);
+ const leftList = ref([]);
+ const rightList = ref([]);
+ const page = ref(1);
+ const loadingText = ref('加载中...');
+ const currentTab = ref(1); // 0 表示关注，1 表示发现
+ const secondNavList = ref(['推荐', '视频', '短剧', '旅游', '美食', '游戏', '钓鱼', '服饰', '信息发布', '创业']);
+ const secondNavIndex = ref(0);
+ const isShow = ref(false);
- // const state = reactive({
- // pagination: {
- // list: [],
- // total: 0,
- // pageNo: 1,
- // pageSize: 10,
- // },
- // })
+ // 点赞功能
+ const likeItem = async (id, index, column) => {
+ try {
+ // 先获取当前点赞状态
+ const {
+ code,
+ data
+ } = await SeedApi.getLike(id);
+ if (code !== 0) {
+ uni.showToast({
+ title: '获取点赞状态失败',
+ icon: 'fail'
+ });
+ return;
+ }
+ // 判断用户是否已点赞
+ const isLiked = data === true;
+
+ // 调用点赞API
+ const {
+ code: likeCode,
+ data: likeData
+ } = await SeedApi.doLike(id);
+ if (likeCode === 0) {
+ // 获取当前列表
+ const list = column === 'left' ? leftList.value : rightList.value;
+ const item = list[index];
+
+ // 更新点赞状态
+ item.isLiked = !isLiked; // 切换点赞状态
+ // 如果已点赞，likeCount+1，否则likeCount-1
+ item.likeCount = isLiked ? item.likeCount - 1 : item.likeCount + 1;
+
+ // 更新列表
+ if (column === 'left') {
+ leftList.value = [...leftList.value.slice(0, index), item, ...leftList.value.slice(index + 1)];
+ } else {
+ rightList.value = [...rightList.value.slice(0, index), item, ...rightList.value.slice(index +
+ 1)];
+ }
+
+ // 提示用户
+ uni.showToast({
+ title: item.isLiked ? '点赞成功' : '取消点赞',
+ icon: 'success'
+ });
+ } else {
+ uni.showToast({
+ title: likeData || '点赞失败',
+ icon: 'fail'
+ });
+ }
+ } catch (error) {
+ console.error('点赞请求失败:', error);
+ uni.showToast({
+ title: '网络错误，请稍后再试',
+ icon: 'fail'
+ });
+ }
+ }
// 生命周期
onMounted(() => {
windowHeight.value = uni.getSystemInfoSync().windowHeight
+ // loadData()
+ })
+ onShow(() => {
+ // 重置数据
+ page.value = 1
+ allData.value = []
+ leftList.value = []
+ rightList.value = []
+ loadingText.value = '加载中...'
+
loadData()
})
-
- // 方法声明
+ const goDetail = (id) => {
+ uni.navigateTo({
+ url: `/pages/seeding/seeding_fabu/detail?id=${id}`
+ });
+ }
+ // 获取数据
const loadData = async () => {
- if (loadingText.value !== '加载中...') return
-
+ if (loadingText.value !== '加载中...') return;
try {
- // const newData = await mockApiRequest()
- const newData = await getlist()
- allData.value = [...allData.value, ...newData]
-
-
+ let newData = [];
+ if (currentTab.value === 0) {
+ newData = await getFollowList();
+ } else {
+ newData = await getlist();
+ }
+ // 获取每一项的点赞状态
+ for (let item of newData) {
+ const {
+ code,
+ data
+ } = await SeedApi.getLike(item.id); // 获取每条数据的点赞状态
+ if (code === 0) {
+ item.isLiked = data; // 根据返回的点赞状态设置
+ } else {
+ item.isLiked = false; // 如果获取失败，默认未点赞
+ }
+ }
+ allData.value = [...allData.value, ...newData];
+
// 简单交替分配数据
newData.forEach((item, index) => {
- index % 2 === 0 ?
- leftList.value.push(item) :
- rightList.value.push(item)
- })
+ index % 2 === 0 ? leftList.value.push(item) : rightList.value.push(item);
+ });
- loadingText.value = '加载完成'
+ loadingText.value = '加载完成';
} catch (error) {
- console.error('加载数据失败:', error)
- loadingText.value = '加载失败'
+ console.error('加载数据失败:', error);
+ loadingText.value = '加载失败';
}
- }
-
+ };
const loadMore = () => {
page.value++
loadingText.value = '加载中...'
loadData()
}
-
// 模拟接口请求
const mockApiRequest = () => {
return new Promise(resolve => {
@@ -147,118 +233,189 @@
}, 1000)
})
}
-
- // 查询项目列表
- async function getlist() {
- const { code, data } = await SeedApi.getSeedList({
+ // 获取关注列表
+ async function getFollowList() {
+ const {
+ code,
+ data
+ } = await SeedApi.getSeedList({
pageNo: page.value,
});
- console.log("返回数据", data);
- // getData.value = res.data.list;
if (code !== 0) {
- return;
+ return;
}
return data.list;
-
}
- //发布动态按钮
- function fabu() {
- isShow.value = !isShow.value
+ // 获取发现列表
+ async function getlist() {
+ const {
+ code,
+ data
+ } = await SeedApi.getSeedList({
+ pageNo: page.value,
+ });
+ if (code !== 0) {
+ return;
+ }
+ return data.list;
}
- // getlist();
+ // 切换标签
+ const switchTab = (tabIndex) => {
+ currentTab.value = tabIndex;
+ page.value = 1;
+ allData.value = [];
+ leftList.value = [];
+ rightList.value = [];
+ loadingText.value = '加载中...';
+ loadData();
+ };
+
+ // 切换二级导航标签
+ const switchSecondNav = (index) => {
+ secondNavIndex.value = index;
+ page.value = 1;
+ allData.value = [];
+ leftList.value = [];
+ rightList.value = [];
+ loadingText.value = '加载中...';
+ loadData();
+ };
+
+ // 发布动态
+ function publish() {
+ uni.navigateTo({
+ url: '/pages/seeding/seeding_fabu/seeding_fabu', // 根据实际路径调整
+ });
+ }
\ No newline at end of file
diff --git a/pages/seeding/seeding_fabu/detail.vue b/pages/seeding/seeding_fabu/detail.vue
new file mode 100644
index 0000000..e55a8cf
--- /dev/null
+++ b/pages/seeding/seeding_fabu/detail.vue
@@ -0,0 +1,192 @@
+
+
+
+
+ {{ detail.nickname || '未知作者' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/seeding/seeding_fabu/seeding_fabu.vue b/pages/seeding/seeding_fabu/seeding_fabu.vue
new file mode 100644
index 0000000..ad0f484
--- /dev/null
+++ b/pages/seeding/seeding_fabu/seeding_fabu.vue
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+ 添加图片
+
+
+
+
+
+
+
+ 填写标题会有更多赞噢~
+
+
+
+
+
+ #话题
+
+
+
+
+ 🔗 添加宝贝({{ items.length }})
+ 请选择 >
+
+
+ 📂 内容分类
+ {{ category || '请选择 >' }}
+
+
+ 💬 是否禁止评论
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index 7070af1..bca3ae1 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -7,20 +7,21 @@
paddingTop: Number(statusBarHeight + 88) + 'rpx',
},
]">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -66,12 +67,15 @@
分值提升
+
+
+
-
-
-
+
+
+
@@ -152,7 +156,7 @@
date: [],
today: '',
isShow: 1,
- pointData:[]
+ pointData: []
});
const tabMaps = [{
@@ -176,7 +180,10 @@
return state.date.join('~');
}
});
-
+ // 跳转积分规则
+ function goToRule() {
+ sheep.$router.go('/pages/activity/pointRule');
+ }
//
//
function brandlists3() {
@@ -243,6 +250,25 @@
+ .register-btn {
+ color: #999999;
+ font-size: 30rpx;
+ font-weight: 500;
+ }
+
+ .register-title {
+ color: #999999;
+ font-size: 30rpx;
+ font-weight: 400;
+ margin-right: 24rpx;
+ }
+
+ .or-title {
+ margin: 0 16rpx;
+ color: #999999;
+ font-size: 30rpx;
+ font-weight: 400;
+ }
+
+ .login-btn {
+ color: var(--ui-BG-Main);
+ font-size: 30rpx;
+ font-weight: 500;
+ }
+
+ .circle {
+ position: absolute;
+ right: 0rpx;
+ top: 18rpx;
+ width: 8rpx;
+ height: 8rpx;
+ border-radius: 8rpx;
+ background: var(--ui-BG-Main);
+ }
+ }
+
+ .safe-box {
+ height: calc(constant(safe-area-inset-bottom) / 5 * 3);
+ height: calc(env(safe-area-inset-bottom) / 5 * 3);
+ }
+
+ .tcp-text {
+ color: var(--ui-BG-Main);
+ }
+
+ .agreement-text {
+ color: $dark-9;
+ }
+
\ No newline at end of file
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 4a75d5a..2f5d8d8 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -7,13 +7,13 @@
-
-
+
-
-
-
+
+
-
-
-
+