Compare commits

...

5 Commits

  1. 11
      high-unionPay/App.vue
  2. 4
      high-unionPay/Utils/Api.js
  3. 8
      high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
  4. 13
      high-unionPay/pages/goods/goods-list/goods-list.vue
  5. 21
      high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
  6. 8
      high-unionPay/pages/order/confirmation.vue
  7. 22
      high-unionPay/pages/tabBar/home/home.vue
  8. 422
      high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
  9. 8
      high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
  10. 6
      high-unionPay/pages/user/news/news.vue
  11. 25
      high-unionPay/pages/user/order_details/order_details.vue
  12. 8
      high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
  13. 27
      high-unionPay/qianzhu-KFC/order-details/order-details.vue
  14. BIN
      high-unionPay/static/img/tongz.png
  15. 7
      high-unionPay/uni.scss

@ -60,5 +60,14 @@
<style lang="scss">
/*每个页面公共css */
@import "/static/iconfont/font.scss";
@import "/static/iconfont/font.scss";
@keyframes noticeAnimation {
from {
transform: translateX(100rpx);
}
to {
// transform: translateX(calc(-100% + 150px));
transform: translateX(-100%);
}
}
</style>

@ -495,6 +495,10 @@ export const sendUserPass = params => {
export const getUserOrderListhuafei = params => {
return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data);
}
// 话费充值数据字典
export const findSecConfigByType = params => {
return POST('GET', `${base}/common/findSecConfigByType`, params).then(res => res.data);
}
//肯德基返利
export const getRebateIntegral = params => {

@ -74,19 +74,19 @@
</view>
</view>
<view class="width94 line1 marb5"></view>
<view class="height50 width100 backcorfff">
<view class="height50 width100 backcorfff" v-if="Integrastu == 1">
<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"
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun"
style="align-items: center;">
{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
<!-- <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view> -->
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 4%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

@ -9,7 +9,7 @@
<view class="swiper-box">
<swiper circular="true" autoplay="true" @change="swiperChange">
<swiper-item v-for="swiper in swiperList" :key="swiper.id">
<image :src="imageUrl+swiper.imgData"></image>
<image :src="imageUrl+swiper.imgData" @click="jumpCont(swiper)"></image>
</swiper-item>
</swiper>
<view class="indicator">
@ -124,7 +124,7 @@
uni.setNavigationBarTitle({
title: '优选商品'
});
this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
this.getCmsContent('CMS_BANNER_SELECTIVE');
this.getBrandCouponList();
}
},
@ -265,6 +265,15 @@
uni.navigateTo({
url: '../../goods/goods?id=' + e
});
},
//
jumpCont(item) {
if (item.jumpUrl) {
uni.navigateTo({
url: item.jumpUrl
})
}
},
}

