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

1.在订单详情页加上客户返积分数

Browse Source 
2.肯德基和星巴克新增用户选择数量
3.星巴克肯德基新增打烊时间
4.肯德基订单详情新增手机点击查看
5.肯德基和星巴克修改文字位置
6.绑定工会卡优化
yj-dev
杨杰 2 years ago
parent ddf5a75413
commit ed89ec9e35
23 changed files with 938 additions and 344 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. 70
      App.vue
  2. 5
      Utils/Api.js
  3. 2
      manifest.json
  4. 70
      member-Recharge/rec-confirmation/rec-confirmation.vue
  5. 70
      pages/goods/refuel-confirm/refuel-confirm.vue
  6. 102
      pages/goods/refuel-details/refuel-details.vue
  7. 19
      pages/goods/refuel/refuel.vue
  8. 69
      pages/goods/store-list/store-details.vue
  9. 4
      pages/order/confirmation.vue
  10. 8
      pages/tabBar/category/category.vue
  11. 51
      pages/tabBar/home/home.vue
  12. 32
      pages/user/bindingCard/bindingCard.vue
  13. 1
      pages/user/positioning/positioning.vue
  14. 6
      qianzhu-KFC/buffet-order/buffet-order.vue
  15. 72
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  16. 181
      qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
  17. 122
      qianzhu-KFC/menu-list/menu-list.vue
  18. 53
      qianzhu-KFC/order-details/order-details.vue
  19. BIN
      qianzhu-KFC/static/imgs/horn.png
  20. BIN
      static/img/rebate.png
  21. BIN
      static/img/sigh.png
  22. 73
      subPages/unionComfirmation/unionComfirmation.vue
  23. 4
      uni.scss

70
App.vue
Unescape View File

@ -28,6 +28,8 @@
balancePrice: '', balancePrice: '',
balanceCardNo: '', balanceCardNo: '',
identificationCode: '', identificationCode: '',
//公司id
companyId:'',
// h5获取信息 // h5获取信息
h5code: '', h5code: '',
//门店ID //门店ID
@ -85,6 +87,74 @@
} }
} }
}) })
uni.getStorage({
key: 'accountId',
success(e) {
if (e.data) {
that.globalData.accountId = e.data;
that.globalData.accountType = e.data;
}
}
})
uni.getStorage({
key: 'gasKey',
success(e) {
if (e.data) {
that.globalData.gasKey = e.data;
}
}
})
uni.getStorage({
key: 'staffCode',
success(e) {
if (e.data) {
if (that.globalData.accountId == '000001&key' || that.globalData.accountId ==
'000000&gasKey' || that.globalData.accountId == '000009&key' || that.globalData.accountId == '0000010&key') {
that.globalData.staffCode = e.data;
} else {
that.globalData.mchId = e.data;
}
}
}
})
uni.getStorage({
key: 'cityId',
success(e) {
if (e.data) {
that.globalData.cityId = e.data;
}
}
})
uni.getStorage({
key: 'companyId',
success(e) {
if (e.data) {
that.globalData.companyId = e.data;
}
}
})
uni.getStorage({
key: 'latitude',
success(e) {
if (e.data) {
that.globalData.latitude = e.data;
}
}
})
uni.getStorage({
key: 'longitude',
success(e) {
if (e.data) {
that.globalData.longitude = e.data;
}
}
})
}, },
onHide: function() {} onHide: function() {}
} }

5
Utils/Api.js
Unescape View File

@ -594,3 +594,8 @@ export const czhltUnionCardPay = params => {
export const getUserOrderListhuafei = params => { export const getUserOrderListhuafei = params => {
return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data); return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data);
} }
//肯德基返利
export const getRebateIntegral = params => {
return POST('POST', `${base}/common/getRebateIntegral`, params).then(res => res.data);
}

2
manifest.json
Unescape View File

@ -86,7 +86,7 @@
}, },
"devServer" : { "devServer" : {
"port" : "", "port" : "",
"https" : true "https" : false
}, },
"domain" : "https://hsgcs.dctpay.com", "domain" : "https://hsgcs.dctpay.com",
"template" : "index.html" "template" : "index.html"

70
member-Recharge/rec-confirmation/rec-confirmation.vue
Unescape View File

@ -73,6 +73,26 @@
¥{{priceValue[1] / 100}} ¥{{priceValue[1] / 100}}
</view> </view>
</view> </view>
<view class="width94 line1 marb5"></view>
<view class="height50 width100 backcorfff">
<view class="width40 flleft fcor333 fontwig6 font15 text1 alijusstart" style="padding-left: 4%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
style="align-items: center;">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 4%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
<view class="width94 line1 marb5"></view>
<view class="height50 width100"> <view class="height50 width100">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 支付方式
@ -116,17 +136,17 @@
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items)"> @click="radioChanges(items)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image> <image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="contrig"> <view class="alijus width60 margle10">
<view class="width80p flleft"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="width20 flright"> <view class="width20 fotrt">
<view class="yhprice"> <view>
<radio v-if="items.discountCondition && orderPrice >= items.discountCondition" <radio v-if="items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" /> color="#c72a20" :checked="items.id == memDiscountId" />
<radio v-if="items.discountCondition && orderPrice < items.discountCondition" <radio v-if="items.discountCondition && orderPrice < items.discountCondition"
@ -154,7 +174,8 @@
qianzhuorderToPayByWx, qianzhuorderToPayByWx,
czhltUnionCardPay, czhltUnionCardPay,
getUserOrderPreList, getUserOrderPreList,
thirdCancelOrder thirdCancelOrder,
getRebateIntegral
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
// #ifdef H5 // #ifdef H5
var jweixin = require('jweixin-module'); var jweixin = require('jweixin-module');
@ -169,7 +190,7 @@
data() { data() {
return { return {
orderList: [], orderList: [],
paytype: '', //支付方式 paytype: '2', //支付方式
priceValue: [0, 0], // 积分可以指定默认值 priceValue: [0, 0], // 积分可以指定默认值
availIntegal: 0, // 可用积分 availIntegal: 0, // 可用积分
totalprice: 0, //总价 totalprice: 0, //总价
@ -195,6 +216,8 @@
imageUrl: app.globalData.imgUrl, //图片地址 imageUrl: app.globalData.imgUrl, //图片地址
orderPrice: 0, //订单价格 orderPrice: 0, //订单价格
rechargeDes: '', // 支付详情 rechargeDes: '', // 支付详情
rebateIntegral: '' ,//返回积分
Integrastu:1 //返积分状态
} }
}, },
onLoad(options) { onLoad(options) {
@ -249,6 +272,7 @@
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
this.getThirdPartyByDetail(); this.getThirdPartyByDetail();
this.getUserOrderPreList(); this.getUserOrderPreList();
this.getRebateIntegral();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -256,6 +280,24 @@
} }
}); });
}, },
//支付返利积分
getRebateIntegral() {
let datas = {
"companyId": app.globalData.companyId,
"price": this.payPrice,
"productId": 3,
"type": 4,
}
getRebateIntegral(datas).then(res => {
if (res.return_code == '000000') {
this.rebateIntegral = res.return_data;
this.Integrastu = 1;
}else{
this.rebateIntegral = res.return_msg;
this.Integrastu = 2;
}
})
},
//查询工会卡详情 //查询工会卡详情
getHuiLianTongCardBalance() { getHuiLianTongCardBalance() {
if (!this.user.hltCardNo) { if (!this.user.hltCardNo) {
@ -299,6 +341,7 @@
} else { } else {
this.isUse = true; this.isUse = true;
} }
this.getRebateIntegral();
}, },
//获取选择支付方式 //获取选择支付方式
changeRiado() { changeRiado() {
@ -463,6 +506,7 @@
2)) - this 2)) - this
.deductionPrice).toFixed(2)); .deductionPrice).toFixed(2));
} }
this.getRebateIntegral();
}, },
rechangeload() { rechangeload() {
this.isUse = false; this.isUse = false;
@ -802,10 +846,10 @@
border-radius: 8px; border-radius: 8px;
image { image {
float: left; // float: left;
width: 170rpx; width: 160rpx;
max-height: 170rpx; max-height: 160rpx;
margin-left: 10px; // margin-left: 10px;
} }
} }
</style> </style>

