diff --git a/App.vue b/App.vue index d744daa..4e1d136 100644 --- a/App.vue +++ b/App.vue @@ -5,15 +5,15 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - url: 'https://hsg.dctpay.com/crest', - imgUrl: 'https://hsg.dctpay.com/filesystem/', - brestUrl : 'https://hsg.dctpay.com/brest', - imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', + // url: 'https://hsg.dctpay.com/crest', + // imgUrl: 'https://hsg.dctpay.com/filesystem/', + // brestUrl : 'https://hsg.dctpay.com/brest', + // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', //测试 - // url: 'https://hsgcs.dctpay.com/crest', - // brestUrl : 'https://hsgcs.dctpay.com/brest', - // imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', + url: 'https://hsgcs.dctpay.com/crest', + brestUrl : 'https://hsgcs.dctpay.com/brest', + imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', userInfo: "", brestUserInfo : '', openId: '', diff --git a/pages.json b/pages.json index b2c8d06..6fcdf7e 100644 --- a/pages.json +++ b/pages.json @@ -526,6 +526,19 @@ } } + ,{ + "path" : "pages/user/cardDes/cardDes", + "style" : + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "绑定卡号", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + } ], "globalStyle": { diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index 4dcbf25..bace2bc 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -247,7 +247,7 @@ if (!app.globalData.userInfo.isSetPayPwd) { this.czList = [{ - url: '../../user/unionCard/unionCard', + url: '../../user/cardDes/cardDes', text: '工会卡', img: '../../../static/img/ghkpay.png' }, @@ -259,8 +259,9 @@ ] return; } + // '../../user/unionCard/unionCard' this.czList = [{ - url: '../../user/unionCard/unionCard', + url: '../../user/cardDes/cardDes', text: '工会卡', img: '../../../static/img/ghkpay.png' }, diff --git a/pages/user/bindingCard/bindingCard.vue b/pages/user/bindingCard/bindingCard.vue index 79e7d15..2e02816 100644 --- a/pages/user/bindingCard/bindingCard.vue +++ b/pages/user/bindingCard/bindingCard.vue @@ -16,7 +16,10 @@ 绑定卡号 获取预留手机号 - + + 【温馨提示】 + 1元可抵扣100积分 + @@ -109,8 +112,8 @@ getHuiLianTongCardByCardNo(params).then(res => { uni.hideLoading() if (res.return_code == '000000') { - this.phoneNumber = res.return_data.userMobile; - // this.phoneNumber = 15583658692; + // this.phoneNumber = res.return_data.userMobile; + this.phoneNumber = 15583658692; this.disStute = true } else { uni.showToast({ @@ -165,7 +168,9 @@ duration: 2000, success() { setTimeout(() => { - uni.navigateBack({}) + uni.navigateBack({ + delta: 2 + }) }, 1000) } }); diff --git a/pages/user/cardDes/cardDes.vue b/pages/user/cardDes/cardDes.vue new file mode 100644 index 0000000..ee5c9d9 --- /dev/null +++ b/pages/user/cardDes/cardDes.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/pages/user/unionCard/unionCard.vue b/pages/user/unionCard/unionCard.vue index f5bb22e..5c6bbf2 100644 --- a/pages/user/unionCard/unionCard.vue +++ b/pages/user/unionCard/unionCard.vue @@ -48,11 +48,11 @@ - {{cardInfp.orderNo}} - -{{cardInfp.tranAmount}}元 + 订单编号:{{cardInfp.orderNo}} + -{{cardInfp.tranAmount}} - 消费时间:{{cardInfp.tranTime}} + {{cardInfp.tranTime}} @@ -91,7 +91,6 @@ ], titleValue:'sinopec_oil_code', titleName:'中石化加油券', - tongCardInfo : '', tongCardPrice:0, cardConsumeList : [], pageNum: 1, @@ -104,23 +103,6 @@ }, onShow() { - this.user = app.globalData.userInfo; - if (!this.user.isSetHltCard) { - uni.showToast({ - icon: 'none', - title: '当前账号还未绑定,前往绑定', - duration: 2000, - success() { - setTimeout(() => { - uni.navigateTo({ - url: '../bindingCard/bindingCard' - }) - }, 1000) - } - }); - - return; - } this.getUserCardList(); }, //上滑刷新 @@ -183,43 +165,6 @@ this.UserCard = ''; }); }, - //解除绑定我的卡号列表 - delUserCard() { - let that = this; - uni.showModal({ - content: '是否确定解除当前绑定卡号?', - success: (res) => { - if (res.confirm) { - let params = { - cardNo: that.user.hltCardNo.cardNo - } - delUserCard(params).then(res => { - if (res.return_code == '000000') { - uni.showToast({ - title:'解除成功', - duration:2000, - icon:'success', - success() { - setTimeout(() => { - uni.navigateBack({ - }) - }, 1000) - } - }) - }else{ - uni.showToast({ - title: res.return_msg, - duration:2000, - icon:'none' - }) - } - }); - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); - }, //查询详情 getHuiLianTongCardBalance() { let params = { @@ -227,7 +172,6 @@ } getHuiLianTongCardBalance(params).then(res => { if (res.return_code == '000000') { - this.tongCardInfo = res.return_data; this.tongCardPrice = res.return_data.balance; } diff --git a/static/img/cards.jpg b/static/img/cards.jpg new file mode 100644 index 0000000..8a0a71b Binary files /dev/null and b/static/img/cards.jpg differ