Merge branches 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
This commit is contained in:
commit
3262e2cbd2
1 file changed
+17
-7
@@ -3,11 +3,11 @@
|
|||||||
<el-form-item label="商户" prop="merchantId" class="w-60 ml-10 my-6">
|
<el-form-item label="商户" prop="merchantId" class="w-60 ml-10 my-6">
|
||||||
<select-mch v-model="merchantId" />
|
<select-mch v-model="merchantId" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<h1 class="mx-auto text-5xl">今日菜谱</h1>
|
<h1 class="mx-auto text-5xl mt-[-40px]">今日菜谱</h1>
|
||||||
|
|
||||||
<table class="w-11/12 border-collapse cursor-pointer mx-auto">
|
<table class="w-11/12 border-collapse cursor-pointer mx-auto">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="text-6xl" @click="addClick(-1)"><</td>
|
<div class="text-4xl mr-2 text-right" @click="addClick(-1)"><</div>
|
||||||
<td
|
<td
|
||||||
v-for="(item, index) in weekData.data"
|
v-for="(item, index) in weekData.data"
|
||||||
:key="index"
|
:key="index"
|
||||||
@@ -17,14 +17,14 @@
|
|||||||
>
|
>
|
||||||
<span>{{ item }}</span>
|
<span>{{ item }}</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-6xl" @click="addClick(1)">></td>
|
<div class="text-4xl ml-2 text-left" @click="addClick(1)">></div>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div class="dataDiv">
|
<div class="dataDiv">
|
||||||
<table>
|
<table>
|
||||||
<tr class="food">
|
<tr class="food">
|
||||||
<td @click="addFood(1)">早餐</td>
|
<td class="text-center" @click="addFood(1)">早餐</td>
|
||||||
<div class="food_list">
|
<div class="food_list">
|
||||||
<td class="food_list_item" v-for="(item, index) in foodData1" :key="index" @click="delteData(item.tid)">
|
<td class="food_list_item" v-for="(item, index) in foodData1" :key="index" @click="delteData(item.tid)">
|
||||||
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="food">
|
<tr class="food">
|
||||||
<td @click="addFood(2)">中餐</td>
|
<td class="text-center" @click="addFood(2)">中餐</td>
|
||||||
<div class="food_list">
|
<div class="food_list">
|
||||||
<td class="food_list_item" v-for="(item, index) in foodData2" :key="index" @click="delteData(item.tid)">
|
<td class="food_list_item" v-for="(item, index) in foodData2" :key="index" @click="delteData(item.tid)">
|
||||||
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="food">
|
<tr class="food">
|
||||||
<td @click="addFood(3)">晚餐</td>
|
<td class="text-center" @click="addFood(3)">晚餐</td>
|
||||||
<div class="food_list">
|
<div class="food_list">
|
||||||
<td class="food_list_item" v-for="(item, index) in foodData3" :key="index" @click="delteData(item.tid)">
|
<td class="food_list_item" v-for="(item, index) in foodData3" :key="index" @click="delteData(item.tid)">
|
||||||
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
|
||||||
@@ -222,7 +222,7 @@ onMounted(async () => {
|
|||||||
.food {
|
.food {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-top: 50px;
|
margin-top: 30px;
|
||||||
|
|
||||||
& > td {
|
& > td {
|
||||||
width: 60px;
|
width: 60px;
|
||||||
@@ -261,6 +261,16 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
.selectedSpan {
|
.selectedSpan {
|
||||||
border: 2px solid rgb(255, 187, 0);
|
border: 2px solid rgb(255, 187, 0);
|
||||||
|
border-left: 2px solid transparent;
|
||||||
color: rgb(255, 187, 0);
|
color: rgb(255, 187, 0);
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.selectedSpan::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
left: -1.5px;
|
||||||
|
top: -1.5px;
|
||||||
|
bottom: -1.5px;
|
||||||
|
border-left: 2px solid rgb(255, 187, 0);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
Reference in new issue
Block a user