- 筛选
-
+
-
+
@@ -229,7 +240,6 @@ export default {
type: '',
index: ''
},
- goodsHeight: '',
defaultKeyword: '',
keyword: '',
oldKeywordList: [],
@@ -267,10 +277,25 @@ export default {
categoryId: ''
},
- routerVal: ''
+ routerVal: '',
+ capsuleInsetRight: 0,
+ searchNavbarWidth: 0,
};
},
+ computed: {
+ searchNavbarStyle() {
+ if (this.searchNavbarWidth) {
+ return {
+ width: `${this.searchNavbarWidth}px`,
+ };
+ }
+ return {
+ width: '100%',
+ };
+ },
+ },
+
onPageScroll(e) {
console.log(e);
this.scrollTop = e.scrollTop;
@@ -309,6 +334,9 @@ export default {
}
this.loadData();
},
+ onReady() {
+ this.setSearchNavbarWidth();
+ },
components: {
mSearch,
goodsList
@@ -338,40 +366,22 @@ export default {
this.loadData();
},
- mounted() {
- const { windowWidth, windowHeight } = uni.getSystemInfoSync();
-
- let topHeight = 0;
- let navHeight = 0;
-
- uni.getSystemInfo({
- success: function(res) {
- // res - 各种参数
-
- let top = uni.createSelectorQuery().select('.u-navbar');
- top.boundingClientRect(function(data) {
- if (data && data.height) {
- //data - 各种参数
- topHeight = data.height; // 获取元素宽度
- }
- }).exec();
- let nav = uni.createSelectorQuery().select('.navbar');
- nav.boundingClientRect(function(data) {
- if (data && data.height) {
- //data - 各种参数
- navHeight = data.height; // 获取元素宽度
- }
- }).exec();
- }
- });
- this.goodsHeight = windowHeight - navHeight - topHeight;
- // #ifdef APP-PLUS
- this.goodsHeight = this.goodsHeight - 100;
- // #endif
- this.goodsHeight += 'px';
- },
-
methods: {
+ setSearchNavbarWidth() {
+ // #ifdef MP-WEIXIN
+ try {
+ const menuButton = uni.getMenuButtonBoundingClientRect();
+ const { windowWidth } = uni.getWindowInfo();
+ this.capsuleInsetRight = windowWidth - menuButton.left;
+ const leftPadding = uni.upx2px(16);
+ const gap = uni.upx2px(8);
+ this.searchNavbarWidth =
+ windowWidth - this.capsuleInsetRight - leftPadding - gap;
+ } catch (e) {
+ this.searchNavbarWidth = 280;
+ }
+ // #endif
+ },
// 数据去重一下 只显示一次 减免 劵 什么的
getPromotion(item) {
if (item.promotionMap) {
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 17ead8c..8d57018 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -10,7 +10,8 @@
-
+
+
申请数量
diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue
index d298151..2ab42b7 100644
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -9,7 +9,8 @@
-
+
+
@@ -22,6 +23,7 @@
+
diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue
index 2424db8..080323e 100644
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -114,7 +114,9 @@
v-if="serviceDetail.serviceType != 'RETURN_MONEY' && serviceDetail.serviceStatus != 'APPLY'">
联系方式:
{{
- storeAfterSaleAddress.salesConsigneeMobile ||secrecyMobile("")
+ storeAfterSaleAddress.salesConsigneeMobile
+ ? secrecyMobile(storeAfterSaleAddress.salesConsigneeMobile)
+ : ''
}}
diff --git a/pages/order/afterSales/applyProgress.vue b/pages/order/afterSales/applyProgress.vue
index 11c03ae..aa99f61 100644
--- a/pages/order/afterSales/applyProgress.vue
+++ b/pages/order/afterSales/applyProgress.vue
@@ -18,12 +18,11 @@
-
-
-
-
- {{time.message}}
- {{time.createTime}}
+
+
+
+ {{ time.message }}
+ {{ time.createTime }}
diff --git a/pages/order/complain/complain.vue b/pages/order/complain/complain.vue
index e27e9cf..5e4f67f 100644
--- a/pages/order/complain/complain.vue
+++ b/pages/order/complain/complain.vue
@@ -5,12 +5,13 @@
{{ order.storeName || "" }}
- {{ orderStatusList[order.orderStatus] }}
+ {{ orderStatusMap[order.orderStatus] }}
+
+
@@ -24,6 +25,7 @@
x{{ sku.num }}
+
@@ -65,7 +67,7 @@ export default {
return {
storage,
uploadFileList: [],
- orderStatusList: {
+ orderStatusMap: {
//订单状态列表
UNDELIVERED: "待发货",
PARTS_DELIVERED: "部分发货",
diff --git a/pages/order/deliverDetail.vue b/pages/order/deliverDetail.vue
index 7225d3c..a5774f0 100644
--- a/pages/order/deliverDetail.vue
+++ b/pages/order/deliverDetail.vue
@@ -3,7 +3,7 @@
+
+
@@ -77,36 +92,32 @@
{{ keyword }}
+
展示更多
-
-
-
+
-
-
-
+
-
-
+
- 物流公司： diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue index 07cd7e6..4a428aa 100644 --- a/pages/order/evaluate/myEvaluate.vue +++ b/pages/order/evaluate/myEvaluate.vue @@ -7,7 +7,8 @@
-
{{ order.consigneeName || "未填写昵称" }}
- {{ order.consigneeMobile || "未填写手机号secrecyMobile(") }}
+ {{ order.consigneeMobile ? secrecyMobile(order.consigneeMobile) : '未填写手机号' }}
地址：{{ order.consigneeAddressPath }}
{{ order.consigneeDetail }}
@@ -67,7 +67,7 @@
{{ order.storeName }}
- {{ orderStatusList[order.orderStatus].title
+ {{ orderStatusMap[order.orderStatus].title
}}
- {{ orderStatusList[order.orderStatus].title }}
-
@@ -35,7 +35,7 @@
{{ orderStatusList[order.orderStatus].value }}
+
+ {{ orderStatusMap[order.orderStatus].title }}
+
{{ orderStatusMap[order.orderStatus].value }}
-
-
+
未注册的手机号验证后将自动创建用户账号，登录即代表您已同意《隐私协议》
@@ -63,14 +61,15 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/product/comment.vue b/pages/product/comment.vue
index b277648..22123cf 100644
--- a/pages/product/comment.vue
+++ b/pages/product/comment.vue
@@ -351,9 +351,7 @@ page {
flex-wrap: wrap;
/* height: 140rpx; */
overflow: hidden;
- > * {
- margin-right: 16rpx;
- }
+ gap: 16rpx;
}
.bot {
diff --git a/pages/product/customerservice/index.vue b/pages/product/customerservice/index.vue
index 1d4793b..d245785 100644
--- a/pages/product/customerservice/index.vue
+++ b/pages/product/customerservice/index.vue
@@ -4,7 +4,6 @@
@@ -560,9 +580,16 @@ page {
.u-image {
box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
}
-.edit{
- padding-right: 32rpx;
- font-size: 28rpx;
+
+.cart-navbar {
+ ::v-deep .u-navbar__content__right {
+ padding-right: var(--cart-capsule-inset, 13px);
+ }
+
+ ::v-deep .u-navbar__content__right__text {
+ color: $light-color;
+ font-size: 28rpx;
+ }
}
.promotion-notice {
margin-top: 10px;
@@ -593,16 +620,26 @@ page {
}
.store-name {
+ flex: 1;
+ min-width: 0;
font-weight: bold;
font-size: 28rpx;
+ margin-left: 8rpx;
+}
+
+.store-arrow {
+ flex-shrink: 0;
+ margin-left: 10rpx;
}
.invalid {
filter: grayscale(1);
}
.cart-item {
+ width: 100%;
border-radius: 0.4em;
transition: 0.35s;
+ overflow: hidden;
}
/* 空白页 */
@@ -698,11 +735,16 @@ page {
}
.goods-content {
- width: 100%;
- height: 100%;
+ flex: 1;
+ min-width: 0;
+ margin-left: 20rpx;
overflow: hidden;
- > p {
- padding-left: 20rpx;
+
+ > p,
+ .sp-name,
+ .sp-type,
+ .sp-number {
+ padding-left: 0;
}
}
@@ -718,25 +760,27 @@ page {
border-right: 1px solid $light-color;
}
-.store-line-check,
-.store-line-img,
-.store-line-desc {
- // #ifdef MP-WEIXIN
- float: left;
- // #endif
+.store-line-check {
+ flex-shrink: 0;
+
+ ::v-deep .u-checkbox {
+ margin: 0;
+ }
}
.store-line {
- // #ifndef MP-WEIXIN
display: flex;
- // #endif
+ align-items: center;
+ flex: 1;
+ min-width: 0;
overflow: hidden;
- flex:10;
}
.goods-config {
display: flex;
align-items: center;
+ flex-shrink: 0;
+
::v-deep .invalid {
display: block;
width: 80rpx !important;
@@ -746,15 +790,17 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
- padding: 30rpx 0 0 0;
+ padding: 24rpx 0 8rpx;
}
.right-col {
- flex:2;
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
text-align: center;
- width: 100rpx;
color: $light-color;
font-size: 26rpx;
+ margin-left: 16rpx;
> span {
margin-left: 20rpx;
@@ -762,14 +808,10 @@ page {
}
.right-line {
- width: 3px;
- float: left;
+ width: 2rpx;
height: 40rpx;
border-left: 1px solid #eeeeee;
-
- ::v-deep span {
- margin-left: 20rpx;
- }
+ margin-right: 20rpx;
}
.box6 {
@@ -795,6 +837,21 @@ page {
padding: 0 32rpx;
display: flex;
align-items: center;
+ flex: 1;
+ min-width: 0;
+ gap: 24rpx;
+
+ .checkout-all {
+ flex-shrink: 0;
+ }
+
+ ::v-deep .u-checkbox {
+ margin: 0;
+ }
+ }
+
+ .checkout-total {
+ margin-left: 8rpx;
}
}
diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue
index 3498066..03561d3 100644
--- a/pages/tabbar/category/category.vue
+++ b/pages/tabbar/category/category.vue
@@ -1,13 +1,28 @@
-
-
+
+
+ 商品分类
+
+
+
+
+
@@ -26,12 +41,14 @@
{{ item.name }}
-
+
{{ children.name }}
+
@@ -48,8 +65,17 @@ export default {
tabList: [], //左侧标题列表
categoryList: [], //右侧分类数据列表
topImg: "", //顶部图片
+ searchBarWidth: 0, //导航栏搜索框宽度（避让微信胶囊）
};
},
+ computed: {
+ searchBarStyle() {
+ if (this.searchBarWidth) {
+ return { width: `${this.searchBarWidth}px` };
+ }
+ return { width: "460rpx" };
+ },
+ },
onLoad() {
this.loadData();
// #ifdef MP-WEIXIN
@@ -57,7 +83,29 @@ export default {
uni.showShareMenu({ withShareTicket: true });
// #endif
},
+ onReady() {
+ this.setSearchBarWidth();
+ },
methods: {
+ /**
+ * 根据微信胶囊位置计算搜索框宽度，避免被胶囊遮挡
+ */
+ setSearchBarWidth() {
+ // #ifdef MP-WEIXIN
+ try {
+ const menuButton = uni.getMenuButtonBoundingClientRect();
+ const { windowWidth } = uni.getWindowInfo();
+ const capsuleInsetRight = windowWidth - menuButton.left;
+ const titleWidth = uni.upx2px(160); // “商品分类” 标题宽度
+ const leftPadding = uni.upx2px(60); // 左侧内边距
+ const gap = uni.upx2px(20); // 搜索框与胶囊间距
+ this.searchBarWidth =
+ windowWidth - capsuleInsetRight - titleWidth - leftPadding - gap;
+ } catch (e) {
+ this.searchBarWidth = 180;
+ }
+ // #endif
+ },
/**
* 查询
*/
@@ -124,22 +172,30 @@ uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
.s-list {
box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
}
+.nav-content {
+ display: flex;
+ align-items: center;
+}
+.nav-search-wrap {
+ flex-shrink: 0;
+}
.nav-search {
- padding-left: 30rpx !important;
- padding-right: 20rpx !important;
+ width: 100%;
}
.title {
- display: block;
- width: 259rpx;
+ flex-shrink: 0;
text-align: center;
- font-size: 28rpx;
-
-
+ font-size: 28rpx;
+ padding-right: 16rpx;
+ white-space: nowrap;
}
.category-wrap {
height: 100%;
+ display: flex;
+ flex-direction: column;
.content {
- height: calc(100vh - 94px);
+ flex: 1;
+ min-height: 0;
display: flex;
color: #333;
font-size: 28rpx;
diff --git a/pages/tabbar/home/template/advertising.scss b/pages/tabbar/home/template/advertising.scss
index be5228c..5a80eaa 100644
--- a/pages/tabbar/home/template/advertising.scss
+++ b/pages/tabbar/home/template/advertising.scss
@@ -7,7 +7,7 @@
display: flex;
}
.item-price {
- > span {
+ .price-text {
font-size: 15px;
font-weight: 500;
color: #e1212b;
@@ -26,7 +26,7 @@
position: relative;
}
.item-line-through {
- > span {
+ .price-text {
font-size: 10px;
font-weight: 400;
text-decoration: line-through;
@@ -46,12 +46,12 @@
align-items: center;
background: #fff;
height: 50px;
- > div:nth-of-type(1) {
+ .join-title-name {
font-size: 16px;
font-weight: bold;
}
- > div:nth-of-type(2) {
+ .join-title-more {
font-size: 12px;
color: #999;
}
- }
\ No newline at end of file
+ }
diff --git a/pages/tabbar/home/template/tpl.scss b/pages/tabbar/home/template/tpl.scss
index a9702fb..e0938fd 100644
--- a/pages/tabbar/home/template/tpl.scss
+++ b/pages/tabbar/home/template/tpl.scss
@@ -4,8 +4,11 @@
display: block;
padding: 2rpx;
}
+// 首页楼层模块统一左右边距（轮播图、宫格等 .layout 容器）
+$home-layout-padding: 16rpx;
+
.layout {
- padding: 16rpx;
+ padding: $home-layout-padding;
margin: 8rpx 0;
background: #fff;
}
diff --git a/pages/tabbar/home/template/tpl_banner.vue b/pages/tabbar/home/template/tpl_banner.vue
index 9e37464..beeaf69 100644
--- a/pages/tabbar/home/template/tpl_banner.vue
+++ b/pages/tabbar/home/template/tpl_banner.vue
@@ -1,11 +1,23 @@
-
+
+
- 为了更好地用户体验，需要您授权手机号
-
-
-
-
- 欢迎进入{{ projectName }}
-
-
- 为您提供优质服务,{{ projectName }}需要获取以下信息
- 您的公开信息（昵称、头像）
-
-
-
-
-
- 暂不登录
-
-
-
-
-
- 阅读并同意《隐私协议》
- 《用户协议》
-
-
+ 为了更好地用户体验，需要您授权手机号
+
+
+
+
+ 欢迎进入{{ projectName }}
+
+
+ 为您提供优质服务,{{ projectName }}需要获取以下信息
+ 您的公开信息（昵称、头像）
+
+
+
+
+
+
+
+ 阅读并同意
+ 《隐私协议》
+ 《用户协议》
+
+
+
+
+ 暂不登录
+ 商品分类
-
-
-
+
+
diff --git a/pages/tabbar/home/template/tpl_flex_four.vue b/pages/tabbar/home/template/tpl_flex_four.vue
index f4971d7..77e8653 100644
--- a/pages/tabbar/home/template/tpl_flex_four.vue
+++ b/pages/tabbar/home/template/tpl_flex_four.vue
@@ -29,7 +29,4 @@ export default {
justify-content: center;
background-size: cover;
}
-img {
- width: 84px;
-}
\ No newline at end of file
diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue
index 67c08cf..690a371 100644
--- a/pages/tabbar/home/template/tpl_flex_one.vue
+++ b/pages/tabbar/home/template/tpl_flex_one.vue
@@ -29,9 +29,5 @@ export default {
width: 100%;
display: block;
overflow: hidden;
- > img {
- width: 100%;
- height: 100%;
- }
}
\ No newline at end of file
diff --git a/pages/tabbar/home/template/tpl_flex_three.vue b/pages/tabbar/home/template/tpl_flex_three.vue
index e07b9a3..172fb7e 100644
--- a/pages/tabbar/home/template/tpl_flex_three.vue
+++ b/pages/tabbar/home/template/tpl_flex_three.vue
@@ -33,7 +33,4 @@ export default {
justify-content: center;
background-size: cover;
}
-img {
- width: 111px;
-}
\ No newline at end of file
diff --git a/pages/tabbar/home/template/tpl_flex_two.vue b/pages/tabbar/home/template/tpl_flex_two.vue
index 1dda91f..6f1db11 100644
--- a/pages/tabbar/home/template/tpl_flex_two.vue
+++ b/pages/tabbar/home/template/tpl_flex_two.vue
@@ -38,10 +38,5 @@ export default {
}
.flex-item {
width: 50%;
- > img {
- display: block;
- max-width: 100%;
- height: 100%;
- }
}
\ No newline at end of file
diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index 72ad81d..6c224af 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -10,76 +10,79 @@
:key="index"
>
-
+
+
+
-
- {{ title.title }}
-{{ title.desc }}
+ {{ title.desc }}
-
-
-
-
-
-
-
- {{ item.title }}
+
+
+
+
+
-
-
+
-
- ¥{{ goodsFormatPrice(item.price)[0] }} .{{ goodsFormatPrice(item.price)[1] }}
+
-
+
+ {{ item.title }}
+
+
+
+ ¥{{ goodsFormatPrice(item.price)[0] }} .{{ goodsFormatPrice(item.price)[1] }}
+
-
-
-
-
-
-
diff --git a/pages/tabbar/home/template/tpl_hot_zone.vue b/pages/tabbar/home/template/tpl_hot_zone.vue
index ba51470..8699cb6 100644
--- a/pages/tabbar/home/template/tpl_hot_zone.vue
+++ b/pages/tabbar/home/template/tpl_hot_zone.vue
@@ -1,7 +1,7 @@
- {{ item.goodsName }}
+
@@ -170,12 +173,12 @@ $w_94: 94%;
}
.selected-title {
- > h4 {
+ .h4 {
font-size: 30rpx;
color: #000 !important;
}
- > div {
+ .title-desc {
font-weight: bold;
color: $main-color !important;
}
@@ -191,11 +194,11 @@ $w_94: 94%;
flex: 1;
text-align: center;
- > h4 {
+ .h4 {
font-size: 32rpx;
}
- > div {
+ .title-desc {
color: #999;
font-size: 24rpx;
}
@@ -223,10 +226,6 @@ $w_94: 94%;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
overflow: hidden;
- > img {
- width: 100%;
- height: 100%;
- }
}
.goods-desc {
@@ -252,7 +251,7 @@ $w_94: 94%;
> .goods-price {
line-height: 2;
color: $main-color;
- > span {
+ .price-int {
font-size: 42rpx;
}
}
diff --git a/pages/tabbar/home/template/tpl_group.vue b/pages/tabbar/home/template/tpl_group.vue
index b234a80..f869054 100644
--- a/pages/tabbar/home/template/tpl_group.vue
+++ b/pages/tabbar/home/template/tpl_group.vue
@@ -2,8 +2,8 @@
+
+
+
-
-
+
- ¥{{ goodsFormatPrice(item.price)[0] }} .{{ goodsFormatPrice(item.price)[1] }}
+
-
+
+ {{ item.goodsName }}
+
+
+
+ ¥{{ goodsFormatPrice(item.price)[0] }} .{{ goodsFormatPrice(item.price)[1] }}
+
-
{{ res.list[0].title }}
- 更多
+ {{ res.list[0].title }}
+ 更多
@@ -11,10 +11,10 @@
- ￥120.00
+ ￥120.00
- ￥190.00
+ ￥190.00
-
diff --git a/pages/tabbar/home/template/tpl_integral.vue b/pages/tabbar/home/template/tpl_integral.vue
index 8f73a78..cbe7d73 100644
--- a/pages/tabbar/home/template/tpl_integral.vue
+++ b/pages/tabbar/home/template/tpl_integral.vue
@@ -2,8 +2,8 @@
@@ -34,7 +34,7 @@ export default {
display: flex;
}
.item-price {
- > span {
+ .price-text {
font-size: 15px;
font-weight: 500;
color: #e1212b;
@@ -53,7 +53,7 @@ export default {
position: relative;
}
.item-line-through {
- > span {
+ .price-text {
font-size: 10px;
font-weight: 400;
text-decoration: line-through;
@@ -73,11 +73,11 @@ export default {
align-items: center;
background: #fff;
height: 50px;
- > div:nth-of-type(1) {
+ .join-title-name {
font-size: 16px;
font-weight: bold;
}
- > div:nth-of-type(2) {
+ .join-title-more {
font-size: 12px;
color: #999;
}
diff --git a/pages/tabbar/home/template/tpl_join_group.vue b/pages/tabbar/home/template/tpl_join_group.vue
index 9309331..a040db0 100644
--- a/pages/tabbar/home/template/tpl_join_group.vue
+++ b/pages/tabbar/home/template/tpl_join_group.vue
@@ -2,8 +2,8 @@
@@ -39,7 +39,7 @@ export default {
display: flex;
}
.item-price {
- > span {
+ .price-text {
font-size: 15px;
font-weight: 500;
color: #e1212b;
@@ -58,7 +58,7 @@ export default {
position: relative;
}
.item-line-through {
- > span {
+ .price-text {
font-size: 10px;
font-weight: 400;
text-decoration: line-through;
@@ -78,11 +78,11 @@ export default {
align-items: center;
background: #fff;
height: 50px;
- > div:nth-of-type(1) {
+ .join-title-name {
font-size: 16px;
font-weight: bold;
}
- > div:nth-of-type(2) {
+ .join-title-more {
font-size: 12px;
color: #999;
}
diff --git a/pages/tabbar/home/template/tpl_menu.vue b/pages/tabbar/home/template/tpl_menu.vue
index 0ef76ed..1f14ed4 100644
--- a/pages/tabbar/home/template/tpl_menu.vue
+++ b/pages/tabbar/home/template/tpl_menu.vue
@@ -1,13 +1,13 @@
- {{ item.title }}
+
+
+
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index 13428e7..bfbe347 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -4,9 +4,9 @@
-
+
-
{{ userInfo.nickName }}
@@ -14,57 +14,55 @@
登录/注册
-
- 地址管理
- 我的足迹
- 我的评价
- 我的关注
- 我的积分
- 我的分销
- 我的投诉
- 优惠券
@@ -58,7 +58,7 @@
- 每日签到
@@ -68,41 +68,41 @@
- 领券中心
- 砍价记录
- 意见反馈
- 关于
- 店铺入驻
-
+
- 设置
@@ -114,7 +114,7 @@
请邀请用户扫描二维码或者将地址复制转发给其他用户
-
+
@@ -253,17 +253,10 @@ export default {
border-radius: 20rpx;
box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);
- .interact-item-img {
- width: 52rpx !important;
- height: 52rpx !important;
- // margin-bottom: !important;
- margin: 0 auto 6rpx auto !important;
- }
-
- image {
- width: 52rpx;
- height: 52rpx;
- margin-bottom: 6rpx;
+ .interact-item-icon {
+ width: 56rpx;
+ height: 56rpx;
+ margin-bottom: 10rpx;
}
display: flex;
@@ -272,10 +265,17 @@ export default {
text-align: center;
.interact-item {
- font-size: $font-sm;
+ font-size: 24rpx;
width: 25%;
- height: 160rpx;
- padding: 30rpx;
+ flex: 0 0 25%;
+ box-sizing: border-box;
+ height: 150rpx;
+ padding: 20rpx 8rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ color: #666;
}
}
}
diff --git a/patches/uview-plus+3.8.42.patch b/patches/uview-plus+3.8.42.patch
new file mode 100644
index 0000000..4c1e6c3
--- /dev/null
+++ b/patches/uview-plus+3.8.42.patch
@@ -0,0 +1,306 @@
+diff --git a/node_modules/uview-plus/components/u-image/u-image.vue b/node_modules/uview-plus/components/u-image/u-image.vue
+index 24e3b10..1360704 100644
+--- a/node_modules/uview-plus/components/u-image/u-image.vue
++++ b/node_modules/uview-plus/components/u-image/u-image.vue
+@@ -26,7 +26,7 @@
+ }"
+ >
+
+
+
+-
+
+ /g, '')
.replace(/:arrow="false"/g, ':isLink="false"')
+ .replace(/|\/)/g, '/g, '')
+ .replace(//g, '')
}
walk(root).forEach((file) => {
diff --git a/uni.scss b/uni.scss
index d045294..929b1f4 100644
--- a/uni.scss
+++ b/uni.scss
@@ -65,9 +65,6 @@ $font-weight: 400;
}
.bg-light-color {
background-color: $light-color !important;
- ::v-deep * {
- background-color: $light-color !important;
- }
}
.bg-main-color {
background-color: $main-color !important;
diff --git a/utils/Foundation.js b/utils/Foundation.js
index 3ffc0d2..e804af7 100644
--- a/utils/Foundation.js
+++ b/utils/Foundation.js
@@ -229,6 +229,38 @@ function navigationToBack(type) {
}
}
+/**
+ * 解析商品相册/图片项，兼容上传组件的 JSON 字符串与纯 URL。
+ * 后端 goodsGalleryList 可能同时存在两种格式：
+ * - '{"url":"https://...jpg","name":"x.jpg","status":"finished"}'
+ * - 'https://...jpg'
+ * @param {String} item 单个相册项
+ * @returns {String} 解析出的图片地址，无法解析时返回空字符串
+ */
+export function parseGoodsImageUrl(item) {
+ if (item === null || item === undefined) return "";
+ if (typeof item !== "string") return "";
+ const trimmed = item.trim();
+ if (!trimmed) return "";
+ // 纯 URL 直接返回
+ if (/^https?:\/\//.test(trimmed)) return trimmed;
+ // JSON 字符串，尝试解析取 url 字段
+ if (trimmed.charAt(0) === "{") {
+ try {
+ const parsed = JSON.parse(trimmed);
+ const url = parsed && (parsed.url || parsed.path || parsed.link);
+ if (typeof url === "string" && /^https?:\/\//.test(url.trim())) {
+ return url.trim();
+ }
+ } catch (e) {
+ // 解析失败时退化为正则提取
+ }
+ const match = trimmed.match(/https?:\/\/[^\s"'\\}]+/);
+ if (match) return match[0];
+ }
+ return "";
+}
+
/**
* 计算当前时间到第二天0点的倒计时[秒]
* @returns {number}
@@ -246,7 +278,7 @@ export function theNextDayTime() {
).getTime() - nowDate.getTime();
return parseInt(time / 1000);
}
-module.exports = {
+export default {
unixToDate,
dateToUnix,
formatPrice,
@@ -256,4 +288,5 @@ module.exports = {
theNextDayTime,
whetherNavigate,
checkBankno,
+ parseGoodsImageUrl,
};
diff --git a/utils/filters.js b/utils/filters.js
index 5c366bc..d0bd420 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -3,6 +3,15 @@ import { getUserInfo } from "@/api/members";
import storage from "@/utils/storage.js";
import config from "@/config/config";
import Foundation from "./Foundation.js";
+
+/**
+ * 解析商品图片地址，兼容上传 JSON 与纯 URL，非法时返回占位图
+ */
+export function parseGoodsImageUrl(item, fallback = config.logo) {
+ const url = Foundation.parseGoodsImageUrl(item);
+ return url || fallback || "";
+}
+
/**
* 金钱单位置换 2999 --> 2,999.00
* @param val
@@ -426,7 +435,7 @@ export function tipsToLogin (type) {
/**
* 获取用户信息并重新添加到缓存里面
*/
-export async function userInfo () {
+export async function refreshUserInfo () {
let res = await getUserInfo();
if (res.data.success) {
storage.setUserInfo(res.data.result);
diff --git a/utils/md5.js b/utils/md5.js
index 87bc7fb..59e3eff 100644
--- a/utils/md5.js
+++ b/utils/md5.js
@@ -216,8 +216,9 @@ function b64MD5w(str) {
/* Backward compatibility */
function calcMD5(str) {
return binl2hex(coreMD5(str2binl(str)))
-}
+}
-module.exports = {
+export const md5 = hexMD5
+export default {
md5: hexMD5
-}
+}
diff --git a/utils/uuid.modified.js b/utils/uuid.modified.js
index 5dc59cf..ade77d0 100644
--- a/utils/uuid.modified.js
+++ b/utils/uuid.modified.js
@@ -4,7 +4,7 @@
// MIT License - http://opensource.org/licenses/mit-license.php
/*global window, require, define */
-(function(_window) {
+var uuid = (function(_window) {
'use strict';
@@ -241,22 +241,7 @@
uuid._whatwgRNG = _whatwgRNG;
- if (('undefined' !== typeof module) && module.exports) {
- // Publish as node.js module
- module.exports = uuid;
- } else if (typeof define === 'function' && define.amd) {
- // Publish as AMD module
- define(function() { return uuid; });
- } else {
- // Publish as global (in browsers)
- _previousRoot = _window.uuid;
+ return uuid;
+})('undefined' !== typeof window ? window : (typeof globalThis !== 'undefined' ? globalThis : {}));
- // **`noConflict()` - (browser only) to reset global 'uuid' var**
- uuid.noConflict = function() {
- _window.uuid = _previousRoot;
- return uuid;
- };
-
- _window.uuid = uuid;
- }
-})('undefined' !== typeof window ? window : null);
\ No newline at end of file
+export default uuid;
\ No newline at end of file
-
{{ res.list[0].title }}
- 更多
+ {{ res.list[0].title }}
+ 更多
@@ -11,10 +11,10 @@
- 20积分
+ 20积分
- 30积分
+ 30积分
-
{{ res.list[0].title }}
- 更多
+ {{ res.list[0].title }}
+ 更多
@@ -16,10 +16,10 @@
2人团
- ￥120.00
+ ￥120.00
- ￥120.00
+ ￥120.00
-
-
+
+
-
-
- 预存款
- {{unitPrice(walletNum) }}
-
-
-
- 优惠券
- {{ couponNum || 0 }}
-
-
-
- 足迹
- {{ footNum || 0 }}
-
-
+
+
+ 预存款
+ {{ unitPrice(walletNum) }}
+
+
+ 优惠券
+ {{ couponNum || 0 }}
+
+
+ 足迹
+ {{ footNum || 0 }}
+
+
- 待付款
+
+
+ 待付款
- 待收货
+
+
+ 待收货
- 待评价
+
+
+ 待评价
- 售后
+
+
+ 售后
- 我的订单
+
+
+ 我的订单
@@ -179,21 +177,18 @@ body {
background-repeat: no-repeat;
color: #ffffff;
display: flex;
- justify-content: space-between;
+ align-items: center;
.head-1 {
- text-align: center;
+ flex-shrink: 0;
width: 152rpx;
- position: relative;
- display: flex;
- align-items: center;
- image {
+ .head-avatar {
width: 152rpx;
height: 144rpx;
border-radius: 50%;
- margin-bottom: 30rpx;
border: 3px solid #fff;
+ display: block;
}
.edti-head {
@@ -205,7 +200,7 @@ body {
top: 100rpx;
right: 0;
- image {
+ .head-avatar {
width: 100%;
height: 100%;
}
@@ -215,13 +210,14 @@ body {
.head-2 {
flex: 1;
margin-left: 30rpx;
- margin-top: 100rpx;
- line-height: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
}
- ::v-deep .u-icon,
- .u-icon {
- margin-top: 106rpx;
+ .header-arrow {
+ flex-shrink: 0;
+ margin-left: 20rpx;
}
}
@@ -234,47 +230,53 @@ body {
}
.point {
+ display: flex;
+ align-items: center;
text-align: center;
height: 160rpx;
-
font-size: $font-sm;
// #ifdef MP-WEIXIN
padding: 24rpx;
-
// #endif
- .u-col {
- view {
- color: $u-main-color;
- font-size: 28rpx;
- }
- view:last-child {
- margin-top: 8rpx;
- color: $main-color;
- font-size: $font-lg;
- }
+ .point-item {
+ flex: 1;
+ text-align: center;
+ }
+
+ .point-label {
+ color: $u-main-color;
+ font-size: 28rpx;
+ }
+
+ .point-value {
+ margin-top: 8rpx;
+ color: $main-color;
+ font-size: $font-lg;
}
}
.order {
height: 140rpx;
- text-align: center;
font-size: $font-sm;
display: flex;
- justify-content: space-around;
align-items: center;
padding: 0 3%;
color: #999;
.order-item {
- position: relative;
- line-height: 2em;
- width: 96rpx;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ }
- :first-child {
- font-size: 48rpx;
- margin-bottom: 10rpx;
- }
+ .order-item-label {
+ margin-top: 10rpx;
+ line-height: 1.4;
+ font-size: $font-sm;
}
}
}
@@ -285,13 +287,18 @@ body {
.user-name {
font-size: 34rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.bag {
width: 56rpx;
height: 56rpx;
border-radius: 50%;
- margin: 0 auto;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.bag1 {
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 0848674..69fde88 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -6,51 +6,51 @@
-
-
-
-
-
-
-
-
-
-