Skip to content

M
mallapp
Commit ac12c46b authored by Mac's avatar Mac
Browse files
Options

修改储蓄卡内容

parent e6d1ae46
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 105 deletions
components/coupon/cashCard.vue
View file @ ac12c46b
......@@ -7,26 +7,26 @@
<view class="chosentips">请选择要使用的储蓄卡</view>
<view class="details">
<view class="item" v-for="(x, i) in ts" :key="i" :style="{'margin-bottom':ts.length==i+1?'50px':'10px'}">
<view class="ticket">
<view class="miane">
<view class="money">
</view>
<view class="item-left">
<view style="font-weight: bold;width: 100%;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;">
{{x.Name}}
</view>
</view>
<view class="detail">
<view class="coupond">
<view class="name">{{x.Name}}</view>
<view class="date">{{x.SurplusPrice}}</view>
<view class="rule">{{x.EndTime}}</view>
</view>
<view class="chosen">
<u-radio-group v-model="currentChosen">
<u-radio shape="circle" :name="x.Id" :icon-size="36" :active-color="mc"></u-radio>
</u-radio-group>
<view style="font-size: 11px;color: #818181;margin-top: 9px;">
有效期{{x.EndTime}}
</view>
</view>
<view style="width: 1px;flex: 1;display: flex;align-items: flex-end;color: #FF4544;font-size: 12px;justify-content: flex-end;">
余额￥ <text style="font-size: 20px;">{{x.SurplusPrice}}99999</text>
</view>
<view class="chosen">
<u-radio-group v-model="currentChosen">
<u-radio shape="circle" :name="x.Id" :icon-size="36" :active-color="mc"></u-radio>
</u-radio-group>
</view>
<view class="positop">
储蓄卡
</view>
</view>
</view>
</scroll-view>
......@@ -113,91 +113,42 @@
.coupon .details .item {
display: flex;
margin-bottom: 10px;
align-items: flex-start;
padding: 35px 15px 15px;
background: #fff;
}
.coupon .details .item .ticket {
position: relative;
background-image: linear-gradient(to bottom right,
rgb(95, 154, 220),
rgb(112, 125, 195));
width: 125px;
height: 100px;
display: flex;
align-items: center;
color: #fff;
}
.coupon .details .item .ticket .miane .money {
font-family: "oswald";
font-weight: bold;
size: 64px;
width: 125px;
text-align: center;
}
.coupon .details .item .ticket .miane .money .small {
font-size: 20px;
border-radius: 5px;
}
.coupon .details .item .ticket .miane .tiaojian {
.coupon .details .item .item-left{
width: calc(100vw - 260rpx - 55px);
font-size: 14px;
width: 125px;
text-align: center;
}
.coupon .details .item .detail {
width: 1px;
flex: 1;
background: #fff;
padding: 10px;
display: flex;
align-items: flex-end;
color: #000000;
}
.coupon .details .item .detail .coupond {
flex: 1;
}
.coupon .details .item .detail .coupond .name {
font-size: 13px;
font-weight: 600;
color: #000;
}
.coupon .details .item .detail .coupond .date {
margin-top: 5px;
font-size: 11px;
color: #777;
}
.coupon .details .item .detail .coupond .rule {
font-size: 11px;
color: #777;
margin-top: 5px;
}
.coupon .details .item .detail .chosen {
.coupon .details .item .chosen {
width: 20px;
position: absolute;
right: 10px;
top: 10px;
}
.coupon .details .item .ticket:before {
content: "";
display: block;
width: 12px;
height: 100%;
background-size: 12px 12px;
/* 一个repeat的大小 */
background-repeat: repeat-y;
background-image: radial-gradient(#f5f5f5 4px, transparent 4px);
.coupon .positop{
position: absolute;
left: 0;
top: 0;
width: 55px;
height: 21px;
background: linear-gradient(90deg, #FF9966, #E95252);
font-size: 12px;
color: #FFFFFF;
line-height: 21px;
text-align: center;
border-top-left-radius:5px ;
border-bottom-right-radius: 5px;
}
.coupon .details .item .ticket:before {
left: -6px;
}
.pesongBox .btton-box {
height: 50px;
......
pages/order-submit/order-submit.vue
View file @ ac12c46b
......@@ -165,7 +165,7 @@
</view>
</view>
<view class="filed" v-if="IsDeposit==1">
<view class="left">储值卡扣除</view>
<view class="left">储蓄卡扣除</view>
<view class="right">
<text class="price" :style="{ color: mc }">-￥{{ cashPrice.toFixed(2) }}</text>
</view>
......@@ -344,7 +344,7 @@
if (option.formData) {
this.formData = JSON.parse(decodeURIComponent(option.formData));
this.formdata = JSON.parse(decodeURIComponent(option.formData));
this.formdata.Use_Deposit_Id = 0;//储值卡ID 2021-4-8加的
this.formdata.Use_Deposit_Id = 0;//储蓄卡ID 2021-4-8加的
}
if (option.IsFormShoppingCart) {
this.IsFormShoppingCart = option.IsFormShoppingCart;
......@@ -423,15 +423,11 @@
form.DetailList = that.DetailList;
form.User_Coupon_Id = that.formdata.User_Coupon_Id;
form.Use_Deposit_Id = that.formdata.Use_Deposit_Id;
form.DepositMoney = that.cashPrice;//储值卡抵扣金额
form.DepositFreightMoney = that.expressPrice;//储值卡抵扣运费
form.DepositMoney = that.cashPrice;//储蓄卡抵扣金额
form.DepositFreightMoney = that.expressPrice;//储蓄卡抵扣运费
form.CouponMoney = that.couponPrice;
form.FreightMoney = that.expressPrice;
if(that.formdata.Use_Deposit_Id == 0){//2021-4-9处理 如果是使用了储值卡 就吧价格复制为储值卡抵用的金额
form.Income = that.ds.total_price;
}else{
form.Income = that.cashPrice;
}
form.Income = that.ds.total_price;
form.IsFormShoppingCart = that.IsFormShoppingCart;
form.Use_Integral = that.formdata.Use_Integral;
......@@ -462,9 +458,17 @@
"&SmallShopId=" + SmallShopId + '&JumpType=4';
console.log(that.path)
} else {
that.payBtn = true;
that.payInfo.OrderId = res.data.OrderId;
that.payInfo.total_price = that.ds.total_price;
if(that.formdata.Use_Deposit_Id!=0 && that.ds.total_price ==0){//如果使用了储蓄卡 就直接支付成功 跳入支付结果
uni.reLaunch({
url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
})
}else{//没使用的话 就弹出支付页面
that.payBtn = true;
}
}
} else {
......
pages/user-center/user-center.vue
View file @ ac12c46b
......@@ -235,6 +235,7 @@
companyStatus:2,
companyName:"",
is_show_korea:0,//是否显示认证标识
IsDeposit:0,//是否开启储蓄卡功能
};
},
components: {
......@@ -277,10 +278,9 @@
this.modelstype = 2
}
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :
0;
this.is_show_korea= uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea :
0;
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :0;
this.is_show_korea= uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea :0;
this.IsDeposit = uni.getStorageSync('basedata')?uni.getStorageSync('basedata').mall.setting.IsDeposit:0
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
uni.setNavigationBarTitle({
......@@ -356,6 +356,13 @@
flag = false;
}
break;
case "/pages/coupon/cards/purchase":
if(this.IsDeposit == 1){
flag = true;
}else{
flag = false;
}
break;
}
return flag;
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment