mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

Browse Source
This commit is contained in:
weipengfei 2024-04-19 10:29:41 +08:00
commit df09bb44b4
2 changed files with 61 additions and 11 deletions
pages
order_addcart
order_addcart.vue
store/home
index.vue

71
pages/order_addcart/order_addcart.vue

@ -20,11 +20,6 @@
</view>
<view class="func" style="padding-top: 0;">
<!-- 分段器 -->
<!-- <view class="subsection">
<u-subsection :list="['综合云市场','商户购物车']" activeColor="#40AE36" :current="subsecCurr"
mode="subsection" @change="subsecChange"></u-subsection>
</view> -->
<view class='nav acea-row row-between-wrapper'>
<view>购物数量：<text class='num t-color'>{{cartTotalCount}}</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
@ -49,12 +44,9 @@
<navigator
:url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
class="info">
<!-- <text class="iconfont icon-shangjiadingdan"></text> -->
<view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou" style="font-weight: bold;"></text>
</navigator>
<!-- <view class="coupon-btn" style="width: auto;padding: 0 10rpx;">{{item.cloud_warehouse}}
</view> -->
</view>
<navigator v-for="goods in item.list" :key="goods.cart_id"
:url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`'
@ -75,6 +67,19 @@
{{goods.productAttr.sku}}
<text class="iconfont icon-xiala1"></text>
</view>
<!-- 标签 -->
<view class="tag"
v-if="goods && goods.product && goods.product.mer_label_name && goods.product.mer_label_name.length > 0">
<view class="tag-item" v-for="(ii,indx) in goods.product.mer_label_name"
:key="index">{{ii}}</view>
</view>
<!-- 规格产地 -->
<!-- <view class="shop-detail" v-if="goods.product && goods.product.store_info">
{{goods.product.store_info}}
</view> -->
<view v-if="goods.product.once_max_count>0 && goods.product.once_min_count>0"
class="buy_limit">
<text
@ -82,7 +87,6 @@
v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
</view>
<view class='money acea-row row-middle'>
<view>
<text class="money-price">￥{{goods.productAttr.price}}</text>
@ -231,7 +235,9 @@
import {
toLogin
} from '@/libs/login.js';
import { Toast } from '../../libs/uniApi';
import {
Toast
} from '../../libs/uniApi';
const app = getApp();
export default {
props: {
@ -1234,6 +1240,51 @@ import { Toast } from '../../libs/uniApi';
color: #282828;
}
.tag {
margin: 10rpx 0;
display: flex;
flex-wrap: wrap;
.tag-item {
padding: 2rpx 6rpx;
border-radius: 6rpx;
border: 1rpx solid #40AE36;
font-size: 18rpx;
margin-right: 7rpx;
color: #40AE36;
}
}
.shop-detail {
display: flex;
align-items: center;
width: 100%;
font-size: 22rpx;
line-height: 28rpx;
color: #999999;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 3;
white-space: pre-wrap;
margin-top: 4rpx;
.brand {
&::after {
content: "";
display: inline-block;
width: 0rpx;
height: 12rpx;
margin: 0 8rpx;
border: 1rpx solid #A1A1A1;
border-radius: 1rpx;
background-color: #A1A1A1;
opacity: .5;
}
}
}
.shoppingCart .list .item .picTxt .buy_limit {
margin-top: 10rpx;
color: #E93323;

1
pages/store/home/index.vue

@ -1794,7 +1794,6 @@
display: flex;
align-items: center;
width: 100%;
// margin-bottom: 28rpx;
font-size: 22rpx;
line-height: 28rpx;
color: #999999;