From ba7585b7554b9f9302ebda8e568a2242224c9907 Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Mon, 1 Aug 2022 09:35:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B4=B5=E5=B7=9E=E4=BA=A7=E5=93=81=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E4=B8=8D=E8=B6=B3=E5=85=85=E5=80=BC=E7=A7=AF=E5=88=86?= =?UTF-8?q?=202.=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=203.?= =?UTF-8?q?=E6=9F=B4=E6=B2=B9=E6=B1=BD=E6=B2=B9=E5=88=86=E5=BC=80=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=204.=E6=B1=87=E8=81=94=E9=80=9A=E8=B5=B0h5=205.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C=EF=BC=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=206.=E8=AF=9D=E8=B4=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 20 +- Utils/Api.js | 2 +- Utils/Request.js | 3 +- member-Recharge/choicepage/choicepage.vue | 12 +- pages.json | 17 +- pages/goods/goods-list/goods-list.vue | 75 ++- pages/goods/refuel-details/refuel-details.vue | 2 +- pages/login/register.vue | 72 ++- pages/login/updatePas/resetPas.vue | 263 +++++---- pages/order/confirmation.vue | 128 +++- pages/tabBar/home/home.vue | 227 +++++--- pages/tabBar/user/user.vue | 4 +- pages/user/order_details/order_details.vue | 8 + pages/user/runningWater/runningWater.vue | 4 +- pages/userLogin/agreement/agreement.vue | 551 ++++++++++++++++++ pages/userLogin/userLogin.vue | 492 ++++++++++++---- qianzhu-KFC/order-details/order-details.vue | 2 +- static/img/gou.png | Bin 0 -> 1566 bytes static/img/personal.png | Bin 0 -> 9634 bytes static/img/shujuzhuanhuan.png | Bin 0 -> 1392 bytes subPages/recharge/recharge.vue | 93 ++- uni.scss | 6 + 22 files changed, 1566 insertions(+), 415 deletions(-) create mode 100644 pages/userLogin/agreement/agreement.vue create mode 100644 static/img/gou.png create mode 100644 static/img/personal.png create mode 100644 static/img/shujuzhuanhuan.png diff --git a/App.vue b/App.vue index 91896dd..f6e8c3c 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 : '', bresthighAgent:'', @@ -47,7 +47,9 @@ //千猪下单数据 qianzhulist:'', //星巴克价格 - salesTallPrice:'' + salesTallPrice:'', + //第三方嵌入id + mchId:'' }, onLaunch: function() { }, diff --git a/Utils/Api.js b/Utils/Api.js index 4ee1599..7500a73 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -298,7 +298,7 @@ export const bindHuiLianTongCard = params => { } //手机短信登录 export const loginByTel = params => { - return POST('POST', `${base}/wechat/loginByTel`, params).then(res => res.data); + return POST('GET', `${base}/wechat/loginByTel`, params).then(res => res.data); } /** * 工会卡 diff --git a/Utils/Request.js b/Utils/Request.js index 245c81d..7ef525d 100644 --- a/Utils/Request.js +++ b/Utils/Request.js @@ -9,7 +9,8 @@ function request(method, url, data) { header: { 'Accept': "*/*", 'content-type': 'application/json;charset=utf-8', - 'Authorization': app.globalData.token + 'Authorization': app.globalData.token, + 'mchId': app.globalData.mchId }, //有的时候这里不一定是 token 还可能是 Authorization success(res) { resolve(res) diff --git a/member-Recharge/choicepage/choicepage.vue b/member-Recharge/choicepage/choicepage.vue index 6b00dcd..adfb201 100644 --- a/member-Recharge/choicepage/choicepage.vue +++ b/member-Recharge/choicepage/choicepage.vue @@ -1,8 +1,9 @@ @@ -31,7 +32,7 @@ //跳转充值 jumprechangeVip(item) { uni.navigateTo({ - url: '../home/home?id='+item.id + url: '../home/home?id=' + item.id }) }, //查询品牌 @@ -69,5 +70,8 @@ diff --git a/pages.json b/pages.json index 9da3bbc..f12b9a5 100644 --- a/pages.json +++ b/pages.json @@ -122,7 +122,7 @@ "path": "pages/tabBar/category/category", "style": { "navigationBarTextStyle": "white", - "navigationBarTitleText": "分类", + "navigationBarTitleText": "商户", "navigationBarBackgroundColor": "#0083f5", "backgroundColorTop": "#0083f5", "app-plus": { @@ -461,7 +461,16 @@ "navigationBarTextStyle": "white" } } - ], + ,{ + "path" : "pages/userLogin/agreement/agreement", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subpackages": [{ "root": "subPages", "pages": [{ @@ -880,7 +889,7 @@ }, { "path": "choicepage/choicepage", "style": { - "navigationBarTitleText": "选择", + "navigationBarTitleText": "充值类型", "enablePullDownRefresh": false } @@ -909,7 +918,7 @@ "pagePath": "pages/tabBar/category/category", "iconPath": "static/img/tabBar/category.png", "selectedIconPath": "static/img/tabBar/category-on.png", - "text": "导航" + "text": "商户" }, { diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue index 39c30ea..cbdd3bf 100644 --- a/pages/goods/goods-list/goods-list.vue +++ b/pages/goods/goods-list/goods-list.vue @@ -19,6 +19,10 @@ + + {{item.title}} + @@ -56,7 +60,8 @@ import { getCouponList, getCmsContent, - getBrandCouponList + getBrandCouponList, + getListGoodsType } from '../../../Utils/Api.js'; let app = getApp(); export default { @@ -85,14 +90,18 @@ typeId: '', couponName: '', brandid: '', - goodtyid: '' + goodtyid: '', + cateTypeList: [] //分类 }; }, onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数 this.typeId = option.id; this.brandid = option.brandId; - this.goodtyid = option.goodsId; + this.goodtyid = option.goodsId; + if(this.goodtyid == undefined){ + this.goodtyid = ''; + } if (option.id == 1) { uni.setNavigationBarTitle({ title: '商品列表' @@ -104,15 +113,23 @@ uni.setNavigationBarTitle({ title: '积分列表' }); - this.getCouponListArea(); + if (app.globalData.cityName == '贵州省') { + this.getListGoodsType(); + }else{ + this.getCouponListArea(); + } + this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); + } + if (option.id == 5) { + uni.setNavigationBarTitle({ + title: '工会卡列表' + }); + if (app.globalData.cityName == '贵州省') { + this.getListGoodsType(); + }else{ + this.getCouponListArea(); + } this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); - } - if (option.id == 5) { - uni.setNavigationBarTitle({ - title: '工会卡列表' - }); - this.getCouponListArea(); - this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); } if (option.id == 3) { uni.setNavigationBarTitle({ @@ -134,6 +151,38 @@ } }, methods: { + //查询品牌 + getListGoodsType() { + uni.showLoading({ + title: '加载中...' + }) + let params = { + pageNum: 1, + pageSize: 10000, + userService: '贵州中石化' + } + getListGoodsType(params).then(res => { + uni.hideLoading(); + if (res.return_code == '000000') { + this.cateTypeList = res.return_data.list; + this.goodtyid = res.return_data.list[0].id; + if (app.globalData.cityName == '贵州省') { + this.getCouponListArea(); + } + } else { + this.cateTypeList = []; + } + }) + }, + //切换id + switchid(item){ + this.goodtyid = item.id; + this.pageNum = 1; + this.pageSize = 10; + this.isNoMoreData = false; + this.goodsList = []; + this.getCouponListArea(); + }, //获取弹出或者弹窗 getCmsContent(item) { let params = { @@ -162,6 +211,7 @@ let pagenum = this.pageNum; let params = { regionId: app.globalData.cityId, + goodsTypeId: this.goodtyid, pageNum: pagenum, pageSize: this.pageSize, displayArea: this.typeId, @@ -358,5 +408,8 @@ font-size: 24upx; text-decoration: line-through; } + } + .borbtom{ + border-bottom: 2px solid #089bf5; } diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index 8f47a33..b736985 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -221,7 +221,7 @@ this.isTyAgent = true; } - if (app.globalData.gasKey) { + if (app.globalData.gasKey && app.globalData.accountType == '000000&gasKey') { this.store_key = app.globalData.gasKey; } else { app.globalData.staffCode = ''; diff --git a/pages/login/register.vue b/pages/login/register.vue index 745b5b6..627e82e 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -15,7 +15,18 @@ - 立即登录/注册 + + + + + + + 授权即表示同意 + 《注册协议》《服务协议》 + + 立即登录/注册 + @@ -39,16 +50,28 @@ passwd: "", getCodeText: '获取验证码', getCodeBtnColor: "#ffffff", - getCodeisWaiting: false + getCodeisWaiting: false, + disabled: false, } }, onLoad() { }, methods: { + //开启状态 + getchecked() { + this.disabled = !this.disabled + }, + //跳转协议 + getDocument(item) { + uni.navigateTo({ + url: '../userLogin/agreement/agreement?id=' + item + }) + }, Timer() {}, getCode() { uni.hideKeyboard() + if (this.getCodeisWaiting) { return; } @@ -63,8 +86,8 @@ title: '发送中...' }) let params = { - phone: this.phoneNumber, - HWMSG:3 + phone: this.phoneNumber, + HWMSG: 3 } sendSmsCodeByHw(params).then(res => { uni.hideLoading(); @@ -96,7 +119,15 @@ }, 1000) }, doReg() { - uni.hideKeyboard() + uni.hideKeyboard(); + if (this.disabled == false) { + uni.showToast({ + title: '请勾选用户协议', + icon: "none", + duration: 2000 + }) + return; + } //模板示例部分验证规则 if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) { uni.showToast({ @@ -136,8 +167,7 @@ key: "token", data: res.return_data.uniqueCode }) - uni.navigateBack({ - }); + uni.navigateBack({}); } else { uni.showToast({ title: res.return_msg, @@ -161,4 +191,32 @@ margin-top: 90px; margin-bottom: 40px; } + + .checkbox { + display: flex; + align-items: center; + // line-height: 35rpx; + + .checkyes { + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + border: 1px solid #f4f4f4; + background-color: #089BF5; + margin-right: 10rpx; + border-radius: 50%; + text-align: center; + vertical-align: sub; + } + + .checkno { + width: 35rpx; + height: 35rpx; + display: inline-block; + border: 1px solid #666; + margin-right: 10rpx; + border-radius: 50%; + vertical-align: sub; + } + } diff --git a/pages/login/updatePas/resetPas.vue b/pages/login/updatePas/resetPas.vue index a241c0d..7e45cb3 100644 --- a/pages/login/updatePas/resetPas.vue +++ b/pages/login/updatePas/resetPas.vue @@ -1,103 +1,164 @@ - - - - - diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 29fad7c..b00e5da 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -91,11 +91,13 @@ - 支付方式: 积分充值 + 支付方式: 积分充值 - 积分支付可用积分: {{user.gold}} @@ -105,7 +107,8 @@ - + @@ -228,9 +231,9 @@ tongCardPrice: 0, storeId: '', isDiscont: false, - coupondiscountid: '', - orderDetails:'' //订单详情 - + coupondiscountid: '', + orderDetails: '', //订单详情 + payGold: '' //积分数 }; }, onLoad(option) { @@ -295,7 +298,7 @@ let params = { couponId: this.couponId } - getCouponById(params).then(res => { + getCouponById(params).then(res => { uni.hideLoading(); if (res.return_code == '000000') { this.couponList = res.return_data; @@ -413,20 +416,24 @@ duration: 2000 }) return; - } - if(this.orderDetails){ - this.orderToPay(this.orderDetails); - return; - } + } + if (this.orderDetails) { + this.orderToPay(this.orderDetails); + return; + } uni.showLoading({ title: '提交订单中...' }) if (this.couponList.reserveStatus) { this.storeId = app.globalData.storeid } + if (this.paytype == 'jinbi' && this.user.gold < this.paytheprice * 100 && this.couponList.buyPoints) { + this.payGold = this.user.gold; + } let goods = { "memDiscountId": this.coupondiscountid, "identificationCode": app.globalData.identificationCode, + "payGold": this.payGold, "highChildOrderList": [{ "goodsType": 1, "goodsId": this.couponId, @@ -434,7 +441,7 @@ "storeId": this.storeId }] } - addOrder(goods).then(res => { + addOrder(goods).then(res => { uni.hideLoading(); if (res.return_code == '000000') { // uni.redirectTo({ @@ -444,7 +451,7 @@ // .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 { @@ -492,7 +499,7 @@ "openId": app.globalData.openId, "orderScene": "GOODS_ORDER" } - // #endif + // #endif orderToPay(params).then(res => { if (res.return_code == '000000') { // #ifdef MP @@ -539,7 +546,7 @@ } }) } else if (that.paytype == 'jinbi') { - if (that.user.gold < that.paytheprice * 100) { + if (that.user.gold < that.paytheprice * 100 && !this.couponList.buyPoints) { uni.showToast({ icon: 'none', title: '积分不足', @@ -554,6 +561,79 @@ }); return; } + + if (that.user.gold < that.paytheprice * 100 && this.couponList.buyPoints) { + + uni.showModal({ + title: '积分支付', + content: '积分不足，请购买并兑换', + success: function(res) { + if (res.confirm) { + // #ifdef H5 + let params = { + "orderId": item.id, + "openId": app.globalData.openId, + "orderScene": "GOODS_ORDER", + "openIdType": 2 + } + // #endif + // #ifdef MP + let params = { + "orderId": item.id, + "openId": app.globalData.openId, + "orderScene": "GOODS_ORDER" + } + // #endif + orderToPay(params).then(res => { + if (res.return_code == '000000') { + // #ifdef MP + uni.showLoading({ + title: '支付中...' + }) + uni.requestPayment({ + "appId": res.return_data.appId, + "nonceStr": res.return_data.nonceStr, + "package": res.return_data.package, + "paySign": res.return_data.sign, + "signType": "MD5", + "timeStamp": res.return_data.timeStamp, + success: function(res) { + uni.hideLoading(); + uni.showToast({ + title: '支付成功' + }) + app.globalData.storeid = ''; + app.globalData.storename = ''; + uni.reLaunch({ + url: '../pay/success/success?id=' + that.couponId + }); + }, + fail: function(err) { + uni.hideLoading(); + uni.navigateBack({}) + }, + }); + // #endif + + //判断是否是公众号 + // #ifdef H5 + //判断微信浏览器 + that.payRequest(res); + // #endif + + } else { + uni.showToast({ + title: res.return_msg, + icon: 'none' + }) + } + }) + } + } + }) + + return; + } if (!that.user.isSetPayPwd) { uni.navigateTo({ url: '../login/updatePas/updatePas' @@ -734,12 +814,12 @@ duration: 4000 }); }); - }, - //跳转积分充值 - jumpdeposits(){ - uni.navigateTo({ - url:'../user/deposit/deposit' - }) + }, + //跳转积分充值 + jumpdeposits() { + uni.navigateTo({ + url: '../user/deposit/deposit' + }) } } @@ -954,8 +1034,8 @@ .jfrecharge { background-color: #0083f5; - padding: 5px 20rpx; - color: #fff; + padding: 5px 20rpx; + color: #fff; margin-left: 50%; justify-content: center; align-items: center; diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index a6eb231..3062945 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -213,7 +213,7 @@ uni.getStorage({ key: 'gasKey', success(e) { - if (e.data) { + if (e.data) { app.globalData.gasKey = e.data; } } @@ -221,8 +221,13 @@ uni.getStorage({ key: 'staffCode', success(e) { - if (e.data) { - app.globalData.staffCode = e.data; + if (e.data) { + if (app.globalData.accountId == '000001&key' || app.globalData.accountId == + '000000&gasKey') { + app.globalData.staffCode = e.data; + } else { + app.globalData.mchId = e.data; + } } } }) @@ -355,7 +360,7 @@ methods: { jumpcdx() { location.href = - 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'; + 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'; }, //获取首页功能 getCmsContentcmsContent() { @@ -517,6 +522,15 @@ success(e) { if (e.data) { app.globalData.accountType = e.data; + + // 000000#/ 一健加油 + // 000000&gasKey 加油员 + // 000001&key 领取优惠券 + // 002 积分专区 + // 003 星巴克 + // 004 肯德基 + // 005 会员充值 + // 006 话费充值 if (e.data == '000000#/' && app.globalData.h5code) { uni.navigateTo({ url: '../../goods/refuel-details/refuel-details' @@ -527,12 +541,37 @@ url: '../../goods/refuel-details/refuel-details' }) } - if (e.data == '000001&key') { uni.navigateTo({ url: '/subPages/scancodeCoupons/scancodeCoupons' }) } + + if (e.data == '000002&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '/pages/goods/goods-list/goods-list?id=2' + }) + } + if (e.data == '000003&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '/qianzhu-Starbucks/home/home' + }) + } + if (e.data == '000004&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '../../../qianzhu-KFC/home/home' + }) + } + if (e.data == '000005&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '/member-Recharge/choicepage/choicepage' + }) + } + if (e.data == '000006&key' && app.globalData.h5code) { + uni.navigateTo({ + url: '../../../subPages/recharge/recharge' + }) + } } } }) @@ -718,35 +757,39 @@ // }) // return; // } - if (item.title == '在线加油') { - uni.navigateTo({ - url: item.ext1 - }) - } else if (item.title == '肯德基') { - uni.navigateTo({ - // url: '/pages/tabBar/order/order?id=1' - url: '../../../qianzhu-KFC/home/home' - }) - } else if (item.title == '电影票') { - uni.navigateTo({ - // url: '/pages/tabBar/order/order?id=2' - // url: '/qianzhu-Starbucks/home/home' - }) - } else if (item.title == '话费充值') { - uni.navigateTo({ - url: '../../../subPages/recharge/recharge' - }) - } else if (item.title == '星巴克') { - uni.navigateTo({ - url: '/qianzhu-Starbucks/home/home' - }) - } else { - uni.showToast({ - title: '暂未开通', - icon: 'none', - duration: 2000 - }) - } + // if (item.title == '在线加油') { + uni.navigateTo({ + url: item.ext1 + }) + // } else if (item.title == '肯德基') { + // uni.navigateTo({ + // // url: '/pages/tabBar/order/order?id=1' + // url: '../../../qianzhu-KFC/home/home' + // }) + // } else if (item.title == '电影票') { + // uni.navigateTo({ + // // url: '/pages/tabBar/order/order?id=2' + // // url: '/qianzhu-Starbucks/home/home' + // }) + // } else if (item.title == '话费充值') { + // uni.navigateTo({ + // url: '../../../subPages/recharge/recharge' + // }) + // } else if (item.title == '星巴克') { + // uni.navigateTo({ + // url: '/qianzhu-Starbucks/home/home' + // }) + // }else if (item.title == '会员充值') { + // uni.navigateTo({ + // url: '/member-Recharge/choicepage/choicepage' + // }) + // } else { + // uni.showToast({ + // title: '暂未开通', + // icon: 'none', + // duration: 2000 + // }) + // } }, //轮播跳转活动 jumplottery(item) { @@ -771,60 +814,64 @@ // }) // return; // } - if (item.title == '汇联通') { - uni.navigateTo({ - url: '/pages/goods/goods-list/goods-list?id=2' - }) - return; - } - if (item.title == '在线加油') { - uni.navigateTo({ - url: '/pages/goods/refuel/refuel' - }) - return; - } - if (item.title == '话费充值') { - uni.navigateTo({ - url: '../../../subPages/recharge/recharge' - }) - return; - } - if (item.title == '电影票') { - uni.navigateTo({ - url: '/pages/tabBar/order/order?id=2' - }) - return; - } - if (item.title == '星巴克') { - uni.navigateTo({ - url: '/qianzhu-Starbucks/home/home' - }) - return; - } - if (item.title == '肯德基') { - uni.navigateTo({ - url: '../../../qianzhu-KFC/home/home' - }) - return; - } - if (item.title == '优选商品') { - uni.navigateTo({ - 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: '/member-Recharge/choicepage/choicepage' - }) - return; - } + + uni.navigateTo({ + url: item.ext1 + }) + // if (item.title == '汇联通') { + // uni.navigateTo({ + // url: '/pages/goods/goods-list/goods-list?id=2' + // }) + // return; + // } + // if (item.title == '在线加油') { + // uni.navigateTo({ + // url: '/pages/goods/refuel/refuel' + // }) + // return; + // } + // if (item.title == '话费充值') { + // uni.navigateTo({ + // url: '../../../subPages/recharge/recharge' + // }) + // return; + // } + // if (item.title == '电影票') { + // uni.navigateTo({ + // url: '/pages/tabBar/order/order?id=2' + // }) + // return; + // } + // if (item.title == '星巴克') { + // uni.navigateTo({ + // url: '/qianzhu-Starbucks/home/home' + // }) + // return; + // } + // if (item.title == '肯德基') { + // uni.navigateTo({ + // url: '../../../qianzhu-KFC/home/home' + // }) + // return; + // } + // if (item.title == '优选商品') { + // uni.navigateTo({ + // 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: '/member-Recharge/choicepage/choicepage' + // }) + // return; + // } }, //调整商品列表 goGoodsList(item) { @@ -864,8 +911,8 @@ } .popImg { - width: 300px; - height: 440px; + width: 100%; + height: 430px; } .h5xfimg { diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index 120505c..2f8b79a 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -306,7 +306,7 @@ }, { url: '../../login/updatePas/updatePas', - text: '设置密码', + text: '设置积分密码', img: '../../../static/img/pas.png' } ] @@ -320,7 +320,7 @@ }, { url: '../../login/updatePas/resetPas', - text: '修改密码', + text: '修改积分密码', img: '../../../static/img/pas.png' } ] diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue index 19870d6..bb691f8 100644 --- a/pages/user/order_details/order_details.vue +++ b/pages/user/order_details/order_details.vue @@ -153,6 +153,14 @@ src="../../../static/img/jfx.png"> {{(recinfo.deductionPrice * 10 * 10).toFixed(0)}} + + + + 积分抵扣 : + + + ￥{{(recinfo.payGold / 100).toFixed(2)}} + diff --git a/pages/user/runningWater/runningWater.vue b/pages/user/runningWater/runningWater.vue index a307c5e..53ba07f 100644 --- a/pages/user/runningWater/runningWater.vue +++ b/pages/user/runningWater/runningWater.vue @@ -29,8 +29,8 @@ :key="agenL.id"> - {{agenL.highCouponCode.consumeTime | formatDate('-')}} - {{agenL.highCouponCode.storeName}} + {{agenL.salesTime | formatDate('-')}} + {{agenL.highCoupon.couponName}} {{agenL.highCoupon.salesPrice}}.00元 diff --git a/pages/userLogin/agreement/agreement.vue b/pages/userLogin/agreement/agreement.vue new file mode 100644 index 0000000..92bfe86 --- /dev/null +++ b/pages/userLogin/agreement/agreement.vue @@ -0,0 +1,551 @@ + + + + + diff --git a/pages/userLogin/userLogin.vue b/pages/userLogin/userLogin.vue index e56410c..666cce1 100644 --- a/pages/userLogin/userLogin.vue +++ b/pages/userLogin/userLogin.vue @@ -1,31 +1,22 @@ @@ -47,8 +83,8 @@ import { getUserInfo, loginByPhone, - HandleCode, - loginByTel, + HandleCode, + loginByTel, sendSmsCodeByHw } from "../../Utils/Api.js" export default { @@ -57,12 +93,13 @@ user: '', imagewxUrl: app.globalData.imageWxImg, imgadres: 'login.png', - imgadres1: 'loginphone.png', - phoneNumber: "", - code: '', - getCodeText: '获取验证码', + imgadres1: 'loginphone.png', + phoneNumber: "", + code: '', + getCodeText: '获取验证码', getCodeisWaiting: false, - type: 1 // 区分登录方式 + type: 1, // 区分登录方式 + disabled: false, } }, onLoad() { @@ -87,7 +124,17 @@ // #endif this.user = app.globalData.userInfo; }, - methods: { + methods: { + //开启状态 + getchecked() { + this.disabled = !this.disabled + }, + //跳转协议 + getDocument(item){ + uni.navigateTo({ + url:'./agreement/agreement?id='+item + }) + }, getuserinfo() { let that = this; uni.getUserProfile({ @@ -138,7 +185,15 @@ that.isShowAuth = false }, // 微信获取手机号 - loginByPhone(PhoneNumber) { + loginByPhone(PhoneNumber) { + if (this.disabled == false) { + uni.showToast({ + title: '请勾选用户协议', + icon: "none", + duration:2000 + }) + return; + } if (PhoneNumber.detail.iv == undefined) { uni.showToast({ title: "用户取消授权", @@ -191,108 +246,121 @@ }) }, //改变登录方式 - updateStu(item) { - this.type = item; - }, - //发送短信 - getCode() { - uni.hideKeyboard() - if (this.getCodeisWaiting) { - return; - } - if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) { + updateStu(item) { + if (this.disabled == false) { uni.showToast({ - title: '请填写正确手机号码', - icon: "none" - }); - return false; - } - uni.showLoading({ - title: '发送中...' - }) - let params = { - phone: this.phoneNumber, - HWMSG:5 - } - sendSmsCodeByHw(params).then(res => { - if (res.return_code == '000000') { - this.getCodeisWaiting = true; - uni.showToast({ - title: '验证码已发送', - icon: "none" - }); - this.setTimer(); - } else { - uni.hideLoading() - } - }) - }, - setTimer() { - let holdTime = 60; - this.getCodeText = "重新获取(60)" - this.Timer = setInterval(() => { - if (holdTime <= 0) { - this.getCodeisWaiting = false; - this.getCodeBtnColor = "#ffffff"; - this.getCodeText = "获取验证码" - clearInterval(this.Timer); - return; - } - this.getCodeText = "重新获取(" + holdTime + ")" - holdTime--; - - }, 1000) - }, - //手机短信登录 - doReg() { - uni.hideKeyboard() - //模板示例部分验证规则 - if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) { - uni.showToast({ - title: '请填写正确手机号码', - icon: "none" - }); - return false; - } - if (!this.code) { - uni.showToast({ - title: '请填写验证码', - icon: "none" - }); - return false; - } - uni.showLoading({ - title: '提交中...' - }) - let params = { - phone: this.phoneNumber, - smsCode: this.code - } - loginByTel(params).then(res => { - uni.hideLoading() - if (res.return_code == '000000') { - app.globalData.token = res.return_data.uniqueCode; - app.globalData.userInfo = res.return_data - .object - .highUser; - uni.setStorage({ - key: "user", - data: res.return_data - .object - .highUser - }) - uni.setStorage({ - key: "token", - data: res.return_data.uniqueCode - }) - uni.navigateBack({}) - } else { - uni.showToast({ - title: res.return_msg, - icon: "none" - }); - } - }) + title: '请勾选用户协议', + icon: "none", + duration:2000 + }) + return; + } + this.type = item; + }, + //发送短信 + getCode() { + uni.hideKeyboard() + if (this.getCodeisWaiting) { + return; + } + if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) { + uni.showToast({ + title: '请填写正确手机号码', + icon: "none" + }); + return false; + } + uni.showLoading({ + title: '发送中...' + }) + let params = { + phone: this.phoneNumber, + HWMSG: 5 + } + sendSmsCodeByHw(params).then(res => { + if (res.return_code == '000000') { + this.getCodeisWaiting = true; + uni.showToast({ + title: '验证码已发送', + icon: "none" + }); + this.setTimer(); + } else { + uni.showToast({ + title: res.return_msg, + duration: 2000, + icon: "none" + }) + uni.hideLoading() + } + }) + }, + setTimer() { + let holdTime = 60; + this.getCodeText = "重新获取(60)" + this.Timer = setInterval(() => { + if (holdTime <= 0) { + this.getCodeisWaiting = false; + this.getCodeBtnColor = "#ffffff"; + this.getCodeText = "获取验证码" + clearInterval(this.Timer); + return; + } + this.getCodeText = "重新获取(" + holdTime + ")" + holdTime--; + + }, 1000) + }, + //手机短信登录 + doReg() { + uni.hideKeyboard() + //模板示例部分验证规则 + if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) { + uni.showToast({ + title: '请填写正确手机号码', + icon: "none" + }); + return false; + } + if (!this.code) { + uni.showToast({ + title: '请填写验证码', + icon: "none" + }); + return false; + } + uni.showLoading({ + title: '提交中...' + }) + let params = { + phone: this.phoneNumber, + code: this.code + } + loginByTel(params).then(res => { + uni.hideLoading() + if (res.return_code == '000000') { + app.globalData.token = res.return_data.uniqueCode; + app.globalData.userInfo = res.return_data + .object + .highUser; + uni.setStorage({ + key: "user", + data: res.return_data + .object + .highUser + }) + uni.setStorage({ + key: "token", + data: res.return_data.uniqueCode + }) + uni.navigateBack({}) + } else { + uni.showToast({ + title: res.return_msg, + icon: "none" + }); + } + }) }, } } @@ -304,4 +372,170 @@ .btns { border-radius: 6px; } + + page { + background-color: #f0f0f1; + } + + .container { + + .banner { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + height: 350rpx; + } + + .identity-code { + width: 150rpx; + height: 150rpx; + background-color: rgba(255, 255, 255, 0.2); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + // position: relative; + } + + + + .img1 { + border: 1px solid rgba(255, 255, 255, 0.4); + border-radius: 100%; + width: 130rpx; + height: 130rpx; + } + + .shuju { + margin: 0rpx 10rpx; + } + + // 右边 + .aut-code { + width: 150rpx; + height: 150rpx; + background-color: rgba(255, 255, 255, 0.2); + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + } + + + .notice { + border-bottom: 20rpx solid #f0f0f1; + background-color: #FFFFFF; + padding: 20rpx 20rpx 20rpx 20rpx; + font-size: 30rpx; + + .name { + font-size: 34rpx; + font-weight: 600; + color: #2c2d28; + } + + .checkbox { + display: flex; + align-items: center; + // line-height: 35rpx; + + .checkyes { + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + border: 1px solid #f4f4f4; + background-color: #089BF5; + margin-right: 10rpx; + border-radius: 50%; + text-align: center; + vertical-align: sub; + } + + .checkno { + width: 35rpx; + height: 35rpx; + display: inline-block; + border: 1px solid #666; + margin-right: 10rpx; + border-radius: 50%; + vertical-align: sub; + } + } + + } + + .phone { + width: 80%; + margin: auto; + padding: 20rpx; + border-radius: 25rpx; + box-shadow: 5rpx 5rpx 10rpx 10rpx #a1a1a1; + background-color: rgba(255, 255, 255, 1); + + .ph-title { + display: block; + width: 100%; + // border: 1px solid red; + text-align: center; + color: #000000; + font-size: 40rpx; + margin-bottom: 25rpx; + + } + + .ph-phone { + display: flex; + width: 90%; + margin: auto; + align-items: center; + margin-top: 50rpx; + margin-bottom: 50rpx; + + .ph-it1 { + flex: 3; + display: inline-block; + border-bottom: 1px solid #b5b5b5; + } + + .ph-btn { + flex: 2; + margin-left: 10rpx; + display: inline-block; + border: 1px solid #2cb0b0; + border-radius: 18rpx; + text-align: center; + height: 50rpx; + line-height: 45rpx; + } + } + + } + + .confirm-box { + display: flex; + flex-direction: row; + margin-top: 100rpx; + + .cancel { + border-radius: 10rpx; + font-size: 32rpx; + font-weight: 700; + background-color: #089bf5; + width: 40%; + padding: 0px; + color: #fff; + } + + .confirm { + border-radius: 10rpx; + background-color: #089bf5; + font-size: 32rpx; + font-weight: 700; + color: #FFFFFF; + width: 40%; + padding: 0px; + } + } + } diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue index 3d1305f..4071499 100644 --- a/qianzhu-KFC/order-details/order-details.vue +++ b/qianzhu-KFC/order-details/order-details.vue @@ -9,7 +9,7 @@ {{typeText[orderList.orderStatus]}} 若超时未支付,订单将自动取消 - 立即支付 + 立即支付 wy$!fk$L9koEv$x0Bg+3=GVVJY5_^DsH`2O@stiqur%7Hjvj4&slNV=ttSXe<&MbCcS36NbVZ#|87Bl8rJl;8gJPIk-M zv!$`?9Od8LaZIqUf7SH;p>eIqm+iO3-ggF9?|yByevdvdXl6-$NlbSa|MUF(zUtND zH*>x7*T3Gi_@20+;L7#w@7}&_`u{_4*6i1}u3I)+T3&ei^h6IYj{`H~^}01*k9G)t ze!y7s_WkRo_?VV^``+HV?z&h>>C)Au#xD#_SoZD{?_Kf#q4SH26W7TX7vJ!B`Ep%t zYsQ|m7kpyzEWSb=(D}`>sXiF-$d(_U0jwdK77tiLcaap zuBW%I@Bh1Pn^W(_pL1t?*nQtX`tqek|6C;ulho7;C(Lw0AUwttWIRx;1$M8H;Hm9W~-u?c*^mWk*qgM(m{?wRMrMimWc=zt5`y?%kl**?! z=1%Gr;fu6lXS^|MGQTKa z6?f-pDmDTMJMN$UU2tO33x^H&qW3&Mug`z4-Fey(z2(veI|MIZZ%>xzkDT zWn!sqU}0roFuU}^dK3-0`6-!cmAEy$(#Q}7YH$VFP+XR7m6TYVs#{u=$&i+rlWL`} zub+{ho2s9flAD>QpP8JWr<<0aSE65%TL9+8CuLWfSmdTB)Xu#?{Bn^$ejQ4>W+{pA^vbjY{MsZS=g;5I3f9v|n+JGj){RaS=F`DoI literal 0 HcmV?d00001 diff --git a/static/img/personal.png b/static/img/personal.png new file mode 100644 index 0000000000000000000000000000000000000000..f09fb53aeebcb923dab7b456921c3931a3612672 GIT binary patch literal 9634 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 Y0~L)+eR)U83;+NC07*qoM6N<$f@!`V?f?J) literal 0 HcmV?d00001 diff --git a/static/img/shujuzhuanhuan.png b/static/img/shujuzhuanhuan.png new file mode 100644 index 0000000000000000000000000000000000000000..385d3e67baafead9eae70b8126ef4bde82899d8b GIT binary patch literal 1392 zcmeAS@N?(olHy`uVBq!ia0vp^4nS-szy>7Mo17hi6id3JFOc5Y&;2Kn7072S4sv&5 zSa(k5C6J?#>=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15^PD{ z?k+$Y2!1;6t_M<_1s;*bK-vS0-A-oP0j=Zoba4!+xb=39uSZCr$np2Gy&+emR76+; z1^y_xiWqv`*&(Rq=FD-jcfsvH5nD2p*WKZ0<@OBE+#A;aLY4wo(9cGt z84ES`U4C@mboQpo^E<0#Z1-zP@=4xzKCQG(ni}Lp^Jgynh*3qG%&An@*O`xr3k&@xRu0>PBtgNMP-OAckf1g*ywX3LT$72yarsD0N zQW!IqPMtT;?eU8aYnO*MGiMmA@8f3hp7rec#jLzGIk}>Cts6`B%ip@3T;){5y`z*{ z**Q_sPHEBNoxwXyfLia}c22IJZ$0P#=3QOpKep%JnaI(kfP@Yld>MSu#iiuET-45; z0g=n)3@0eLra7KC#I$Ukea(R>8(!K6G8o*^F|YeC_v?#hxm=TPTiXKvc?$$&)H7@k z9B$9(_!vIffx#|3eD=HrUm42Z7qx4|u-v@)EcC)ZhWU1d?P_z3qcWG;*O{DMz^b@- zamL=Nqq55rgpW6F+kW`@M#ImO1@1GQ*;TZ;NyXA~kAs-_LSNqtTTS127u!ZeHGRB& zdmg{5;*Y-<%HO}SyY%IaedbLJ}dp|G+W0KS+Ea>gM z@c#Z=5tn#*E+xBp*8T@o4fK?mt?cra3n-=Ew|yvXaOQdQthu`1z5|oq@y301y%Qfk z^97}+13UKEy!f&OnD)xVq}~N@In+Eq>K*8ji#W3KFrzrXK%j4M+rJMOtzSv{(e!Ng4L`|kGkr-d1g z1qb~F4|4tTTxs77EFDx!Tq8 - - - - - - - - - - - diff --git a/uni.scss b/uni.scss index 0be7c28..9325945 100644 --- a/uni.scss +++ b/uni.scss @@ -304,6 +304,9 @@ $uni-font-size-paragraph:30upx; .backcorfff { background-color: white; } +.backcorlb{ + background: linear-gradient(to right, #089bf5, #0083f5); +} .backshare { background: rgba(0, 0, 0, 0); @@ -686,6 +689,9 @@ $uni-font-size-paragraph:30upx; padding-right: 10px; } +.paddtright15 { + padding-right: 15px; +} .paddbotm5 { padding-bottom: 5px; }