|
@@ -5,37 +5,43 @@
|
|
<h3 class="title">{{getTitle}}</h3>
|
|
<h3 class="title">{{getTitle}}</h3>
|
|
<span class="desc" v-if="orderBundle.orderFlag == 'CAEL' || orderBundle.orderFlag == 'SYCA' ">取消原因: {{getPayStatusFun}}</span>
|
|
<span class="desc" v-if="orderBundle.orderFlag == 'CAEL' || orderBundle.orderFlag == 'SYCA' ">取消原因: {{getPayStatusFun}}</span>
|
|
</div>
|
|
</div>
|
|
- <div class="content">
|
|
|
|
- <div class="product-img" @click="toDetail">
|
|
|
|
|
|
+ <div class="content" @click="toDetail">
|
|
|
|
+ <div class="product-img" >
|
|
<img v-if="bundle.icon2" class="img" :src="bundle.icon2" alt="">
|
|
<img v-if="bundle.icon2" class="img" :src="bundle.icon2" alt="">
|
|
<div v-else class="center-con">
|
|
<div v-else class="center-con">
|
|
<img class="img" src="/static/img/ic_shop_title_06.png" alt="">
|
|
<img class="img" src="/static/img/ic_shop_title_06.png" alt="">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="product-info">
|
|
<div class="product-info">
|
|
- <div @click="toDetail">
|
|
|
|
|
|
+ <div>
|
|
<div class="title">{{detailData ? detailData.bundleName : ''}}</div>
|
|
<div class="title">{{detailData ? detailData.bundleName : ''}}</div>
|
|
<div class="desc">{{bundle.tag ? bundle.tag : ''}}</div>
|
|
<div class="desc">{{bundle.tag ? bundle.tag : ''}}</div>
|
|
</div>
|
|
</div>
|
|
- <!-- <div>
|
|
|
|
- <div class="price">
|
|
|
|
- ¥{{bundle.price ? bundle.price : 0}}
|
|
|
|
- </div>
|
|
|
|
- </div> -->
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="package-info" v-if="orderBundle.orderFlag === 'PAED'">
|
|
<div class="package-info" v-if="orderBundle.orderFlag === 'PAED'">
|
|
- <van-cell-group>
|
|
|
|
|
|
+ <div v-for="item in customerBundleItemList" :key="item.id" :id='item.id' @click="subscribeMessage" class="info-item">
|
|
|
|
+ <div class="item-itemName">
|
|
|
|
+ <div>{{item.itemName}}</div>
|
|
|
|
+ <div class="package-qr">
|
|
|
|
+ <span style="color: #999;">剩余{{item.remainTimes}}次</span>
|
|
|
|
+ <van-icon class="icon-qr" size="1.5em" name="qr" color="#ff5500" />
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div style="color: #999;font-size: 12px;">{{(item.expiryDateStr ? item.expiryDateStr :'') + ( item.expiryTimesStr ? '('+item.expiryTimesStr+')' :'')}}</div>
|
|
|
|
+ </div>
|
|
|
|
+ <!-- <van-cell-group>
|
|
<!-- <form @submit="formSubmit" class="formId" report-submit="true">
|
|
<!-- <form @submit="formSubmit" class="formId" report-submit="true">
|
|
<button form-type="submit"></button>
|
|
<button form-type="submit"></button>
|
|
</form> -->
|
|
</form> -->
|
|
- <van-cell :title="item.itemName" :label="item.expiryDateStr+(item.expiryTimesStr? item.expiryTimesStr:'')" v-for="item in customerBundleItemList" :key="item.id" :id='item.id' is-link @click="subscribeMessage">
|
|
|
|
|
|
+ <!--<van-cell :title="item.itemName" v-for="item in customerBundleItemList" :key="item.id" :id='item.id' is-link @click="subscribeMessage">
|
|
<div class="package-qr">
|
|
<div class="package-qr">
|
|
<span>剩余{{item.remainTimes}}次</span>
|
|
<span>剩余{{item.remainTimes}}次</span>
|
|
<van-icon class="icon-qr" size="1.5em" name="qr" color="#ff5500" />
|
|
<van-icon class="icon-qr" size="1.5em" name="qr" color="#ff5500" />
|
|
</div>
|
|
</div>
|
|
|
|
+ <div class="package-expiryDate">{{(item.expiryDateStr ? item.expiryDateStr :'')+(item.expiryTimesStr? (item.expiryTimesStr):'')}}</div>
|
|
</van-cell>
|
|
</van-cell>
|
|
- </van-cell-group>
|
|
|
|
|
|
+ </van-cell-group> -->
|
|
<div class="package-info-desc">
|
|
<div class="package-info-desc">
|
|
请将对应服务的二维码出示给门店进行消费
|
|
请将对应服务的二维码出示给门店进行消费
|
|
</div>
|
|
</div>
|
|
@@ -112,7 +118,8 @@ export default {
|
|
orderBundle: {},
|
|
orderBundle: {},
|
|
customerBundleItemList: [],
|
|
customerBundleItemList: [],
|
|
formId:null,
|
|
formId:null,
|
|
- detailData: null
|
|
|
|
|
|
+ detailData: null,
|
|
|
|
+ bundleType:'', // 0: 套餐 1:非套餐
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -139,11 +146,14 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- // formSubmit (e){
|
|
|
|
- // console.log(e)
|
|
|
|
- // this.formId = e.target.formId
|
|
|
|
- // this.showQRcode(e.target.id)
|
|
|
|
- // },
|
|
|
|
|
|
+ // 套餐查看详情
|
|
|
|
+ toDetail(){
|
|
|
|
+ if(this.bundleType==0){
|
|
|
|
+ wx.navigateTo({
|
|
|
|
+ url: `/pages/bundleDetail/main?id=${this.$mp.query.id}`
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ },
|
|
// 核销订阅消息
|
|
// 核销订阅消息
|
|
subscribeMessage(e){
|
|
subscribeMessage(e){
|
|
console.log(e)
|
|
console.log(e)
|
|
@@ -209,11 +219,10 @@ export default {
|
|
_this.bundle = res.data.bundle || {icon2: null, name: '', tag: null, price: 0};
|
|
_this.bundle = res.data.bundle || {icon2: null, name: '', tag: null, price: 0};
|
|
_this.coupon = res.data.coupon;
|
|
_this.coupon = res.data.coupon;
|
|
_this.orderBundle = res.data.orderBundle;
|
|
_this.orderBundle = res.data.orderBundle;
|
|
|
|
+ _this.bundleType=res.data.freeChoiceFlag
|
|
res.data.customerBundleItemList.map(item => {
|
|
res.data.customerBundleItemList.map(item => {
|
|
if((item.expiryDate && (item.expiryDate.substr(0,10) != '2099-01-01')) && item.cycleFlag== 0){
|
|
if((item.expiryDate && (item.expiryDate.substr(0,10) != '2099-01-01')) && item.cycleFlag== 0){
|
|
item.expiryDateStr = '过期时间:' + item.expiryDate
|
|
item.expiryDateStr = '过期时间:' + item.expiryDate
|
|
- }else{
|
|
|
|
- item.expiryDateStr = '过期时间:' + '--'
|
|
|
|
}
|
|
}
|
|
if(item.expiryTimes && item.expiryTimes!=0){
|
|
if(item.expiryTimes && item.expiryTimes!=0){
|
|
item.expiryTimesStr='已过期'+item.expiryTimes+'次'
|
|
item.expiryTimesStr='已过期'+item.expiryTimes+'次'
|
|
@@ -423,24 +432,35 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
.package-info {
|
|
.package-info {
|
|
- .package-qr {
|
|
|
|
- display: flex;
|
|
|
|
- align-items: flex-start;
|
|
|
|
- justify-content: flex-end;
|
|
|
|
|
|
+ .info-item{
|
|
|
|
+ padding :15rpx 0;
|
|
|
|
+ border-bottom :1px solid #eee
|
|
|
|
+ .item-itemName{
|
|
|
|
+ display :flex;
|
|
|
|
+ justify-content :space-between;
|
|
|
|
+ align-items :center
|
|
|
|
+ .package-qr {
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: flex-start;
|
|
|
|
+ justify-content: flex-end;
|
|
|
|
|
|
- .icon-qr {
|
|
|
|
- margin: 0 20rpx;
|
|
|
|
- position: relative;
|
|
|
|
- top: 1px;
|
|
|
|
|
|
+ .icon-qr {
|
|
|
|
+ margin: 0 20rpx;
|
|
|
|
+ position: relative;
|
|
|
|
+ top: 1px;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
.package-info-desc {
|
|
.package-info-desc {
|
|
font-size: 25rpx;
|
|
font-size: 25rpx;
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
text-align: center;
|
|
text-align: center;
|
|
padding: 25rpx 0;
|
|
padding: 25rpx 0;
|
|
}
|
|
}
|
|
|
|
+ .package-expiryDate{
|
|
|
|
+ text-align :start
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
.order-infos {
|
|
.order-infos {
|