update
This commit is contained in:
ylj20011123
parent
e9b1957164
commit
f99ae32564
@ -726,7 +726,9 @@ export default {
|
||||
if (safeHeight) {
|
||||
this.safeHeight = Number(safeHeight);
|
||||
}
|
||||
this.$utils.addUserBehaviorNew();
|
||||
this.$utils.addUserBehaviorNew({
|
||||
behaviorRecordDesc: query.pageType === "UnionMall" ? '进入了工会商城' : "进入了精选商城"
|
||||
});
|
||||
// if (query && query.recommendCode && query.recommendId) {
|
||||
// this.$utils.addUserBehaviorNew(null,true);
|
||||
// console.log("this.globalData", this.globalData);
|
||||
|
||||
@ -642,6 +642,26 @@ export default {
|
||||
this.isMakeOrdering = false;
|
||||
}
|
||||
},
|
||||
// 在实际支付完之后 调用该方法 可以将订单内容和成长值挂钩起来
|
||||
async handleUpdateOrderGrowth(id, money) {
|
||||
const req = {
|
||||
MemberShipId: this.user.MEMBERSHIP_ID,
|
||||
OwnerUnitId: 911,
|
||||
ScoreType: "4020",
|
||||
CurrentScore: money,
|
||||
ConsumptionRecordId: id,
|
||||
Description: "商城订单 支付",
|
||||
AppID: "wxee018fb96955552a",
|
||||
type: 'encryption'
|
||||
}
|
||||
console.log('reqreqreq', req);
|
||||
|
||||
const data = await this.$api.$zzyLocalPost(
|
||||
"/Member/RecordMemberScoreInfo",
|
||||
req
|
||||
);
|
||||
console.log('datadatadatadata', data);
|
||||
},
|
||||
// 余额支付
|
||||
async handleBalancePayment(obj) {
|
||||
let _this = this;
|
||||
@ -744,6 +764,9 @@ export default {
|
||||
// 获取后台信息调取微信支付
|
||||
async getOrderInfo(obj, payMoney) {
|
||||
if (this.user.TEST_MEMBER) {
|
||||
// 因为是内部会员 跳过支付 所以 直接跳转 且给成长值
|
||||
this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT)
|
||||
|
||||
uni.redirectTo({
|
||||
url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
|
||||
});
|
||||
@ -839,6 +862,7 @@ export default {
|
||||
: Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
success(res) {
|
||||
console.log("res", res);
|
||||
_this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT)
|
||||
},
|
||||
fail(res) {
|
||||
console.log("fail", res);
|
||||
|
||||
@ -647,8 +647,38 @@ export default {
|
||||
}
|
||||
this.onClose();
|
||||
},
|
||||
// 在实际支付完之后 调用该方法 可以将订单内容和成长值挂钩起来
|
||||
async handleUpdateOrderGrowth(id, money) {
|
||||
const req = {
|
||||
MemberShipId: this.user.MEMBERSHIP_ID,
|
||||
OwnerUnitId: 911,
|
||||
ScoreType: "4010",
|
||||
CurrentScore: money,
|
||||
ConsumptionRecordId: id,
|
||||
Description: "点餐订单支付",
|
||||
AppID: "wxee018fb96955552a",
|
||||
type: 'encryption'
|
||||
}
|
||||
console.log('reqreqreq', req);
|
||||
|
||||
const data = await this.$api.$zzyLocalPost(
|
||||
"/Member/RecordMemberScoreInfo",
|
||||
req
|
||||
);
|
||||
console.log('datadatadatadata', data);
|
||||
},
|
||||
// 微信支付的实际方法
|
||||
async handleWxPay(obj) {
|
||||
if (this.user.TEST_MEMBER) {
|
||||
// 因为是内部会员 跳过支付 所以 直接跳转 且给成长值
|
||||
this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT)
|
||||
|
||||
uni.redirectTo({
|
||||
url: `/pages/order/orderFoodDetail/index?orderInternal=${obj.SALEBILL_ID}`,
|
||||
});
|
||||
return
|
||||
}
|
||||
|
||||
let _this = this;
|
||||
// 拿到签名
|
||||
let mchid = "1672298991";
|
||||
@ -728,6 +758,7 @@ export default {
|
||||
total_fee: Number(_this.orderAmount) * 100 || 1,
|
||||
success(res) {
|
||||
console.log("res", res);
|
||||
_this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT)
|
||||
},
|
||||
fail(res) {
|
||||
console.log("fail", res);
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -526,7 +526,9 @@ var _default = {
|
||||
if (safeHeight) {
|
||||
_this2.safeHeight = Number(safeHeight);
|
||||
}
|
||||
_this2.$utils.addUserBehaviorNew();
|
||||
_this2.$utils.addUserBehaviorNew({
|
||||
behaviorRecordDesc: query.pageType === "UnionMall" ? '进入了工会商城' : "进入了精选商城"
|
||||
});
|
||||
// if (query && query.recommendCode && query.recommendId) {
|
||||
// this.$utils.addUserBehaviorNew(null,true);
|
||||
// console.log("this.globalData", this.globalData);
|
||||
|
||||
@ -754,37 +754,70 @@ var _default = {
|
||||
}, _callee3);
|
||||
}))();
|
||||
},
|
||||
// 余额支付
|
||||
handleBalancePayment: function handleBalancePayment(obj) {
|
||||
// 在实际支付完之后 调用该方法 可以将订单内容和成长值挂钩起来
|
||||
handleUpdateOrderGrowth: function handleUpdateOrderGrowth(id, money) {
|
||||
var _this6 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var _this, userData, insufficientBalance, req, data;
|
||||
var req, data;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
_this = _this6;
|
||||
console.log("this.user", _this6.user);
|
||||
req = {
|
||||
MemberShipId: _this6.user.MEMBERSHIP_ID,
|
||||
OwnerUnitId: 911,
|
||||
ScoreType: "4020",
|
||||
CurrentScore: money,
|
||||
ConsumptionRecordId: id,
|
||||
Description: "商城订单 支付",
|
||||
AppID: "wxee018fb96955552a",
|
||||
type: 'encryption'
|
||||
};
|
||||
console.log('reqreqreq', req);
|
||||
_context4.next = 4;
|
||||
return _this6.$api.$zzyLocalPost("/Member/RecordMemberScoreInfo", req);
|
||||
case 4:
|
||||
data = _context4.sent;
|
||||
console.log('datadatadatadata', data);
|
||||
case 6:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4);
|
||||
}))();
|
||||
},
|
||||
// 余额支付
|
||||
handleBalancePayment: function handleBalancePayment(obj) {
|
||||
var _this7 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
|
||||
var _this, userData, insufficientBalance, req, data;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
case 0:
|
||||
_this = _this7;
|
||||
console.log("this.user", _this7.user);
|
||||
console.log("obj", obj);
|
||||
|
||||
// 获取最新的用户余额
|
||||
uni.showLoading({
|
||||
title: "获取用户余额..."
|
||||
});
|
||||
_context4.next = 6;
|
||||
return _this6.$api.getCoop({
|
||||
_context5.next = 6;
|
||||
return _this7.$api.getCoop({
|
||||
action_type: "GetMembershipInfo",
|
||||
WechatUserId: _this6.user.WechatUserId
|
||||
WechatUserId: _this7.user.WechatUserId
|
||||
});
|
||||
case 6:
|
||||
userData = _context4.sent;
|
||||
_this6.userInfo = userData.Data;
|
||||
console.log("this.userInfo", _this6.userInfo);
|
||||
userData = _context5.sent;
|
||||
_this7.userInfo = userData.Data;
|
||||
console.log("this.userInfo", _this7.userInfo);
|
||||
uni.hideLoading();
|
||||
|
||||
// 判断余额是否不足
|
||||
insufficientBalance = false;
|
||||
if (_this6.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT)) {
|
||||
if (_this7.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT)) {
|
||||
insufficientBalance = true;
|
||||
// uni.showToast({
|
||||
// title: "余额不足！无法支付",
|
||||
@ -796,20 +829,20 @@ var _default = {
|
||||
req = {
|
||||
action_type: "ECodeConsume",
|
||||
saleBill: obj.SALEBILL_ID,
|
||||
industryMembershipId: _this6.user.INDUSTRY_MEMBERSHIP_ID,
|
||||
industryMembershipId: _this7.user.INDUSTRY_MEMBERSHIP_ID,
|
||||
requestType: "application/x-www-form-urlencoded",
|
||||
mixPay: insufficientBalance ? 1 : "" // 组合支付的时候传1
|
||||
};
|
||||
_context4.next = 15;
|
||||
return _this6.$api.postCoop(req);
|
||||
_context5.next = 15;
|
||||
return _this7.$api.postCoop(req);
|
||||
case 15:
|
||||
data = _context4.sent;
|
||||
data = _context5.sent;
|
||||
console.log("data", data);
|
||||
if (data.ResultCode === "100") {
|
||||
if (insufficientBalance) {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: "\u5F53\u524D\u79EF\u5206".concat(_this6.userInfo.ACCOUNT_BALANCE, "\uFF0C\u8FD8\u9700\u989D\u5916\u652F\u4ED8").concat(data.ResultData, "\u5143"),
|
||||
content: "\u5F53\u524D\u79EF\u5206".concat(_this7.userInfo.ACCOUNT_BALANCE, "\uFF0C\u8FD8\u9700\u989D\u5916\u652F\u4ED8").concat(data.ResultData, "\u5143"),
|
||||
success: function success(res) {
|
||||
if (res.confirm) {
|
||||
uni.showLoading({
|
||||
@ -821,7 +854,7 @@ var _default = {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
_this6.isMakeOrdering = false;
|
||||
_this7.isMakeOrdering = false;
|
||||
uni.showToast({
|
||||
title: "支付成功！",
|
||||
icon: "none"
|
||||
@ -840,10 +873,10 @@ var _default = {
|
||||
}
|
||||
case 18:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
return _context5.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4);
|
||||
}, _callee5);
|
||||
}))();
|
||||
},
|
||||
// 生成订单号
|
||||
@ -869,24 +902,26 @@ var _default = {
|
||||
// 生成一个符合要求的商户订单号（长度为16的示例）
|
||||
// 获取后台信息调取微信支付
|
||||
getOrderInfo: function getOrderInfo(obj, payMoney) {
|
||||
var _this7 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
|
||||
var _this8 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
|
||||
var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
|
||||
return _regenerator.default.wrap(function _callee6$(_context6) {
|
||||
return _regenerator.default.wrap(function _callee7$(_context7) {
|
||||
while (1) {
|
||||
switch (_context6.prev = _context6.next) {
|
||||
switch (_context7.prev = _context7.next) {
|
||||
case 0:
|
||||
if (!_this7.user.TEST_MEMBER) {
|
||||
_context6.next = 3;
|
||||
if (!_this8.user.TEST_MEMBER) {
|
||||
_context7.next = 4;
|
||||
break;
|
||||
}
|
||||
// 因为是内部会员 跳过支付 所以 直接跳转 且给成长值
|
||||
_this8.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT);
|
||||
uni.redirectTo({
|
||||
url: "/pages/order/orderdetail/index?orderInternal=".concat(obj.SALEBILL_ID)
|
||||
});
|
||||
return _context6.abrupt("return");
|
||||
case 3:
|
||||
return _context7.abrupt("return");
|
||||
case 4:
|
||||
// payMoney 工会之家订单 组合支付时可能会出现的值
|
||||
_this = _this7;
|
||||
_this = _this8;
|
||||
console.log("_this.couponOrder", _this.couponOrder);
|
||||
console.log("payMoneypayMoneypayMoney", payMoney);
|
||||
console.log("objobjobjobjobjobjobjobj", obj);
|
||||
@ -923,10 +958,10 @@ var _default = {
|
||||
parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n",
|
||||
provinceCode: _this.provinceCode || "530000"
|
||||
};
|
||||
_context6.next = 17;
|
||||
return _this7.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 17:
|
||||
data = _context6.sent;
|
||||
_context7.next = 18;
|
||||
return _this8.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 18:
|
||||
data = _context7.sent;
|
||||
console.log("data3213123", data.Result_Data);
|
||||
Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
|
||||
AuthorizationStr = "WECHATPAY2-SHA256-RSA2048 ".concat(Authorization);
|
||||
@ -943,11 +978,11 @@ var _default = {
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
success: function () {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(res) {
|
||||
var paySign, reqSign, data;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
return _regenerator.default.wrap(function _callee6$(_context6) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
switch (_context6.prev = _context6.next) {
|
||||
case 0:
|
||||
console.log(res.data.prepay_id);
|
||||
_this.text = "request success";
|
||||
@ -955,10 +990,10 @@ var _default = {
|
||||
reqSign = {
|
||||
parameters: "wxee018fb96955552a\n" + timeStamp + "\n" + nonceStr + "\nprepay_id=" + res.data.prepay_id + "\n"
|
||||
};
|
||||
_context5.next = 6;
|
||||
_context6.next = 6;
|
||||
return _this.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 6:
|
||||
data = _context5.sent;
|
||||
data = _context6.sent;
|
||||
paySign = data.Result_Data;
|
||||
wx.requestPayment({
|
||||
timeStamp: timeStamp.toString(),
|
||||
@ -969,6 +1004,7 @@ var _default = {
|
||||
total_fee: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
success: function success(res) {
|
||||
console.log("res", res);
|
||||
_this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT);
|
||||
},
|
||||
fail: function fail(res) {
|
||||
console.log("fail", res);
|
||||
@ -982,10 +1018,10 @@ var _default = {
|
||||
});
|
||||
case 9:
|
||||
case "end":
|
||||
return _context5.stop();
|
||||
return _context6.stop();
|
||||
}
|
||||
}
|
||||
}, _callee5);
|
||||
}, _callee6);
|
||||
}));
|
||||
function success(_x) {
|
||||
return _success.apply(this, arguments);
|
||||
@ -993,13 +1029,13 @@ var _default = {
|
||||
return success;
|
||||
}()
|
||||
});
|
||||
return _context6.abrupt("return");
|
||||
case 26:
|
||||
return _context7.abrupt("return");
|
||||
case 27:
|
||||
case "end":
|
||||
return _context6.stop();
|
||||
return _context7.stop();
|
||||
}
|
||||
}
|
||||
}, _callee6);
|
||||
}, _callee7);
|
||||
}))();
|
||||
}
|
||||
}
|
||||
|
||||
@ -564,16 +564,60 @@ var _default = {
|
||||
}
|
||||
this.onClose();
|
||||
},
|
||||
// 在实际支付完之后 调用该方法 可以将订单内容和成长值挂钩起来
|
||||
handleUpdateOrderGrowth: function handleUpdateOrderGrowth(id, money) {
|
||||
var _this3 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
||||
var req, data;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
req = {
|
||||
MemberShipId: _this3.user.MEMBERSHIP_ID,
|
||||
OwnerUnitId: 911,
|
||||
ScoreType: "4010",
|
||||
CurrentScore: money,
|
||||
ConsumptionRecordId: id,
|
||||
Description: "点餐订单支付",
|
||||
AppID: "wxee018fb96955552a",
|
||||
type: 'encryption'
|
||||
};
|
||||
console.log('reqreqreq', req);
|
||||
_context.next = 4;
|
||||
return _this3.$api.$zzyLocalPost("/Member/RecordMemberScoreInfo", req);
|
||||
case 4:
|
||||
data = _context.sent;
|
||||
console.log('datadatadatadata', data);
|
||||
case 6:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee);
|
||||
}))();
|
||||
},
|
||||
// 微信支付的实际方法
|
||||
handleWxPay: function handleWxPay(obj) {
|
||||
var _this3 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
||||
var _this4 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
|
||||
var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
return _regenerator.default.wrap(function _callee3$(_context3) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
_this = _this3; // 拿到签名
|
||||
if (!_this4.user.TEST_MEMBER) {
|
||||
_context3.next = 4;
|
||||
break;
|
||||
}
|
||||
// 因为是内部会员 跳过支付 所以 直接跳转 且给成长值
|
||||
_this4.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT);
|
||||
uni.redirectTo({
|
||||
url: "/pages/order/orderFoodDetail/index?orderInternal=".concat(obj.SALEBILL_ID)
|
||||
});
|
||||
return _context3.abrupt("return");
|
||||
case 4:
|
||||
_this = _this4; // 拿到签名
|
||||
mchid = "1672298991";
|
||||
timeStamp = Math.ceil(new Date().getTime() / 1000);
|
||||
nonceStr = Math.random().toString(36).substring(2, 8);
|
||||
@ -605,10 +649,10 @@ var _default = {
|
||||
parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n",
|
||||
provinceCode: _this.provinceCode || "530000"
|
||||
};
|
||||
_context2.next = 11;
|
||||
return _this3.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 11:
|
||||
data = _context2.sent;
|
||||
_context3.next = 15;
|
||||
return _this4.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 15:
|
||||
data = _context3.sent;
|
||||
console.log("data3213123", data.Result_Data);
|
||||
Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
|
||||
AuthorizationStr = "WECHATPAY2-SHA256-RSA2048 ".concat(Authorization);
|
||||
@ -624,11 +668,11 @@ var _default = {
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
success: function () {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {
|
||||
var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
|
||||
var paySign, reqSign, data;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
console.log(res.data.prepay_id);
|
||||
_this.text = "request success";
|
||||
@ -636,10 +680,10 @@ var _default = {
|
||||
reqSign = {
|
||||
parameters: "wxee018fb96955552a\n" + timeStamp + "\n" + nonceStr + "\nprepay_id=" + res.data.prepay_id + "\n"
|
||||
};
|
||||
_context.next = 6;
|
||||
_context2.next = 6;
|
||||
return _this.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 6:
|
||||
data = _context.sent;
|
||||
data = _context2.sent;
|
||||
paySign = data.Result_Data;
|
||||
wx.requestPayment({
|
||||
timeStamp: timeStamp.toString(),
|
||||
@ -650,6 +694,7 @@ var _default = {
|
||||
total_fee: Number(_this.orderAmount) * 100 || 1,
|
||||
success: function success(res) {
|
||||
console.log("res", res);
|
||||
_this.handleUpdateOrderGrowth(obj.SALEBILL_ID, obj.PAY_AMOUNT);
|
||||
},
|
||||
fail: function fail(res) {
|
||||
console.log("fail", res);
|
||||
@ -663,10 +708,10 @@ var _default = {
|
||||
});
|
||||
case 9:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
return _context2.stop();
|
||||
}
|
||||
}
|
||||
}, _callee);
|
||||
}, _callee2);
|
||||
}));
|
||||
function success(_x) {
|
||||
return _success.apply(this, arguments);
|
||||
@ -674,12 +719,12 @@ var _default = {
|
||||
return success;
|
||||
}()
|
||||
});
|
||||
case 17:
|
||||
case 21:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
return _context3.stop();
|
||||
}
|
||||
}
|
||||
}, _callee2);
|
||||
}, _callee3);
|
||||
}))();
|
||||
},
|
||||
// 去支付
|
||||
@ -877,51 +922,51 @@ var _default = {
|
||||
this.time = now;
|
||||
},
|
||||
handleGetServerPart: function handleGetServerPart() {
|
||||
var _this4 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
|
||||
var req, detail, detailObj;
|
||||
return _regenerator.default.wrap(function _callee3$(_context3) {
|
||||
while (1) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
_this4.isLoading = true;
|
||||
req = {
|
||||
ServerpartId: _this4.SERVERPART_ID
|
||||
};
|
||||
_context3.next = 4;
|
||||
return _this4.$api.$get("/CommercialApi/BaseInfo/GetServerpartInfo", req);
|
||||
case 4:
|
||||
detail = _context3.sent;
|
||||
detailObj = detail.Result_Data;
|
||||
_this4.handleGetDistance(detailObj);
|
||||
_this4.isLoading = false;
|
||||
case 8:
|
||||
case "end":
|
||||
return _context3.stop();
|
||||
}
|
||||
}
|
||||
}, _callee3);
|
||||
}))();
|
||||
},
|
||||
handleGetDistance: function handleGetDistance(obj) {
|
||||
var _this5 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var _this, key, origin, destination, url;
|
||||
var req, detail, detailObj;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
_this5.isLoading = true;
|
||||
req = {
|
||||
ServerpartId: _this5.SERVERPART_ID
|
||||
};
|
||||
_context4.next = 4;
|
||||
return _this5.$api.$get("/CommercialApi/BaseInfo/GetServerpartInfo", req);
|
||||
case 4:
|
||||
detail = _context4.sent;
|
||||
detailObj = detail.Result_Data;
|
||||
_this5.handleGetDistance(detailObj);
|
||||
_this5.isLoading = false;
|
||||
case 8:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4);
|
||||
}))();
|
||||
},
|
||||
handleGetDistance: function handleGetDistance(obj) {
|
||||
var _this6 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
|
||||
var _this, key, origin, destination, url;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
case 0:
|
||||
// uni.showLoading({
|
||||
// title: "计算预计时间...",
|
||||
// });
|
||||
_this5.isLoading = true;
|
||||
_this = _this5;
|
||||
_this6.isLoading = true;
|
||||
_this = _this6;
|
||||
key = "6e96a801bcea5290d3dcbf100358a6b3"; // 在高德开发者平台申请
|
||||
// 出发点
|
||||
origin = "".concat(_this5.seat.longitude, ",").concat(_this5.seat.latitude); // 目的地
|
||||
origin = "".concat(_this6.seat.longitude, ",").concat(_this6.seat.latitude); // 目的地
|
||||
destination = "".concat(obj.SERVERPART_X, ",").concat(obj.SERVERPART_Y);
|
||||
url = "https://restapi.amap.com/v3/direction/driving?key=".concat(key, "&origin=").concat(origin, "&destination=").concat(destination, "&strategy=20&extensions=all");
|
||||
_context4.next = 8;
|
||||
_context5.next = 8;
|
||||
return uni.request({
|
||||
url: url,
|
||||
success: function success(res) {
|
||||
@ -946,8 +991,8 @@ var _default = {
|
||||
console.log("day", day);
|
||||
console.log("hour", hour);
|
||||
console.log("min", min);
|
||||
_this5.arriveTime = "".concat(y, "-").concat(m, "-").concat(day, " ").concat(hour, ":").concat(min);
|
||||
console.log('this.arriveTime', _this5.arriveTime);
|
||||
_this6.arriveTime = "".concat(y, "-").concat(m, "-").concat(day, " ").concat(hour, ":").concat(min);
|
||||
console.log('this.arriveTime', _this6.arriveTime);
|
||||
_this.beExpectedTo = "".concat(nowDay < day ? day - nowDay === 1 ? '次日' : "".concat(day - nowDay, "\u5929\u540E") : '').concat(hour < 10 ? "0" + hour : hour, ":").concat(min < 10 ? "0" + min : min);
|
||||
}
|
||||
},
|
||||
@ -955,13 +1000,13 @@ var _default = {
|
||||
});
|
||||
case 8:
|
||||
// uni.hideLoading();
|
||||
_this5.isLoading = false;
|
||||
_this6.isLoading = false;
|
||||
case 9:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
return _context5.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4);
|
||||
}, _callee5);
|
||||
}))();
|
||||
},
|
||||
// 获取用户当前位置
|
||||
@ -973,11 +1018,11 @@ var _default = {
|
||||
altitude: true,
|
||||
isHighAccuracy: true,
|
||||
success: function () {
|
||||
var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
|
||||
var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(res) {
|
||||
var seatInfo;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
return _regenerator.default.wrap(function _callee6$(_context6) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
switch (_context6.prev = _context6.next) {
|
||||
case 0:
|
||||
seatInfo = {
|
||||
latitude: res.latitude,
|
||||
@ -990,10 +1035,10 @@ var _default = {
|
||||
_this.isLoading = false;
|
||||
case 6:
|
||||
case "end":
|
||||
return _context5.stop();
|
||||
return _context6.stop();
|
||||
}
|
||||
}
|
||||
}, _callee5);
|
||||
}, _callee6);
|
||||
}));
|
||||
function success(_x2) {
|
||||
return _success2.apply(this, arguments);
|
||||
@ -1001,19 +1046,19 @@ var _default = {
|
||||
return success;
|
||||
}(),
|
||||
fail: function () {
|
||||
var _fail = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(err) {
|
||||
return _regenerator.default.wrap(function _callee6$(_context6) {
|
||||
var _fail = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(err) {
|
||||
return _regenerator.default.wrap(function _callee7$(_context7) {
|
||||
while (1) {
|
||||
switch (_context6.prev = _context6.next) {
|
||||
switch (_context7.prev = _context7.next) {
|
||||
case 0:
|
||||
console.log("err", err);
|
||||
_this.isLoading = false;
|
||||
case 2:
|
||||
case "end":
|
||||
return _context6.stop();
|
||||
return _context7.stop();
|
||||
}
|
||||
}
|
||||
}, _callee6);
|
||||
}, _callee7);
|
||||
}));
|
||||
function fail(_x3) {
|
||||
return _fail.apply(this, arguments);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user