diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue index 37cdcaf..749f788 100644 --- a/high-unionPay/App.vue +++ b/high-unionPay/App.vue @@ -5,15 +5,15 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - url: 'https://hsg.dctpay.com/crest', - imgUrl: 'https://hsg.dctpay.com/filesystem/', - brestUrl : 'https://hsg.dctpay.com/brest', - imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', + // url: 'https://hsg.dctpay.com/crest', + // imgUrl: 'https://hsg.dctpay.com/filesystem/', + // brestUrl : 'https://hsg.dctpay.com/brest', + // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', //测试 - // url: 'https://hsgcs.dctpay.com/crest', - // brestUrl : 'https://hsgcs.dctpay.com/brest', - // imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', + url: 'https://hsgcs.dctpay.com/crest', + brestUrl : 'https://hsgcs.dctpay.com/brest', + imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', userInfo: "", brestUserInfo : '', openId: '', diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js index 86d19ec..5bdaf55 100644 --- a/high-unionPay/Utils/Api.js +++ b/high-unionPay/Utils/Api.js @@ -131,6 +131,11 @@ export const cancelOrder = params => { export const getOrderById = params => { return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data); } + +//已完成未查看 +export const orderCheck = params => { + return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data); +} //获取商户列表 export const getMerchantList = params => { return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data); diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json index 18e8128..7c7a0ec 100644 --- a/high-unionPay/pages.json +++ b/high-unionPay/pages.json @@ -5,8 +5,8 @@ "style": { "navigationBarTextStyle": "white", "navigationBarTitleText": "嗨森逛", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", + "navigationBarBackgroundColor": "#3da7e7", + "backgroundColorTop": "#3da7e7", "onReachBottomDistance": 50, "app-plus": { "titleNView": false, //禁用原生导航栏 @@ -700,7 +700,19 @@ } } - ], + ,{ + "path" : "pages/user/news/news", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false //禁用原生导航栏 + } + } + + } + ], "subpackages": [{ "root": "subPages", "pages": [{ diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue index 9789374..e3e5156 100644 --- a/high-unionPay/pages/goods/goods-list/goods-list.vue +++ b/high-unionPay/pages/goods/goods-list/goods-list.vue @@ -2,7 +2,7 @@ - + @@ -24,35 +24,21 @@ @click="switchid(item)" :class="[goodtyid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index"> {{item.title}} - - - - - {{row.couponName}} + + + + {{row.couponName}} 限购{{row.limitNumber}}件 - - - - {{ row.discountPrice*100}} - - - ¥ {{ row.discountPrice}} + + + ¥{{ row.discountPrice}} - - - - - - {{ row.salesPrice*100}} - - ¥{{ row.salesPrice}} + + ¥{{ row.salesPrice}} @@ -61,6 +47,7 @@ + diff --git a/high-unionPay/pages/goods/goods.vue b/high-unionPay/pages/goods/goods.vue index 645c404..8a8bab0 100644 --- a/high-unionPay/pages/goods/goods.vue +++ b/high-unionPay/pages/goods/goods.vue @@ -1,340 +1,333 @@ - - - - - diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue index 72795e7..5656c94 100644 --- a/high-unionPay/pages/tabBar/home/home.vue +++ b/high-unionPay/pages/tabBar/home/home.vue @@ -1,58 +1,133 @@ @@ -88,10 +163,11 @@ currentSwiper: 0, imageUrl: app.globalData.imgUrl, imagewxUrl: app.globalData.imageWxImg, - imgadres: 'headunion.png', - imgadres1: 'jbhed.png', - imgadres2: 'jt.png', - imgadres3: '', + imgadres: '/home/home1.png', + imgadres1: '/home/home2.png', + imgadres2: 'jt.png', + imgadres5: 'unionarea.png', + imgadres3: '', imgadres4: 'cusservice.png', webUrl: '', // 轮播图片 @@ -152,26 +228,10 @@ success(e) { app.globalData.token = e.data; } - // fail() { - // uni.navigateTo({ - // url: '../../userLogin/userLogin' - // }) - // } }) - // if (!app.globalData.userInfo.phone) { - // uni.navigateTo({ - // url: '../../userLogin/userLogin' - // }) - // return; - // } that.getCacheParam(); } }) - // if (app.globalData.cityName != '') { - // this.city = app.globalData.cityName; - // this.getCouponListArea(); - // this.getCouponListgold(); - // } }, onLoad() { this.hqaddress(); @@ -213,6 +273,11 @@ delCacheParam(params).then(res => { }) + }, + test(item) { + uni.navigateTo({ + url:'../../user/news/news' + }) }, //定位信息 hqaddress() { @@ -451,49 +516,6 @@ uni.navigateTo({ url: item.ext1 }) - // 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/refuel/refuel' - // }) - // return; - // } - // if (item.title == '话费充值') { - // uni.navigateTo({ - // url: '../../unionPay/recharge/recharge' - // }) - // return; - // } - // if (item.title == '积分专区') { - // uni.navigateTo({ - // url: '/pages/goods/goods-list/goods-list?id=3' - // }) - // 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; - // } - }, //调整商品列表 goGoodsList(item) { @@ -506,608 +528,261 @@ }; diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue index 7c7d82b..3859232 100644 --- a/high-unionPay/pages/tabBar/user/user.vue +++ b/high-unionPay/pages/tabBar/user/user.vue @@ -1,8 +1,7 @@ @@ -142,91 +164,36 @@ isfirst: true, imagewxUrl: app.globalData.imageWxImg, imgadres: 'head.png', - headerPosition: "fixed", textnum: '', textSend: '', therrNum: '', - rechargeOrderNum:'', //话费待支付 - headerTop: null, - statusTop: null, - showHeader: true, + rechargeOrderNum:'', //话费待支付 + whetherCheckNum: '', //未查看数量 + orderPayNum: '', //支付订单数量 //个人信息, user: "", // 订单类型 orderList: [{ text: '待支付', - icon: "fukuan" + icon: "../../../static/img/user/user1.png" }, { text: '已支付', - icon: "fahuo" + icon: "../../../static/img/user/user2.png" }, { text: '已完成', - icon: "shouhuo" + icon: "../../../static/img/user/user3.png" }, { text: '已退款', - icon: "tuihuo" - }, { - text: '已取消', - icon: "pingjia" + icon: "../../../static/img/user/user4.png" } ], - huafeiList: [{ - text: '待支付', - icon: "fukuan" - }, - { - text: '已支付', - icon: "fahuo" - }, - { - text: '已完成', - icon: "shouhuo" - }, { - text: '已取消', - icon: "pingjia" - }, { - text: '已退款', - icon: "tuihuo" - } - ], - // 工具栏列表 - mytoolbarList: [{ - url: '/pages/goods/recording/recording', - text: '积分记录', - img: 'user/mingxi.png' - }, - // , - // { - // url: '/pages/goods/recording/recording?id=2', - // text: '消费记录', - // img: 'user/quan.png' - // }, - { - url: '/pages/user/mineCoupons/mineCoupons', - text: '我的卡券', - img: 'user/choujiang.png' - }, - { - url: '../../user/coupon/coupon', - text: '我的优惠券', - img: 'user/momey.png' - }, - { - url: '/pages/user/myPromotion/myPromotion', - text: '我的推广', - img: 'user/extension.png' - } - // , - // { - // url: '/pages/user/generatePoster/generatePoster', - // text: '生成海报', - // img: 'user/poster.png' - // } - ], //操作列表 - czList: '', + czList: '', + nopaylist: [1, 2, 3, 4, 5], + assetsstu: 2, + userphone:'' // 手机号 } }, //下拉刷新,需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true @@ -235,18 +202,10 @@ uni.stopPullDownRefresh(); }, 1000); }, - onPageScroll(e) { - //兼容iOS端下拉时顶部漂移 - this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute"; - this.headerTop = e.scrollTop >= 0 ? null : 0; - this.statusTop = e.scrollTop >= 0 ? null : -this.statusHeight + 'px'; - }, - onLoad() { - this.statusHeight = 0; - // #ifdef H5 - this.showHeader = true; - // this.statusHeight = plus.navigator.getStatusbarHeight(); - // #endif + onLoad() { + if (!app.globalData.userInfo) { + this.findUser() + } }, onReady() { //此处,演示,每次页面初次渲染都把登录状态重置 @@ -261,45 +220,39 @@ if (app.globalData.userInfo) { this.findUser(); } - if (!app.globalData.userInfo.isSetPayPwd) { - this.czList = [{ - url: '../../../subPages/cardsList/cardsList', - text: '卡包', - img: '../../../static/img/ghkpay.png', - type: 2 - }, { - url: '', - text: '客服', - img: 'user/kefu.png', - type: 1 - }, - { - url: '../../login/updatePas/updatePas', - text: '设置积分密码', - img: '../../../static/img/pas.png', - type: 2 - }, - ] - return; - } - // '../../user/unionCard/unionCard' - this.czList = [{ - url: '../../../subPages/cardsList/cardsList', - text: '卡包', - img: '../../../static/img/ghkpay.png', - type: 2 - }, { - url: '', - text: '客服', - img: 'user/kefu.png', - type: 1 - }, - { - url: '../../login/updatePas/resetPas', - text: '修改积分密码', - img: '../../../static/img/pas.png', - type: 2 - }, + if (!app.globalData.userInfo.isSetPayPwd) { + this.czList = [{ + url: '/pages/goods/recording/recording', + text: '积分记录', + img: '../../../static/img/ghkpay.png' + }, + { + url: '../../login/updatePas/updatePas', + text: '支付密码', + img: '../../../static/img/user/user11.png' + }, { + url: '', + text: '客服', + img: '../../../static/img/user/user13.png' + } + ] + return; + } + this.czList = [{ + url: '../../../subPages/cardsList/cardsList', + text: '卡包', + img: '../../../static/img/ghkpay.png' + }, + { + url: '../../login/updatePas/resetPas', + text: '支付密码', + img: '../../../static/img/user/user11.png' + }, + { + url: '', + text: '客服', + img: '../../../static/img/user/user13.png' + } ] }, methods: { @@ -308,11 +261,14 @@ findUser(params).then(res => { if (res.return_code == '000000') { app.globalData.userInfo = res.return_data; - this.user = res.return_data; - this.textnum = res.return_data.unusedCouponNum; - this.textSend = res.return_data.unusedDiscount; + this.user = res.return_data; + this.textnum = res.return_data.unusedCouponNum; + this.textSend = res.return_data.unusedDiscount; this.therrNum = res.return_data.unpaid; - this.rechargeOrderNum = res.return_data.rechargeOrderNum; + this.whetherCheckNum = res.return_data.whetherCheckNum; + this.orderPayNum = res.return_data.orderPayNum; + this.rechargeOrderNum = res.return_data.rechargeOrderNum; + this.geTel(this.user.phone); uni.setStorage({ key: "user", data: res.return_data @@ -340,6 +296,53 @@ this.toDeposit(); } }); + }, + // 隐藏手机号 + geTel(tel) { + var reg = /^(\d{3})\d{4}(\d{4})$/; + this.userphone = tel.replace(reg, "$1****$2"); + }, + // 资产查看状态 + updatestu(item) { + if (item == 1) { + this.assetsstu = 2; + } + if (item == 2) { + this.assetsstu = 1; + } + }, + // 推广 + jumppage(item) { + // if (item == 1) { + // uni.navigateTo({ + // url: '../../login/login?id=1' + // }) + // } + // if (item == 2) { + // uni.navigateTo({ + // url: '../../login/login?id=2' + // }) + // } + if (item == 3) { + uni.navigateTo({ + url: '/pages/user/myPromotion/myPromotion' + }) + } + if (item == 4) { + uni.navigateTo({ + url: '../../../subPages/cardsList/cardsList' + }) + } + if (item == 5) { + uni.navigateTo({ + url: '/pages/user/mineCoupons/mineCoupons' + }) + } + if (item == 6) { + uni.navigateTo({ + url: '../../user/coupon/coupon' + }) + } }, //跳转登录 jumplogin() { @@ -418,11 +421,7 @@ uni.navigateTo({ url: url }) - } else { - // uni.showModal({ - // title: '客服', - // content: '4006780738' - // }) + } else { this.playPhone(); } @@ -452,379 +451,259 @@ } diff --git a/high-unionPay/pages/user/coupon/coupon.vue b/high-unionPay/pages/user/coupon/coupon.vue index 7595d9c..c6af601 100644 --- a/high-unionPay/pages/user/coupon/coupon.vue +++ b/high-unionPay/pages/user/coupon/coupon.vue @@ -1,68 +1,75 @@