From f0e189bb7f35e3e4db804c8d5646b311f4a48998 Mon Sep 17 00:00:00 2001 From: liqianjin <949671634@qq.com> Date: Tue, 7 Mar 2023 13:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy-components/diy-member-info.vue | 124 ++--- components/sx-rate/sx-rate/iconfont.css | 21 - pages.json | 12 + pages_promotion/fenxiao/bill.vue | 7 +- pages_tool/login/find.vue | 2 +- pages_tool/member/apply_withdrawal.vue | 3 + pages_tool/member/balance.vue | 6 + pages_tool/member/goufang.vue | 192 ++++++++ pages_tool/member/goufang_to_balance.vue | 448 ++++++++++++++++++ pages_tool/member/pay_password.vue | 2 +- .../member/public}/myp-one/myp-one.vue | 0 pages_tool/order/evaluate.vue | 2 +- .../order/public}/sx-rate/common.js | 0 .../order/public}/sx-rate/index.vue | 0 .../order/public/sx-rate/sx-rate/iconfont.css | 21 + .../public}/sx-rate/sx-rate/iconfont.eot | Bin .../public}/sx-rate/sx-rate/iconfont.svg | 0 .../public}/sx-rate/sx-rate/iconfont.ttf | Bin .../public}/sx-rate/sx-rate/iconfont.woff | Bin .../public}/sx-rate/sx-rate/iconfont.woff2 | Bin 20 files changed, 729 insertions(+), 111 deletions(-) delete mode 100644 components/sx-rate/sx-rate/iconfont.css create mode 100644 pages_tool/member/goufang.vue create mode 100644 pages_tool/member/goufang_to_balance.vue rename {components => pages_tool/member/public}/myp-one/myp-one.vue (100%) rename {components => pages_tool/order/public}/sx-rate/common.js (100%) rename {components => pages_tool/order/public}/sx-rate/index.vue (100%) create mode 100644 pages_tool/order/public/sx-rate/sx-rate/iconfont.css rename {components => pages_tool/order/public}/sx-rate/sx-rate/iconfont.eot (100%) rename {components => pages_tool/order/public}/sx-rate/sx-rate/iconfont.svg (100%) rename {components => pages_tool/order/public}/sx-rate/sx-rate/iconfont.ttf (100%) rename {components => pages_tool/order/public}/sx-rate/sx-rate/iconfont.woff (100%) rename {components => pages_tool/order/public}/sx-rate/sx-rate/iconfont.woff2 (100%) diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue index e2801ce..40b7f08 100644 --- a/components/diy-components/diy-member-info.vue +++ b/components/diy-components/diy-member-info.vue @@ -144,48 +144,41 @@ v-show="value.style == 2" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }" > - - {{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }} - 消费券 - - - - {{ memberInfo ? parseFloat(memberInfo.point).toFixed(2) : '--' }} - 兑换券 - - - - {{ fenxiaoInfo && fenxiaoInfo.points != undefined ? fenxiaoInfo.points : '--' }} - 积分 + + + + - - {{ fenxiaoInfo && fenxiaoInfo.contribution != undefined ? fenxiaoInfo.contribution : '--' }} - 贡献值 + + + - - + + - - - - - - - - - 会员码 - - - - 如遇到扫码失败请将屏幕调至最亮重新扫码 - - - - + + @@ -391,57 +384,18 @@ export default { }); }, /** - * 跳转 - * @param {Object} url - */ - redirect(url) { + * 跳转 + * @param {Object} url + * @param param + */ + redirect(url, param = {}) { if (!uni.getStorageSync('token')) { this.$refs.login.open(url); } else { - this.$util.redirectTo(url); + this.$util.redirectTo(url, param); } }, - /** - * 显示会员码 - */ - showMemberQrcode() { - if (!this.memberInfo.mobile && !this.memberInfo.member_code) { - uni.showModal({ - title: '提示', - content: '使用会员码需先绑定手机号，是否绑定手机号？', - success: res => { - if (res.confirm) { - this.$util.redirectTo('/pages_tool/member/info_edit', { action: 'mobile' }); - } - } - }); - return; - } - if (this.memberCode) { - this.$refs.erWeiPopup.open(); - } - this.$api.sendRequest({ - url: '/api/member/membereqrcode', - data: { - page: '' - }, - success: res => { - if (res.code == 0) { - this.memberCode = { - barcode: res.bar_code, - qrcode: res.data.path - }; - this.$refs.erWeiPopup.open(); - } - } - }); - }, - /** - * 关闭会员码 - */ - closeMemberQrcode() { - this.$refs.erWeiPopup.close(); - }, + /** * 跳转之前需先进行授权 * @param {Object} url @@ -737,9 +691,9 @@ export default { } .account-info { display: flex; - padding: 40rpx 0; + padding: 20rpx 0; align-items: center; - justify-content: center; + justify-content: space-evenly; view { color: #fff; } @@ -756,7 +710,7 @@ export default { .value { font-size: 34rpx; font-weight: bold !important; - margin-bottom: 4rpx; + //margin-bottom: 4rpx; line-height: 1.3; } .title { diff --git a/components/sx-rate/sx-rate/iconfont.css b/components/sx-rate/sx-rate/iconfont.css deleted file mode 100644 index 5cd5397..0000000 --- a/components/sx-rate/sx-rate/iconfont.css +++ /dev/null @@ -1,21 +0,0 @@ -@font-face {font-family: "iconfont"; - src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */ - src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'), - url('~@/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'), - url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */ -} - -.iconfont { - font-family: "iconfont" !important; - font-size: inherit; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-star:before { - content: "\e6e3"; -} - diff --git a/pages.json b/pages.json index c249374..3e96588 100644 --- a/pages.json +++ b/pages.json @@ -1036,6 +1036,18 @@ "navigationStyle": "custom" } }, + { + "path": "member/goufang", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "member/goufang_to_balance", + "style": { + "navigationStyle": "custom" + } + }, { "path": "member/balance_detail", "style": { diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue index 5614876..3b49895 100644 --- a/pages_promotion/fenxiao/bill.vue +++ b/pages_promotion/fenxiao/bill.vue @@ -28,7 +28,8 @@ export default { data() { return { accountList: {}, - showEmpty: true + showEmpty: true, + type: '' }; }, onShow() { @@ -49,6 +50,7 @@ export default { }, methods: { getData(mescroll) { + this.type = this.$route.query.type; if (mescroll.num == 1) { this.accountList = []; } @@ -56,7 +58,8 @@ export default { url: '/fenxiao/api/account/page', data: { page: mescroll.num, - page_size: mescroll.size + page_size: mescroll.size, + type: this.type }, success: res => { let newArr = []; diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue index 6942238..c4fd25c 100644 --- a/pages_tool/login/find.vue +++ b/pages_tool/login/find.vue @@ -88,7 +88,7 @@ + + diff --git a/pages_tool/member/goufang_to_balance.vue b/pages_tool/member/goufang_to_balance.vue new file mode 100644 index 0000000..f10ecb3 --- /dev/null +++ b/pages_tool/member/goufang_to_balance.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue index cb83063..558f45f 100644 --- a/pages_tool/member/pay_password.vue +++ b/pages_tool/member/pay_password.vue @@ -17,7 +17,7 @@