解决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

@@ -7,7 +7,7 @@
<!-- 订单列表 -->
<view class="order--content" :class="[true ? 'chunk': 'broad']" v-for="(item, arrayIndex) in array"
:key="arrayIndex">
<view class="order--group--header" @click=" $Router.push({ name: 'ShopDetail', params: {shopId: item.shop.shop_id}})">
<view class="order--group--header" @click=" $Router.push({ name: 'ShopDetail', params: {ShopId: item.shop.shop_id}})">
<image class="logo" v-if="item.shop.cover != ''" :src="item.shop.cover" mode="aspectFill"></image>
<view class="store">
{{item.shop.name}}