yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改2.0 页面问题

Browse Source
yj-dev
杨杰 2 years ago
parent d8158babc3
commit 033c8ff68b
3 changed files with 26 additions and 116 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 136
      pages/order/confirmation.vue
  2. 2
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  3. 4
      subPages/unionComfirmation/unionComfirmation.vue

136
pages/order/confirmation.vue
Unescape View File

@ -9,28 +9,14 @@
<view class="font13 fcor666 mart10">规格: 默认</view>
<view class="price-number mart10" v-if="isDiscont">
<view class="price font16">￥{{couponList.salesPrice}}</view>
<!-- <view class="price font16" v-else>
<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
</image>{{couponList.salesPrice * 100}}
</view> -->
<view class="flright fotrt paddleft10">x1</view>
</view>
<view class="price-number mart10" v-if="!isDiscont">
<view class="price font16">￥{{couponList.discountPrice}}</view>
<!-- <view class="price font16" v-else>
<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
</image>{{couponList.discountPrice*100}}
</view> -->
<view class="number fcor666 font13 margle"
v-if="couponList.salesPrice != couponList.discountPrice">
￥{{couponList.salesPrice}}
</view>
<!-- <view class="number fcor666 font13 margle"
v-if="couponList.payType != 1 && couponList.salesPrice != couponList.discountPrice">
<image style="width: 15px;height: 15px;" src="../../static/img/jfh.png">
</image>{{couponList.salesPrice*100}}
</view> -->
<view class="flright fotrt paddleft10">x1</view>
</view>
</view>
@ -43,19 +29,9 @@
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999" v-if=" isDiscont">
￥{{couponList.salesPrice}}
</view>
<!-- <view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666 aliitem"
v-if="couponList.payType != 1 && isDiscont">
<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
</image>{{couponList.salesPrice*100}}
</view> -->
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999" v-if="!isDiscont">
￥{{couponList.discountPrice}}
</view>
<!-- <view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666 aliitem"
v-if="couponList.payType != 1 && !isDiscont">
<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
</image>{{couponList.discountPrice*100}}
</view> -->
</view>
<view class="width94 line1 mart5 marb5"></view>
@ -104,9 +80,6 @@
<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
@end="blockEnd" />
<!-- <cj-slider style="width: 60%; float:left;" v-if="isDiscount == 2" v-model="priceValue" :min="0"
:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
@end="blockEnd" /> -->
<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
</view>
</view>
@ -174,27 +147,10 @@
</view>
</view>
<!-- <view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
</view>
<view class="width15 flright fotct">
<image class="jtcs" src="../../static/img/jt.png"></image>
</view>
</view>
</view> -->
<view class="width100 height60"></view>
<view class="footer">
<view class="settlement">
<view class="sum">实付:<view class="money">￥{{paytheprice}}</view>
<!-- <view class="money aliitem" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../static/img/jfx.png">
</image>{{paytheprice*100}}
</view> -->
</view>
<!-- #ifdef MP -->
<button class="btn" open-type="getPhoneNumber" v-if="user == null"
@ -234,7 +190,6 @@
getCouponById,
loginByPhone,
getUserNormalDiscountList,
orderToGoldPay,
findUser,
cardPay,
getRebateIntegral,
@ -256,13 +211,6 @@
},
data() {
return {
buylist: [], //订单列表
goodsPrice: 0.0, //商品合计价格
sumPrice: 0.0, //用户付款价格
freight: 12.00, //运费
note: '', //备注
int: 1200, //抵扣积分
deduction: 0, //抵扣价格
couponId: '',
couponList: [],
UserNormalDiscountList: [],
@ -431,38 +379,6 @@
showPopup() {
this.$refs.popup.show();
},
// radioChanges(item) {
// if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
// this.memDiscountId = '';
// this.coupondiscountid = '';
// this.paytheprice = this.couponList.discountPrice;
// this.deductionPrice = '0.00';
// this.isDiscont = false;
// } else { // 否则进行选中赋值
// this.isDiscont = true;
// this.memDiscountId = item.id;
// this.coupondiscountid = item.id;
// if (item.highDiscount.discountType == 1) {
// //满减价格
// this.deductionPrice = item.highDiscount.discountPrice;
// this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
// } else if (item.highDiscount.discountType == 2) {
// //抵扣价格
// this.deductionPrice = item.highDiscount.discountPrice;
// this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
// } else if (item.highDiscount.discountType == 3) {
// // 打折
// this.deductionPrice = parseFloat(this.couponList.salesPrice - (this.couponList.salesPrice *
// item
// .highDiscount.discountPrice)).toFixed(2)
// this.paytheprice = parseFloat(this.couponList.salesPrice * item.highDiscount.discountPrice)
// .toFixed(2);
// }
// }
// this.$refs.popup.hide();
// },
//选择优惠券
radioChanges(item) {
this.paytheprice = this.orderPrice;
@ -516,14 +432,9 @@
if (payprice > this.user.gold) {
this.availIntegal = this.user.gold;
this.priceValue[1] = 0;
// if (this.availIntegal < this.priceValue[1]) {
// this.priceValue[1] = this.user.gold;
// this.reload();
// }
} else {
this.availIntegal = payprice;
this.priceValue[1] = 0;
// this.reload();
}
this.reload();
this.calculatepayPrice();
@ -563,7 +474,6 @@
})
},
//查询工会卡余额
//查询详情
getHuiLianTongCardBalance() {
let params = {
cardNo: this.user.hltCardNo.cardNo
@ -620,7 +530,7 @@
});
},
toPay() {
if (this.paytheprice == 0) {
if (!this.user.isSetPayPwd) {
uni.navigateTo({
@ -630,15 +540,15 @@
}
this.$refs.paymentPassword.modalFun('show');
return;
}
if (this.paytype == '') {
uni.showToast({
title: '请选择支付方式',
icon: 'none',
duration: 2000
})
return;
}
if (this.paytype == '') {
uni.showToast({
title: '请选择支付方式',
icon: 'none',
duration: 2000
})
return;
}
if (this.orderDetails) {
@ -659,8 +569,8 @@
"saleCount": 1,
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
memDiscountId:this.memDiscountId
"promoteCode": this.identificationCode,
memDiscountId: this.memDiscountId
}
create(goods).then(res => {
uni.hideLoading();
@ -821,21 +731,21 @@
"saleCount": 1,
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword,
memDiscountId:this.memDiscountId
"promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword,
memDiscountId: this.memDiscountId
}
create(goods).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
app.globalData.storeid = '';
app.globalData.storename = '';
uni.reLaunch({
url: '../pay/success/success?id=' + this
.couponId
uni.showToast({
title: '支付成功'
})
app.globalData.storeid = '';
app.globalData.storename = '';
uni.reLaunch({
url: '../pay/success/success?id=' + this
.couponId
});
} else {
uni.showToast({

2
qianzhu-KFC/confirmOrder/confirmOrder.vue
Unescape View File

@ -619,7 +619,7 @@
"storeCode":this.storeCode,
"platformId": this.showType,
"productType": this.productType,
"orderItems": data2,
"orderItems": this.orderList,
"goodsType": 9,
"saleCount": 1,
}],

4
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -564,8 +564,8 @@
"companyId": app.globalData.companyId,
"memDiscountId": that.memDiscountId,
"payPwd": ""
}
}
create(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();

Write Preview
Loading…
Cancel
Save