70
pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -120,6 +120,25 @@
¥{{priceValue[1] / 100}} ¥{{priceValue[1] / 100}}
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
<image src="../../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
</view>
<view class="width50 flright fotrt paddtright15 font15 colore95 alijun" style="align-items: center;"
v-if="Integrastu == 1">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright15 font15 colore95 alijun" style="align-items: center;"
v-if="Integrastu == 2">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
</view> </view>
<!-- //支付方式 --> <!-- //支付方式 -->
@ -176,18 +195,18 @@
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items.highDiscount,items)"> @click="radioChanges(items.highDiscount,items)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.highDiscount.discountImg"></image> <image mode="widthFix" :src="imageUrl+items.highDiscount.discountImg"></image>
<view class="contrig"> <view class="alijus width60 margle10">
<view class="width80p flleft"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.highDiscount.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view>
<view class="font13 fcor999 mart5"> <view class="font13 fcor999 mart5">
有效期:{{items.highDiscount.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} 有效期:{{items.highDiscount.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="width20 flright"> <view class="width20 fotrt">
<view class="yhprice"> <view>
<radio <radio
v-if="items.highDiscount.discountCondition && orderPrice >= items.highDiscount.discountCondition" v-if="items.highDiscount.discountCondition && orderPrice >= items.highDiscount.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" /> color="#c72a20" :checked="items.id == memDiscountId" />
@ -219,7 +238,8 @@
canUseDiscount, canUseDiscount,
addOrder, addOrder,
cancelOrder, cancelOrder,
oilPriceDiscountCompute oilPriceDiscountCompute,
getRebateIntegral
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue'; import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@ -256,7 +276,9 @@
memDiscountId: '', //优惠券id memDiscountId: '', //优惠券id
priceValue: [0, 0], // 积分可以指定默认值 priceValue: [0, 0], // 积分可以指定默认值
availIntegal: 0, // 可用积分 availIntegal: 0, // 可用积分
gasOrderList: '' //存的订单信息 gasOrderList: '', //存的订单信息
rebateIntegral: '', //返回积分
Integrastu: 1 //返积分状态
} }
}, },
onLoad(e) { onLoad(e) {
@ -290,6 +312,24 @@
} }
}); });
}, },
//支付返利积分
getRebateIntegral() {
let datas = {
"companyId": app.globalData.companyId,
"price": this.payPrice,
"productId": 1,
"type": 3,
}
getRebateIntegral(datas).then(res => {
if (res.return_code == '000000') {
this.rebateIntegral = res.return_data;
this.Integrastu = 1;
} else {
this.rebateIntegral = res.return_msg;
this.Integrastu = 2;
}
})
},
//查询优惠券 //查询优惠券
canUseDiscount() { canUseDiscount() {
let params = { let params = {
@ -323,6 +363,8 @@
} else { } else {
this.availIntegal = payprice; this.availIntegal = payprice;
} }
this.getRebateIntegral();
} }
}) })
}, },
@ -401,6 +443,7 @@
2)) - this 2)) - this
.deductionPrice).toFixed(2)); .deductionPrice).toFixed(2));
} }
this.getRebateIntegral();
}, },
rechangeload() { rechangeload() {
this.isUse = false; this.isUse = false;
@ -434,6 +477,7 @@
} else { } else {
this.isUse = true; this.isUse = true;
} }
this.getRebateIntegral();
}, },
//密码支付完成 //密码支付完成
@ -1034,10 +1078,10 @@
border-radius: 8px; border-radius: 8px;
image { image {
float: left; // float: left;
width: 170rpx; width: 160rpx;
max-height: 170rpx; max-height: 160rpx;
margin-left: 10px; // margin-left: 10px;
} }
} }
</style> </style>

102
pages/goods/refuel-details/refuel-details.vue
Unescape View File

