1

components/payment/index.vue

@@ -96,7 +96,7 @@
 					action: 'payClose'
 				});
 			},
-			goPay: function(number, paytype) {
+			goPay: async function(number, paytype) {
 				if (this.isCall) {
 					return this.$emit('onChangeFun', {
 						action: 'payCheck',
@@ -137,6 +137,17 @@
 				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({
@@ -147,26 +158,18 @@
 			},
 
 			// 输入密码回调
-			handleConfirm(e) {
+			async handleConfirm(e) {
-				// 验证密码是否正确
+				const result = await this.$util.checkPassword(e);
-				verifyPwd({
+				// 验证密码正确
-					withdrawal_pwd: e
+				if (result.data.code == 100) {
-				}).then(res => {
-					// 密码是否有效 状态码判断
-					const code = res.data.code;
-
-					if (code == 100) { //密码正确
 					uni.showLoading({
 						title: '订单支付中',
 						mask: true
 					});
-						this.trueOrderPay();
+					this.trueOrderPay(e);
 				} else {
-						this.$refs.payPwd.handleOpen(code);
+					this.$refs.payPwd.handleOpen(result.data.code);
 				}
-				}).catch(err => {
-					console.log(err)
-				})
 			},
 
 			handleClear() {},
@@ -190,12 +193,13 @@
 				}
 			},
 
-			trueOrderPay() {
+			trueOrderPay(e) {
 				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',

pages/payment/settlement.vue

@@ -580,7 +580,7 @@
 				});
 			},
 
-			SubOrder: function() {
+			SubOrder: async function() {
 				let that = this,
 					data = {};
 				if (!that.payType) return that.$util.Tips({
@@ -596,6 +596,19 @@
 
 				// 设置支付密码
 				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({
@@ -606,29 +619,20 @@
 				}
 			},
 
-
 			// 输入密码回调
-			handleConfirm(e) {
+			async handleConfirm(e) {
-				// 验证密码是否正确
+				const result = await this.$util.checkPassword(e);
-				verifyPwd({
+				// 验证密码正确
-					withdrawal_pwd: e
+				if (result.data.code == 100) {
-				}).then(res => {
-					// 密码是否有效 状态码判断
-					const code = res.data.code;
 					this.$set(this.payForm, 'withdrawal_pwd', e);
-
-					if (code == 100) { //密码正确
 					uni.showLoading({
 						title: '订单支付中',
 						mask: true
 					});
 					this.truePayOrder(this.payForm);
 				} else {
-						this.$refs.payPwd.handleOpen(code);
+					this.$refs.payPwd.handleOpen(result.data.code);
 				}
-				}).catch(err => {
-					console.log(err)
-				})
 			},
 
 			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码

pages/users/order_confirm/index.vue

@@ -1413,7 +1413,8 @@
 						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) {
@@ -1678,7 +1679,7 @@
 				this.virtualIndex = index;
 			},
 
-			SubOrder: function(e) {
+			SubOrder: async function(e) {
 				let that = this,
 					data = {};
 				if (!that.payType) return that.$util.Tips({
@@ -1828,23 +1829,31 @@
 				// 设置支付密码
 				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);
 				}
 			},
 
 			// 输入密码回调
-			handleConfirm(e) {
+			async handleConfirm(e) {
-				// 验证密码是否正确
+				const result = await this.$util.checkPassword(e);
-				verifyPwd({
+				// 验证密码正确
-					withdrawal_pwd: e
+				if (result.data.code == 100) {
-				}).then(res => {
-
-					// 密码是否有效 状态码判断
-					const code = res.data.code;
-
-					if (code == 100) { //密码正确
 					this.$set(this.orderData, 'withdrawal_pwd', e);
 					uni.showLoading({
 						title: '订单支付中',
@@ -1852,15 +1861,12 @@
 					});
 					this.truePayOrder(this.orderData);
 				} else {
-						this.$refs.payPwd.handleOpen(code);
+					this.$refs.payPwd.handleOpen(result.data.code);
 				}
-				}).catch(err => {
-					console.log(err)
-				})
 			},
 
 			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码
-			handleLeft(code) {
+			handleLeft() {
 				uni.navigateTo({
 					url: "/pages/users/user_modify_pwd/index?type=payPwd"
 				});

utils/util.js

@@ -12,6 +12,10 @@ 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';
@@ -19,6 +23,15 @@ import {
 import permision from "./permission.js"
 // #endif
 export default {
+
+	// 是否设置密码
+	checkPassword: async function(e) {
+		e = e ? e : '';
+		return await verifyPwd({
+			withdrawal_pwd: e
+		});
+	},
+
 	/**
 	 * 字符串截取
 	 * @obj 传入的数据
@@ -217,7 +230,8 @@ 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);
@@ -304,11 +318,13 @@ 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].slice(0,
+						textArray[textArray.length - 1].length - 1)
 					textArray[textArray.length - 1] += '…';
 					contentArray = textArray;
 				}
@@ -408,7 +424,8 @@ export default {
 				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);
@@ -527,7 +544,8 @@ 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);
@@ -1004,7 +1022,8 @@ 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({