From 619f5dc757212065df91436d80023262192496aa Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Mon, 28 Nov 2022 14:35:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=8B=A8=E6=89=93?= =?UTF-8?q?=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- .../pages/tabBar/category/category.vue | 6 +- high-unionPay/pages/tabBar/home/home.vue | 58 ++++++++++--------- high-unionPay/pages/tabBar/user/user.vue | 4 +- 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 99057ba..8732631 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -unpackage/ \ No newline at end of file +unpackage/ +.hbuilderx/launch.json +node_modules \ No newline at end of file diff --git a/high-unionPay/pages/tabBar/category/category.vue b/high-unionPay/pages/tabBar/category/category.vue index bc64bbb..918ffdb 100644 --- a/high-unionPay/pages/tabBar/category/category.vue +++ b/high-unionPay/pages/tabBar/category/category.vue @@ -271,10 +271,12 @@ // uni.showToast({title: "建议跳转到新页面做搜索功能"}); }, //拨打客服电话 - playPhone() { + playPhone() { + let cont = "本服务由惠兑礼品提供\n400-678-738"; + let content = cont.replace(/
/g,"\n"); uni.showModal({ title: '客服', - content: '4006780738', + content: content, success: function(res) { if (res.confirm) { uni.makePhoneCall({ diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue index 72795e7..2bf2eb7 100644 --- a/high-unionPay/pages/tabBar/home/home.vue +++ b/high-unionPay/pages/tabBar/home/home.vue @@ -66,7 +66,7 @@ getTPigCinemaToken, getCacheParam, delCacheParam, - getCmsContent, + getCmsContent, findByLatAndLng } from "../../../Utils/Api.js"; //您的api路径 import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; @@ -233,15 +233,15 @@ success: function(res) { switch (uni.getSystemInfoSync().platform) { case 'android': - let zuob = JSON.parse(res); + let zuob = JSON.parse(res); app.globalData.latitude = zuob.latitude; - app.globalData.longitude = zuob.longitude; - that.findByLatAndLng(zuob.longitude,zuob.latitude); + app.globalData.longitude = zuob.longitude; + that.findByLatAndLng(zuob.longitude, zuob.latitude); break; case 'ios': app.globalData.latitude = res.latitude; - app.globalData.longitude = res.longitude; - that.findByLatAndLng(res.longitude,res.latitude); + app.globalData.longitude = res.longitude; + that.findByLatAndLng(res.longitude, res.latitude); break; } @@ -249,23 +249,23 @@ fail: function() {} }); }); - }, - //经纬度转换 - findByLatAndLng(item, item1) { - let datas = { - lng: item, - lat: item1 - } - findByLatAndLng(datas).then(res => { - if (res.return_code == '000000') { - // res.return_data.provinceName - app.globalData.cityName = res.return_data.provinceName; - app.globalData.qianzhuCityName = res.return_data.cityName; - app.globalData.cityId = res.return_data.regionId; - // app.globalData.cityId = '520000'; - app.globalData.companyId = res.return_data.companyId; - } - }); + }, + //经纬度转换 + findByLatAndLng(item, item1) { + let datas = { + lng: item, + lat: item1 + } + findByLatAndLng(datas).then(res => { + if (res.return_code == '000000') { + // res.return_data.provinceName + app.globalData.cityName = res.return_data.provinceName; + app.globalData.qianzhuCityName = res.return_data.cityName; + app.globalData.cityId = res.return_data.regionId; + // app.globalData.cityId = '520000'; + app.globalData.companyId = res.return_data.companyId; + } + }); }, //获取首页功能 getCmsContentcmsContent() { @@ -411,10 +411,12 @@ }) }, //拨打客服电话 - playPhone() { + playPhone() { + let cont = "本服务由惠兑礼品提供\n400-678-738"; + let content = cont.replace(/
/g,"\n"); uni.showModal({ title: '客服', - content: '4006780738', + content: content, success: function(res) { if (res.confirm) { uni.makePhoneCall({ @@ -447,9 +449,9 @@ } }, //单独跳转话费充值 - jumphuafei(item) { - uni.navigateTo({ - url: item.ext1 + jumphuafei(item) { + uni.navigateTo({ + url: item.ext1 }) // if (!app.globalData.userInfo) { // uni.navigateTo({ diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue index 7c7d82b..56a43fb 100644 --- a/high-unionPay/pages/tabBar/user/user.vue +++ b/high-unionPay/pages/tabBar/user/user.vue @@ -429,9 +429,11 @@ }, //拨打客服电话 playPhone() { + let cont = "本服务由惠兑礼品提供\n400-678-738"; + let content = cont.replace(/
/g,"\n"); uni.showModal({ title: '客服', - content: '4006780738', + content: content, success: function(res) { if (res.confirm) { uni.makePhoneCall({ From 3f7202e1519cf2bb685cdba90e5681a97eaf4bbe Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 30 Dec 2022 09:39:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=AE=9E=E7=89=A9?= =?UTF-8?q?=E5=95=86=E5=93=81=202.=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- high-unionPay/pages/order/confirmation.vue | 28 ++++++++++++++-- .../user/order_details/order_details.vue | 32 +++++++++++++++++-- .../coupon-packge-details.vue | 2 +- high-unionPay/subPages/lottery/lottery.vue | 5 ++- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue index 1db1a5b..1df7bad 100644 --- a/high-unionPay/pages/order/confirmation.vue +++ b/high-unionPay/pages/order/confirmation.vue @@ -93,6 +93,22 @@ 邀请码 + + + + + + 联系人 + + + + 联系电话 + + + + 联系地址 + + @@ -247,7 +263,10 @@ isDiscont: false, coupondiscountid: '', typeId: '', - identificationCode: '' //渠道商 + identificationCode: '' ,//渠道商 + contactPepole: '', //联系人 + contactPhone: '', //联系电话 + contactAddress: '' //联系地址 }; }, @@ -440,7 +459,12 @@ "goodsId": this.couponId, "saleCount": 1, "storeId": this.storeId - }] + }], + "postData": { + "address": this.contactAddress, + "user": this.contactPepole, + "phone": this.contactPhone + } } addOrder(goods).then(res => { if (res.return_code == '000000') { diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue index 8270a79..c47bf8e 100644 --- a/high-unionPay/pages/user/order_details/order_details.vue +++ b/high-unionPay/pages/user/order_details/order_details.vue @@ -150,6 +150,30 @@ {{recinfo.refusalRefundContent}} + + + + 联系人 : + + + {{materialData.user}} + + + + + 联系电话 : + + + {{materialData.phone}} + + + + + 联系地址 : + + + {{materialData.address}} + @@ -286,7 +310,8 @@ imageUrl: app.globalData.imgUrl, imagewxUrl: app.globalData.imageWxImg, imgadres1: 'dhf.png', - preByOrderInfo: '' + preByOrderInfo: '', + materialData: '' //实物参数 }; }, onShow() { @@ -343,7 +368,10 @@ getOrderById(params).then(res => { if (res.return_code == '000000') { uni.hideLoading(); - this.recinfo = res.return_data; + this.recinfo = res.return_data; + if (res.return_data.remarks) { + this.materialData = JSON.parse(res.return_data.remarks); + } } else { uni.hideLoading() } diff --git a/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue index 7006c03..927a745 100644 --- a/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue +++ b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue @@ -19,7 +19,7 @@ - + diff --git a/high-unionPay/subPages/lottery/lottery.vue b/high-unionPay/subPages/lottery/lottery.vue index 2a02f99..6c563a4 100644 --- a/high-unionPay/subPages/lottery/lottery.vue +++ b/high-unionPay/subPages/lottery/lottery.vue @@ -193,6 +193,7 @@ couponId: this.couponId } getActivityByCoupon(params).then(res => { + uni.hideLoading(); if (res.return_code == '000000') { let prizeLists = res.return_data.activityAward; this.activityId = res.return_data.activityInfo.id; @@ -287,7 +288,9 @@ }, onLoad(options) { this.couponId = options.id - this.handleInitCanvas() + }, + onShow() { + this.handleInitCanvas(); }, onUnload() { uni.hideLoading()