diff --git a/App.vue b/App.vue
index eb2a24c..751aaba 100644
--- a/App.vue
+++ b/App.vue
@@ -32,7 +32,9 @@
//门店ID
storeid:'',
//门店名字
- storename:''
+ storename:'',
+ //公众号进入值
+ accountId:''
},
onLaunch: function() {
},
diff --git a/Utils/Api.js b/Utils/Api.js
index a5a7d9d..1431920 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -26,7 +26,11 @@ export const setUserPayPwd = params => {
// 修改用户积分支付密码
export const updateUserPayPwd = params => {
return POST('POST', `${base}/highUser/updateUserPayPwd`, params).then(res => res.data);
-}
+}
+//经纬度转换
+export const findByLatAndLng = params => {
+ return POST('GET', `${base}/common/findByLatAndLng`, params).then(res => res.data);
+}
//获取用户信息
export const findUser = params => {
@@ -176,8 +180,11 @@ export const getGasStoreList = params => {
//查询团油详情
export const getGasDetailByStoreKey = params => {
return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data);
-}
-
+}
+//团油距离限制
+export const getDictionaryByCodeTypeOl = params => {
+ return POST('GET', `${base}/common/getDictionaryByCodeTypeOl`, params).then(res => res.data);
+}
//获取已开通的省份
export const getDredgeProvince = params => {
return POST('GET', `${base}/common/getDredgeProvince`, params).then(res => res.data);
@@ -237,7 +244,11 @@ export const hltUnionCardPay = params => {
}
export const bindHuiLianTongCard = params => {
return POST('POST', `${base}/highUserCard/bindHuiLianTongCard`, params).then(res => res.data);
-}
+}
+//手机短信登录
+export const loginByTel = params => {
+ return POST('POST', `${base}/wechat/loginByTel`, params).then(res => res.data);
+}
/**
* 工会卡
*/
@@ -342,7 +353,10 @@ export const generateCode = params => {
export const highremark = params => {
return POSTBREST('POST', `${brestBase}/highCouponAgent/remark`, params).then(res => res.data);
}
-
+//查询兑换码
+export const getAgentConvertCodeCount = params => {
+ return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentConvertCodeCount`, params).then(res => res.data);
+}
// 查看二维码
export const getCodeById = params => {
return POSTBREST('GET', `${brestBase}/highCouponAgent/getCodeById`, params).then(res => res.data);
diff --git a/components/QS-tabs/QS-tabs.vue b/components/QS-tabs/QS-tabs.vue
new file mode 100644
index 0000000..3f18146
--- /dev/null
+++ b/components/QS-tabs/QS-tabs.vue
@@ -0,0 +1,484 @@
+
+
+
+
+
+
+
+
+ {{item.name || item}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/yy-video-player/yy-video-player.nvue b/components/yy-video-player/yy-video-player.nvue
index e39a22a..5e8fa25 100644
--- a/components/yy-video-player/yy-video-player.nvue
+++ b/components/yy-video-player/yy-video-player.nvue
@@ -46,7 +46,6 @@ export default {
},
processBarColor:{
type:String,
- default:"#39BFFD"
}
},
data() {
diff --git a/pages.json b/pages.json
index 2e2af72..4bf1fd6 100644
--- a/pages.json
+++ b/pages.json
@@ -632,10 +632,20 @@
}, {
"path": "trade-union-recharge/trade-union-recharge",
"style": {
- "navigationBarTitleText": "工会卡充值",
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
+ "navigationBarTitleText": "工会卡充值",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "union-card-success/union-card-success",
+ "style": {
+ "navigationBarTitleText": "充值成功",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
}
diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue
index c6c92b5..c94021d 100644
--- a/pages/goods/coupons-info-details/coupons-info-details.vue
+++ b/pages/goods/coupons-info-details/coupons-info-details.vue
@@ -27,19 +27,27 @@
备注:{{couponDesInfo.couponAgentCode.remark}}
-
- 核销码(商户扫客户)
-
+
+ 核销码(商户扫客户)
+
请告知加油员用码商支付
-
+
-
+
点击下方复制按钮,复制兑换码发送用户
{{couponDesInfo.couponAgentCode.convertCode}}
复制兑换码
-
+
+
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index 6462245..ac3e8de 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -22,7 +22,7 @@
-
+
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index dfdc36f..a289b14 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -1,413 +1,467 @@
-
-
-
-
-
-
- {{orderList.goodsName}}
- {{refulAdress}}
- ¥{{orderList.gasPriceVip}}
- ¥{{orderList.gasPriceGun}}
-
-
-
-
- 订单详情
-
-
-
- 油号\油枪
-
-
- {{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
-
-
-
-
-
- 加油金额
-
-
- {{orderList.totalPrice}}
-
-
+
+
+
+
+
+
+ {{orderList.goodsName}}
+ {{refulAdress}}
+ ¥{{orderList.gasPriceVip}}
+ ¥{{orderList.gasPriceGun}}
+
+
+
+
+ 订单详情
+
+
+
+ 油号\油枪
+
+
+ {{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
+
+
+
+
+
+ 加油金额
+
+
+ {{orderList.totalPrice}}
+
+
+
+
+ 支付方式
+
+
+
-
- 支付方式
-
-
-
-
+
- 微信支付
+ 积分支付
-
+
-
-
-
-
- 汇联通工会卡余额: {{tongCardPrice}}元
-
-
-
-
-
-
-
- 重要说明
- 1.请先加油后下单,即您到站后,与工作人员确认油号,抢号后再付款。
-
- 2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 8d5f6c6..5f955cf 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -1,487 +1,605 @@
-
-
-
-
-
-
- {{storeList.gasName}}
- {{storeList.gasAddress}}
-
-
-
- {{storeList.distance}}km
-
-
-
- 营业时间 : 00:00-23:59
-
-
-
-
-
-
- {{oilNo}}
-
-
-
- 平台价
- ¥{{priceVip}}
-
-
- 油站价
- ¥{{priceGun}}
-
-
- 国标价
- ¥{{priceOfficial}}
-
-
-
-
-
- 我要加油
-
-
- 选择油号
-
-
- {{oilNo}}
-
-
-
-
-
- 选择油枪
-
-
- {{gunNo}}号
-
-
-
-
-
-
-
- 加油金额
-
- ¥
-
-
- 约{{litre}}L
-
-
-
-
-
-
-
-
- 选择油号
- 选择油枪
- 汽油油号
- 汽油油枪
-
-
- {{swiper.oilNoName}}
-
-
-
-
-
- {{item.gunNo}}
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/goods/refuel-succes/refuel-succes.vue b/pages/goods/refuel-succes/refuel-succes.vue
index e44f269..6cb378b 100644
--- a/pages/goods/refuel-succes/refuel-succes.vue
+++ b/pages/goods/refuel-succes/refuel-succes.vue
@@ -68,9 +68,9 @@
¥{{orderInfo.deductionPrice}}
-
+
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index d088b05..fb1b4b6 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -306,11 +306,15 @@
],
onilName: '92#',
latitudeful:'',
- longitudeful:''
+ longitudeful:'',
+ isTyAgent: false //是否是代理商
}
},
onLoad() {
let that = this;
+ if (app.globalData.accountId) {
+ that.isTyAgent = true;
+ }
uni.getLocation({
type: 'wgs84',
success: function(res) {
@@ -396,7 +400,8 @@
latitude: this.latitudeful,
longitude: this.longitudeful,
pageNum: pagenum,
- pageSize: this.pageSize
+ pageSize: this.pageSize,
+ isTyAgent: this.isTyAgent
}
getGasStoreList(params).then(res => {
if (res.return_code == '000000') {
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index f418e69..bbb604d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -90,12 +90,12 @@
-
- 支付方式
+
+ 支付方式 积分充值
-
积分支付可用积分: {{user.gold}}
@@ -105,7 +105,7 @@
-
+
@@ -116,8 +116,8 @@
-
-
+
+
汇联通工会卡可用余额: {{tongCardPrice}}元
@@ -168,10 +168,10 @@
-
+
{{items.highDiscount.discountName}}
- 有效期至:{{items.highDiscount.salesEndTime | formatDate('-')}}
+ 有效期至:{{items.useEndTime | formatDate('-')}}
@@ -227,8 +227,9 @@
jumpType: '',
tongCardPrice: 0,
storeId: '',
- isDiscont: false,
- coupondiscountid:''
+ isDiscont: false,
+ coupondiscountid: '',
+ orderDetails:'' //订单详情
};
},
@@ -309,24 +310,24 @@
this.$refs.popup.show();
},
radioChanges(item) {
- if (this.memDiscountId == item.highDiscount.id) { // 如果已经选中,则取消选中
- this.memDiscountId = '';
+ if (this.memDiscountId == item.id) { // 如果已经选中,则取消选中
+ this.memDiscountId = '';
this.coupondiscountid = '';
this.paytheprice = this.couponList.discountPrice;
this.deductionPrice = '0.00';
this.isDiscont = false;
} else { // 否则进行选中赋值
this.isDiscont = true;
- this.memDiscountId = item.highDiscount.id;
+ this.memDiscountId = item.id;
this.coupondiscountid = item.id;
if (item.highDiscount.discountType == 1) {
//满减价格
this.deductionPrice = item.highDiscount.discountPrice;
- this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+ this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
} else if (item.highDiscount.discountType == 2) {
//抵扣价格
this.deductionPrice = item.highDiscount.discountPrice;
- this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+ this.paytheprice = parseFloat(this.couponList.salesPrice - this.deductionPrice).toFixed(2);
} else if (item.highDiscount.discountType == 3) {
// 打折
this.deductionPrice = parseFloat(this.couponList.salesPrice - (this.couponList.salesPrice *
@@ -414,7 +415,11 @@
duration: 2000
})
return;
- }
+ }
+ if(this.orderDetails){
+ this.orderToPay(this.orderDetails);
+ return;
+ }
uni.showLoading({
title: '提交订单中...'
})
@@ -441,7 +446,8 @@
// .highChildOrderList[0].ext1
// })
this.jumpType = res.return_data.highChildOrderList[0].ext1;
- this.orderId = res.return_data.id;
+ this.orderId = res.return_data.id;
+ this.orderDetails = res.return_data;
this.orderToPay(res.return_data);
} else {
uni.hideLoading();
@@ -731,7 +737,13 @@
duration: 4000
});
});
- },
+ },
+ //跳转积分充值
+ jumpdeposits(){
+ uni.navigateTo({
+ url:'../user/deposit/deposit'
+ })
+ }
}
}
@@ -917,7 +929,7 @@
align-items: center;
.sum {
- width: 50%;
+ width: 68%;
font-size: 18px;
margin-right: 10upx;
display: flex;
@@ -930,7 +942,7 @@
}
.btn {
- padding: 0 50rpx;
+ padding: 0 45rpx;
height: 80rpx;
background-color: #0083f5;
color: #fff;
@@ -943,6 +955,17 @@
}
}
+ .jfrecharge {
+ background-color: #0083f5;
+ padding: 5px 20rpx;
+ color: #fff;
+ margin-left: 50%;
+ justify-content: center;
+ align-items: center;
+ font-size: 30rpx;
+ border-radius: 40rpx;
+ }
+
.goods-list {
width: 100%;
padding: 0;
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index 42f0118..56dea76 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -18,7 +18,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 8547f90..22dc7b9 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -65,7 +65,6 @@
-
@@ -85,11 +84,13 @@
-
-
-
+
+
+
+
+
@@ -104,7 +105,8 @@
getTPigKFCToken,
getTPigCinemaToken,
getCmsContent,
- getMembershipLevel
+ getMembershipLevel,
+ findByLatAndLng
} from "../../../Utils/Api.js"; //您的api路径
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp();
@@ -185,8 +187,8 @@
}
},
onLoad(options) {
+ app.globalData.accountId = options.accountId;
let that = this;
-
// 1.wx获取登录用户code
// #ifdef MP
uni.login({
@@ -346,7 +348,7 @@
success: function(res) {
app.globalData.latitude = res.latitude;
app.globalData.longitude = res.longitude;
- that.getUserLocation(res.longitude, res.latitude);
+ // that.findByLatAndLng(res.longitude, res.latitude);
// #ifdef MP
uni.request({
url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + res.latitude +
@@ -368,14 +370,47 @@
that.getCmsContentcmshome();
that.getCmsContentcmsContent();
},
- fail() {
+ fail(err) {
uni.hideLoading()
}
})
//#endif
+ },
+ fail: (err) => {
+ if (err.errCode == 2) {
+ uni.showToast({
+ title: '请开启系统定位',
+ duration: 3000,
+ icon: 'none'
+ })
+ }
}
})
},
+ //经纬度转换
+ findByLatAndLng(item, item1) {
+ let that = this;
+ let datas = {
+ lng: item,
+ lat: item1
+ }
+ findByLatAndLng(datas).then(res => {
+ if (res.return_code == '000000') {
+ that.city = res.return_data.result.addressComponent.province;
+ app.globalData.cityName = res.return_data.result.addressComponent
+ .province;
+ app.globalData.cityId = res.return_data.result.addressComponent.adcode;
+ // app.globalData.cityId = '500100';
+ that.getCouponListArea();
+ that.getCouponListgold();
+ uni.hideLoading();
+ that.getCmsContent();
+ that.getCmsAactibity();
+ that.getCmsContentcmshome();
+ that.getCmsContentcmsContent();
+ }
+ });
+ },
//H5 获取openId
getH5AccessToken(item) {
let params = {
@@ -449,7 +484,6 @@
})
.catch(err => {
uni.hideLoading()
- console.log(err);
});
},
@@ -488,8 +522,8 @@
return;
}
this.productListleg = res.return_data.total;
- }else{
- this.productList = [];
+ } else {
+ this.productList = [];
}
})
},
@@ -510,8 +544,8 @@
return;
}
this.goldproductListleg = res.return_data.total;
- }else{
- this.productList = [];
+ } else {
+ this.productList = [];
}
})
},
@@ -581,18 +615,18 @@
//跳转菜单
toCategory(item) {
- if (!app.globalData.userInfo.phone) {
- uni.navigateTo({
- url: '../../userLogin/userLogin'
- })
- return;
- }
- if (!app.globalData.userInfo) {
- uni.navigateTo({
- url: '../../userLogin/userLogin'
- })
- return;
- }
+ // if (!app.globalData.userInfo.phone) {
+ // uni.navigateTo({
+ // url: '../../userLogin/userLogin'
+ // })
+ // return;
+ // }
+ // if (!app.globalData.userInfo) {
+ // uni.navigateTo({
+ // url: '../../userLogin/userLogin'
+ // })
+ // return;
+ // }
if (item.title == '在线加油') {
uni.navigateTo({
url: item.ext1
@@ -628,18 +662,18 @@
},
//单独跳转话费充值
jumphuafei(item) {
- if (!app.globalData.userInfo) {
- uni.navigateTo({
- url: '../../userLogin/userLogin'
- })
- return;
- }
- if (!app.globalData.userInfo.phone) {
- uni.navigateTo({
- url: '../../userLogin/userLogin'
- })
- return;
- }
+ // if (!app.globalData.userInfo) {
+ // uni.navigateTo({
+ // url: '../../userLogin/userLogin'
+ // })
+ // return;
+ // }
+ // if (!app.globalData.userInfo.phone) {
+ // uni.navigateTo({
+ // url: '../../userLogin/userLogin'
+ // })
+ // return;
+ // }
if (item.title == '汇联通') {
uni.navigateTo({
url: '/pages/goods/goods-list/goods-list?id=2'
@@ -675,13 +709,13 @@
url: '../../../subPages/preferred-goods/preferred-goods'
})
return;
- }
- if (item.title == '优惠券包') {
- uni.navigateTo({
- url:'../../../subPages/coupon-package/coupon-package'
- })
- return;
- }
+ }
+ if (item.title == '优惠券包') {
+ uni.navigateTo({
+ url: '../../../subPages/coupon-package/coupon-package'
+ })
+ return;
+ }
},
@@ -704,13 +738,13 @@
.popImg {
width: 300px;
height: 440px;
- }
-
- .xfimg{
- width: 80rpx;
- bottom: 60rpx;
- position: fixed;
- right: 40rpx;
+ }
+
+ .xfimg {
+ width: 80rpx;
+ bottom: 60rpx;
+ position: fixed;
+ right: 40rpx;
}
@font-face {
@@ -1182,6 +1216,7 @@
height: 180rpx;
margin-left: 14rpx;
margin-top: 14rpx;
+ float: left;
}
.orange-content .swiper-item .img {
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 93a5725..530bfb8 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -24,18 +24,18 @@
@@ -231,7 +231,7 @@
},
{
url: '../../login/login?id=2',
- text: '我的推广',
+ text: '代理商登录',
img: 'user/renw.png'
}
diff --git a/pages/user/agentCoupons/agentCoupons.vue b/pages/user/agentCoupons/agentCoupons.vue
index e23bd9f..be28572 100644
--- a/pages/user/agentCoupons/agentCoupons.vue
+++ b/pages/user/agentCoupons/agentCoupons.vue
@@ -31,9 +31,9 @@
+ v-if="typeId == 2 && (typeid == 2 || typeid == 3) ">查看详情
+ v-if="typeId == 2 && (typeid == 2 || typeid == 3) && agent.remark !=null ">
备注:{{agent.remark}}
@@ -127,7 +127,7 @@
return false;
}
let pagenum = this.pageNum;
- let params;
+ let params;
if (this.typeId == 1) {
if (this.typeid == 1) {
params = {
@@ -155,11 +155,19 @@
type: 1,
pageSize: this.pageSize
}
- } else {
+ } else if(this.typeid == 2){
params = {
pageNum: pagenum,
couponId: this.couponId,
- status: '2,3',
+ status: 2,
+ type: 2,
+ pageSize: this.pageSize
+ }
+ }else if(this.typeid == 3){
+ params = {
+ pageNum: pagenum,
+ couponId: this.couponId,
+ status: 3,
type: 2,
pageSize: this.pageSize
}
diff --git a/pages/user/cardDes/cardDes.vue b/pages/user/cardDes/cardDes.vue
index 355963b..e692650 100644
--- a/pages/user/cardDes/cardDes.vue
+++ b/pages/user/cardDes/cardDes.vue
@@ -1,121 +1,129 @@
-
-
-
-
- 卡号 : {{user.hltCardNo.cardNo}}
- 余额 : {{tongCardPrice}}¥
-
- 查询明细
- 解绑
-
-
-
-
-
-
diff --git a/pages/user/deposit/deposit.vue b/pages/user/deposit/deposit.vue
index 32078e1..9d376aa 100644
--- a/pages/user/deposit/deposit.vue
+++ b/pages/user/deposit/deposit.vue
@@ -36,17 +36,6 @@
-
@@ -85,11 +74,11 @@
data() {
return {
inputAmount: '', //金额
- amountList: [10, 50, 100], //预设3个可选快捷金额
+ amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额
paytype: 'wxpay', //支付类型
user: "",
imagewxUrl: app.globalData.imageWxImg,
- imgadres:'wxpay.png'
+ imgadres: 'wxpay.png'
};
},
onLoad() {
@@ -126,7 +115,7 @@
title: '正在提交订单...'
})
let goods = {
- "identificationCode":app.globalData.identificationCode,
+ "identificationCode": app.globalData.identificationCode,
"highChildOrderList": [{
"goodsType": 2,
"goodsId": app.globalData.userInfo.id,
@@ -214,10 +203,10 @@
jweixin.chooseWXPay({
appId: self.return_data.appId,
timestamp: self.return_data
- .timeStamp, // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+ .timeStamp, // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
nonceStr: self.return_data.nonceStr, // 支付签名随机串,不长于 32 位
package: self.return_data
- .package, // 统一支付接口返回的prepay_id参数值,提交格式如:prepay_id=***)
+ .package, // 统一支付接口返回的prepay_id参数值,提交格式如:prepay_id=***)
signType: 'MD5', // 签名方式,默认为'SHA1',使用新版支付需传入'MD5'
paySign: self.return_data.sign, // 支付签名
success: function(res) {
@@ -271,19 +260,22 @@
width: 100%;
.list {
- display: flex;
+ display: flow-root;
justify-content: space-between;
padding: 20upx 0;
.box {
width: 30%;
- height: 120upx;
+ height: 120rpx;
+ float: left;
+ margin-left: 3.333%;
+ margin-top: 20px;
display: flex;
justify-content: center;
align-items: center;
- border-radius: 10upx;
- box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05);
- font-size: 36upx;
+ border-radius: 10rpx;
+ box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05);
+ font-size: 36rpx;
background-color: #f1f1f1;
color: 333;
@@ -295,14 +287,14 @@
}
.num {
- margin-top: 10upx;
+ margin-top: 20upx;
display: flex;
justify-content: flex-end;
align-items: center;
.text {
padding-right: 10upx;
- font-size: 30upx;
+ font-size: 40upx;
}
.input {
@@ -315,7 +307,7 @@
input {
margin: 0 20upx;
height: 60upx;
- font-size: 30upx;
+ font-size: 40upx;
color: #0083f5;
justify-content: flex-end;
align-items: center;
@@ -395,4 +387,4 @@
}
}
}
-
+
diff --git a/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
index 5b08f62..ea02994 100644
--- a/pages/user/mineCouponsDestails/mineCouponsDestails.vue
+++ b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
@@ -1,200 +1,246 @@
-
-
-
-
-
-
-
- {{couponsDetails.highDiscount.discountName}}
-
- 使用截止时间:{{salesEndTime | formatDate('-')}}
-
-
- 领取有效期:{{couponsDetails.highDiscount.effectiveDay}}天
-
-
-
- 可购买的商品
-
-
-
-
-
-
- {{ product.highCoupon.couponName }}
-
-
- ¥{{ product.highCoupon.discountPrice}}
-
-
- ¥{{ product.highCoupon.salesPrice}}
-
-
-
-
-
- {{ product.highCoupon.discountPrice*100}}
-
-
-
- {{ product.highCoupon.salesPrice*100}}
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index deeba7b..350abac 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -1,6 +1,6 @@
- 我的推广
+ 代理商平台
@@ -18,148 +18,228 @@
今日流水
+
+
-
-
-
-
- 库存管理
-
-
-
-
-
-
-
-
-
- 剩余库存({{mineproList.laveStockCount}})
-
-
- 总计 ¥{{mineproList.surplusCountPrice}}
+
+
+
+
+
+ 库存管理
+
+
-
- 暂无数据
-
-
- 面额{{mers.salesPrice}}
-
-
- {{mers.stockCount}}张
+
+
+
+
+
+ 剩余库存({{agentList.laveStockCount}})
+
+
+ 总计 ¥{{agentList.surplusCountPrice}}
+
-
- {{mers.salesPrice*mers.stockCount}}
+
+ 暂无数据
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.stockCount}}张
+
+
+ {{mers.salesPrice*mers.stockCount}}
+
-
-
-
-
-
-
- 销售统计
-
-
-
-
-
-
-
-
-
- 已销售({{mineproList.soldCount}})
-
-
- 总计 ¥{{mineproList.salesCountPrice}}
+
+
+
+
+
+ 销售统计
+
+
- 暂无数据
-
-
-
- 面额{{mers.salesPrice}}
-
-
- {{mers.salesCount}}张
+
+
+
+
+
+ 已销售({{agentList.soldCount}})
+
+
+ 总计 ¥{{agentList.salesCountPrice}}
+
-
- {{mers.salesPrice*mers.salesCount}}
+ 暂无数据
+
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.salesCount}}张
+
+
+ {{mers.salesPrice*mers.salesCount}}
+
-
-
-
-
-
-
- 销核码兑换
-
-
+
+
+
+
+
+
+ 销售统计
+
+
+
-
-
-
-
-
-
- 待使用({{codeList.laveStockCount}})
+
+
+
+
+
+ 待销售({{couponList.noSalesNum}})
+
+
+ 总计 ¥{{couponList.noSalesPrice}}
+
-
- 总计 ¥{{codeList.surplusCountPrice}}
+ 暂无数据
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.stockCount}}张
+
+
+ {{mers.salesPrice*mers.stockCount}}
+
-
- 暂无数据
-
-
- 面额{{mers.salesPrice}}
+
+
+
+
+
+
+
+ 已销售({{couponList.salesNum}})
+
+
+ 总计 ¥{{couponList.salesPrice}}
+
-
- {{mers.salesPrice*mers.stockCount}}
+ 暂无数据
+
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.noUsedNum}}张
+
+
+ {{mers.noUsedPrice}}
+
-
-
-
-
-
-
- 销核码统计
-
-
+
+
+
+
+
+ 使用统计
+
+
+
-
-
-
-
-
-
- 已使用({{codeList.soldCount}})
+
+
+
+
+
+ 待使用({{couponList.noUsedNum}})
+
+
+ 总计 ¥{{couponList.noUsedPrice}}
+
-
- 总计 ¥{{codeList.salesCountPrice}}
+ 暂无数据
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.noUsedNum}}张
+
+
+ {{mers.noUsedPrice}}
+
- 暂无数据
-
-
-
- 面额{{mers.salesPrice}}
+
+
+
+
+
+
+
+ 已使用({{couponList.usedNum}})
+
+
+ 总计 ¥{{couponList.usedPrice}}
+
-
- {{mers.salesPrice*mers.salesCount}}
+ 暂无数据
+
+
+
+ 面额{{mers.salesPrice}}
+
+
+ {{mers.usedNum}}张
+
+
+ {{mers.usedPrice}}
+
@@ -169,51 +249,92 @@
-
-
diff --git a/subPages/Phone-recharge-details/Phone-recharge-details.vue b/subPages/Phone-recharge-details/Phone-recharge-details.vue
index 18e4aec..252fd7d 100644
--- a/subPages/Phone-recharge-details/Phone-recharge-details.vue
+++ b/subPages/Phone-recharge-details/Phone-recharge-details.vue
@@ -32,15 +32,15 @@
订单总额
- {{phoneorderdes.orderPrice}}元
+ {{phoneorderdes.orderPrice == null ? '0': phoneorderdes.orderPrice}}元
优惠
- {{phoneorderdes.deductionPrice}}元
+ {{phoneorderdes.deductionPrice == null ? '0': phoneorderdes.deductionPrice}}元
实际支付金额
- {{phoneorderdes.payRealPrice}}元
+ {{phoneorderdes.payRealPrice == null ? '0': phoneorderdes.payRealPrice}}元
diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index 5d4094a..df3f9c8 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -3,59 +3,107 @@
-
+
-
+
+
+
+
+
选择金额
- {{item.price}}元
+ {{item.price}}元
+ {{item.discount}} 折
已售空
- 话费充值温馨提示:
-
-
- 1:
- 慢充话费与营业厅充值一样,只是到账时间稍长。充值过程中可能出现分批到账的情况,但是总金额不会少,请耐心等待。
-
-
- 2:
- 此业务为话费慢充,日常72小时内到账,如遇月初、月末高峰期或系统更新到账时间会有一定延迟,敬请谅解!急单勿拍!
-
-
- 3:
- 目前仅支持(移动、联通、电信三网号段),
- 运营商黑名单号码(长期欠费或非实名制认证)、携号转网,空号、虚拟卡(如165.167.170.171.162等等虚拟号段)、副卡号码或做过某些特殊套餐绑定的卡暂不支持充值,请勿下单。
+ 充值说明:
-
- 4:
- 停机号码需要额外补缴欠费后,慢充话费才能到账。此服务为虚拟充值类服务,无特殊情况不支持退款,下单前请确认充值的号码无误。
-
-
- 5:
- 空号、错号充值后不支持退款,请您务必核对确认号码无误后再进行充值。非空号欠费可充,欠费1个月导致空号的不能充值,损失自负无法退款。
-
-
- 6:
- 本充值业务不提供发票。如需发票请在运营商手机客户端储开取电子发票,也可以凭身份证到运营商实体营业厅打印发票。
-
-
- 7:
- 如遇系统维护充值失败,将72小时后原路退款到付款账户。
+
+
+ 1:
+
+ 此业务为话费慢充。日常5个工作日内到账,如遇月初、月末运营商高峰期或系统更新,到账时间会有一定延迟,敬请谅解。充值失败后系统会自动为您退款至原账户。急单请选择“6小时到账”充值端口,感谢您的支持!
+
+
+
+ 2:
+ 慢充话费与营业厅充值一样,只是到账时间稍长。充值过程中可能出现分批到账的情况,但是总金额不会少,请耐心等待。
+
+
+ 3:
+
+ 目前仅支持(移动、联通、电信三网号段),运营商黑名单号码(长期欠费或非实名制认证)携号转网空号、虚拟卡(如165167170171162等等虚拟号段)副卡号码或做过某些特殊套餐绑定的卡暂不支持充值,请勿下单。
+
+
+
+ 4:
+ 停机号码需要额外补缴欠费后,慢充话费才能到账。此服务为虚拟充值类服务,无特殊情况不支持退款,下单前请确认充值的号码无误。
+
+
+ 5:
+ 空号、错号充值后不支持退款,请您务必核对确认号码无误后再进行充值。非空号欠费可充,欠费1个月导致空号的不能充值,损失自负无法退款。
+
+
+
+ 6:
+ 本充值业务不提供发票。如需发票请在运营商手机客户端储开取电子发票,也可以凭身份证到运营商实体营业厅打印发票。
+
+
+ 7:
+ 如遇系统维护充值失败,将72小时后原路退款到付款账户。
+
+
+ 8:
+ 请登录所属运营商app(手机营业厅)查看充值号码的到账情况,如金额有出入或未到账,请截图充值记录明细反馈给客服。录明细反馈给客服。
+
-
- 8:
- 请登录所属运营商app(手机营业厅)查看充值号码的到账情况,如金额有出入或未到账,请截图充值记录明细反馈给客服。
+
+
+ 1:
+
+ 充值后6小时内到账,请耐心等待;如遇月初、月末运营商充值压力大,充值失败后,系统会为您自动再提交一次,如二次充值仍然失败,系统将会自动为您退款至原账户,请悉知。
+
+
+
+ 2:
+
+ 目前仅支持(移动、联通、电信三网号段),运营商黑名单号码(长期欠费或非实名制认证)携号转网空号、虚拟卡(如165167170171162等等虚拟号段)副卡号码或做过某些特殊套餐绑定的卡暂不支持充值,请勿下单。
+
+
+
+ 3:
+ 停机号码需要额外补缴欠费后,慢充话费才能到账。此服务为虚拟充值类服务,无特殊情况不支持退款,下单前请确认充值的号码无误。
+
+
+ 4:
+ 空号、错号充值后不支持退款,请您务必核对确认号码无误后再进行充值。非空号欠费可充,欠费1个月导致空号的不能充值,损失自负无法退款。
+
+
+ 5:
+ 本充值业务不提供发票。如需发票请在运营商手机客户端储开取电子发票,也可以凭身份证到运营商实体营业厅打印发票。
+
+
+ 6:
+ 如遇系统维护充值失败,将72小时后原路退款到付款账户。
+
+
+
+ 7:
+ 请登录所属运营商app(手机营业厅)查看充值号码的到账情况,如金额有出入或未到账,请截图充值记录明细反馈给客服。录明细反馈给客服。
+
@@ -70,12 +118,16 @@
var jweixin = require('jweixin-module');
// #endif
let app = getApp();
+ import QSTabs from '../../components/QS-tabs/QS-tabs.vue';
import {
getListOutRechargePrice,
addOrderPay,
orderToUNionPay
} from '../../Utils/Api.js';
export default {
+ components: {
+ QSTabs
+ },
data() {
return {
typeId: '',
@@ -85,70 +137,119 @@
amoutType: '',
codesVlues: '',
amountList: [],
- price: '',
- amoutstatus:''
+ price: '',
+ amoutstatus: '',
+ tabs: ["5个工作日", "6小时到账"], //切换操作
+ current: 0, //默认
+ swiperCurrent: 2
}
},
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 (!app.globalData.userInfo) {
+ 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;
+ }
}
- if (this.typeId == 3) {
- uni.setNavigationBarTitle({
- title: '中国联通'
- })
- this.amoutType = 3;
- this.getListOutRechargePrice(3);
- return;
+ },
+ onShow() {
+ this.amountList = [];
+ if (app.globalData.userInfo) {
+ 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;
+ }
}
-
-
},
methods: {
select(amoutinfos) {
this.inputAmount = amoutinfos.realPrice;
this.price = amoutinfos.price;
- this.inputAmountId = amoutinfos.id;
+ this.inputAmountId = amoutinfos.id;
this.amoutstatus = amoutinfos.status;
},
-
+ //筛选
+ change(index) {
+ this.$refs.tabs.setFinishCurrent(index);
+ this.current = index;
+ this.inputAmount = '';
+ this.inputAmountId = '';
+ this.amoutstatus = '';
+ if (index == 0) {
+ this.swiperCurrent = 2;
+ this.getListOutRechargePrice(this.amoutType);
+ } else {
+ this.swiperCurrent = 1;
+ this.getListOutRechargePrice(this.amoutType);
+ }
+ },
/**
* 查询价格
*/
getListOutRechargePrice(item) {
uni.showLoading({
title: '加载中...'
- })
- let showType;
- // #ifdef H5
- showType = 2;
- // #endif
- // #ifdef MP
- showType = 1;
+ })
+ let showType;
+ // #ifdef H5
+ showType = 2;
+ // #endif
+ // #ifdef MP
+ showType = 1;
// #endif
let params = {
- type: item,
- regionId: app.globalData.cityId,
- showType: showType
+ type: item,
+ regionId: app.globalData.cityId,
+ showType: showType,
+ rechargeType: this.swiperCurrent
}
getListOutRechargePrice(params).then(res => {
uni.hideLoading()
- if (res.return_code == '000000') {
+ if (res.return_code == '000000' && res.return_data) {
this.amountList = res.return_data;
+ } else {
+ this.amountList = [];
}
})
},
@@ -157,27 +258,35 @@
* 提交订单
*/
addOrderPay() {
- let that = this;
- if(that.amoutstatus == 2){
- uni.showToast({
- title: '当前面值已售空',
- duration:2000,
- icon: "none"
- });
- return;
+ let that = this;
+ if (that.amoutstatus == 2) {
+ uni.showToast({
+ title: '当前面值已售空',
+ duration: 2000,
+ icon: "none"
+ });
+ return;
}
if (that.inputPhone == '') {
uni.showToast({
- title: '请输入充值号码',
- duration:2000,
+ title: '请输入充值号码',
+ duration: 2000,
+ icon: "none"
+ });
+ return;
+ }
+ if (that.inputPhone.length != 11) {
+ uni.showToast({
+ title: '请输入正确充值号码',
+ duration: 2000,
icon: "none"
});
return;
}
if (that.inputAmount == '') {
uni.showToast({
- title: '请选择价格',
- duration:2000,
+ title: '请选择价格',
+ duration: 2000,
icon: "none"
});
return false;
@@ -199,7 +308,7 @@
url: '../unionComfirmation/unionComfirmation?orderPrice=' + that.price +
'&payPrice=' + that.inputAmount + '&rechargeContent=' + that.inputPhone +
'&rechargeModel=' + that.amoutType + '&agentKey=' + that.codesVlues +
- '&objectId=' + that.inputAmountId
+ '&objectId=' + that.inputAmountId + '&rechargeType=' + that.swiperCurrent
})
}
})
@@ -327,7 +436,7 @@
width: 94%;
margin-left: 3%;
display: flow-root;
- justify-content: space-between;
+ justify-content: space-between;
align-items: center;
padding: 20upx 0;
@@ -338,7 +447,7 @@
margin-top: 20upx;
float: left;
height: 120upx;
- // line-height: 120upx;
+ // line-height: 120upx;
display: inline-grid;
justify-content: center;
align-items: center;
diff --git a/subPages/static/union5.jpg b/subPages/static/union5.jpg
new file mode 100644
index 0000000..9150905
Binary files /dev/null and b/subPages/static/union5.jpg differ
diff --git a/subPages/static/upay3.jpg b/subPages/static/upay3.jpg
index bccefe0..2e21625 100644
Binary files a/subPages/static/upay3.jpg and b/subPages/static/upay3.jpg differ
diff --git a/subPages/trade-union-recharge/trade-union-recharge.vue b/subPages/trade-union-recharge/trade-union-recharge.vue
index d07cc27..dd56537 100644
--- a/subPages/trade-union-recharge/trade-union-recharge.vue
+++ b/subPages/trade-union-recharge/trade-union-recharge.vue
@@ -3,8 +3,10 @@
- 我的账户余额: {{tongCardPrice}} 个 ( 1:100)
+ 充值账号
+
@@ -19,14 +21,14 @@
{{amount}}元
-
+
@@ -36,17 +38,6 @@
-
@@ -86,88 +77,83 @@
data() {
return {
inputAmount: '', //金额
- amountList: [10, 50, 100], //预设3个可选快捷金额
+ amountList: [50, 100, 150], //预设3个可选快捷金额
paytype: 'wxpay', //支付类型
user: "",
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png',
- tongCardPrice: 0
+ tongCardPrice: 0,
+ cardId: '', //工会卡号
+ typevas: ''
};
},
- onLoad() {
- this.user = app.globalData.userInfo;
+ onLoad(options) {
+ this.cardId = options.cardId;
+ this.typevas = options.RechargeType;
},
onShow() {
- if (this.user.isSetHltCard) {
- this.getHuiLianTongCardBalance();
- }
+ this.user = app.globalData.userInfo;
},
methods: {
- //查询详情
- getHuiLianTongCardBalance() {
- let params = {
- cardNo: this.user.hltCardNo.cardNo
- }
- getHuiLianTongCardBalance(params).then(res => {
- if (res.return_code == '000000') {
- this.tongCardPrice = res.return_data.balance;
- }
-
- });
- },
select(amount) {
this.inputAmount = amount;
},
doDeposit() {
- if (!this.user.isSetHltCard) {
+ if (!this.cardId) {
uni.showToast({
+ title: '请输入充值工会卡',
icon: 'none',
- title: '当前账号还未绑定,前往绑定',
- duration: 2000,
- success() {
- setTimeout(() => {
- uni.navigateTo({
- url: '../../pages/user/bindingCard/bindingCard'
- })
- }, 1000)
- }
- });
- return;
- }
- if (parseFloat(this.inputAmount).toString() == "NaN") {
- uni.showToast({
- title: '请输入正确金额',
- icon: 'none'
- });
- return;
- }
- if (this.inputAmount <= 0) {
- uni.showToast({
- title: '请输入大于0的金额',
- icon: 'none'
- });
- return;
- }
- if (parseFloat(this.inputAmount).toFixed(2) != parseFloat(this.inputAmount)) {
- uni.showToast({
- title: '最多只能输入两位小数哦~',
- icon: 'none'
+ duration: 2000
});
return;
}
+ // if (parseFloat(this.inputAmount).toString() == "NaN") {
+ // uni.showToast({
+ // title: '请输入正确金额',
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // return;
+ // }
+ // if (this.inputAmount <= 0) {
+ // uni.showToast({
+ // title: '请输入大于0的金额',
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // return;
+ // }
+ // if (this.inputAmount > 2000) {
+ // uni.showToast({
+ // title: '充值金额不能超过大于2000',
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // return;
+ // }
+ // if (parseFloat(this.inputAmount).toFixed(2) != parseFloat(this.inputAmount)) {
+ // uni.showToast({
+ // title: '最多只能输入两位小数哦~',
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // return;
+ // }
uni.showLoading({
title: '正在提交订单...'
})
- let goods = {
+ let datas = {
"identificationCode": app.globalData.identificationCode,
+ "memCardNo": this.cardId,
"highChildOrderList": [{
- "goodsType": 2,
+ "goodsType": 8,
"goodsId": app.globalData.userInfo.id,
"saleCount": 1,
"goodsPrice": this.inputAmount
}]
}
- addOrder(goods).then(res => {
+ let that = this;
+ addOrder(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
//模板模拟支付,实际应用请调起微信/支付宝
@@ -197,8 +183,15 @@
duration: 2000,
success() {
setTimeout(() => {
- uni.navigateBack({
- })
+ if (that.typevas == 'Hlt') {
+ uni.navigateTo({
+ url: '../union-card-success/union-card-success?price=' +
+ that
+ .inputAmount
+ })
+ } else {
+ uni.navigateBack({})
+ }
}, 1000)
}
});
@@ -217,7 +210,9 @@
// #endif
} else {
uni.showToast({
- title: '支付失败'
+ title: '支付失败',
+ duration: 2000,
+ icon: 'none'
})
}
})
@@ -225,7 +220,9 @@
} else {
uni.showToast({
- title: res.return_msg
+ title: res.return_msg,
+ icon: 'none',
+ duration: 2000
});
}
})
@@ -304,11 +301,10 @@
.content {
.my {
width: 100%;
- height: 120upx;
+ height: 100upx;
display: flex;
align-items: center;
- font-size: 30upx;
- border-bottom: solid 1upx #eee;
+ font-size: 34upx;
}
.amount {
diff --git a/subPages/union-card-success/union-card-success.vue b/subPages/union-card-success/union-card-success.vue
new file mode 100644
index 0000000..1d8d3a5
--- /dev/null
+++ b/subPages/union-card-success/union-card-success.vue
@@ -0,0 +1,34 @@
+
+
+
+ 支付成功
+ ¥ {{sucprice}}
+
+
+
+
+
+
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 38767c1..b57f01e 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -27,7 +27,7 @@
-
+
优惠抵扣{{OrderPreList.length}}张可用
@@ -81,6 +81,7 @@
+