服务卡项支付的优化

yvan.ni
1 parent a2230796
Showing 3 changed files with 123 additions and 28 deletions
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2_pre.js
@@ -122,6 +122,8 @@ Page({
         same_ok:1,  //同城配送按钮控制
         bconfig: null,
         showFold:true,
+
+        is_wfk:0,  //-- 是不是服务卡项的购买 --
       },
  
  
@@ -154,6 +156,10 @@ Page({
         if (t.order_id) this.data.order_id = t.order_id;
         if (t.order_sn) this.data.order_sn = t.order_sn;
  
+        if(t.is_wfk){
+            this.data.is_wfk=1;
+        }
+
         wx.setNavigationBarTitle({ title: "订单详情", })
         var th = this;
         getApp().getConfig2(function (e) {
@@ -211,8 +217,12 @@ Page({
         }else{
  
             console.log('onshow-3333');
+            let o_list="/pages/user/order_list/order_list";
+            if(this.data.is_fwk){
+                o_list='/pages/user/order_list/order_list?index=2&tabindex=1';
+            }
             //-- 富友支付的 --
-            var fy= ut.fy_back("/pages/user/order_list/order_list",1);
+            var fy= ut.fy_back(o_list,1);
             if(fy) return false;
             util_pay.set_fir();
  
@@ -223,8 +233,20 @@ Page({
                 console.log(th.data.ok_order_sn);
  
                 if(!th.data.ok_order_sn) return false;
-                getApp().request.promiseGet("/api/weshop/order/page",
-                    {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{
+
+                let ord_url='';
+                let ord_req={};
+                //-- 如果是服务卡项的时候 --
+                if(th.data.is_fwk){
+                    ord_url="/api/weshop/recharge/user/page";
+                    ord_req={store_id:os.stoid,rder_sn:th.data.ok_order_sn,user_id:getApp().globalData.user_id};
+                }else{
+                    ord_url="/api/weshop/order/page";
+                    ord_req={store_id:os.stoid,parent_sn:th.data.ok_order_sn};
+                }
+
+                getApp().request.promiseGet(ord_url,
+                    {data:ord_req}).then(res=>{
                     if(ut.ajax_ok(res)){
  
                         console.log('onshow-444');
@@ -476,6 +498,11 @@ Page({
             th = this;
  
  
+        if(this.data.is_fwk){
+            get_buy_card(ord);
+            return false;
+        }
+
         if (o_sn) {
             //获取order信息根据订单编号order_sn
             await getApp().request.promiseGet("/api/weshop/order/page", {
@@ -492,6 +519,8 @@ Page({
                 order = res.data.data;
             });
         }
+
+
         //---获取订单从表---
         await getApp().request.promiseGet("/api/weshop/ordergoods/page", {
             data: {
@@ -793,8 +822,24 @@ Page({
         }
     },
  
+    async get_buy_card(ord){
+
+
+        let url = '/api/weshop/recharge/user/page'
+        let data = {
+            store_id: app.globalData.setting.stoid,
+            user_id: this.data.userInfo.user_id,
+            order_id: ord,
+        };
+
+        // 请求数据
+        let res= await app.promiseGet(url, {
+            data: data,
+        });
+
+    },
  
-   async calculatePrice2() {
+    async calculatePrice2() {
         var th = this;
         if (!this.data.pre_arr) return false;
 		th.setData({ show_submit: 0,disabled_btn:0 })
@@ -133,6 +133,8 @@ Page({
         appoint_pick_keyid: '',
         bconfig:null,
         showFold:true,
+
+        is_fwk:0  //-- 判断是不是服务卡项订单 --
       },
  
  
@@ -213,19 +215,39 @@ Page({
             if(fy) return false;
             util_pay.set_fir();
  
+            let error_url="/pages/user/order_list/order_list";
+            let ok_url="/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn;
+
+            if(th.data.is_fwk){
+                err_url='/pages/user/order_list/order_list?index=2&tabindex=1';
+                ok_url="/pages/payment/pay_success/pay_success?type=3&order_sn=" + this.data.ok_order_sn;
+            }
+
             //-- 通联的第三方支付的返回优化 --
-            ut.is_pay_ok(th.data.ok_order_sn,"/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn,
-                "/pages/user/order_list/order_list",function (){
+            ut.is_pay_ok(th.data.ok_order_sn,ok_url,err_url,function (){
                 if(!th.data.ok_order_sn) return false;
-                getApp().request.promiseGet("/api/weshop/order/page",
-                    {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{
+
+                let ord_url='';
+                let ord_req={};
+
+                //如果是服务卡项的时候
+                if(th.data.is_fwk){
+                    ord_url="/api/weshop/recharge/user/page";
+                    ord_req={store_id:os.stoid,rder_sn:th.data.ok_order_sn,user_id:getApp().globalData.user_id};
+                }else{
+                    ord_url="/api/weshop/order/page"
+                    ord_req={store_id:os.stoid,parent_sn:th.data.ok_order_sn};
+                }
+
+                getApp().request.promiseGet(ord_url,
+                    {data:ord_req}).then(res=>{
                     if(ut.ajax_ok(res)){
                         var item=res.data.data.pageData[0];
                         if(item.pay_status==1){
                             //支付支付，返回首页
                             ut.m_toast('支付成功');
                             setTimeout(()=>{
-                                getApp().re_to("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn);
+                                getApp().re_to(ok_url);
                             },1000)
  
                         }else{
@@ -58,6 +58,8 @@ Page({
     is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
     bconfig: null,
     showFold:true,
+
+    is_fwk:0,  //判断服务卡项的类型
   },
   onReady() {
     setTimeout(() => {
@@ -324,8 +326,15 @@ Page({
   //----------子页返回父页触发----------
   onShow: function () {
  
-    var fy=ut.fy_back("/pages/user/order_list/order_list",1);
+
+    let o_list="/pages/user/order_list/order_list";
+    if(this.data.is_fwk){
+       o_list='/pages/user/order_list/order_list?index=2&tabindex=1';
+    }
+
+    var fy=ut.fy_back(o_list,1);
     if(fy) return false;
+
     util_pay.set_fir();
     var th = this;
     //判断是不是第一次进入
@@ -336,29 +345,48 @@ Page({
       //-- 支付完成后的跳转的时间 --
       var ok_url = "/packageC/pages/presell/cart/cart?order_sn=" +this.data.ok_order_sn;
       var err_url="/pages/user/order_list/order_list";
+      if(this.data.is_fwk){
+        err_url='/pages/user/order_list/order_list?index=2&tabindex=1';
+      }
+
       //-- 通联的第三方支付的返回优化 --
       ut.is_pay_ok(th.data.ok_order_sn,ok_url,err_url,function (){
         if(!th.data.ok_order_sn) return false;
-        getApp().request.promiseGet("/api/weshop/order/page",
-            {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{
-            if(ut.ajax_ok(res)){
-              var item=res.data.data.pageData[0];
-              if(item.pay_time){
-                //支付支付，返回首页
-                ut.m_toast('支付成功');
-                setTimeout(()=>{
-                  getApp().re_to(ok_url);
-                },1000)
-
-              }else{
-                //支付支付，返回首页
-                ut.m_toast('支付失败');
-                setTimeout(()=>{
-                  getApp().re_to(err_url);
-                },1000)
-              }
+
+        let ord_url='';
+        let ord_req={};
+
+        //如果是服务卡项的时候
+        if(th.data.is_fwk){
+          ord_url="/api/weshop/recharge/user/page";
+          ord_req={store_id:os.stoid,rder_sn:th.data.ok_order_sn,user_id:getApp().globalData.user_id};
+        }else{
+          ord_url="/api/weshop/order/page";
+          ord_req={store_id:os.stoid,parent_sn:th.data.ok_order_sn};
+        }
+
+        getApp().request.promiseGet(ord_url,
+            {data:ord_req}).then(res=>{
+          if(ut.ajax_ok(res)){
+            var item=res.data.data.pageData[0];
+            if(item.pay_time){
+              //支付支付，返回首页
+              ut.m_toast('支付成功');
+              setTimeout(()=>{
+                getApp().re_to(ok_url);
+              },1000)
+
+            }else{
+              //支付支付，返回首页
+              ut.m_toast('支付失败');
+              setTimeout(()=>{
+                getApp().re_to(err_url);
+              },1000)
             }
+          }
         })
+
+
       });
     }