@ -76,8 +76,11 @@
<view class="list width90"> <view class="list width90">
<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)" <view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
:class="{'on':amount.codeValue == inputMoney}"> :class="{'on':amount.codeValue == inputMoney}">
<view class="heTitle fcor333 paddtop10" :class="{'colorfe80':amount.codeValue == inputMoney}">{{amount.codeValue}}元</view> <view class="heTitle fcor333 paddtop10" :class="{'colorfe80':amount.codeValue == inputMoney}">
<view class="width100 font12 fcor333 mart5" :class="{'colorfe80':amount.codeValue == inputMoney}">最高优惠¥{{amount.codeName}}</view> {{amount.codeValue}}元
</view>
<view class="width100 font12 fcor333 mart5" :class="{'colorfe80':amount.codeValue == inputMoney}">
最高优惠¥{{amount.codeName}}</view>
</view> </view>
</view> </view>
@ -245,35 +248,48 @@
getCodeText: '获取验证码', getCodeText: '获取验证码',
getCodeBtnColor: "#ffffff", getCodeBtnColor: "#ffffff",
getCodeisWaiting: false, getCodeisWaiting: false,
showtoastdes:'' // 未登陆错误 showtoastdes: '' // 未登陆错误
} }
}, },
onLoad(options) { onLoad(options) {
this.store_key = options.id; let that = this;
this.counId = options.desId; // #ifdef MP
this.oilNo = options.oilNo; that.store_key = options.id;
// #endif
// #ifdef H5
uni.getStorage({
key: 'store_key',
success(e) {
if (e.data) {
that.store_key = e.data;
}
}
})
// #endif
that.counId = options.desId;
that.oilNo = options.oilNo;
if (app.globalData.accountId) { if (app.globalData.accountId) {
this.isTyAgent = true; that.isTyAgent = true;
} }
if (app.globalData.gasKey && app.globalData.accountType == '000000&gasKey') { if (app.globalData.gasKey && app.globalData.accountType == '000000&gasKey') {
this.store_key = app.globalData.gasKey; that.store_key = app.globalData.gasKey;
} else { } else {
app.globalData.staffCode = ''; app.globalData.staffCode = '';
} }
// #ifdef H5 // #ifdef H5
if (app.globalData.accountType && app.globalData.accountType == '000000#/') { if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
this.recentGasStation(); that.recentGasStation();
} else { } else {
this.getGasDetailByStoreKey(); that.getGasDetailByStoreKey();
} }
// #endif // #endif
// #ifdef MP // #ifdef MP
this.getGasDetailByStoreKey(); that.getGasDetailByStoreKey();
// #endif // #endif
this.getDictionaryByCodeTypeOl(); that.getDictionaryByCodeTypeOl();
this.getDictionaryByCodeTypeMoney(); that.getDictionaryByCodeTypeMoney();
this.getDictionaryByCodeType(); that.getDictionaryByCodeType();
}, },
onShow() { onShow() {
this.user = app.globalData.userInfo; this.user = app.globalData.userInfo;
@ -414,7 +430,7 @@
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: "none", icon: "none",
duration:2000 duration: 2000
}); });
} }
}) })
@ -424,6 +440,11 @@
//前往导航 //前往导航
seeloaction() { seeloaction() {
// #ifdef H5
window.open(
`//uri.amap.com/navigation?from=${app.globalData.longitude},${app.globalData.latitude},我的位置&to=${this.storeList.gasAddressLongitude},${this.storeList.gasAddressLatitude},${this.storeList.gasAddress}&mode=car&policy=1&src=mypage&coordinate=gaode&callnative=1`
)
// #endif
// #ifdef MP // #ifdef MP
uni.openLocation({ uni.openLocation({
latitude: Number(this.storeList.gasAddressLatitude), //目的地的定位 latitude: Number(this.storeList.gasAddressLatitude), //目的地的定位
@ -456,23 +477,52 @@
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.storeList = res.return_data; this.storeList = res.return_data;
if (!this.oilNo) { // if (!this.oilNo) {
// this.oilNo = res.return_data.oilPriceList[0].oilNoName;
// this.priceVip = res.return_data.oilPriceList[0].priceVip;
// this.priceGun = res.return_data.oilPriceList[0].priceGun;
// this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
// this.detailList = res.return_data.oilPriceList;
// this.oilType = res.return_data.oilPriceList[0].oilType;
// this.gasGunList = res.return_data.gasGunList;
// this.counId = res.return_data.goodsId;
// for (var i = 0; i < res.return_data.gasGunList.length; i++) {
// if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
// this.gunnumber.push(res.return_data.gasGunList[i])
// // this.gunNo = res.return_data.gasGunList[i].gunNo;
// this.gasOilNo = res.return_data.gasGunList[i].oilNo;
// }
// }
// }
if (!this.oilNo || this.oilNo == undefined) {
this.oilNo = res.return_data.oilPriceList[0].oilNoName; this.oilNo = res.return_data.oilPriceList[0].oilNoName;
this.priceVip = res.return_data.oilPriceList[0].priceVip; this.priceVip = res.return_data.oilPriceList[0].priceVip;
this.priceGun = res.return_data.oilPriceList[0].priceGun; this.priceGun = res.return_data.oilPriceList[0].priceGun;
this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial; this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
this.detailList = res.return_data.oilPriceList;
this.oilType = res.return_data.oilPriceList[0].oilType; this.oilType = res.return_data.oilPriceList[0].oilType;
this.gasGunList = res.return_data.gasGunList; } else {
this.counId = res.return_data.goodsId; let oillist = res.return_data.oilPriceList;
for (var i = 0; i < res.return_data.gasGunList.length; i++) { for (var i = 0; i < oillist.length; i++) {
if (this.oilNo == res.return_data.gasGunList[i].oilNoName) { if (this.oilNo == oillist[i].oilNoName) {
this.gunnumber.push(res.return_data.gasGunList[i]) this.priceVip = oillist[i].priceVip;
// this.gunNo = res.return_data.gasGunList[i].gunNo; this.priceGun = oillist[i].priceGun;
this.gasOilNo = res.return_data.gasGunList[i].oilNo; this.priceOfficial = oillist[i].priceOfficial;
this.oilType = oillist[i].oilType;
} }
} }
} }
this.detailList = res.return_data.oilPriceList;
this.counId = res.return_data.goodsId;
this.gasGunList = res.return_data.gasGunList;
for (var i = 0; i < res.return_data.gasGunList.length; i++) {
if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
this.gunnumber.push(res.return_data.gasGunList[i])
// this.gunNo = res.return_data.gasGunList[i].gunNo;
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
}
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
@ -1096,9 +1146,11 @@
font-size: 12px; font-size: 12px;
} }
} }
.colorfe80{
.colorfe80 {
color: #089bf5; color: #089bf5;
} }
.footer { .footer {
position: fixed; position: fixed;
bottom: 0upx; bottom: 0upx;

19
pages/goods/refuel/refuel.vue
Unescape View File

@ -156,13 +156,21 @@
} }
}, },
onLoad() { onLoad() {
// let that = this;
// that.getDictionaryByCodeType();
// if (app.globalData.accountId) {
// that.isTyAgent = true;
// }
// that.getGasStoreList();
},
onShow() {
let that = this; let that = this;
that.getDictionaryByCodeType(); that.getDictionaryByCodeType();
if (app.globalData.accountId) { if (app.globalData.accountId) {
that.isTyAgent = true; that.isTyAgent = true;
} }
that.getGasStoreList(); that.getGasStoreList();
}, },
onReachBottom() { onReachBottom() {
this.getGasStoreList(); this.getGasStoreList();
@ -192,8 +200,8 @@
seeloaction(item) { seeloaction(item) {
// #ifdef H5 // #ifdef H5
// window.location.href = window.location.href =
// `http://apis.map.qq.com/uri/v1/marker?marker=coord:(${item.latitude},${item.longitude})&addr:${item.address}`; `http://apis.map.qq.com/uri/v1/marker?marker=coord:(${item.latitude},${item.longitude})&addr:${item.address}`;
// #endif // #endif
// #ifdef MP // #ifdef MP
uni.openLocation({ uni.openLocation({
@ -260,6 +268,7 @@
pageSize: this.pageSize, pageSize: this.pageSize,
isTyAgent: this.isTyAgent isTyAgent: this.isTyAgent
} }
getGasStoreList(params).then(res => { getGasStoreList(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.hideLoading(); uni.hideLoading();
@ -281,6 +290,10 @@
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId + '&oilNo=' + this url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId + '&oilNo=' + this
.onilName .onilName
}) })
uni.setStorage({
key: "store_key",
data: items
})
}, },
result(val) { result(val) {
console.log('filter_result:' + JSON.stringify(val)); console.log('filter_result:' + JSON.stringify(val));

69
pages/goods/store-list/store-details.vue
Unescape View File

@ -3,7 +3,8 @@
<view class="backcorf06 height100p"></view> <view class="backcorf06 height100p"></view>
<view class="backcorfff backgrd width92 couhead"> <view class="backcorfff backgrd width92 couhead">
<view class="width100 height40p"> <view class="width100 height40p">
<image class="headimg flleft" mode="widthFix" :src="imageUrl+merchanList.highMerchant.merchantLogo"></image> <image class="headimg flleft" mode="widthFix" :src="imageUrl+merchanList.highMerchant.merchantLogo">
</image>
<view class="store_rig font16 fontwig6 paddtop10">{{merchanList.storeName}}</view> <view class="store_rig font16 fontwig6 paddtop10">{{merchanList.storeName}}</view>
</view> </view>
@ -12,7 +13,7 @@
<view class="font14 fcor666 fontwig6 text2">{{merchanList.address}}</view> <view class="font14 fcor666 fontwig6 text2">{{merchanList.address}}</view>
<view class="font14 fcor666 mart5">营业时间: 00:00-23:59</view> <view class="font14 fcor666 mart5">营业时间: 00:00-23:59</view>
</view> </view>
<view class="width20 flright mart10 fotct" @click="seeloaction"> <view class="width20 flright mart10 fotct" @click="seeloaction">
<image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1"> <image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1">
</image> </image>
<view class="mart5 fcor999 font13">{{distance}}km</view> <view class="mart5 fcor999 font13">{{distance}}km</view>
@ -20,14 +21,16 @@
</view> </view>
</view> </view>
<view class="width100 height100p mart20"></view> <view class="width100 height100p mart20"></view>
<view class="width92 height80 aliitem backcorfff" style="border-radius: 8px;" v-for="mers in menCoupnList" :key="mers.id"> <view class="width92 height80 aliitem backcorfff" style="border-radius: 8px;" v-for="mers in menCoupnList"
:key="mers.id">
<view class="width70 flleft"> <view class="width70 flleft">
<view class="width90 fcor333 font16 mart5 fontwig6">{{mers.highCouponModel.couponName}}</view> <view class="width90 fcor333 font16 mart5 fontwig6">{{mers.highCouponModel.couponName}}</view>
<view class="width90 fcor666 font14 mart10"> <view class="width90 fcor666 font14 mart10">
有效期至:{{mers.useEndTime | formatDate('-')}}</view> 有效期至:{{mers.useEndTime | formatDate('-')}}</view>
</view> </view>
<view class="width30 flright" > <view class="width30 flright">
<view class="store_btn font15 fontwig6" @click="jumpCoupondes(mers.id,mers.highCouponModel.id)">查看详情</view> <view class="store_btn font15 fontwig6" @click="jumpCoupondes(mers.id,mers.highCouponModel.id)">查看详情
</view>
</view> </view>
</view> </view>
<view class="store-no width80 fontwig6 font20 fcor999 fotct mart20" v-if="menCoupnList == '' && user != ''"> <view class="store-no width80 fontwig6 font20 fcor999 fotct mart20" v-if="menCoupnList == '' && user != ''">
@ -88,8 +91,25 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.merchanId = option.id; let that = this;
this.distance = option.juli; that.merchanId = option.id;
that.distance = option.juli;
uni.getStorage({
key: 'store_id',
success(e) {
if (e.data) {
that.merchanId = e.data;
}
}
})
uni.getStorage({
key: 'store_juli',
success(e) {
if (e.data) {
that.distance = e.data;
}
}
})
}, },
onShow() { onShow() {
this.user = app.globalData.userInfo; this.user = app.globalData.userInfo;
@ -105,7 +125,7 @@
//获取登陆信息 //获取登陆信息
getuserinfo() { getuserinfo() {
uni.navigateTo({ uni.navigateTo({
url:'../../userLogin/userLogin' url: '../../userLogin/userLogin'
}) })
}, },
//查询门店详情 //查询门店详情
@ -133,12 +153,20 @@
}, },
//前往导航 //前往导航
seeloaction() { seeloaction() {
// #ifdef H5
window.open(
`//uri.amap.com/navigation?from=${app.globalData.longitude},${app.globalData.latitude},我的位置&to=${this.merchanList.longitude},${this.merchanList.latitude},${this.merchanList.address}&mode=car&policy=1&src=mypage&coordinate=gaode&callnative=1`
)
// #endif
// #ifdef MP
uni.openLocation({ uni.openLocation({
latitude: Number(this.merchanList.latitude), //目的地的定位 latitude: Number(this.merchanList.latitude), //目的地的定位
longitude: Number(this.merchanList.longitude), //目的地的定位 longitude: Number(this.merchanList.longitude), //目的地的定位
name: this.merchanList.storeName, name: this.merchanList.storeName,
address: this.merchanList.address address: this.merchanList.address
}) })
// #endif
}, },
//查询门店对应的卡券 //查询门店对应的卡券
getCouponListByStoreId() { getCouponListByStoreId() {
@ -190,26 +218,29 @@
.headimg { .headimg {
width: 160rpx; width: 160rpx;
max-height: 160rpx; max-height: 160rpx;
margin-top: -40px; margin-top: -40px;
margin-left: 20px; margin-left: 20px;
} }
.store_rig{
.store_rig {
margin-left: 210rpx; margin-left: 210rpx;
} }
.store_zp{
.store_zp {
background: #e6f2fe; background: #e6f2fe;
color: #0084f5; color: #0084f5;
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
} }
} }
.store_btn{
border: 2px solid #0084f5; .store_btn {
color: #0084f5; border: 2px solid #0084f5;
width: 150rpx; color: #0084f5;
padding: 6px; width: 150rpx;
text-align: center; padding: 6px;
border-radius: 5px; text-align: center;
border-radius: 5px;
} }

4
pages/order/confirmation.vue
Unescape View File

@ -960,8 +960,8 @@
display: flex; display: flex;
image { image {
width: 170rpx; width: 160rpx;
max-height: 170rpx; max-height: 160rpx;
} }
} }

