修改问题
This commit is contained in:
zpc
parent
4f79f70a8f
commit
0ca099af4a
|
|
@ -220,7 +220,7 @@ export default {
|
|||
|
||||
.baoxiang-tag {
|
||||
position: absolute;
|
||||
left: 15rpx;
|
||||
right: 15rpx;
|
||||
top: 15rpx;
|
||||
z-index: 5;
|
||||
font-weight: 400;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
<view class="type-tag justify-center"
|
||||
:style="{ backgroundColor: dataItem.shang_info ? dataItem.shang_info.color : '#000000' }"
|
||||
v-if="innerTipTitle">{{ innerTipTitle }}</view>
|
||||
<view class="baoxiang-tag justify-center" v-if="isTips"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -422,6 +423,24 @@ export default {
|
|||
box-sizing: border-box;
|
||||
border-radius: 25rpx;
|
||||
}
|
||||
.baoxiang-tag {
|
||||
height: 64rpx;
|
||||
width: 136rpx;
|
||||
position: absolute;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
top: 12rpx;
|
||||
right: 24rpx;
|
||||
font-weight: 400;
|
||||
line-height: 40rpx;
|
||||
font-size: 20rpx;
|
||||
color: #FFFFFF;
|
||||
background-image: url($iconurl + "baoxiang.png");
|
||||
background-size: 100% 100%;
|
||||
box-sizing: border-box;
|
||||
border-radius: 25rpx;
|
||||
}
|
||||
}
|
||||
|
||||
// 商品标题
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
<view class="price">
|
||||
<template v-if="pageData.goods.type != 5">¥</template>
|
||||
<text>{{ orderData.goods.price }}</text>
|
||||
<template v-if="pageData.goods.type == 5">{{currencyName2}}</template>
|
||||
<template v-if="pageData.goods.type == 5">{{ currencyName2 }}</template>
|
||||
</view>
|
||||
|
||||
<view class="num">×{{ orderData.goods.prize_num }}</view>
|
||||
|
|
@ -60,8 +60,9 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<template v-if="pageData.goods.type != 5">
|
||||
<view class="card-row" @click="$emit('to-coupon')">
|
||||
|
||||
<template>
|
||||
<view v-if="pay_coupon" class="card-row" @click="$emit('to-coupon')">
|
||||
<view class="title">优惠券</view>
|
||||
|
||||
<view class="row-r">
|
||||
|
|
@ -72,13 +73,9 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<view v-if="pageData.goods.type == 6 && !getBtnXianShi()"> </view>
|
||||
<template v-else>
|
||||
|
||||
<view class="pay-type" v-if="pay_balance" @click="changePayMethod('useMoney')">
|
||||
<view class="title flex align-center">
|
||||
使用{{ balanceName }}{{deduction_name}}¥{{ orderData.use_money }}
|
||||
使用{{ balanceName }}{{ deduction_name }}¥{{ orderData.use_money }}
|
||||
<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
|
||||
(剩余:{{ orderData.money }})</text>
|
||||
</view>
|
||||
|
|
@ -91,9 +88,9 @@
|
|||
|
||||
<view class="pay-type" v-if="pay_currency" @click="changePayMethod('useIntegral')">
|
||||
<view class="title flex align-center">
|
||||
使用{{ currencyName }}{{deduction_name}}¥{{ orderData.use_integral_money }}
|
||||
<text
|
||||
style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.integral }})</text>
|
||||
使用{{ currencyName }}{{ deduction_name }}¥{{ orderData.use_integral_money }}
|
||||
<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.integral
|
||||
}})</text>
|
||||
</view>
|
||||
|
||||
<view class="icon">
|
||||
|
|
@ -102,11 +99,12 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="pay-type" v-if="pay_currency2" @click="changePayMethod('useMoney2')">
|
||||
<view class="title flex align-center">
|
||||
使用{{ currencyName2 }}{{deduction_name}}¥{{ (orderData.use_score/100).toFixed(2) }} <text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
|
||||
使用{{ currencyName2 }}{{ deduction_name }}¥{{ (orderData.use_score / 100).toFixed(2) }} <text
|
||||
style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
|
||||
(剩余:{{ orderData.score }})</text>
|
||||
</view>
|
||||
<view class="icon">
|
||||
|
|
@ -144,7 +142,7 @@
|
|||
<view class="pay-btn" @click="$emit('confirm')">
|
||||
<text>确认支付</text>
|
||||
<text>{{
|
||||
pageData.goods.type == 5 ? ` ${(orderData.use_score/100).toFixed(2)}积分` : ` ¥${orderData.price}`
|
||||
pageData.goods.type == 5 ? ` ${(orderData.use_score / 100).toFixed(2)}积分` : ` ¥${orderData.price}`
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -205,7 +203,7 @@ export default {
|
|||
//pageData.goods.type
|
||||
return {
|
||||
currencyName: '',
|
||||
currencyName2:'',
|
||||
currencyName2: '',
|
||||
balanceName: '',
|
||||
pay_balance: 1,
|
||||
pay_coupon: 1,
|
||||
|
|
@ -213,40 +211,50 @@ export default {
|
|||
pay_currency2: 1,
|
||||
pay_wechat: 1,
|
||||
is_deduction: 1,
|
||||
deduction_name:''
|
||||
deduction_name: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
console.log('创建了');
|
||||
|
||||
// 获取货币名称和余额名称
|
||||
this.currencyName = this.$config.getAppSetting('currency1_name') || 'UU币';
|
||||
this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达卷';
|
||||
this.balanceName = this.$config.getAppSetting('balance_name') || '余额';
|
||||
let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type);
|
||||
//是否显示余额支付
|
||||
this.pay_balance = goodType.pay_balance;
|
||||
//是否显示优惠卷
|
||||
this.pay_coupon = goodType.pay_coupon;
|
||||
//是否显示货币支付
|
||||
this.pay_currency = goodType.pay_currency;
|
||||
//是否显示货币2支付
|
||||
this.pay_currency2 = goodType.pay_currency2;
|
||||
//是否显示微信支付
|
||||
this.pay_wechat = goodType.pay_wechat;
|
||||
//抵扣还是支付
|
||||
this.is_deduction=goodType.is_deduction;
|
||||
if(this.is_deduction==1){
|
||||
this.deduction_name='抵扣';
|
||||
}else{
|
||||
this.deduction_name='支付';
|
||||
}
|
||||
|
||||
this.setPayType(goodType);
|
||||
|
||||
},
|
||||
methods: {
|
||||
|
||||
setPayType(good_extend) {
|
||||
if (good_extend != null) {
|
||||
//是否显示余额支付
|
||||
this.pay_balance = good_extend.pay_balance;
|
||||
//是否显示优惠卷
|
||||
this.pay_coupon = good_extend.pay_coupon;
|
||||
//是否显示货币支付
|
||||
this.pay_currency = good_extend.pay_currency;
|
||||
//是否显示货币2支付
|
||||
this.pay_currency2 = good_extend.pay_currency2;
|
||||
//是否显示微信支付
|
||||
this.pay_wechat = good_extend.pay_wechat;
|
||||
//抵扣还是支付
|
||||
this.is_deduction = good_extend.is_deduction;
|
||||
if (this.is_deduction == 1) {
|
||||
this.deduction_name = '抵扣';
|
||||
} else {
|
||||
this.deduction_name = '支付';
|
||||
}
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 打开弹窗
|
||||
*/
|
||||
open() {
|
||||
if (this.orderData != null && this.orderData.goods_extend != null) {
|
||||
this.setPayType(this.orderData.goods_extend);
|
||||
}
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
|
||||
|
|
@ -262,15 +270,15 @@ export default {
|
|||
* @param {String} method 支付方式
|
||||
*/
|
||||
changePayMethod(method) {
|
||||
if(this.is_deduction==0){
|
||||
if (this.is_deduction == 0) {
|
||||
// 如果是支付模式，检查可用的支付方式数量
|
||||
let availablePayMethods = 0;
|
||||
if(this.pay_balance) availablePayMethods++;
|
||||
if(this.pay_currency) availablePayMethods++;
|
||||
if(this.pay_currency2) availablePayMethods++;
|
||||
|
||||
if (this.pay_balance) availablePayMethods++;
|
||||
if (this.pay_currency) availablePayMethods++;
|
||||
if (this.pay_currency2) availablePayMethods++;
|
||||
if (this.pay_wechat) availablePayMethods++;
|
||||
// 如果只有一种支付方式可用，则不允许切换
|
||||
if(availablePayMethods <= 1) {
|
||||
if (availablePayMethods <= 1) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@
|
|||
</view>
|
||||
|
||||
<!-- 确认订单弹窗 -->
|
||||
<order-confirm-popup ref="buyPop" v-if="orderData" :order-data="orderData" :page-data="pageData"
|
||||
<order-confirm-popup ref="buyPop" :order-data="orderData" :page-data="pageData"
|
||||
:use-money="useMoney" :use-money2="useMoney2" :use-integral="useIntegral" :coupon-data="couponData"
|
||||
:is-agree="isAgree" :send-rule-data="sendRuleData" :buy-num="buyNum" @close="close('buyPop')"
|
||||
@change-pay="changePay" @toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@
|
|||
<view class="log-list">
|
||||
<view class="log-item br10" v-for="(a, b) in logList" :key="b">
|
||||
<view class="avatar">
|
||||
<image :src="a.user_info && a.user_info.headimg"></image>
|
||||
<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;"></image>
|
||||
</view>
|
||||
|
||||
<view class="info">
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user