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

1.优化订单确认页显示

Browse Source 
2.解决联系客服不能操作按钮
yj-dev
杨杰 2 years ago
parent 9e8d0b99b4
commit 91dfd0f246
9 changed files with 91 additions and 33 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. 8
      member-Recharge/rec-confirmation/rec-confirmation.vue
  2. 13
      pages/goods/refuel-confirm/refuel-confirm.vue
  3. 8
      pages/order/confirmation.vue
  4. 11
      pages/tabBar/home/home.vue
  5. 6
      pages/user/news/news.vue
  6. 26
      pages/user/order_details/order_details.vue
  7. 8
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  8. 28
      qianzhu-KFC/order-details/order-details.vue
  9. 8
      subPages/unionComfirmation/unionComfirmation.vue

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

@ -74,19 +74,19 @@
</view> </view>
</view> </view>
<view class="width94 line1 marb5"></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%;"> <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> <image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
</view> </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;"> style="align-items: center;">
返{{rebateIntegral}}积分 返{{rebateIntegral}}积分
</view> </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;"> style="align-items: center;">
{{rebateIntegral}} {{rebateIntegral}}
</view> </view> -->
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 4%;"> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 4%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

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

@ -129,19 +129,18 @@
</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="height40 width100 backcorfff" v-if="Integrastu == 1">
<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;"> <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> <image src="../../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
</view> </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 == 1">
返{{rebateIntegral}}积分 返{{rebateIntegral}}积分
</view> </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"> v-if="Integrastu == 2">
{{rebateIntegral}} {{rebateIntegral}}
</view> </view> -->
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;"> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
@ -307,7 +306,7 @@
imageUrl: app.globalData.imgUrl, imageUrl: app.globalData.imgUrl,
oilPirce: 0, //油卡余额 oilPirce: 0, //油卡余额
user: '', user: '',
paytype: 'weixin', paytype: '2',
PaymentPassword: '', PaymentPassword: '',
orderPrice: '', //原价 orderPrice: '', //原价
deductionPrice: '0.00', //优惠金额 deductionPrice: '0.00', //优惠金额
@ -526,7 +525,7 @@
if (item.discountType == 3) { if (item.discountType == 3) {
this.memDiscountId = items.id; this.memDiscountId = items.id;
// 打折 // 打折
this.deductionPrice = this.orderPrice - (this.orderPrice * item.discountPrice); this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item.discountPrice)).toFixed(2);
let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2); let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
this.priceCaluc(oldprice); this.priceCaluc(oldprice);

8
pages/order/confirmation.vue
Unescape View File

@ -112,19 +112,19 @@
<view class="width94 line1 mart5 marb5"></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%;"> <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> <image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
</view> </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;"> style="align-items: center;">
返{{rebateIntegral}}积分 返{{rebateIntegral}}积分
</view> </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;"> style="align-items: center;">
{{rebateIntegral}} {{rebateIntegral}}
</view> </view> -->
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;"> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

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

@ -65,7 +65,7 @@
<view class="height120 backcorfff" v-if="item.type == 3"> <view class="height120 backcorfff" v-if="item.type == 3">
<view class="height20 width100"></view> <view class="height20 width100"></view>
<view class="width92 message alijus"> <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"> v-if="item.childDate.length == 1">
<view class="width80p paddleft10 alijusstart"> <view class="width80p paddleft10 alijusstart">
<view class="stus"></view> <view class="stus"></view>
@ -626,8 +626,15 @@
this.currentSwiper = event.detail.current; this.currentSwiper = event.detail.current;
}, },
test(item) { test(item) {
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({ uni.navigateTo({
url: '../../user/news/news' url: '../../user/news/news?id=' + jumpid
}) })
}, },

6
pages/user/news/news.vue
Unescape View File

