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

1.优化2.0确认订单页面汇联通工会卡

Browse Source 
2.优化2.0消息中心问题
yj-dev
杨杰 2 years ago
parent 6e88877847
commit 2ade2e4e68
8 changed files with 112 additions and 98 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. 38
      pages/goods/refuel-confirm/refuel-confirm.vue
  2. 13
      pages/order/confirmation.vue
  3. 67
      pages/user/news/news.vue
  4. 8
      pages/user/order_details/order_details.vue
  5. 20
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  6. 4
      qianzhu-KFC/order-details/order-details.vue
  7. BIN
      qianzhu-KFC/static/imgs/desloca.png
  8. 28
      subPages/unionComfirmation/unionComfirmation.vue

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

@ -170,7 +170,7 @@
油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text> 油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
<radio :checked="paytype=='6'" @click="changeRiado()" color="#0083f5" /> <radio :checked="paytype=='6'" color="#0083f5" />
</view> </view>
</view> </view>
@ -184,8 +184,7 @@
</view> </view>
</view> </view>
<view class="line1" v-if="item ==7"></view> <view class="line1" v-if="item ==7"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item ==7" <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item ==7" @tap="paytype='7'">
@tap="paytype='7'">
<view class="width60 flleft font14"> <view class="width60 flleft font14">
车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text> 车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
</view> </view>
@ -249,7 +248,7 @@
<view class="width80p"> <view class="width80p">
<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view> <view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
<view class="font13 fcor999 mart5"> <view class="font13 fcor999 mart5">
有效期:{{items.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} 有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
</view> </view>
<view class="width20 fotrt"> <view class="width20 fotrt">
@ -400,6 +399,7 @@
} }
this.canUseDiscount(); this.canUseDiscount();
this.oilPriceDiscountCompute(); this.oilPriceDiscountCompute();
this.getHuiLianTongCardBalance();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
@ -680,10 +680,21 @@
return; return;
} }
if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') { if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') {
let cardNo;
if (this.paytype == 3) {
cardNo = this.user.hltCardNo.cardNo;
}
if (this.paytype == 6) {
cardNo = this.user.oilCard.cardNo;
}
if (this.paytype == 7) {
cardNo = this.oilUserno;
}
let params = { let params = {
"orderNo": this.orderNo, "orderNo": this.orderNo,
"cardNo": this.user.hltCardNo.cardNo, "cardNo": cardNo,
"password": this.PaymentPassword "password": this.PaymentPassword,
"carLicensePlate": this.cardNoNumber
} }
cardPay(params).then(res => { cardPay(params).then(res => {
uni.hideLoading(); uni.hideLoading();
@ -743,7 +754,7 @@
}, },
//获取选择支付方式 //获取选择支付方式
changeRiado() { changeRiado() {
if (!this.user.isSetOilCard) { if (!this.user.setHltCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '当前账号还未绑定,前往绑定', title: '当前账号还未绑定,前往绑定',
@ -926,7 +937,7 @@
}) })
return; return;
} }
if (!that.user.isSetOilCard) { if (!that.user.setHltCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '当前账号还未绑定,前往绑定', title: '当前账号还未绑定,前往绑定',
@ -960,7 +971,7 @@
}) })
return; return;
} }
if (!that.user.isSetHltCard) { if (!that.user.isSetOilCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '当前账号还未绑定,前往绑定', title: '当前账号还未绑定,前往绑定',
@ -978,15 +989,6 @@
that.$refs.paymentPassword.modalFun('show'); that.$refs.paymentPassword.modalFun('show');
} }
if (that.paytype == 'jifen') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
that.$refs.paymentPassword.modalFun('show');
}
}, },
payRequest: function(self) { payRequest: function(self) {

13
pages/order/confirmation.vue
Unescape View File

@ -657,6 +657,12 @@
} }
}) })
} else if (that.paytype == '3') { } else if (that.paytype == '3') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../login/updatePas/updatePas'
})
return;
}
if (that.tongCardPrice < that.paytheprice) { if (that.tongCardPrice < that.paytheprice) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -665,12 +671,7 @@
}); });
return; return;
} }
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../login/updatePas/updatePas'
})
return;
}
if (!that.user.isSetHltCard) { if (!that.user.isSetHltCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

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

@ -13,7 +13,7 @@
<view v-if="newsList == ''" class="mart60 fotct font14 fcor666"> <view v-if="newsList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view> </view>
<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index"> <view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index" @click="jumporther(item)">
<view class="alijusstart mart10 margle10" v-if="item.type == 1"> <view class="alijusstart mart10 margle10" v-if="item.type == 1">
<image src="../../../static/img/user/notive.png" mode="widthFix" class="icon30"></image> <image src="../../../static/img/user/notive.png" mode="widthFix" class="icon30"></image>
<text class="font18 margle" style="color: #0B1D83;">服务通知</text> <text class="font18 margle" style="color: #0B1D83;">服务通知</text>
@ -36,7 +36,7 @@
<!-- 交易信息 --> <!-- 交易信息 -->
<view class="width90 mart20" v-if="item.type == 2"> <view class="width90 mart20" v-if="item.type == 2">
<view class="font18 fcor333">{{item.title}}</view> <view class="font18 fcor333">{{item.title}}</view>
<view class="mart10 border-r backcor9"> <view class="mart15 border-r backcor9">
<view class="font20 colore95 fontwig6 paddtop10 fotct">¥{{item.content | msgFormat('price')}}</view> <view class="font20 colore95 fontwig6 paddtop10 fotct">¥{{item.content | msgFormat('price')}}</view>
<view class="width94 mart10 alijusstart font14"> <view class="width94 mart10 alijusstart font14">
<view class="fontwig6 fcor333 width30">交易对象</view> <view class="fontwig6 fcor333 width30">交易对象</view>
@ -47,8 +47,8 @@
<view class="fontwig6 fcor333 width30">交易时间</view> <view class="fontwig6 fcor333 width30">交易时间</view>
<view class="width70 fcor666 fotrt">{{item.content | msgFormat('time') }}</view> <view class="width70 fcor666 fotrt">{{item.content | msgFormat('time') }}</view>
</view> </view>
<view class="font16 fcor666 alijus mart10 fotct paddbotm20">查看详情<image <view class="font16 fcor666 alijus mart15 fotct paddbotm20" @click="jumpDetails(item.content)">查看详情
src="../../../static/img/jt.png" mode="widthFix" class="icon15 margle"></image> <image src="../../../static/img/jt.png" mode="widthFix" class="icon15 margle"></image>
</view> </view>
</view> </view>
</view> </view>
@ -86,10 +86,7 @@
newsTyplist: [], //消息类型 newsTyplist: [], //消息类型
newsList: [], // 信内容 newsList: [], // 信内容
newstypeid: 1, //类型id newstypeid: 1, //类型id
headerTop: '0px', headerTop: '0px'
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
} }
}, },
filters: { filters: {
@ -103,13 +100,11 @@
// #ifdef H5 // #ifdef H5
this.headerTop = '44px'; this.headerTop = '44px';
// #endif // #endif
},
onShow() {
this.getDictionaryByCodeType(); this.getDictionaryByCodeType();
}, },
onReachBottom() { // onShow() {
this.getMsgByList(); // this.getDictionaryByCodeType();
}, // },
methods: { methods: {
//查询类型 //查询类型
getDictionaryByCodeType() { getDictionaryByCodeType() {
@ -126,37 +121,49 @@
}, },
//切换 //切换
changeValue(item) { changeValue(item) {
this.pageNum = 1;
this.newsList = []; this.newsList = [];
this.isNoMoreData = false;
this.getMsgByList(item); this.getMsgByList(item);
}, },
//查询列表 //查询列表
getMsgByList(item) { getMsgByList(item) {
this.newstypeid = item; this.newstypeid = item;
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let datas = { let datas = {
companyId: app.globalData.companyId, companyId: app.globalData.companyId,
type: item, type: item
pageNum: this.pageNum,
pageSize: this.pageSize
} }
getMsgByList(datas).then(res => { getMsgByList(datas).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') { if (res.return_code == '000000' && res.return_data != '') {
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true; this.newsList = res.return_data;
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.newsList = this.newsList.concat(res.return_data.list);
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else { } else {
this.newsList = []; this.newsList = [];
} }
}) })
},
//根据类型跳转详情
jumpDetails(item1) {
let lists = JSON.parse(item1);
if (lists.productType == 1 || lists.productType == 2 || lists.productType == 3) {
uni.navigateTo({
url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo
})
} else {
uni.navigateTo({
url: '/pages/user/order_details/order_details?id=' + lists.orderNo
})
}
},
//客服信息
jumporther(item){
if(item.jumpType == 2){
uni.navigateTo({
url: '/pages/tabBar/order/webUrl/webUrl?url=' + item.content
})
}
if(item.jumpType == 3){
uni.navigateTo({
url:item.content
})
}
} }
} }
} }

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

