diff --git a/components/virtualScroll/virtualScroll.vue b/components/virtualScroll/virtualScroll.vue index b9b5e2d..fec8778 100644 --- a/components/virtualScroll/virtualScroll.vue +++ b/components/virtualScroll/virtualScroll.vue @@ -1,184 +1,95 @@ - \ No newline at end of file diff --git a/components/virtualScroll1/virtualScroll1.vue b/components/virtualScroll1/virtualScroll1.vue deleted file mode 100644 index 0c8d85e..0000000 --- a/components/virtualScroll1/virtualScroll1.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/package.json b/package.json index bb10e6e..576cd87 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "license": "ISC", "dependencies": { "dayjs": "^1.11.12", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.6.2" } } diff --git a/pages/home/home.vue b/pages/home/home.vue index 072494e..294ca64 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -11,75 +11,42 @@ Tiktok - + - - - + + Commodities - - - {{ userInfo.account }} - - - + + + + + + + + - - - - - {{ $t(`page.home.${menuTitles[index]}`) }} - + + About Us - - - - - - - - - - - current - - - - - - - - {{ item.title }} - - - - - - {{ $t('page.home.equity_item_1', [item.num]) }} - - - - {{ $t('page.home.equity_item_2', [item.percentage]) }} - - - {{ $t('page.home.equity_item_3', [item.price]) }} - - + + + TikTok Shop + Growth Marketing Company + Click to view introduction - - - - - - {{ $t(`page.home.${agreementTitles[index]}`) }} - + + + Commission + + + + @@ -87,10 +54,13 @@ - + + + + @@ -99,7 +69,7 @@ import serviceList from '@/components/serviceList/serviceList.vue' import popUpWindow from '../../components/popUpWindow/popUpWindow.vue' import virtualScroll from '../../components/virtualScroll/virtualScroll.vue' - import virtualScroll1 from '../../components/virtualScroll1/virtualScroll1.vue' + import changeLanguage from '@/components/changeLanguage/changeLanguage.vue' export default { components: { @@ -107,160 +77,32 @@ serviceList, popUpWindow, virtualScroll, - virtualScroll1 + changeLanguage }, data() { return { - notification: {}, showService: false, menuTitles: ['CustomerService', 'Certifcate', 'Deposit', 'Withdraw'], agreementTitles: ['agreement_item_1', 'agreement_item_2', 'agreement_item_3', 'agreement_item_4'], serverList: [], - onList: [], outList: [], vipList: [], userInfo: {}, vipInfo: {}, - notificationType: { - en: 'keyEnglish', - es: "keySpanish", - zh: "keyChinese", - ar : "keyA", - fr : "keyF", - ru : "keyE" - }, - showPopUp : uni.getStorageSync('clickPopUp') ? false : true + // showPopUp: uni.getStorageSync('clickPopUp') ? false : true, + showPopUp: false, + showLanguage: false, + + swiperDotIndex: 0 } }, onShow() { - this.getIndexIcon() - this.getNotice() - this.getUserInfo() - this.forgetPass() + }, methods: { - //跳转证书页面 - toCertificate() { - uni.navigateTo({ - url: `/pages/instructions/instructions?index=1&type=onList` - }) - }, - - //跳转充值页面 - toPurse() { - uni.navigateTo({ - url: '/pages/purse/purse?type=1' - }) - }, - - //跳转提现页面 - toWithdraw() { - uni.navigateTo({ - url: '/pages/withdraw/withdraw?type=1' - }) - }, - - //显示客服列表 - revealServiceList() { - this.showService = true; - }, - - //关闭客服列表 - closeServiceList() { - this.showService = false; - }, - - //跳转说明页面(六合一) - toinstructions(index) { - this.$play() - uni.navigateTo({ - url: `/pages/instructions/instructions?index=${index}` - }) - }, - - //获取首页图标 - getIndexIcon() { - this.request('indexIcon').then(res => { - if (res.code == 200) { - this.onList = res.result.onList; - this.outList = res.result.outList; - } - }) - }, - - //获取vip套餐 - getVipShop() { - this.request('vipShop').then(res => { - if (res.code == 200) { - res.result.forEach(item => { - if (this.vipInfo && item.id == this.vipInfo.id) { - item.current = true - } - }) - this.vipList = res.result - } - }) - }, - - //获取通知 - getNotice() { - this.request('indexNotice').then(res => { - if (res.code == 200) { - this.notification = res.result - } - }) - }, - - //用户点击菜单 - clickMenu(index) { - this.$play() - if (index == 0) { - this.revealServiceList() - } - if (index == 1) { - this.toCertificate() - } - if (index == 2) { - this.toPurse() - } - if (index == 3) { - this.toWithdraw() - } - }, - - //获取用户信息 - getUserInfo() { - this.request('userInfo').then(res => { - if (res.code == 200) { - this.userInfo = res.result.userInfo - this.vipInfo = res.result.vip - this.getVipShop() - } - }) - }, - - //忘记密码(获取客服列表) - forgetPass() { - this.request('forgetPass').then(res => { - if (res.code == 200) { - this.serverList = res.result - } - }) - }, - - //跳转签到页面 - toSignin() { - this.$play() - uni.navigateTo({ - url: '/pages/signIn/signIn' - }) - }, - - //关闭弹框 - closePopUp(){ - this.showPopUp = false + swiperChange(item) { + console.log(item); } - } } @@ -272,7 +114,7 @@ margin: 0 auto; background-size: 100%; background-repeat: no-repeat; - padding-bottom: 200rpx; + padding-bottom: 120rpx; .content { width: 96%; @@ -309,151 +151,82 @@ } } - .user-info { + .home-title { + position: relative; display: flex; - flex-direction: column; + justify-content: center; align-items: center; - margin: 20rpx 0rpx; - - .user-name { - font-size: 34rpx; + font-size: 36rpx; + height: 120rpx; + + &::before, + &::after { + position: absolute; + top: 50%; + content: ''; + width: 20%; + border-top: 2rpx solid black; } - .member-image { - - image { - width: 150rpx; - height: 110rpx; - } + &::before { + left: 10%; + } + &::after { + right: 10%; } } - .menu-list, - .agreement-list { - display: flex; - flex-wrap: wrap; - justify-content: space-around; - text-align: center; + .swiper { + .swiper-box { + height: 200px; + } - .menu-item, - .agreement-item { + .swiper-item { + /* #ifndef APP-NVUE */ display: flex; + /* #endif */ flex-direction: column; + justify-content: center; align-items: center; - width: calc(25% - 20px); - flex-shrink: 0; - - image { - width: 110rpx; - height: 110rpx; - } - - .menu-descript { - box-sizing: border-box; - width: 100%; - text-align: center; - word-break: break-all; - font-size: 24rpx; - margin: 10rpx 0rpx; - padding: 0rpx 12rpx; - } - } - - .agreement-item { - font-size: 19rpx; - + height: 200px; + color: #fff; + image { - width: 90rpx; - height: 90rpx; + width: 30%; } } + } - .agreement-list { - padding-bottom: 40rpx; - } + .about-us , + .roll { + background-image: url('@/static/home/bg.jpeg'); + background-size: 100%; + height: 400rpx; - .member-list { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - margin: 20rpx auto; - - .member-item { - position: relative; - box-sizing: border-box; - padding: 15rpx; - width: calc(50% - 10rpx); - border-radius: 10rpx; - border: 1px solid #00000080; - margin-bottom: 25rpx; - - .status-icon { - box-sizing: border-box; - position: absolute; - width: 100%; - display: flex; - justify-content: flex-end; - padding: 0rpx 20rpx; - - .current { - display: flex; - align-items: center; - justify-content: center; - width: 120rpx; - background-image: url('@/static/home/current.png'); - background-size: 100%; - background-repeat: no-repeat; - color: black; - font-size: 25rpx; - } - } + .about-content { + padding: 10% 0rpx 0rpx 5%; - .img-box { - display: flex; - justify-content: center; - width: 150rpx; - height: 110rpx; - overflow: hidden; - margin: 20rpx auto; - - image { - width: 150rpx; - height: 110rpx; - } + .title , + .click { + font-size: 40rpx; + font-weight: bold; } - .menber-descript { - text-align: center; - color: $uni-bg-color-app; - font-size: 28rpx; - margin-bottom: 10rpx; + .desc { + font-size: 20rpx; + color: #464648; } - .equity-list { - // color: white; - font-size: 20rpx; - padding-bottom: 40rpx; - - .equity-item { - padding-left: 15rpx; - position: relative; - word-break: break-all; - - &::before { - position: absolute; - left: 0; - top: 10rpx; - content: ''; - width: 5rpx; - height: 5rpx; - background: white; - border-radius: 50%; - } - } + .click { + font-size: 22rpx; } } } + + .roll { + background-image: url('@/static/home/bg1.jpg'); + } } \ No newline at end of file diff --git a/static/home/bg.jpeg b/static/home/bg.jpeg new file mode 100644 index 0000000..49ba612 Binary files /dev/null and b/static/home/bg.jpeg differ diff --git a/static/home/bg1.jpg b/static/home/bg1.jpg new file mode 100644 index 0000000..9ecd758 Binary files /dev/null and b/static/home/bg1.jpg differ diff --git a/static/home/language.png b/static/home/language.png new file mode 100644 index 0000000..a968d24 Binary files /dev/null and b/static/home/language.png differ diff --git a/static/home/product.jpg b/static/home/product.jpg new file mode 100644 index 0000000..eab9628 Binary files /dev/null and b/static/home/product.jpg differ diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md new file mode 100644 index 0000000..85cf54d --- /dev/null +++ b/uni_modules/uni-swiper-dot/changelog.md @@ -0,0 +1,12 @@ +## 1.2.0(2021-11-19) +- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot) +## 1.1.0(2021-07-30) +- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.6(2021-05-12) +- 新增 示例地址 +- 修复 示例项目缺少组件的Bug +## 1.0.5(2021-02-05) +- 调整为uni_modules目录规范 +- 新增 clickItem 事件,支持指示点控制轮播 +- 新增 支持 pc 可用 diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue new file mode 100644 index 0000000..e66b6c7 --- /dev/null +++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json new file mode 100644 index 0000000..f2dd8d2 --- /dev/null +++ b/uni_modules/uni-swiper-dot/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-swiper-dot", + "displayName": "uni-swiper-dot 轮播图指示点", + "version": "1.2.0", + "description": "自定义轮播图指示点组件", + "keywords": [ + "uni-ui", + "uniui", + "轮播图指示点", + "dot", + "swiper" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md new file mode 100644 index 0000000..7d397e2 --- /dev/null +++ b/uni_modules/uni-swiper-dot/readme.md @@ -0,0 +1,11 @@ + + +## SwiperDot 轮播图指示点 +> **组件名:uni-swiper-dot** +> 代码块: `uSwiperDot` + + +自定义轮播图指示点 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 \ No newline at end of file