diff --git a/src/pages/member/index.vue b/src/pages/member/index.vue index 0f60840..dfa20de 100644 --- a/src/pages/member/index.vue +++ b/src/pages/member/index.vue @@ -58,7 +58,7 @@ function login() { 登录 - + 我的工具 diff --git a/src/styles/iconfonts.scss b/src/styles/iconfonts.scss index 3d95029..b670872 100644 --- a/src/styles/iconfonts.scss +++ b/src/styles/iconfonts.scss @@ -84,4 +84,10 @@ } } - +// iconfont 客服 icon () +@mixin customerService { + @font-face { + font-family: 'customerService'; + src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAANcAAsAAAAABzgAAAMOAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACCcAqCNIIzATYCJAMICwYABCAFhGcHLhttBsgOJQUA1hzADABFBND++Gb37QeQdFS6axISI9kvFCkJlYxQFibXNCNWBBkxy/9vm285f2kKc0TC7jyQmgcgNwcEF4fj1nkCD0LNOTDM8m1dYGMPwq7zALiHbA4rwcj+LxFQqJdspoOLKxuB42qOaoAHc1gYSIPDarmUA9ayTpLAmS/I7TsxlYbDcoh74h0cCj8fvugT8olyMhg2fmmRBMyctVOXbPP/zWRvbJ4vDTpH5CBDt50JwuR22Vhmsa0bM4V1MnMtXHISeB/0/98XCLv+84RcGFgMmgF3T3iXcKuBESSoXQs4MGpJUvFI++JZoO3u4PUQttwaeKAePR9Zbm8XPZtK2L2TnzQbvDvL5hsbe+/N1WuepzyfBth9U55ypp8aPzp756DDk8lDD2wL9146HbY8tivad7Hh+YweErt9J7Ycb3vU0c3HBkzFAU5D/gOw/8MQX1/7ir1xUPVpe+7CpIaE2sboltjVqbEBO3F89iGWC4NPxwbh4OrXUV/HdsBhkYMZ83WZonRWlCJJu16SxqVkzGcHma1jogrDsP/1hjzrX+MmqoIsd3ac5LF6pKnT7k5h3eEnLT5VzquFVVyYVNHbuqvCDzcEGEAu4D86DqTmbPOfsZupmwI+5pUN/JpflMDbqaWtIamfgvyrlQU+vWZ2avqP+VKz6U1MaIkXEK01qSWikIz8h6pKJ2NZVY/oCvJVPagiT1MKmXwtiITpAjmK9IFc+QZBoa6KphepIjATUgE66GQQlBuBqNRFyJRbRiTMMeSodQ65yv1CoamhZLEiHcKiAoI4iiRQ1ArlYqzhHSYNG61HUp2KI1XmZkS0cjDCuB69is4SpEFkiiFavTSeUh7yBKthsbgdUqkwFAhWIDGNllEqpMf0XFr3lmgxVoMCBMKhEAlIpBUkJ4Zp8H5umv++eoiUjgqH9EQ02wgtOTQOxYkW2wNRQtP0yrqTZbT0pOJRFA/iEeZQg4plCaIybBgk1LdTQMSoaLIRFkG6GMrF96VFr89Qf9oiKITsGCg6k1YhXgcAAAA=') format('woff2'); + } +} diff --git a/src/subpackage/groupon/pages/confirm_order/ticket.vue b/src/subpackage/groupon/pages/confirm_order/ticket.vue index b854443..c12e5c4 100644 --- a/src/subpackage/groupon/pages/confirm_order/ticket.vue +++ b/src/subpackage/groupon/pages/confirm_order/ticket.vue @@ -56,7 +56,7 @@ function confirmBtn(){ const _query = { verifyToken: verify_token.value ?? '', - poiId: '7174984639059068985', + poiId: _tVal?.poi_id ?? '', orderList: [{ orderId: _tVal?.order_id ?? '', certificateList: [{ diff --git a/src/subpackage/groupon/pages/list.vue b/src/subpackage/groupon/pages/list.vue index 2716b0c..e565893 100644 --- a/src/subpackage/groupon/pages/list.vue +++ b/src/subpackage/groupon/pages/list.vue @@ -6,23 +6,8 @@ import { routeTo, showModal } from '@/utils/polish'; import { userCertificates } from "../api"; const ticketLs = ref([]); onLoad(() => { - // tt.login({ - // success() { - // tt.showToast({ - // title: '登录成功', - // icon: 'success', - // }); - // }, - // fail() { - // tt.showToast({ - // title: '登录失败', - // icon: 'fail', - // }); - // }, - // }); userCertificates({ data: { - debug: 1, appid: tt.getEnvInfoSync()?.microapp?.appId ?? '', data: JSON.stringify({ "account_id": "7419147144797358116", @@ -41,28 +26,7 @@ function ticketClick(e){ let _ouxuan_group_purchase_info = certificates?.sku_info?.ouxuan_group_purchase_info ?? {}; let _merchandise_type = _ouxuan_group_purchase_info?.merchandise_type; if(![0, 1].includes(_merchandise_type))return showModal({ content: '无效的商品类型' }); - // const _query = { - // verifyToken: new Date().getTime() + '', - // poiId: '7174984639059068985', - // orderList: [{ - // orderId: e.order_id, - // certificateList: [{ - // code: certificates.certificate_id, - // times: 1 - // }] - // }], - // orderEntrySchema: { - // path: 'subpackage/order/pages/detail' - // }, - // complete(res){ - // console.warn('verifyCertificates', res); - // } - - // } - // console.log('tt.verifyCertificates -->', _query) - // tt.verifyCertificates(_query); - - // return + let _ticketInfo = { expire_time: certificates?.expire_time ?? 0, dy_title: certificates?.sku_info?.title ?? '', diff --git a/src/subpackage/order/pages/detail.vue b/src/subpackage/order/pages/detail.vue index 4fa0385..8abf9a1 100644 --- a/src/subpackage/order/pages/detail.vue +++ b/src/subpackage/order/pages/detail.vue @@ -187,6 +187,11 @@ function serverOrderCancel({ brand_id, order_no, reason }){ }) } +function imError(e){ + console.warn('imError', e); + showNone(e?.detail?.errMsg ?? '客服功能异常,请稍后重试'); +} + @@ -279,9 +284,14 @@ function serverOrderCancel({ brand_id, order_no, reason }){ :imgUrl="orderInfo?.image" > - + - 申请退款 + + 申请退款 + @@ -416,6 +426,7 @@ function serverOrderCancel({ brand_id, order_no, reason }){ padding: 18upx 24upx; background: #fff; @include isPd(18upx); + display: flex; .of-refund{ margin-left: auto; margin-right: 0; @@ -425,6 +436,16 @@ function serverOrderCancel({ brand_id, order_no, reason }){ border: 2upx solid $mColor; @include flcw(28upx, 68upx, $mColor); } + .of-im-btn{ + @include clearBtn; + padding: 0 10upx; + @include flcw(28upx, 40upx, #333); + @include customerService; + text-align: center; + .oib-icon{ + font-family: 'customerService'; + } + } } }