From 08f2931abfb8a6b5d11cde5e3f1789cbf8800e9c Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Wed, 15 Dec 2021 14:55:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=8C=85=202.=E4=B8=8A=E7=BA=BF=E5=B0=8F=E7=A8=8B=E5=BA=8F=20?= =?UTF-8?q?=EF=BC=8Ch5=203.=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utils/Api.js | 107 +- pages.json | 355 ++++--- pages/goods/coupon-details/coupon-details.vue | 44 +- .../coupons-info-details.vue | 1 + pages/goods/goods.vue | 121 --- pages/login/login.vue | 8 +- pages/login/loginInvalid/loginInvalid.vue | 22 - pages/order/confirmation.vue | 101 +- pages/pay/payment/payment.vue | 29 +- pages/pay/success/success.vue | 100 +- pages/tabBar/category/category.vue | 15 +- pages/tabBar/home/home.vue | 29 +- pages/user/coupon/coupon.vue | 45 +- .../mineCouponsDestails.vue | 1 + pages/user/order_details/order_details.vue | 20 +- pages/user/order_list/order_list.vue | 5 + static/img/cusservice.png | Bin 0 -> 9306 bytes static/img/head.jpg | Bin 41002 -> 0 bytes static/img/order9.png | Bin 0 -> 7631 bytes static/img/phone.png | Bin 0 -> 742 bytes .../Phone-recharge-details.vue | 103 ++ .../coupon-comfirmation-success.vue | 35 + .../coupon-comfirmation.vue | 908 ++++++++++++++++ subPages/coupon-package/coupon-package.vue | 280 +++++ .../coupon-packge-details.vue | 988 ++++++++++++++++++ subPages/recharge-centre/recharge-centre.vue | 31 +- .../sotre-details-list/sotre-details-list.vue | 95 ++ subPages/static/coupsucces.png | Bin 0 -> 4157 bytes subPages/static/phone.png | Bin 0 -> 8718 bytes .../unionComfirmation/unionComfirmation.vue | 86 +- .../unionPay-orderList/unionPay-orderList.vue | 4 +- uni.scss | 20 + 32 files changed, 3043 insertions(+), 510 deletions(-) delete mode 100644 pages/login/loginInvalid/loginInvalid.vue create mode 100644 static/img/cusservice.png delete mode 100644 static/img/head.jpg create mode 100644 static/img/order9.png create mode 100644 static/img/phone.png create mode 100644 subPages/Phone-recharge-details/Phone-recharge-details.vue create mode 100644 subPages/coupon-comfirmation-success/coupon-comfirmation-success.vue create mode 100644 subPages/coupon-comfirmation/coupon-comfirmation.vue create mode 100644 subPages/coupon-package/coupon-package.vue create mode 100644 subPages/coupon-packge-details/coupon-packge-details.vue create mode 100644 subPages/sotre-details-list/sotre-details-list.vue create mode 100644 subPages/static/coupsucces.png create mode 100644 subPages/static/phone.png diff --git a/Utils/Api.js b/Utils/Api.js index 786a695..6a2d23c 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -1,8 +1,9 @@ import { POST -} from "./Request.js"; +} from "./Request.js"; import { - POSTBREST} from "./bRequest.js"; + POSTBREST +} from "./bRequest.js"; let app = getApp(); let base = app.globalData.url; let brestBase = app.globalData.brestUrl; @@ -26,12 +27,12 @@ export const setUserPayPwd = params => { export const updateUserPayPwd = params => { return POST('POST', `${base}/highUser/updateUserPayPwd`, params).then(res => res.data); } - -//获取用户信息 + +//获取用户信息 export const findUser = params => { return POST('GET', `${base}/highUser/findUser`, params).then(res => res.data); -} -//绑定用户电话 +} +//绑定用户电话 export const loginByPhone = params => { return POST('GET', `${base}/wechat/loginByPhone`, params).then(res => res.data); }; @@ -58,27 +59,27 @@ export const getMerchantStoreById = params => { //根据门店ID 获取卡券 export const getCouponListByStoreId = params => { return POST('GET', `${base}/coupon/getCouponListByStoreId`, params).then(res => res.data); -} -//获取优选商品分类 +} +//获取优选商品分类 export const getListGoodsType = params => { return POST('GET', `${base}/highGoodsType/getListGoodsType`, params).then(res => res.data); -} -//获取优选商品品牌列表 +} +//获取优选商品品牌列表 export const getBrandByList = params => { return POST('GET', `${base}/highBrand/getBrandByList`, params).then(res => res.data); -} -// 优选商品列表 +} +// 优选商品列表 export const getBrandCouponList = params => { return POST('GET', `${base}/coupon/getCouponList`, params).then(res => res.data); -} -//优选商品详情 +} +//优选商品详情 export const getPreByOrderIdId = params => { return POST('GET', `${base}/orderPre/getPreByOrderIdId`, params).then(res => res.data); -} -//优选商品预约完成 +} +//优选商品预约完成 export const orderComplete = params => { return POST('POST', `${base}/orderPre/orderComplete`, params).then(res => res.data); -} +} //卡券详情 export const getCouponById = params => { return POST('GET', `${base}/coupon/getCouponById`, params).then(res => res.data); @@ -99,31 +100,31 @@ export const orderToGoldPay = params => { export const getUserGoldRecList = params => { return POST('GET', `${base}/highGoldRec/getUserGoldRecList`, params).then(res => res.data); } -//获取用户卡券 +//获取用户卡券 export const getUserCouponList = params => { return POST('GET', `${base}/coupon/getUserCouponList`, params).then(res => res.data); -} -//获取用户卡券详情 +} +//获取用户卡券详情 export const getUserCouponDetail = params => { return POST('GET', `${base}/coupon/getUserCouponDetail`, params).then(res => res.data); } //获取用户最新卡券详情 export const getUserNewCouponDetail = params => { return POST('GET', `${base}/coupon/getUserNewCouponDetail`, params).then(res => res.data); -} -//获取订单信息 +} +//获取订单信息 export const getUserOrderList = params => { return POST('GET', `${base}/highOrder/getUserOrderList`, params).then(res => res.data); -} -//取消订单 +} +//取消订单 export const cancelOrder = params => { return POST('GET', `${base}/highOrder/cancelOrder`, params).then(res => res.data); -} -//订单查询详情 +} +//订单查询详情 export const getOrderById = params => { return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data); -} -//获取商户列表 +} +//获取商户列表 export const getMerchantList = params => { return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data); } @@ -134,12 +135,12 @@ export const getStoreListByMerchant = params => { //获取优惠券详情 export const getDiscountByQrCode = params => { return POST('GET', `${base}/discount/getDiscountByQrCode`, params).then(res => res.data); -} -//查询话费优惠券 +} +//查询话费优惠券 export const getUserOrderPreList = params => { - return POST('GET', `${base}/userDiscount/getUserOrderPreList`, params).then(res => res.data); -} - + return POST('GET', `${base}/userDiscount/getUserExclusiveDiscount`, params).then(res => res.data); +} + //领取优惠券 export const receiveDiscount = params => { return POST('POST', `${base}/userDiscount/receiveDiscount`, params).then(res => res.data); @@ -185,11 +186,24 @@ export const getDredgeProvince = params => { export const getCmsContent = params => { return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data); } - -//设置用户参数 +//设置用户参数 export const setCacheParam = params => { return POST('POST', `${base}/highUser/setCacheParam`, params).then(res => res.data); } +//查询充值话费详情 +export const getPhoneOrderById = params => { + return POST('GET', `${base}/outRechargeOrder/getOrderById`, params).then(res => res.data); +} +//优惠券包列表 +export const getDiscountPackageList = params => { + return POST('GET', `${base}/discountPackage/getDiscountPackageList`, params).then(res => res.data); +} +//优惠券包详情 +export const getDiscountPackageDetail = params => { + return POST('GET', `${base}/discountPackage/getDiscountPackageDetail`, params).then(res => res.data); +} + + /** * 工会卡 */ @@ -197,7 +211,7 @@ export const setCacheParam = params => { export const getHuiLianTongCardByCardNo = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardByCardNo`, params).then(res => res.data); } -// 获取用户卡号列表 +// 获取用户卡号列表 export const getUserCardList = params => { return POST('GET', `${base}/highUserCard/getUserCardList`, params).then(res => res.data); } @@ -209,10 +223,10 @@ export const getHuiLianTongCardByPhone = params => { export const delUserCard = params => { return POST('POST', `${base}/highUserCard/delUserCard`, params).then(res => res.data); } -// 查询汇联通工会卡详情 +// 查询汇联通工会卡详情 export const getHuiLianTongCardBalance = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardBalance?`, params).then(res => res.data); -} +} // 查询汇联通工会卡消费记录 export const getHuiLianTongCardConsume = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardConsume`, params).then(res => res.data); @@ -223,7 +237,7 @@ export const hltUnionCardPay = params => { } export const bindHuiLianTongCard = params => { return POST('POST', `${base}/highUserCard/bindHuiLianTongCard`, params).then(res => res.data); -} +} /** * 工会卡 */ @@ -252,10 +266,10 @@ export const getUserLotteryNum = params => { export const getWinLotteryList = params => { return POST('GET', `${base}/activity/getWinLotteryList`, params).then(res => res.data); } -//跳转是否赠券 +//跳转是否赠券 export const getMembershipLevel = params => { return POST('GET', `${base}/highUser/GetMembershipLevel`, params).then(res => res.data); -} +} /** * 肯德基地址 */ @@ -312,14 +326,14 @@ export const useCouponCode = params => { -//**代理商// +//**代理商// export const getAgentCount = params => { return POSTBREST('GET', `${brestBase}/highCouponAgent/getAgentCount`, params).then(res => res.data); } // 查询销售码 export const getCodeListByAgentCoupon = params => { return POSTBREST('GET', `${brestBase}/highCouponAgent/getCodeListByAgentCoupon`, params).then(res => res.data); -} +} // 生成二维码 export const generateCode = params => { return POSTBREST('POST', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data); @@ -339,8 +353,8 @@ export const getAgentSalesPriceCount = params => { //修改密码 export const sendUserPass = params => { return POSTBREST('POST', `${brestBase}/secUser/sendUserPass`, params).then(res => res.data); -} - +} + @@ -371,5 +385,4 @@ export const hltUnionCardPayUnion = params => { //话费列表 export const getUserOrderListhuafei = params => { return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data); -} - +} diff --git a/pages.json b/pages.json index 0d94345..88b5fb8 100644 --- a/pages.json +++ b/pages.json @@ -1,34 +1,34 @@ { "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/tabBar/home/home", - "style": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "首页", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "onReachBottomDistance": 50, - "app-plus": { - "titleNView": false, //禁用原生导航栏 - "softinputNavBar": "none", - "subNVues": [{ - "id": "homeTitleNvue", // 唯一标识 - "path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径 - "type": "navigationBar" - }] - } - } - }, { - "path": "pages/qianZhuPay/union-pay/union-pay", - "style": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "选择方式", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "enablePullDownRefresh": false - } - - },{ + { + "path": "pages/tabBar/home/home", + "style": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "首页", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none", + "subNVues": [{ + "id": "homeTitleNvue", // 唯一标识 + "path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径 + "type": "navigationBar" + }] + } + } + }, { + "path": "pages/qianZhuPay/union-pay/union-pay", + "style": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "选择方式", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "enablePullDownRefresh": false + } + + }, { "path": "pages/user/bindingCardList/bindingCardList", "style": { "navigationBarTitleText": "卡列表", @@ -331,21 +331,21 @@ }, { "path": "pages/goods/externalCoupon/externalCoupon", - "style": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "扫码领取优惠券", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "onReachBottomDistance": 50, - "app-plus": { - "titleNView": false, //禁用原生导航栏 - "softinputNavBar": "none", - "subNVues": [{ - "id": "homeTitleNvue", // 唯一标识 - "path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径 - "type": "navigationBar" - }] - } + "style": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "扫码领取优惠券", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "onReachBottomDistance": 50, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none", + "subNVues": [{ + "id": "homeTitleNvue", // 唯一标识 + "path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径 + "type": "navigationBar" + }] + } } }, { @@ -434,17 +434,6 @@ "navigationBarTextStyle": "white" } - }, { - "path": "pages/login/loginInvalid/loginInvalid", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - }, { "path": "pages/user/bindingCard/bindingCard", "style": { @@ -483,110 +472,168 @@ "backgroundColorTop": "#0083f5", "navigationBarTextStyle": "white" } - } - - + ], "subpackages": [{ "root": "subPages", - "pages": [{ - "path": "brand-classification/brand-classification", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "品牌分类", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - - },{ - "path": "preferred-goods/preferred-goods", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "商品分类", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - - },{ - "path": "lottery/lottery", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "抽奖活动", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#e62601", - "backgroundColorTop": "#e62601", - "navigationBarTextStyle": "white" - } - - }, - { - "path": "recharge/recharge", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "话费充值", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - - }, - { - "path": "recharge-centre/recharge-centre", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "话费充值", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - - },{ - "path": "unionComfirmation/unionComfirmation", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "确认订单", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - },{ - "path": "unionPay-orderList/unionPay-orderList", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "话费订单", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" - } - }, - { - "path": "unionPay/unionPay", - "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "入口选择", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white" + "pages": [ + { + "path" : "coupon-comfirmation-success/coupon-comfirmation-success", + "style" : + { + "enablePullDownRefresh": false, + "navigationBarTitleText": "支付成功", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + },{ + "path": "brand-classification/brand-classification", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "品牌分类", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, { + "path": "preferred-goods/preferred-goods", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "商品分类", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, { + "path": "lottery/lottery", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "抽奖活动", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#e62601", + "backgroundColorTop": "#e62601", + "navigationBarTextStyle": "white" + } + + }, + { + "path": "recharge/recharge", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "话费充值", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, + { + "path": "recharge-centre/recharge-centre", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "话费充值", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, { + "path": "unionComfirmation/unionComfirmation", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "确认订单", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, { + "path": "unionPay-orderList/unionPay-orderList", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "话费订单", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, + { + "path": "unionPay/unionPay", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "入口选择", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, { + "path": "unionWeb/unionWeb", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "Phone-recharge-details/Phone-recharge-details", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "交易详情", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, { + "path": "sotre-details-list/sotre-details-list", + "style": { + "navigationBarTitleText": "门店列表", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, { + "path": "coupon-package/coupon-package", + "style": { + "navigationBarTitleText": "", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, { + "path": "coupon-packge-details/coupon-packge-details", + "style": { + "navigationBarTitleText": "优惠券包详情", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + }, { + "path": "coupon-comfirmation/coupon-comfirmation", + "style": { + "navigationBarTitleText": "确认订单", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + } - } ,{ - "path" : "unionWeb/unionWeb", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } ] }], "globalStyle": { diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue index 41ae1cc..7860f9a 100644 --- a/pages/goods/coupon-details/coupon-details.vue +++ b/pages/goods/coupon-details/coupon-details.vue @@ -25,9 +25,9 @@ - - + + 预约订单已成功 门店会在24小时内联系您 @@ -35,24 +35,31 @@ 请告知加油员用码商支付 - + - {{couponDesInfo.couponCodeInfo.codeKey}} + {{couponDesInfo.couponCodeInfo.codeKey}} + - - 门店信息 + + + 门店信息 + + + 查看更多 + + - {{store.storeName}} - {{store.address}} + {{store.storeName}} + {{store.address}} @@ -62,8 +69,6 @@ - @@ -95,7 +100,7 @@ threeTime: '', menddesId: '', pageNum: 1, - pageSize: 10, + pageSize: 1, isNoMoreData: false } }, @@ -123,7 +128,6 @@ } }, onReachBottom() { - this.getStoreListByCoupon(); }, methods: { //我的卡券详情 @@ -162,7 +166,12 @@ address: e.address }) }, - + //跳转门店 + jumpstorelist() { + uni.navigateTo({ + url: '../../../subPages/sotre-details-list/sotre-details-list?id=' + this.menddesId + }) + }, /** * 查询门店列表 */ @@ -346,7 +355,8 @@ position: fixed; bottom: 0px; background-color: red; - color: #FFFFFF; + color: #FFFFFF; + border-radius: 0px; } .czlq { diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue index 9f7b8b5..6b06dad 100644 --- a/pages/goods/coupons-info-details/coupons-info-details.vue +++ b/pages/goods/coupons-info-details/coupons-info-details.vue @@ -216,6 +216,7 @@ bottom: 0px; background-color: red; color: #FFFFFF; + border-radius: 0px; } .czlq { diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue index 808bf7f..6462245 100644 --- a/pages/goods/goods.vue +++ b/pages/goods/goods.vue @@ -139,8 +139,6 @@ return { //控制渐变标题栏的参数 beforeHeaderzIndex: 11, //层级 - afterHeaderzIndex: 10, //层级 - beforeHeaderOpacity: 1, //不透明度 afterHeaderOpacity: 0, //不透明度 //是否显示返回按钮 // #ifndef MP @@ -152,14 +150,8 @@ //轮播图下标 currentSwiper: 0, anchorlist: [], //导航条锚点 - selectAnchor: 0, //选中锚点 - serviceClass: '', //服务弹窗css类，控制开关动画 - specClass: '', //规格弹窗css类，控制开关动画 - shareClass: '', //分享弹窗css类，控制开关动画 // 商品信息 goodsData: "", - selectSpec: null, //选中规格 - isKeep: false, //收藏 //商品描述html desid: '', imageUrl: app.globalData.imgUrl, @@ -258,29 +250,6 @@ swiperChange(event) { this.currentSwiper = event.detail.current; }, - hideShare() { - this.shareClass = 'hide'; - setTimeout(() => { - this.shareClass = 'none'; - }, 150); - }, - //收藏 - keep() { - this.isKeep = this.isKeep ? false : true; - }, - // 加入购物车 - joinCart() { - if (this.selectSpec == null) { - return this.showSpec(() => { - uni.showToast({ - title: "已加入购物车" - }); - }); - } - uni.showToast({ - title: "已加入购物车" - }); - }, //获取登陆信息 getuserinfo() { let that = this; @@ -363,100 +332,10 @@ }) }, - //跳转评论列表 - showComments(goodsid) { - - }, - //选择规格 - setSelectSpec(index) { - this.selectSpec = index; - }, - //减少数量 - sub() { - if (this.goodsData.number <= 1) { - return; - } - this.goodsData.number--; - }, - //增加数量 - add() { - this.goodsData.number++; - }, - //跳转锚点 - toAnchor(index) { - this.selectAnchor = index; - uni.pageScrollTo({ - scrollTop: this.anchorlist[index].top, - duration: 200 - }); - }, - //计算锚点高度 - calcAnchor() { - this.anchorlist = [{ - name: '主图', - top: 0 - }, - { - name: '评价', - top: 0 - }, - { - name: '详情', - top: 0 - } - ] - let commentsView = uni.createSelectorQuery().select("#comments"); - commentsView.boundingClientRect((data) => { - let statusbarHeight = 0; - //APP内还要计算状态栏高度 - // #ifdef APP-PLUS - statusbarHeight = plus.navigator.getStatusbarHeight() - // #endif - let headerHeight = uni.upx2px(100); - this.anchorlist[1].top = data.top - headerHeight - statusbarHeight; - this.anchorlist[2].top = data.bottom - headerHeight - statusbarHeight; - - }).exec(); - }, //返回上一页 back() { uni.navigateBack(); }, - //服务弹窗 - showService() { - console.log('show'); - this.serviceClass = 'show'; - }, - //关闭服务弹窗 - hideService() { - this.serviceClass = 'hide'; - setTimeout(() => { - this.serviceClass = 'none'; - }, 200); - }, - //规格弹窗 - showSpec(fun) { - console.log('show'); - this.specClass = 'show'; - this.specCallback = fun; - }, - specCallback() { - return; - }, - //关闭规格弹窗 - hideSpec() { - this.specClass = 'hide'; - //回调 - - this.selectSpec && this.specCallback && this.specCallback(); - this.specCallback = false; - setTimeout(() => { - this.specClass = 'none'; - }, 200); - }, - discard() { - //丢弃 - } } }; diff --git a/pages/login/login.vue b/pages/login/login.vue index 65f7e8b..291068a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -9,12 +9,12 @@ - + - + 登 录 diff --git a/pages/login/loginInvalid/loginInvalid.vue b/pages/login/loginInvalid/loginInvalid.vue deleted file mode 100644 index 8183fd0..0000000 --- a/pages/login/loginInvalid/loginInvalid.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 0bcbf0e..f418e69 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -7,16 +7,27 @@ {{couponList.couponName}} 规格: 默认 - + + ￥{{couponList.salesPrice}} + + + {{couponList.salesPrice * 100}} + + x1 + + ￥{{couponList.discountPrice}} {{couponList.discountPrice*100}} - + + ￥{{couponList.salesPrice}} - + {{couponList.salesPrice*100}} @@ -29,10 +40,21 @@ 商品总额 - + + ￥{{couponList.salesPrice}} + + + + {{couponList.salesPrice*100}} + + ￥{{couponList.discountPrice}} - + {{couponList.discountPrice*100}} @@ -204,7 +226,9 @@ orderId: '', jumpType: '', tongCardPrice: 0, - storeId: '' + storeId: '', + isDiscont: false, + coupondiscountid:'' }; }, @@ -284,37 +308,32 @@ showPopup() { this.$refs.popup.show(); }, - radioChanges(item) { - if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中 - this.memDiscountId = ''; + if (this.memDiscountId == item.highDiscount.id) { // 如果已经选中，则取消选中 + this.memDiscountId = ''; + this.coupondiscountid = ''; this.paytheprice = this.couponList.discountPrice; this.deductionPrice = '0.00'; + this.isDiscont = false; } else { // 否则进行选中赋值 - this.memDiscountId = item.id; + this.isDiscont = true; + this.memDiscountId = item.highDiscount.id; + this.coupondiscountid = item.id; if (item.highDiscount.discountType == 1) { - if (this.couponList.salesPrice > item.highDiscount.discountPrice) { - //满减价格 - this.deductionPrice = item.highDiscount.discountPrice; - this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) / - 100); - } else { - uni.showToast({ - title: '未满足满减条件', - icon: 'none', - duration: 2000 - }) - } + //满减价格 + this.deductionPrice = item.highDiscount.discountPrice; + this.paytheprice = this.couponList.salesPrice - this.deductionPrice; } else if (item.highDiscount.discountType == 2) { //抵扣价格 this.deductionPrice = item.highDiscount.discountPrice; - this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) / 100); + this.paytheprice = this.couponList.salesPrice - this.deductionPrice; } else if (item.highDiscount.discountType == 3) { // 打折 - this.deductionPrice = this.couponList.salesPrice - this.couponList.salesPrice * ( - item.highDiscount.discountPrice / 10); - this.paytheprice = this.couponList.salesPrice * (item.highDiscount - .discountPrice / 10); + this.deductionPrice = parseFloat(this.couponList.salesPrice - (this.couponList.salesPrice * + item + .highDiscount.discountPrice)).toFixed(2) + this.paytheprice = parseFloat(this.couponList.salesPrice * item.highDiscount.discountPrice) + .toFixed(2); } } this.$refs.popup.hide(); @@ -403,7 +422,7 @@ this.storeId = app.globalData.storeid } let goods = { - "memDiscountId": this.memDiscountId, + "memDiscountId": this.coupondiscountid, "identificationCode": app.globalData.identificationCode, "highChildOrderList": [{ "goodsType": 1, @@ -492,7 +511,8 @@ app.globalData.storeid = ''; app.globalData.storename = ''; uni.reLaunch({ - url: '../pay/success/success?id=' + that.couponId + url: '../pay/success/success?id=' + that + .couponId }); }, fail: function(err) { @@ -516,6 +536,21 @@ } }) } else if (that.paytype == 'jinbi') { + if (that.user.gold < that.paytheprice * 100) { + uni.showToast({ + icon: 'none', + title: '积分不足', + duration: 2000, + success() { + setTimeout(() => { + uni.navigateTo({ + url: '../user/deposit/deposit' + }) + }, 1000) + } + }); + return; + } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../login/updatePas/updatePas' @@ -524,6 +559,14 @@ } that.$refs.paymentPassword.modalFun('show'); } else if (that.paytype == 'gonghuika') { + if (that.tongCardPrice < that.paytheprice) { + uni.showToast({ + icon: 'none', + title: '工会卡余额不足', + duration: 2000, + }); + return; + } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../login/updatePas/updatePas' diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue index 4ec5de9..42f0118 100644 --- a/pages/pay/payment/payment.vue +++ b/pages/pay/payment/payment.vue @@ -20,7 +20,7 @@ - + 积分支付(积分:{{user.gold}}) @@ -96,7 +96,7 @@ jumpType: '', PaymentPassword: '', tongCardPrice: 0, - goodsType:'' + goodsType: '' }; }, onLoad(e) { @@ -115,7 +115,7 @@ this.amount = parseFloat(e.amount).toFixed(2); }, onShow() { - let that = this; + let that = this; that.user = app.globalData.userInfo; that.getHuiLianTongCardBalance(); }, @@ -209,6 +209,21 @@ } }) } else if (that.paytype == 'jinbi') { + if (that.user.gold < that.amount * 100) { + uni.showToast({ + icon: 'none', + title: '积分不足', + duration: 2000, + success() { + setTimeout(() => { + uni.navigateTo({ + url:'../../user/deposit/deposit' + }) + }, 1000) + } + }); + return; + } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../../login/updatePas/updatePas' @@ -217,6 +232,14 @@ } that.$refs.paymentPassword.modalFun('show'); } else if (that.paytype == 'gonghuika') { + if (that.tongCardPrice < that.amount) { + uni.showToast({ + icon: 'none', + title: '工会卡余额不足', + duration: 2000, + }); + return; + } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../../login/updatePas/updatePas' diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue index 9134df2..8a45d77 100644 --- a/pages/pay/success/success.vue +++ b/pages/pay/success/success.vue @@ -10,7 +10,8 @@ - + + {{couponDesInfo.couponInfo.couponName}} @@ -26,28 +27,30 @@ 视频教程 - + + - - - 预约订单已成功 门店会在24小时内联系您 - 请出示核销码(商户扫客户) - 请告知加油员用码商支付 + + + 预约订单已成功 + 门店会在24小时内联系您 + + 请出示核销码(商户扫客户) + + 请告知加油员用码商支付 二维码生效中,前往个人中心查看 - + {{store.distance}}km + --> + + + + 门店信息 + + 查看更多 + - + + + + {{store.storeName}} + {{store.address}} + + + + + {{store.distance}}km + + + + + - + @@ -101,7 +128,7 @@ twoTime: '', threeTime: '', pageNum: 1, - pageSize: 10, + pageSize: 1, isNoMoreData: false } }, @@ -129,7 +156,7 @@ } }, onReachBottom() { - this.getStoreListByCoupon(); + // this.getStoreListByCoupon(); }, methods: { //我的卡券详情 @@ -144,7 +171,7 @@ if (res.return_code == '000000') { uni.hideLoading(); this.couponDesInfo = res.return_data; - if(res.return_data.couponInfo.couponSource == 4){ + if (res.return_data.couponInfo.couponSource == 4) { this.oneTime = res.return_data.highUserCoupon.createTime; this.twoTime = res.return_data.highUserCoupon.useEndTime; this.threeTime = res.return_data.highUserCoupon.consumeTime; @@ -179,10 +206,16 @@ }); }, //跳转抽奖活动 - jumpcjhuod(){ + jumpcjhuod() { this.closePopup(); uni.reLaunch({ - url:'../../../subPages/lottery/lottery?id='+this.couDesId + url: '../../../subPages/lottery/lottery?id=' + this.couDesId + }) + }, + //跳转门店 + jumpstorelist() { + uni.navigateTo({ + url: '../../../subPages/sotre-details-list/sotre-details-list?id=' + this.couDesId }) }, //导航 @@ -246,8 +279,11 @@ } diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue index 23c3ee4..aef54a5 100644 --- a/pages/tabBar/category/category.vue +++ b/pages/tabBar/category/category.vue @@ -62,6 +62,9 @@ + + + diff --git a/subPages/coupon-package/coupon-package.vue b/subPages/coupon-package/coupon-package.vue new file mode 100644 index 0000000..f460418 --- /dev/null +++ b/subPages/coupon-package/coupon-package.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/subPages/coupon-packge-details/coupon-packge-details.vue b/subPages/coupon-packge-details/coupon-packge-details.vue new file mode 100644 index 0000000..f1f9991 --- /dev/null +++ b/subPages/coupon-packge-details/coupon-packge-details.vue @@ -0,0 +1,988 @@ + + + + + diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue index 33045e1..475c0a2 100644 --- a/subPages/recharge-centre/recharge-centre.vue +++ b/subPages/recharge-centre/recharge-centre.vue @@ -15,7 +15,8 @@ - {{item.price}}元 + {{item.price}}元 + 已售空 @@ -84,7 +85,8 @@ amoutType: '', codesVlues: '', amountList: [], - price: '' + price: '', + amoutstatus:'' } }, onLoad(options) { @@ -120,7 +122,8 @@ select(amoutinfos) { this.inputAmount = amoutinfos.realPrice; this.price = amoutinfos.price; - this.inputAmountId = amoutinfos.id; + this.inputAmountId = amoutinfos.id; + this.amoutstatus = amoutinfos.status; }, /** @@ -145,17 +148,27 @@ * 提交订单 */ addOrderPay() { - let that = this; + let that = this; + if(that.amoutstatus == 2){ + uni.showToast({ + title: '当前面值已售空', + duration:2000, + icon: "none" + }); + return; + } if (that.inputPhone == '') { uni.showToast({ - title: '请输入充值号码', + title: '请输入充值号码', + duration:2000, icon: "none" }); return; } if (that.inputAmount == '') { uni.showToast({ - title: '请选择价格', + title: '请选择价格', + duration:2000, icon: "none" }); return false; @@ -305,7 +318,8 @@ width: 94%; margin-left: 3%; display: flow-root; - justify-content: space-between; + justify-content: space-between; + align-items: center; padding: 20upx 0; .box { @@ -315,7 +329,8 @@ margin-top: 20upx; float: left; height: 120upx; - line-height: 120upx; + // line-height: 120upx; + display: inline-grid; justify-content: center; align-items: center; text-align: center; diff --git a/subPages/sotre-details-list/sotre-details-list.vue b/subPages/sotre-details-list/sotre-details-list.vue new file mode 100644 index 0000000..f51c212 --- /dev/null +++ b/subPages/sotre-details-list/sotre-details-list.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/subPages/static/coupsucces.png b/subPages/static/coupsucces.png new file mode 100644 index 0000000000000000000000000000000000000000..81cc99941b948f322384e3067d3996bd57b8f000 GIT binary patch literal 4157 zcmV-D5W???P)Px^_en%SRCr$PU43vI<$3=-dlF;INgzr2gGrhYI)ljvq=lIp3U07(Pui93AhpQT z^5NT4!7+g}Uk$;*lbDvoG#?#ONcf1+?U|OeKnPgY?Mb%>=BvR>;v|r1qP9@N&?L=_ z0}MeBOSezvy_1Y3>uz`N_VaFcMx#IW`F?);?(O?N@ADEm@ESGKr&zPnX$)RXpw$4c z2B?pj`v~X*VI{=>`k%OFYJZH^7?>fV8GvU1nr84cfu^Ni>t|zf<=IXP7scJ7ODFqR zNo<`@Oq-bbTq3Ln(Cd?5v&@(#qQ{wd+#+fJodZ*^`lKrmv9SceXldYsRi670F|7k( z6M$48(K=R16^wBvekesf505F6KMu)`mes}v0J(|&H7r>Q2r3wBTK3paM#2Fw46>wB ze#6uOKUH}pJJJA%MbaB(A|_ynBmi=g>5XhjTLBisdk0)JPLg$dexR~1YR*Io0G*fk zrRk0y5F!D9&QE-Ffe>6ad+x zd@T{K57NQ7>0-u?!l3!ZpzIC=0Al8jQN5lS8-sEz&U%QjkC56C#LS}a0MJUAZD1Bp z{oCW5ln`t`1fm_fQohws-M#`qGcr2BSw9`u98bs z)|GO>2=KVaMWX zC7IiAF;V`p9g--OcDsP&8UVSHJf5uT`Ip6ZB#TwVykfd4q;&;=WIex~^aR7}ww}N- z0Ol)s9u3BgL`ypnkbt#LD~lWhKr`ftq>QVbv;@jq)K$~b+>9dthyqSxx;ao65@l^g zfQheiQfO)m08zTls6N{5)w^wFBLrqqZA?h5wJSNd1whV_Z|l~&{SflzsYlBPL||QQ#N=%(rEE zB4XAj=6DbRvZS+@_AWXG0NRAS6B54Qfxbk9vk2T1U{%#lT{W*e+N@&%P?DdBY!@zP z0gVq8;eK5)hqH!UCP4PxaKZsyG0$!YfModhJq1TAD8Bm2FNW{g{GW$&MfF6c!v;WS z`E9|{*TA9?AQ}Gs4u4%f1EwWOLq~TR%@xz{W2()%p5n6=i(UhZ0gw#;KF7W${^7&b z*N5-g_}Gg}m1%~2K7jiGywx{Dmb?az03cUdegLjjc_cqrxwi%Y z%}DPC=x>5FpyPEBo+ntt3qQ6R`I|M;-y+au!N-H|(ACOiH2`Fb^3z24K=4L%tj1q~ zF{}@oP1jU3L*518nlPfkjGq(+&C};c0Qs34HIJkE0Za5uh=z2M>Q@*vTu{qm?_|R(XQZg7Ko&BzP_EH-^4S9=lo z-TaeZY9=OIk~a|7KKCNfONlm6){s9*z(2L;d$)6w#ejJ7_cn`!R+P_%gny4p7c~Yx zB}RZ-0d875-tFnN^PdS978LV4&FC)O+y9hfZ1&~&hp8@$^gy76S3)jV?9+9uq z)yg;RoXQq6pC{r)HF$PBf!=34D}Dp~0>DXuDqcnz0ekbRc|ooyU%|l5kzJS~`h>2O zzit;V%}9R~pis^Mva{`|`@a+b2))HCgI}1ft~leajT5yhne2r8mn7k)C;)RwFt65C z^DA}%4x*^T&IX6~UlsreeHz%R^7=g+E8=V9$W?Di!#4x;L5I%xOGb39u9UxIrzAVs z|L0^`qO2yWrSIwPv$saY=t+tSQ0H_^d zABU?3fDm5+_8l&_mgVDrH^(;<=#o$(O7taNDPL=+TiAJc4q{6ETsztb-LJg@!ub(M z_z@)9toN7y+ett)BmFgiKIMegD;fsAT2Rf;IFY9r^8ElVa6%g)nqP+a8AzLTwd|@2 zDO<{1P0Ya*t`dD+SIVDok}S>0>;^b~1vTO`Fx-hC%IRv^)v~B&WHchai5YKllAKm( zm~cx$F+b{rS1YA&0Mlok&_<1>J`oi1R4@}=RZz;VzL!TQ`&G-bMB6$acG1*JrJN)y zTg-f#DAb}3CuTOGp(i7;7<6=Jv`ll^B&mUR;Y=Q!oDqa(teyka^!=WvUWzC;4u zX(uz{_iKwmkys8U;=j);6<6ERFDt6=oTFJW5_s_Ai~mhmD~=XyMoVegViIfrDtQs0SZ|^HklAkl=yEu|X9ZsxYmZn}7E^dW87tqv!N$WMf zc+X!{4!Lo&zR$k4ko5ire2-eaJiJGCCRZzEZUpnk-PjOy+9ex9qVXlLT+kSJjOTFi zo=xWSZh~6xxFMF5Y5gKT#sRE6Zb)BO{FM`VIU~KDLAI-aPGm)khHlf<^0xX2P_I=N z2S7&h5+`TRRdMm18_l1(F>s5Se!Da)UI+A7^Lz)b9t`ivI0KVblt)3h!;Q|k&@y3T zK`|$40JwCre^tt|UIvhgumk_al5|mFV9IqD6RniKku6GBrMcmMQTG3j6CXQ#!%Vd* zNym#GMMpY>Xhr$EpkTKsJ4wV6n*W;z!6R;YFWo1<*Xal%W*Nz{rU1Ont)5uWGw#<1 z&0%5d8!cjt^xqQ5w$?3l2MI4pBwaK%FlG2*%a+RecSwh&2LYVwhx{nWWbnreYNhtM zd;|dV2SWZR3I^KRK$sPH?QGVH@+}~2v!m;P`;8k# z#<*3iqjK#=$%`lOTZ3ZLRxIE zam?8Bo+r)R&Yf6xjem4s`jl!)dbqnzLv?s$i~v9<92!NSdsnWQ&3$v-{@)(`uxuUQ z)OWaN=8+(J^SAJj`o`kw(5Oxr1%wYoWTbkm+-|w@{|k}T3|TCCIXYR}w`>G1*yXWt zoiYm4;!O02)MMqw_BEZB~6_kqYo=ZmnsE-7)*bOrn6aTy2%%ZNEjy`oA1EAis z2Tfa`cYD;M;=cr}9aGK6oY>zxQrXu^pAGj1U6 zqm}7hH)?zbfG|cZATg@fC##6gQX^LN2&o-z7j~RUUrZGU02Wjx^#t}Qa=V^yFR?jA zpa7_i2KCCK?MZprF^MTkz%HkiJnbfafj@8n92pHt=_|p~HQioqEUI@w)(uVyIK4{x z(Q-lqK>aI0IhioGoq?@>I2U!9qHdqjv&*h@+fP421;B!1_1(zQR)AfVGx-@9e`V7+ zN!IQ8flBDzSt9{}?g2t{5+C|+fM!ov=Zy%_OMIjOaAZW7=wHLIRHUGQvBuwF*<sRJHM_e@-*UI9%<1px-hQb1563x=2^Ju+Vbt-?50T7RYml8Gq|h75w# zs;sv77#0X76IUd#nO7b>*p|Eym}4^nG>XmW1LwY(dshrFL1CsfM75KUf8Wb} zzYpEDSFf(B)2q9y&e?lMDl1B1ppv4(z`$V0NQTB{}(+Q2%iN{PbM zOp+hLzyM)n#KCGF250&x9%}Qq?`uTJ;=o8m5WBL940W@5^!9Z)wVf7sMKhr;ETb#f z@?-(^_W;AP8JyzufQTx%u<-z<-|||bTq8mkZ$0c(-_5RR*&+Aq z-Uh$;X$xWGE(FM+WlB0y{kSTHs#9{_F*2t=k13l|Z= z7LS1q6tO{$AOUf$idTccBG@1qKAj8_GPodM{T8j&M-(WKnVJ4IzJ!eph{WJlVU&Ra znWQ*Ev!Sp6ptMbEq>fAw6ePJceqrYV0Kmrm3Uji!P>@tq7z(MU0wUv**%fFcLFdFR zjhlq1r!qG+$83@Zw~n(X{$c|`%$*`l1OCZRYKMWSg69%V=h%j<`?N5UJ*%1ONgq5u zCu?DtEV0}xes-N2t%y!OmRXAdMhva_U&~LS;PxZ$zlY~g&-U<2!qi!>ri8Pn$dVUl z|Fg|5RNJRtV;%0+-Em9O$p%J@o=-8}A1+g6V0IaZ6~Nt{EkRWbh)0 z(TPnH-e%M=FntunVbh7)%(1j<%N?ST@c<}?BiST-Vu{rHNOdSNTh!4vj%sEOaeFY| z0C_JZ9p5cH)l!o-X~5VpZTH@aq2ncRtth=eK!^9|@~c>z64E}oCoFgN$>eAtPOuXi z!xTbtDO^m%G~Hh$v540R7=IkS%=B@x=OU1FO`)+sf)ie^J$6w9B5X6vW!Iq-rZ(=x zqQ(<#IWk*kov{n55~Q!Mwpo>KXp9i?E-wC2wwVY+o1~TtZ%t7Zdv`#4!?dKi2#3`S zE&&&#{r5^b$x?RO+)z?ZgJK11+h?5l76Gsms=!xb6Ly%FFVv*l!MVUXh_k^qb92vX zvaH$j!cPE6?gcNSgfTnMmuZ_EV_IL5%XX#xk1OUYiw|Y4G61oxXsq6LIj!tKuB|(it?8>Fy-aO(j<6O>X91B)vS@H@A z*}ty;5i3D346`BpeZSgkH^6J@d zQ!#g$NkCqNb$;UhSu=ouw(CAQR(rH9R@Q{yEDkiHoZm1y8j;3q03MTf7b4RQGukEv zi3Gjy1DSv|Q`&&gnm*(&VOV2PHtAUiM6=kSMU^)EO`Y04GJgc0Vqt_RllyK`T=M!Zth_us6?%_spGa8e0q(R9bh< zJM>sB36MW5!h$0oap$+)wXiBP<_X%x_n}{-k?d7 z@t19)w(RCS+R>O0oLy;)TqHcxR*OXeWQP%~j|@f1qR67)HBh84?Y0KQJb_kgR#JQ4 z1P>>hnF{dR+2b1?4i=ukuKa?4gaecFa!q{8vLoF{qE;Kr;EM8e?jz1-_6G5VR$9vo|VJUNo+j60X=-bG64-T+o!t(e5Tf+6kAD@+!8W;h^cHjZ`OT z3>lc-Gj`x(rl7cAoX2eq=Srd}ZG5aIZeA-6v`d@vcekJW5wR`mDMuCK5MKp>~G)@N9Uyj1VQps!Dc%dLJq)>>8x zkd8{9jQc^O@o#H}rvG9MS7?|^W3N??Rb6PLCu6Sjt29UXV1iwy1^PtKAfH;#Ui@0O zR!!RHcUdmxw~Ez+KzweCe(U@Ev-)g}dhuL0G}3_wc0)^eUi3K@5aCIML3lhi2V)Ic zwTjg@C(g8VE~(q$AY?1z zTZqNZa*;`J9&bOly@nB+_N!ld$U$3ZR?r*y1G1&g4OIj}Aq}AcB<@?h#=8BfzzD0o zDg0YQ#rg&>N58xf%fkwWw+`zSgh7E{3Hd}^q!!=)3435mzdt}l$yz1)~kNBx}kmGt zzpZ&CZh^A4^M8NmFl(4nqXvh{wV%JE|H~Wop6NUp*>YWz>JaI@QHp0U_tt$JWxxu{ zAyHAY_cyYdEZxwsG&kx&9oigk^z-&2VYc|hx_<#!(OjI{g%b+&D=UPR(sFY<jw@Oc>jZgb?svW~^8~7p7I5h+t1~ zA*PiUCq*XRUd|u=_*(gA28{Xi&e*(A*jb^jBGFFwxT6%reVXbj^v)#Oa#oM8(_HQS zyW!5h$&C5a-n~|3`*WHQ1p#8CxS?m3|lIv7p zNvPEt^ZByJHHAvCjXZhur9pb~sw+sy!)(w)V8`zN;KAsZIbPE|(lrjOD_dpVmgpQ=;jin7gVDWjtmG2EyMF&<~wHdLCr|E@(S zbhHb%7iZmR3u7qOdz3+Th@30yeEmlDswkl?yw_iF(?Cc)x=eN&XWt;~D`u7?I z3+9)mp=+0Q=QFXN4~vh(VlOZzODC{Y*j~cd`2g`b__m41qb&K$7T;czr8cpr=*5pb zOO%_-f*SAiTsIp7Hx_vwK@7afLo_FU6io_Uy?Ap?E&tzxeMId!ch=rfCao7uv=K;~ zT+p~vvUR5}!kPJ!4iv8r$zmMqU8Bzs3ehf;vME&Lw&|}U?rKLH{4ALD>PxxhBwVmxyFu7hk?G% zEznazK+u%aF#L2uTG!P1$?Epab+(>3i>#B}%Uq1++?(cwg4SvamJ*luQ0vLuoZ&)6 z=NehLXwMup(4F)jVXt3FsA^;iIBO&6Bq&{sGWF?lZ*mj1?eIirj#F~oAFzBq zSIg%3i1myJX*pdnTfLHX@t>y5%ZRL;w5WZz)MkI{=*E$2<|-^!c-+1U7xUUVJJODF zAbhRGd^fPv=JuJO{$(whAP{~JL~4JFl;5?8&$o4w1eFf-;x&8 ztFj7zcPrTN@A)z0-?pgVc74(nM?#2~dY;4Sh4XYn z?eP_dEM|qC5A;#Y=8Fl_AC*=c&MHjmEk&U@$5f8tI4)5L%Z3yAh#Xg)z>U!*Z6-6) zQPP(MRfj>i0+5$QN{lr+YVw(eK_6bl$YwQUG>pR_r`6nD~gt5BtR6< z-*0@?s8-0t29^Hlh;g(Qs8y$yKBN%;3@)2ZSv`Dje!+fgK2@Icl_k3@r8764i|k{k zKtVpZxUF=K>l4#N>gd+GVkI)yI%igWN7sag$Ja>!bE3wZ3Od)rY^NC9duX~+hB`JiN+Ma9?>mYo!;;VO$ z-xg5AHvVnqi?USv#SicJ-s|N|#1~7W#aXV8+%JoZ9NTZ9X-AU6=mMOa{ep~)%{xOh zA{DgK2Ko2oll3}-860Zr#eEHCEiv~kZgyThD~mCyD_(9UW3{-v7X@S*5lhl3B(m;b&tmX}U+rA84l(^a4(om?8AYzkJw$i1n$ z%#mq{>MJl{Hg6|?p5|ppBEN3T;i?h7Mnqz=5cxZkAM)_j;rD#Ih`%J( ziI5ks=ykd>c?J{36EbK*^Tzk`dMRjO^GqV?wN4#M{h(3x+#hJ(rWOyW>Qd^TE*hCN6&Kvi))RwLOH~%iaX<+_$Slj-Z(S zbNzW>%$$E5{(g5%%F*oN z@BX7P4<$v$@u$JtPgobE0tpprcOIg9x$X@lB_-6{Pe;`PU62;pE%Y8&qQAKsCh=B5 zy96HO+4a<%vc%OjGv$A_RVg(Pc$oYQypTKY!Z(x|JrUfOWa7f`Yt!GVT|Y67V&am- z0bL5;Coh61Lqk{QtgB5rcUdRV#-h#?InT;zrS091b!S@F3V(GSJ>Sj;TdmUA_ z=uKW_b}Ze=ah{d^?{kHpbcB$8jM36O68dfu8WXzVf@{1}BWZ)V(^$4EdtEz)WipBM zWE+&KIG(HJgzPM=;`Xhc4@}%2ZYt3{HXp+RPWW=D!c=)LMxDjc4EO#}MGzhzg1M$U z8&zxs#~t(T_wB_*^%9;g3PuUGN^DJd&c)DBzt|URf`TKOo&cOMGEzw!p`NYY8Tx_ftG9bnUo1 zWfWz3jCP$@Ul}PiVf_;lM(1N#D4;(RUSF9D@&4BE=Oa~H2U*|zfYoG_Ec|5`Ka$(k zfUkWtmi4`honH^VU`URUo{}QjGMW8)E&`zwNEB!NXpb@#3=h)t)X5Y+pFa`{=Dxe( zZ!4TlJWHxR&LK^W`|_q6LWn0B`1{~NhiPCm_($ka)VZ)_iPC$>~ZdRt#R z^JsL60HwTxnur?Gf{kHd!aSVhp0qw$h_%8>QaKa8`WdE=H@)l4qbiBaxo3hcXpc~) zMSF_fkMP67@5p3}3bZ1 zQ{^0|+9nTUC`BxXh?yQ2OiM^7Yi-qzhmq?+7xM3j#<{3D#lwq~D+Uf~R0)f`mnnu6 z4V^Ed-b%2juj|tJQq}mKe5yU)Z<8;FK4=q@CharbxaI8n+?`RK3SsMJS1JqAn=pTF z5;ggzvJ8;T1Im7Z3qv)qExtjTM(2=?7r9t~M_a3yWfEn}2-^)XPf@k3z>E!eVueQxw>V}4#L?^u#ic-7s% zo#DgRHx?fM-`!q+{VSUO1!!44IwL+?ROc2v6EdAsA=rY>doGQrDR z(7DvQcHsnD1a-%(YBYrl0-@jrL_9h&u$%omDwiDS>Qshq!(W}x4*k(u@%EtBHrU($ z(lo!coq*DQVZY6`)tz?1dulp)9r${L6^;SGPLxjuYucbjfcAt zCZ6fSD@dYk{?l;#vhkSw6&(QMW9fWQ&n+?Cf3?QSCdDG!SFm-^IMM@#&L?w1URhR0 znftEWvkOVlXblib`cgxO2!>f7hlU{UgDA8Rw5_@oJF%2Y_%+Jk*Y?qg;11ugSV{#H zoV!1RxAsSLteSI$>`zHTYBQa!Fdr+tupo^``QGx%{x_>cZy($=66Vq~oa)nsG$2Ci zLC_UTlj@|6(|V>5b}7bD=Jt(>o~{@$UK}ShQi|&D#{7 zKG^mr0Yt_G%A^{Ur>Q^$#8Rmac2l#@3O&Qo_-DJwZ} z!w6})W)qw=lYxBBacHZ9%>+8j`MluebnSIcbmHRT0<#p(3vO*<_D*Y7L~ z+H`{6erWHgb#J(@`)j`2AHRGX%Hif$wmY@4AFr}fR6kG4t@_-(v!?%yPygBG&qTF@ z7OrnE;Y8WENKcuvNEAtEopBu0A>#S5@fuW2%n~Y9r(@(Qh_dOEJ3^zaj zm=R3HlalXPdz7DQx5~;=RTh!S?e=(9;cjGL5pPUK4$;t$rxFAM9^d)(>aBob4tGxf zV}M4ys)r+(0aq*ysGVcP{SrEiHfEl)EV9D`D!xWok#Pl03O5=#FF)N*l`t<1ChJ%A zZ9259$z^im09UIM#NMJ<#S={IpHsIch zpOdZXzgE;zg3VH}OuJMqAe_=zgA>dR-x&I9Cr`o|m6ZCiY!cHA*8a-HH;t_MZaqo* z-0JTtbp5SIoAwvB|Ce*bOrld0uHTLmk}~1yAqTTs8osTOrt|?*fe>I&ZcOdE_g}-+7DwT*S9#bFC$f9Lps<3zmwSH9D#anbptGFaAlx z`P=0<^TU9c2Z(Tk__pMSdrWHDL)Ou<5PltOyX5!-!}j;tykZ2m*fx#6f4zSt)eE@5 z<)id7(>9cWtYC{hHtkHXb^|;#Fqgi%30D8f1InEDmYE-X?6R4hbS5ybUBE+HLzxkZ zR-@hH#}VXL95F-Fn>>~A+QFs^Qj0+<8uTKg*`>pSyDnxvNciZbOHLG&fa4iA8cP0R z)rEn3T^$bt?_K&o=9DRx3>-$J5tG(>LjvQ9!nPe4Wzj!^Ji?YdY{x=c@VBt+JO+A8 z+&Hx&rh(!2n^3zU$$&tDbl!#!S2Ju-a@29b9nz)yG{bb=??FPpT#pZzrTaB&=seps ziA&|7Ab_?8K;`@YX&)>S`B@L*K=U%2i;jVw)_wT_0y0vH6g5HeWA zPJ{hMeM);qT+xKB$J_=`qQA7_$evH^y(bR#vq^hT9 zIoA3Bs{t!RQCr$#2Lj;9CfpULnX|!1pZpdFDGyu>i39{IIr5*?f>g6Y@QPm5#{Tgj zbL^Q{S!od3%j9d0_PwS8b0nG)+yrH~3Xt=>K5>dR-9vPrfgf&Ld<3>75+g6C0 zj1I;eVNpgE^n)x6`1ZB>e{zB0lMo@|KnzU! z&Zz_7qfQ%xaBoC}mPOX@P@F~EWe z84saSK5$xQ!(H%7!N>{%p0Ug9sRo?j_VLSB4Vddt_0|un+prH-s?K5;<$!YOVBOL+ zUO~G9l(0jWM%syI*AFe^y3r-n$dHVk%gOJ(r%U4mO}LRT=BIh*1*a>x zuk+tixI4(_@1Ro#LTn`0@ z1B{v>k`CIMCdEf6Ge$noW8#+09^I8@JQgbH>JB51k$xy;p&vp0Yyc_~rxkXc#QrQ~ zK>j@P5hPn8;bC07o9Y76p4bBw;`q$*{H3Wzb?LV4Bq-o@e5OaJ(m@Oy@q~yW$wo3k z3HA8d%uu0E93Uka9`BEG{h!VkiF{mAYkD^GSuUZlLB^ZOFjGN(YZ*IUaj`6RBKu#G z$MER9^nKZ&RxU6EAd#wME0fjNXCCzeQi+dspd3ZFQIxYXkr61Ys$Afcgp~m&VA{|} zDxoS-6-3BuvZ51@p6;4-CwY9VjRZ?fRDuY=e1FDVl_v*MvS9pz_ak&vfx0jc1~F2K zB87eFDF9wseE%pbPljGQxIe=dImw2;nXqrvtsF`hYGWwP4J-S}nLw$?89#qE0vH_A zghYNO%=R;+OKOnNlD>4@ZXieB*Q4Lus(V3DCsva3g_spr7XlfRfCHfPi9 zp{4(Oz^DMwdYXc%s9k z(U6oV)Tn?fx_w_H2?gaH--szuV8IE}$dMb#q)优惠券选择 - - - - + + + + {{items.discountName}} + 有效期至：{{items.useEndTime | timeFormat('yyyy-mm-dd')}} + + + + + - {{items.discountName}} - 有效期至：{{items.useEndTime | timeFormat('yyyy-mm-dd')}} - @@ -221,7 +224,7 @@ //查询优惠券 getUserOrderPreList() { let params = { - usingAttribution: 1 + useScope: 3 } getUserOrderPreList(params).then(res => { if (res.return_code == '000000') { @@ -253,7 +256,7 @@ }) }, radioChanges(item) { - this.paytheprice = this.saveprice; + this.paytheprice = this.orderPrice; if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中 this.memDiscountId = ''; this.payPrice = this.saveprice; @@ -261,27 +264,19 @@ } else { // 否则进行选中赋值 this.memDiscountId = item.id; if (item.discountType == 1) { - if (this.paytheprice > item.discountPrice) { - //满减价格 - this.deductionPrice = item.discountPrice; - this.payPrice = (((this.paytheprice * 100) - (this.deductionPrice * 100)) / - 100); - } else { - uni.showToast({ - title: '未满足满减条件', - icon: 'none', - duration: 2000 - }) - } + //满减价格 + this.deductionPrice = item.discountPrice; + this.payPrice = this.paytheprice- this.deductionPrice; + } else if (item.discountType == 2) { //抵扣价格 this.deductionPrice = item.discountPrice; - this.payPrice = (((this.paytheprice * 100) - (this.deductionPrice * 100)) / 100); + this.payPrice = this.paytheprice - this.deductionPrice; } else if (item.discountType == 3) { // 打折 - this.deductionPrice = this.paytheprice - this.paytheprice * ( - item.discountPrice / 10); - this.payPrice = this.paytheprice * (item.discountPrice / 10); + this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice)) + .toFixed(2); + this.payPrice = parseFloat(this.paytheprice * item.discountPrice).toFixed(2) } } this.$refs.popup.hide(); @@ -333,7 +328,8 @@ uni.showLoading({ title: '提交订单中...' }) - let params = { + let params = { + "memDiscountId": this.memDiscountId, "orderPrice": this.orderPrice, "payPrice": this.payPrice, "rechargeContent": this.rechargeContent, @@ -405,8 +401,12 @@ uni.showToast({ title: '支付成功' }) - uni.switchTab({ - url: '../../pages/tabBar/user/user' + // uni.switchTab({ + // url: '../../pages/tabBar/user/user' + // }) + uni.reLaunch({ + url: '../Phone-recharge-details/Phone-recharge-details?id=' + + that.orderId }) }, fail: function(err) { @@ -492,8 +492,9 @@ uni.showToast({ title: '支付成功' }) - uni.switchTab({ - url: '../../pages/tabBar/user/user' + uni.reLaunch({ + url: '../Phone-recharge-details/Phone-recharge-details?id=' + + this.orderId }) return; } @@ -541,6 +542,7 @@ }, payRequest: function(self) { + let that = this; uni.showLoading({ title: '支付中...' }) @@ -573,15 +575,10 @@ uni.showToast({ title: '支付成功' }) - if (that.jumpType == 4) { - uni.reLaunch({ - url: '/pages/tabBar/user/user' - }); - } else { - uni.reLaunch({ - url: '../success/success?id=' + that.couponId - }); - } + uni.reLaunch({ + url: '../Phone-recharge-details/Phone-recharge-details?id=' + + that.orderId + }) }, cancel: function(r) {}, fail: function(res) {} @@ -628,11 +625,7 @@ } .yhprice { - width: 100%; - height: 25px; - text-align: right; margin-top: -30px; - margin-left: 50px; } .price-number { @@ -713,10 +706,9 @@ box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2); border: 1px solid #f6f6f6; border-radius: 8px; - align-items: center; - display: flex; image { + float: left; width: 170rpx; max-height: 170rpx; margin-left: 10px; @@ -727,6 +719,10 @@ margin-left: 20rpx; } + .contrig { + margin-left: 180rpx; + } + .info { display: flex; justify-content: space-between; diff --git a/subPages/unionPay-orderList/unionPay-orderList.vue b/subPages/unionPay-orderList/unionPay-orderList.vue index 57b4f16..ef1f32b 100644 --- a/subPages/unionPay-orderList/unionPay-orderList.vue +++ b/subPages/unionPay-orderList/unionPay-orderList.vue @@ -69,8 +69,8 @@ 1: '等待付款', 2: '订单已支付', 3: '订单已完成', - 5: '订单已取消', - 4: '订单已退款' + 4: '订单已取消', + 5: '订单已退款' }, // 退换货 orderType: ['全部', '待支付', '已支付', '已完成', '已取消', '已退款'], diff --git a/uni.scss b/uni.scss index b3e09b1..5462e4d 100644 --- a/uni.scss +++ b/uni.scss @@ -117,8 +117,13 @@ $uni-font-size-paragraph:30upx; .font28 { font-size: 28px; +} + +.font48 { + font-size: 48px; } + // 字体加粗 .fontwig6{ font-weight: bold; @@ -317,6 +322,16 @@ $uni-font-size-paragraph:30upx; width: 60%; margin-left: 20%; } + +.width40w { + width: 40%; + margin-left: 30%; +} + +.width20w { + width: 20%; + margin-left: 40%; +} .width35 { width: 35%; @@ -626,6 +641,11 @@ $uni-font-size-paragraph:30upx; .line1 { height: 1px; background-color: #f4f4f4; +} + +.linec6 { + height: 1px; + background-color: #f1f1f1; } .line10 {