Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

This commit is contained in:
2020-08-03 10:35:41 +08:00
40 changed files with 1875 additions and 878 deletions

View File

@@ -13,7 +13,7 @@
<view class="guanzhu" @click="guanzhu"><text style="color:#fff;font-size:24rpx">{{info.is_attention == 1 ? '已关注' : '关注'}}</text></view>
</view>
<view class="userlist" :style="{'top': top + 10 * rpx}">
<image class="userlistitem" v-for="(i,j) in [0,1,2]" :style="{'right': (-j * 15 * rpx) + 'px'}"></image>
<image class="userlistitem" v-for="(i,j) in [0,1,2]" :style="{'right': (-j * 15 * rpx) + 'px'}" :key="j"></image>
</view>
<view class="hot" :style="{'top': top + 10 * rpx}">
<text class="hottext">2.8w</text>
@@ -52,7 +52,7 @@
</div> -->
</div>
<list class="list">
<cell class="item" v-for="(i,j) in list" @click="xuanzhong(j)">
<cell class="item" v-for="(i,j) in list" :key="j" @click="xuanzhong(j)">
<image class="shopimg" :src="i.goods_image"></image>
<div class="infos">
<div>