1.优化2.0删除多余的代码

yj-dev
杨杰 2 years ago
parent b701fc0057
commit 53680cef7c
  1. 2
      Utils/Api.js
  2. 7
      pages.json
  3. 15
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 16
      pages/order/confirmation.vue
  5. 33
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  6. 22
      qianzhu-KFC/kfc-details/kfc-details.vue
  7. 15
      qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
  8. 4
      qianzhu-KFC/order-details/order-details.vue
  9. 3
      subPages/unionComfirmation/unionComfirmation.vue

@ -172,7 +172,7 @@ export const getDiscountByCode = params => {
//站内信列表 //站内信列表
export const getMsgByList = params => { export const getMsgByList = params => {
return POST('GET', `${base}//bsMsg/getMsgByList`, params).then(res => res.data); return POST('GET', `${base}/bsMsg/getMsgByList`, params).then(res => res.data);
} }
// 根据优惠券查卡券 // 根据优惠券查卡券
export const getCouponByDiscount = params => { export const getCouponByDiscount = params => {

@ -874,13 +874,6 @@
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
}, {
"path": "kfc-details/kfc-details",
"style": {
"navigationBarTitleText": "详情",
"enablePullDownRefresh": false
}
},{ },{
"path": "kfc-menu-list/kfc-menu-list", "path": "kfc-menu-list/kfc-menu-list",
"style": { "style": {

@ -275,9 +275,7 @@
wechatPay, wechatPay,
getHuiLianTongCardBalance, getHuiLianTongCardBalance,
cardPay, cardPay,
orderToGoldPay,
findUser, findUser,
oilCardPay,
getUserOrderPreList, getUserOrderPreList,
canUseDiscount, canUseDiscount,
create, create,
@ -311,8 +309,6 @@
user: '', user: '',
paytype: 'weixin', paytype: 'weixin',
PaymentPassword: '', PaymentPassword: '',
// timedeductionPrice: '0', //
orderPrice: '', // orderPrice: '', //
deductionPrice: '0.00', // deductionPrice: '0.00', //
OrderPreList: [], // OrderPreList: [], //
@ -348,7 +344,6 @@
}, },
onShow() { onShow() {
let that = this; let that = this;
// that.paytype = '';
that.findUser(); that.findUser();
this.priceValue[1] = 0; this.priceValue[1] = 0;
this.reload(); this.reload();
@ -488,14 +483,6 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.orderList = res.return_data; this.orderList = res.return_data;
this.payPrice = res.return_data.payPrice; this.payPrice = res.return_data.payPrice;
// let payprice = parseFloat(this.payPrice * 100).toFixed(
// 0);
// if (payprice > this.user.gold) {
// this.availIntegal = this.user.gold;
// } else {
// this.availIntegal = payprice;
// }
this.getRebateIntegral(); this.getRebateIntegral();
this.getThirdPartyByDetail(); this.getThirdPartyByDetail();
} }
@ -831,7 +818,7 @@
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword, "payPwd": this.PaymentPassword,
memDiscountId: this.memDiscountId "memDiscountId": this.memDiscountId
} }
create(goods).then(res => { create(goods).then(res => {

@ -69,6 +69,22 @@
</view> </view>
</view> </view>
<!-- // -->
<view class="width94 backcorfff mart10" v-if="couponList.wherePost">
<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系人</view>
<input class="width60 fotrt font15" v-model="contactPepole" placeholder="请输入联系人" />
</view>
<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系电话</view>
<input class="width60 fotrt font15" v-model="contactPhone" placeholder="请输入联系电话" />
</view>
<view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系地址</view>
<input class="width60 fotrt font15" v-model="contactAddress" placeholder="请输入联系地址" />
</view>
</view>
<view class="width94 comorder mart10"> <view class="width94 comorder mart10">
<view class="width92 alijusstart paddtop20"> <view class="width92 alijusstart paddtop20">

@ -809,6 +809,22 @@
} }
}) })
} else if (that.paytype == '3') { } else if (that.paytype == '3') {
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../pages/user/bindingCard/bindingCard'
})
}, 1000)
}
});
that.thirdCancelOrder();
return;
}
if (!that.user.isSetPayPwd) { if (!that.user.isSetPayPwd) {
uni.navigateTo({ uni.navigateTo({
url: '../../pages/login/updatePas/updatePas' url: '../../pages/login/updatePas/updatePas'
@ -826,22 +842,7 @@
return; return;
} }
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../pages/user/bindingCard/bindingCard'
})
}, 1000)
}
});
that.thirdCancelOrder();
return;
}
that.$refs.paymentPassword.modalFun('show'); that.$refs.paymentPassword.modalFun('show');
} else { } else {
uni.showToast({ uni.showToast({

@ -1,22 +0,0 @@
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

@ -68,11 +68,13 @@
</view> </view>
<view class="mart10 icon-click fotrt alijusend" v-else> <view class="mart10 icon-click fotrt alijusend" v-else>
<view class="num fcorfff font14" style="background: #d90209;" @click="showPopups(titem)"> <view class="num fcorfff font14" style="background: #d90209;"
@click="showPopups(titem)">
选规格 选规格
</view> </view>
<view class="unibadge" v-if="titem.count > 0"> <view class="unibadge" v-if="titem.count > 0">
{{titem.count}}</view> {{titem.count}}
</view>
</view> </view>
</view> </view>
@ -82,8 +84,7 @@
</view> </view>
</scroll-view> </scroll-view>
<shopcart v-if="flist !='' " :goods="shoppingcart" @add="addCart" @dec="decreaseCart" <shopcart v-if="flist !='' " :goods="shoppingcart" @add="addCart" @dec="decreaseCart" @delAll="delAll">
@delAll="delAll">
</shopcart> </shopcart>
@ -499,12 +500,6 @@
return true; return true;
},
//
navToList() {
uni.navigateTo({
url: '../kfc-details/kfc-details'
})
} }
} }
} }

@ -113,8 +113,8 @@
</view> </view>
<view class="width94 backcorfff marb20"> <view class="width94 backcorfff marb20">
<view class="width100" style="height: 10px;"> <view class="width100" style="height: 10px;">
<view class=".cro_left_top flleft"></view> <view class="cro_left_top flleft"></view>
<view class=".cro_right_top flright"></view> <view class="cro_right_top flright"></view>
</view> </view>
<view class="width94 alijusstart paddtop10 "> <view class="width94 alijusstart paddtop10 ">
<view class="font15 fcor333 fontwig6 width50">商品小计</view> <view class="font15 fcor333 fontwig6 width50">商品小计</view>

@ -353,9 +353,6 @@
// //
// //
getHuiLianTongCardBalance() { getHuiLianTongCardBalance() {
if (!this.user.hltCardNo) {
return;
}
let params = { let params = {
cardNo: this.user.hltCardNo.cardNo cardNo: this.user.hltCardNo.cardNo
} }

Loading…
Cancel
Save