charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

feat: 修改样式

Browse Source
This commit is contained in:
charles
2026-07-16 15:54:26 +08:00
parent 4a669ec670
commit aa2f1009e8
12 changed files with 538 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/choiceness/choiceness.vue
+1 -1
View File
@@ -86,7 +86,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.choiceness_warp { .choiceness_warp {
margin-top: 50rpx; margin-top: 35rpx;
} }
.choiceness_title { .choiceness_title {
components/common/product-seckill-card.vue
+13 -4
View File
@@ -24,7 +24,7 @@
<!-- (秒杀券立减) --> <!-- (秒杀券立减) -->
<view class="coupon_row" v-if="hasCoupon"> <view class="coupon_row" v-if="hasCoupon">
<view class="coupon_badge" v-if="activedType === 'seckill'"> <view class="coupon_badge" v-if="activedType === 'seckill' || activedType === 'actived'">
<text class="flash_icon">⚡</text> <text class="flash_icon">⚡</text>
<text class="coupon_text" v-if="item.secDiscount || item.subsidy">加倍补{{ item.secDiscount || <text class="coupon_text" v-if="item.secDiscount || item.subsidy">加倍补{{ item.secDiscount ||
item.subsidy }}元</text> item.subsidy }}元</text>
@@ -46,7 +46,7 @@
</view> </view>
<!-- Alarm clock button --> <!-- Alarm clock button -->
<view class="alarm_btn_wrapper"> <view class="alarm_btn_wrapper">
<image class="uni-image" v-if="activedType === 'seckill'" <image class="uni-image" v-if="activedType === 'actived'"
src="https://static.tbmall.xin/static/new-home/home_3.png"></image> src="https://static.tbmall.xin/static/new-home/home_3.png"></image>
<image class="uni-image seckill-icon" v-else src="https://static.tbmall.xin/static/home/qiang.png"> <image class="uni-image seckill-icon" v-else src="https://static.tbmall.xin/static/home/qiang.png">
</image> </image>
@@ -110,6 +110,15 @@ export default {
methods: { methods: {
// 商品 // 商品
onSelectProct(item) { onSelectProct(item) {
if (this.activedType === 'actived') {
uni.showToast({
title: '活动即将开始',
icon: 'none',
mask: true,
duration: 1500,
})
return;
}
let url = "/pages/other_package/productInfo/productInfo?id=" + item.id; let url = "/pages/other_package/productInfo/productInfo?id=" + item.id;
if (this.activedType === 'seckill') { if (this.activedType === 'seckill') {
url = "/pages/other_package/productInfo/productInfo?id=" + item.id + "&activedType=" + this.activedType + "&activityId=" + item.activityId; url = "/pages/other_package/productInfo/productInfo?id=" + item.id + "&activedType=" + this.activedType + "&activityId=" + item.activityId;
@@ -239,14 +248,14 @@ export default {
font-size: 26rpx; font-size: 26rpx;
color: #000; color: #000;
font-weight: bold; font-weight: bold;
line-height: 40rpx; line-height: 30rpx;
word-break: break-all; word-break: break-all;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
overflow: hidden; overflow: hidden;
margin-bottom: 12rpx; // margin-bottom: 12rpx;
} }
.coupon_row { .coupon_row {
manifest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"appid" : "__UNI__4910728", "appid" : "__UNI__4910728",
"description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。", "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
"versionName" : "1.0.3", "versionName" : "1.0.3",
"versionCode" : 164, "versionCode" : 165,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
pages/active/limited-time/limited-time.vue
+38 -25
View File
@@ -1,9 +1,9 @@
<template> <template>
<view class="content-two"> <view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp"> <view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper" @change="(e) => (currentNum = e.current)"> <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@change="(e) => (currentNum = e.current)">
<template #indicator> <template #indicator>
<view class="indicator-num"> <view class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text> <text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
@@ -11,26 +11,25 @@
</template> </template>
</up-swiper> </up-swiper>
<view class="img_comm left_warp"> <view class="img_comm left_warp">
<up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00" @click="jumpLeft"></up-image> <up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00"
@click="jumpLeft"></up-image>
</view> </view>
</view> </view>
<view class="tab-view"> <view class="tab-view">
<!-- 限时秒杀卡片 --> <!-- 限时秒杀卡片 -->
<view class="tab-card"> <view class="tab-card">
<view class="tab-item" :class="{ active: activeTab === index }" @click="onActiveTabChange(index)" v-for="(item, index) in activeTabList" :key="index"> <view class="tab-item" :class="{ active: activeTab === index }" @click="onActiveTabChange(index)"
v-for="(item, index) in activeTabList" :key="index">
<text class="tab-text">{{ item.name }}</text> <text class="tab-text">{{ item.name }}</text>
</view> </view>
</view> </view>
<!-- 限时秒杀标签 --> <!-- 限时秒杀标签 -->
<view class="tab-list-container"> <view class="tab-list-container">
<view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index"> <view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
<text <text class="text-28 text-space" :style="{
class="text-28 text-space" color: curTab == index ? '#7A35F6' : '#666'
:style="{ }">
color: curTab == index ? '#7A35F6' : '#666'
}"
>
{{ item.name }} {{ item.name }}
</text> </text>
<!-- <view class="line" v-if="curTab == index"></view> --> <!-- <view class="line" v-if="curTab == index"></view> -->
@@ -40,10 +39,11 @@
<view class="setting-view"> <view class="setting-view">
<view class="name-box"> <view class="name-box">
<mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption" @init="mescrollInit" :fixed="false"> <mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
@init="mescrollInit" :fixed="false">
<!-- 原来单个 v-for 替换成两列 --> <!-- 原来单个 v-for 替换成两列 -->
<view class="mescrollUniView" v-for="item in dataList" :key="item.id"> <view class="mescrollUniView" v-for="item in dataList" :key="item.id">
<productSeckillCard :item="item" actived-type="seckill" :attributes="attributes" /> <productSeckillCard :item="item" :actived-type="activedScekillType" :attributes="attributes" />
</view> </view>
</mescroll-uni> </mescroll-uni>
</view> </view>
@@ -83,8 +83,8 @@ export default {
curTab: 0, curTab: 0,
activeTab: 0, activeTab: 0,
activeTabList: [ activeTabList: [
{ name: '今日秒杀', type: 'current' }, { name: '今日秒杀', type: 'current', activedType: 'seckill' },
{ name: '活动预告', type: 'preview' } { name: '活动预告', type: 'preview', activedType: "actived" }
], ],
upOption: { upOption: {
auto: false, auto: false,
@@ -104,7 +104,8 @@ export default {
bgColor: 'rgba(0,0,0,0)' bgColor: 'rgba(0,0,0,0)'
}, },
mescroll: null, mescroll: null,
attributes: {} // 限时秒杀卡片属性 attributes: {},// 限时秒杀卡片属性
activedScekillType: 'seckill'
}; };
}, },
onLoad() { onLoad() {
@@ -179,9 +180,7 @@ export default {
}, },
downCallback() { downCallback() {
this.$nextTick(function () { this.mescroll && this.mescroll.resetUpScroll();
this.mescroll && this.mescroll.resetUpScroll();
});
}, },
mescrollInit(mescroll) { mescrollInit(mescroll) {
@@ -207,8 +206,12 @@ export default {
if (index !== this.activeTab) { if (index !== this.activeTab) {
this.activeTab = index; this.activeTab = index;
this.dataList = []; this.dataList = [];
if (this.mescroll) {
this.mescroll.isUpScrolling = true;
}
const item = this.activeTabList[index]; const item = this.activeTabList[index];
this.onGetSeckillCurrent(item.type); this.onGetSeckillCurrent(item.type);
this.activedScekillType = item.activedType;
} }
}, },
@@ -234,27 +237,29 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.content-two { .content-two {
height: calc(100vh); height: 100vh;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
position: relative;
} }
.product_info_header_warp { .product_info_header_warp {
position: relative; position: relative;
.product_info_header_swiper { .product_info_header_swiper {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) { ::v-deep(.u-swiper__wrapper) {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper { .u-swiper__wrapper {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper__item__wrapper__image { .u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
} }
} }
@@ -376,7 +381,7 @@ export default {
background-color: #fff; background-color: #fff;
overflow-x: auto; overflow-x: auto;
position: absolute; position: absolute;
top: 520rpx; top: 600rpx;
left: 0; left: 0;
.tab-list-container { .tab-list-container {
@@ -386,6 +391,8 @@ export default {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
overflow-x: auto; overflow-x: auto;
padding: 0 12rpx;
box-sizing: border-box;
} }
.tab-list { .tab-list {
@@ -403,6 +410,7 @@ export default {
margin-top: 0; margin-top: 0;
width: 100%; width: 100%;
flex: 1; flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -411,11 +419,16 @@ export default {
padding: 0 32rpx; padding: 0 32rpx;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
margin-top: 106rpx; margin-top: 126rpx;
/* #ifndef H5 || MP-WEIXIN */
margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
/* #endif */
.name-box { .name-box {
width: 100%; width: 100%;
flex: 1; flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
pages/active/newcomer-exclusive/newcomer-exclusive.vue
+23 -15
View File
@@ -1,6 +1,5 @@
<template> <template>
<view class="content-two"> <view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp"> <view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper" <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@@ -92,7 +91,7 @@ export default {
}; };
}, },
onLoad() { onLoad() {
this.cascadeCategory(); this.cascadeCategory();
this.getCarouselImage() this.getCarouselImage()
this.upCallback({ num: 1, size: 10 }); this.upCallback({ num: 1, size: 10 });
}, },
@@ -130,7 +129,7 @@ export default {
let params = { let params = {
page: page.num, page: page.num,
pageSize: page.size, pageSize: page.size,
// tag: tag: 3
}; };
if (this.curTab != 0) { if (this.curTab != 0) {
params["categoryId"] = this.tabList[this.curTab].id; params["categoryId"] = this.tabList[this.curTab].id;
@@ -139,6 +138,7 @@ export default {
} }
searchList(params).then((res) => { searchList(params).then((res) => {
let curPageLen = res.data ? res.data.length : 0; let curPageLen = res.data ? res.data.length : 0;
if (page.num === 1) this.dataList = [];
if (res.data) { if (res.data) {
this.dataList = page.num === 1 ? res.data : this.dataList.concat(res.data); this.dataList = page.num === 1 ? res.data : this.dataList.concat(res.data);
} }
@@ -151,9 +151,7 @@ export default {
}, },
downCallback() { downCallback() {
this.$nextTick(function () { this.mescroll && this.mescroll.resetUpScroll();
this.mescroll && this.mescroll.resetUpScroll();
});
}, },
mescrollInit(mescroll) { mescrollInit(mescroll) {
@@ -193,25 +191,29 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.content-two { .content-two {
height: calc(100vh); height: 100vh;
background-color: #fff; background-color: #fff;
display: flex;
flex-direction: column;
overflow: hidden;
position: relative;
} }
.product_info_header_warp { .product_info_header_warp {
position: relative; position: relative;
.product_info_header_swiper { .product_info_header_swiper {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) { ::v-deep(.u-swiper__wrapper) {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper { .u-swiper__wrapper {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper__item__wrapper__image { .u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
} }
} }
@@ -297,7 +299,7 @@ export default {
background-color: #fff; background-color: #fff;
overflow-x: auto; overflow-x: auto;
position: absolute; position: absolute;
top: 520rpx; top: 600rpx;
left: 0; left: 0;
.tab-list { .tab-list {
@@ -319,9 +321,10 @@ export default {
} }
.setting-view { .setting-view {
margin-top: 20rpx; margin-top: 40rpx;
width: 100%; width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height)); flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -331,9 +334,14 @@ export default {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
/* #ifndef H5 || MP-WEIXIN */
margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
/* #endif */
.name-box { .name-box {
width: 100%; width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height)); flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
pages/active/super-subsidy/super-subsidy.vue
+21 -13
View File
@@ -1,6 +1,5 @@
<template> <template>
<view class="content-two"> <view class="content-two">
<TopSafe></TopSafe>
<view class="product_info_header_warp"> <view class="product_info_header_warp">
<up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper" <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@@ -120,6 +119,7 @@ export default {
} }
searchList(params).then((res) => { searchList(params).then((res) => {
let curPageLen = res.data ? res.data.length : 0; let curPageLen = res.data ? res.data.length : 0;
if (page.num === 1) this.dataList = [];
if (res.data) { if (res.data) {
this.dataList = this.dataList.concat(res.data); this.dataList = this.dataList.concat(res.data);
} }
@@ -132,9 +132,7 @@ export default {
}, },
downCallback() { downCallback() {
this.$nextTick(function () { this.mescroll && this.mescroll.resetUpScroll();
this.mescroll && this.mescroll.resetUpScroll();
});
}, },
mescrollInit(mescroll) { mescrollInit(mescroll) {
@@ -175,25 +173,29 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.content-two { .content-two {
height: calc(100vh); height: 100vh;
background-color: #fff; background-color: #fff;
display: flex;
flex-direction: column;
overflow: hidden;
position: relative;
} }
.product_info_header_warp { .product_info_header_warp {
position: relative; position: relative;
.product_info_header_swiper { .product_info_header_swiper {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
::v-deep(.u-swiper__wrapper) { ::v-deep(.u-swiper__wrapper) {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper { .u-swiper__wrapper {
height: 600rpx !important; height: 660rpx !important;
.u-swiper__wrapper__item__wrapper__image { .u-swiper__wrapper__item__wrapper__image {
height: 600rpx !important; height: 660rpx !important;
border-radius: 0 !important; border-radius: 0 !important;
} }
} }
@@ -279,7 +281,7 @@ export default {
background-color: #fff; background-color: #fff;
overflow-x: auto; overflow-x: auto;
position: absolute; position: absolute;
top: 520rpx; top: 600rpx;
left: 0; left: 0;
.tab-list { .tab-list {
@@ -301,9 +303,10 @@ export default {
} }
.setting-view { .setting-view {
margin-top: 20rpx; margin-top: 40rpx;
width: 100%; width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height)); flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -313,9 +316,14 @@ export default {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
/* #ifndef H5 || MP-WEIXIN */
margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
/* #endif */
.name-box { .name-box {
width: 100%; width: 100%;
height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height)); flex: 1;
min-height: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
pages/home/home.vue
+94 -209
View File
@@ -1,104 +1,55 @@
<template> <template>
<view <view v-if="pageReady" class="home_warp" :class="platformType ? '' : 'iosplatformType'">
v-if="pageReady"
class="home_warp"
:class="platformType ? '' : 'iosplatformType'"
>
<!-- 带背景的头部 --> <!-- 带背景的头部 -->
<view class="home_content_z_warp"> <view class="home_content_z_warp">
<view class="home_header_warp"> <view class="home_header_warp">
<view class="header_title_warp"> <view class="header_title_warp">
<view <view class="language_warp" style="width: 100%; justify-content: flex-start" @click="jumpSearch">
class="language_warp"
style="width: 100%; justify-content: flex-start"
@click="jumpSearch"
>
<view style="margin-top: 10rpx"> <view style="margin-top: 10rpx">
<up-image <up-image src="https://static.tbmall.xin/static/home/search_b.png" width="20" height="20"
src="https://static.tbmall.xin/static/home/search_b.png" bgColor="#f1f6ff00"></up-image>
width="20"
height="20"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
<text class="search_msg_warp">搜索</text> <text class="search_msg_warp">搜索</text>
</view> </view>
<image <image src="https://static.tbmall.xin/static/chart.png" class="chart_img" @click.stop="jumpNewSearch('list')">
src="https://static.tbmall.xin/static/chart.png" </image>
class="chart_img"
@click.stop="jumpNewSearch('list')"
></image>
</view> </view>
<view class="logo_banner"> <view class="logo_banner">
<view style="padding: 20rpx 0 0 20rpx"> <view style="padding: 20rpx 0 0 20rpx">
<up-image <up-image src="https://static.tbmall.xin/static/home/logo_banner.png" width="108" height="16"
src="https://static.tbmall.xin/static/home/logo_banner.png" bgColor="#f1f6ff00"></up-image>
width="108"
height="16"
bgColor="#f1f6ff00"
></up-image>
<view class="logo_banner_title">TB聚合商城</view> <view class="logo_banner_title">TB聚合商城</view>
<view class="logo_banner_msg">全民共创共享的电商平台</view> <view class="logo_banner_msg">全民共创共享的电商平台</view>
</view> </view>
<up-image <up-image src="https://static.tbmall.xin/static/logo_banner2.png" width="140" height="98"
src="https://static.tbmall.xin/static/logo_banner2.png" bgColor="#f1f6ff00"></up-image>
width="140"
height="98"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
<!-- 分类 --> <!-- 分类 -->
<view class="home_sort_warp"> <view class="home_sort_warp">
<view <view class="sort_comm_warp" v-if="sortList && sortList.length !== 0 && isBlockedDate">
class="sort_comm_warp" <view v-for="item in sortList" :key="item.id" class="sort_item_comm" @click="jumpSort(item)">
v-if="sortList && sortList.length !== 0 && isBlockedDate" <up-image :src="item.icon" width="50" height="36" bgColor="#f1f6ff00"></up-image>
>
<view
v-for="item in sortList"
:key="item.id"
class="sort_item_comm"
@click="jumpSort(item)"
>
<up-image
:src="item.icon"
width="40"
height="32"
bgColor="#f1f6ff00"
></up-image>
<view class="sort_item_title_comm">{{ item.name }}</view> <view class="sort_item_title_comm">{{ item.name }}</view>
</view> </view>
</view> </view>
<view v-else class="not_order_warp"> <view v-else class="not_order_warp">
<up-image <up-image src="https://static.tbmall.xin/static/not_order.png" width="80" height="80"
src="https://static.tbmall.xin/static/not_order.png" bgColor="#f1f6ff00"></up-image>
width="80"
height="80"
bgColor="#f1f6ff00"
></up-image>
<view class="not_order_msg_warp">暂无分类</view> <view class="not_order_msg_warp">暂无分类</view>
</view> </view>
</view> </view>
<!-- 爆款专区--> <!-- 爆款专区-->
<view <view class="home_content_warp Hot_Picks_Zone" v-if="faddishProduct && faddishProduct.length !== 0"
class="home_content_warp Hot_Picks_Zone" @click="onJumpYou">
v-if="faddishProduct && faddishProduct.length !== 0"
@click="onJumpYou"
>
<view class="product_comm_yp"> <view class="product_comm_yp">
<view class="yp_title"> <view class="yp_title">
<view class="yp_title_left"> <view class="yp_title_left">
<text class="yp_title_main">信任桥优品</text> <text class="yp_title_main">信任桥优品</text>
<up-image <up-image src="https://static.tbmall.xin/static/home/youxuan.png" width="14" height="14"
src="https://static.tbmall.xin/static/home/youxuan.png" bgColor="#f1f6ff00"></up-image>
width="14" <text class="yp_title_sub" style="margin-left: 8rpx">品牌五折秒杀福利</text>
height="14"
bgColor="#f1f6ff00"
></up-image>
<text class="yp_title_sub" style="margin-left: 8rpx"
>品牌五折秒杀福利</text
>
</view> </view>
<view class="yp_title_right"> <view class="yp_title_right">
<text>立即抢购</text> <text>立即抢购</text>
@@ -109,27 +60,14 @@
</view> </view>
<view class="yp_content"> <view class="yp_content">
<!-- <up-loading-icon :show="productLoading"></up-loading-icon> --> <!-- <up-loading-icon :show="productLoading"></up-loading-icon> -->
<view <view class="yp_item" v-for="item in faddishProduct" :key="item.id" @click.stop="jumpInfo(item)">
class="yp_item"
v-for="item in faddishProduct"
:key="item.id"
@click.stop="jumpInfo(item)"
>
<view class="yp_item_image_wrapper"> <view class="yp_item_image_wrapper">
<up-image <up-image :src="item.url" width="100%" height="88" bgColor="#f1f6ff00" shape="square"
:src="item.url" radius="15"></up-image>
width="100%"
height="88"
bgColor="#f1f6ff00"
shape="square"
radius="15"
></up-image>
</view> </view>
<view class="yp_item_info"> <view class="yp_item_info">
<view class="yp_item_name">{{ item.title }}</view> <view class="yp_item_name">{{ item.title }}</view>
<view class="yp_item_price_tag" <view class="yp_item_price_tag">优选价{{ item.price }}元</view>
>优选价{{ item.price }}元</view
>
</view> </view>
</view> </view>
</view> </view>
@@ -150,12 +88,8 @@
<view>好物随心兑</view> <view>好物随心兑</view>
</view> </view>
</view> </view>
<up-image <up-image src="https://static.tbmall.xin/static/home/min_card_jfdh_2.png" width="55" height="55"
src="https://static.tbmall.xin/static/home/min_card_jfdh_2.png" bgColor="#f1f6ff00"></up-image>
width="55"
height="55"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
<!-- 红包抽奖 --> <!-- 红包抽奖 -->
<view class="min_card_item" @click="jumpTurntable"> <view class="min_card_item" @click="jumpTurntable">
@@ -166,88 +100,46 @@
<view>现金红包等你拿！</view> <view>现金红包等你拿！</view>
</view> </view>
</view> </view>
<up-image <up-image src="https://static.tbmall.xin/static/home/min_card_hbcj_2.png" width="55" height="55"
src="https://static.tbmall.xin/static/home/min_card_hbcj_2.png" bgColor="#f1f6ff00"></up-image>
width="45"
height="45"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
</view> </view>
<view class="home_actived_warp"> <view class="home_actived_warp">
<view <view class="home_actived_item_warp" v-for="item in homeActivedList" :key="item.id">
class="home_actived_item_warp" <view class="home_actived_item">
v-for="item in homeActivedList"
:key="item.id"
>
<view
class="home_actived_item"
v-if="
(item.activedType === 'seckill' &&
seckillGoodsList.length !== 0) ||
(item.activedType === 'super' && superGoodsList.length !== 0)
"
>
<view class="product_comm_tip" @click="jumpPage(item.path)"> <view class="product_comm_tip" @click="jumpPage(item.path)">
<view class="product_comm_tip_left"> <view class="product_comm_tip_left">
<image class="uni-image" :src="item.title_icon"></image> <image class="uni-image" :src="item.title_icon"></image>
<view <view :class="[
:class="[ activedTabId === 'actived'
activedTabId === 'actived' ? 'tip_title '
? 'tip_title_lable' : 'tip_title_lable',
: 'tip_title', ]" style="margin-right: 10rpx" v-if="item.title_text" @click.stop="jumpTab(item, 'seckill')">{{
]" item.title_text }}</view>
style="margin-right: 10rpx" <view v-if="item.activedType === 'seckill'" :class="[
v-if="item.title_text" activedTabId === 'seckill'
@click.stop="jumpTab(item, 'actived')" ? 'tip_title '
>{{ item.title_text }}</view : 'tip_title_lable',
> ]" @click.stop="jumpTab(item, 'actived')">{{ item.title }}</view>
<view <view v-else class="tip_title_lable">{{ item.title }}</view>
:class="[
activedTabId === 'seckill'
? 'tip_title_lable'
: 'tip_title',
]"
@click.stop="jumpTab(item, 'seckill')"
>{{ item.title }}</view
>
</view> </view>
<view class="product_comm_tip_right" <view class="product_comm_tip_right">{{ item.rightText }}
>{{ item.rightText }} <image class="uni-image" src="/static/common/right.png"></image>
<up-image <!-- <up-image src="/static/common/right.png" width="15" height="15" bgColor="#f1f6ff00"></up-image> -->
src="/static/common/right.png"
width="15"
height="15"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
</view> </view>
<!-- 限时秒杀 --> <!-- 限时秒杀 -->
<view v-if="item.activedType === 'seckill'"> <view v-if="item.activedType === 'seckill'">
<view <view class="product_seckill_card" v-for="ele in seckillGoodsList" :key="ele.id">
class="product_seckill_card" <productSeckillCard :item="ele" :actived-type="seckillActivedType" :attributes='attributes' />
v-for="ele in seckillGoodsList"
:key="ele.id"
>
<productSeckillCard
:item="ele"
:actived-type="item.activedType"
/>
</view> </view>
</view> </view>
<!-- 超级补贴 --> <!-- 超级补贴 -->
<view v-if="item.activedType === 'super'"> <view v-if="item.activedType === 'super'">
<view <view class="product_seckill_card" v-for="ele in superGoodsList" :key="ele.id">
class="product_seckill_card" <productSeckillCard :item="ele" :actived-type="item.activedType" />
v-for="ele in superGoodsList"
:key="ele.id"
>
<productSeckillCard
:item="ele"
:actived-type="item.activedType"
/>
</view> </view>
</view> </view>
</view> </view>
@@ -263,12 +155,7 @@
<up-modal :show="openShow" :showConfirmButton="false"> <up-modal :show="openShow" :showConfirmButton="false">
<view class="slot-content"> <view class="slot-content">
<view class="close_warp" @click="openShow = false"> <view class="close_warp" @click="openShow = false">
<up-image <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
src="/static/common/close.png"
width="20"
height="20"
bgColor="#f1f6ff00"
></up-image>
</view> </view>
<view class="content_"> <view class="content_">
<view class="content_1">温馨提示</view> <view class="content_1">温馨提示</view>
@@ -290,24 +177,14 @@
<view class="banner_box"> <view class="banner_box">
<view class="conter">{{ updateApkObj.content }}</view> <view class="conter">{{ updateApkObj.content }}</view>
<view class="banner_foot" v-if="!bannerPercentageShow"> <view class="banner_foot" v-if="!bannerPercentageShow">
<button <button @click="goUpdate(updateApkObj, platformType)" class="banner_foot_button">
@click="goUpdate(updateApkObj, platformType)"
class="banner_foot_button"
>
立即更新 立即更新
</button> </button>
<view <view @click="bannerShow = false" class="banner_foot_button_no" v-if="!updateApkObj.isForce">暂不更新
@click="bannerShow = false"
class="banner_foot_button_no"
v-if="!updateApkObj.isForce"
>暂不更新
</view> </view>
</view> </view>
<view v-else> <view v-else>
<up-line-progress <up-line-progress :percentage="bannerPercentage" activeColor="#a85cfa"></up-line-progress>
:percentage="bannerPercentage"
activeColor="#a85cfa"
></up-line-progress>
<view class="banner_loading_msg"> <view class="banner_loading_msg">
更新中{{ bannerPercentage }}% 更新中{{ bannerPercentage }}%
</view> </view>
@@ -330,11 +207,7 @@
</view> </view>
</view> </view>
</up-overlay> </up-overlay>
<HomePopup <HomePopup :show="homeShow" :dataObj="curData" @jumpShop="onJumpShop"></HomePopup>
:show="homeShow"
:dataObj="curData"
@jumpShop="onJumpShop"
></HomePopup>
</view> </view>
</template> </template>
@@ -390,22 +263,23 @@ export default {
{ {
id: 1, id: 1,
title: "超级补贴", title: "超级补贴",
title_icon: "https://static.tbmall.xin/static/new-home/home_4.png", title_icon: "https://static.tbmall.xin/static/new-home/home_9.png",
path: "super-subsidy", path: "super-subsidy",
rightText: "官方补贴 .100%正品", rightText: "官方补贴 .100%正品",
activedType: "super", activedType: "super",
}, }, {
{
id: 2, id: 2,
title: "限时秒杀", title: "活动预告",
title_text: "活动预告", title_text: "限时秒杀",
title_icon: "https://static.tbmall.xin/static/new-home/home_3.png", title_icon: "https://static.tbmall.xin/static/new-home/home_10.png",
path: "limited-time", path: "limited-time",
rightText: "专属补贴 . 低价秒杀", rightText: "专属补贴 . 低价秒杀",
activedType: "seckill", activedType: "seckill",
}, },
], // 首页活动列表 ], // 首页活动列表
activedTabId: "seckill", // 当前选中的活动类型 activedTabId: "seckill", // 当前选中的活动类型
attributes: {},
seckillActivedType: 'seckill'
}; };
}, },
onShow() { onShow() {
@@ -446,17 +320,21 @@ export default {
// 不需要启动页，才渲染首页 // 不需要启动页，才渲染首页
this.pageReady = true; this.pageReady = true;
}, },
mounted() {}, mounted() { },
methods: { methods: {
// 切换活动类型 // 切换活动类型
jumpTab(item, type) { jumpTab(item, type) {
if (this.activedTabId === type) return;
this.activedTabId = type; this.activedTabId = type;
// this.attributes = { activeSeckillType: type }
this.seckillActivedType = type;
this.onGetSeckillCurrent(); this.onGetSeckillCurrent();
}, },
// 获取秒杀 // 获取秒杀
onGetSeckillCurrent() { onGetSeckillCurrent() {
const url = const url =
this.activedTabId === "seckill" ? getSeckillCurrent : getSeckillPreview; this.activedTabId === "seckill" ? getSeckillCurrent : getSeckillPreview;
console.log('获取秒杀----', this.activedTabId)
url().then((res) => { url().then((res) => {
console.log("获取秒杀", res); console.log("获取秒杀", res);
if (res.bizcode === 100) { if (res.bizcode === 100) {
@@ -480,11 +358,11 @@ export default {
} }
}); });
}, },
jumpSearch() { jumpSearch() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/rwa_package/dongjian/search", url: "/pages/rwa_package/dongjian/search",
}); });
}, },
// 商品列表 // 商品列表
onGetSuperGoodsList() { onGetSuperGoodsList() {
searchList({ searchList({
@@ -691,7 +569,7 @@ export default {
prg = parseInt( prg = parseInt(
(parseFloat(task.downloadedSize) / (parseFloat(task.downloadedSize) /
parseFloat(task.totalSize)) * parseFloat(task.totalSize)) *
100, 100,
); );
self.bannerPercentage = prg; self.bannerPercentage = prg;
break; break;
@@ -798,8 +676,8 @@ export default {
.home_header_warp { .home_header_warp {
background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%); background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%);
height: 900rpx; height: auto;
padding: 160rpx 30rpx 0rpx; padding: calc(var(--status-bar-height) + 80rpx) 30rpx 30rpx;
} }
.home_content_z_warp { .home_content_z_warp {
@@ -817,8 +695,12 @@ export default {
right: 0; right: 0;
z-index: 999; z-index: 999;
background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%); background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%);
padding: 60rpx 30rpx 20rpx; padding: calc(var(--status-bar-height) + 20rpx) 30rpx 20rpx;
/* 解决部分机型下 fixed 定位底部出现 1px 渲染缝隙（白线）的问题 */
border-bottom: 1px solid transparent;
border-image: linear-gradient(270deg, #af39c4 0%, #7732ff 100%) 1;
} }
.header_right_warp { .header_right_warp {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -855,6 +737,7 @@ export default {
justify-content: space-between; justify-content: space-between;
// padding: 0 30rpx; // padding: 0 30rpx;
color: #ffffff; color: #ffffff;
margin-top: 50rpx;
.logo_banner_title { .logo_banner_title {
font-weight: bold; font-weight: bold;
@@ -1163,13 +1046,13 @@ export default {
display: flex; display: flex;
gap: 10rpx; gap: 10rpx;
justify-content: space-between; justify-content: space-between;
padding: 30rpx 30rpx 0; padding: 30rpx 30rpx 15rpx;
background-color: #fff; background-color: #fff;
.min_card_item { .min_card_item {
padding: 10rpx 12rpx; padding: 10rpx 12rpx;
flex: 1; flex: 1;
height: 108rpx; // height: 108rpx;
border-radius: 30rpx; border-radius: 30rpx;
opacity: 0.8; opacity: 0.8;
border-radius: 16rpx; border-radius: 16rpx;
@@ -1209,7 +1092,8 @@ export default {
.home_actived_item_warp { .home_actived_item_warp {
padding: 0 30rpx 30rpx; padding: 0 30rpx 30rpx;
background-color: #fff; background-color: #fff;
margin-bottom: 30rpx; margin-bottom: 20rpx;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
@@ -1223,11 +1107,12 @@ export default {
.product_comm_tip_left { .product_comm_tip_left {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 32rpx; font-size: 36rpx;
.uni-image { .uni-image {
width: 50rpx; width: 40rpx;
height: 100%; height: 40rpx;
margin-right: 10rpx;
} }
.tip_title { .tip_title {
@@ -1246,11 +1131,12 @@ export default {
font-size: 24rpx; font-size: 24rpx;
color: #666666; color: #666666;
::v-deep(.u-image) { .uni-image {
display: flex !important; width: 30rpx;
align-items: center !important; height: 30rpx;
margin-left: 10rpx; vertical-align: middle;
} }
} }
} }
} }
@@ -1259,8 +1145,7 @@ export default {
.uni-banner-news { .uni-banner-news {
width: 540rpx; width: 540rpx;
margin: 0 auto; margin: 0 auto;
background: url(https://hashmall-prod.oss-cn-shenzhen.aliyuncs.com/common/image/%E9%9D%9E%E5%BC%BA%E5%88%B6%E5%8D%87%E7%BA%A7.png) background: url(https://hashmall-prod.oss-cn-shenzhen.aliyuncs.com/common/image/%E9%9D%9E%E5%BC%BA%E5%88%B6%E5%8D%87%E7%BA%A7.png) no-repeat;
no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.close_btn { .close_btn {
pages/other_package/productInfo/productInfo.vue
+29 -17
View File
@@ -47,8 +47,9 @@
}}</text> }}</text>
<text class="price_o">￥{{ orderInfo.adPrice }}</text> <text class="price_o">￥{{ orderInfo.adPrice }}</text>
</view> </view>
<view class="text-24" style="color: #ff5a5a; width: 120rpx; height: 38rpx" v-if="orderInfo.tag"> <view class="text-24" style="color: #ff5a5a; height: 38rpx; display: flex; align-items: center; gap: 5rpx" v-if="orderInfo?.goodsTagList">
<image src="/static/shopping/tg.png" style="width: 120rpx; height: 38rpx"></image> <image v-for="val in orderInfo.goodsTagList" :src="val.icon" mode="heightFix" style="height: 38rpx">
</image>
</view> </view>
</view> </view>
<view class="content_data_title"> <view class="content_data_title">
@@ -125,7 +126,7 @@
<text class="text-28 text-fu1">拆封后影响品质”或“影响二次销售的”不予退货。</text> <text class="text-28 text-fu1">拆封后影响品质”或“影响二次销售的”不予退货。</text>
<view class="tui-list"> <view class="tui-list">
<view class="tui-box" :key="index" v-for="(item, index) in tuiList"> <view class="tui-box" :key="index" v-for="(item, index) in tuiList">
<image :src="`/static/new/tui_${index}.png`"></image> <image :src="`https://static.tbmall.xin/static/new/tui_${index}.png`"></image>
<text class="text-24 text-gray">{{ item }}</text> <text class="text-24 text-gray">{{ item }}</text>
</view> </view>
<!-- tuiList --> <!-- tuiList -->
@@ -324,8 +325,9 @@
<SharePopup ref="share" v-if="shareOpen" :show="shareShow" @close="onClose" @share="onShare" :id="id" <SharePopup ref="share" v-if="shareOpen" :show="shareShow" @close="onClose" @share="onShare" :id="id"
:text="orderInfo.name ? orderInfo.name : ''" :price="orderInfo.minPrice ? orderInfo.minPrice : ''" :text="orderInfo.name ? orderInfo.name : ''" :price="orderInfo.minPrice ? orderInfo.minPrice : ''"
:tu="swiperList.length && swiperList[0]"></SharePopup> :tu="swiperList.length && swiperList[0]"></SharePopup>
<EvaluateDialog ref="evaluateDialog" :show="evaluateDialogShow" @close="evaluateDialogShow = false" :evalId="id" <EvaluateDialog ref="evaluateDialog" v-if="evaluateDialogShow" :show="evaluateDialogShow"
:mainGraph="orderInfo.mainGraph" :name="orderInfo.name"></EvaluateDialog> @close="evaluateDialogShow = false" :evalId="id" :mainGraph="orderInfo.mainGraph" :name="orderInfo.name">
</EvaluateDialog>
<view class="hideCanvasView"> <view class="hideCanvasView">
<canvas id="myCanvas" canvas-id="myCanvas" :style="{ <canvas id="myCanvas" canvas-id="myCanvas" :style="{
height: bgObj.height + 'px', height: bgObj.height + 'px',
@@ -971,6 +973,10 @@ export default {
if (this.isCoupon) { if (this.isCoupon) {
params.type = -1; params.type = -1;
} }
if (this.activedType == "seckill") {
params["activityType"] = this.activedType; // 活动类型
params["activityId"] = this.activityId;// 秒杀活动ID
}
const resp = await getGoodsSpecs(params); const resp = await getGoodsSpecs(params);
if (resp && resp.bizcode === 100) { if (resp && resp.bizcode === 100) {
const data = resp.data; const data = resp.data;
@@ -1145,9 +1151,10 @@ export default {
} }
.product_info_warp { .product_info_warp {
height: 100vh; min-height: 100vh;
background-color: $app-bj; background-color: $app-bj;
overflow-y: auto; padding-bottom: calc(160rpx + env(safe-area-inset-bottom) + 20rpx);
box-sizing: border-box;
} }
.product_info_header_warp { .product_info_header_warp {
@@ -1359,7 +1366,7 @@ export default {
border-radius: 24rpx; border-radius: 24rpx;
padding: 10rpx 10rpx 30rpx; padding: 10rpx 10rpx 30rpx;
margin-top: 30rpx; margin-top: 30rpx;
margin-bottom: 200rpx; // margin-bottom: 200rpx;
.content_details_title { .content_details_title {
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
@@ -1372,23 +1379,27 @@ export default {
} }
.product_but_warp { .product_but_warp {
padding: 20rpx; padding: 20rpx 20rpx calc(20rpx + env(safe-area-inset-bottom));
position: fixed; position: fixed;
bottom: 0; bottom: 0;
height: 160rpx; left: 0;
width: calc(100% - 40rpx); right: 0;
height: calc(160rpx + env(safe-area-inset-bottom));
background-color: #ffffff; background-color: #ffffff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box;
z-index: 99;
.product_but_left { .product_but_left {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 36%; // width: 225rpx;
margin-top: 6rpx; margin-top: 6rpx;
.left_item { .left_item {
width: 50%; // width: 50%;
width: 78rpx;
text-align: center; text-align: center;
font-weight: 500; font-weight: 500;
font-size: 20rpx; font-size: 20rpx;
@@ -1399,11 +1410,12 @@ export default {
.product_but_right { .product_but_right {
display: flex; display: flex;
justify-content: center; justify-content: end;
flex: 1;
.but_comm { .but_comm {
text-align: center; text-align: center;
padding: 20rpx 40rpx; padding: 20rpx 30rpx;
color: #ffffff; color: #ffffff;
height: 46rpx; height: 46rpx;
} }
@@ -1673,8 +1685,8 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: fixed;
top: 10000; top: 10000px;
left: 10000; left: 10000px;
z-index: 1000000000000; z-index: 1000000000000;
// background-color: rgba(0,0,0,0.2); // background-color: rgba(0,0,0,0.2);
display: flex; display: flex;
pages/rwa_package/dongjian/jia.vue
+280 -263
View File
@@ -10,17 +10,17 @@
<view class="box-panel" style="padding:0;margin-bottom:30rpx;"> <view class="box-panel" style="padding:0;margin-bottom:30rpx;">
<view class="box-top"> <view class="box-top">
<view class="flex-c-lr" style="align-items: center;"> <view class="flex-c-lr" style="align-items: center;">
<text class="text-40 text-bold text-gray">{{lockedData ? lockedData.selfBuyLocked : 0}}</text> <text class="text-40 text-bold text-gray">{{ lockedData ? lockedData.selfBuyLocked : 0 }}</text>
<text class="text-fu1 text-24 text-w-400">自购锁定量(数字积分)</text> <text class="text-fu1 text-24 text-w-400">自购锁定量(数字积分)</text>
</view> </view>
<view class="flex-c-lr" style="align-items: center;"> <view class="flex-c-lr" style="align-items: center;">
<text class="text-40 text-bold text-gray">{{lockedData ? lockedData.spreadLocked : 0}}</text> <text class="text-40 text-bold text-gray">{{ lockedData ? lockedData.spreadLocked : 0 }}</text>
<text class="text-fu1 text-24 text-w-400">推广锁定量(数字积分)</text> <text class="text-fu1 text-24 text-w-400">推广锁定量(数字积分)</text>
</view> </view>
</view> </view>
<view class="tab-view"> <view class="tab-view">
<view class="tab-list" @click="onTab(index)" v-for="(item,index) in tabList" :key="index"> <view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
<text class="text-32" :style="{color:index == curTab ? '#7934F6' : '#666666'}">{{item}}</text> <text class="text-32" :style="{ color: index == curTab ? '#7934F6' : '#666666' }">{{ item }}</text>
<view class="tab-line" v-if="index == curTab"></view> <view class="tab-line" v-if="index == curTab"></view>
</view> </view>
</view> </view>
@@ -35,28 +35,28 @@
<view class="box-li"> <view class="box-li">
<view class="box-biao"> <view class="box-biao">
<view class="box-head"> <view class="box-head">
<view class="box-head-view" v-for="(item,index) in topHead" :key="item" :style="{ <view class="box-head-view" v-for="(item, index) in topHead" :key="item" :style="{
borderRightWidth:index == 2 ? 0 : '1rpx' borderRightWidth: index == 2 ? 0 : '1rpx'
}"> }">
<text class="text-fu text-24">{{item}}</text> <text class="text-fu text-24">{{ item }}</text>
</view> </view>
</view> </view>
<view class="list-all-view"> <view class="list-all-view">
<view class="list-view" v-for="(item,index) in topList" :key="index"> <view class="list-view" v-for="(item, index) in topList" :key="index">
<view class="list-view-box"> <view class="list-view-box">
<text class="text-fu text-24 text-bold">{{item.amount}}</text> <text class="text-fu text-24 text-bold">{{ item.amount }}</text>
</view> </view>
<view class="list-view-box"> <view class="list-view-box">
<text class="text-fu text-24 text-bold">{{item.time}}</text> <text class="text-fu text-24 text-bold">{{ item.time }}</text>
</view> </view>
<view class="list-view-box" style="borderRightWidth:0"> <view class="list-view-box" style="borderRightWidth:0">
<text class="text-fu text-24 text-bold">{{item.source}}</text> <text class="text-fu text-24 text-bold">{{ item.source }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="box-list" style="margin-top:24rpx;"> <view class="box-list" style="margin-top:24rpx;">
<view class="head-box"> <view class="head-box">
@@ -67,105 +67,100 @@
<view class="box-li"> <view class="box-li">
<view class="box-biao"> <view class="box-biao">
<view class="box-head"> <view class="box-head">
<view class="box-head-view" v-for="(item,index) in bottomHead" :key="item" :style="{ <view class="box-head-view" v-for="(item, index) in bottomHead" :key="item" :style="{
borderRightWidth:index == 1 ? 0 : '1rpx' borderRightWidth: index == 1 ? 0 : '1rpx'
}"> }">
<text class="text-fu text-24">{{item}}</text> <text class="text-fu text-24">{{ item }}</text>
</view> </view>
</view> </view>
<view class="list-all-view"> <view class="list-all-view">
<view class="list-view" v-for="(item,index) in bottomList" :key="index"> <view class="list-view" v-for="(item, index) in bottomList" :key="index">
<view class="list-view-box"> <view class="list-view-box">
<text class="text-fu text-24 text-bold">{{item.amount}}</text> <text class="text-fu text-24 text-bold">{{ item.amount }}</text>
</view> </view>
<view class="list-view-box" style="borderRightWidth:0"> <view class="list-view-box" style="borderRightWidth:0">
<text class="text-fu text-24 text-bold">{{item.time}}</text> <text class="text-fu text-24 text-bold">{{ item.time }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="box-panel mt-32 mb-32" v-if="curTab == 0"> <view class="box-panel mt-32 mb-32" v-if="curTab == 0">
<text class="text-gray text-28 text-bold" style="font-weight: bold;">数字积分获取说明</text> <text class="text-gray text-28 text-bold" style="font-weight: bold;">数字积分获取说明</text>
<text class="text-fu text-24" style="margin-top:24rpx">1.商城优选区消费1:1获得贡献值，每消费1元获得1贡献值，次日根据当日商城营收占比获得数字积分。</text> <text class="text-fu text-24"
style="margin-top:24rpx">1.商城优选区消费1:1获得贡献值，每消费1元获得1贡献值，次日根据当日商城营收占比获得数字积分。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费10:1获得贡献值，直推用户优选区每消费10元您将获得1积分。</text> <text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费10:1获得贡献值，直推用户优选区每消费10元您将获得1积分。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">3.积分获得后均为锁定状态。</text> <text class="text-fu text-24 " style="margin-top:24rpx">3.积分获得后均为锁定状态。</text>
<text class="text-gray text-28 text-bold" style="margin-top:48rpx">数字积分解锁说明</text> <text class="text-gray text-28 text-bold" style="margin-top:48rpx">数字积分解锁说明</text>
<text class="text-fu text-24 " style="margin-top:24rpx">1.您本人在商城消费获得的积分，每日按1‰自然解锁。</text> <text class="text-fu text-24 " style="margin-top:24rpx">1.您本人在商城消费获得的积分，每日按1‰自然解锁。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费获得的贡献值5：1解锁您本人消费获得的数字积分。</text> <text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费获得的贡献值5：1解锁您本人消费获得的数字积分。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">3.直推获得的奖励，根据您在商城的消费获得的贡献值2:1进行解锁，每获得2贡献值解锁1积分。</text> <text class="text-fu text-24 "
<text class="text-fu text-24 " style="margin-top:24rpx">4.直推获得的奖励有效期7日，7日未解锁的部分将自动归属于上级，上级获得该奖励后也为锁定状态有效期7日，7日未解锁的部分将自动销毁</text> style="margin-top:24rpx">3.直推获得的奖励，根据您在商城的消费获得的贡献值2:1进行解锁，每获得2贡献值解锁1积分。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">5.若发生退货退款等因素，信任桥将回收各部分奖励，若数字积分已兑换，则不符合7天无理由退货。</text> <text class="text-fu text-24 "
style="margin-top:24rpx">4.直推获得的奖励有效期7日，7日未解锁的部分将自动归属于上级，上级获得该奖励后也为锁定状态有效期7日，7日未解锁的部分将自动销毁</text>
<text class="text-fu text-24 "
style="margin-top:24rpx">5.若发生退货退款等因素，信任桥将回收各部分奖励，若数字积分已兑换，则不符合7天无理由退货。</text>
<text class="text-fu text-24 " style="margin-top:24rpx">6.最终解释权归信任桥所有。</text> <text class="text-fu text-24 " style="margin-top:24rpx">6.最终解释权归信任桥所有。</text>
</view> </view>
<!-- (2)转盘抽奖获得 --> <!-- (2)转盘抽奖获得 -->
<view class="tab-two-panel" v-if="curTab == 1"> <view class="tab-two-panel" v-if="curTab == 1">
<mescroll-uni <mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
ref="mescrollRef" @init="mescrollInit" :fixed="false">
@down="downCallback" <view class="mescrollUniView">
@up="upCallback" <view class="dai-list-view" v-for="(item, index) in daiList" :key="index">
:up="upOption" <view class="dai-top">
:down="downOption" <view class="time-view">
@init="mescrollInit" <text class="text-zu text-24" style="margin-right:12rpx">距销毁</text>
:fixed="false" <u-count-down :time="item.time" format="HH:mm:ss" autoStart millisecond
> @finish="onFinish" :ref="'time' + item.refId" @change="onChange($event, index)">
<view class="mescrollUniView"> <view class="time-panel">
<view class="dai-list-view" v-for="(item,index) in daiList" :key="index"> <view class="time__custom">
<view class="dai-top"> <text class="text-24" style="color:#FE2E2E">{{
<view class="time-view"> item.timeData.days > 10 ? item.timeData.days : '0' + item.timeData.days}}</text>
<text class="text-zu text-24" style="margin-right:12rpx">距销毁</text> </view>
<u-count-down <text class="text-zu text-24" style="margin:0 10rpx">天</text>
:time="item.time" <view class="time__custom">
format="HH:mm:ss" <text class="text-24" style="color:#FE2E2E">{{
autoStart item.timeData.hours > 10 ? item.timeData.hours : '0' + item.timeData.hours}}</text>
millisecond </view>
@finish="onFinish" <text class="text-24" style="margin:0 10rpx">:</text>
:ref="'time' + item.refId" <view class="time__custom">
@change="onChange($event,index)" <text class="text-24" style="color:#FE2E2E">{{ item.timeData.minutes
> }}</text>
<view class="time-panel"> </view>
<view class="time__custom"> <text class="text-24" style="margin:0 10rpx">:</text>
<text class="text-24" style="color:#FE2E2E">{{ item.timeData.days>10?item.timeData.days:'0'+item.timeData.days}}</text> <view class="time__custom">
<text class="text-24" style="color:#FE2E2E">{{ item.timeData.seconds
}}</text>
</view>
</view> </view>
<text class="text-zu text-24" style="margin:0 10rpx">天</text> </u-count-down>
<view class="time__custom"> </view>
<text class="text-24" style="color:#FE2E2E">{{ item.timeData.hours>10?item.timeData.hours:'0'+item.timeData.hours}}</text>
</view> </view>
<text class="text-24" style="margin:0 10rpx">:</text> <view class="dai-mid" style="margin-top:40rpx;">
<view class="time__custom"> <text class="text-32 text-fu1">下级:</text>
<text class="text-24" style="color:#FE2E2E">{{ item.timeData.minutes }}</text> <text class="text-32 text-gray">{{ item.lowerLevelPhone }}</text>
</view> </view>
<text class="text-24" style="margin:0 10rpx">:</text> <view class="dai-mid" style="margin-top:32rpx;">
<view class="time__custom"> <text class="text-32 text-fu1">积分奖励总量:</text>
<text class="text-24" style="color:#FE2E2E">{{ item.timeData.seconds }}</text> <text class="text-32 text-gray">{{ item.expendAmount }}</text>
</view> </view>
</view> <view class="dai-progress" style="margin-top:40rpx;">
</u-count-down> <u-line-progress :percentage="item.unlockRatio" activeColor="#7934F6" height="16rpx"
:showText="true"></u-line-progress>
</view>
<view class="dai-bottom">
<text class="text-24 text-fu1">0</text>
<text class="text-24 text-fu1">{{ item.Tbclockacmont }}</text>
</view> </view>
</view>
<view class="dai-mid" style="margin-top:40rpx;">
<text class="text-32 text-fu1">下级:</text>
<text class="text-32 text-gray">{{item.lowerLevelPhone}}</text>
</view>
<view class="dai-mid" style="margin-top:32rpx;">
<text class="text-32 text-fu1">积分奖励总量:</text>
<text class="text-32 text-gray">{{item.expendAmount}}</text>
</view>
<view class="dai-progress" style="margin-top:40rpx;">
<u-line-progress :percentage="item.unlockRatio" activeColor="#7934F6" height="16rpx" :showText="true" ></u-line-progress>
</view>
<view class="dai-bottom">
<text class="text-24 text-fu1">0</text>
<text class="text-24 text-fu1">{{item.Tbclockacmont}}</text>
</view> </view>
</view> </view>
</view>
</mescroll-uni> </mescroll-uni>
</view> </view>
</view> </view>
@@ -176,7 +171,7 @@
<script> <script>
import { getUserInfo } from '@/api/auth.js'; import { getUserInfo } from '@/api/auth.js';
import { getVcoinLocked,getVcoinReleaseLog,getUserExpendTbcList } from '@/api/finance.js'; import { getVcoinLocked, getVcoinReleaseLog, getUserExpendTbcList } from '@/api/finance.js';
import Header from '@/components/common/header.vue'; import Header from '@/components/common/header.vue';
import TopSafe from '@/components/common/top-safe.nvue' import TopSafe from '@/components/common/top-safe.nvue'
import DownPopup from '@/components/common/down-popup.vue'; import DownPopup from '@/components/common/down-popup.vue';
@@ -190,33 +185,33 @@ import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
export default { export default {
mixins: [MescrollMixin], mixins: [MescrollMixin],
components: { Header, TopSafe, DownPopup,MescrollUni }, components: { Header, TopSafe, DownPopup, MescrollUni },
data() { data() {
return { return {
lockedData:null, lockedData: null,
topHead:['解锁数量','解锁时间','触发解锁订单'], topHead: ['解锁数量', '解锁时间', '触发解锁订单'],
bottomHead:['解锁数量','解锁时间'], bottomHead: ['解锁数量', '解锁时间'],
topList:[], topList: [],
bottomList:[], bottomList: [],
tabList:['已解锁','待解锁'], tabList: ['已解锁', '待解锁'],
curTab:0, curTab: 0,
daiList:[], daiList: [],
upOption: { upOption: {
auto: false, auto: false,
page: { page: {
size: 10, // 每页数据的数量,默认10 size: 10, // 每页数据的数量,默认10
}, },
noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示 noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
empty: { empty: {
tip: `空空如也`, tip: `空空如也`,
}, },
textColor: "#333", textColor: "#333",
bgColor: "rgba(0,0,0,0)", bgColor: "rgba(0,0,0,0)",
}, },
downOption: { downOption: {
auto: false, auto: false,
textColor: "#333", textColor: "#333",
bgColor: "rgba(0,0,0,0)", bgColor: "rgba(0,0,0,0)",
}, },
}; };
}, },
@@ -224,64 +219,64 @@ export default {
this.init(); this.init();
}, },
methods: { methods: {
onChange(e,index){ onChange(e, index) {
this.daiList[index].timeData = e; this.daiList[index].timeData = e;
console.log('e',e) console.log('e', e)
}, },
onFinish(){ onFinish() {
this.downCallback(); this.downCallback();
}, },
mescrollInit(mescroll) { mescrollInit(mescroll) {
this.mescroll = mescroll; this.mescroll = mescroll;
}, },
upCallback(page) { upCallback(page) {
let pageNum = page.num; let pageNum = page.num;
let pageSize = page.size; let pageSize = page.size;
let params = { let params = {
status:0, status: 0,
page: page.num, page: page.num,
pageSize: page.size, pageSize: page.size,
}; };
getUserExpendTbcList(params).then(res=>{ getUserExpendTbcList(params).then(res => {
let curPageLen = ''; let curPageLen = '';
if(res.data.entitys){ if (res.data.entitys) {
curPageLen = res.data.entitys.length; curPageLen = res.data.entitys.length;
if (page.num === 1) this.daiList = []; if (page.num === 1) this.daiList = [];
this.daiList = this.daiList.concat(res.data.entitys); this.daiList = this.daiList.concat(res.data.entitys);
this.daiList.forEach(item=>{ this.daiList.forEach(item => {
item.time = item.endDate - item.date; item.time = item.endDate - item.date;
item.timeData = {}; item.timeData = {};
}) })
console.log('daiList',this.daiList) console.log('daiList', this.daiList)
}else{ } else {
curPageLen = 0; curPageLen = 0;
} }
this.mescroll.endBySize(curPageLen, res.data.totalCount); this.mescroll.endBySize(curPageLen, res.data.totalCount);
}) })
}, },
downCallback() { downCallback() {
this.$nextTick(function () { this.$nextTick(function () {
this.mescroll && this.mescroll.resetUpScroll(); this.mescroll && this.mescroll.resetUpScroll();
}); });
}, },
onTab(index){ onTab(index) {
if(this.curTab != index){ if (this.curTab != index) {
this.curTab = index; this.curTab = index;
if(this.curTab == 0){ if (this.curTab == 0) {
this.daiList = []; this.daiList = [];
}else{ } else {
this.downCallback(); this.downCallback();
} }
} }
}, },
onJump(item){ onJump(item) {
uni.navigateTo({ uni.navigateTo({
url:`/pages/other_package/productInfo/productInfo?id=${item.refId}` url: `/pages/other_package/productInfo/productInfo?id=${item.refId}`
}) })
}, },
init() { init() {
@@ -291,40 +286,40 @@ export default {
this.vcoinReleaseLog(2); this.vcoinReleaseLog(2);
// this.getQuichens() // this.getQuichens()
}, },
vcoinLocked(){ vcoinLocked() {
getVcoinLocked().then(res=>{ getVcoinLocked().then(res => {
if (res.bizcode == 100) { if (res.bizcode == 100) {
this.lockedData = res.data; this.lockedData = res.data;
} }
}) })
}, },
vcoinReleaseLog(val){ vcoinReleaseLog(val) {
let params = { let params = {
page:1, page: 1,
pageSize:10000, pageSize: 10000,
type:val type: val
} }
getVcoinReleaseLog(params).then(res=>{ getVcoinReleaseLog(params).then(res => {
if (res.bizcode == 100) { if (res.bizcode == 100) {
if(val == 1){ if (val == 1) {
this.topList = res.data.entitys || []; this.topList = res.data.entitys || [];
}else{ } else {
this.bottomList = res.data.entitys || []; this.bottomList = res.data.entitys || [];
} }
this.topList.forEach(item=>{ this.topList.forEach(item => {
item.time = func.formatDate(new Date(item.ctdate), 4); item.time = func.formatDate(new Date(item.ctdate), 4);
}) })
this.bottomList.forEach(item=>{ this.bottomList.forEach(item => {
item.time = func.formatDate(new Date(item.ctdate), 4); item.time = func.formatDate(new Date(item.ctdate), 4);
}) })
} }
}) })
}, },
getQuichens() { getQuichens() {
let params ={ let params = {
page:1, page: 1,
pageSize:1000 pageSize: 1000
} }
quickens(params).then(res => { quickens(params).then(res => {
if (res.bizcode == 100) { if (res.bizcode == 100) {
@@ -381,66 +376,74 @@ export default {
width: 100%; width: 100%;
height: 240rpx; height: 240rpx;
display: flex; display: flex;
min-height:240rpx; min-height: 240rpx;
margin-bottom:40rpx; margin-bottom: 40rpx;
padding: 0 32rpx; padding: 0 32rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.tab-two-panel{
width:100%; .tab-two-panel {
height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx); width: 100%;
min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx); height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
min-height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 32rpx; padding: 0 32rpx;
box-sizing: border-box; box-sizing: border-box;
.mescrollUniView{
width:calc(100vw - 64rpx); .mescrollUniView {
height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx); width: calc(100vw - 64rpx);
min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx); height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
min-height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.dai-list-view{
width:100%; .dai-list-view {
height:344rpx; width: 100%;
min-height:344rpx; height: 344rpx;
margin-bottom:24rpx; min-height: 344rpx;
margin-bottom: 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 32rpx; padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 16rpx; border-radius: 16rpx;
border: 2rpx solid #EAEAEA; border: 2rpx solid #EAEAEA;
.dai-bottom{
width:100%; .dai-bottom {
margin-top:12rpx; width: 100%;
margin-top: 12rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
} }
.dai-progress{
width:100%; .dai-progress {
height:16rpx; width: 100%;
min-height:16rpx; height: 16rpx;
min-height: 16rpx;
display: flex; display: flex;
} }
.time-view{
width:100%; .time-view {
height:40rpx; width: 100%;
min-height:40rpx; height: 40rpx;
min-height: 40rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
.time-panel{
height:40rpx; .time-panel {
height: 40rpx;
display: flex; display: flex;
flex:1; flex: 1;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
.time__custom{
width:48rpx; .time__custom {
height:40rpx; width: 48rpx;
height: 40rpx;
background-color: rgba(254, 46, 46, 0.10); background-color: rgba(254, 46, 46, 0.10);
display: flex; display: flex;
align-items: center; align-items: center;
@@ -449,17 +452,19 @@ export default {
} }
} }
} }
.dai-mid{
width:100%; .dai-mid {
height:32rpx; width: 100%;
height: 32rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.dai-top{
width:100%; .dai-top {
height:40rpx; width: 100%;
height: 40rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: cneter; align-items: cneter;
@@ -467,8 +472,9 @@ export default {
} }
} }
} }
.box-panel { .box-panel {
position: relative; position: relative;
z-index: 1; z-index: 1;
display: flex; display: flex;
@@ -476,9 +482,10 @@ export default {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 0 32rpx; padding: 0 32rpx;
box-sizing: border-box; box-sizing: border-box;
.box-top { .box-top {
width: 100%; width: 100%;
height: 90rpx; height: 90rpx;
@@ -489,48 +496,52 @@ export default {
padding: 0 32rpx; padding: 0 32rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.tab-view{
width:100%; .tab-view {
height:80rpx; width: 100%;
min-height:80rpx; height: 80rpx;
min-height: 80rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
border-bottom:2rpx solid #D0D7DE; border-bottom: 2rpx solid #D0D7DE;
box-sizing: border-box; box-sizing: border-box;
margin-top:48rpx; margin-top: 48rpx;
.tab-list{
width:100%; .tab-list {
height:100%; width: 100%;
height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative; position: relative;
.tab-line{
width:48rpx; .tab-line {
width: 48rpx;
background-color: #7934F6; background-color: #7934F6;
height:4rpx; height: 4rpx;
position: absolute; position: absolute;
bottom:0; bottom: 0;
} }
} }
} }
.box-list { .box-list {
width:100%; width: 100%;
display: flex; display: flex;
padding:24rpx 0 4rpx; padding: 24rpx 0 4rpx;
box-sizing: border-box; box-sizing: border-box;
background: rgba(121,52,246,0.08); background: rgba(121, 52, 246, 0.08);
border-radius: 12rpx; border-radius: 12rpx;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.box-li{ .box-li {
width:calc(100% - 8rpx); width: calc(100% - 8rpx);
height:386rpx; height: 386rpx;
min-height:396rpx; min-height: 396rpx;
border-radius: 12rpx; border-radius: 12rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
@@ -538,77 +549,83 @@ export default {
align-items: center; align-items: center;
padding: 16rpx 24rpx; padding: 16rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
.box-biao{
width:100%; .box-biao {
height:100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
border:1rpx solid #eaeaea; border: 1rpx solid #eaeaea;
border-radius: 16rpx; border-radius: 16rpx;
.list-all-view{
flex:1; .list-all-view {
flex: 1;
display: flex; display: flex;
overflow-y: auto; overflow-y: auto;
width:100%; width: 100%;
flex-direction: column; flex-direction: column;
.list-view{
width:100%; .list-view {
height:64rpx; width: 100%;
height: 64rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
min-height:64rpx; min-height: 64rpx;
.list-view-box{
flex:1; .list-view-box {
height:100%; flex: 1;
height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-right:1rpx solid #EAEAEA; border-right: 1rpx solid #EAEAEA;
box-sizing: border-box; box-sizing: border-box;
border-bottom:1rpx solid #EAEAEA; border-bottom: 1rpx solid #EAEAEA;
} }
} }
} }
.box-head{ .box-head {
width:100%; width: 100%;
height:80rpx; height: 80rpx;
min-height:80rpx; min-height: 80rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.box-head-view{
flex:1; .box-head-view {
height:100%; flex: 1;
height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-right:1rpx solid #EAEAEA; border-right: 1rpx solid #EAEAEA;
box-sizing: border-box; box-sizing: border-box;
border-bottom:1rpx solid #EAEAEA; border-bottom: 1rpx solid #EAEAEA;
background-color: #F8F8F8; background-color: #F8F8F8;
} }
} }
} }
} }
.head-box{ .head-box {
width:100%; width: 100%;
height:88rpx; height: 88rpx;
min-height:88rpx; min-height: 88rpx;
position: relative; position: relative;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 24rpx; padding: 0 24rpx;
box-sizing: border-box; box-sizing: border-box;
.icon-img{
width:42rpx; .icon-img {
height:36rpx; width: 42rpx;
height: 42rpx;
position: absolute; position: absolute;
right:24rpx; right: 24rpx;
top:-8rpx; top: -8rpx;
} }
} }
} }
pages/sort/sort.vue
+29 -67
View File
@@ -1,16 +1,13 @@
<template> <template>
<view class="sort_warp" :class="platformType ? '' : 'iosplatformType'"> <view class="sort_warp" :class="platformType ? '' : 'iosplatformType'">
<TopSafe></TopSafe>
<view class="sort_header"> <view class="sort_header">
<!-- 分类切换 --> <!-- 分类切换 -->
<view class="sort_category_header"> <view class="sort_category_header">
<view <view :class="selCategory === 1
:class=" ? 'category_item category_item_sel'
selCategory === 1 : 'category_item'
? 'category_item category_item_sel' " @click="checkCategory(1)">
: 'category_item'
"
@click="checkCategory(1)"
>
<view>分类</view> <view>分类</view>
<view v-if="selCategory === 1" class="category_item_sel_but"></view> <view v-if="selCategory === 1" class="category_item_sel_but"></view>
</view> </view>
@@ -21,31 +18,16 @@
</view> </view>
<!-- 搜索 --> <!-- 搜索 -->
<view style="width: 200rpx" @click="jumpSearch" class="jump-search"> <view style="width: 200rpx" @click="jumpSearch" class="jump-search">
<up-search <up-search shape="square" bgColor="#EEEEEEFF" color="#666666FF" :showAction="false"
shape="square" placeholder="搜索"></up-search>
bgColor="#EEEEEEFF"
color="#666666FF"
:showAction="false"
placeholder="搜索"
></up-search>
</view> </view>
</view> </view>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<!-- 左侧类别 --> <!-- 左侧类别 -->
<scroll-view <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
scroll-y <view v-for="(item, index) in tabbarList" :key="index" class="u-tab-item"
scroll-with-animation :class="[current == index ? 'u-tab-item-active' : '']" :data-current="index"
class="u-tab-view menu-scroll-view" @tap.stop="swichMenu(item, index)">
:scroll-top="scrollTop"
>
<view
v-for="(item, index) in tabbarList"
:key="index"
class="u-tab-item"
:class="[current == index ? 'u-tab-item-active' : '']"
:data-current="index"
@tap.stop="swichMenu(item, index)"
>
<text class="u-line-1">{{ item.name }}</text> <text class="u-line-1">{{ item.name }}</text>
</view> </view>
</scroll-view> </scroll-view>
@@ -58,42 +40,20 @@
<view class="page-view"> <view class="page-view">
<!-- 这里还有一层循环 --> <!-- 这里还有一层循环 -->
<up-loading-page :loading="tabbarContentLoading"></up-loading-page> <up-loading-page :loading="tabbarContentLoading"></up-loading-page>
<view <view class="class-item" v-for="(item, index) in tabbarContentList" :key="index">
class="class-item"
v-for="(item, index) in tabbarContentList"
:key="index"
>
<view class="item-title"> <view class="item-title">
<text>{{ item.name }}</text> <text>{{ item.name }}</text>
</view> </view>
<view <view class="item-container" v-if="item.foods && item.foods.length !== 0">
class="item-container" <view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1" @click="jumpInfo(item1)">
v-if="item.foods && item.foods.length !== 0" <image class="item-menu-image" :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'" mode="">
>
<view
class="thumb-box"
v-for="(item1, index1) in item.foods"
:key="index1"
@click="jumpInfo(item1)"
>
<image
class="item-menu-image"
:src="item1.icon ? item1.icon : '/static/common/def_img.jpg'"
mode=""
>
</image> </image>
<view class="item-menu-name">{{ item1.name }}</view> <view class="item-menu-name">{{ item1.name }}</view>
</view> </view>
</view> </view>
<view v-else class="not_order_warp"> <view v-else class="not_order_warp">
<view class="not_order_warp_img" <view class="not_order_warp_img"><up-image src="https://static.tbmall.xin/static/not_shopping.png"
><up-image width="100" height="100" bgColor="#f1f6ff00"></up-image></view>
src="https://static.tbmall.xin/static/not_shopping.png"
width="100"
height="100"
bgColor="#f1f6ff00"
></up-image
></view>
<view class="not_order_msg_warp">暂无分类，快去添加吧~</view> <view class="not_order_msg_warp">暂无分类，快去添加吧~</view>
</view> </view>
</view> </view>
@@ -110,9 +70,10 @@
import { getCascadeCategory, getCarouselImage } from "@/api/common.js"; import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
import CustomTabBar from "@/components/custom-tab-bar.vue"; import CustomTabBar from "@/components/custom-tab-bar.vue";
import { APP_PAGE_TYPE } from "@/utils/enumUtils.js"; import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
import TopSafe from '@/components/common/top-safe.nvue';
export default { export default {
components: { CustomTabBar }, components: { CustomTabBar, TopSafe },
data() { data() {
return { return {
selCategory: 1, selCategory: 1,
@@ -193,11 +154,11 @@ export default {
}, },
// 查询分类 // 查询分类
async getSort(pId) { async getSort(pId) {
const params = { const params = {
parentId: pId, parentId: pId,
}; };
console.log('查询分类', params,pId); console.log('查询分类', params, pId);
const resp = await getCascadeCategory(params); const resp = await getCascadeCategory(params);
if (resp && resp.bizcode === 100) { if (resp && resp.bizcode === 100) {
return resp.data; return resp.data;
@@ -209,7 +170,7 @@ export default {
}, },
// 点击左边的栏目切换 // 点击左边的栏目切换
async swichMenu(item, index) { async swichMenu(item, index) {
console.log('点击左边的栏目切换',item, index, "item, index"); console.log('点击左边的栏目切换', item, index, "item, index");
if (index == this.current) return; if (index == this.current) return;
this.tabbarContentLoading = true; this.tabbarContentLoading = true;
const firstData = await this.getSort(item.id); const firstData = await this.getSort(item.id);
@@ -257,13 +218,14 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.sort_warp { .sort_warp {
padding-top:env(safe-area-inset-top) ; padding-top: env(safe-area-inset-top);
height: calc(100vh - env(safe-area-inset-bottom) - 50rpx); height: calc(100vh - env(safe-area-inset-bottom) - 50rpx);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y: auto; overflow-y: auto;
&.iosplatformType { &.iosplatformType {
.right-box { .right-box {
padding-bottom: 100rpx !important; padding-bottom: 100rpx !important;
} }
@@ -281,7 +243,7 @@ export default {
align-items: center; align-items: center;
} }
.jump-search{ .jump-search {
display: flex; display: flex;
} }
@@ -308,8 +270,7 @@ export default {
} }
} }
.sort_content { .sort_content {}
}
.u-menu-wrap { .u-menu-wrap {
flex: 1; flex: 1;
@@ -317,7 +278,7 @@ export default {
// overflow: hidden; // overflow: hidden;
// margin-top: 20rpx; // margin-top: 20rpx;
// height: calc(100vh - 216rpx - env(safe-area-inset-bottom)); // height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
padding-bottom:calc(100rpx + env(safe-area-inset-bottom)); padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
} }
.u-search-inner { .u-search-inner {
@@ -388,6 +349,7 @@ export default {
background-color: #fff; background-color: #fff;
padding: 16rpx; padding: 16rpx;
border-radius: 8rpx; border-radius: 8rpx;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
pages/supply_chain/supply_chain.vue
+5 -4
View File
@@ -115,7 +115,6 @@ export default {
if (this.tabArr.length > 0) { if (this.tabArr.length > 0) {
const sortParams = uni.getStorageSync('sortParams'); const sortParams = uni.getStorageSync('sortParams');
if (sortParams) { if (sortParams) {
const targetIndex = this.tabArr.find(item => item.name === sortParams.value)?.id; const targetIndex = this.tabArr.find(item => item.name === sortParams.value)?.id;
uni.removeStorageSync('sortParams'); uni.removeStorageSync('sortParams');
if (targetIndex) { if (targetIndex) {
@@ -123,6 +122,9 @@ export default {
this.dataList = []; this.dataList = [];
this.downCallback(); this.downCallback();
} }
} else {
this.getSearchList()
} }
} }
}, },
@@ -168,6 +170,7 @@ export default {
searchList(params).then((res) => { searchList(params).then((res) => {
let curPageLen = res.data.length; let curPageLen = res.data.length;
if (page.num === 1) this.dataList = [];
this.dataList = this.dataList.concat(res.data); this.dataList = this.dataList.concat(res.data);
this.waterfall(); this.waterfall();
@@ -175,9 +178,7 @@ export default {
}); });
}, },
downCallback() { downCallback() {
this.$nextTick(function () { this.mescroll && this.mescroll.resetUpScroll();
this.mescroll && this.mescroll.resetUpScroll();
});
}, },
onTab(index) { onTab(index) {
if (index != this.curTab) { if (index != this.curTab) {
utils/config.js
+4 -4
View File
@@ -3,11 +3,11 @@
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
// export const BASE_URL = "https://api.tbmall.xin"; //生产 export const BASE_URL = "https://api.tbmall.xin"; //生产
// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产 export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试 // export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试 // export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
// https://h.o.tbmall.xin/#/ // https://h.o.tbmall.xin/#/