From aeaa74ff259f89b993e49a19422efe1b829f8c14 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Fri, 22 Mar 2024 16:26:46 +0800 Subject: [PATCH] Revert "1" This reverts commit 6c7a7ccd46334a9eac0a57b360cf1041f894c8af. --- components/payment/index.vue | 48 ++++----- pages/payment/settlement.vue | 48 ++++----- pages/users/order_confirm/index.vue | 62 ++++++------ utils/util.js | 149 ++++++++++++---------------- 4 files changed, 137 insertions(+), 170 deletions(-) diff --git a/components/payment/index.vue b/components/payment/index.vue index 3772cd8..c4e609c 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -96,7 +96,7 @@ action: 'payClose' }); }, - goPay: async function(number, paytype) { + goPay: function(number, paytype) { if (this.isCall) { return this.$emit('onChangeFun', { action: 'payCheck', @@ -137,17 +137,6 @@ this.type = type; if (paytype == 'balance' || paytype == 'merBalance') { - // 是否输入密码 - const result = await this.$util.checkPassword(); - if (result.data.code == 101) { //未设置支付密码 - return this.$util.Tips({ - title: "您暂未设置支付密码,请前往设置!" - }, () => { - uni.navigateTo({ - url: "/pages/users/user_modify_pwd/index?type=payPwd" - }); - }) - } this.$refs.popups.handleOpen(); } else { uni.showLoading({ @@ -158,18 +147,26 @@ }, // 输入密码回调 - async handleConfirm(e) { - const result = await this.$util.checkPassword(e); - // 验证密码正确 - if (result.data.code == 100) { - uni.showLoading({ - title: '订单支付中', - mask: true - }); - this.trueOrderPay(e); - } else { - this.$refs.payPwd.handleOpen(result.data.code); - } + handleConfirm(e) { + // 验证密码是否正确 + verifyPwd({ + withdrawal_pwd: e + }).then(res => { + // 密码是否有效 状态码判断 + const code = res.data.code; + + if (code == 100) { //密码正确 + uni.showLoading({ + title: '订单支付中', + mask: true + }); + this.trueOrderPay(); + } else { + this.$refs.payPwd.handleOpen(code); + } + }).catch(err => { + console.log(err) + }) }, handleClear() {}, @@ -193,13 +190,12 @@ } }, - trueOrderPay(e) { + trueOrderPay() { let that = this; let orderApi = that.order_type === 1 ? presellOrderPay : that.order_type === 2 ? integralOrderPay : orderPay orderApi(that.order_id, { type: that.type, - withdrawal_pwd: e, // #ifdef H5 return_url: that.returnUrl !== '' ? 'http://' + window.location.host + that.returnUrl : 'http://' + window.location.host + '/pages/users/order_list/index', diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue index e427433..a557ea8 100644 --- a/pages/payment/settlement.vue +++ b/pages/payment/settlement.vue @@ -580,7 +580,7 @@ }); }, - SubOrder: async function() { + SubOrder: function() { let that = this, data = {}; if (!that.payType) return that.$util.Tips({ @@ -596,19 +596,6 @@ // 设置支付密码 if (that.payType == 'balance' || that.payType == 'merBalance') { - - // 是否输入密码 - const result = await this.$util.checkPassword(); - if (result.data.code == 101) { //未设置支付密码 - return this.$util.Tips({ - title: "您暂未设置支付密码,请前往设置!" - }, () => { - uni.navigateTo({ - url: "/pages/users/user_modify_pwd/index?type=payPwd" - }); - }) - } - this.$refs.popups.handleOpen(); } else { uni.showLoading({ @@ -619,20 +606,29 @@ } }, + // 输入密码回调 - async handleConfirm(e) { - const result = await this.$util.checkPassword(e); - // 验证密码正确 - if (result.data.code == 100) { + handleConfirm(e) { + // 验证密码是否正确 + verifyPwd({ + withdrawal_pwd: e + }).then(res => { + // 密码是否有效 状态码判断 + const code = res.data.code; this.$set(this.payForm, 'withdrawal_pwd', e); - uni.showLoading({ - title: '订单支付中', - mask: true - }); - this.truePayOrder(this.payForm); - } else { - this.$refs.payPwd.handleOpen(result.data.code); - } + + if (code == 100) { //密码正确 + uni.showLoading({ + title: '订单支付中', + mask: true + }); + this.truePayOrder(this.payForm); + } else { + this.$refs.payPwd.handleOpen(code); + } + }).catch(err => { + console.log(err) + }) }, // 弹框左边按钮 101 未设置密码 102 忘记密码 都去设置密码 diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 0bba44e..ba000f4 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -754,7 +754,7 @@ isShow: false, moneyInfo: {}, orderData: {}, //支付参数 - sale_type: 1, + sale_type: 1, }; }, computed: { @@ -773,7 +773,7 @@ mounted: function() {}, onLoad: function(options) { this.seckillId = options.seckillId - if (options.sale_type) this.sale_type = options.sale_type; + if(options.sale_type) this.sale_type = options.sale_type; // #ifdef H5 this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' // #endif @@ -1413,8 +1413,7 @@ orderId = res.data.result.order_id, callback_key = res.data.result.pay_key, jsConfig = res.data.result.config, - goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message + - '&sale_type=' + that.sale_type; + goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message + '&sale_type=' + that.sale_type; that.orderPay = true; uni.hideLoading(); switch (status) { @@ -1679,7 +1678,7 @@ this.virtualIndex = index; }, - SubOrder: async function(e) { + SubOrder: function(e) { let that = this, data = {}; if (!that.payType) return that.$util.Tips({ @@ -1829,44 +1828,39 @@ // 设置支付密码 if (data.pay_type == 'balance' || data.pay_type == 'merBalance') { this.orderData = data; - - // 是否输入密码 - const result = await this.$util.checkPassword(); - if (result.data.code == 101) { //未设置支付密码 - return this.$util.Tips({ - title: "您暂未设置支付密码,请前往设置!" - }, () => { - uni.navigateTo({ - url: "/pages/users/user_modify_pwd/index?type=payPwd" - }); - }) - } - - //已设置 输入密码 this.$refs.popups.handleOpen(); - } else { //无须支付密码 + } else { this.truePayOrder(data); } }, // 输入密码回调 - async handleConfirm(e) { - const result = await this.$util.checkPassword(e); - // 验证密码正确 - if (result.data.code == 100) { - this.$set(this.orderData, 'withdrawal_pwd', e); - uni.showLoading({ - title: '订单支付中', - mask: true - }); - this.truePayOrder(this.orderData); - } else { - this.$refs.payPwd.handleOpen(result.data.code); - } + handleConfirm(e) { + // 验证密码是否正确 + verifyPwd({ + withdrawal_pwd: e + }).then(res => { + + // 密码是否有效 状态码判断 + const code = res.data.code; + + if (code == 100) { //密码正确 + this.$set(this.orderData, 'withdrawal_pwd', e); + uni.showLoading({ + title: '订单支付中', + mask: true + }); + this.truePayOrder(this.orderData); + } else { + this.$refs.payPwd.handleOpen(code); + } + }).catch(err => { + console.log(err) + }) }, // 弹框左边按钮 101 未设置密码 102 忘记密码 都去设置密码 - handleLeft() { + handleLeft(code) { uni.navigateTo({ url: "/pages/users/user_modify_pwd/index?type=payPwd" }); diff --git a/utils/util.js b/utils/util.js index 9414227..f99dcd1 100644 --- a/utils/util.js +++ b/utils/util.js @@ -12,10 +12,6 @@ import { HTTP_REQUEST_URL } from '../config/app.js'; import store from '../store'; - -import { - verifyPwd -} from '@/api/order.js'; import { pathToBase64 } from '@/plugin/image-tools/index.js'; @@ -23,15 +19,6 @@ import { import permision from "./permission.js" // #endif export default { - - // 是否设置密码 - checkPassword: async function(e) { - e = e ? e : ''; - return await verifyPwd({ - withdrawal_pwd: e - }); - }, - /** * 字符串截取 * @obj 传入的数据 @@ -195,7 +182,7 @@ export default { arr.push(text.slice(str, text.length)); return [strLength, arr, rows] // [处理文字的总字节长度，每行显示内容的数组，行数] }, - /** +/** * 获取分享海报 * @param array arr2 海报素材 * @param string store_name 素材文字 @@ -212,7 +199,7 @@ export default { * 只能获取合法域名下的图片信息,本地调试无法获取 * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { console.log(res, 'getImageInfo') @@ -230,8 +217,7 @@ export default { ctx.drawImage(arr2[2], cx, cy, d, d); ctx.restore(); const CONTENT_ROW_LENGTH = 40; - let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, - CONTENT_ROW_LENGTH); + let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, CONTENT_ROW_LENGTH); if (contentRows > 2) { contentRows = 2; let textArray = contentArray.slice(0, 2); @@ -291,26 +277,26 @@ export default { * 只能获取合法域名下的图片信息,本地调试无法获取 * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { console.log(res, 'getImageInfo') const WIDTH = res.width; const HEIGHT = res.height; - ctx.drawImage(arr2[0], 0, 0, WIDTH, HEIGHT + 50); + ctx.drawImage(arr2[0], 0, 0, WIDTH, HEIGHT+50); ctx.save(); let r = 90; let d = r * 2; let cx = 555; let cy = 910; let ux = 50; - let uy = 50; + let uy = 50; ctx.arc(cx + r, cy + r, r, 0, 2 * Math.PI); that.handleBorderRect(ctx, 30, 30, 50, 50, 25); ctx.clip(); ctx.drawImage(arr2[3], 30, 30, 50, 50); ctx.restore(); - ctx.drawImage(arr2[2], cx, cy - 30, d - 30, d - 30); + ctx.drawImage(arr2[2], cx, cy-30, d-30, d-30); ctx.save(); ctx.restore(); ctx.setTextAlign('left'); @@ -318,14 +304,12 @@ export default { ctx.setFillStyle('#282828'); ctx.fillText(site_name, r, 62); const CONTENT_ROW_LENGTH = 26; - let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, - CONTENT_ROW_LENGTH); + let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, CONTENT_ROW_LENGTH); if (contentRows > 2) { contentRows = 2; let textArray = contentArray.slice(0, 2); - textArray[textArray.length - 1] = textArray[textArray.length - 1].slice(0, - textArray[textArray.length - 1].length - 1) - textArray[textArray.length - 1] += '…'; + textArray[textArray.length - 1] = textArray[textArray.length - 1].slice(0,textArray[textArray.length - 1].length-1) + textArray[textArray.length - 1] += '…'; contentArray = textArray; } ctx.setFontSize(32); @@ -339,18 +323,18 @@ export default { ctx.setFontSize(26); ctx.setFillStyle('#999999'); ctx.beginPath(); - const textWidth = ctx.measureText(ot_price + '￥').width + 16; //检查字体的宽度 + const textWidth = ctx.measureText(ot_price+'￥').width + 16; //检查字体的宽度 //绘制数字中间的矩形 ctx.setFillStyle('#999999'); - ctx.rect(35, 1062, textWidth - 10, 1); + ctx.rect(35, 1062,textWidth-10, 1); ctx.fill(); ctx.closePath(); ctx.fillText('￥' + ot_price, 35, 1030 + contentHh); // ctx.clip(); // ctx.restore(); - that.handleBorderRect(ctx, 30, 108, WIDTH - 60, WIDTH - 20, 12); + that.handleBorderRect(ctx, 30, 108, WIDTH-60, WIDTH-20, 12); ctx.clip(); - ctx.drawImage(arr2[1], 30, 108, WIDTH - 60, WIDTH - 20); + ctx.drawImage(arr2[1], 30, 108, WIDTH-60, WIDTH-20); ctx.draw(true, function() { uni.canvasToTempFilePath({ canvasId: 'myCanvas', @@ -394,7 +378,7 @@ export default { * 只能获取合法域名下的图片信息,本地调试无法获取 * */ - uni.getImageInfo({ + uni.getImageInfo({ src: arr2[0], success: function(res) { const WIDTH = res.width; @@ -406,26 +390,25 @@ export default { let ux = 50; let uy = 700; ctx.drawImage(arr2[0], 0, 0, WIDTH, HEIGHT); - ctx.drawImage(arr2[1], 32, 32, WIDTH - 64, WIDTH - 64); + ctx.drawImage(arr2[1], 32, 32, WIDTH-64, WIDTH-64); ctx.strokeStyle = "#ffffff"; ctx.save(); ctx.arc(cx + r, cy + r, r, 0, 2 * Math.PI); ctx.drawImage(arr2[2], 530, 760, d, d); that.handleBorderRect(ctx, ux, uy, r, r, 45); ctx.clip(); - ctx.stockStyle = "#ffffff"; + ctx.stockStyle ="#ffffff"; ctx.drawImage(arr2[3], ux, uy, r, r); ctx.restore(); ctx.setTextAlign('left') ctx.setFontSize(28); ctx.setFillStyle('#282828'); - ctx.fillText(nickname, r + 60, 760); + ctx.fillText(nickname, r+60, 760); ctx.setTextAlign('left') ctx.setFontSize(28); ctx.setFillStyle('#282828'); const CONTENT_ROW_LENGTH = 25; - let [contentLeng, contentArray, contentRows] = that.textByteLength(content, - CONTENT_ROW_LENGTH); + let [contentLeng, contentArray, contentRows] = that.textByteLength(content, CONTENT_ROW_LENGTH); if (contentRows > 2) { contentRows = 2; let textArray = contentArray.slice(0, 2); @@ -433,11 +416,11 @@ export default { contentArray = textArray; } ctx.setTextAlign('left'); - ctx.font = 'bold 32px Arial'; + ctx.font = 'bold 32px Arial'; let contentHh = 32 * 1.3; for (let m = 0; m < contentArray.length; m++) { ctx.fillText(contentArray[m], 55, 850 + contentHh * m); - } + } ctx.draw(true, function() { uni.canvasToTempFilePath({ canvasId: 'myCanvas', @@ -465,36 +448,36 @@ export default { }) }, /** - * 图片圆角设置 - * @param string x x轴位置 - * @param string y y轴位置 - * @param string w 图片宽 - * @param string y 图片高 - * @param string r 圆角值 - */ - handleBorderRect(ctx, x, y, w, h, r) { - ctx.beginPath(); - // 左上角 - ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI); - ctx.moveTo(x + r, y); - ctx.lineTo(x + w - r, y); - ctx.lineTo(x + w, y + r); - // 右上角 - ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI); - ctx.lineTo(x + w, y + h - r); - ctx.lineTo(x + w - r, y + h); - // 右下角 - ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI); - ctx.lineTo(x + r, y + h); - ctx.lineTo(x, y + h - r); - // 左下角 - ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI); - ctx.lineTo(x, y + r); - ctx.lineTo(x + r, y); - - ctx.fill(); - ctx.closePath(); - }, + * 图片圆角设置 + * @param string x x轴位置 + * @param string y y轴位置 + * @param string w 图片宽 + * @param string y 图片高 + * @param string r 圆角值 + */ + handleBorderRect(ctx, x, y, w, h, r) { + ctx.beginPath(); + // 左上角 + ctx.arc(x + r, y + r, r, Math.PI, 1.5 * Math.PI); + ctx.moveTo(x + r, y); + ctx.lineTo(x + w - r, y); + ctx.lineTo(x + w, y + r); + // 右上角 + ctx.arc(x + w - r, y + r, r, 1.5 * Math.PI, 2 * Math.PI); + ctx.lineTo(x + w, y + h - r); + ctx.lineTo(x + w - r, y + h); + // 右下角 + ctx.arc(x + w - r, y + h - r, r, 0, 0.5 * Math.PI); + ctx.lineTo(x + r, y + h); + ctx.lineTo(x, y + h - r); + // 左下角 + ctx.arc(x + r, y + h - r, r, 0.5 * Math.PI, Math.PI); + ctx.lineTo(x, y + r); + ctx.lineTo(x + r, y); + + ctx.fill(); + ctx.closePath(); + }, /** * 用户信息分享海报 * @param array arr2 海报素材 1背景 0二维码 @@ -544,8 +527,7 @@ export default { ctx.setFontSize(10); } const CONTENT_ROW_LENGTH = 28; - let [contentLeng, contentArray, contentRows] = that.textByteLength(sitename, - CONTENT_ROW_LENGTH); + let [contentLeng, contentArray, contentRows] = that.textByteLength(sitename, CONTENT_ROW_LENGTH); if (contentRows > 2) { contentRows = 2; let textArray = contentArray.slice(0, 2); @@ -557,10 +539,10 @@ export default { let contentHh = 12 * 1.3; for (let m = 0; m < contentArray.length; m++) { ctx.fillText(contentArray[m], w * markx, h * marky + contentHh * m); - } + } // ctx.fillText(sitename, w * markx, h * marky); ctx.save(); - ctx.draw(false, setTimeout(() => { + ctx.draw(false,setTimeout(()=>{ uni.canvasToTempFilePath({ canvasId: 'myCanvas' + index, fileType: 'png', @@ -572,10 +554,10 @@ export default { fail: function(err) { console.log(err) uni.hideLoading(); - + } }) - }, 1000)) + },1000)) }, fail: function(err) { @@ -610,7 +592,7 @@ export default { count: count, //最多可以选择的图片总数 sizeType: sizeType, // 可以指定是原图还是压缩图，默认二者都有 sourceType: sourceType, // 可以指定来源是相册还是相机，默认二者都有 - success: async (res) => { + success: async (res)=> { let image = []; let filesLen = res.tempFiles.length; let exceeded_list = []; @@ -692,7 +674,7 @@ export default { }) }) }, - /** +/** * 小程序头像获取上传 * @param uploadUrl 上传接口地址 * @param filePath 上传文件路径 @@ -701,7 +683,7 @@ export default { */ uploadImgs(uploadUrl, filePath, successCallback, errorCallback) { let that = this; - let inputName = 'pics'; + let inputName = 'pics'; uni.uploadFile({ url: HTTP_REQUEST_URL + '/api/' + uploadUrl + '/' + inputName, filePath: filePath, @@ -756,8 +738,8 @@ export default { }, getNowUrl: function() { const pages = getCurrentPages(), - page = pages[pages.length - 1], - query = this.serialize(page.options || {}); + page = pages[pages.length - 1], + query = this.serialize(page.options || {}); return page.route + (query ? '?' + query : ''); }, /** @@ -1000,9 +982,9 @@ export default { if (arr.length > 1) { //#ifdef MP let pathArr = arr[1].split('?') - if (pathArr.length > 1) {} + if(pathArr.length > 1){} uni.navigateToMiniProgram({ - appId: pathArr.length > 1 ? pathArr[0] : arr[arr.length - 1], // 此为生活缴费appid + appId: pathArr.length > 1 ? pathArr[0] : arr[arr.length-1], // 此为生活缴费appid path: arr[0], // 此为生活缴费首页路径 envVersion: "release", success: res => { @@ -1022,8 +1004,7 @@ export default { url: `/pages/annex/web_view/index?url=${url}` }); } else { - if (['/pages/goods_cate/goods_cate', '/pages/plant_grass/index', - '/pages/order_addcart/order_addcart', '/pages/user/index' + if (['/pages/goods_cate/goods_cate','/pages/plant_grass/index','/pages/order_addcart/order_addcart','/pages/user/index' ] .indexOf(url) == -1) { uni.navigateTo({ @@ -1037,4 +1018,4 @@ export default { } } }, -} \ No newline at end of file +}