|
@@ -30,21 +30,19 @@
|
|
|
<div>
|
|
<div>
|
|
|
<div class="text">
|
|
<div class="text">
|
|
|
<img
|
|
<img
|
|
|
- v-if="active == '外卖配送'"
|
|
|
|
|
|
|
+ v-if="!status"
|
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-50JDBrQbgB.png"
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-50JDBrQbgB.png"
|
|
|
alt=""
|
|
alt=""
|
|
|
/>
|
|
/>
|
|
|
<div class="text1">江宁学院一食堂楼 益禾堂</div>
|
|
<div class="text1">江宁学院一食堂楼 益禾堂</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-if="userInfo">
|
|
<div v-if="userInfo">
|
|
|
- <div v-if="active == '外卖配送'" class="text2">
|
|
|
|
|
- {{ userInfo.nickname }} {{ userInfo.phone }}
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <div v-if="!status" class="text2">{{ userInfo.nickname }} {{ userInfo.phone }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-if="active == '到店自取'" class="text2 text3">商家地址</div>
|
|
<div v-if="active == '到店自取'" class="text2 text3">商家地址</div>
|
|
|
</div>
|
|
</div>
|
|
|
<img
|
|
<img
|
|
|
- v-if="active == '外卖配送'"
|
|
|
|
|
|
|
+ v-if="!status"
|
|
|
class="imgBox1"
|
|
class="imgBox1"
|
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-00LxfIfsLZ.png"
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-00LxfIfsLZ.png"
|
|
|
alt=""
|
|
alt=""
|
|
@@ -58,7 +56,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
<div class="border"></div>
|
|
<div class="border"></div>
|
|
|
<div class="time" @click="show = true">
|
|
<div class="time" @click="show = true">
|
|
|
- <div class="text" v-if="active == '到店自取'">
|
|
|
|
|
|
|
+ <div class="text" v-if="status">
|
|
|
<div class="text3">预留信息</div>
|
|
<div class="text3">预留信息</div>
|
|
|
<div class="textCon" v-if="userInfo" @click.stop="navigateTo('/pages/changeReserve')">
|
|
<div class="textCon" v-if="userInfo" @click.stop="navigateTo('/pages/changeReserve')">
|
|
|
<div class="text2 text5">{{ userInfo.nickname }}</div>
|
|
<div class="text2 text5">{{ userInfo.nickname }}</div>
|
|
@@ -70,13 +68,13 @@
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div v-if="active == '到店自取'" class="quarantine"></div>
|
|
|
|
|
- <div class="text1" v-if="active == '外卖配送'">立即送出</div>
|
|
|
|
|
|
|
+ <div v-if="status" class="quarantine"></div>
|
|
|
|
|
+ <div class="text1" v-if="!status">立即送出</div>
|
|
|
<div>
|
|
<div>
|
|
|
- <div class="text1 text4" v-if="active == '到店自取'">自取时间</div>
|
|
|
|
|
|
|
+ <div class="text1 text4" v-if="status">自取时间</div>
|
|
|
<div class="time1">
|
|
<div class="time1">
|
|
|
<div class="text2">
|
|
<div class="text2">
|
|
|
- {{ active == '外卖配送' ? `预计${time}配送` : `今天${time}自取` }}
|
|
|
|
|
|
|
+ {{ !status ? `预计${time}配送` : `今天${time}自取` }}
|
|
|
</div>
|
|
</div>
|
|
|
<img
|
|
<img
|
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-15-58-50tLAIsjgR.png"
|
|
src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-15-58-50tLAIsjgR.png"
|
|
@@ -176,7 +174,14 @@ import NavTitle from '../components/NavTitle.vue';
|
|
|
export default {
|
|
export default {
|
|
|
components: { NavTitle },
|
|
components: { NavTitle },
|
|
|
computed: {
|
|
computed: {
|
|
|
- ...mapState(['userInfo'])
|
|
|
|
|
|
|
+ ...mapState(['userInfo']),
|
|
|
|
|
+ status() {
|
|
|
|
|
+ if (this.active == '到店自取') {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
// items() {
|
|
// items() {
|
|
|
// let list = [...this.listInfo];
|
|
// let list = [...this.listInfo];
|
|
|
// return list.map((item, index) => {
|
|
// return list.map((item, index) => {
|