1.新增工会卡专区

2.修改显示问题
3.肯德基页面新增
yj-dev
杨杰 2 years ago
parent b763f38290
commit 22757f5622
  1. 29
      Utils/Request.js
  2. 8
      pages.json
  3. 11
      pages/goods/goods-list/goods-list.vue
  4. 8
      pages/goods/refuel-confirm/refuel-confirm.vue
  5. 12
      pages/order/confirmation.vue
  6. 49
      pages/tabBar/home/home.vue
  7. 71
      pages/user/deposit/deposit.vue
  8. 22
      qianzhu-KFC/kfc-details/kfc-details.vue
  9. 6
      qianzhu-KFC/menu-list/menu-list.vue
  10. 3
      qianzhu-KFC/order-details/order-details.vue
  11. 2
      subPages/Phone-recharge-details/Phone-recharge-details.vue
  12. 8
      subPages/coupon-comfirmation/coupon-comfirmation.vue
  13. 6
      subPages/unionComfirmation/unionComfirmation.vue

@ -26,19 +26,32 @@ function request(method, url, data) {
data: ''
})
// #ifdef H5
uni.showToast({
title: '当前登录信息失效,请前往登录',
icon: 'none',
duration: 2000,
success() {
setTimeout(() => {
uni.showModal({
title: '前往登录',
content: '当前登录信息失效,请前往登录',
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: '/pages/login/register'
})
}, 1500);
}
}
})
// uni.showToast({
// title: '当前登录信息失效,请前往登录',
// icon: 'none',
// duration: 2000,
// success() {
// setTimeout(() => {
// console.log('======'+window.location.href);
// uni.navigateTo({
// url: '/pages/login/register'
// })
// }, 1500);
// }
// })
// #endif
// #ifdef MP
uni.showToast({

@ -461,7 +461,6 @@
"navigationBarTextStyle": "white"
}
}
],
"subpackages": [{
"root": "subPages",
@ -808,6 +807,13 @@
"enablePullDownRefresh": false
}
}, {
"path": "kfc-details/kfc-details",
"style": {
"navigationBarTitleText": "详情",
"enablePullDownRefresh": false
}
}]
}],
"globalStyle": {

@ -33,7 +33,7 @@
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image> {{ row.discountPrice*100}}
</view>
<view class="price" v-if="typeId == 1 || typeId == 3">
<view class="price" v-if="typeId == 1 || typeId == 3 || typeId == 5">
{{ row.discountPrice}}
</view>
<!-- v-if="product.discountPrice !== product.salesPrice" -->
@ -43,7 +43,7 @@
src="../../../static/img/jfh.png">
</image>{{ row.salesPrice*100}}
</view>
<view v-if="typeId == 1 || typeId == 3">{{ row.salesPrice}}</view>
<view v-if="typeId == 1 || typeId == 3 || typeId == 5">{{ row.salesPrice}}</view>
</view>
</view>
</view>
@ -107,6 +107,13 @@
this.getCouponListArea();
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
}
if (option.id == 5) {
uni.setNavigationBarTitle({
title: '工会卡列表'
});
this.getCouponListArea();
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
}
if (option.id == 3) {
uni.setNavigationBarTitle({
title: '优选商品'

@ -87,7 +87,7 @@
</view>
</view>
<!-- // -->
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式:</view>
<view class="line1"></view>
<view class="width100 backcorfff">
<!-- <view class="height50 width100 backcorfff" @tap="paytype='jifen'">
@ -103,7 +103,7 @@
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='jifen'">
<view class="width60 flleft fontwig6">
<view class="width60 flleft">
积分支付
</view>
<view class="flright width30 fotct">
@ -113,7 +113,7 @@
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
<view class="width60 flleft fontwig6">
<view class="width60 flleft">
微信支付
</view>
<view class="flright width30 fotct">
@ -123,7 +123,7 @@
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='oilcard'">
<view class="width60 flleft fontwig6">
<view class="width60 flleft">
油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}</text>
</view>
<view class="flright width30 fotct">

@ -91,13 +91,13 @@
<view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式 <text class="jfrecharge" @click="jumpdeposits" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3 || couponList.payType== 4">积分充值</text>
支付方式: <text class="jfrecharge" @click="jumpdeposits" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text>
</view>
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3 || couponList.payType== 4"
<view class="height50 width100 backcorfff" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
@tap="paytype='jinbi'">
<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@ -105,10 +105,10 @@
<radio :checked="paytype=='jinbi'" color="#0083f5" />
</view>
</view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3 || couponList.payType== 4"></view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
v-if="couponList.payType == 1 || couponList.payType==3 ">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@ -118,7 +118,7 @@
</view>
<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"

@ -65,6 +65,24 @@
</view>
</swiper-item>
</swiper>
<!-- 工会卡专区 -->
<view style="width: 90%;margin-left: 5%;" v-if='unioncardproductList.length != 0' @click="goGoodsList(5)">
<image class="mart30 width100" mode="widthFix" :src="imagewxUrl+imgadres5"></image>
</view>
<swiper class="orange-content" :display-multiple-items="unioncardproductListleg" v-if='unioncardproductList.length != 0'
next-margin="50rpx">
<swiper-item class="swiper-hed" v-for="(item,index) in unioncardproductList" :key="index"
@click="toGoods(item.id)">
<view class="swiper-item" :data-id="item.id">
<image class="img" :src="imageUrl+item.couponImg" mode="aspectFit"></image>
<view class="fotlt fcor333 font14 text1 mart10">{{item.couponName}}</view>
<view class="subject fotct mart5">
<view class="subject fotct mart5">{{item.discountPrice}}</view>
</view>
</view>
</swiper-item>
</swiper>
<image mode="widthFix" style="margin-top: 30px;width: 90%;margin-left: 5%;" v-for="(row, index) in homeCateList"
:key="index" @click="jumphuafei(row)" :src="imageUrl+row.imgData"></image>
<!-- 赠券 -->
@ -137,6 +155,7 @@
imgadres: 'headzq.png',
imgadres1: 'jbhed.png',
imgadres2: 'jt.png',
imgadres5: 'unionarea.png',
imgadres3: '',
imgadres4: 'cusservice.png',
webUrl: '',
@ -157,6 +176,8 @@
productListleg: '',
goldproductList: [],
goldproductListleg: '',
unioncardproductList: [],
unioncardproductListleg: '',
loadingText: '正在加载...',
pageNum: 1,
pageSize: 6,
@ -175,6 +196,7 @@
this.city = app.globalData.cityName;
this.getCouponListArea();
this.getCouponListgold();
this.getunioncardCouponListgold();
this.getCmsContent();
this.getCmsContentcmshome();
this.getCmsContentcmsContent();
@ -261,6 +283,7 @@
app.globalData.cityId = '500000';
this.getCouponListArea();
this.getCouponListgold();
this.getunioncardCouponListgold();
this.getCmsContent();
this.getCmsAactibity();
this.getCmsContentcmshome();
@ -275,6 +298,7 @@
app.globalData.cityId = '500000';
this.getCouponListArea();
this.getCouponListgold();
this.getunioncardCouponListgold();
this.getCmsContent();
this.getCmsAactibity();
this.getCmsContentcmshome();
@ -505,6 +529,7 @@
if (res.return_data.result.addressComponent.adcode) {
that.getCouponListArea();
that.getCouponListgold();
this.getunioncardCouponListgold();
that.getCmsContent();
that.getCmsAactibity();
that.getCmsContentcmshome();
@ -606,6 +631,28 @@
}
})
},
//
getunioncardCouponListgold() {
let params = {
regionId: app.globalData.cityId,
pageNum: this.pageNum,
pageSize: this.pageSize,
displayArea: 5
}
getCouponList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list) {
this.unioncardproductList = res.return_data.list;
this.unioncardproductListleg = res.return_data.total;
if (res.return_data.total > 4) {
this.unioncardproductListleg = 4;
return;
}
this.unioncardproductListleg = res.return_data.total;
} else {
this.unioncardproductList = [];
}
})
},
//
swiperChange(event) {
this.currentSwiper = event.detail.current;
@ -1135,7 +1182,7 @@
background-color: #FFFFFF;
border-bottom: solid 2upx #f6f6f6;
display: flex;
justify-content: space-between;
justify-content: flex-start;
flex-wrap: wrap;
.category {

@ -16,12 +16,13 @@
<view class="list">
<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)"
:class="{'on':amount == inputAmount}">
{{amount}}
<view class="heTitle">{{amount}}</view>
<view class="font14">{{amount * 100}}</view>
</view>
</view>
<view class="num">
<view class="text">
自定义充值金额
<view class="text font13">
自定义充值金额(:{{inputAmount * 100}})
</view>
<view class="input">
<input type="number" v-model="inputAmount" />
@ -269,33 +270,74 @@
.amount {
width: 100%;
.list {
width: 94%;
margin-left: 3%;
display: flow-root;
justify-content: space-between;
align-items: center;
padding: 20upx 0;
.box {
width: 30%;
height: 120rpx;
margin-left: 1%;
margin-right: 2%;
margin-top: 20upx;
float: left;
margin-left: 3.333%;
margin-top: 20px;
display: flex;
height: 120upx;
// line-height: 120upx;
display: inline-grid;
justify-content: center;
align-items: center;
border-radius: 10rpx;
box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05);
font-size: 36rpx;
text-align: center;
box-shadow: 0upx 0upx 4upx #666666;
font-size: 36upx;
color: #089bf5;
background-color: #f1f1f1;
color: 333;
&.on {
background-color: #0083f5;
color: #fff;
background-color: #089bf5;
color: #ffffff;
}
}
.heTitle {
width: 100%;
font-size: 15px;
}
}
// .list {
// display: flow-root;
// justify-content: space-between;
// padding: 20upx 0;
// .box {
// width: 30%;
// height: 120rpx;
// float: left;
// margin-left: 3.333%;
// margin-top: 20px;
// display: flex;
// justify-content: center;
// align-items: center;
// border-radius: 10rpx;
// box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05);
// font-size: 36rpx;
// background-color: #f1f1f1;
// color: 333;
// &.on {
// background-color: #0083f5;
// color: #fff;
// }
// }
// .heTitle {
// width: 100%;
// font-size: 15px;
// }
// }
.num {
margin-top: 20upx;
display: flex;
@ -304,7 +346,6 @@
.text {
padding-right: 10upx;
font-size: 40upx;
}
.input {

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

@ -682,6 +682,12 @@
//
delAll() {
},
//
navToList(){
uni.navigateTo({
url:'../kfc-details/kfc-details'
})
}
}
}

@ -65,6 +65,9 @@
<view class="canbtn height30">联系客服</view>
</view>
</view>
<view class="width90 mart10 font13 fcor666">友情提示</view>
<view class="width90 mart10 font12 fcor999">1如遇到商品售罄将导致您无法取到所定食物系统将自动为您安排退款1个工作日内到账</view>
<view class="width90 mart5 font12 fcor999 marb40">2如遇更多问题请及时联系在线客服处理</view>
</view>
</template>

@ -28,7 +28,7 @@
<view class="linec6 width90 mart10"></view>
<view class="width90 mart10 fcor333 font15">
话费充值 : {{phoneorderdes.userPhone}}{{phoneorderdes.operatorName}}
话费充值 : {{phoneorderdes.rechargeContent}}{{phoneorderdes.operatorName}}
</view>
<view class="width90 mart15 height22">
<view class="flleft fcor333 width50 font15">订单总额</view>

@ -27,12 +27,12 @@
<view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式
支付方式:
</view>
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" @tap="paytype='jinbi'">
<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@ -42,7 +42,7 @@
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" @tap="paytype='weixin'">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@ -52,7 +52,7 @@
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'">
<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"

@ -83,13 +83,13 @@
<view class="width94 line1 mart5 marb5"></view>
<view class="height50 width100 backcorfff">
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式
支付方式:
</view>
</view>
<view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="width94 line1 mart5 marb5" v-if="item == 2"></view>
<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
<view class="width50 flleft fcor666 fontwig6 font16" style="padding-left: 4%;">
<view class="width50 flleft fcor666 font16" style="padding-left: 4%;">
微信支付
</view>
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
@ -99,7 +99,7 @@
</view>
<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
<view class="width70 flleft fcor666 fontwig6 font16 text1" style="padding-left: 4%;">
<view class="width70 flleft fcor666 font16 text1" style="padding-left: 4%;">
汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}</text>
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"

Loading…
Cancel
Save