@ -130,19 +130,18 @@
</view>
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="height40 width100 backcorfff" v-if="Integrastu == 1">
<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">
<view class="width50 flright fotrt paddtright15 font15 colore95 alijun" style="align-items: center;">
{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright15 font15 colore95 alijun" style="align-items: center;"
<!-- <view class="width50 flright fotrt paddtright15 font15 colore95 alijun" style="align-items: center;"
v-if="Integrastu == 2">
{{rebateIntegral}}
</view>
</view> -->
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
@ -203,7 +202,7 @@
<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 alijus" v-for="(items, index) in OrderPreList" :key="index"
@click="radioChanges(items,items)">
@click="radioChanges(items)">
<image mode="widthFix" :src="imageUrl+items.discountImg"></image>
<view class="alijus width60 margle10">
<view class="width80p">
@ -397,9 +396,9 @@
this.$refs.popup.show();
},
//
radioChanges(item, items) {
radioChanges(item) {
this.rechangeload();
if (this.memDiscountId == items.id) { //
if (this.memDiscountId == item.id) { //
this.memDiscountId = '';
this.deductionPrice = '0.00';
this.priceCaluc(this.orderList.payPrice);
@ -407,7 +406,7 @@
} else { //
if (item.discountType == 1) {
if (this.orderPrice >= item.discountCondition) {
this.memDiscountId = items.id;
this.memDiscountId = item.id;
//
this.deductionPrice = item.discountPrice;
let oldprice = this.orderPrice - this.deductionPrice;
@ -421,14 +420,14 @@
}
}
if (item.discountType == 2) {
this.memDiscountId = items.id;
this.memDiscountId = item.id;
//
this.deductionPrice = item.discountPrice;
let oldprice = this.orderPrice - this.deductionPrice;
this.priceCaluc(oldprice);
}
if (item.discountType == 3) {
this.memDiscountId = items.id;
this.memDiscountId = item.id;
//
this.deductionPrice = this.orderPrice - (this.orderPrice * item.discountPrice);
let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);

@ -111,19 +111,19 @@
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="height40 width100 backcorfff" v-if="Integrastu == 1">
<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"
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun"
style="align-items: center;">
{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
<!-- <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view> -->
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

@ -38,7 +38,7 @@
<view class="height120 backcorfff" v-if="item.type == 3">
<view class="height20 width100"></view>
<view class="width92 message alijus">
<view class="width100 alijus" style="margin-top: -20px;" @click="test(item.childDate)"
<view class="width100 alijus" style="margin-top: -20px;" @click="test(0)"
v-if="item.childDate.length == 1">
<view class="width80p paddleft10 alijusstart">
<view class="stus"></view>
@ -244,8 +244,15 @@
})
},
test(item) {
uni.navigateTo({
url: '../../user/news/news'
let datas = [];
for (var i = 0; i < this.homeCateList.length; i++) {
if (this.homeCateList[i].type == 3) {
datas.push(this.homeCateList[i])
}
}
let jumpid = datas[0].childDate[item].type;
uni.navigateTo({
url: '../../user/news/news?id=' + jumpid
})
},
//
@ -328,7 +335,7 @@
//广
this.showPopup();
this.imgadres3 = res.return_data.childCategory[0].imgData;
this.webUrl = res.return_data.childCategory[0].ext1;
this.webUrl = res.return_data.childCategory[0].jumpUrl;
this.jumpType = res.return_data.childCategory[0].jumpType;
}
});
@ -415,9 +422,9 @@
},
//
jumplottery(item) {
if (item.ext1) {
if (item.jumpUrl) {
uni.navigateTo({
url: item.ext1
url: item.jumpUrl
})
}
},
@ -655,8 +662,7 @@
.spcarea {
width: 31%;
margin-right: auto;
margin-left: auto;
margin-left: 2%;
border-radius: 10px 10px 0px 0px;
padding-bottom: 10px;
}

@ -1,154 +1,270 @@
<template>
<view>
<view class="width100 height100p backcorf06">
<view class="width100 height120" style="background-color: #3267f6;">
<view class="alijusstart paddleft10 paddtright10" style="background-color: #2d5de5;height: 30px;">
<image src="../../../static/img/tongz.png" style="height: 20px;" class="icon45"></image>
<view class="right-left-scroll margle">
<view class="content font12 fontspec"
:style="{'animation': `noticeAnimation ${time}s linear 1s infinite`}">
{{notice}}
</view>
</view>
</view>
<view class="block">
<view class="content height60">
<input type="number" class="my flleft font18 fcorfff" maxlength="11"
<input type="number" class="my flleft font20 fcorfff" maxlength="11"
placeholder-style="color:#ffffff;" placeholder="请输入充值号码" v-model="inputPhone" />
</view>
<view class="line1 width100 backcorfff"></view>
</view>
</view>
<!-- <view class="mart5">
<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
activeColor="#089bf5" lineColor="#089bf5" minWidth="374">
</QSTabs>
</view> -->
<view class="width90 font16 fcor333 fontwig6 mart20">
选择金额
</view>
<view class="list">
<view class="box" :class="{'on':item.id == inputAmountId}" v-for="(item,index) in amountList" :key="index"
@click="select(item)">
<view class="heTitle">{{item.rechargePrice}}</view>
<view class="font13 fcoreb5 fontwig6" v-if="item.status != 2">{{item.payPrice}}</view>
<view class="font13 fcor999" v-if="item.status == 2">已售空</view>
<view class="backcorlf5 height70"></view>
<view class="width90 border-r backcorfff" style="margin-top: -60px;">
<view class="swiperHead">
<!--组件-->
<swiperNavBar :scrollIntoView="scrollIntoView" :swiperTabList='tabs' :swiperTabIdx='swiperTabIdx'
:currentSwiperWidth='currentSwiperWidth' :currentSwiperHeight='currentSwiperHeight'
:swiperCurrentSize='swiperCurrentSize' :swiperColor='swiperColor'
:swiperCurrentColor='swiperCurrentColor' :currentSwiperLineShow="currentSwiperLineShow"
:currentSwiperLineActiveWidth="currentSwiperLineActiveWidth"
:currentSwiperLineActiveHeight="currentSwiperLineActiveHeight"
:currentSwiperLineActiveBg="currentSwiperLineActiveBg"
:currentSwiperLineAnimatie="currentSwiperLineAnimatie" v-if=" tabs.length > 0 "
@change="CurrentTab">
</swiperNavBar>
<!--组件-->
</view>
<!--内容-->
<view class="swiperCont border-r">
<swiper class="swiper border-r" :style="{ height:mainHeight + 'px' }" :current="swiperTabIdx"
@change="SwiperChange">
<swiper-item class="swiperItem border-r" v-for="(item,index) in tabs" :key='index'>
<!-- <view class="width90 font14 fcor333 fontwig6 mart5">
话费特惠充值
</view> -->
<view v-if="amountList == ''" class="mart10 fotct font14 fcor666">
<image mode="widthFix" style="width: 40vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="list" v-else>
<view class="box border-r" :class="{'on':item.id == inputAmountId}"
v-for="(item,index) in amountList" :key="index" @click="select(item)">
<view class="heTitle font16 fontwig6 paddtop5">{{item.rechargePrice}}</view>
<view class="font13 contcil" :class="{'on':item.id == inputAmountId}"
v-if="item.status != 2">{{item.payPrice}}</view>
<view class="font12 contcil" :class="{'on':item.id == inputAmountId}"
v-if="item.status == 2">已售空</view>
<view class="width100 font12 height25l boxchil"
:class="{'on':item.id == inputAmountId}" style="">{{explainReceiptTime}}
</view>
</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="width90 height50 backcor008 font18 fcorfff fotct border-r" @click="addOrderPay()">
<text v-if="inputAmount">¥</text>
{{inputAmount}}
立即充值
</view>
<view class="width100 height40"></view>
</view>
<view class="mart5 width90 font18 fcor333 fontwig6">
充值说明
</view>
<!-- <view class="width90 mart20" v-if="current == 0">
<image mode="widthFix" :src="imagewxUrl+image2"></image>
</view> -->
<view class="width90 mart20">
<image mode="widthFix" :src="imagewxUrl+image1"></image>
</view>
<view class="height100p"></view>
<view class="bombtn width94 font16">
<view class="width50 flleft payem">应付: {{inputAmount}}</view>
<view class="width50 flright paybtn" @click="addOrderPay">立即购买</view>
<view class="width90 mart20">
<rich-text :nodes="textcont"></rich-text>
</view>
<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
<image class="popImg" :src="imageUrl+imgadres1"></image>
</wybPopup>
</view>
</template>
<script>
let app = getApp();
import QSTabs from '@/components/QS-tabs/QS-tabs.vue';
import swiperNavBar from '@/components/swiperNavBar.vue';
import wybPopup from '@/components/wyb-popup/wyb-popup.vue';
import {
getListOutRechargePrice,
addOrderPay
} from '../../../Utils/Api.js';
import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
addOrderPay,
findSecConfigByType,
getCmsContent
} from '@/Utils/Api.js';
export default {
components: {
QSTabs
QSTabs,
swiperNavBar,
wybPopup
},
data() {
return {
typeId: '',
inputAmountId: '',
inputAmount: '',
orderPrice: '',
inputPhone: '',
amoutType: '',
codesVlues: '',
amountList: [],
price: '',
amoutstatus: '',
tabs: ["5个工作日", "6小时到账"], //
tabs: [], //
current: 0, //
swiperCurrent: 2,
imagewxUrl: app.globalData.imageWxImg,
image1:'telephone1.png',
image2:'telephone2.png'
swiperCurrent: 2,
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'noorder.png',
imgadres1: '',
image1: 'telephone1.png',
image2: 'telephone2.png',
notice: '', //
textcont: '', //
explainReceiptTime: '', //
time: 20,
//
scrollIntoView: 0, //
swiperTabList: [], //
swiperTabIdx: 0,
swiperCurrentSize: '30rpx', //
swiperColor: '#333333', //
swiperCurrentColor: '#1D63FF', //
currentSwiperWidth: '23%', // % upx rpx px
currentSwiperHeight: 100, // rpx px
mainHeight: 240, //
currentSwiperLineShow: true, //线 线.swiperLinecss
currentSwiperLineActiveBg: '#1D63FF', //线
currentSwiperLineActiveWidth: '30rpx', //线 upx rpx px
currentSwiperLineActiveHeight: '6rpx', //线 upx rpx px
currentSwiperLineAnimatie: 300, //线
}
},
onLoad(options) {
this.typeId = options.id;
if (this.typeId == 1) {
uni.setNavigationBarTitle({
title: '中国移动'
})
this.amoutType = 2;
this.getListOutRechargePrice(2);
return;
}
if (this.typeId == 2) {
uni.setNavigationBarTitle({
title: '中国电信'
})
this.amoutType = 1;
this.getListOutRechargePrice(1);
return;
}
if (this.typeId == 3) {
uni.setNavigationBarTitle({
title: '中国联通'
})
this.amoutType = 3;
this.getListOutRechargePrice(3);
return;
}
this.getCmsAactibity();
this.getListOutRechargePrice();
},
onShow() {
this.findSecConfigByType();
this.findSecConfigByTypewap();
},
mounted() {
// let scroll_width = 0;
// const query = uni.createSelectorQuery().in(this);
// query.select('.right-left-scroll').boundingClientRect(data => {
// scroll_width = (data.width).toFixed(2);
// }).exec();
// query.select('.right-left-scroll .content').boundingClientRect(data => {
// if (data.width - scroll_width > 0) {
// this.time = (9 * data.width / scroll_width).toFixed(2);
// }
// }).exec();
},
methods: {
//
getCmsAactibity() {
let code;
// #ifdef H5
code = '2'
// #endif
// #ifdef MP
code = '1'
// #endif
let params = {
companyId: app.globalData.companyId,
platform: code,
categoryCode: 'CMS_RECHARGE_POPOVER'
}
getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data.childCategory.length != 0) {
//广
this.imgadres1 = res.return_data.childCategory[0].imgData;
this.showPopup();
}
});
},
//
showPopup() {
this.$refs.popup.show();
},
//
findSecConfigByType() {
let datas = {
codeType: 'EXPLAIN_NOTIFICATIONS'
}
findSecConfigByType(datas).then(res => {
if (res.return_code == '000000') {
this.notice = res.return_data.codeValue;
}
});
},
//
findSecConfigByTypewap() {
let datas = {
codeType: 'EXPLAIN_WRAP '
}
findSecConfigByType(datas).then(res => {
if (res.return_code == '000000') {
this.textcont = res.return_data.codeValue;
}
});
},
select(amoutinfos) {
this.inputAmount = amoutinfos.payPrice;
this.orderPrice = amoutinfos.rechargePrice;
this.price = amoutinfos.rechargePrice;
this.inputAmountId = amoutinfos.id;
this.amoutstatus = amoutinfos.status;
},
//
change(index) {
this.$refs.tabs.setFinishCurrent(index);
this.current = index;
this.inputAmount = '';
this.amoutstatus = '';
if (index == 0) {
this.swiperCurrent = 2;
this.getListOutRechargePrice(this.amoutType);
} else {
this.swiperCurrent = 1;
this.getListOutRechargePrice(this.amoutType);
}
},
/**
* 查询价格
*/
getListOutRechargePrice(item) {
getListOutRechargePrice() {
uni.showLoading({
title: '加载中...'
})
let showType;
// #ifdef H5
showType = 2;
// #endif
// #ifdef MP
showType = 1;
// #endif
let params = {
operatorType: item,
"companyId": app.globalData.companyId,
platformId: 3
// rechargeType: this.swiperCurrent
platformId: showType
}
getListOutRechargePrice(params).then(res => {
uni.hideLoading()
if (res.return_code == '000000' && res.return_data) {
this.amountList = res.return_data;
this.tabs = res.return_data;
this.amountList = res.return_data[0].priceList;
this.explainReceiptTime = res.return_data[0].explain_receipt_time;
this.amoutType = res.return_data[0].id;
} else {
this.amountList = [];
}
})
},
//tab
CurrentTab: function(index) {
this.swiperTabIdx = index;
this.scrollIntoView = Math.max(0, index - 1);
this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
this.amountList = this.tabs[this.swiperTabIdx].priceList;
this.amoutType = this.tabs[this.swiperTabIdx].id;
},
//
SwiperChange: function(e) {
this.swiperTabIdx = e.detail.current;
this.scrollIntoView = Math.max(0, e.detail.current - 1);
this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
this.amountList = this.tabs[this.swiperTabIdx].priceList;
this.amoutType = this.tabs[this.swiperTabIdx].id;
},
/**
* 提交订单
*/
addOrderPay() {
addOrderPay() {
let that = this;
if (that.amoutstatus == 2) {
uni.showToast({
@ -161,6 +277,7 @@
if (that.inputPhone == '') {
uni.showToast({
title: '请输入充值号码',
duration: 2000,
icon: "none"
});
return;
@ -168,6 +285,7 @@
if (that.inputPhone.length != 11) {
uni.showToast({
title: '请输入正确充值号码',
duration: 2000,
icon: "none"
});
return;
@ -175,9 +293,10 @@
if (that.inputAmount == '') {
uni.showToast({
title: '请选择价格',
duration: 2000,
icon: "none"
});
return;
return false;
}
uni.showToast({
title: '提交订单...',
@ -185,7 +304,7 @@
duration: 2000,
success() {
uni.navigateTo({
url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.orderPrice +
url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.price +
'&payPrice=' + that.inputAmount + '&rechargeContent=' + that.inputPhone +
'&rechargeModel=' + that.amoutType +
'&objectId=' + that.inputAmountId + '&rechargeType=' + that.swiperCurrent
@ -199,9 +318,68 @@
</script>
<style lang="scss">
page {
background-color: #f5f5f5;
}
.popImg {
width: 100%;
height: 430px;
}
.swiperHead {
width: 100%;
}
.swiperHead scroll-view {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
white-space: nowrap;
}
.swiperTab {
display: inline-flex;
flex-direction: column;
text-align: center;
}
.swiperCont {
width: 100%;
padding-top: 5px;
padding-bottom: 20px;
background-color: #ffffff;
}
/* #ifdef H5 */
.swiperHead {
top: 44px;
z-index: 10;
width: 100%;
background: #FFFFFF;
}
/* #endif */
.swiper {
width: 100%;
height: 500rpx;
}
.swiperItem {
overflow: auto;
background: #ffffff;
color: #333333;
font-size: 30upx;
}
.block {
width: 94%;
padding: 60upx 3%;
padding: 15px 3%;
.my {
width: 80%;
@ -224,55 +402,63 @@
padding: 20upx 0;
.box {
width: 30%;
width: 29%;
margin-left: 1%;
margin-right: 2%;
margin-top: 20upx;
margin-bottom: 20upx;
float: left;
height: 120upx;
height: 150upx;
// line-height: 120upx;
display: inline-grid;
// display: inline-grid;
justify-content: center;
align-items: center;
text-align: center;
box-shadow: 0upx 0upx 4upx #666666;
border: 1px solid #f1f1f1;
font-size: 36upx;
color: #089bf5;
color: #333333;
&.on {
background-color: #089bf5;
color: #ffffff;
background-color: #ecf5fe;
border: 1px solid #089bf5;
color: #089bf5;
}
}
.heTitle {
width: 100%;
font-size: 15px;
}
}
.bombtn {
position: fixed;
height: 45px;
bottom: 20px;
border-radius: 6px;
.payem {
height: 45px;
line-height: 45px;
text-align: center;
background-color: #007AFF;
color: #FFFFFF;
border-radius: 6px 0 0 6px;
.boxchil {
border-radius: 0 0 5px 5px;
background-color: #f0f0f0;
margin-top: 6px;
color: #999999;
&.on {
background-color: #089bf5;
color: #ffffff;
}
}
.paybtn {
height: 45px;
line-height: 45px;
text-align: center;
background-color: #F8A628;
border-radius: 0 6px 6px 0;
color: #FFFFFF;
.contcil {
color: #999999;
&.on {
// background-color: #089bf5;
color: #089bf5;
}
}
.right-left-scroll {
white-space: nowrap;
overflow: hidden;
.content {
display: inline-block;
color: #c1b569;
}
}
</style>

@ -84,19 +84,19 @@
</view>
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="height40 width100 backcorfff" v-if="Integrastu == 1">
<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"
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun"
style="align-items: center;">
{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
<!-- <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view> -->
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

@ -96,7 +96,8 @@
return a[value1];
}
},
onLoad() {
onLoad(options) {
this.newstypeid = options.id;
this.getDictionaryByCodeType();
},
// onShow() {
@ -111,8 +112,7 @@
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
this.newsTyplist = res.return_data;
this.newstypeid = res.return_data[0].codeValue;
this.getMsgByList(res.return_data[0].codeValue);
this.getMsgByList(this.newstypeid);
}
})
},

@ -485,7 +485,7 @@
<!-- 再来一单 -->
<view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend">
<button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
<view class="cusservice font12 fcor666 alijus" @click="playPhone">联系客服</view>
<!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
</view>
</view>
@ -756,7 +756,28 @@
'&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType
})
},
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
}
}
}
</script>

@ -124,19 +124,19 @@
</view>
<view class="width94 line1 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="height40 width100 backcorfff" v-if="Integrastu == 1">
<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"
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun"
style="align-items: center;">
{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
<!-- <view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view> -->
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

@ -61,7 +61,7 @@
<!-- 星巴克 -->
<view v-if="typeid == 9 && recinfo.object.orderItems[0].code">
<view class="fotct font18 width100 mart10 color2f6f43"
v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}</view>
v-for="(item,index) in recinfo.object.orderItems" :key='index'>取餐口令:{{item.code}}</view>
</view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list">
<!-- {{recinfo.statusDesc}} -->
@ -190,8 +190,8 @@
<!-- 再来一单 -->
<view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3">
<button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
<!-- <view class="buybtn font12 fcorfff">再来一</view> -->
<view class="cusservice font12 fcor666 alijus" v-if="orderList.orderStatus == 3" @click="playPhone">联系客服</view>
<view class="buybtn font12 fcorfff" v-if="orderList.orderStatus == 1" @click="thirdCancelOrder">取消订</view>
</view>
</view>
@ -372,6 +372,27 @@
}
holdTime--;
}, 1000)
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
},
//
showtime() {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -296,6 +296,9 @@ $uni-font-size-paragraph:30upx;
background: linear-gradient(to bottom, #3da7e7, #6fbdee);
}
.backcorlf5{
background: linear-gradient(to bottom, #3267f6, #f5f5f5);
}
.backcorf06{
background-color: #0083f5;
@ -552,6 +555,10 @@ $uni-font-size-paragraph:30upx;
.height25 {
height: 25px;
}
.height25l {
height: 25px;
line-height: 25px;
}
.height50 {

Loading…
Cancel
Save