8
pages/tabBar/category/category.vue
Unescape View File

@ -262,6 +262,14 @@
// uni.navigateTo({ // uni.navigateTo({
// url: '../../goods/goods?id=' + e // url: '../../goods/goods?id=' + e
// }); // });
uni.setStorage({
key: "store_id",
data: e.id
})
uni.setStorage({
key: "store_juli",
data: e.distance
})
}, },
//搜索跳转 //搜索跳转
toSearch() { toSearch() {

51
pages/tabBar/home/home.vue
Unescape View File

@ -223,7 +223,8 @@
success(e) { success(e) {
if (e.data) { if (e.data) {
if (app.globalData.accountId == '000001&key' || app.globalData.accountId == if (app.globalData.accountId == '000001&key' || app.globalData.accountId ==
'000000&gasKey' || app.globalData.accountId == '000009&key' || app.globalData.accountId == '0000010&key') { '000000&gasKey' || app.globalData.accountId == '000009&key' || app.globalData
.accountId == '0000010&key') {
app.globalData.staffCode = e.data; app.globalData.staffCode = e.data;
} else { } else {
app.globalData.mchId = e.data; app.globalData.mchId = e.data;
@ -269,6 +270,16 @@
uni.hideLoading(); uni.hideLoading();
app.globalData.latitude = res.lat; app.globalData.latitude = res.lat;
app.globalData.longitude = res.lng; app.globalData.longitude = res.lng;
uni.setStorage({
key: "latitude",
data: res.lat
})
uni.setStorage({
key: "longitude",
data: res.lng
})
that.findByLatAndLng(res.lng, res.lat); that.findByLatAndLng(res.lng, res.lat);
}, },
err => { err => {
@ -323,9 +334,16 @@
}, },
//获取首页功能 //获取首页功能
getCmsContentcmsContent() { getCmsContentcmsContent() {
let code;
// #ifdef H5
code = 'CMS_H5_IMG'
// #endif
// #ifdef MP
code = 'CMS_HOME_CONTENT'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, regionId: app.globalData.cityId,
categoryCode: 'CMS_HOME_CONTENT' categoryCode: code
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -343,9 +361,16 @@
}, },
//获取首页菜单 //获取首页菜单
getCmsContentcmshome() { getCmsContentcmshome() {
let code;
// #ifdef H5
code = 'CMS_H5_FAST'
// #endif
// #ifdef MP
code = 'CMS_HOME_NAV'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, regionId: app.globalData.cityId,
categoryCode: 'CMS_HOME_NAV' categoryCode: code
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -367,9 +392,16 @@
}); });
}, },
getCmsAactibity() { getCmsAactibity() {
let code;
// #ifdef H5
code = 'CMS_H5_ALERT'
// #endif
// #ifdef MP
code = 'CMS_WX_APPLETS_HOME_ACTIVITY'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, regionId: app.globalData.cityId,
categoryCode: 'CMS_WX_APPLETS_HOME_ACTIVITY' categoryCode: code
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') { if (res.return_code == '000000' && res.return_data != '') {
@ -466,6 +498,15 @@
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;
uni.setStorage({
key: "cityId",
data: res.return_data.regionId
})
uni.setStorage({
key: "companyId",
data: res.return_data.companyId
})
// app.globalData.cityId = '500103'; // app.globalData.cityId = '500103';
if (res.return_data.regionId) { if (res.return_data.regionId) {
that.getCouponListArea(); that.getCouponListArea();
@ -553,7 +594,7 @@
} }
} }
}) })
}else{ } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',

32
pages/user/bindingCard/bindingCard.vue
Unescape View File

@ -10,15 +10,15 @@
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image> <image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view> </view>
<!-- <view class="username paddtop10" v-if="UserCard && type == 2"> <view class="username paddtop10" v-if="UserCard">
<picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo" @change="bindUserCard"> <picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo" @change="bindUserCard">
<view class="date text1">{{cardNoNumber}}</view> <view class="date text1" style="padding: 0 25rpx;">{{cardNoNumber}}</view>
</picker> </picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image> <image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view> --> </view>
<view class="username"> <view class="username" v-if="!UserCard">
<input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入卡号" <input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入卡号"
v-model="cardNoNumber" placeholder-style="color: #333333;" /> v-model="cardNoNumber" placeholder-style="color: #333333;" />
</view> </view>
@ -32,11 +32,11 @@
<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view> <view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view> <view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view>
</view> </view>
<view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 70%;" v-if="type == 1"> <!-- <view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 70%;" v-if="type == 1">
<view class="fontlet font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">【温馨提示】 <view class="fontlet font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">【温馨提示】
</view> </view>
<view class="fontlet font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view> <view class="fontlet font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
</view> </view> -->
</view> </view>
</template> </template>
@ -70,7 +70,6 @@
}, },
onLoad(options) { onLoad(options) {
this.user = app.globalData.userInfo; this.user = app.globalData.userInfo;
// this.getHuiLianTongCardByPhone();
this.getDictionaryByCodeType(); this.getDictionaryByCodeType();
}, },
@ -84,6 +83,9 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.cardList = res.return_data; this.cardList = res.return_data;
this.type = res.return_data[0].codeValue; this.type = res.return_data[0].codeValue;
if (this.type == 1) {
this.getHuiLianTongCardByPhone();
}
this.typeName = res.return_data[0].codeName; this.typeName = res.return_data[0].codeName;
} }
}) })
@ -99,6 +101,10 @@
if (res.return_code == '000000' && res.return_data != '') { if (res.return_code == '000000' && res.return_data != '') {
this.UserCard = res.return_data; this.UserCard = res.return_data;
this.cardNoNumber = res.return_data[0].cardNo; this.cardNoNumber = res.return_data[0].cardNo;
let params = {
cardNo: this.cardNoNumber
}
this.getHuiLianTongCardByCardNo(params);
return; return;
} }
this.UserCard = ''; this.UserCard = '';
@ -107,6 +113,9 @@
//选择卡类型 //选择卡类型
changeUserCard(e) { changeUserCard(e) {
this.type = this.cardList[e.target.value].codeValue; this.type = this.cardList[e.target.value].codeValue;
if(this.type == 1){
this.getHuiLianTongCardByPhone();
}
this.typeName = this.cardList[e.target.value].codeName; this.typeName = this.cardList[e.target.value].codeName;
this.cardNoNumber = ''; this.cardNoNumber = '';
this.phoneNumber = ''; this.phoneNumber = '';
@ -115,6 +124,10 @@
//选择卡号 //选择卡号
bindUserCard(e) { bindUserCard(e) {
this.cardNoNumber = this.UserCard[e.target.value].cardNo; this.cardNoNumber = this.UserCard[e.target.value].cardNo;
let params = {
cardNo: this.cardNoNumber
}
this.getHuiLianTongCardByCardNo(params);
}, },
getCode() { getCode() {
uni.hideKeyboard() uni.hideKeyboard()
@ -133,7 +146,7 @@
}) })
let params = { let params = {
phone: this.phoneNumber, phone: this.phoneNumber,
HWMSG:1 HWMSG: 1
} }
sendSmsCodeByHw(params).then(res => { sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -284,8 +297,7 @@
duration: 2000, duration: 2000,
success() { success() {
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ uni.navigateBack({})
})
}, 1000) }, 1000)
} }
}); });

