|
|
@@ -4,8 +4,9 @@
|
|
|
<div class="delivery-wrap" v-if="!$util.isEmpty(orderShop)">
|
|
|
<div class="shop-logo-wrap" v-if="!$util.isEmpty(orderShop)">
|
|
|
<div class="logo-img">
|
|
|
- <img :src="orderShop.merchant.smallLogoUrl | default_img" alt mode="widthFix" />
|
|
|
+ <img :src="smallAvatar" alt mode="widthFix" />
|
|
|
</div>
|
|
|
+ <div class="shop-name">{{ showName }}</div>
|
|
|
</div>
|
|
|
<div class="module-com pay-input-wrap">
|
|
|
<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
|
|
|
@@ -112,7 +113,9 @@
|
|
|
// 优惠折扣
|
|
|
discountArr: false,
|
|
|
// 未设置密码
|
|
|
- setPassModal: false
|
|
|
+ setPassModal: false,
|
|
|
+ showName:'',
|
|
|
+ smallAvatar:''
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -142,9 +145,9 @@
|
|
|
}
|
|
|
getOrderShop(true).then(res => {
|
|
|
this.inpFocus = true
|
|
|
- uni.setNavigationBarTitle({
|
|
|
- title: `向【${res.shop.showName}】付款`
|
|
|
- })
|
|
|
+
|
|
|
+ this.showName = res.shop.showName
|
|
|
+ this.smallAvatar = res.shop.smallAvatar
|
|
|
this.$refs.couponSel._getUserDiscount().then(status => {
|
|
|
this.discountArr = status
|
|
|
})
|
|
|
@@ -359,16 +362,20 @@
|
|
|
}
|
|
|
.shop-logo-wrap {
|
|
|
padding-bottom: 20upx;
|
|
|
- @include disFlex(center, center);
|
|
|
+ text-align: center;
|
|
|
.logo-img {
|
|
|
width: 120upx;
|
|
|
border-radius: 50%;
|
|
|
- margin: 10upx auto;
|
|
|
- // margin-right: 20upx;
|
|
|
+ margin: 0 auto 20upx;
|
|
|
img {
|
|
|
border-radius: 50%;
|
|
|
}
|
|
|
}
|
|
|
+ .shop-name {
|
|
|
+ font-size: 36upx;
|
|
|
+ color: #333;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
}
|
|
|
// 可选优惠
|
|
|
.discount-wrap {
|
