!131 2022-1-30 Leung

Merge pull request !131 from Admin/sit-Leung
This commit is contained in:
Admin 2022-01-30 08:09:34 +00:00 committed by Gitee
commit ba76c5a28c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 9 deletions

View File

@ -41,7 +41,7 @@ let util = {
if((isWx || !isMobile) && $paytype == 1) {
return {'result':true};
}
if(isMobile && $paytype == 3) {
if(isMobile && !isWx && $paytype == 3) {
return {'result':true};
}
if($paytype == 2) {
@ -50,13 +50,13 @@ let util = {
let message='';
switch($paytype) {
case "1":
message = '请返回电脑端继续当前订单的支付';
message = '请返回电脑网页端继续当前订单的支付';
break;
case "2":
message = '请返回支付宝继续当前订单的支付';
break;
case "3":
message = '请返回手机端继续当前订单的支付';
message = '请返回手机网页端继续当前订单的支付';
break;
default:
message = '订单已过期,请重新下单';

View File

@ -326,8 +326,6 @@ export default {
if (data) {
outputObj = data;
outputObj.productName = data.name;
outputObj.picture = outputObj.picture;
outputObj.showImgFile = outputObj.showImgFile;
newlist = [outputObj];
curItem = outputObj;
}
@ -530,12 +528,8 @@ export default {
let data = await oncequery(this.productCode);
let outputObj = {};
if (data) {
console.log(data);
debugger
outputObj = data;
outputObj.productName = data.name;
outputObj.picture = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.picture;
outputObj.showImgFile = 'https://royalcanincn.escase.cn/jc/royalcanin/'+outputObj.showImgFile;
this.newlist = [outputObj];
}
let picture = this.newlist[0].picture.split(",");