1
pages/user/positioning/positioning.vue
Unescape View File

@ -110,6 +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;
uni.navigateBack({}) uni.navigateBack({})
} else { } else {
uni.showToast({ uni.showToast({

6
qianzhu-KFC/buffet-order/buffet-order.vue
Unescape View File

@ -107,12 +107,14 @@
jumpmenulist(item) { jumpmenulist(item) {
if (this.typeid == 2) { if (this.typeid == 2) {
uni.navigateTo({ uni.navigateTo({
url: '../menu-list/menu-list?storeCode=' + item.code url: '../menu-list/menu-list?storeCode=' + item.code + '&sttime=' + item.startTime +
'&entime=' + item.endTime
}) })
} }
if (this.typeid == 1) { if (this.typeid == 1) {
uni.navigateTo({ uni.navigateTo({
url: '../kfc-menu-list/kfc-menu-list?storeCode=' + item.storeCode url: '../kfc-menu-list/kfc-menu-list?storeCode=' + item.storeCode + '&sttime=' + item
.startTime + '&entime=' + item.endTime
}) })
} }
}, },

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

@ -114,6 +114,28 @@
¥{{priceValue[1] / 100}} ¥{{priceValue[1] / 100}}
</view> </view>
</view> </view>
<view class="width94 line1 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="width40 flleft fcor666 font15 text1 alijusstart" style="padding-left: 2%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
style="align-items: center;">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
<view class="width94 line1 marb5"></view>
<view class="height50 width100"> <view class="height50 width100">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 支付方式
@ -214,17 +236,17 @@
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items)"> @click="radioChanges(items)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image> <image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="contrig"> <view class="alijus width60 margle10">
<view class="width80p flleft"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="width20 flright"> <view class="width20 fotrt">
<view class="yhprice"> <view>
<radio <radio
v-if="typeid == 1 && items.discountCondition && orderPrice >= items.discountCondition" v-if="typeid == 1 && items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" /> color="#c72a20" :checked="items.id == memDiscountId" />
@ -265,7 +287,8 @@
qianzhuorderToPayByWx, qianzhuorderToPayByWx,
czhltUnionCardPay, czhltUnionCardPay,
getUserOrderPreList, getUserOrderPreList,
thirdCancelOrder thirdCancelOrder,
getRebateIntegral
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
// #ifdef H5 // #ifdef H5
var jweixin = require('jweixin-module'); var jweixin = require('jweixin-module');
@ -281,7 +304,7 @@
return { return {
orderList: [], orderList: [],
sttypeid: 1, sttypeid: 1,
paytype: '', //支付方式 paytype: '2', //支付方式
typeid: app.globalData.distinguishid, //类型区分 typeid: app.globalData.distinguishid, //类型区分
priceValue: [0, 0], // 积分可以指定默认值 priceValue: [0, 0], // 积分可以指定默认值
availIntegal: 0, // 可用积分 availIntegal: 0, // 可用积分
@ -308,6 +331,8 @@
imageUrl: app.globalData.imgUrl, //图片地址 imageUrl: app.globalData.imgUrl, //图片地址
orderPrice: 0, //订单价格 orderPrice: 0, //订单价格
rechargeDes: '', // 支付详情 rechargeDes: '', // 支付详情
rebateIntegral: '', //返回积分
Integrastu: 1 //返积分状态
} }
}, },
onLoad() { onLoad() {
@ -358,6 +383,24 @@
} }
}); });
}, },
//支付返利积分
getRebateIntegral() {
let datas = {
"companyId": app.globalData.companyId,
"price": this.payPrice,
"productId": this.productType,
"type": 4,
}
getRebateIntegral(datas).then(res => {
if (res.return_code == '000000') {
this.rebateIntegral = res.return_data;
this.Integrastu = 1;
} else {
this.rebateIntegral = res.return_msg;
this.Integrastu = 2;
}
})
},
//查询积分 //查询积分
findUser() { findUser() {
findUser().then(res => { findUser().then(res => {
@ -367,6 +410,7 @@
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
this.getThirdPartyByDetail(); this.getThirdPartyByDetail();
this.getUserOrderPreList(); this.getUserOrderPreList();
this.getRebateIntegral();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -462,6 +506,7 @@
} else { } else {
this.isUse = true; this.isUse = true;
} }
this.getRebateIntegral();
}, },
//获取选择支付方式 //获取选择支付方式
changeRiado() { changeRiado() {
@ -683,6 +728,7 @@
2)) - this 2)) - this
.deductionPrice).toFixed(2)); .deductionPrice).toFixed(2));
} }
this.getRebateIntegral();
}, },
rechangeload() { rechangeload() {
this.isUse = false; this.isUse = false;
@ -1037,10 +1083,10 @@
border-radius: 8px; border-radius: 8px;
image { image {
float: left; // float: left;
width: 170rpx; width: 160rpx;
max-height: 170rpx; max-height: 160rpx;
margin-left: 10px; // margin-left: 10px;
} }
} }
</style> </style>

181
qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
Unescape View File

