diff --git a/.env b/.env index 883e41e..c855deb 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ SHOPRO_VERSION = v1.8.3 # 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development) SHOPRO_BASE_URL = https://zysc.fjptzykj.com -#SHOPRO_BASE_URL = http://192.168.1.12:6127 +#SHOPRO_BASE_URL = http://192.168.10.36:6127 #SHOPRO_BASE_URL = http://124.222.208.27:6127 #SHOPRO_BASE_URL = http://192.168.1.9:6127 #SHOPRO_BASE_URL = http://192.168.1.8:6127 @@ -11,8 +11,10 @@ SHOPRO_BASE_URL = https://zysc.fjptzykj.com # 后端接口 - 测试环境(通过 process.env.NODE_ENV = development) SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com +#SHOPRO_DEV_BASE_URL = http://192.168.10.36:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.10.29:6127 #SHOPRO_DEV_BASE_URL = http://192.168.1.12:6127 -#SHOPRO_DEV_BASE_URL = http://124.222.208.27:6127 +#SHOPRO_DEV_BASE_URL = http://192.168.10.75:6127 #SHOPRO_DEV_BASE_URL = http://192.168.1.9:6127 #SHOPRO_DEV_BASE_URL = http://192.168.1.8:6127 #SHOPRO_DEV_BASE_URL = http://192.168.1.7:6127 diff --git a/manifest.json b/manifest.json index d4665ed..51f949f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name": "芋道商城", - "appid": "__UNI__460BC4C", + "name": "众悦商城", + "appid": "__UNI__6E503C5", "description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。", "versionName": "2.1.0", "versionCode": 183, @@ -184,7 +184,7 @@ "versionCode": 100 }, "mp-weixin": { - "appid": "wxa66f2777a5656baf", + "appid": "", "setting": { "urlCheck": false, "minified": true, diff --git a/pages.json b/pages.json index b1dafb8..58959e5 100644 --- a/pages.json +++ b/pages.json @@ -59,6 +59,34 @@ "group": "商城" } }, + { + "path": "pages/seeding/seeding_fabu/seeding_fabu", + "style": { + "navigationBarTitleText": "发布动态", + "navigationBarBackgroundColor": "#FFFFFF" + // "navigationBarTextStyle": "black" + }, + "meta": { + "auth": true, // 可能需要登录 + "sync": true, + "title": "发布动态", + "group": "商城" + } + }, + { + "path": "pages/seeding/seeding_fabu/detail", + "style": { + "navigationBarTitleText": "内容详情", + "navigationBarBackgroundColor": "#FFFFFF" + // "navigationBarTextStyle": "black" + }, + "meta": { + "auth": true, // 可能需要登录 + "sync": true, + "title": "内容详情", + "group": "商城" + } + }, { "path": "pages/subscribe/success_tolse", "style": { @@ -193,9 +221,8 @@ } }, { - "path" : "pages/community/community", - "style" : - { + "path": "pages/community/community", + "style": { "navigationBarTitleText": "社区", "enablePullDownRefresh": false }, @@ -205,6 +232,12 @@ "title": "社区", "group": "商城" } + }, + { + "path": "sheep/components/s-image-banner-long/s-image-banner-long", + "style": { + "navigationBarTitleText": "" + } } ], "subPackages": [{ @@ -244,15 +277,15 @@ } }, { - "path": "point", - "style": { - "navigationBarTitleText": "积分商品" - }, - "meta": { - "sync": true, - "title": "积分商品", - "group": "商品" - } + "path": "point", + "style": { + "navigationBarTitleText": "积分商品" + }, + "meta": { + "sync": true, + "title": "积分商品", + "group": "商品" + } }, { "path": "list", @@ -279,6 +312,12 @@ "style": { "navigationBarTitleText": "商品评价" } + }, + { + "path": "evaluate", + "style": { + "navigationBarTitleText": "" + } } ] }, @@ -378,6 +417,12 @@ "auth": true, "title": "物流轨迹" } + }, + { + "path": "storeVeryfi", + "style": { + "navigationBarTitleText": "" + } } ] }, @@ -510,6 +555,48 @@ "title": "用户积分", "group": "用户中心" } + }, + { + "path": "invoices/invoiceCenter", + "style": { + "navigationBarTitleText": "发票中心" + }, + "meta": { + "auth": true, + "sync": true, + "title": "发票中心", + "group": "发票中心" + } + }, + { + "path": "invoices/addInvoiceHeader", + "style": { + "navigationBarTitleText": "添加发票抬头" + }, + "meta": { + "auth": true, + "sync": true, + "title": "添加发票抬头", + "group": "添加发票抬头" + } + }, + { + "path": "invoices/addInvoiceInfo", + "style": { + "navigationBarTitleText": "添加发票信息" + }, + "meta": { + "auth": true, + "sync": true, + "title": "添加发票信息", + "group": "添加发票信息" + } + }, + { + "path": "invoices/invoicePreviews", + "style": { + "navigationBarTitleText": "" + } } ] }, @@ -788,6 +875,17 @@ "group": "营销活动" } }, + { + "path": "pointRule", + "style": { + "navigationBarTitleText": "积分规则" + }, + "meta": { + "sync": true, + "title": "积分规则", + "group": "积分规则" + } + }, { "path": "groupon/list", "style": { 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 @@ @@ -29,42 +28,44 @@ 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/commission/order.vue b/pages/commission/order.vue index 080e901..13dcca2 100644 --- a/pages/commission/order.vue +++ b/pages/commission/order.vue @@ -180,7 +180,6 @@ padding: 20rpx; .total-item { - margin-bottom: 30rpx; .item-title { font-size: 24rpx; diff --git a/pages/commission/team.vue b/pages/commission/team.vue index 258e596..14a39d0 100644 --- a/pages/commission/team.vue +++ b/pages/commission/team.vue @@ -270,7 +270,9 @@ } function setType(e) { + state.pagination.pageNo = 1; state.pagination.list = []; + state.pagination.total = 0; state.level = e + ''; getTeamList(); } @@ -327,7 +329,7 @@ width: 750rpx; z-index: 3; position: relative; - background: url('https://zysc.fjptzykj.com:3000/shangcheng/c9aeef7e970b76991668740263d518f25ce737b1552db9ee7b22d8572a4a5110.png') no-repeat, + background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/c9aeef7e970b76991668740263d518f25ce737b1552db9ee7b22d8572a4a5110.png') no-repeat, linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); background-size: 750rpx 100%; diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue index cfb5c41..75276cc 100644 --- a/pages/commission/withdraw.vue +++ b/pages/commission/withdraw.vue @@ -29,9 +29,10 @@ 请选择提现方式 钱包余额 - 微信零钱 - 支付宝账户 - 银行卡转账 + 银行卡转账 + 微信账户 + 支付宝账户 + 微信零钱 @@ -64,10 +65,10 @@ /> - 收款码 + 收款码 @@ -81,10 +82,10 @@ - 持卡人 + 持卡人 - 提现银行 + 提现银行 - 开户地址 + 开户地址 { // 参数校验 - debugger; + // debugger; if ( !state.accountInfo.price || state.accountInfo.price > state.brokerageInfo.price || diff --git a/pages/goods/components/detail/detail-activity-tip.vue b/pages/goods/components/detail/detail-activity-tip.vue index f312edb..c29f7fe 100644 --- a/pages/goods/components/detail/detail-activity-tip.vue +++ b/pages/goods/components/detail/detail-activity-tip.vue @@ -88,12 +88,12 @@ //秒杀卡片 .seckill-box { - background: url('https://zysc.fjptzykj.com:3000/shangcheng/0796100444273e747b7afc5778081bf8a1f8373707822cccc272cc205e7ad0f3.png') no-repeat; + background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/0796100444273e747b7afc5778081bf8a1f8373707822cccc272cc205e7ad0f3.png') no-repeat; background-size: 100% 100%; } .groupon-box { - background: url('https://zysc.fjptzykj.com:3000/shangcheng/0796100444273e747b7afc5778081bf8a1f8373707822cccc272cc205e7ad0f3.png') no-repeat; + background: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/0796100444273e747b7afc5778081bf8a1f8373707822cccc272cc205e7ad0f3.png') no-repeat; background-size: 100% 100%; } diff --git a/pages/goods/components/detail/detail-tabbar.vue b/pages/goods/components/detail/detail-tabbar.vue index a9ae00e..1c326e6 100644 --- a/pages/goods/components/detail/detail-tabbar.vue +++ b/pages/goods/components/detail/detail-tabbar.vue @@ -32,7 +32,7 @@ > 客服 diff --git a/pages/goods/evaluate.vue b/pages/goods/evaluate.vue new file mode 100644 index 0000000..fc9c2d6 --- /dev/null +++ b/pages/goods/evaluate.vue @@ -0,0 +1,246 @@ + + + + + + + diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue index caeff01..5a8991e 100644 --- a/pages/goods/groupon.vue +++ b/pages/goods/groupon.vue @@ -90,7 +90,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/27747f3ba1d36807f485eab196aecd357e0811d6f74b36936818a2a7ff86d96e.png" /> diff --git a/pages/goods/point.vue b/pages/goods/point.vue index e526ef1..90452e3 100644 --- a/pages/goods/point.vue +++ b/pages/goods/point.vue @@ -32,7 +32,7 @@ @@ -96,7 +96,7 @@ > @@ -374,7 +374,7 @@ font-size: 24rpx; font-weight: 600; margin-left: -36rpx; - background-image: url('https://zysc.fjptzykj.com:3000/shangcheng/ae81b6671e07f250d4bbccc9707409e970cd5ecee9d4fd861fd0bb926812dda9.png'); + background-image: url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/ae81b6671e07f250d4bbccc9707409e970cd5ecee9d4fd861fd0bb926812dda9.png'); background-repeat: no-repeat; background-size: 100% 100%; color: #ffffff; diff --git a/pages/index/components/second-second.vue b/pages/index/components/second-second.vue index 97ada20..9a88659 100644 --- a/pages/index/components/second-second.vue +++ b/pages/index/components/second-second.vue @@ -16,7 +16,7 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index f5f1f39..f64d033 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,10 +3,14 @@ - - + :navbarStyle="template.navigationBar" navbarbackgroundColor="transparent" onShareAppMessage + @search="(e) => { console.log(e,'eeeeeeeeeeee') }" headerBtns='headerBtns' + :backgroundColor="stateData.backgroundColor" opacityBgUi='ll' :navBg="stateData.navBg"> + + + + + @@ -16,7 +20,13 @@ \ No newline at end of file diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue index 1ad2e06..2341c11 100644 --- a/pages/order/confirm.vue +++ b/pages/order/confirm.vue @@ -32,7 +32,7 @@ 兑换积分 {{ state.orderInfo.usePoint }} @@ -45,7 +45,7 @@ {{ state.pointStatus || state.orderPayload.pointActivityId ? '剩余积分' : '当前积分' }} {{ diff --git a/pages/order/detail.vue b/pages/order/detail.vue index dcbcbf6..eaea16b 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -13,23 +13,23 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/8761518e0fa2e892fa65f9c3f79456a23a4dab1796b7069b8a5482ac79d00811.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/5aa87fed5713160eb6e7f2cf8697d426d52abac9ede40a1011e8d3296266487e.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b729e67ba7b6039676a43b28ca855228ed82914f7669482b938e9696ed9cc798.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/7b1b2022173b3b6812ad256c836b4c5c67b6aa63a203c7d142ae90802a416e7b.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png"> + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png"> 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)"> 拼团详情 + + + + + + + + @@ -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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ + + + + + \ No newline at end of file diff --git a/pages/user/user_vip/index.vue b/pages/user/user_vip/index.vue index bf758a5..5a4ceb3 100644 --- a/pages/user/user_vip/index.vue +++ b/pages/user/user_vip/index.vue @@ -65,7 +65,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/a76960e858aa07041f4bcdda5b085ce86e45bca97dab29b5438a544901d6ccb9.png"> 会员折扣 @@ -73,7 +73,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/ff7742ad6ffacad57259622b5fa6bd782632dcc11297f22c8b6775419630877f.png"> 专属徽章 @@ -81,7 +81,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/15f401f434376a9f0852e110aaf56b9a09410350be4e1ad696742b6334b565b5.png"> 会员升级 @@ -89,7 +89,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/9d89ea97ebbbfa7e94a454a0f3b30c33dbdfec228db38d46c88126f599df309c.png"> 经验积累 @@ -97,7 +97,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/eb35eb546e82b8a3501e4796bb14d49631ee6817478309c48b8fa959ec586f6b.png"> 更多特权 @@ -113,7 +113,7 @@ - + 签到 @@ -126,7 +126,7 @@ - + 购买商品 @@ -206,10 +206,10 @@ const limit = ref(20); const expList = ref([]); // const items = ref([{ - // url: 'https://zysc.fjptzykj.com:3000/shangcheng/94eaaae47569b35cd1f06f2507b0b56f7b597b82b359ee9fb90fd9db630e64cc.png', + // url: 'https://zysc.fjptzykj.com/admin-api/infra/file/25/get/94eaaae47569b35cd1f06f2507b0b56f7b597b82b359ee9fb90fd9db630e64cc.png', // }, { - // url: 'https://zysc.fjptzykj.com:3000/shangcheng/6cb1566a669a2d0a0d043df9d69341fbb9e386fd08fea0bb5288e3baf8543553.png', + // url: 'https://zysc.fjptzykj.com/admin-api/infra/file/25/get/6cb1566a669a2d0a0d043df9d69341fbb9e386fd08fea0bb5288e3baf8543553.png', // }]); const items = ref([]); diff --git a/pages/user/user_vip/list.vue b/pages/user/user_vip/list.vue index 23a65a0..df61bfe 100644 --- a/pages/user/user_vip/list.vue +++ b/pages/user/user_vip/list.vue @@ -5,7 +5,7 @@ @@ -37,7 +37,7 @@ diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue index f4ef444..bca3ae1 100644 --- a/pages/user/wallet/score.vue +++ b/pages/user/wallet/score.vue @@ -7,20 +7,21 @@ paddingTop: Number(statusBarHeight + 88) + 'rpx', }, ]"> - - - - - - - - - - - + + + + + + + + + + + @@ -49,42 +50,45 @@ 分值明细 分值提升 + + + - - - + + + 购买商品可获得积分奖励 赚积分 每日签到可获得积分奖励 赚积分 @@ -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-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue index 1842458..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 @@ - 已开通 立即开通 - + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" /> + --> diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue index 3dd68c6..bb2bf2a 100644 --- a/sheep/components/s-coupon-block/s-coupon-block.vue +++ b/sheep/components/s-coupon-block/s-coupon-block.vue @@ -67,7 +67,7 @@ }; const couponBgFalse = { - background: `url('https://zysc.fjptzykj.com:3000/shangcheng/94dfaa69257a102da3e28aa9b82cc7e04be5cea38555941972f6b5a3c2fc47a3.png') no-repeat top center / 100% 100%`, + background: `url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/94dfaa69257a102da3e28aa9b82cc7e04be5cea38555941972f6b5a3c2fc47a3.png') no-repeat top center / 100% 100%`, }; const btnStyles = { diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue index 30d8270..60623f8 100644 --- a/sheep/components/s-goods-column/s-goods-column.vue +++ b/sheep/components/s-goods-column/s-goods-column.vue @@ -209,7 +209,7 @@ {{ data.point }} @@ -284,7 +284,7 @@ {{ data.point }} diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue index 5e06303..026f849 100644 --- a/sheep/components/s-groupon-block/s-groupon-block.vue +++ b/sheep/components/s-groupon-block/s-groupon-block.vue @@ -10,7 +10,7 @@ + src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/2f2be070c60ceb9466af937ff9dd8917ad2ee02f774dbac48fbb9e73bfc688d0.png" /> 拼团活动 92人拼团成功 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-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 @@ - - + - - - + + - - - + - + {{ item.badge.text }} @@ -70,6 +68,7 @@ + @@ -206,6 +205,7 @@ // 生成数据 const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column)); + console.log('这是菜单', menuList) const swiperHeight = computed( () => props.data.row * (props.data.layout === 'iconText' ? 200 : 180), ); @@ -218,9 +218,22 @@ // 重组数据 const splitData = (oArr = [], length = 1) => { + const newArr = [...oArr, + // { + // title: "商家客服", + // url: "/pages/chat/index", + // badge: { + // bgColor: "#FF6000", + // show: true, + // textColor: "#fff" + // }, + // iconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/5a3b0e3c7e7b15a246f988c3ffa9f11e1efe28d1931d2e76fde0212f1421f1f1.png", + // titleColor: "#333" + // }, + ]; let arr = []; let minArr = []; - oArr.forEach((c) => { + newArr.forEach((c) => { if (minArr.length === length) { minArr = []; } @@ -229,21 +242,22 @@ } minArr.push(c); }); - + console.log('这是arr', arr) return arr; }; + .poster-img { + border-radius: 20rpx; + width: 100%; + height: 100%; + } + \ No newline at end of file diff --git a/sheep/components/s-tabbar/s-tabbar.vue b/sheep/components/s-tabbar/s-tabbar.vue index 5222edf..9268964 100644 --- a/sheep/components/s-tabbar/s-tabbar.vue +++ b/sheep/components/s-tabbar/s-tabbar.vue @@ -44,25 +44,25 @@ text: "首页", url: "/pages/index/index", iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/fdece57673d74d956692edad8c83e85b62503f90f1286cfcbfa9e1c564e127f0.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/fdece57673d74d956692edad8c83e85b62503f90f1286cfcbfa9e1c564e127f0.png" }, { text: "分类", url: "/pages/index/category?id=3", iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/3f681bdfd791d2170fff188be799c588b60a3ceb5b9cd22b8b94a1ae508783d4.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/3f681bdfd791d2170fff188be799c588b60a3ceb5b9cd22b8b94a1ae508783d4.png" }, { text: "购物车", url: "/pages/index/cart", iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/c8e2bc5e2d49ad959951e52c4f4020d6b794310389a09138e1b454be6d6086ec.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/c8e2bc5e2d49ad959951e52c4f4020d6b794310389a09138e1b454be6d6086ec.png" }, { text: "我的", url: "/pages/index/user", iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/cfd3ca7242acfa44b890c66b43ea39dc83de0570a20718251c73785540085002.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/cfd3ca7242acfa44b890c66b43ea39dc83de0570a20718251c73785540085002.png" } ]; } else if (state.themeType == 'blue') { @@ -70,25 +70,25 @@ text: "首页", url: "/pages/index/index", iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/d353e289077f36dab00bb39b161e04364e8d5c1f8e86b2c8ad77e2efc8b38c80.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/d353e289077f36dab00bb39b161e04364e8d5c1f8e86b2c8ad77e2efc8b38c80.png" }, { text: "分类", url: "/pages/index/category?id=3", iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/ffdbfc0244b68cbc0985339049e9b5b5cddf16e50cf4c0ec7326efd61dc5334d.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/ffdbfc0244b68cbc0985339049e9b5b5cddf16e50cf4c0ec7326efd61dc5334d.png" }, { text: "购物车", url: "/pages/index/cart", iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/5d399948d0d391a2ae88fb29049ced561106d7bc6d3bae525c32f3f6dfb92677.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/5d399948d0d391a2ae88fb29049ced561106d7bc6d3bae525c32f3f6dfb92677.png" }, { text: "我的", url: "/pages/index/user", iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/4a5387da733de9a9b2bfe921d0a3f09031cc6da7d3bf1b6125eb6635c9e5f7e9.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/4a5387da733de9a9b2bfe921d0a3f09031cc6da7d3bf1b6125eb6635c9e5f7e9.png" } ]; @@ -97,25 +97,25 @@ text: "首页", url: "/pages/index/index", iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/0af8fd1f7dd91b22ce8480a4f75591d237f3a359a9d991e4eb333eda96f755fe.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/0af8fd1f7dd91b22ce8480a4f75591d237f3a359a9d991e4eb333eda96f755fe.png" }, { text: "分类", url: "/pages/index/category?id=3", iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/15548546af5bd5e13ff5c69c5acab5ab0d3d0333b63d583fd0470f3d48bf4e76.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/15548546af5bd5e13ff5c69c5acab5ab0d3d0333b63d583fd0470f3d48bf4e76.png" }, { text: "购物车", url: "/pages/index/cart", iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/27ed7f014ba28a6c257c84c2ad6e8c73335d8e9df2076db4aedff1c5d03c66ba.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/27ed7f014ba28a6c257c84c2ad6e8c73335d8e9df2076db4aedff1c5d03c66ba.png" }, { text: "我的", url: "/pages/index/user", iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/059277d5bfe7b44ee74cece09fbe8515f5d021f20b2a9729590265cdf893f31a.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/059277d5bfe7b44ee74cece09fbe8515f5d021f20b2a9729590265cdf893f31a.png" } ]; @@ -124,25 +124,25 @@ text: "首页", url: "/pages/index/index", iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/aab810be4dea52817656ac3ae17ed418561bc4b12b4e33116cb68abaf362311f.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/aab810be4dea52817656ac3ae17ed418561bc4b12b4e33116cb68abaf362311f.png" }, { text: "分类", url: "/pages/index/category?id=3", iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/c972bdc6808b37c9c88eac52bb8feb2bf787874a64b45a5ac3e41be60dee0994.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/c972bdc6808b37c9c88eac52bb8feb2bf787874a64b45a5ac3e41be60dee0994.png" }, { text: "购物车", url: "/pages/index/cart", iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/69febc6f7f2371180ae3e11c25bf46c046bdb1b80a14f0b5df3abbea060f47ac.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/69febc6f7f2371180ae3e11c25bf46c046bdb1b80a14f0b5df3abbea060f47ac.png" }, { text: "我的", url: "/pages/index/user", iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png", - activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/de40b82a64b9554092cc7c35621ce1a438bbf234e9b43567790a7b9bc1b8f618.png" + activeIconUrl: "https://zysc.fjptzykj.com/admin-api/infra/file/25/get/de40b82a64b9554092cc7c35621ce1a438bbf234e9b43567790a7b9bc1b8f618.png" } ]; diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue index 933dcd6..9a2e0b5 100644 --- a/sheep/components/s-user-card/s-user-card.vue +++ b/sheep/components/s-user-card/s-user-card.vue @@ -1,11 +1,21 @@