解决merge

This commit is contained in:
2022-06-11 11:28:48 +08:00
117 changed files with 19519 additions and 13458 deletions

View File

@@ -25,12 +25,12 @@
</view>
<!-- 店铺信息 -->
<view class="shopInfo" @click="toShop(2)" v-if="goods.shop">
<view class="shopInfo" @click="toShop(goods.shop.shop_id)" v-if="goods.shop">
<view class="shopInfo-title-left">
<image class="shop-logo" :src="goods.shop.cover" mode="aspectFill" />
<view class="shop-title">
<view class="shop-titl" >{{goods.shop.name}}</view>
<view> 商品质量:<span class='no'>5.0</span> <text style="padding-left: 20rpx;">服务态度:<span class='no'>5.0</span></text> </view>
<view> 店铺评分:<span class='no'>5.0</span> <text style="padding-left: 20rpx;">服务态度:<span class='no'>5.0</span></text> </view>
</view>
</view>
<view class="shopInfo-title-right" >全部商品 {{goods.shop.goods_count || 0}} <uni-icons type="right" color="grey"/></view>
@@ -45,7 +45,7 @@
</view>
<!-- 立即购买 -->
<view class="footer">
<view @click="toShop(2)" class=" shop"><uni-icons type="shop" size="26" color="grey"/>店铺</view>
<view @click="toShop(goods.shop.shop_id)" class=" shop"><uni-icons type="shop" size="26" color="grey"/>店铺</view>
<button type="default" hover-class="none" @click="buy">立即购买</button>
</view>
</view>
@@ -96,7 +96,7 @@
this.$Router.push({
name: 'ShopDetail',
params: {
shopId: id
ShopId: id
}
})
}