@ -1,19 +1,17 @@
<template> <template>
<view class="content"> <view class="content">
<!-- <view class="width100 height85 backcorfff heads"> <view class="width100" v-if="flist ==''">
<view class="paddtop10 width90 alijusstart"> <view class="width100 height40 font14 padleft15 alijusstart"
<view class="width80p font16 fcor333 fontwig6"> style="background-color: #e7f2ea;color: #4e8a5c;">
<image mode="widthFix" class="icon15 marRight10" src="../static/imgs/shop.png"></image>时代天街 <image class="icon20 paddtright5" mode="widthFix" src="../static/imgs/horn.png"></image>
</view> 营业时间{{starttime}}至{{endtime}}.
<view class="width20 fotrt">
<image mode="widthFix" class="icon20" src="../static/imgs/nocollection.png"></image>
<image mode="widthFix" class="icon20" src="../static/imgs/collection.png"></image>
</view>
</view> </view>
<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</view> <view v-if="flist == '' " class="width100 mart60 fotct font14 fcor666">
</view> --> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
</view>
<scroll-view scroll-y class="left-aside"> <scroll-view scroll-y class="left-aside" v-if="flist !=''">
<view v-for="(item,index) in flist" :key="index" class="f-item" :class="{active: item.name == currentId}" <view v-for="(item,index) in flist" :key="index" class="f-item" :class="{active: item.name == currentId}"
@click="tabtap(item)"> @click="tabtap(item)">
<view class="width100 fotct"> <view class="width100 fotct">
@ -26,8 +24,8 @@
</scroll-view> </scroll-view>
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" <scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop"
:scroll-top="tabScrollTop"> v-if="flist !='' ">
<view v-for="(item,index) in slist" :key="index" :id="'main-'+item.kfcId"> <view v-for="(item,index) in slist" :key="index" :id="'main-'+item.kfcId">
<view class="s-item width90"> <view class="s-item width90">
<text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text> <text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text>
@ -36,7 +34,7 @@
{{item.name}} {{item.name}}
</view> </view>
<view v-if="titem.cateName == item.name" class="t-list mart10 paddbotm10" v-for="(titem,index) in tlist" <view v-if="titem.cateName == item.name" class="t-list mart10 paddbotm10" v-for="(titem,index) in tlist"
:key="index" @click="showPopups(titem)"> :key="index">
<view class="paddtop10 width94 font16 fcor333 fotrt fontwig6 text2"> <view class="paddtop10 width94 font16 fcor333 fotrt fontwig6 text2">
{{titem.productName}} {{titem.productName}}
</view> </view>
@ -59,10 +57,22 @@
v-if="titem.originalPrice == titem.salePrice" style="text-decoration: line-through;"> v-if="titem.originalPrice == titem.salePrice" style="text-decoration: line-through;">
</view> </view>
<view class="mart10 icon-click fotrt"> <view class="mart10 icon-click fotrt alijusend" v-if="titem.productId">
<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image> --> <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"
<!-- <view class="num fcorfff" style="background: #d90209;">1</view> --> v-if="titem.count > 0" @click="deletenums(titem)"></image>
<image class="btn-plus" mode="widthFix" src="../static/imgs/plus.png"></image> <view class="num fcorfff" style="background: #d90209;" v-if="titem.count > 0">
{{titem.count}}
</view>
<image class="btn-plus" mode="widthFix" src="../static/imgs/plus.png"
@click="showPopups(titem)"></image>
</view>
<view class="mart10 icon-click fotrt alijusend" v-else>
<view class="num fcorfff font14" style="background: #d90209;" @click="showPopups(titem)">
选规格
</view>
<view class="unibadge" v-if="titem.count > 0">
{{titem.count}}</view>
</view> </view>
</view> </view>
@ -72,12 +82,13 @@
</view> </view>
</scroll-view> </scroll-view>
<shopcart :goods="shoppingcart" @add="addCart" @dec="decreaseCart" @input="inputCart" @delAll="delAll"> <shopcart v-if="flist !='' " :goods="shoppingcart" @add="addCart" @dec="decreaseCart"
@delAll="delAll">
</shopcart> </shopcart>
<!-- 弹窗选择规格 --> <!-- 弹窗选择规格 -->
<wybPopup ref="popup" type="bottom" width="500" height="700" scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" height="700" scrollY="true" radius="6" :showCloseIcon="true">
<image mode="widthFix" class="width40w mart40" :src="kfcimgs"></image> <image mode="widthFix" class="width40w mart40" :src="kfcimgs"></image>
<view class="width100 line1 mart10"></view> <view class="width100 line1 mart10"></view>
<view class="mart20 width90 font18 fontwig6 fcor333">{{kfcname}}</view> <view class="mart20 width90 font18 fontwig6 fcor333">{{kfcname}}</view>
@ -139,11 +150,17 @@
kfcname: '', // 名字 kfcname: '', // 名字
kfcimgs: '', //图片 kfcimgs: '', //图片
kfcprice: '', //价格 kfcprice: '', //价格
kfcoldprice: '' //原价 kfcoldprice: '', //原价
starttime: '', //开始时间
endtime: '', //结束时间
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'storeClose.png',
} }
}, },
onLoad(options) { onLoad(options) {
this.storeCode = options.storeCode; this.storeCode = options.storeCode;
this.starttime = options.sttime;
this.endtime = options.entime;
this.listByStoreCode(); this.listByStoreCode();
}, },
methods: { methods: {
@ -232,6 +249,21 @@
addCart: function(item) { addCart: function(item) {
if (item.num >= 0) { if (item.num >= 0) {
item.num++ item.num++
for (var i = 0; i < this.tlist.length; i++) {
if (this.tlist[i].productId && item.productId == this.tlist[i].productId) {
this.tlist[i].count = item.num;
}
if (!this.tlist[i].productId) {
for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
if (item.productId == this.tlist[i].specGroups[k].productId) {
this.tlist[i].count = item.num
}
}
}
}
this.shoppingcart.forEach((good) => { this.shoppingcart.forEach((good) => {
if (item.name == good.name) if (item.name == good.name)
good.num = item.num good.num = item.num
@ -248,27 +280,25 @@
decreaseCart(item) { decreaseCart(item) {
if (item.num) { if (item.num) {
item.num-- item.num--
this.shoppingcart.forEach((good) => { for (var i = 0; i < this.tlist.length; i++) {
if (item.name == good.name) if (this.tlist[i].productId && item.productId == this.tlist[i].productId) {
good.num = item.num this.tlist[i].count = this.tlist[i].count - 1;
}) }
}
},
inputCart: function(item) {
if (item.num >= 0) {
item.num++
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
good.num = item.num + -1
})
} else { if (!this.tlist[i].productId) {
for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
if (item.productId == this.tlist[i].specGroups[k].productId) {
this.tlist[i].count = this.tlist[i].count - 1;
}
}
}
}
this.shoppingcart.forEach((good) => { this.shoppingcart.forEach((good) => {
if (item.name == good.name) if (item.name == good.name)
Vue.set(good, 'count', 1) good.num = item.num
}) })
} }
}, },
// 清空购物车 // 清空购物车
delAll() { delAll() {
@ -277,8 +307,29 @@
good.num = 0 good.num = 0
} }
}) })
for (var i = 0; i < this.tlist.length; i++) {
this.tlist[i].count = 0;
}
this.shoppingcart = [];
app.globalData.qianzhulist = ''; app.globalData.qianzhulist = '';
}, },
//商品减
deletenums(item) {
if (item.count) {
item.count--
for (var i = 0; i < this.tlist.length; i++) {
if (this.tlist[i].productId && item.productId == this.tlist[i].productId) {
this.tlist[i].count = item.count;
}
}
this.shoppingcart.forEach((good) => {
if (item.productName == good.name)
good.num = item.count
})
}
},
//弹出弹窗 //弹出弹窗
showPopups(item) { showPopups(item) {
let that = this; let that = this;
@ -335,7 +386,13 @@
}, 1000); }, 1000);
} }
} }
}else{
for (var i = 0; i < that.tlist.length; i++) {
if (that.tlist[i].productId && item.productId == that.tlist[i].productId) {
that.tlist[i].count = that.tlist[i].count + 1
}
}
} else {
that.kdjchangelist = item.specGroups; that.kdjchangelist = item.specGroups;
that.kfcimgs = item.specGroups[0].productImageUrl; that.kfcimgs = item.specGroups[0].productImageUrl;
that.productId = item.specGroups[0].productId; that.productId = item.specGroups[0].productId;
@ -346,6 +403,7 @@
} }
}, },
//选择类型 //选择类型
changetype(item) { changetype(item) {
this.productId = item.productId; this.productId = item.productId;
@ -368,6 +426,16 @@
"oldprice": this.kfcoldprice "oldprice": this.kfcoldprice
} }
this.shoppingcart.push(datas); this.shoppingcart.push(datas);
for (var i = 0; i < this.tlist.length; i++) {
if (!this.tlist[i].productId) {
for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
if (this.productId == this.tlist[i].specGroups[k].productId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
}
}
this.$refs.popup.hide(); this.$refs.popup.hide();
return; return;
} }
@ -376,6 +444,16 @@
if (this.shoppingcart[i].name == this.kfcname) { if (this.shoppingcart[i].name == this.kfcname) {
indexs = 0; indexs = 0;
this.shoppingcart[i].num = this.shoppingcart[i].num + this.nums; this.shoppingcart[i].num = this.shoppingcart[i].num + this.nums;
for (var i = 0; i < this.tlist.length; i++) {
if (!this.tlist[i].productId) {
for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
if (this.productId == this.tlist[i].specGroups[k].productId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
}
}
} }
} }
if (indexs != 0) { if (indexs != 0) {
@ -389,6 +467,16 @@
"oldprice": this.kfcoldprice "oldprice": this.kfcoldprice
} }
this.shoppingcart.push(datas); this.shoppingcart.push(datas);
for (var i = 0; i < this.tlist.length; i++) {
if (!this.tlist[i].productId) {
for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
if (this.productId == this.tlist[i].specGroups[k].productId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
}
}
} }
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
@ -509,6 +597,7 @@
border-radius: 15px; border-radius: 15px;
background: #fff; background: #fff;
min-height: 150px; min-height: 150px;
&:after { &:after {
content: ''; content: '';
flex: 99; flex: 99;
@ -578,4 +667,18 @@
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
} }
.unibadge {
background: #000;
width: 20px;
height: 20px;
border-radius: 50%;
font-size: 9px;
color: #fff;
line-height: 20px;
text-align: center;
position: absolute;
margin-top: -25px;
margin-right: -5px;
}
</style> </style>

122
qianzhu-KFC/menu-list/menu-list.vue
Unescape View File

