wxd / MShopWeApp

Commit 8e393defd7e8f2a0707d7133ffa43e0b57077f5f

Authored by 后端开发-许程
2 parents 47ef3956 34e4837b

Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

Inline Side-by-side
Showing 2 changed files with 40 additions and 8 deletions
pages/cart/cart2/cart2.js
  View file @8e393de
... ... @@ -2,6 +2,7 @@ var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
2 2 s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
3 3 var oo=t.globalData.setting;
4 4 var regeneratorRuntime = require('../../../utils/runtime.js');
  5 +var util_pay = require("../../../utils/pay.js");
5 6  
6 7 Page({
7 8 data: {
... ... @@ -981,9 +982,24 @@ Page({
981 982 //要进行判断，如果是用微信支付，就要跳转到支付界面
982 983 if (order_amount > 0) {
983 984 th.setData({ isclose: 0 });
984   - void e.jumpToCart4({
985   - order_sn: data.data,
986   - }, 1);
  985 + //void e.jumpToCart4({
  986 + // order_sn: data.data,
  987 + //}, 1);
  988 + util_pay.pay(data.data, function() {
  989 + app.my_warnning("支付成功",1,th);
  990 + setTimeout(function () {
  991 + wx.navigateTo({
  992 + url: "/pages/user/order_list/order_list"
  993 + })
  994 + },1000)
  995 +
  996 + }, function () {
  997 + //支付失败
  998 + setTimeout(function () {
  999 + wx.navigateBack({ delta: 1 })
  1000 + },1000)
  1001 + },oo.stoid);
  1002 +
987 1003 } else {
988 1004 var dd = {
989 1005 parent_sn: data.data,
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @8e393de
... ... @@ -2,6 +2,7 @@ var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
2 2 s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
3 3 var oo=t.globalData.setting;
4 4 var regeneratorRuntime = require('../../../utils/runtime.js');
  5 +var util_pay = require("../../../utils/pay.js");
5 6  
6 7 Page({
7 8 data: {
... ... @@ -457,11 +458,26 @@ Page({
457 458 })
458 459 //要进行判断，如果是用微信支付，就要跳转到支付界面
459 460 if (order_amount > 0) {
460   - th.setData({ isclose: 0 });
461   - void e.jumpToCart4({
462   - order_sn: data.data,
463   - type:1,
464   - }, 1);
  461 + th.setData({ isclose: 0 });
  462 + //void e.jumpToCart4({
  463 + // order_sn: data.data,
  464 + // type:1,
  465 + // }, 1);
  466 + util_pay.pay(data.data, function() {
  467 + app.my_warnning("支付成功",1,th);
  468 + setTimeout(function () {
  469 + wx.navigateTo({
  470 + url: "/pages/user/order_list/order_list"
  471 + })
  472 + },1000)
  473 + }, function () {
  474 + //支付失败
  475 + setTimeout(function () {
  476 + wx.navigateBack({ delta: 1 })
  477 + },1000)
  478 +
  479 + },oo.stoid,1);
  480 +
465 481 } else {
466 482 var dd = {
467 483 parent_sn: data.data,
... ...