Commit 26ab06a3 by 程默

f

parent 3c2267d6
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"es6": true, "es6": true,
"enhance": true, "enhance": true,
"postcss": true, "postcss": true,
"preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"coverView": true, "coverView": true,
...@@ -16,14 +17,22 @@ ...@@ -16,14 +17,22 @@
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": true,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"bundle": true, "bundle": false,
"useIsolateContext": true,
"useCompilerModule": true, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
}, },
"miniprogramRoot": "dist/wx/", "miniprogramRoot": "dist/wx/",
"compileType": "miniprogram", "compileType": "miniprogram",
...@@ -33,15 +42,12 @@ ...@@ -33,15 +42,12 @@
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"condition": { "condition": {
"search": { "search": {
"current": -1,
"list": [] "list": []
}, },
"conversation": { "conversation": {
"current": -1,
"list": [] "list": []
}, },
"plugin": { "plugin": {
"current": -1,
"list": [] "list": []
}, },
"game": { "game": {
...@@ -49,11 +55,9 @@ ...@@ -49,11 +55,9 @@
"list": [] "list": []
}, },
"gamePlugin": { "gamePlugin": {
"current": -1,
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": -1,
"list": [ "list": [
{ {
"id": 0, "id": 0,
......
<template> <template>
<div class="domain">{{message}}</div> <div class="domain">{{ message }}</div>
</template> </template>
<script> <script>
...@@ -15,46 +15,54 @@ export default { ...@@ -15,46 +15,54 @@ export default {
shopmixid: "", shopmixid: "",
openId: "", openId: "",
options: {}, options: {},
options_orderType:'', options_orderType: "",
// 购买会员卡新页面 // 购买会员卡新页面
options_isCard:'', options_isCard: "",
options_isCardTitle:'', options_isCardTitle: "",
batchNumber : '', batchNumber: "",
totalMoney : '' totalMoney: "",
scene: "", //sso
backUrl: "",
}; };
}, },
onLoad(options) { onLoad(options) {
wx.showLoading({ wx.showLoading({
title: "加载中" title: "加载中",
}); });
Object.assign(this.$data, this.$options.data()); //mpvue 的混合周期 使用小程序生命周期数据未初始化 Object.assign(this.$data, this.$options.data()); //mpvue 的混合周期 使用小程序生命周期数据未初始化
console.log("onload//",options); console.log("onload//", options);
if(options.batchNumber){ if (options.batchNumber) {
let ordercode = JSON.parse(options.ordercode) let ordercode = JSON.parse(options.ordercode);
ordercode.orderSn = '' ordercode.orderSn = "";
ordercode.batchNumber = options.batchNumber ordercode.batchNumber = options.batchNumber;
this.options = ordercode this.options = ordercode;
this.batchNumber = ordercode.batchNumber this.batchNumber = ordercode.batchNumber;
console.log(JSON.parse(options.ordercode).orderSn) console.log(JSON.parse(options.ordercode).orderSn);
if(JSON.parse(options.ordercode).orderSn){ if (JSON.parse(options.ordercode).orderSn) {
this.totalMoney = Number(JSON.parse(options.ordercode).orderSn.totalAmount).toFixed(2) this.totalMoney = Number(
}else{ JSON.parse(options.ordercode).orderSn.totalAmount
this.totalMoney = Number(JSON.parse(options.ordercode).totalAmount).toFixed(2) ).toFixed(2);
} else {
this.totalMoney = Number(
JSON.parse(options.ordercode).totalAmount
).toFixed(2);
} }
// } // }
console.log(this.totalMoney,'totalMoney') console.log(this.totalMoney, "totalMoney");
}else{ } else {
this.options = JSON.parse(options.ordercode); this.options = JSON.parse(options.ordercode);
options.scene && (this.scene = options.scene);
options.backUrl && (this.backUrl = options.backUrl);
} }
this.options_orderType = options.orderType; this.options_orderType = options.orderType;
this.options_isCard= options.isCard; this.options_isCard = options.isCard;
this.options_isCardTitle= options.isCardTit; this.options_isCardTitle = options.isCardTit;
if(options.sessionid){ if (options.sessionid) {
try { try {
wx.setStorageSync('sessionid', options.sessionid) wx.setStorageSync("sessionid", options.sessionid);
} catch (e) { } } catch (e) {}
} }
let that = this; let that = this;
wx.getStorage({ wx.getStorage({
...@@ -67,39 +75,45 @@ export default { ...@@ -67,39 +75,45 @@ export default {
console.log("支付开始", that.options); console.log("支付开始", that.options);
that.toPay(); that.toPay();
}, },
fail(err){ fail(err) {
console.log('获取err',err) console.log("获取err", err);
} },
}); });
}, },
methods: { methods: {
toPay() { toPay() {
wxPay wxPay
.to_wx_pay(this.options) .to_wx_pay(this.options)
.then(res => { .then((res) => {
wx.hideLoading(); wx.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
let payData = JSON.parse(res.data.data); let payData = JSON.parse(res.data.data);
console.log('wxPay',res.data) console.log("wxPay", res.data);
payData.success = res => { payData.success = (res) => {
console.log("支付成功", res, this.options); console.log("支付成功", res, this.options);
this.message = "支付成功"; this.message = "支付成功";
const orderSn = this.options.orderSn; const orderSn = this.options.orderSn;
let vm = this let vm = this;
try { try {
const subscribeMessageObj = this.$store.state
const subscribeMessageObj = this.$store.state.subscribeMessageObj; .subscribeMessageObj;
if (subscribeMessageObj && Object.keys(subscribeMessageObj).length > 0) { if (
subscribeMessageObj &&
Object.keys(subscribeMessageObj).length > 0
) {
// TODO 小程序订阅消息埋点 // TODO 小程序订阅消息埋点
const tmplIds = []; const tmplIds = [];
for (var key in subscribeMessageObj) { for (var key in subscribeMessageObj) {
// 送礼订单 // 送礼订单
if (this.options_orderType == 5 && (key == 'gift_be_expire' || key == 'gift_draw')) { if (
this.options_orderType == 5 &&
(key == "gift_be_expire" || key == "gift_draw")
) {
tmplIds.push(subscribeMessageObj[key]); tmplIds.push(subscribeMessageObj[key]);
} }
// 订单发货 // 订单发货
if (key == 'order_shipment') { if (key == "order_shipment") {
tmplIds.push(subscribeMessageObj[key]); tmplIds.push(subscribeMessageObj[key]);
} }
} }
...@@ -108,70 +122,76 @@ export default { ...@@ -108,70 +122,76 @@ export default {
wx.requestSubscribeMessage({ wx.requestSubscribeMessage({
tmplIds: tmplIds, tmplIds: tmplIds,
success(res) { success(res) {
fn(vm) fn(vm);
console.log("message success response: ", res); console.log("message success response: ", res);
}, },
fail(res) { fail(res) {
fn(vm) fn(vm);
console.log("message fail response: ", res) console.log("message fail response: ", res);
} },
}) });
}else{ } else {
fn(vm) fn(vm);
} }
}else{ } else {
console.log('来这里了') console.log("来这里了");
fn(this) fn(this);
} }
} catch (err) { } catch (err) {
console.error("subscribeMessage-err", err); console.error("subscribeMessage-err", err);
} }
function fn(_this){ function fn(_this) {
// _this.message = "支付成功"; // _this.message = "支付成功";
if(!_this.options_isCard){ if (!_this.options_isCard) {
let query; let query;
if(_this.batchNumber){ if (_this.batchNumber) {
query = { query = {
orderSn: _this.options.orderSn, orderSn: _this.options.orderSn,
batchNumber : _this.batchNumber, batchNumber: _this.batchNumber,
multiMerchantsFlag : 1, multiMerchantsFlag: 1,
totalMoney : _this.totalMoney totalMoney: _this.totalMoney,
}; };
}else{ } else {
query = { query = {
orderSn: _this.options.orderSn orderSn: _this.options.orderSn,
}; };
} }
// sso场景(跳转第三方url)
if (_this.scene == "sso") {
wx.redirectTo({
url: `../wxArticle/main?from=sso&link=${_this.backUrl}`,
});
return;
}
wx.redirectTo({ wx.redirectTo({
url: `../index/main?from=wxPay&backpath=/pay/paySuccess&params=${JSON.stringify( url: `../index/main?from=wxPay&backpath=/pay/paySuccess&params=${JSON.stringify(
query query
)}` )}`,
}); });
}else{ } else {
let query = { let query = {
cardTitle: _this.options_isCardTitle cardTitle: _this.options_isCardTitle,
} };
wx.redirectTo({ wx.redirectTo({
url: `../index/main?from=wxPay&backpath=/pay/payCardSuccess&params=${JSON.stringify( url: `../index/main?from=wxPay&backpath=/pay/payCardSuccess&params=${JSON.stringify(
query query
)}` )}`,
}); });
} }
} }
}; };
payData.fail = res => { payData.fail = (res) => {
console.log("支付失败", res, this.options.orderSn); console.log("支付失败", res, this.options.orderSn);
this.message = "支付失败"; this.message = "支付失败";
if (res.errMsg='requestPayment:fail cancel') { if ((res.errMsg = "requestPayment:fail cancel")) {
wxPay.cancelPayment(this.options.orderSn).then(() => { wxPay.cancelPayment(this.options.orderSn).then(() => {
console.log("取消成功"); console.log("取消成功");
}); });
} }
this.toPage(); this.toPage();
}; };
payData.complete = res => { payData.complete = (res) => {
console.log("支付completa", res, this.options.orderSn); console.log("支付completa", res, this.options.orderSn);
// if (res.errMsg == "requestPayment:fail cancel") { // if (res.errMsg == "requestPayment:fail cancel") {
// console.log("支付取消", this.options); // console.log("支付取消", this.options);
...@@ -184,33 +204,47 @@ export default { ...@@ -184,33 +204,47 @@ export default {
wx.showToast({ title: res.data.msg, icon: "none" }); wx.showToast({ title: res.data.msg, icon: "none" });
} }
}) })
.catch(err => { .catch((err) => {
wx.showToast({ title: res.data.msg, icon: "none" }); wx.showToast({ title: res.data.msg, icon: "none" });
}); });
}, },
toPage() { toPage() {
console.log('支付失败来这里了',this.batchNumber) console.log(
if(this.batchNumber){ "支付失败来这里了",
let query = { this.batchNumber,
multiMerchantsFlag : 1 this.scene == "sso",
this.scene
);
if (this.scene == "sso") {
//sso模式(嵌入第三方)
wx.redirectTo({
url: `../wxArticle/main?from=sso&link=${this.backUrl}`,
});
return;
} }
if (this.batchNumber) {
let query = {
multiMerchantsFlag: 1,
};
wx.redirectTo({ wx.redirectTo({
url: `../index/main?from=wxPay&backpath=/order/orderList&params=${JSON.stringify(query)}` url: `../index/main?from=wxPay&backpath=/order/orderList&params=${JSON.stringify(
query
)}`,
}); });
return return;
} }
let query = { let query = {
orderSn: this.options.orderSn, orderSn: this.options.orderSn,
payList: true, payList: true,
orderListToorderDetail: true orderListToorderDetail: true,
}; };
wx.redirectTo({ wx.redirectTo({
url: `../index/main?from=wxPay&backpath=/order/orderDetail&params=${JSON.stringify( url: `../index/main?from=wxPay&backpath=/order/orderDetail&params=${JSON.stringify(
query query
)}` )}`,
}); });
} },
} },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment