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

2.肯德基和星巴克新增用户选择数量
3.星巴克肯德基新增打烊时间
4.肯德基订单详情新增手机点击查看
5.肯德基和星巴克修改文字位置
6.绑定工会卡优化
yj-dev
杨杰 2 years ago
parent ddf5a75413
commit ed89ec9e35
  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. 86
      pages/goods/refuel-details/refuel-details.vue
  7. 19
      pages/goods/refuel/refuel.vue
  8. 41
      pages/goods/store-list/store-details.vue
  9. 4
      pages/order/confirmation.vue
  10. 8
      pages/tabBar/category/category.vue
  11. 49
      pages/tabBar/home/home.vue
  12. 30
      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. 171
      qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
  17. 114
      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

@ -28,6 +28,8 @@
balancePrice: '',
balanceCardNo: '',
identificationCode: '',
//id
companyId:'',
// h5
h5code: '',
//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() {}
}

@ -594,3 +594,8 @@ export const czhltUnionCardPay = params => {
export const getUserOrderListhuafei = params => {
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);
}

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

@ -73,6 +73,26 @@
¥{{priceValue[1] / 100}}
</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="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">
<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)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
<view class="contrig">
<view class="width80p flleft">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
<image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="alijus width60 margle10">
<view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
<view class="width20 flright">
<view class="yhprice">
<view class="width20 fotrt">
<view>
<radio v-if="items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" />
<radio v-if="items.discountCondition && orderPrice < items.discountCondition"
@ -154,7 +174,8 @@
qianzhuorderToPayByWx,
czhltUnionCardPay,
getUserOrderPreList,
thirdCancelOrder
thirdCancelOrder,
getRebateIntegral
} from '../../Utils/Api.js';
// #ifdef H5
var jweixin = require('jweixin-module');
@ -169,7 +190,7 @@
data() {
return {
orderList: [],
paytype: '', //
paytype: '2', //
priceValue: [0, 0], //
availIntegal: 0, //
totalprice: 0, //
@ -195,6 +216,8 @@
imageUrl: app.globalData.imgUrl, //
orderPrice: 0, //
rechargeDes: '', //
rebateIntegral: '' ,//
Integrastu:1 //
}
},
onLoad(options) {
@ -249,6 +272,7 @@
this.getHuiLianTongCardBalance();
this.getThirdPartyByDetail();
this.getUserOrderPreList();
this.getRebateIntegral();
uni.setStorage({
key: "user",
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() {
if (!this.user.hltCardNo) {
@ -299,6 +341,7 @@
} else {
this.isUse = true;
}
this.getRebateIntegral();
},
//
changeRiado() {
@ -463,6 +506,7 @@
2)) - this
.deductionPrice).toFixed(2));
}
this.getRebateIntegral();
},
rechangeload() {
this.isUse = false;
@ -802,10 +846,10 @@
border-radius: 8px;
image {
float: left;
width: 170rpx;
max-height: 170rpx;
margin-left: 10px;
// float: left;
width: 160rpx;
max-height: 160rpx;
// margin-left: 10px;
}
}
</style>

@ -120,6 +120,25 @@
¥{{priceValue[1] / 100}}
</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>
<!-- // -->
@ -176,18 +195,18 @@
<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
<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)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.highDiscount.discountImg"></image>
<view class="contrig">
<view class="width80p flleft">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.highDiscount.discountName}}</view>
<image mode="widthFix" :src="imageUrl+items.highDiscount.discountImg"></image>
<view class="alijus width60 margle10">
<view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view>
<view class="font13 fcor999 mart5">
有效期:{{items.highDiscount.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
<view class="width20 flright">
<view class="yhprice">
<view class="width20 fotrt">
<view>
<radio
v-if="items.highDiscount.discountCondition && orderPrice >= items.highDiscount.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" />
@ -219,7 +238,8 @@
canUseDiscount,
addOrder,
cancelOrder,
oilPriceDiscountCompute
oilPriceDiscountCompute,
getRebateIntegral
} from '../../../Utils/Api.js';
import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@ -256,7 +276,9 @@
memDiscountId: '', //id
priceValue: [0, 0], //
availIntegal: 0, //
gasOrderList: '' //
gasOrderList: '', //
rebateIntegral: '', //
Integrastu: 1 //
}
},
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() {
let params = {
@ -323,6 +363,8 @@
} else {
this.availIntegal = payprice;
}
this.getRebateIntegral();
}
})
},
@ -401,6 +443,7 @@
2)) - this
.deductionPrice).toFixed(2));
}
this.getRebateIntegral();
},
rechangeload() {
this.isUse = false;
@ -434,6 +477,7 @@
} else {
this.isUse = true;
}
this.getRebateIntegral();
},
//
@ -1034,10 +1078,10 @@
border-radius: 8px;
image {
float: left;
width: 170rpx;
max-height: 170rpx;
margin-left: 10px;
// float: left;
width: 160rpx;
max-height: 160rpx;
// margin-left: 10px;
}
}
</style>

@ -76,8 +76,11 @@
<view class="list width90">
<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
:class="{'on':amount.codeValue == inputMoney}">
<view class="heTitle fcor333 paddtop10" :class="{'colorfe80':amount.codeValue == inputMoney}">{{amount.codeValue}}</view>
<view class="width100 font12 fcor333 mart5" :class="{'colorfe80':amount.codeValue == inputMoney}">最高优惠¥{{amount.codeName}}</view>
<view class="heTitle fcor333 paddtop10" :class="{'colorfe80':amount.codeValue == inputMoney}">
{{amount.codeValue}}
</view>
<view class="width100 font12 fcor333 mart5" :class="{'colorfe80':amount.codeValue == inputMoney}">
最高优惠¥{{amount.codeName}}</view>
</view>
</view>
@ -249,31 +252,44 @@
}
},
onLoad(options) {
this.store_key = options.id;
this.counId = options.desId;
this.oilNo = options.oilNo;
let that = this;
// #ifdef MP
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) {
this.isTyAgent = true;
that.isTyAgent = true;
}
if (app.globalData.gasKey && app.globalData.accountType == '000000&gasKey') {
this.store_key = app.globalData.gasKey;
that.store_key = app.globalData.gasKey;
} else {
app.globalData.staffCode = '';
}
// #ifdef H5
if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
this.recentGasStation();
that.recentGasStation();
} else {
this.getGasDetailByStoreKey();
that.getGasDetailByStoreKey();
}
// #endif
// #ifdef MP
this.getGasDetailByStoreKey();
that.getGasDetailByStoreKey();
// #endif
this.getDictionaryByCodeTypeOl();
this.getDictionaryByCodeTypeMoney();
this.getDictionaryByCodeType();
that.getDictionaryByCodeTypeOl();
that.getDictionaryByCodeTypeMoney();
that.getDictionaryByCodeType();
},
onShow() {
this.user = app.globalData.userInfo;
@ -424,6 +440,11 @@
//
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
uni.openLocation({
latitude: Number(this.storeList.gasAddressLatitude), //
@ -456,15 +477,45 @@
uni.hideLoading();
if (res.return_code == '000000') {
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.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;
} else {
let oillist = res.return_data.oilPriceList;
for (var i = 0; i < oillist.length; i++) {
if (this.oilNo == oillist[i].oilNoName) {
this.priceVip = oillist[i].priceVip;
this.priceGun = oillist[i].priceGun;
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])
@ -472,7 +523,6 @@
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
}
}
}
} else {
uni.showToast({
title: res.return_msg,
@ -1096,9 +1146,11 @@
font-size: 12px;
}
}
.colorfe80 {
color: #089bf5;
}
.footer {
position: fixed;
bottom: 0upx;

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

@ -3,7 +3,8 @@
<view class="backcorf06 height100p"></view>
<view class="backcorfff backgrd width92 couhead">
<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>
@ -20,14 +21,16 @@
</view>
</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="width90 fcor333 font16 mart5 fontwig6">{{mers.highCouponModel.couponName}}</view>
<view class="width90 fcor666 font14 mart10">
有效期至:{{mers.useEndTime | formatDate('-')}}</view>
</view>
<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 class="store-no width80 fontwig6 font20 fcor999 fotct mart20" v-if="menCoupnList == '' && user != ''">
@ -88,8 +91,25 @@
}
},
onLoad(option) {
this.merchanId = option.id;
this.distance = option.juli;
let that = this;
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() {
this.user = app.globalData.userInfo;
@ -133,12 +153,20 @@
},
//
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({
latitude: Number(this.merchanList.latitude), //
longitude: Number(this.merchanList.longitude), //
name: this.merchanList.storeName,
address: this.merchanList.address
})
// #endif
},
//
getCouponListByStoreId() {
@ -193,9 +221,11 @@
margin-top: -40px;
margin-left: 20px;
}
.store_rig {
margin-left: 210rpx;
}
.store_zp {
background: #e6f2fe;
color: #0084f5;
@ -203,6 +233,7 @@
padding-right: 4px;
}
}
.store_btn {
border: 2px solid #0084f5;
color: #0084f5;

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

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

@ -223,7 +223,8 @@
success(e) {
if (e.data) {
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;
} else {
app.globalData.mchId = e.data;
@ -269,6 +270,16 @@
uni.hideLoading();
app.globalData.latitude = res.lat;
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);
},
err => {
@ -323,9 +334,16 @@
},
//
getCmsContentcmsContent() {
let code;
// #ifdef H5
code = 'CMS_H5_IMG'
// #endif
// #ifdef MP
code = 'CMS_HOME_CONTENT'
// #endif
let params = {
regionId: app.globalData.cityId,
categoryCode: 'CMS_HOME_CONTENT'
categoryCode: code
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
@ -343,9 +361,16 @@
},
//
getCmsContentcmshome() {
let code;
// #ifdef H5
code = 'CMS_H5_FAST'
// #endif
// #ifdef MP
code = 'CMS_HOME_NAV'
// #endif
let params = {
regionId: app.globalData.cityId,
categoryCode: 'CMS_HOME_NAV'
categoryCode: code
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
@ -367,9 +392,16 @@
});
},
getCmsAactibity() {
let code;
// #ifdef H5
code = 'CMS_H5_ALERT'
// #endif
// #ifdef MP
code = 'CMS_WX_APPLETS_HOME_ACTIVITY'
// #endif
let params = {
regionId: app.globalData.cityId,
categoryCode: 'CMS_WX_APPLETS_HOME_ACTIVITY'
categoryCode: code
}
getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') {
@ -466,6 +498,15 @@
app.globalData.cityName = res.return_data.provinceName;
app.globalData.qianzhuCityName = res.return_data.cityName;
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';
if (res.return_data.regionId) {
that.getCouponListArea();

@ -10,15 +10,15 @@
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</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">
<view class="date text1">{{cardNoNumber}}</view>
<view class="date text1" style="padding: 0 25rpx;">{{cardNoNumber}}</view>
</picker>
<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="请输入卡号"
v-model="cardNoNumber" placeholder-style="color: #333333;" />
</view>
@ -32,11 +32,11 @@
<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</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>
<view class="fontlet font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
</view>
</view> -->
</view>
</template>
@ -70,7 +70,6 @@
},
onLoad(options) {
this.user = app.globalData.userInfo;
// this.getHuiLianTongCardByPhone();
this.getDictionaryByCodeType();
},
@ -84,6 +83,9 @@
if (res.return_code == '000000') {
this.cardList = res.return_data;
this.type = res.return_data[0].codeValue;
if (this.type == 1) {
this.getHuiLianTongCardByPhone();
}
this.typeName = res.return_data[0].codeName;
}
})
@ -99,6 +101,10 @@
if (res.return_code == '000000' && res.return_data != '') {
this.UserCard = res.return_data;
this.cardNoNumber = res.return_data[0].cardNo;
let params = {
cardNo: this.cardNoNumber
}
this.getHuiLianTongCardByCardNo(params);
return;
}
this.UserCard = '';
@ -107,6 +113,9 @@
//
changeUserCard(e) {
this.type = this.cardList[e.target.value].codeValue;
if(this.type == 1){
this.getHuiLianTongCardByPhone();
}
this.typeName = this.cardList[e.target.value].codeName;
this.cardNoNumber = '';
this.phoneNumber = '';
@ -115,6 +124,10 @@
//
bindUserCard(e) {
this.cardNoNumber = this.UserCard[e.target.value].cardNo;
let params = {
cardNo: this.cardNoNumber
}
this.getHuiLianTongCardByCardNo(params);
},
getCode() {
uni.hideKeyboard()
@ -284,8 +297,7 @@
duration: 2000,
success() {
setTimeout(() => {
uni.navigateBack({
})
uni.navigateBack({})
}, 1000)
}
});

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

@ -107,12 +107,14 @@
jumpmenulist(item) {
if (this.typeid == 2) {
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) {
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
})
}
},

@ -114,6 +114,28 @@
¥{{priceValue[1] / 100}}
</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="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">
<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)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
<view class="contrig">
<view class="width80p flleft">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
<image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="alijus width60 margle10">
<view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
</view>
<view class="width20 flright">
<view class="yhprice">
<view class="width20 fotrt">
<view>
<radio
v-if="typeid == 1 && items.discountCondition && orderPrice >= items.discountCondition"
color="#c72a20" :checked="items.id == memDiscountId" />
@ -265,7 +287,8 @@
qianzhuorderToPayByWx,
czhltUnionCardPay,
getUserOrderPreList,
thirdCancelOrder
thirdCancelOrder,
getRebateIntegral
} from '../../Utils/Api.js';
// #ifdef H5
var jweixin = require('jweixin-module');
@ -281,7 +304,7 @@
return {
orderList: [],
sttypeid: 1,
paytype: '', //
paytype: '2', //
typeid: app.globalData.distinguishid, //
priceValue: [0, 0], //
availIntegal: 0, //
@ -308,6 +331,8 @@
imageUrl: app.globalData.imgUrl, //
orderPrice: 0, //
rechargeDes: '', //
rebateIntegral: '', //
Integrastu: 1 //
}
},
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().then(res => {
@ -367,6 +410,7 @@
this.getHuiLianTongCardBalance();
this.getThirdPartyByDetail();
this.getUserOrderPreList();
this.getRebateIntegral();
uni.setStorage({
key: "user",
data: res.return_data
@ -462,6 +506,7 @@
} else {
this.isUse = true;
}
this.getRebateIntegral();
},
//
changeRiado() {
@ -683,6 +728,7 @@
2)) - this
.deductionPrice).toFixed(2));
}
this.getRebateIntegral();
},
rechangeload() {
this.isUse = false;
@ -1037,10 +1083,10 @@
border-radius: 8px;
image {
float: left;
width: 170rpx;
max-height: 170rpx;
margin-left: 10px;
// float: left;
width: 160rpx;
max-height: 160rpx;
// margin-left: 10px;
}
}
</style>

@ -1,19 +1,17 @@
<template>
<view class="content">
<!-- <view class="width100 height85 backcorfff heads">
<view class="paddtop10 width90 alijusstart">
<view class="width80p font16 fcor333 fontwig6">
<image mode="widthFix" class="icon15 marRight10" src="../static/imgs/shop.png"></image>时代天街
<view class="width100" v-if="flist ==''">
<view class="width100 height40 font14 padleft15 alijusstart"
style="background-color: #e7f2ea;color: #4e8a5c;">
<image class="icon20 paddtright5" mode="widthFix" src="../static/imgs/horn.png"></image>
营业时间{{starttime}}{{endtime}}.
</view>
<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 v-if="flist == '' " class="width100 mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
</view>
<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</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}"
@click="tabtap(item)">
<view class="width100 fotct">
@ -26,8 +24,8 @@
</scroll-view>
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll"
:scroll-top="tabScrollTop">
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop"
v-if="flist !='' ">
<view v-for="(item,index) in slist" :key="index" :id="'main-'+item.kfcId">
<view class="s-item width90">
<text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text>
@ -36,7 +34,7 @@
{{item.name}}
</view>
<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">
{{titem.productName}}
</view>
@ -59,10 +57,22 @@
v-if="titem.originalPrice == titem.salePrice" style="text-decoration: line-through;">
</view>
<view class="mart10 icon-click fotrt">
<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image> -->
<!-- <view class="num fcorfff" style="background: #d90209;">1</view> -->
<image class="btn-plus" mode="widthFix" src="../static/imgs/plus.png"></image>
<view class="mart10 icon-click fotrt alijusend" v-if="titem.productId">
<image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"
v-if="titem.count > 0" @click="deletenums(titem)"></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>
@ -72,7 +82,8 @@
</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>
@ -139,11 +150,17 @@
kfcname: '', //
kfcimgs: '', //
kfcprice: '', //
kfcoldprice: '' //
kfcoldprice: '', //
starttime: '', //
endtime: '', //
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'storeClose.png',
}
},
onLoad(options) {
this.storeCode = options.storeCode;
this.starttime = options.sttime;
this.endtime = options.entime;
this.listByStoreCode();
},
methods: {
@ -232,6 +249,21 @@
addCart: function(item) {
if (item.num >= 0) {
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) => {
if (item.name == good.name)
good.num = item.num
@ -248,27 +280,25 @@
decreaseCart(item) {
if (item.num) {
item.num--
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
good.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 = 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) => {
if (item.name == good.name)
Vue.set(good, 'count', 1)
good.num = item.num
})
}
},
//
delAll() {
@ -277,8 +307,29 @@
good.num = 0
}
})
for (var i = 0; i < this.tlist.length; i++) {
this.tlist[i].count = 0;
}
this.shoppingcart = [];
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) {
let that = this;
@ -335,6 +386,12 @@
}, 1000);
}
}
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.kfcimgs = item.specGroups[0].productImageUrl;
@ -346,6 +403,7 @@
}
},
//
changetype(item) {
this.productId = item.productId;
@ -368,6 +426,16 @@
"oldprice": this.kfcoldprice
}
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();
return;
}
@ -376,6 +444,16 @@
if (this.shoppingcart[i].name == this.kfcname) {
indexs = 0;
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) {
@ -389,6 +467,16 @@
"oldprice": this.kfcoldprice
}
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();
},
@ -509,6 +597,7 @@
border-radius: 15px;
background: #fff;
min-height: 150px;
&:after {
content: '';
flex: 99;
@ -578,4 +667,18 @@
position: fixed;
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>

@ -1,19 +1,17 @@
<template>
<view class="content">
<!-- <view class="width100 height85 backcorfff heads">
<view class="paddtop10 width90 alijusstart">
<view class="width80p font16 fcor333 fontwig6">
<image mode="widthFix" class="icon15 marRight10" src="../static/imgs/shop.png"></image>时代天街
<view class="width100" v-if="flist ==''">
<view class="width100 height40 font14 padleft15 alijusstart"
style="background-color: #e7f2ea;color: #4e8a5c;">
<image class="icon20 paddtright5" mode="widthFix" src="../static/imgs/horn.png"></image>
营业时间{{starttime}}{{endtime}}.
</view>
<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 v-if="flist == '' " class="width100 mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
</view>
<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</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}"
@click="tabtap(item)">
<view class="width100 fotct">
@ -26,8 +24,8 @@
</scroll-view>
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll"
:scroll-top="tabScrollTop">
<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop"
v-if="flist != '' ">
<view v-for="item in slist" :key="item.id" :id="'main-'+item.id">
<view class="s-item width90">
<text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text>
@ -36,7 +34,7 @@
{{item.name}}
</view>
<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">
{{titem.name}}
</view>
@ -44,7 +42,7 @@
<image :src="titem.defaultImage" mode="widthFix" class="qzgoodsimg"></image>
<view class="width50 fotrt">
<view class="width100 font12 color2f6f43">¥<text
class="font18 fontwig6 margle">{{titem.salesTallPrice}}</text>
class="font18 fontwig6 margle">{{titem.showPrice}}</text>
</view>
<view class="width100 font14 mart5 color2f6f43"
v-if="titem.marketTallPrice != titem.salesTallPrice">
@ -62,10 +60,16 @@
style="text-decoration: line-through;">
</view>
<view class="mart10 icon-click fotrt">
<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image> -->
<!-- <view class="num fcorfff" style="background: #d90209;">1</view> -->
<image class="btn-plus" mode="widthFix" src="../static/imgs/blueplus.png"></image>
<view class="mart10 icon-click fotrt alijusend">
<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/wreduce.png"
@click="deletenums(titem)" v-if="titem.count > 0"></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>
@ -74,7 +78,7 @@
</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>
@ -199,11 +203,17 @@
shoppingcart: [], //
productId: '', //id
salesTallPrice: '', //
marketTallPrice: '' //
marketTallPrice: '', //
starttime: '', //
endtime: '', //
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'storeClose.png',
}
},
onLoad(options) {
this.storeCode = options.storeCode;
this.starttime = options.sttime;
this.endtime = options.entime;
this.getStarbucksProducts();
},
methods: {
@ -290,6 +300,12 @@
//
addCart: function(item) {
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) => {
if (JSON.stringify(item) == JSON.stringify(good)) {
item.num++
@ -303,11 +319,16 @@
Vue.set(good, 'count', 1)
})
}
},
decreaseCart(item) {
if (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) => {
if (this.checinfo(good, item) === true) {
good.num = item.num
@ -315,24 +336,17 @@
})
}
},
inputCart: function(item) {
if (item.num >= 0) {
item.num++
//
delAll() {
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
good.num = item.num + -1
if (good.num) {
good.num = 0
}
})
} else {
this.shoppingcart.forEach((good) => {
if (item.name == good.name)
Vue.set(good, 'count', 1)
})
for (var i = 0; i < this.tlist.length; i++) {
this.tlist[i].count = 0;
}
},
//
delAll() {
this.shoppingcart = [];
},
//
@ -427,15 +441,31 @@
this.shoppingcart.forEach((good) => {
if (this.checinfo(good, datas) === true) {
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;
}
})
if (istue == 0) {
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 {
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.$refs.popup.hide();
},
//key
@ -619,4 +649,18 @@
position: fixed;
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>

@ -29,28 +29,37 @@
<view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10">
<view class="fotct font14 width100 fcor999">您的取餐码为</view>
<view v-if="typeid == 4 && orderList.list">
<view class="width90 alijusstart mart20" v-for="(item,index) in orderList.list" :key='index'>
<view v-if="typeid == 4 && orderList.list && phonestu == 2">
<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>
<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 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 class="fotct font18 width100 mart10 color2f6f43"
v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</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">
{{orderList.statusDesc}}
</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"
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 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>
@ -76,9 +85,11 @@
<view class="width40 font13 fcor666">{{item.goodsName}}</view>
<view class="width10 font12 fcor999">x{{item.saleCount}}</view>
<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 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>
</view>
</view>
@ -190,6 +201,7 @@
6: '退款中',
7: '退款失败'
},
phonestu: 1 //
}
},
onLoad(options) {
@ -201,8 +213,13 @@
onUnload() {
clearInterval(this.timer);
clearInterval(this.timerdjs);
console.log('')
},
methods: {
//
updatestu() {
this.phonestu = 2
},
getAllCount() {
this.orderList.highChildOrderList.forEach((food) => {
this.coutnums += food.saleCount
@ -210,14 +227,14 @@
},
//
getThirdOrderByOrderId() {
uni.showLoading({
title: '加载中...'
})
// uni.showLoading({
// title: '...'
// })
let datas = {
orderId: this.orderId
}
getThirdOrderByOrderId(datas).then(res => {
uni.hideLoading();
// uni.hideLoading();
if (res.return_code == '000000') {
this.typeid = res.return_data.highChildOrderList[0].goodsType;
this.orderList = res.return_data;
@ -374,6 +391,18 @@
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 {
border-radius: 0 0 30px 30px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

@ -81,6 +81,27 @@
</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 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="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式:
@ -135,16 +156,16 @@
</view>
<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
<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)">
<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
<view class="contrig">
<view class="width80p flleft">
<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
<image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="alijus width60 margle10">
<view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5">有效期至{{items.useEndTime | timeFormat('yyyy-mm-dd')}}</view>
</view>
<view class="width20 flright">
<view class="yhprice">
<view class="width20 fotrt">
<view>
<radio color="#0083f5"
v-if="items.discountCondition && orderPrice > items.discountCondition"
:checked="items.id == memDiscountId" />
@ -172,7 +193,8 @@
getHuiLianTongCardBalance,
loginByPhone,
getUserOrderPreList,
findById
findById,
getRebateIntegral
} from '../../Utils/Api.js';
import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
import cjSlider from '../../components/cj-slider/cj-slider.vue';
@ -197,7 +219,7 @@
radioStatus: true,
memDiscountId: '',
user: '',
paytype: '',
paytype: '2',
PaymentPassword: '',
orderId: '',
jumpType: '',
@ -218,7 +240,9 @@
changePrice: '', //
isDiscount: true,
availIntegal: '', //
isUse: true //
isUse: true, //
rebateIntegral: '', //
Integrastu: 1 //
};
},
@ -283,6 +307,7 @@
this.user = res.return_data;
this.findById();
this.getHuiLianTongCardBalance();
this.getRebateIntegral();
uni.setStorage({
key: "user",
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() {
let params = {
@ -399,6 +442,7 @@
this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
.deductionPrice).toFixed(2);
}
this.getRebateIntegral();
},
rechangeload() {
this.isUse = false;
@ -794,6 +838,7 @@
} else {
this.isUse = true;
}
this.getRebateIntegral();
},
}
@ -916,10 +961,10 @@
border-radius: 8px;
image {
float: left;
width: 170rpx;
max-height: 170rpx;
margin-left: 10px;
// float: left;
width: 160rpx;
max-height: 160rpx;
// margin-left: 10px;
}
}

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

Loading…
Cancel
Save