From c4c787ea6f0fbda2ff1b200468ca48f0860c7c48 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 30 May 2018 10:30:37 +0800 Subject: [PATCH] Add by @lb --- app.js.rej | 11 + app.json | 4 +- components/actionsheet/index.js | 36 +++ components/actionsheet/index.json | 3 + components/actionsheet/index.wxml | 15 + components/actionsheet/index.wxss | 107 +++++++ components/pop-manager/index.js | 29 ++ components/pop-manager/index.json | 3 + components/pop-manager/index.wxml | 12 + components/pop-manager/index.wxss | 1 + components/popup/index.js | 35 +++ components/popup/index.json | 6 + components/popup/index.wxml | 8 + images/finish_ico.png | Bin 0 -> 1732 bytes images/ic_arrow_right.png | Bin 0 -> 419 bytes images/icon_task_finish.png | Bin 0 -> 6216 bytes images/moments_ico.png | Bin 0 -> 1379 bytes images/wechat_ico.png | Bin 0 -> 1389 bytes pages/activity_list/activity_list.js | 88 ++++++ pages/activity_list/activity_list.json | 3 + pages/activity_list/activity_list.wxml | 36 +++ pages/activity_list/activity_list.wxss | 138 +++++++++ pages/mcenter/mcenter.js | 9 +- pages/pay_result/pay_result.js | 371 +++++++++++++++++++++++++ pages/pay_result/pay_result.json | 7 + pages/pay_result/pay_result.wxml | 31 +++ pages/pay_result/pay_result.wxss | 83 ++++++ 27 files changed, 1033 insertions(+), 3 deletions(-) create mode 100644 app.js.rej create mode 100644 components/actionsheet/index.js create mode 100644 components/actionsheet/index.json create mode 100644 components/actionsheet/index.wxml create mode 100644 components/actionsheet/index.wxss create mode 100644 components/pop-manager/index.js create mode 100644 components/pop-manager/index.json create mode 100644 components/pop-manager/index.wxml create mode 100644 components/pop-manager/index.wxss create mode 100644 components/popup/index.js create mode 100644 components/popup/index.json create mode 100644 components/popup/index.wxml create mode 100644 images/finish_ico.png create mode 100644 images/ic_arrow_right.png create mode 100644 images/icon_task_finish.png create mode 100644 images/moments_ico.png create mode 100644 images/wechat_ico.png create mode 100644 pages/activity_list/activity_list.js create mode 100644 pages/activity_list/activity_list.json create mode 100644 pages/activity_list/activity_list.wxml create mode 100644 pages/activity_list/activity_list.wxss create mode 100644 pages/pay_result/pay_result.js create mode 100644 pages/pay_result/pay_result.json create mode 100644 pages/pay_result/pay_result.wxml create mode 100644 pages/pay_result/pay_result.wxss diff --git a/app.js.rej b/app.js.rej new file mode 100644 index 0000000..2e916a7 --- /dev/null +++ b/app.js.rej @@ -0,0 +1,11 @@ +diff a/app.js b/app.js (rejected hunks) +@@ -19,8 +19,7 @@ + + } + }) +- +- ++ this.gw.systemInfo = wx.getSystemInfoSync(); + }, + getSessionKey: function (code) { + var that = this; diff --git a/app.json b/app.json index 2dcda70..89b432f 100644 --- a/app.json +++ b/app.json @@ -17,7 +17,9 @@ "pages/serviceDesc/serviceDesc", "pages/two_code/two_code", "pages/out/out", - "pages/agreement/agreement" + "pages/agreement/agreement", + "pages/pay_result/pay_result", + "pages/activity_list/activity_list" ], "window": { "backgroundTextStyle": "light", diff --git a/components/actionsheet/index.js b/components/actionsheet/index.js new file mode 100644 index 0000000..406df27 --- /dev/null +++ b/components/actionsheet/index.js @@ -0,0 +1,36 @@ +Component({ + externalClasses: ['mask-class', 'container-class'], + properties: { + actions: { + type: Array, + value: [] + }, + show: { + type: Boolean, + value: false + }, + cancelWithMask: { + type: Boolean, + value: true + }, + cancelText: { + type: String, + value: '' + } + }, + methods: { + onMaskClick() { + if (this.data.cancelWithMask) { + this.cancelClick(); + } + }, + cancelClick() { + this.triggerEvent('cancel'); + }, + handleBtnClick({ currentTarget = {} }) { + const dataset = currentTarget.dataset || {}; + const { index } = dataset; + this.triggerEvent('actionclick', { index }); + } + } +}); diff --git a/components/actionsheet/index.json b/components/actionsheet/index.json new file mode 100644 index 0000000..467ce29 --- /dev/null +++ b/components/actionsheet/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} diff --git a/components/actionsheet/index.wxml b/components/actionsheet/index.wxml new file mode 100644 index 0000000..c7b7d5f --- /dev/null +++ b/components/actionsheet/index.wxml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/components/actionsheet/index.wxss b/components/actionsheet/index.wxss new file mode 100644 index 0000000..68e934e --- /dev/null +++ b/components/actionsheet/index.wxss @@ -0,0 +1,107 @@ +.zan-actionsheet { + background-color: #f8f8f8; +} + +.zan-actionsheet__mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 10; + background: rgba(0, 0, 0, 0.7); + display: none; +} + +.zan-actionsheet__container { + position: fixed; + left: 0; + right: 0; + bottom: 0; + background: #f8f8f8; + -webkit-transform: translate3d(0, 50%, 0); + transform: translate3d(0, 50%, 0); + -webkit-transform-origin: center; + transform-origin: center; + transition: all 0.2s ease; + z-index: 11; + opacity: 0; + visibility: hidden; +} + +.zan-actionsheet__btn { + margin-bottom: 0 !important; +} + +.zan-actionsheet__footer .zan-actionsheet__btn { + background: #fff; +} + +.zan-actionsheet__btn-content { + display: flex; + flex-direction: row; + justify-content: center; +} + +.zan-actionsheet__subname { + color: #999; +} + +.zan-actionsheet__name, .zan-actionsheet__subname { + height: 45px; + line-height: 45px; +} + +.zan-actionsheet__btn.zan-btn:last-child::after { + border-bottom-width: 0; +} + +.zan-actionsheet__subname { + margin-left: 2px; + font-size: 12px; +} + +.zan-actionsheet__footer { + margin-top: 10px; +} + +.zan-actionsheet__btn--loading .zan-actionsheet__subname { + color: transparent; +} + +.zan-actionsheet--show .zan-actionsheet__container { + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + visibility: visible; +} + +.zan-actionsheet--show .zan-actionsheet__mask { + display: block; +} + +.icon-wrap { + width: 375rpx; + height: 135px; + float: left; + text-align: center; + background: none !important; + color: #000 !important; +} + +.icon-wrap::after { + border: none; +} + +.txt-classname { + height: 20rpx; + line-height: 20rpx; + color: #333; + font-size: 16px; +} + +.icon-classname { + width: 80rpx; + height: 80rpx; + margin-top: 48rpx; +} diff --git a/components/pop-manager/index.js b/components/pop-manager/index.js new file mode 100644 index 0000000..edbd996 --- /dev/null +++ b/components/pop-manager/index.js @@ -0,0 +1,29 @@ +Component({ + properties: { + show: { + type: Boolean, + value: false + }, + // 是否有遮罩层 + overlay: { + type: Boolean, + value: true + }, + // 遮罩层是否会显示 + showOverlay: { + type: Boolean, + value: true + }, + // 内容从哪个方向出，可选 center top bottom left right + type: { + type: String, + value: 'center' + } + }, + + methods: { + handleMaskClick() { + this.triggerEvent('clickmask', {}); + } + } +}); diff --git a/components/pop-manager/index.json b/components/pop-manager/index.json new file mode 100644 index 0000000..467ce29 --- /dev/null +++ b/components/pop-manager/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} diff --git a/components/pop-manager/index.wxml b/components/pop-manager/index.wxml new file mode 100644 index 0000000..6bb47ef --- /dev/null +++ b/components/pop-manager/index.wxml @@ -0,0 +1,12 @@ + + + + + + diff --git a/components/pop-manager/index.wxss b/components/pop-manager/index.wxss new file mode 100644 index 0000000..5f449e8 --- /dev/null +++ b/components/pop-manager/index.wxss @@ -0,0 +1 @@ +.pop{visibility:hidden}.pop--show{visibility:visible}.pop__mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background:rgba(0,0,0,.7);display:none}.pop__mask--hide{background:0 0}.pop__container{position:fixed;left:50%;top:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0);-webkit-transform-origin:center;transform-origin:center;transition:all .4s ease;z-index:11;opacity:0}.pop--show .pop__container{opacity:1}.pop--show .pop__mask{display:block}.pop--left .pop__container{left:0;top:50%;-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.pop--show.pop--left .pop__container{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.pop--right .pop__container{right:0;top:50%;left:auto;-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}.pop--show.pop--right .pop__container{-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.pop--bottom .pop__container{top:auto;left:50%;bottom:0;-webkit-transform:translate3d(-50%,100%,0);transform:translate3d(-50%,100%,0)}.pop--show.pop--bottom .pop__container{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)}.pop--top .pop__container{top:0;left:50%;-webkit-transform:translate3d(-50%,-100%,0);transform:translate3d(-50%,-100%,0)}.pop--show.pop--top .pop__container{-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0)} \ No newline at end of file diff --git a/components/popup/index.js b/components/popup/index.js new file mode 100644 index 0000000..71bb69f --- /dev/null +++ b/components/popup/index.js @@ -0,0 +1,35 @@ +Component({ + properties: { + show: { + type: Boolean, + value: false + }, + + overlay: { + type: Boolean, + value: true + }, + + closeOnClickOverlay: { + type: Boolean, + value: true + }, + + // 弹出方向 + type: { + type: String, + value: 'center' + } + }, + + methods: { + handleMaskClick() { + this.triggerEvent('click-overlay', {}); + + if (!this.data.closeOnClickOverlay) { + return; + } + this.triggerEvent('close', {}); + } + } +}); diff --git a/components/popup/index.json b/components/popup/index.json new file mode 100644 index 0000000..a6fe44e --- /dev/null +++ b/components/popup/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "pop-manager": "../pop-manager/index" + } +} diff --git a/components/popup/index.wxml b/components/popup/index.wxml new file mode 100644 index 0000000..6451fc6 --- /dev/null +++ b/components/popup/index.wxml @@ -0,0 +1,8 @@ + + + diff --git a/images/finish_ico.png b/images/finish_ico.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae6921f7c31da27ecd3faa42b006977fa2c624d GIT binary patch literal 1732 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 literal 0 HcmV?d00001 diff --git a/images/moments_ico.png b/images/moments_ico.png new file mode 100644 index 0000000000000000000000000000000000000000..eb3cbe113bd6696afbb3450745bc60ebafc3dcb6 GIT binary patch literal 1379 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 literal 0 HcmV?d00001 diff --git a/pages/activity_list/activity_list.js b/pages/activity_list/activity_list.js new file mode 100644 index 0000000..e6ca0ed --- /dev/null +++ b/pages/activity_list/activity_list.js @@ -0,0 +1,88 @@ +// pages/activity_list/activity_list.js +const util = require('../../utils/util.js') +Page({ + + /** + * 页面的初始数据 + */ + data: { + repos: [], + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.loadData(); + }, + + loadData: function () {//定义函数名称 + wx.showLoading(); + var that = this; + wx.request({ + url: getApp().gw.hostUrl + '/mall/wxa/activity/group/list', + method: 'get', + data: { + pageNum: 1, + pageSize: 2 + }, + header: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'sessionId': wx.getStorageSync('sessionId') + }, + success: function (res) { + console.log(res); + wx.hideLoading(); + if (res.data.code == 0) { + that.setData({ + repos: res.data.response.map((n) => Object.assign({}, n, { + createdAt: util.formatTime(new Date(n.createdAt)).substr(0, 16), + img: that.switchImg(n.status), + activityTypeStr: that.switchType(n.activityType), + })), + }) + } else { + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 1000 + }); + } + }, + + fail: function (e) { + wx.hideLoading(); + wx.showToast({ + title: '网络异常!', + icon: 'none', + duration: 1000 + }); + }, + + }) + }, + + itemClick: function (event) { + var groupNo = event.currentTarget.dataset.testid; + wx.navigateTo({ + url: '../pay_result/pay_result?groupNo=' + groupNo + }) + }, + + switchType: function (activityType) { + switch (activityType) { + case 10: return '拼团' + case 20: return '砍价' + case 30: return '抽奖' + } + }, + + switchImg: function (status) { + switch (status) { + case 0: return '../../images/icon_task_finish.png' + case 20: return '../../images/icon_task_finish.png' + case 90: return '../../images/icon_task_finish.png' + } + } + +}) \ No newline at end of file diff --git a/pages/activity_list/activity_list.json b/pages/activity_list/activity_list.json new file mode 100644 index 0000000..2094ac4 --- /dev/null +++ b/pages/activity_list/activity_list.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "活动记录" +} \ No newline at end of file diff --git a/pages/activity_list/activity_list.wxml b/pages/activity_list/activity_list.wxml new file mode 100644 index 0000000..8ae8a4f --- /dev/null +++ b/pages/activity_list/activity_list.wxml @@ -0,0 +1,36 @@ + + + + + + + + + + + {{ item.activityName }} + {{ item.activityTypeStr }} + + + 参与时间: {{ item.createdAt }} + + + + + 进行中 + + + + + + + + + + + + + + 亲，您还没有参加任何活动！ + + \ No newline at end of file diff --git a/pages/activity_list/activity_list.wxss b/pages/activity_list/activity_list.wxss new file mode 100644 index 0000000..d79615f --- /dev/null +++ b/pages/activity_list/activity_list.wxss @@ -0,0 +1,138 @@ +/* pages/activity_list/activity_list.wxss */ + +.weui-media-box { + height: 120rpx; + padding: 15px; + margin-top: 10rpx; + position: relative; +} + +.weui-media-box:before { + content: ""; + position: absolute; + top: 0; + right: 0; + height: 1px; + border-top: 1rpx solid #f1f1f1; + color: #f1f1f1; + left: 0; +} + +.weui-media-box_appmsg { + height: 120rpx; + margin-top: 10rpx; + background: #fff; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; +} + +.weui-cell_active { + background-color: #f1f1f1; +} + +.weui-media-box__bd_in-appmsg { + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; + min-width: 0; +} + +.weui-media-box__info { + list-style: none; + overflow: hidden; +} + +.weui-media-box-info-meta { + float: left; + padding-right: 1px; + font-size: 13px; + margin-top: 12px; + color: #cecece; +} + +.weui-media-box-name { + float: left; + padding-right: 1px; + margin-right: 4px; + height: 40rpx; + line-height: 40rpx; + font-size: 18px; + color: #333; + font-weight: bold; +} + +.item_status { + margin-right: 0.8em; + float: left; + height: 40rpx; + line-height: 40rpx; + font-size: 16px; + color: #666; +} + +.weui-media-box__thumb { + width: 60px; + height: 60px; + margin-right: 0.8em; + vertical-align: top; +} + +.icon-arrow { + width: 16px; + height: 16px; + vertical-align: top; +} + +.weui-media-box__type10 { + color: #fff; + background: #f36619; + border-radius: 20rpx; + text-align: center; + font-size: 12px; + height: 40rpx; + line-height: 40rpx; + width: 90rpx; + float: left; +} + +.weui-media-box__type20 { + color: #fff; + background: #21be8d; + border-radius: 20rpx; + text-align: center; + font-size: 12px; + height: 40rpx; + line-height: 40rpx; + width: 90rpx; + float: left; +} + +.weui-media-box__type30 { + color: #fff; + background: #ffa043; + border-radius: 20rpx; + text-align: center; + font-size: 12px; + height: 40rpx; + line-height: 40rpx; + width: 90rpx; + float: left; +} + +.view_hide { + display: none; +} + +.empty-layout { + width: 100%; + height: 100%; + padding-top: 65%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} diff --git a/pages/mcenter/mcenter.js b/pages/mcenter/mcenter.js index 64ce901..a8f3d46 100644 --- a/pages/mcenter/mcenter.js +++ b/pages/mcenter/mcenter.js @@ -6,8 +6,8 @@ Page({ data: { items:[ { top: 20, title: '我的订单', img:'../../images/order.png',page:'Order'}, - // { top: 1, title: '我的地址', img: '../../images/addr.png', page:'Address'}, - { top: 20, title: '联系客服', img: '../../images/service.png', page:'Transition'} + { top: 1, title: '我的活动', img: '../../images/addr.png', page:'Activity'}, + { top: 1, title: '联系客服', img: '../../images/service.png', page:'Transition'} ], sessionId: '' }, @@ -23,6 +23,11 @@ Page({ url: '../jz/jz' }) }, + goActivity: function (e) { + wx.navigateTo({ + url: '../pay_result/pay_result' + }) + }, goLogin: function (e) { wx.navigateTo({ url: '../login/login' diff --git a/pages/pay_result/pay_result.js b/pages/pay_result/pay_result.js new file mode 100644 index 0000000..6b55cb1 --- /dev/null +++ b/pages/pay_result/pay_result.js @@ -0,0 +1,371 @@ +Page({ + data: { + groupNo: '', + windowWidth: 0, + windowHeight: 0, + scaleW: 0.85, + scaleH: 1.15, + shareImgSrc: '', + showPopup: false, + show: false, + cancelWithMask: true, + actions: [{ + name: '微信好友', + icon: '../../images/wechat_ico.png', + openType: 'share' + }, { + name: '朋友圈', + icon: '../../images/moments_ico.png' + }], + txtmoment: '保存图片，分享到朋友圈', + qrImageUrl: "", + avatarPath: '', + imgPath: '', + qrCodePath: '', + }, + + onLoad: function (options) { + this.groupNo = options.groupNo; + console.log("groupNo>>" + this.groupNo); + wx.getSystemInfo({ + success: (res) => { + this.setData({ + windowWidth: res.windowWidth, + windowHeight: res.windowHeight, + }) + } + }); + var that = this; + wx.request({ + url: getApp().gw.hostUrl + '/mall/wxa/activity/group/wxa_code', + method: 'get', + data: { + groupNo: that.groupNo, + width: 120, + // page: '' + }, + header: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'sessionId': wx.getStorageSync('sessionId') + }, + success: function (res) { + if (res.statusCode == 200) { + that.qrImageUrl = res.data.msg; + } + } + }) + }, + //打败Actionsheet，进行分享 + openActionsheet: function () { + if (this.data.qrImageUrl.length == 0) { + wx.showLoading({ + title: '正在获取', + mask: true, + }); + var that = this; + wx.request({ + url: getApp().gw.hostUrl + '/mall/wxa/activity/group/wxa_code', + method: 'get', + data: { + groupNo: that.groupNo, + width: 120, + page: '' + }, + header: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'sessionId': wx.getStorageSync('sessionId') + }, + success: function (res) { + wx.hideLoading(); + if (res.statusCode == 200) { + that.setData({ + qrImageUrl: res.data.msg, + show: true + }); + } else { + wx.showToast({ + title: '获取信息失败!', + icon: 'none', + duration: 1000 + }); + } + }, + fail: function (res) { + wx.hideLoading(); + wx.showToast({ + title: '网络错误!', + icon: 'none', + duration: 1000 + }); + } + }); + } else { + this.setData({ + 'show': true + }); + } + }, + + closeActionSheet: function () { + this.setData({ + 'show': false + }); + }, + + onShareAppMessage: function () { + return { + title: '1号家政', + imageUrl: this.qrImageUrl + }; + }, + + clickAction({ detail }) { + // 如果是分享按钮被点击, 不处理关闭 + const { index } = detail; + if (index === 0) { + + return + } else if (index == 1) { + this.showMomentImage(); + } + this.setData({ + [`show`]: false, + [`actions[${index}].loading`]: false + }); + }, + + goActivityInfo: function () { + + }, + + togglePopup: function () { + this.setData({ + shareImgSrc: '', + showPopup: !this.data.showPopup, + }) + }, + + //绘制图片，加上二维码和相关的信息； + drawMomentImage: function (avatarPath, imgPath, qrCodePath) { + var that = this; + console.log(avatarPath.length + "," + imgPath.length + "," + qrCodePath.length); + if (avatarPath.length == 0 || qrCodePath.length == 0 || imgPath.length == 0) { + return; + } + + const ctx = wx.createCanvasContext('shareCanvas'); + var viewWidth = that.data.windowWidth * that.data.scaleW; + var viewHight = that.data.windowWidth * that.data.scaleH; + + ctx.clearRect(0, 0, viewWidth, viewHight) + ctx.setFillStyle('white') + ctx.fillRect(0, viewHight - 120, viewWidth, viewHight); + + ctx.drawImage(imgPath, 0, 0, viewWidth, viewHight - 120) + ctx.drawImage(qrCodePath, viewWidth - 110, viewHight - 110, 100, 100); + ctx.save(); + + ctx.beginPath(); //开始绘制 + ctx.arc(36 / 2 + 10, 36 / 2 + 200, 36 / 2, 0, Math.PI * 2, false); + ctx.clip();// + ctx.drawImage(avatarPath, 10, 200, 36, 36); // 推进去图片 + ctx.drawImage(avatarPath, 10, viewHight - 113, 24, 24) + ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 还可以继续绘制 + ctx.save(); + + ctx.setFontSize(15) + ctx.setTextBaseline('top') + ctx.setFillStyle('#333') + ctx.fillText(getApp().globalData.userInfo.nickName, 40, viewHight - 111) + + ctx.setFontSize(16) + ctx.setFillStyle('#000') + ctx.fillText('宠友们快来围观萌宠靓照', 10, viewHight - 80) + ctx.fillText('我在萌爪幼稚园', 10, viewHight - 58) + + ctx.setFontSize(13) + ctx.fillText('长按扫码查看详情', 10, viewHight - 26) + ctx.draw() + //将绘制的图片保存到内存，然后进行展示； + setTimeout(function () { + wx.canvasToTempFilePath({ + x: 0, + y: 0, + width: viewWidth, + height: viewHight, + destWidth: viewWidth, + destHeight: viewHight, + canvasId: 'shareCanvas', + success: function (res) { + that.setData({ + shareImgSrc: res.tempFilePath, + showPopup: !that.data.showPopup + }) + wx.hideLoading(); + }, + fail: function (err) { + that.handleErr(err, false); + } + }) + }, 2000); + }, + + handleErr: function (err, toast) { + if (!toast) { + toast = true; + wx.hideLoading(); + wx.showToast({ + title: '生成图片失败!', + icon: 'none', + duration: 1000 + }); + } + }, + + showMomentImage: function () { + var that = this; + var toast = false; + var avatarPath = ''; + var imgPath = ''; + var qrCodePath = ''; + wx.showLoading({ + title: '正在生成图片', + mask: true, + }); + console.log(getApp().globalData.userInfo); + //先从服务器获取要分享的图片，保存到本地； + wx.downloadFile({ + url: getApp().globalData.userInfo.avatarUrl, + success: (res) => { + if (res.statusCode == 200 && res.tempFilePath != undefined && res.tempFilePath.length > 0) { + console.log(res); + avatarPath = res.tempFilePath; + that.drawMomentImage(avatarPath, imgPath, qrCodePath); + } else { + that.handleErr(err, toast); + toast = true; + } + }, + fail: function (err) { + that.handleErr(err, toast); + toast = true; + } + }); + wx.downloadFile({ + url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1527496410439&di=54c111d35f3ca9d1e9b193834785c264&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F013c81583fa08ea8012060c864c3b7.jpg', + success: (res) => { + if (res.statusCode == 200 && res.tempFilePath != undefined && res.tempFilePath.length > 0) { + console.log(res); + imgPath = res.tempFilePath; + that.drawMomentImage(avatarPath, imgPath, qrCodePath); + } else { + that.handleErr(err, toast); + toast = true; + } + }, + fail: function (err) { + that.handleErr(err, toast); + toast = true; + } + }); + wx.downloadFile({ + url: that.qrImageUrl, + success: (res) => { + if (res.statusCode == 200 && res.tempFilePath != undefined && res.tempFilePath.length > 0) { + console.log(res); + qrCodePath = res.tempFilePath; + that.drawMomentImage(avatarPath, imgPath, qrCodePath); + } else { + that.handleErr(err, toast); + toast = true; + } + }, + fail: function (err) { + that.handleErr(err, toast); + toast = true; + } + }); + // wx.downloadFile({ + // url: getApp().globalData.userInfo.avatarUrl, + // success: (aRes) => { + // wx.downloadFile({ + // url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1527496410439&di=54c111d35f3ca9d1e9b193834785c264&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F013c81583fa08ea8012060c864c3b7.jpg', + // success: (res) => { + // //从服务器获二维码图片，保存到本地； + // wx.downloadFile({ + // url: that.qrImageUrl, + // success: (qRres) => { + // that.drawMomentImage(aRes.tempFilePath, res.tempFilePath, qRres.tempFilePath); + // }, + // fail: function (err) { + // wx.hideLoading(); + // wx.showToast({ + // title: '生成图片失败!qRres', + // icon: 'none', + // duration: 1000 + // }); + // } + // }) + // }, + // fail: function (err) { + // console.log(err); + // wx.hideLoading(); + // wx.showToast({ + // title: '生成图片失败!res', + // icon: 'none', + // duration: 1000 + // }); + // } + // }) + // }, + // fail: function (err) { + // wx.hideLoading(); + // wx.showToast({ + // title: '生成图片失败!' + err.errMsg, + // icon: 'none', + // duration: 1000 + // }); + // } + // }); + }, + + //将图片保存到本地相册 + saveImageToAlbum: function () { + wx.showLoading({ + title: '正在保存成图片', + mask: true, + }); + var that = this; + setTimeout(function () { + wx.saveImageToPhotosAlbum({ + filePath: that.data.shareImgSrc, + success(res) { + wx.hideLoading(); + that.togglePopup() + wx.showModal({ + title: '保存图片成功', + content: '图片成功保存到相册了，去发圈噻~', + showCancel: false, + confirmText: '好哒', + confirmColor: '#333', + success: function (res) { + if (res.confirm) { + console.log('用户点击确定'); + } + } + }) + }, + fail: function (res) { + console.log(res) + wx.hideLoading(); + wx.showToast({ + title: '保存图片失败!aRres', + icon: 'none', + duration: 1000 + }); + } + }) + }, 3000) + }, + +}) \ No newline at end of file diff --git a/pages/pay_result/pay_result.json b/pages/pay_result/pay_result.json new file mode 100644 index 0000000..bb1779e --- /dev/null +++ b/pages/pay_result/pay_result.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "支付成功", + "usingComponents": { + "zan-actionsheet": "../../components/actionsheet/index", + "zan-popup": "../../components/popup/index" + } +} \ No newline at end of file diff --git a/pages/pay_result/pay_result.wxml b/pages/pay_result/pay_result.wxml new file mode 100644 index 0000000..180a87d --- /dev/null +++ b/pages/pay_result/pay_result.wxml @@ -0,0 +1,31 @@ + + + + + + + 支付成功 + + 拼团成功后，将会存入您的服务卡中公众号关注【一号家政服务号】，即可预约 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/pay_result/pay_result.wxss b/pages/pay_result/pay_result.wxss new file mode 100644 index 0000000..4b1eca7 --- /dev/null +++ b/pages/pay_result/pay_result.wxss @@ -0,0 +1,83 @@ +page { + background-color: #21be8d; +} + +.main-layout { + height: 100%; + display: flex; + flex-direction: column; + align-items: center; +} + +.userinfo { + width: 85%; + height: 900rpx; + display: flex; + background-color: #fff; + flex-direction: column; + align-items: center; + border-radius: 8px; + margin-top: 85rpx; +} + +.pay-icon { + width: 160rpx; + height: 160rpx; + margin-top: 60rpx; + margin-bottom: 10rpx; +} + +.pop-image { + width: 85vw; + height: 105vw; +} + +.pay-text { + color: #21be8d; + font-size: 20px; + /* font-weight:bold; */ +} + +.tip-text { + color: #333; + font-size: 14px; + text-align: center; + margin: 60rpx; +} + +.btn-invite { + color: #fff; + background: #1eba84; + border-radius: 40px; + text-align: center; + font-size: 18px; + height: 80rpx; + line-height: 80rpx; + width: 80%; + margin: 0 auto; + margin-top: 80rpx; +} + +.btn-info { + color: #333; + background: #fff; + border-radius: 40px; + text-align: center; + font-size: 18px; + height: 80rpx; + line-height: 80rpx; + width: 80%; + margin: 0 auto; + margin-top: 50rpx; + border: 2rpx solid #1eba84; +} + +.title_img { + width: 200rpx; + height: 36rpx; + margin-top: 80rpx; +} + +.tiny { + background: rgba(30, 30, 40, 0.7) !important; +} \ No newline at end of file