Compare commits

..

No commits in common. 'a07d1a827bcd63889085b3d0a2fa73563d63b5f3' and 'aac6ef4e1e3967d6830383b324e8afa3eb9f7df4' have entirely different histories.

  1. 112
      App.vue
  2. 2
      member-Recharge/rec-confirmation/rec-confirmation.vue
  3. 13
      pages/order/confirmation.vue
  4. 1996
      pages/tabBar/home/home.vue
  5. 3
      pages/user/positioning/positioning.vue
  6. 2
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  7. 7
      subPages/unionComfirmation/unionComfirmation.vue

@ -63,12 +63,10 @@
// //
qianzhuCityName: '重庆市', qianzhuCityName: '重庆市',
// //
pelletoilList: '', pelletoilList: '',
// //
shareNum: 0, shareNum:0,
//
isSelect: false
}, },
onLaunch: function() {}, onLaunch: function() {},
@ -232,7 +230,7 @@
} }
} }
}) })
// #endif // #endif
}, },
onHide: function() {} onHide: function() {}
@ -243,7 +241,7 @@
/*每个页面公共css */ /*每个页面公共css */
@import "/static/iconfont/font.scss"; @import "/static/iconfont/font.scss";
@import "/static/iconfont/cart.scss"; @import "/static/iconfont/cart.scss";
@keyframes noticeAnimation { @keyframes noticeAnimation {
from { from {
transform: translateX(100rpx); transform: translateX(100rpx);
@ -254,56 +252,52 @@
transform: translateX(-100%); transform: translateX(-100%);
} }
} }
//checkbox 使使mycheck //checkbox 使使mycheck
checkbox.mycheck .wx-checkbox-input, checkbox.mycheck .wx-checkbox-input,
checkbox.mycheck .uni-checkbox-input { checkbox.mycheck .uni-checkbox-input {
width: 30rpx !important; width: 30rpx !important;
height: 30rpx !important; height: 30rpx !important;
background-color: #ffffff !important; background-color: #ffffff !important;
border-radius: 50% !important; border-radius: 50% !important;
border: solid 1px #cccccc !important; border: solid 1px #cccccc !important;
overflow: hidden; overflow: hidden;
} }
//
// checkbox.mycheck .uni-checkbox-input-checked::before,
checkbox.mycheck .uni-checkbox-input-checked::before, checkbox.mycheck .wx-checkbox-input-checked::before {
checkbox.mycheck .wx-checkbox-input-checked::before { font-size: 38rpx !important; // 30rpx /
font-size: 38rpx !important; // 30rpx / // color: #FFCC1E;
// color: #FFCC1E; }
}
/* 解决小程序和app滚动条的问题 */
/* 解决小程序和app滚动条的问题 */ /* #ifdef MP-WEIXIN || APP-PLUS */
/* #ifdef MP-WEIXIN || APP-PLUS */ ::-webkit-scrollbar{
::-webkit-scrollbar { display: none;
display: none; }
} /* #endif */
/* 解决H5 的问题 */
/* #endif */ /* #ifdef H5 */
/* 解决H5 的问题 */ uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
/* #ifdef H5 */ /* 隐藏滚动条,但依旧具备可以滚动的功能 */
uni-scroll-view .uni-scroll-view::-webkit-scrollbar { display: none
/* 隐藏滚动条,但依旧具备可以滚动的功能 */ }
display: none /* #endif */
}
/* #endif */
.cart-num .uni-numbox__minus {
border-top-left-radius: 10px !important;
border-bottom-left-radius: 10px !important;
.cart-num .uni-numbox__minus { }
border-top-left-radius: 10px !important; .cart-num .uni-numbox-btns {
border-bottom-left-radius: 10px !important; background-color: #f6f6f6 !important;
} }
.cart-num .uni-numbox__plus{
.cart-num .uni-numbox-btns { border-top-right-radius: 10px !important;
background-color: #f6f6f6 !important; border-bottom-right-radius: 10px !important;
} }
.cart-num .uni-numbox__plus { </style>
border-top-right-radius: 10px !important;
border-bottom-right-radius: 10px !important;
}
</style>

@ -450,7 +450,7 @@
this.priceCaluc(this.totalprice); this.priceCaluc(this.totalprice);
} else { // } else { //
if (item.discountType == 1) { if (item.discountType == 1) {
if (this.orderPrice >= item.discountCondition) { if (this.orderPrice > item.discountCondition) {
this.memDiscountId = item.id; this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;

@ -498,7 +498,7 @@
this.$refs.popup.show(); this.$refs.popup.show();
}, },
// //
radioChanges(item) { radioChanges(item) {
this.paytheprice = this.orderPrice; this.paytheprice = this.orderPrice;
this.rechangeload(); this.rechangeload();
if (this.memDiscountId == item.id) { // if (this.memDiscountId == item.id) { //
@ -508,9 +508,10 @@
this.isDiscont = false; this.isDiscont = false;
} else { // } else { //
this.isDiscont = true; this.isDiscont = true;
this.memDiscountId = item.id;
if (item.discountType == 1) { if (item.discountType == 1) {
// //
if (this.orderPrice >= item.discountCondition) { if (this.orderPrice > item.discountCondition) {
this.memDiscountId = item.id; this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;
@ -524,15 +525,13 @@
}) })
} }
} }
if (item.discountType == 2) { if (item.discountType == 2) {
this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;
let oldprice = this.orderPrice - this.deductionPrice; let oldprice = this.orderPrice - this.deductionPrice;
this.priceCaluc(oldprice); this.priceCaluc(oldprice);
} }
if (item.discountType == 3) { if (item.discountType == 3) {
this.memDiscountId = item.id;
// //
this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item
.discountPrice)) .discountPrice))

File diff suppressed because one or more lines are too long

@ -110,8 +110,7 @@
app.globalData.cityName = res.return_data.provinceName; app.globalData.cityName = res.return_data.provinceName;
app.globalData.qianzhuCityName = res.return_data.cityName; app.globalData.qianzhuCityName = res.return_data.cityName;
app.globalData.cityId = res.return_data.regionId; app.globalData.cityId = res.return_data.regionId;
app.globalData.companyId = res.return_data.companyId; app.globalData.companyId = res.return_data.companyId;
app.globalData.isSelect = true;
uni.navigateBack({}) uni.navigateBack({})
} else { } else {
uni.showToast({ uni.showToast({

@ -690,7 +690,7 @@
} else { // } else { //
if (item.discountType == 1) { if (item.discountType == 1) {
if (this.orderPrice >= item.discountCondition) { if (this.orderPrice > item.discountCondition) {
this.memDiscountId = item.id; this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;

@ -376,6 +376,7 @@
this.priceCaluc(this.saveprice); this.priceCaluc(this.saveprice);
} else { // } else { //
this.memDiscountId = item.id;
if (item.discountType == 1) { if (item.discountType == 1) {
// //
if (this.orderPrice >= item.discountCondition) { if (this.orderPrice >= item.discountCondition) {
@ -392,15 +393,13 @@
}) })
} }
} }
if (item.discountType == 2) { if (item.discountType == 2) {
this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;
let oldprice = this.paytheprice - this.deductionPrice; let oldprice = this.paytheprice - this.deductionPrice;
this.priceCaluc(oldprice); this.priceCaluc(oldprice);
} }
if (item.discountType == 3) { if (item.discountType == 3) {
this.memDiscountId = item.id;
// //
this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice)) this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice))
.toFixed(2); .toFixed(2);

Loading…
Cancel
Save