From a223079631d6574381eb238f5179c12477838750 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 30 Oct 2023 09:15:31 +0800
Subject: [PATCH] 预售服务卡的优化

---
 packageC/pages/presell/cardInfo/goodsInfo.js |  3 +++
 packageC/pages/presell/cart/cart2_pre.js     | 27 ++++++++-------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index b525d29..a9958c0 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -730,6 +730,7 @@ Page({
                             'service_sn':t.data.data.serviceSn,
                             'goods_sn':t.data.data.serviceSn,
                             'listServiceVideos': t.data.data.listServiceVideos,
+                            'erpItemID': t.data.data.erpItemID,
                         }
 
                         that.setData({
@@ -916,6 +917,8 @@ Page({
                 goods_name: o.goods_name,
                 goods_sn: o.goods_sn,
                 presell_list_id: th.data.presellList.id,
+                erpItemID: o.erpItemID,
+                keyid: th.data.sto_sele_keyid,
             };
 
             //---是不是从收藏夹出来的---
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index cced98a..0dfd254 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -823,14 +823,14 @@ Page({
     var th = this,pdata = new Array();
 
     var item = {
-      'user_id': to.globalData.user_id,
+      'user_id': getApp().globalData.user_id,
       'account': th.data.formData.order_amount, //使用余额
-      'store_id': oo.stoid, //商家
+      'store_id': os.stoid, //商家
       'list': new Array(),
     };
 
     //判断是不是购物车购买还是立即购买
-    var gg = getApp().globalData.service_now;
+    var gg = app.get_b_now();
     if (!gg.pick_id) {
       getApp().showWarning("未找到门店");
       return false;
@@ -839,7 +839,7 @@ Page({
       'card_id': th.data.bn_goods.id,
       'itemid': th.data.bn_goods.erpItemID,
       'qty': gg.goods_num,
-      'price': th.data.bn_goods.money,
+      'price': th.data.bn_goods.shop_price,
       // 'price': th.data.formData.order_amount,
       'pickup_id': gg.pick_id,
       'pickup_keyid': gg.keyid,
@@ -847,10 +847,6 @@ Page({
       'prom_id': this.data.postdata.prom_id,     //促销活动id
     };
 
-    if(this.data.postdata.prom_type == 1) {
-      goods.price = this.data.postdata.prom_price;
-    };
-
     if(getApp().globalData.skinface_id){
       goods.skinface_id=getApp().globalData.skinface_id;
     }
@@ -865,7 +861,7 @@ Page({
       goods.guide_id = gg.guide_id;
       goods.guide_type = gg.guide_type;
       //调用接口判断是不是会员
-      await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(
+      await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + os.stoid + "/" + gg.guide_id, {}).then(
           res => {
             if (res.data.code == 0) {
               goods.guide_name = res.data.data.salesman;
@@ -888,7 +884,7 @@ Page({
       title: "加载中"
     });
     wx.request({
-      url: oo.url + '/api/weshop/recharge/saveRecharge',
+      url: os.url + '/api/weshop/recharge/saveRecharge',
       data: str,
       method: 'POST',
       header: {
@@ -901,14 +897,7 @@ Page({
           var data = res.data;
           if (data.code == 0) {
             th.data.order_id = data.data.order_id;
-            // console.log('myyyyyyyyyyyyyyyyyy', data.data);
-            if (th.data.is_cart) {
-              var list = th.data.cartlist_y;
-              for (var i = 0; i < list.length; i++) {
-                //删除购物车
-                a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {});
-              }
-            }
+
             var order_amount = pdata.account;
             //要进行判断，如果是用微信支付，就要跳转到支付界面
             if (order_amount > 0) {
@@ -920,7 +909,7 @@ Page({
               t_pay.pay(
                   {
                     parentSn: data.data.order_sn,
-                    store_id: oo.stoid
+                    store_id: os.stoid
                   },function (){
                     wx.showToast({
                       title: '购买成功',
--
libgit2 0.21.4