@ -96,10 +96,11 @@
return a[value1]; return a[value1];
} }
}, },
onLoad() { onLoad(options) {
// #ifdef H5 // #ifdef H5
this.headerTop = '44px'; this.headerTop = '44px';
// #endif // #endif
this.newstypeid = options.id;
this.getDictionaryByCodeType(); this.getDictionaryByCodeType();
}, },
// onShow() { // onShow() {
@ -114,8 +115,7 @@
getDictionaryByCodeType(datas).then(res => { getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.newsTyplist = res.return_data; this.newsTyplist = res.return_data;
this.newstypeid = res.return_data[0].codeValue; this.getMsgByList(this.newstypeid);
this.getMsgByList(res.return_data[0].codeValue);
} }
}) })
}, },

26
pages/user/order_details/order_details.vue
Unescape View File

@ -484,7 +484,12 @@
<!-- 再来一单 --> <!-- 再来一单 -->
<view class="height50 width100"></view> <view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend"> <view class="bottomstu backcorfff width100 height50 alijusend">
<!-- #ifdef MP-->
<button open-type="contact" class="cusservice font12 fcor666">联系客服</button> <button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
<!-- #endif -->
<!-- #ifdef H5-->
<view class="cusservice font12 fcor666 alijus" @click="playPhone">联系客服</view>
<!-- #endif -->
<!-- <view class="buybtn font12 fcorfff">再来一单</view> --> <!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
</view> </view>
</view> </view>
@ -734,6 +739,27 @@
} }
}); });
}, },
//拨打客服电话
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);
}
})
}
}
})
},
toPay(item) { toPay(item) {
let payTypes; let payTypes;
if (this.recinfo.payType == 1 || this.recinfo.payType == null) { if (this.recinfo.payType == 1 || this.recinfo.payType == null) {

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

@ -124,19 +124,19 @@
</view> </view>
<view class="width94 line1 marb5"></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%;"> <view class="width40 flleft fcor666 font15 text1 alijusstart" style="padding-left: 2%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image> <image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
</view> </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;"> style="align-items: center;">
返{{rebateIntegral}}积分 返{{rebateIntegral}}积分
</view> </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;"> style="align-items: center;">
{{rebateIntegral}} {{rebateIntegral}}
</view> </view> -->
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;"> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

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

@ -61,7 +61,7 @@
<!-- 星巴克 --> <!-- 星巴克 -->
<view v-if="typeid == 9 && recinfo.object.orderItems[0].code"> <view v-if="typeid == 9 && recinfo.object.orderItems[0].code">
<view class="fotct font18 width100 mart10 color2f6f43" <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>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list"> <view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list">
<!-- {{recinfo.statusDesc}} --> <!-- {{recinfo.statusDesc}} -->
@ -188,7 +188,12 @@
<!-- 再来一单 --> <!-- 再来一单 -->
<view class="height50 width100"></view> <view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3 || orderList.orderStatus == 1"> <view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3 || orderList.orderStatus == 1">
<!-- #ifdef MP-->
<button open-type="contact" class="cusservice font12 fcor666" v-if="orderList.orderStatus == 3">联系客服</button> <button open-type="contact" class="cusservice font12 fcor666" v-if="orderList.orderStatus == 3">联系客服</button>
<!-- #endif -->
<!-- #ifdef H5-->
<view class="cusservice font12 fcor666 alijus" v-if="orderList.orderStatus == 3" @click="playPhone">联系客服</view>
<!-- #endif -->
<view class="buybtn font12 fcorfff" v-if="orderList.orderStatus == 1" @click="thirdCancelOrder">取消订单</view> <view class="buybtn font12 fcorfff" v-if="orderList.orderStatus == 1" @click="thirdCancelOrder">取消订单</view>
</view> </view>
@ -371,6 +376,27 @@
holdTime--; holdTime--;
}, 1000) }, 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() { showtime() {
var nowtime = new Date(), //获取当前时间 var nowtime = new Date(), //获取当前时间

8
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -82,19 +82,19 @@
</view> </view>
<view class="width94 line1 mart5 marb5"></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%;"> <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> <image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text> <text>下单返积分</text>
</view> </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;"> style="align-items: center;">
返{{rebateIntegral}}积分 返{{rebateIntegral}}积分
</view> </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;"> style="align-items: center;">
{{rebateIntegral}} {{rebateIntegral}}
</view> </view> -->
</view> </view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;"> <view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image> <image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>

Write Preview
Loading…
Cancel
Save