@ -54,7 +54,8 @@
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 2">微信支付</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 2">微信支付</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通银联支付工会卡</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 7">嗨森逛个人油卡</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 8">嗨森逛车队油卡</view>
</view> </view>
<view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6"> <view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6">
<view class="width20 fcor777">地址</view> <view class="width20 fcor777">地址</view>
@ -142,9 +143,12 @@
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice"> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-else> <view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="recinfo.productType == 6 && recinfo.payRealPrice">
加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text> 加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
</view> </view>
<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="recinfo.productType != 6 && recinfo.payRealPrice">
实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
</view>
</view> </view>

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

@ -450,10 +450,11 @@
result = result1.toFixed(2); result = result1.toFixed(2);
}) })
// let resul2 = 0; let resul2 = 0;
let result3 = 0; let result3 = 0;
this.orderList.forEach((good) => { this.orderList.forEach((good) => {
result3 += this.accMul(good.num, good.oldprice) resul2 += this.accMul(good.num, good.oldprice);
result3 = resul2.toFixed(2);
this.disconutprice = (result3 - result).toFixed(2); this.disconutprice = (result3 - result).toFixed(2);
}) })
@ -808,6 +809,13 @@
} }
}) })
} else if (that.paytype == '3') { } else if (that.paytype == '3') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../pages/login/updatePas/updatePas'
})
that.thirdCancelOrder();
return;
}
if (that.tongCardPrice < that.payPrice) { if (that.tongCardPrice < that.payPrice) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -817,13 +825,7 @@
that.thirdCancelOrder(); that.thirdCancelOrder();
return; return;
} }
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../pages/login/updatePas/updatePas'
})
that.thirdCancelOrder();
return;
}
if (!that.user.isSetHltCard) { if (!that.user.isSetHltCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

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

@ -11,10 +11,10 @@
</view> </view>
<view class=" paddtop10 paddbotm10 headsbg backcorfff fotct" v-if="orderList.orderStatus != 1 && typeid != 10"> <view class=" paddtop10 paddbotm10 headsbg backcorfff fotct" v-if="orderList.orderStatus != 1 && typeid != 10">
<view class="headotherstu alijus font18 fontwig6" <!-- <view class="headotherstu alijus font18 fontwig6"
v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3"> v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3">
<image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image> <image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image>
</view> </view> -->
<view class="width100 font18 fcorfff mart15" <view class="width100 font18 fcorfff mart15"
v-if=" orderList.orderStatus != 2 && orderList.orderStatus != 3"> v-if=" orderList.orderStatus != 2 && orderList.orderStatus != 3">
{{typeText[orderList.orderStatus]}} {{typeText[orderList.orderStatus]}}

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 904 B

After

Width:  |  Height:  |  Size: 6.3 KiB

28
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -131,7 +131,7 @@
</view> </view>
</view> </view>
<!-- <image :src="imagewxUrl+imgadres1" class="width100 mart20 marb30" mode="widthFix"></image> --> <!-- <image :src="imagewxUrl+imgadres1" class="width100 mart20 marb30" mode="widthFix"></image> -->
<view class="width100 height60"></view> <view class="width100 height110"></view>
<view class="footer"> <view class="footer">
<view class="settlement"> <view class="settlement">
<!-- v-if="paytype == '2' || paytype == '3' " --> <!-- v-if="paytype == '2' || paytype == '3' " -->
@ -644,8 +644,8 @@
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '../Phone-recharge-details/Phone-recharge-details?id=' + url: '../../pages/user/order_details/order_details?id=' +
that.orderId this.orderId
}) })
}, },
fail: function(err) { fail: function(err) {
@ -669,6 +669,12 @@
} }
}) })
} else if (that.paytype == '3') { } else if (that.paytype == '3') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../pages/login/updatePas/updatePas'
})
return;
}
if (that.tongCardPrice < that.payPrice) { if (that.tongCardPrice < that.payPrice) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -677,12 +683,7 @@
}); });
return; return;
} }
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../pages/login/updatePas/updatePas'
})
return;
}
if (!that.user.isSetHltCard) { if (!that.user.isSetHltCard) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -739,8 +740,7 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.orderId = res.return_data.orderNo; this.orderId = res.return_data.orderNo;
uni.reLaunch({ uni.reLaunch({
url: '../Phone-recharge-details/Phone-recharge-details?id=' + url: '../../pages/user/order_details/order_details?id=' + this.orderId
this.orderId
}) })
return; return;
} }
@ -770,8 +770,7 @@
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '../Phone-recharge-details/Phone-recharge-details?id=' + url: '../../pages/user/order_details/order_details?id=' + this.orderId
this.orderId
}) })
return; return;
} }
@ -825,8 +824,7 @@
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '../Phone-recharge-details/Phone-recharge-details?id=' + url: '../../pages/user/order_details/order_details?id=' +that.orderId
that.orderId
}) })
}, },
cancel: function(r) { cancel: function(r) {

Write Preview
Loading…
Cancel
Save