@ -1,19 +1,17 @@
<template> <template>
<view class="content"> <view class="content">
<!-- <view class="width100 height85 backcorfff heads"> <view class="width100" v-if="flist ==''">
<view class="paddtop10 width90 alijusstart"> <view class="width100 height40 font14 padleft15 alijusstart"
<view class="width80p font16 fcor333 fontwig6"> style="background-color: #e7f2ea;color: #4e8a5c;">
<image mode="widthFix" class="icon15 marRight10" src="../static/imgs/shop.png"></image>时代天街 <image class="icon20 paddtright5" mode="widthFix" src="../static/imgs/horn.png"></image>
</view> 营业时间{{starttime}}至{{endtime}}.
<view class="width20 fotrt"> </view>
<image mode="widthFix" class="icon20" src="../static/imgs/nocollection.png"></image> <view v-if="flist == '' " class="width100 mart60 fotct font14 fcor666">
<image mode="widthFix" class="icon20" src="../static/imgs/collection.png"></image> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
</view> </view>
<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</view> </view>
</view> -->
<scroll-view scroll-y class="left-aside"> <scroll-view scroll-y class="left-aside" v-if="flist != '' ">
<view v-for="item in flist" :key="item.id" class="f-item" :class="{active: item.id === currentId}" <view v-for="item in flist" :key="item.id" class="f-item" :class="{active: item.id === currentId}"
@click="tabtap(item)"> @click="tabtap(item)">
<view class="width100 fotct"> <view class="width100 fotct">
@ -26,8 +24,8 @@
</scroll-view> </scroll-view>
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" <scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop"
:scroll-top="tabScrollTop"> v-if="flist != '' ">
<view v-for="item in slist" :key="item.id" :id="'main-'+item.id"> <view v-for="item in slist" :key="item.id" :id="'main-'+item.id">
<view class="s-item width90"> <view class="s-item width90">
<text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text> <text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text>
@ -36,7 +34,7 @@
{{item.name}} {{item.name}}
</view> </view>
<view v-if="titem.ext1 == item.id" class="t-list mart10 paddbotm10" v-for="titem in tlist" <view v-if="titem.ext1 == item.id" class="t-list mart10 paddbotm10" v-for="titem in tlist"
:key="titem.id" @click="showPopup(titem)"> :key="titem.id">
<view class="paddtop10 width94 font16 fcor333 fotrt fontwig6 text2"> <view class="paddtop10 width94 font16 fcor333 fotrt fontwig6 text2">
{{titem.name}} {{titem.name}}
</view> </view>
@ -44,7 +42,7 @@
<image :src="titem.defaultImage" mode="widthFix" class="qzgoodsimg"></image> <image :src="titem.defaultImage" mode="widthFix" class="qzgoodsimg"></image>
<view class="width50 fotrt"> <view class="width50 fotrt">
<view class="width100 font12 color2f6f43">¥<text <view class="width100 font12 color2f6f43">¥<text
class="font18 fontwig6 margle">{{titem.salesTallPrice}}</text> class="font18 fontwig6 margle">{{titem.showPrice}}</text>
</view> </view>
<view class="width100 font14 mart5 color2f6f43" <view class="width100 font14 mart5 color2f6f43"
v-if="titem.marketTallPrice != titem.salesTallPrice"> v-if="titem.marketTallPrice != titem.salesTallPrice">
@ -62,10 +60,16 @@
style="text-decoration: line-through;"> style="text-decoration: line-through;">
</view> </view>
<view class="mart10 icon-click fotrt"> <view class="mart10 icon-click fotrt alijusend">
<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image> --> <!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/wreduce.png"
<!-- <view class="num fcorfff" style="background: #d90209;">1</view> --> @click="deletenums(titem)" v-if="titem.count > 0"></image> -->
<image class="btn-plus" mode="widthFix" src="../static/imgs/blueplus.png"></image> <view class="num fcorfff font14" style="background: #4e8a5c;" @click="showPopup(titem)">
选规格
</view>
<view class="unibadge" v-if="titem.count > 0">
{{titem.count}}</view>
<!-- <image class="btn-plus" mode="widthFix" src="../static/imgs/blueplus.png"
@click="showPopup(titem)"></image> -->
</view> </view>
</view> </view>
</view> </view>
@ -74,7 +78,7 @@
</view> </view>
</scroll-view> </scroll-view>
<shopcart :goods="shoppingcart" @add="addCart" @dec="decreaseCart" @input="inputCart" @delAll="delAll"> <shopcart v-if="flist !=''" :goods="shoppingcart" @add="addCart" @dec="decreaseCart" @delAll="delAll">
</shopcart> </shopcart>
@ -199,11 +203,17 @@
shoppingcart: [], //购物车 shoppingcart: [], //购物车
productId: '', //商品id productId: '', //商品id
salesTallPrice: '', //新价格 salesTallPrice: '', //新价格
marketTallPrice: '' // 老价格 marketTallPrice: '', // 老价格
starttime: '', //开始时间
endtime: '', //结束时间
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'storeClose.png',
} }
}, },
onLoad(options) { onLoad(options) {
this.storeCode = options.storeCode; this.storeCode = options.storeCode;
this.starttime = options.sttime;
this.endtime = options.entime;
this.getStarbucksProducts(); this.getStarbucksProducts();
}, },
methods: { methods: {
@ -290,6 +300,12 @@
//购物车 //购物车
addCart: function(item) { addCart: function(item) {
if (item.num >= 0) { if (item.num >= 0) {
for (var i = 0; i < this.tlist.length; i++) {
if (item.productId == this.tlist[i].goodsId) {
this.tlist[i].count = this.tlist[i].count + 1;
}
}
this.shoppingcart.forEach((good) => { this.shoppingcart.forEach((good) => {
if (JSON.stringify(item) == JSON.stringify(good)) { if (JSON.stringify(item) == JSON.stringify(good)) {
item.num++ item.num++
@ -303,11 +319,16 @@
Vue.set(good, 'count', 1) Vue.set(good, 'count', 1)
}) })
} }
}, },
decreaseCart(item) { decreaseCart(item) {
if (item.num) { if (item.num) {
item.num-- item.num--
for (var i = 0; i < this.tlist.length; i++) {
if (item.productId == this.tlist[i].goodsId) {
this.tlist[i].count = this.tlist[i].count - 1;
}
}
this.shoppingcart.forEach((good) => { this.shoppingcart.forEach((good) => {
if (this.checinfo(good, item) === true) { if (this.checinfo(good, item) === true) {
good.num = item.num good.num = item.num
@ -315,24 +336,17 @@
}) })
} }
}, },
inputCart: function(item) {
if (item.num >= 0) {
item.num++
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
good.num = item.num + -1
})
} else {
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
Vue.set(good, 'count', 1)
})
}
},
// 清空购物车 // 清空购物车
delAll() { delAll() {
this.shoppingcart.forEach((good) => {
if (good.num) {
good.num = 0
}
})
for (var i = 0; i < this.tlist.length; i++) {
this.tlist[i].count = 0;
}
this.shoppingcart = []; this.shoppingcart = [];
}, },
//弹出弹窗 //弹出弹窗
@ -427,15 +441,31 @@
this.shoppingcart.forEach((good) => { this.shoppingcart.forEach((good) => {
if (this.checinfo(good, datas) === true) { if (this.checinfo(good, datas) === true) {
good.num = good.num + this.nums; good.num = good.num + this.nums;
for (var i = 0; i < this.tlist.length; i++) {
if (this.cbkchangelist.goodsId == this.tlist[i].goodsId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
istue = 1; istue = 1;
} }
}) })
if (istue == 0) { if (istue == 0) {
this.shoppingcart.push(datas); this.shoppingcart.push(datas);
for (var i = 0; i < this.tlist.length; i++) {
if (this.cbkchangelist.goodsId == this.tlist[i].goodsId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
} }
} else { } else {
for (var i = 0; i < this.tlist.length; i++) {
if (this.cbkchangelist.goodsId == this.tlist[i].goodsId) {
this.tlist[i].count = this.tlist[i].count + this.nums
}
}
this.shoppingcart.push(datas); this.shoppingcart.push(datas);
} }
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
//排除key对比 //排除key对比
@ -619,4 +649,18 @@
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
} }
.unibadge {
background: #000;
width: 20px;
height: 20px;
border-radius: 50%;
font-size: 9px;
color: #fff;
line-height: 20px;
text-align: center;
position: absolute;
margin-top: -25px;
margin-right: -5px;
}
</style> </style>

53
qianzhu-KFC/order-details/order-details.vue
Unescape View File

@ -29,28 +29,37 @@
<view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10"> <view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10">
<view class="fotct font14 width100 fcor999">您的取餐码为</view> <view class="fotct font14 width100 fcor999">您的取餐码为</view>
<view v-if="typeid == 4 && orderList.list"> <view v-if="typeid == 4 && orderList.list && phonestu == 2">
<view class="width90 alijusstart mart20" v-for="(item,index) in orderList.list" :key='index'> <view class="width90 alijusstart mart10" v-for="(item,index) in orderList.list" :key='index'>
<view class="font14 width50 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text> <view class="font14 width50 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text>
</view> </view>
<view class="font14 width50 fcor666">手机尾号: <text class="colorc3 font18">{{item.phone}}</text> <view class="font14 width50 fcor666">手机尾号:
<text class="colorc3 font18">{{item.phone}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="fotct" v-if="typeid == 4 && orderList.list && phonestu == 1">
<view class="width90 alicntend mart10 " v-for="(item,index) in orderList.list" :key='index'>
<view class="font14 width100 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text>
</view>
</view>
</view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view>
<view class="phoneck" v-if="typeid == 4 && orderList.list && phonestu == 1" @click="updatestu">查看手机号</view>
<view v-if="typeid == 9 && orderList.object.orderItems[0].code"> <view v-if="typeid == 9 && orderList.object.orderItems[0].code">
<view class="fotct font18 width100 mart10 color2f6f43" <view class="fotct font18 width100 mart10 color2f6f43"
v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view> v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view>
</view> </view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !orderList.list"> <view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !orderList.list">
{{orderList.statusDesc}} {{orderList.statusDesc}}
</view> </view>
<view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view>
<view class="fotct font20 width100 mart10 color2f6f43" <view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view> v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view>
<view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view> <view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view>
<view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view> <view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view>
<view class="fotct font13 width100 mart5 colorc3">注:平台取餐手机号皆为虚拟号码</view>
<view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view>
</view> </view>
</view> </view>
@ -76,9 +85,11 @@
<view class="width40 font13 fcor666">{{item.goodsName}}</view> <view class="width40 font13 fcor666">{{item.goodsName}}</view>
<view class="width10 font12 fcor999">x{{item.saleCount}}</view> <view class="width10 font12 fcor999">x{{item.saleCount}}</view>
<view class="width20"> <view class="width20">
<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.goodsActualPrice}}</text> <view class="width100 fcor333 font12">¥<text
class="fontwig6 font16">{{item.goodsActualPrice}}</text>
</view> </view>
<view class="width100 fcor999 font12" v-if="item.goodsActualPrice != item.goodsPrice" style="text-decoration: line-through;"> <view class="width100 fcor999 font12" v-if="item.goodsActualPrice != item.goodsPrice"
style="text-decoration: line-through;">
¥{{item.goodsPrice}}</view> ¥{{item.goodsPrice}}</view>
</view> </view>
</view> </view>
@ -190,6 +201,7 @@
6: '退款中', 6: '退款中',
7: '退款失败' 7: '退款失败'
}, },
phonestu: 1 // 手机号查看状态
} }
}, },
onLoad(options) { onLoad(options) {
@ -201,8 +213,13 @@
onUnload() { onUnload() {
clearInterval(this.timer); clearInterval(this.timer);
clearInterval(this.timerdjs); clearInterval(this.timerdjs);
console.log('')
}, },
methods: { methods: {
//修改状态
updatestu() {
this.phonestu = 2
},
getAllCount() { getAllCount() {
this.orderList.highChildOrderList.forEach((food) => { this.orderList.highChildOrderList.forEach((food) => {
this.coutnums += food.saleCount this.coutnums += food.saleCount
@ -210,14 +227,14 @@
}, },
//查询订单详情 //查询订单详情
getThirdOrderByOrderId() { getThirdOrderByOrderId() {
uni.showLoading({ // uni.showLoading({
title: '加载中...' // title: '加载中...'
}) // })
let datas = { let datas = {
orderId: this.orderId orderId: this.orderId
} }
getThirdOrderByOrderId(datas).then(res => { getThirdOrderByOrderId(datas).then(res => {
uni.hideLoading(); // uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.typeid = res.return_data.highChildOrderList[0].goodsType; this.typeid = res.return_data.highChildOrderList[0].goodsType;
this.orderList = res.return_data; this.orderList = res.return_data;
@ -374,6 +391,18 @@
color: #c72a20; color: #c72a20;
} }
.phoneck {
height: 35px;
width: 120px;
line-height: 35px;
font-size: 14px;
border-radius: 39px;
border: 1px solid #CD2314;
box-sizing: border-box;
color: #CD2314;
margin: 10px auto;
}
.headsbg { .headsbg {
border-radius: 0 0 30px 30px; border-radius: 0 0 30px 30px;
} }

BIN
qianzhu-KFC/static/imgs/horn.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
static/img/rebate.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
static/img/sigh.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

73
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -81,6 +81,27 @@
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view> <view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
style="align-items: center;">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
<view class="width94 line1 marb5"></view>
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式: 支付方式:
@ -135,16 +156,16 @@
</view> </view>
<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index" <view class="width92 height110 tccs mart10 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items)"> @click="radioChanges(items)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image> <image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="contrig"> <view class="alijus width60 margle10">
<view class="width80p flleft"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期至：{{items.useEndTime | timeFormat('yyyy-mm-dd')}}</view> <view class="font13 fcor999 mart5">有效期至：{{items.useEndTime | timeFormat('yyyy-mm-dd')}}</view>
</view> </view>
<view class="width20 flright"> <view class="width20 fotrt">
<view class="yhprice"> <view>
<radio color="#0083f5" <radio color="#0083f5"
v-if="items.discountCondition && orderPrice > items.discountCondition" v-if="items.discountCondition && orderPrice > items.discountCondition"
:checked="items.id == memDiscountId" /> :checked="items.id == memDiscountId" />
@ -172,7 +193,8 @@
getHuiLianTongCardBalance, getHuiLianTongCardBalance,
loginByPhone, loginByPhone,
getUserOrderPreList, getUserOrderPreList,
findById findById,
getRebateIntegral
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
import wybPopup from '../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
import cjSlider from '../../components/cj-slider/cj-slider.vue'; import cjSlider from '../../components/cj-slider/cj-slider.vue';
@ -197,7 +219,7 @@
radioStatus: true, radioStatus: true,
memDiscountId: '', memDiscountId: '',
user: '', user: '',
paytype: '', paytype: '2',
PaymentPassword: '', PaymentPassword: '',
orderId: '', orderId: '',
jumpType: '', jumpType: '',
@ -218,7 +240,9 @@
changePrice: '', //滑动值 changePrice: '', //滑动值
isDiscount: true, isDiscount: true,
availIntegal: '', // 可用积分 availIntegal: '', // 可用积分
isUse: true // 是否禁用状态 isUse: true, // 是否禁用状态
rebateIntegral: '', //返回积分
Integrastu: 1 //返积分状态
}; };
}, },
@ -283,6 +307,7 @@
this.user = res.return_data; this.user = res.return_data;
this.findById(); this.findById();
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
this.getRebateIntegral();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -290,6 +315,24 @@
} }
}); });
}, },
//支付返利积分
getRebateIntegral() {
let datas = {
"companyId": app.globalData.companyId,
"price": this.payPrice,
"productId": this.rechargeModel,
"type": 3,
}
getRebateIntegral(datas).then(res => {
if (res.return_code == '000000') {
this.rebateIntegral = res.return_data;
this.Integrastu = 1;
} else {
this.rebateIntegral = res.return_msg;
this.Integrastu = 2;
}
})
},
//查询优惠券 //查询优惠券
getUserOrderPreList() { getUserOrderPreList() {
let params = { let params = {
@ -399,6 +442,7 @@
this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
.deductionPrice).toFixed(2); .deductionPrice).toFixed(2);
} }
this.getRebateIntegral();
}, },
rechangeload() { rechangeload() {
this.isUse = false; this.isUse = false;
@ -794,6 +838,7 @@
} else { } else {
this.isUse = true; this.isUse = true;
} }
this.getRebateIntegral();
}, },
} }
@ -916,10 +961,10 @@
border-radius: 8px; border-radius: 8px;
image { image {
float: left; // float: left;
width: 170rpx; width: 160rpx;
max-height: 170rpx; max-height: 160rpx;
margin-left: 10px; // margin-left: 10px;
} }
} }

4
uni.scss
Unescape View File

@ -229,6 +229,10 @@ $uni-font-size-paragraph:30upx;
color: #c32b21; color: #c32b21;
} }
.colore95{
color: #e95845;
}
.fcorred{ .fcorred{
color: red; color: red;
} }

Write Preview
Loading…
Cancel
Save