diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index b73299f..e9a84ed 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -392,7 +392,10 @@ Component({
item.cardprice1 = val.cardprice1;
item.cardprice2 = val.cardprice2;
item.cardprice3 = val.cardprice3;
-
+
+ if(val.prom_price) item.prom_price = val.prom_price;
+ if(val.prom_integral) item.prom_integral = val.prom_integral;
+
prom_id = val.prom_id;
var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index a7553b1..37b1a76 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -43,9 +43,13 @@
{{item.goods_name}}
-
- ￥{{item.prom_price}}
- ￥{{item.market_price}}
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
@@ -187,8 +191,12 @@
{{item.goods_name}}
-
- ￥{{item.prom_price}}
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
￥{{item.market_price}}
@@ -330,8 +338,12 @@
{{item.goods_name}}
-
- ￥{{item.prom_price}}
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
￥{{item.market_price}}
@@ -473,96 +485,114 @@
{{item.goods_name}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
销量：{{item.sales_sum}}件
@@ -623,8 +653,12 @@
{{aitem.goods_name}}
-
- ￥{{aitem.prom_price}}
+
+
+ {{aitem.prom_integral}}
+ +
+ ￥{{aitem.prom_price}}
+
￥{{aitem.market_price}}
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 85c9718..7352331 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -12,10 +12,12 @@
{{item.goods_name}}
-
-
+
+
+ {{item.prom_integral}}积分
+ +
-
+
￥
{{item.prom_price}}
diff --git a/pages/cart/cart2_inte/c_filter.wxs b/pages/cart/cart2_inte/c_filter.wxs
new file mode 100644
index 0000000..7216131
--- /dev/null
+++ b/pages/cart/cart2_inte/c_filter.wxs
@@ -0,0 +1,67 @@
+var filters = {
+ toFix:function(val,count){
+ return val.toFixed(count)
+ },
+ format_time:function(ts,isFull) {
+ var d = getDate(ts*1000)
+ var fm=[d.getFullYear(), d.getMonth()+1, d.getDate()].join('-');
+ if(isFull==1)
+ fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
+ return fm;
+ },
+ setcolor:function(ind){
+ if (ind == 0 || ind ==null) return "red";
+ if(ind==1 ) return "green";
+ if(ind==2) return "blue";
+ if(ind==11) return "green";
+ if(ind==12) return "blue";
+ if(ind==20) return "green";
+ return "";
+ },
+ setbgcolor: function (ind) {
+ if (ind == 0 || ind == null) return "#ffa1b9";
+ if (ind == 1) return "#59e1d2";
+ if (ind == 2) return "#a3bcff";
+ if (ind == 11) return "#59e1d2";
+ if (ind == 12) return "#a3bcff";
+ if (ind == 20) return "#6d87cd";
+ return "";
+ },
+
+ get_type:function(ind){
+ if (ind == 0 || ind == null) return "全场通用";
+ if (ind == 1) return "品牌";
+ if (ind == 2) return "品类";
+ if (ind == 11) return "用途";
+ if (ind == 12) return "分类1";
+ if (ind == 20) return "指定单品";
+ return "";
+ },
+ get_type_card:function(ind){
+ if (ind == 0 || ind == null) return "全场通用";
+ if (ind == 1) return "指定品牌";
+ if (ind == 2) return "指定品类";
+ if (ind == 11) return "指定用途";
+ if (ind == 12) return "指定分类1";
+ if (ind == 20) return "指定单品";
+ return "";
+ },
+ format_huiche:function (text) {
+ if (!text) {
+ return "";
+ }
+ var reg = getRegExp('\\\\n', 'g')
+ return text.replace(reg, '\n')
+ }
+}
+
+module.exports = {
+ toFix: filters.toFix,
+ format_time:filters.format_time,
+ setcolor:filters.setcolor,
+ setbgcolor: filters.setbgcolor,
+ get_type: filters.get_type,
+ get_split_name: filters.get_split_name,
+ get_type_card: filters.get_type_card,
+ format_huiche: filters.format_huiche,
+}
\ No newline at end of file
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
new file mode 100644
index 0000000..ecea0d7
--- /dev/null
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -0,0 +1,1055 @@
+var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
+ s = require("../../../utils/util.js"),ut=s, o = require("../../../utils/md5.js"), to = getApp();
+var oo=t.globalData.setting,os=oo;
+var regeneratorRuntime = require('../../../utils/runtime.js');
+var util_pay = require("../../../utils/pay.js");
+
+Page({
+ data: {
+ url: t.globalData.setting.url,
+ imgUrl: t.globalData.setting.imghost,
+ goods: null,
+ order: null,
+ orderPrices: null,
+ coupons: null,
+ coupon: null,
+ invoiceToggle: !0,
+ payWithUserMoney: !0,
+ payWithPoints: !0,
+ maxWord: 0,
+ enterAddressPage: !1,
+ firstEnter: !0,
+ //页面获取的参数
+ param:null,
+ //提交订单的格式
+ formData: {
+ order_amount:0,//支付金额
+ total_amount:0,//总价
+ all_price:0,//商品卖的总价
+ pay_points: 0,//使用积分
+ user_money: 0,//使用余额
+ couponCode: "",//使用优惠券(多单就用逗号隔开)
+ shipping_price:0,//物流费用
+ },
+
+
+ /*----------------立即购买---------------------*/
+ is_b_now:1, //0是购物车结算 1立即购买
+ bn_goods:null, //立即购买时候的调用商品
+ bn_use_money:0,//是否使用余额
+ bn_exp_type:1, //0是物流 1自提
+ bn_pick:0, //选择的门店
+ bn_pickname: "", //选择的门店名称
+ bn_t_exp_t:0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流
+
+ bn_plus_cut_price:0, //显示等级卡会优惠多少钱
+ /*------------------------*/
+ user_addr:null,//物流
+ userinfo:null, //获取会员
+ /*----------物流选择--------*/
+ wu_arr:null,
+ index:0,
+ w_sele_index:0,
+
+ //判断页面是返回回来的还是 首次进入的
+ isclose:1,
+ //申请提现的金额
+ txmon:0,
+ yuer:0,
+ //提交中，不重复提交
+ is_summit_ing:0,
+
+ disabled:0,
+ open_express:0,//控制选择物流名列表 的属性
+
+ is_express:0, //选中物流的属性
+ expres_name:"", //点击选定
+ is_shipping_code:"",//插入用户默认地址
+ wu_arr_txt:"", //要更新的物流的字段
+
+ //如果是全场包邮了，或者是全场不包邮了，就不要选包邮券
+ is_no_by:{},
+ is_by:{},
+ is_quan_by:{},
+ //--购买赠送的商品--
+ buy_now_gift_goods:null,
+ //--订单优惠--
+ order_prom:{},
+ show_submit:0, //提交按钮变正常显示
+
+ },
+ onLoad: function(t) {
+ wx.setNavigationBarTitle({ title: "填写订单",})
+ var th = this;
+ th.data.param=t;
+ //清空is_pick_up
+ getApp().request.put("/api/weshop/useraddress/updatePickUp", {
+ data: {user_id: getApp().globalData.user_id, is_pickup: 0},
+ success: function (s) {
+ }
+ });
+
+
+ },
+ onUnload: function () { this.setData({ isclose: 1 })},
+ onHide: function () {
+ this.setData({
+ is_no_by:{},
+ is_by:{}
+ })
+ },
+
+ //----------子页返回父页触发----------
+ onShow: function() {
+ var th=this;
+ th.setData({show_submit:0}); //让提交先掩藏
+ th.data.g_cart_q_time=null;
+
+ if (th.data.isclose==0){
+ wx.navigateTo({
+ url: "/pages/index/index/index"
+ })
+
+ }else{
+ this.getuser_addr(function(ie){
+ //地址切换要把包邮券清空
+ if( !th.data.user_addr || !ie || th.data.user_addr.address_id!=ie.address_id){
+ var using_quan=th.data.using_quan;
+ for(var i in using_quan){
+ var item=using_quan[i];
+ if(item.isby==1){
+ var ob={},txt="using_quan["+i+"]";ob[txt]={};
+ th.setData(ob);
+ }
+ }
+
+ }
+
+
+ th.data.prom_goods_map={};
+ th.data.is_summit_ing=0;
+ //更换地址回来要重新调用计算价钱的接口
+ if(!th.data.user_addr || th.data.user_addr.address_id!=ie.address_id){
+ th.setData({user_addr: ie });
+ if (th.data.is_b_now == 1) {
+ if(th.data.bn_goods) {
+ th.setData({add_back:1});
+
+ }
+ }
+ }else{
+ th.setData({user_addr: ie });
+ }
+ var going=0;
+
+ });
+ //--更新默认地址--,看一下是不是跳到地址页面
+ if(!getApp().globalData.is_cart2_old){
+ this.update_code();
+ }else{
+ getApp().globalData.is_cart2_old=0;
+ }
+ }
+
+ //先获取是否有关闭使用优惠券
+ getApp().getConfig2(function (ee) {
+ var json_d = JSON.parse(ee.switch_list);
+ th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
+ th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
+
+ var rank_switch=json_d.rank_switch;
+ var max_price=-1;
+ var show_card=null;
+ var name="";
+ //如果有开等级卡的时候,
+ //因为都是调接口，要返回在计算
+ if(rank_switch==2){
+ //-- 获取所有的等级卡, --
+ getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid,
+ {}).then(res => {
+ if(res.data.code==0){
+ var plusCard = res.data.data;
+ //-- 循环判断，拿到最贵的那张卡 --
+ for(var ih in plusCard){
+ if(plusCard[ih].IsStopBuy == true){ continue; }
+ if(max_price<0){
+ max_price=plusCard[ih].CardFee;
+ name='card'+plusCard[ih]['CorrPrice'];
+ show_card=plusCard[ih];
+ }else{
+ if(max_price0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
+ th.setData({ txmon: su.data.data.summoney, yuer: yuer });
+ }
+ }
+ });
+ },
+
+ //-----获取立即购买的商品信息，入口----
+ get_buy_goods: function (e){
+ var th=this;
+ var gg = to.get_b_now();
+ //--------如果goods_id一样，就是要立即购买-----
+ if(e==gg.goods_id){
+ a.get("/api/weshop/goods/get/" + oo.stoid+"/"+e, {
+ success:async function (t) {
+ var gd = t.data.data;
+ t.data.data.original_img = oo.imghost + t.data.data.original_img;
+ t.data.data['buynum'] = gg.goods_num;
+ var distr_t=0,et=0
+ if (t.data.data.distr_type==0){
+ distr_t = gg.pick_dis;
+ }else{
+ distr_t = t.data.data.distr_type;
+ }
+ switch (distr_t){
+ case 0: et=1; break;
+ case 1: et = 1; break;
+ case 2: et = 0; break;
+ }
+
+ if(th.data.bn_goods) et=th.data.bn_exp_type
+
+ var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
+ if(et==0 && def_exp_code){
+ for(var k=0;k0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){
+ var cut_p= (gg.goods_price-gd[th.data.card_name])*gg.goods_num;
+ th.setData({card_cut_price:cut_p});
+ }
+ }
+
+ switch (gd.prom_type){
+ case 0:
+ case 2:
+ case 3:
+ case 5:
+ case 6:
+ getApp().my_warnning("商品不是积分活动",0,th);
+ wx.navigateBack();
+ break;
+ case 4: //-- 积分购 --
+ getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+ data:{store_id:os.stoid,goods_id:gg.goods_id},
+ success: async function (tt) {
+ if(tt.data.code==0 && tt.data.data && tt.data.data.pageData){
+ var inte_data=tt.data.data.pageData[0];
+ t.data.data.shop_price=inte_data.addmoney;
+ t.data.data.integral=inte_data.integral;
+ th.setData({
+ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind,
+ bn_pick: gg.pick_id, bn_t_exp_t: distr_t,bn_exp_type: et
+ });
+ //计算价格
+ th.calculatePrice2();
+ }else{
+ getApp().my_warnning("商品不是积分活动",0,th);
+ wx.navigateBack();
+ }
+ }
+ });
+ break;
+ }
+ },
+ });
+ }
+ },
+
+ //---------------检查是否有收货地址-------------------
+ checkAddressList: function() {
+ var t = this;
+ return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({
+ title: "请先填写或选择收货地址~",
+ success: function(a) {
+ a.confirm ? t.enterAddressPage() : wx.navigateBack();
+ },
+ fail: function() {
+ wx.navigateBack();
+ }
+ }), !1);
+ },
+ showInvoice: function() {
+ this.setData({
+ invoiceToggle: !this.data.invoiceToggle
+ });
+ },
+ keyUpChangePay1: function(t) {
+ this.setData({
+ payWithUserMoney: !(t.detail.value.length > 0)
+ });
+ },
+ keyUpChangePay2: function(t) {
+ this.setData({
+ payWithPoints: !(t.detail.value.length > 0)
+ });
+ },
+ keyUpChangeNum: function(t) {
+ this.setData({
+ maxWord: t.detail.value.length
+ });
+ },
+
+
+ //---------计算立即购买----------
+ calculatePrice2: function () {
+ var th = this, good = this.data.bn_goods;
+ wx.showLoading({ title:"处理中.",})
+ //-----------计算商品总价--------------
+ var allpice = good.shop_price * good.buynum;
+ var cut_price=0;
+ if(good.prom_type==3 && good.prom_price!==null){
+ cut_price=allpice-good.prom_price;
+ }
+ allpice=parseFloat(allpice).toFixed(2);
+ var txt = "formData.all_price";
+ th.setData({ [txt]: allpice, });
+ if(cut_price){
+ var c_txt="formData.cut_price";
+ th.setData({ [c_txt]: cut_price, });
+ }
+ to.getConfig2(function (ee) {
+ to.getwuliuprice(async function (rs) {
+
+ var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
+ //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮----------
+ if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past!=1 ){
+
+ switch (good['exp_sum_type']) {
+ case 1:
+ //统一运费
+ o_shipping_price += good['uniform_exp_sum']; break;
+ case 2:
+ if (goods_weight < 0) goods_weight = 0;
+ //累积商品重量 每种商品的重量 * 数量
+ goods_weight += good['weight'] * good['buynum'];break;
+ case 3:
+ if (goods_piece < 0) goods_piece = 0;
+ //累积商品数量
+ goods_piece += good['buynum']; break;
+ }
+
+ var code ="";
+ if(th.data.wu_arr && th.data.wu_arr[th.data.index]) code=th.data.wu_arr[th.data.index].code;
+ var freight_free = ee.freight_free; //全场满多少包邮
+ var no_ex_id=ee.no_ex_id;
+ th.data.is_no_by[th.data.bn_pick]=0;
+
+ var no_by_data=null;
+ var gift_freight_free=freight_free;
+ //有不包邮区域，且不免运费
+ if(no_ex_id && freight_free>0 && freight_free<=allpice-cut_price){
+ //-----------获取不包邮区域，不包邮商品-------
+ await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods",{
+ data:{store_id:os.stoid,id:no_ex_id}
+ }).then(res=>{
+ if(res.data.code==0){
+ no_by_data=res.data.data[0];
+ //如果有设置不包邮区域的时候
+ if(res.data.data[0].region_list){
+ if(th.check_by_area(res.data.data[0].region_list)){
+ freight_free=0;
+ th.data.is_no_by[th.data.bn_pick]=1;
+ }
+ }
+ //如果有设置不包邮商品
+ if(res.data.data[0].goods_list && freight_free){
+ if(th.check_by_goods(res.data.data[0].goods_list)){
+ freight_free=0;
+ th.data.is_no_by[th.data.bn_pick]=1;
+ }
+ }
+ }
+ })
+ }
+
+ th.data.is_by[th.data.bn_pick]=0;
+ //--------------开始计算物流------------------
+ var shipping_price=
+ th.calculatewuliu(code, o_shipping_price, goods_weight,
+ goods_piece, th.data.user_addr, freight_free, allpice-cut_price, rs);
+ if(shipping_price<=0){
+ th.data.is_by[th.data.bn_pick]=1; //已经是包邮了，就不要选择包邮券
+ }
+
+ shipping_price = parseFloat(shipping_price).toFixed(2);
+ var wl_txt = "formData.shipping_price";
+ th.setData({ [wl_txt]: shipping_price, })
+
+ }else{
+ var wl_txt = "formData.shipping_price";
+ th.setData({ [wl_txt]: 0, })
+ }
+ //---如果有选择优惠券的情况下---
+ var quan_price=0,bn_pick=th.data.bn_pick;
+
+ //-----------------支付价,优惠券不减物流-----------------
+ var total_m = (parseFloat(allpice)).toFixed(2);
+ var order_m = (parseFloat(allpice-cut_price)-quan_price).toFixed(2);
+ var coupon_price=quan_price; //优惠券优惠了多少钱
+ if(order_m<0) {
+ order_m=0;coupon_price=parseFloat(order_m).toFixed(2);
+ }
+
+ //--看一下有没有订单优惠--
+ total_m= parseFloat( total_m)+ parseFloat( th.data.formData.shipping_price);
+ order_m = parseFloat(order_m)+ parseFloat( th.data.formData.shipping_price);
+ var atxt= "formData.total_amount";
+ th.setData({ [atxt]: total_m, })
+
+ var txt = "formData.user_money";
+ var txt2 = "formData.order_amount";
+ var txt4="formData.integral";
+
+ var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
+ //--------------如果使用余额---------------------
+ if (th.data.bn_use_money == 1) {
+ if (amoney> order_m) {
+ order_m = order_m.toFixed(2);
+ th.setData({ [txt]: order_m, [txt2]:0,[txt4]:good.integral,show_submit:1 })
+ }else{
+ order_m =parseFloat(order_m - amoney);
+ order_m = order_m.toFixed(2);
+ th.setData({ [txt]: amoney, [txt2]: order_m,[txt4]:good.integral,show_submit:1 })
+ }
+ }else{
+ th.setData({ [txt]: 0, [txt2]: order_m,[txt4]:good.integral, show_submit:1 })
+ }
+
+ wx.hideLoading();
+
+ });
+ });
+ },
+
+ //--------------------提交订单-----------------------
+ async submitForm(t){
+ var sub_value=t;
+
+ if(this.data.is_summit_ing==1) return false; //--提交中退出--
+ this.data.is_summit_ing=1;
+ var th=this,pdata=new Array();
+ var ff=true;
+ //------------立即购买-------------
+ if (th.data.is_b_now==1 && th.data.bn_goods.prom_type!=5){
+
+ if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){
+ ff = false; getApp().my_warnning("请选择收货地址",0,th);
+ th.data.is_summit_ing = 0;
+ }
+ if (!ff) return false;
+ var addr = th.data.user_addr;
+ if (th.data.bn_exp_type == 1) addr=null;
+
+ if(th.data.bn_exp_type==0)
+ if(th.data.wu_arr==null || th.data.wu_arr.length<=0){
+ getApp().my_warnning("读取物流失败",0,th);
+ th.data.is_summit_ing = 0;
+ return false;
+ }
+
+ var item={
+ 'user_id': to.globalData.user_id,
+ 'consignee': addr == null ? "" : addr.consignee,
+ 'province': addr == null ? 0 : addr.province,
+ 'city': addr == null ? 0 : addr.city,
+ 'district': addr == null ? 0 : addr.district,
+ 'twon': addr == null ? 0 : addr.twon,
+ 'address': addr == null ? "": addr.address,
+ 'more_address': addr == null ? "" : addr.more_address,
+ //'mobile': th.data.userinfo.mobile,
+ 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
+ 'email':'',
+ 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
+ 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
+ 'invoice_title':'',
+ 'goods_price': th.data.formData.all_price, //商品总价
+ 'shipping_price': th.data.formData.shipping_price, //物流金额
+ 'user_money': th.data.formData.user_money, //使用余额
+ 'total_amount': th.data.formData.total_amount, //订单总价
+ 'order_amount': th.data.formData.order_amount, //应付
+ 'user_note': t.detail.value.user_note, //用户备注
+ 'store_id':oo.stoid, //商家
+ 'pickup_id': th.data.bn_pick, //门店
+ 'exp_type': th.data.bn_exp_type, //配送方式
+ 'order_goods':new Array(),
+ 'integral': th.data.formData.integral,
+ };
+ //是不是重新提交
+ if(th.data.is_continue==1) item.is_continue=1;
+
+ //获取立即购买的商品的信息
+ var gg = to.get_b_now();
+ //--商品的房间号--
+ if(gg.room_id && gg.room_id>0){
+ item.room_ids=gg.room_id;
+ }
+
+ var goods={
+ 'goods_id': gg.goods_id,
+ 'goods_name': gg.goods_name,
+ 'goods_sn': gg.goods_sn,
+ 'goods_num': gg.goods_num,
+ 'market_price': th.data.bn_goods.market_price,
+ 'goods_price': th.data.bn_goods.shop_price,
+ 'member_goods_price': th.data.bn_goods.shop_price,
+ 'store_id': oo.stoid,
+ 'prom_type':th.data.bn_goods.prom_type, //促销活动类型
+ 'prom_id': th.data.bn_goods.prom_id, //促销活动id
+ };
+
+ //-- 把导购的信息填入--
+ if(gg.guide_id){
+ 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(res=>{
+ if(res.data.code==0){
+ goods.guide_name=res.data.data.salesman;
+ goods.guide_sn=res.data.data.salesman_no;
+ }
+ })
+ }
+
+ //--商品的房间号--
+ if(gg.room_id && gg.room_id>0){
+ goods.room_id=gg.room_id;
+ }
+
+ item.order_goods.push(goods);
+ pdata.push(item);
+ }
+
+
+ if (pdata.length==0) return;
+ var str = JSON.stringify(pdata);
+
+ wx.showLoading({title: "加载中"});
+ wx.request({
+ url: oo.url + '/api/weshop/order/createWxdOrder',
+ data: str,
+ method: 'POST',
+ header: {
+ 'content-type': 'application/json'
+ },// 设置请求的 header
+ success: function (res) {
+
+ th.data.is_summit_ing=0; //是否提交中
+ wx.hideLoading();
+ if (res.statusCode == 200) {
+ var data=res.data;
+ if(data.code==0){
+ console.log(th.data.is_b_now);
+ //如果是购物车结算，还要删除购物车
+ if (th.data.is_b_now == 0) {
+ console.log(th.data.cartlist_y);
+ var list = th.data.cartlist_y;
+ for (var i = 0; i < list.length; i++) {
+ //删除购物车
+ a.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {});
+ }
+ }
+ var order_amount = 0;
+ pdata.forEach(function (em, ind) {
+ order_amount += em.order_amount;
+ })
+ //要进行判断，如果是用微信支付，就要跳转到支付界面
+ if (order_amount > 0) {
+ th.setData({ isclose: 0 });
+ //void e.jumpToCart4({
+ // order_sn: data.data,
+ //}, 1);
+ util_pay.pay(data.data, function() {
+ //app.my_warnning("支付成功",1,th);
+ //setTimeout(function () {
+ wx.redirectTo({
+ url: "/pages/payment/pay_success/pay_success?type=2&order_sn="+data.data
+ })
+ //},1000)
+
+ }, function () {
+ //支付失败
+ setTimeout(function () {
+ wx.navigateBack({ delta: 1 })
+ },1000)
+ },oo.stoid);
+
+ } else {
+ var dd = {
+ parent_sn: data.data,
+ store_id: oo.stoid,
+ type: 2,
+ };
+ a.post("/api/weshop/order/pay/createOrder", {
+ data: dd,
+ success: function (t) {
+ //console.log(t);
+ if(t.data.code==0){
+ //app.my_warnning("支付成功",1,th);
+ //setTimeout(function () {
+ th.setData({ isclose: 0 });
+ wx.redirectTo({
+ url: "/pages/payment/pay_success/pay_success?type=2&order_sn="+data.data,
+ })
+ //}, 1000)
+ }
+ },
+ fail:function () {
+
+ }
+ });
+ }
+
+ }
+ else{
+ //--内容换行--
+ var msg=data.msg;
+ //赠品活动已经取消，无法赠送，是否继续买单？
+ if(msg.indexOf("是否继续买单")>0){
+ wx.showModal({
+ title:"提示",
+ content: data.msg,
+ cancelText:'取消',
+ confirmText:'确定',
+ showCancel: true,
+ success(res){
+ if(res.cancel){
+ return;
+ }else if(res.confirm){
+ th.data.is_continue=1;
+ th.submitForm(sub_value);
+ }
+ }
+ })
+ return;
+ }
+ if(msg.length>13){
+ msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13);
+ }
+ getApp().confirmBox(msg);
+ }
+ }else{
+ console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+ }
+ },
+ fail: function () {
+ th.data.is_summit_ing=0;
+ wx.hideLoading();
+ console.log("index.js wx.request CheckCallUser fail");
+ },
+ complete: function () {}
+ })
+
+ },
+
+ //---确认线下门店的数量足不足---
+ async check_store_num(goods_id,pick,goods_num,func){
+ var lock=0,pick_no,plist,erpwareid;
+ //先读取门店的lock
+ await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
+ data:{store_id:os.stoid,wareId:goods_id,storageId:pick,pageSize:1000}
+ }).then(res=>{
+ if(res.data.code==0 && res.data.data.total>0){
+ for(var i in res.data.data.pageData)
+ lock+=res.data.data.pageData[i].outQty;
+ }
+ })
+ //先获取门店的编号
+ await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick,{
+ data:{storeId:os.stoid,goodsId:t.goods_id,pickupId:pick}
+ }).then(res=>{
+ if(res.data.code==0){
+ pick_no=res.data.data.pickup_no;
+ }
+ })
+ //先获取商品的线下库存
+ await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+goods_id,{
+ data:{storeId:os.stoid,goodsId:t.goods_id,pickupId:pick}
+ }).then(res=>{
+ if(res.data.code==0){
+ erpwareid=res.data.data.erpwareid;
+ }
+ })
+ //读取线下的门店库存
+ await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
+ data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+ }).then(res=>{
+ if(res.data.code==0){
+ plist=res.data.data.pageData[0];
+ }
+ })
+ var isok=1;
+ if(goods_num>plist.CanOutQty-lock){
+ isok=0;
+ }
+ func(isok);
+ },
+
+ useCoupon: function() {
+ if (this.data.order.couponNum <= 0) {
+ getApp().my_warnning("无可用优惠券",0,this);
+ return;
+ }
+
+ var a = {
+ lid: this.data.coupon ? this.data.coupon.id : "0"
+ };
+ wx.navigateTo({
+ url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a)
+ });
+ },
+ enterAddressPage: function() {
+ getApp().globalData.is_cart_old=1;
+ this.data.isget_by_quan={};
+ this.data.enterAddressPage = !0, wx.navigateTo({
+ url: "/pages/user/address_list/address_list"
+ });
+ },
+
+
+
+ //--------立即购买时，选择自提和物流----------
+ setexptype:function(t){
+ var th=this;
+ var ty = t.currentTarget.dataset.t,def_exp_code= getApp().globalData.userInfo.def_exp_code;
+ th.setData({ bn_exp_type:ty});
+ //当物流为空的时候。
+ if (ty == 0 && th.data.wu_arr==null){
+ th.data.isget_by_quan={};
+ return th.get_wuliu(th.calculatePrice2());
+ }
+
+ //--自提就要把包邮券清理掉--
+ if(ty==1){
+ th.data.isget_by_quan={};
+ if(th.data.using_quan[th.data.bn_pick] && th.data.using_quan[th.data.bn_pick].isby==1){
+ th.setData({using_quan:{}});
+ }
+ }
+
+ //判断有没有默认的物流地址值
+ if (def_exp_code != "" && def_exp_code != null && def_exp_code !=undefined) {
+ var wu_arr=this.data.wu_arr;
+ if (wu_arr!= null && wu_arr!=""){
+ for(var i=0;i 0 && o_price >= freight_free){ return 0;}
+ if (user_addr==null) { return 0; }
+ //计算物流的config item;
+ var item=null;
+ //先根据 镇 县 区找计算的config
+ item = th.get_wuliu_config(user_addr.district,code,rs);
+ if (item==null) item = th.get_wuliu_config(user_addr.city, code, rs);
+ if (item==null) item = th.get_wuliu_config(user_addr.province, code, rs);
+ if (item == null) item = th.get_wuliu_default(code,rs);
+ if (item == null) return o_shipping_price;
+ var fw_price = 0, fp_price=0;
+ item=item.config;
+ if (item == null) return o_shipping_price;
+ //------按重量----------
+ if (goods_weight>=0 && item['money']) {
+ fw_price =parseFloat(item['money']);
+ if (goods_weight > item['first_weight']){
+ var fw = goods_weight - item['first_weight'];
+ var n = Math.ceil(fw/item['second_weight'])
+ fw_price = fw_price + n * parseFloat(item['add_money']);
+ }
+ }
+ //------按件数----------
+ if (goods_piece > 0 && item['piecemoney']) {
+ fp_price = parseFloat(item['piecemoney']);
+ if (goods_piece > item['first_piece']) {
+ var fp = goods_piece - item['first_piece'];
+ var m = Math.ceil(fp / item['second_piece'])
+ fp_price = fp_price + m * parseFloat(item['add_piecemoney']);
+ }
+ }
+ var rspice =parseFloat(price + fw_price + fp_price);
+ return rspice;
+ },
+
+ //------------循环获取config-----------
+ get_wuliu_config:function(region_id,code,rs){
+ var item=null,rslist = rs.pageData;
+ for (var i = 0; i < rslist.length;i++){
+ if (rslist[i].code == code && rslist[i].region_id == region_id) { item = rslist[i];}
+ }
+ return item;
+ },
+ //-------循环获取config,code default-------
+ get_wuliu_default: function (code, rs) {
+ var item = null, rslist=rs.pageData;
+ for (var i = 0; i < rslist.length; i++) {
+ if (rslist[i].shipping_code == code && rslist[i].is_default == 1) { item = rslist[i]; }
+ }
+ return item;
+ },
+
+ //----------立即购买，选择物流-------------
+ bindPickerChange:function(e){
+ var ind = e.detail.value
+ this.setData({ index: ind });
+ this.calculatePrice2();
+ },
+ //----------购物车结算，选择物流-------------
+ bindPickerChange_w: function (e) {
+ var ind=e.detail.value, txt = e.currentTarget.dataset.txt;
+ this.setData({ [txt]: ind });
+ this.calculatePrice();
+ },
+
+ cart_set_err:function(e){
+ var txt = e.currentTarget.dataset.err;
+ var ob={};
+ ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
+ this.setData(ob);
+ },
+
+ //// 开启物流的弹窗
+ show_wu_arr:function(e){
+ var wu_arr_txt=e.currentTarget.dataset.txt;
+ var w_sele_index=e.currentTarget.dataset.w_sele_index;
+ var is_express=null;
+ var ob={open_express: 1,wu_arr_txt:wu_arr_txt,disabled:1};
+
+ //--如果是多个门店的时候--
+ if(w_sele_index!=undefined){
+ is_express=this.data.cartlist[w_sele_index].wind;
+ ob['is_express']=is_express;
+ }
+ this.setData(ob);
+ },
+ // 关闭物流的弹窗
+ close_express:function(){
+ this.setData({ open_express:0,disabled:0 });
+ },
+ // 选择物流
+ click_express_name:function(e){
+ var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode;
+ var index=e.currentTarget.dataset.idxe;
+ var ob={ is_express: index, is_shipping_code: shippingcode,disabled:0};
+ ob[this.data.wu_arr_txt]=index;
+ this.setData(ob);
+ },
+
+ //点击确定物流
+ determine_expres:function(e){
+ this.setData({ open_express: 0});
+ this.calculatePrice2();
+ },
+
+ //设置默认物流
+ select_default_logistics: function () {
+ var th=this;
+ var is_shipping_code=this.data.is_shipping_code
+ getApp().request.put("/api/weshop/users/update",{
+ data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code},
+ success:function(rse){
+ if (rse.data.code==0){
+ getApp().globalData.userInfo.def_exp_code=is_shipping_code;
+ th.setData({ open_express: 0 });
+ //----计算此时购物车的价格----
+ if(th.data.is_b_now==1) th.calculatePrice2();
+ else th.calculatePrice();
+ }
+ }
+ })
+ },
+
+ //更新下默认，在onshow里面
+ update_code(){
+ var th=this,m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
+ //--定时器，判断wu_arr不未空--
+ var uii=setInterval(function () {
+ if(th.data.wu_arr)
+ {
+ clearInterval(uii);
+ for (var k = 0; k < th.data.wu_arr.length; k++) {
+ var item = th.data.wu_arr[k];
+ if (def_exp_code == item.code) { m_wind = k; }
+ }
+ //--如果是立即购买--
+ th.setData({index: m_wind,is_express:m_wind});
+
+ }
+ },500);
+ },
+
+ //检查区域是不是包邮
+ check_area:function(arr){
+ var user_addr=this.data.user_addr;
+ for(var i in arr){
+ var item=arr[i];
+ if(user_addr.twon==item || user_addr.district==item
+ || user_addr.city==item|| user_addr.province==item ){
+ return 0;
+ }
+ }
+ return 1;
+ },
+
+ //检查立即购买的商品是不是不包邮
+ check_good:function(arr,goods_id){
+ if(!goods_id) goods_id=this.data.bn_goods.goods_id;
+ for(var i in arr){
+ var item=arr[i];
+ if(goods_id==item) return 0;
+ }
+ return 1;
+ },
+ check_by_area:function(region_list){
+ var arr=region_list.split(",");
+ var check=this.check_area(arr);
+ return !check;
+ },
+ check_by_goods:function(goods_list,goods_id){
+ var arr=goods_list.split(",");
+ var check=this.check_good(arr,goods_id);
+ return !check;
+ },
+
+
+ //从优惠的映射中拿出商品从表的item
+ arr_get_goods:function(goods_id,arr){
+ for(var i in arr){
+ if(arr[i].goods_id==goods_id) return arr[i];
+ }
+ },
+
+ //跳转到购买卡
+ buycard:function(){
+ getApp().goto("/pages/user/plus/plus");
+ getApp().globalData.plus_buy_back=1;
+ }
+
+});
diff --git a/pages/cart/cart2_inte/cart2_inte.json b/pages/cart/cart2_inte/cart2_inte.json
new file mode 100644
index 0000000..0cfb931
--- /dev/null
+++ b/pages/cart/cart2_inte/cart2_inte.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "填写订单",
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn"
+ }
+}
\ No newline at end of file
diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml
new file mode 100644
index 0000000..cda87da
--- /dev/null
+++ b/pages/cart/cart2_inte/cart2_inte.wxml
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/cart/cart2_inte/cart2_inte.wxss b/pages/cart/cart2_inte/cart2_inte.wxss
new file mode 100644
index 0000000..a3ed00c
--- /dev/null
+++ b/pages/cart/cart2_inte/cart2_inte.wxss
@@ -0,0 +1,960 @@
+.bdr_t-14 {
+ border-top-left-radius: 14rpx;
+ border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+ border-bottom-left-radius: 14rpx;
+ border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+ border-radius: 14rpx;
+}
+.mgt20 {
+ margin-top: 20rpx;
+}
+.shadow {
+ box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+ box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+
+page {
+ /* background-color: #FAFAFA; */
+ background-color: #F0F0F0;
+ padding: 0 22rpx;
+ box-sizing: border-box;
+}
+.container {
+ background-color: #F0F0F0;
+ /* padding-top: 28rpx; */
+ padding-bottom: 120rpx;
+}
+.user-mes {
+ position: relative;
+ background-color: #fff;
+ font-size: 32rpx;
+ color: #444;
+ /* margin-top: 28rpx; */
+ border-radius: 14rpx;
+}
+.user-contact {
+ padding: 24rpx 26rpx;
+ font-weight: 600;
+}
+
+.location {
+ position: relative;
+ padding: 0 70rpx 24rpx;
+}
+
+.pos-icon {
+ position: absolute;
+ left: 28rpx;
+ top: 6rpx;
+ width: 30rpx;
+ height: 36rpx;
+}
+
+.border-img {
+ width: 100%;
+ height: 12rpx;
+}
+
+.update-logistics {
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 80rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.arrow-rigth {
+ width: 32rpx;
+ height: 32rpx;
+}
+
+.order-meg {
+ margin-bottom: 20rpx;
+ font-size: 28rpx;
+
+}
+
+.order-detail {
+ padding: 30rpx 0;
+ border-bottom: 2rpx solid #eee;
+ color: #777;
+ min-height: 190rpx;
+ background-color: #fff;
+
+}
+
+.goods-img {
+ float: left;
+ width: 200rpx;
+ height: 200rpx;
+ margin: 0 20rpx;
+}
+
+.order-cont {
+ float: left;
+ width: 438rpx;
+}
+
+.goods-name {
+ height: 74rpx;
+ line-height: 40rpx;
+ overflow: hidden;
+ margin-bottom: 16rpx;
+ font-size: 28rpx;
+ color: #333;
+
+}
+
+.goods-color {
+ font-size: 24rpx;
+}
+
+.order-num {
+ margin-top: 25rpx;
+ font-size: 24rpx;
+ line-height: 42rpx;
+}
+
+.set-mes{
+ background-color: #fff;
+ /* margin-top: 20rpx; */
+}
+.use-item{
+ display: flex;
+ align-items: center;
+ height: 80rpx;
+ /* border-bottom: 1px solid #ddd; */
+ font-size: 30rpx;
+ /* width:95%;
+margin:auto; */
+ padding: 0 26rpx;
+}
+.use-item>view{
+ display: flex;
+ /* margin-right: 12rpx; */
+}
+.use-item.bfff{
+ background-color: #fff;
+}
+.use-item .dp{
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ margin-left: -6rpx;
+}
+
+.set-item {
+ justify-content: space-between;
+ background-color: #fff;
+}
+
+.set-btn {
+ display: flex;
+ font-size: 24rpx;
+}
+
+.set-mes input {
+ width: 380rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ border: 1px solid #ddd;
+}
+
+.use-btn {
+ width: 100rpx;
+ height: 50rpx;
+ margin-left: 20rpx;
+ line-height: 50rpx;
+ text-align: center;
+ background-color: #f23030;
+ color: #fff;
+}
+
+.coupon-mes {
+ /* box-sizing: border-box; */
+ height:95rpx;
+ padding: 0 26rpx;
+ background-color: #fff;
+ font-size: 30rpx;
+ color: #444;
+ /* width: 100%; */
+ border-radius: 14rpx;
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
+}
+
+.coupon-title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 92rpx;
+}
+
+.coupon-title>view {
+ display: flex;
+}
+
+.coupon-num {
+ height: 36rpx;
+ margin-left: 20rpx;
+ padding: 0 16rpx;
+ line-height: 36rpx;
+ text-align: center;
+ background-color: #f23030;
+ color: #fff;
+ font-size: 24rpx;
+}
+
+.leave-word {
+ position: relative;
+ font-size: 24rpx;
+ margin-left: 20rpx;
+ flex-grow: 1;
+}
+
+.word-box {
+ font-size: 26rpx;
+ /* width: 600rpx; */
+ padding: 10rpx;
+ height: 28rpx;
+ line-height: 40rpx;
+}
+
+.max-word {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
+
+.information {
+ padding: 0 26rpx;
+ background-color: #fff;
+ /* margin-bottom: 120rpx; */
+}
+
+.information .item {
+ display: flex;
+ justify-content: space-between;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size: 26rpx;
+ color: #777;
+}
+
+.btn-wrap {
+ height: 94rpx;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ background-color: white;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 0 30rpx;
+}
+
+.tips-btn {
+ /* float: right;
+ width: 200rpx;
+ height: 100rpx;
+ line-height: 100rpx;
+ text-align: center;
+ font-size: 30rpx;
+ color: #fff;
+ background-color: #f23030; */
+ color: white;
+ background-color: #FE4445;
+ height: 72rpx;
+ line-height: 72rpx;
+ padding: 0 42rpx;
+ border-radius: 36rpx;
+ margin-left: 0;
+ margin-right: 0;
+}
+
+.pay-amount {
+ /* float: right;
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ font-size: 26rpx;
+ margin-right: 40rpx; */
+}
+
+.payable {
+ color: #444;
+ /* margin-right: 20rpx; */
+}
+
+.shipping-modal {
+ z-index: 20;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ overflow-y: hidden;
+ color: #666666;
+ background-color: white;
+}
+
+.shipping-nav {
+ text-align: center;
+ font-size: 35rpx;
+ padding-top: 30rpx;
+}
+
+.shipping-list {
+ padding: 20rpx 30rpx 40rpx;
+ font-size: 28rpx;
+}
+
+.shipping-item {
+ display: block;
+ padding: 20rpx 0;
+}
+
+.shipping-btn {
+ width: 100%;
+ color: white;
+ background-color: #f23030;
+ line-height: 90rpx;
+ text-align: center;
+ font-size: 40rpx;
+}
+
+/*----------nyf新增，地址---------*/
+.add_new{
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+ padding: 0 26rpx;
+}
+.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd;
+ margin-right: 15rpx;vertical-align: middle;}
+.yu_er{
+ margin-left: 10rpx;
+ /* margin-right: 60rpx; */
+}
+.wuliu{margin-left: 20rpx;}
+
+
+/*---- 优惠券列表 -----*/
+.xc-coupon-frame{
+ width: 100%;
+ height: 92rpx;
+
+}
+.xc-coupon-frame .work-frame{
+ width: 100%;
+ height: 100%;
+ border-bottom:3rpx solid #eee;
+ padding: 0 26rpx;
+ background-color: white;
+}
+.xc-right{
+ width:20rpx;
+ height:20rpx;
+ border-top:2rpx solid #000;
+ border-right:2rpx solid #000;
+ transform:rotate(45deg);
+ display:inline-block;
+}
+
+.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
+.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx }
+
+/* 自定义弹出窗口 */
+.cx-popup{
+ width:100%;
+ height:880rpx;
+ background: #fff;
+ z-index: 35;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ position:fixed;
+ bottom:0;
+ left: 0;
+ /* padding-bottom: 25rpx; */
+}
+
+.cx-popup .top{
+ width:95%;
+ height:100rpx;
+ border-bottom:3rpx solid #ddd;
+ margin: auto;
+ margin-top: 30rpx;
+
+}
+.xc-top-content{
+ width: 93%;
+ height:85rpx;
+ padding-top: 30rpx;
+ font-size: 34rpx;
+ font-weight: 600;
+
+}
+
+
+.xc-valid-coupon{
+ width: 90%;
+ height:40rpx;
+ padding-top: 24rpx;
+ overflow: hidden;
+}
+.xc-frame{
+ width: 100%;
+ height:60%;
+}
+
+.xc-frame .list-frame{
+ width: 95%;
+ height: 100%;
+ overflow-y:scroll;
+
+}
+.xc-close-frame{
+ margin-top:-10rpx;
+
+}
+
+.xc-close{
+ width: 37rpx;
+height: 37rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+line-height: 34rpx;
+font-size: 29rpx;
+color: #333;
+
+}
+.xc-money{
+ color: #af2346;
+ font-size: 35rpx;
+}
+
+.xc-money-frame{
+ margin-left:35rpx;
+
+}
+.xc-coupon-effect{
+ width: 99%;
+ min-height: 100rpx;
+ border-bottom:3rpx solid #ddd;
+
+
+}
+.xc-goods-coupon{
+ width: 85%;
+ height:100%;
+
+}
+.xc-title{
+ width:50%;
+ margin-left:222rpx;
+
+}
+.xc-coupon-money0{
+ color: #c91e31;
+ font-size: 35rpx;
+ line-height: 40rpx;
+
+}
+.xc-coupon-money{
+ color: #c91e31;
+ font-size: 35rpx;
+ line-height: 40rpx;
+ padding-top: 10px;
+
+}
+.xc-coupon-money1{
+ color: #444;
+ font-size: 28rpx;
+ line-height: 60rpx;
+
+
+}
+.xc-coupon-time{
+ height: 50rpx;
+ font-size: 27rpx;
+ color: #a4a4a4;
+}
+.xc-coupon-time .time{
+ margin-left: 15rpx;
+ font-size: 27rpx;
+}
+.xc-coupon-selection{
+ height:100%;
+}
+
+.xc-confirm {
+ width: 50%;
+ border-radius: 50rpx;
+ height: 80rpx;
+ margin:0 auto;
+ background:#d60021;
+ color:#fff;
+ font-size:28rpx;
+ margin-top: 28rpx;
+}
+
+.up{ animation: up .7s; }
+.down{ animation: down 1s; }
+@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } }
+@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
+
+.xc-not-Selection{
+ width: 40rpx;
+height: 40rpx;
+ background: #eeeeee;
+}
+
+
+.xc-close-express{
+ width: 40rpx;
+height: 40rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+font-size:32rpx;
+line-height: 38rpx;
+color: #333;
+margin-top: 5rpx;
+}
+.cx-popup .tops{
+ width: 100%;
+height: 145rpx;
+border-bottom: 3rpx solid #eee;
+
+}
+.top-content {
+ width: 82%;
+padding-top: 33px;
+height: 100%;
+padding-left: 40rpx;
+}
+.close-frame{
+ margin-top: 30rpx;
+
+}
+
+.xc-hook {
+width: 33rpx;
+height: 33rpx;
+transform: rotate(-135deg);
+line-height: 35rpx;
+text-align: center;
+margin-right: 20rpx
+
+
+}
+.xc-hooks {
+width: 30rpx;
+height: 30rpx;
+border: 1rpx solid #999;
+margin-right: 20rpx;
+}
+.express_list_frame{
+ display: flex;
+height: 80rpx;
+align-items: center;
+padding-left: 40rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.express_list{
+ width: 100%;
+ height: 65%;
+ overflow-y: auto;
+ margin-bottom: 40rpx;
+
+}
+.xc-confirms {
+ box-sizing: border-box;
+ width: 40%;
+ border-radius: 50rpx;
+ height: 80rpx;
+ margin:0 auto;
+ font-size:28rpx;
+ background: #fff;
+ color: #333;
+ border: 2rpx solid #333;
+}
+
+
+/* 优惠券的改版样式 */
+.xc-coupon-frame{
+ /* width: 710rpx; */
+ width: 100%;
+ height:auto;
+ margin: 0 auto;
+
+}
+.xc-coupon-frame .coupon-frame{
+ width: 100%;
+ height: 200rpx;
+ margin-top:10rpx;
+ border-bottom: 1rpx solid #eee;
+
+}
+.xc-coupon-frame .coupon-frame .coupon-left{
+ width: 215rpx;
+ height:100%;
+ overflow: hidden;
+}
+.xc-money-frames{
+ width:96%;
+ margin-top: -10px;
+}
+
+.xc-rmb-symbol{
+ font-size:40rpx;
+
+}
+
+.xc-rmb-val{
+ font-size:60rpx;
+
+}
+.coupon-explain{
+ font-size:25rpx;
+width:100%;
+
+
+}
+.xc-valuer{
+ margin-top:39rpx;
+ margin-left:28rpx;
+ font-size:25rpx;
+}
+.coupon-frame .oval{
+ width:155rpx;
+ height:83rpx;
+ border-radius: 50%;
+ right:-78rpx;
+ top:-37rpx;
+}
+.coupon-right{
+ /* width:490rpx; */
+ height: 99%;
+ border-top: 1rpx solid #eaeaea;
+ /* //border-bottom: 1rpx solid #eaeaea; */
+ border-right: 1rpx solid #eaeaea;
+ flex-grow: 1;
+}
+.coupon-annotation{
+ width: 95%;
+ height: 100%;
+
+}
+.xc-brand{
+ width:100rpx;
+ height:35rpx;
+ line-height: 35rpx;
+ font-size:21rpx;
+ border-radius:10rpx; position: relative; top:-1px;
+ margin-right: 8rpx
+}
+.top-frame{
+ width:82%;
+ height: 75rpx;
+ margin-top:10rpx;
+}
+.top-frame .coupon-wode{
+ font-size: 25rpx;
+ margin-left:10rpx;
+ width:340rpx;
+ height:88rpx;
+}
+.coupon-code{
+ width:60rpx;
+ height:60rpx;
+ margin-top:5rpx;
+
+}
+.frame{
+ width: 100%
+}
+.coupon-time{
+ font-size: 23rpx;
+ line-height:33rpx;
+ color: #333;
+}
+
+.clik-get{
+ width:125rpx;
+ height:45rpx;
+ border-radius: 25rpx;
+ line-height: 45rpx;
+ font-size:25rpx;
+ bottom:67rpx;
+ right:6px;
+}
+
+.code-img{
+ margin-left:20rpx;
+}
+.bottmo-explain{
+top:145rpx;
+width:94%;
+border-top:1rpx dashed #eee;
+padding-top:8rpx;
+height:38rpx;
+line-height: 51rpx;
+
+}
+.font-word{
+ font-size: 22rpx;
+}
+.circle-size{
+ background: #a0a0a0;
+ width: 27rpx;
+ height: 27rpx;
+ margin-top:13rpx;
+margin-left:8rpx;
+display: flex;
+
+align-items: center;
+}
+.xc-jiantou{
+ /* width: 9rpx;
+ height: 9rpx; */
+ /* border-top: 2rpx solid #fff;
+ border-right: 2rpx solid #fff; */
+ transform: rotate(-90deg);
+ color: #fff;
+ font-size: 15rpx;
+ /* display:inline-block;
+ margin-top: 6.5rpx; */
+ text-align: center;
+width: 24rpx;
+}
+.xc-buttom{
+ box-sizing: border-box;
+ width:100%;
+ min-height:76rpx;
+ height:auto;
+ line-height:40rpx;
+ border-left:1rpx solid #eee;
+ border-right:1rpx solid #eee;
+ border-bottom:1rpx solid #eee;
+/* margin-left: 6rpx; */
+}
+
+.goods-num{
+ font-size: 28rpx;
+ color: #333;
+}
+
+.explain-coupon{
+ font-size:25rpx;
+ padding: 10rpx 10rpx
+}
+.circle-frame{
+ width: 20rpx;
+ height: auto;
+ z-index:1;
+ left:210rpx;
+
+}
+.circle-sawtooth{
+ width: 11rpx;
+ height: 11rpx;
+ background: #fff;
+}
+
+.red{background-color: #fe7496;}
+.green{ background-color: #22c7c1;}
+.blue{background-color:#5e82e3;}
+.g_gray{background-color: #aaaaaa}
+
+.f_text{text-align: center; height:96rpx; }
+.xc-hook.sn {
+ margin-top:12%;
+width:45rpx;
+height:45rpx;
+font-size:28rpx;
+line-height:44rpx;
+
+
+}
+.xc-hooks.on{
+ margin-top:12%;
+width:42rpx;
+height:42rpx;
+}
+.may_use_coupon{
+ /* width: 95%; */
+ /* height: 68rpx; */
+ line-height:78rpx;
+ padding: 0 26rpx;
+ justify-content: space-between;
+ align-items: center;
+}
+.determine-frame{
+ width: 100%;
+ height: 130rpx;
+
+}
+.xc-determine{
+ height: 80rpx;
+ width: 40%;
+ border-radius: 50rpx;
+background: #d60021;
+color: #fff;
+font-size: 28rpx;
+margin: 0 auto;
+
+}
+.click-buttem{
+width: 90%;
+margin: auto;
+}
+.logistics-name{
+ margin-right:20rpx;
+}
+.xc-border{
+ border-top:8rpx solid #eee;
+width: 100%
+}
+.main-top{
+margin-top: 20rpx;
+
+}
+.xc-hookts{
+border: 1rpx solid #999;
+
+}
+.xc-hookts.on{
+ width:30rpx;
+height:30rpx;
+
+}
+.xc-hookt.sn{
+ width: 32rpx;
+height: 32rpx;
+font-size: 28rpx;
+line-height: 34rpx;
+}
+.xc-hookt{
+ transform: rotate(-135deg);
+text-align: center;
+
+}
+.main-bottom{
+ margin-bottom: 20rpx;
+
+}
+.xc-hookst{
+ border: 1rpx solid #999;
+
+}
+.xc-hookst.ons{
+ width: 42rpx;
+height: 42rpx;
+margin-left: 20rpx;
+
+}
+.is_use_coupon{
+ width: 65%;
+justify-content: flex-end;
+padding-top: 10rpx;
+
+
+}
+.xc-hooka{
+ transform: rotate(-135deg);
+text-align: center;
+
+}
+.xc-hooka.sn{
+ width: 45rpx;
+height: 45rpx;
+font-size: 28rpx;
+line-height: 44rpx;
+margin-left: 20rpx;
+
+}
+.color-gray{
+ color: #808080;
+}
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
+.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0}
+
+.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;}
+
+.navigator-hover {
+ background: none;
+ opacity: 1;
+}
+
+
+.plus_buy{
+ background-color: #fff;
+ margin:15rpx 0;
+ padding: 20rpx 10rpx;
+ position: relative;
+}
+
+
+.card_bg {
+ box-sizing: border-box;
+ padding: 2rpx 10rpx;
+ height: 28rpx;
+ border-radius: 26rpx;
+ font-size: 18rpx;
+ line-height: 28rpx;
+ max-width: 210rpx;
+ background: #333;
+ color: #fff;
+ margin-left: 8rpx;
+ position:relative;
+ top:7rpx;
+}
+
+.card_bg image {
+ width: 19rpx;
+ height: 19rpx;
+ margin-right: 8rpx;
+}
+
+/* .card_bg .card_name {
+ max-width: 76rpx;
+ width: auto;
+ overflow: hidden;
+ white-space: nowrap;
+} */
+
+.card_name {
+ position: relative;
+ top: -4rpx;
+ margin-left: 6px;
+}
+
+.car_tri_up {
+ width: 0;height: 0;
+ border-left: 20rpx solid transparent;
+ border-right: 20rpx solid transparent;
+ border-bottom: 20rpx solid #fff;
+ position: absolute;
+ right: 20rpx;
+ top:-10rpx
+}
+.card_op{
+ position: absolute;
+ right: 20rpx;
+ top:36rpx
+}
+
diff --git a/pages/cart/cart2_inte/filter.wxs b/pages/cart/cart2_inte/filter.wxs
new file mode 100644
index 0000000..c0e8d13
--- /dev/null
+++ b/pages/cart/cart2_inte/filter.wxs
@@ -0,0 +1,11 @@
+var format = function (text) {
+ if (!text) {
+ return
+ }
+ var reg = getRegExp('\\\\n', 'g')
+ return text.replace(reg, '\n')
+}
+
+module.exports = {
+ format: format
+}
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
new file mode 100644
index 0000000..251c1d7
--- /dev/null
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+ {{data.goods_name}}
+
+
+ {{prom_integral}}积分
+ +
+ {{prom_price}}元
+
+
+
+
+
+ 已售：{{prom_act.buy_num}}
+ 可售：{{prom_act.limitqty-prom_act.buy_num}}
+
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+ 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+
+
+
+
+ 选择门店
+
+
+
+ 更多门店
+
+
+
+ (库存不足)
+
+ (库存不足)
+
+ (库存不足)
+
+
+
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+
+ 商品属性
+
+
+ {{item.gg}}
+
+
+
+
+
+ 购买数量
+
+ -
+
+ +
+
+
+
+
+
+
+
+
+ 库存不足
+
+
+
+
+
+ 库存不足
+
+
+
+ 库存不足
+
+
+
+ 请先选择门店
+
+
+
+ 库存不足
+
+
+ 立即兑换
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
new file mode 100644
index 0000000..8bb1445
--- /dev/null
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+ {{sele_g.goods_name}}
+
+ ￥
+
+ {{sele_g[card_field]}}
+ {{sele_g.shop_price}}
+
+
+
+ 已售：{{sele_g.sales_sum}}
+
+ 可售：{{def_pick_store.CanOutQty}}
+ 可售:0
+
+ 可售：{{sele_g.store_count}}
+
+
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+ 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+
+
+
+
+ 选择门店
+
+
+
+ 更多门店
+
+
+
+ (库存不足)
+
+ (库存不足)
+
+ (库存不足)
+
+
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+
+ 商品属性
+
+
+ {{item.gg}}
+
+
+
+
+
+ 购买数量
+
+ -
+
+ +
+
+
+
+
+
+
+
+
+ 库存不足
+
+
+
+
+
+ 库存不足
+
+
+
+ 库存不足
+
+
+
+ 请先选择门店
+
+
+
+ 库存不足
+
+
+
+ 加入购物车
+ 立即购买
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
new file mode 100644
index 0000000..ad22054
--- /dev/null
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+ {{sele_g.goods_name}}
+
+
+
+
+ ￥ {{sele_g[card_field]}}
+
+
+ ￥ {{sele_g.shop_price}}
+
+
+ ￥ {{prom_price}}
+
+
+
+
+ 已售：{{sele_g.sales_sum}}
+
+ 可售：{{def_pick_store.CanOutQty}}
+ 可售:0
+
+ 可售：{{sele_g.store_count}}
+
+
+
+
+ 已售：{{prom_act.buy_num}}
+ 已售：{{prom_act.buy_num}}
+ 可售：{{prom_act.goods_num-prom_act.buy_num}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+ 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+
+
+
+
+ 选择门店
+
+
+
+ 更多门店
+
+
+
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+ 商品属性
+
+
+ {{item.gg}}
+
+
+
+
+
+
+ {{item.gg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 购买数量
+
+ -
+
+ +
+
+
+
+
+
+
+
+ 选择门店
+
+
+
+
+ {{item.name}}
+
+
+ {{item.pickup_name}}
+
+
+
+
+
+ {{sec_sto.name}}
+
+ {{item.pickup_name}}
+
+
+
+
+
+
+
+
+
+
+
+ 库存不足
+
+
+
+
+
+ 库存不足
+
+
+
+ 库存不足
+
+
+
+ 请先选择门店
+
+
+
+ 库存不足
+
+
+ 立即购买
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 40c7e1e..4bee1bb 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -28,9 +28,10 @@ Page({
gid: "",
stoid: o.stoid,
url: o.url,
- resourceUrl: o.resourceUrl,
+ resourceUrl: 'https://mshop-lib.yolipai.net/', //公众号那边的图片文件域名
iurl: o.imghost,
defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
+
data: null,
content: "", //商品详情
comments: null, //商品评论
@@ -242,7 +243,8 @@ Page({
poster:null, //自定义海报
share_b_img:'', //自定义分享的背景
- showPoster: false,
+ showPoster: false,
+ hui_condition:null,
},
//------初始化加载----------
@@ -279,8 +281,7 @@ Page({
},
fail: function(res) {}
});
- }
-
+ }
th.setData({poster:json_data})
}
@@ -313,7 +314,6 @@ Page({
getApp().globalData.room_goods_id=gid;
}
-
var c_guide_id=t.c_guide_id;
if(c_guide_id){
th.data.c_guide_id=c_guide_id;
@@ -388,7 +388,6 @@ Page({
}
}, 500)
})
-
}
});
@@ -404,8 +403,8 @@ Page({
//获取用户的默认门店
getApp().get_user_store(function(ee) {
-
- if(!ee) {
+
+ if(!ee) {
th.data.fir_def_store={}; //赋值空对象
return false;
}
@@ -480,8 +479,6 @@ Page({
},1000)
});
-
-
},
@@ -710,7 +707,7 @@ Page({
//获取统一条形码,普通商品和优惠促销的商品
- if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 4 || ee.data.data.prom_type == 5){
+ if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5){
//默认门店要拿下门店库存
if(that.data.sales_rules==2 && that.data.is_newsales_rules){
//获取门店
@@ -753,8 +750,7 @@ Page({
ee.get_sku(o.stoid, t.data.data.sku, gid);
}
else {
- var gg = "",
- item = t.data.data;
+ var gg = "", item = t.data.data;
if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec="";
if(item.goods_color=="null" || item.goods_color==null) item.goods_color="";
@@ -951,7 +947,106 @@ Page({
th.add_cart_func(t);
}
},
- //加入购物的函数
+
+
+
+ //-- 加入购物的函数 --
+ add_cart_func_inte: function(t) {
+ var i = getApp().request;
+ if (oo.user_id == null) {
+ return s.my_warnning("还未登录！", 0, this);
+ }
+ var e = this,
+ th = e,
+ a = 0,
+ o = this.data.data;
+ a = o.goods_id;
+
+ //----------添加到购物车时，要判断限购数量，--------
+ e.get_buy_num(o, function(ee) {
+ //---判断商品是否超出限购---
+ if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
+ if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
+ wx.showModal({
+ title: '提示',
+ content: '超出商品限购'
+ });
+ return false;
+ }
+ }
+ //---判断商品是否超出活动限购---
+ if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
+ if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
+ wx.showModal({
+ title: '提示',
+ content: '超出商品活动限购'
+ });
+ return false;
+ }
+ }
+
+ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
+ if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
+ this.setData({
+ sto_sele_name: ""
+ });
+ if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
+
+ //--------------此时操作的数据------------
+ var newd = {
+ goods_id: o.goods_id,
+ goods_num: th.data.goodsInputNum,
+ pick_id: th.data.sto_sele_id,
+ user_id: oo.user_id,
+ store_id: th.data.stoid,
+ goods_price: th.data.prom_price,
+ integral:th.data.prom_integral,
+ member_goods_price: o.shop_price,
+ goods_name: o.goods_name,
+ goods_sn: o.goods_sn,
+ sku: o.sku,
+ };
+
+ //---是不是从收藏夹出来的---
+ if(th.data.c_guide_id){
+ newd['guide_id'] = th.data.c_guide_id;
+ newd['guide_type']=2;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3;
+ }else{
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+ if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1;
+ }
+ }
+
+ //让商品带上房间号
+ //让商品带上房间号
+ if(th.data.sys_switch.is_skuroom_id==1){
+ if(th.data.data.goods_id==getApp().globalData.room_goods_id){
+ newd.room_id=getApp().globalData.room_id;
+ }
+ }else{
+ if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id;
+ }
+
+ //如果是积分够，is_integral_normal就要有积分购普通购买字段
+ //if(o.prom_type==4){
+ //newd.is_integral_normal=1;
+ //}
+
+ //-----如果是秒杀，团购，积分购,拼团-----
+ newd.prom_type = th.data.prom_type;
+ newd.prom_id = th.data.prom_id;
+ if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+ if (o.store_count e || 0 == e ? t = e : t < 1 && (t = 1);
th.setData({ goodsInputNum: t });
+ th.is_show_more_buy();
+
+ })
+ },
+ //----- 检查一下积分购的限购之类的问题 -----
+ checkCartNum_inte: function(t) {
+ var th = this;
+ this.get_buy_num(this.data.data, async function() {
+
+ //--判断商品是否超出限购--
+ if (th.data.g_buy_num != null && th.data.data.viplimited > 0) {
+
+ var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
+
+ if (t + gd_buy_num > th.data.sele_g.viplimited) {
+ wx.showModal({
+ title: '超出商品限购',
+ });
+
+ var num= th.data.sele_g.viplimited-gd_buy_num;
+ if(num<0) num=0;
+ th.setData({goodsInputNum:num})
+ return false;
+ }
+ }
+
+ //--判断商品是否超出活动限购--
+ if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
+ if (t + th.data.prom_buy_num > th.data.prom_buy_limit) {
+ wx.showModal({
+ title: '超出商品活动限购',
+ });
+
+ var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
+ if(num<0) num=0;
+ th.setData({goodsInputNum:num})
+ return false;
+ }
+ }
+
+ if (th.data.sele_g.prom_type == 1 || th.data.sele_g.prom_type == 6) {
+ var redis_num = 0;
+ //------判断活动是否抢光-----
+ await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+ os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
+ 1: 1
+ }).then(res => {
+ redis_num = res.data.data;
+ });
+
+ if (t > redis_num) {
+ wx.showModal({
+ title: '超出商品活动库存',
+ });
+ th.setData({goodsInputNum:redis_num})
+ return false;
+ }
+
+ }
+
+ var e = th.data.sele_g.store_count;
+ if(th.data.sales_rules==2){
+ if(!th.data.def_pick_store){
+ wx.showModal({ title: '请选择门店', });
+ return false;
+ }else{
+ e=th.data.def_pick_store.CanOutQty;
+ }
+ }
+
+ //库存不足，不增加
+ if(e e || 0 == e ? t = e : t < 1 && (t = 1);
+ th.setData({ goodsInputNum: t });
})
},
- closeSpecModal: function() {
+
+ closeSpecModal: function() {
+ if(this.data.openSpecModal_pt && this.data.is_normal){
+ this.get_sto();
+ }
+
this.setData({
openSpecModal: !1,
openSpecModal_pt: !1
});
},
+
openSpecModel: function(t) {
var open_store = t.currentTarget.dataset.ind;
@@ -1692,8 +1890,11 @@ Page({
that.check_is_youhui(gid)
-
+ var ty=0;
+
this.get_sto();
+
+
//默认门店要拿下门店库存
if(that.data.sales_rules==2 && that.data.def_pick_store){
var lock=0,plist=null;
@@ -1778,6 +1979,14 @@ Page({
//---------拿出门店分类和门店------------
get_sto(e) {
var th = this,that=this;
+ var is_normal=e;
+
+ if(e==1){
+ th.setData({is_normal:1})
+ }else{
+ th.setData({is_normal:0})
+ }
+
var timer_get = setInterval(function() {
if (th.data.is_get_local_ok == 0) return false;
var dd = null,
@@ -1803,16 +2012,25 @@ Page({
dd.lon = th.data.lon;
}
clearInterval(timer_get);
-
+
+ //如果会员是有默认的门店话
+ if(!th.data.def_pick_store && th.data.fir_def_store){
+ th.setData({def_pick_store:th.data.fir_def_store});
+ }
+
if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
th.setData({def_pick_store:null});
}
-
+
+ wx.showLoading({
+ title:'加载中.'
+ });
//----------获取门店----------------
getApp().request.promiseGet("/api/weshop/pickup/list", {
data: dd,
}).then(res => {
var e = res;
+
if (e.data.code == 0) {
//如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
@@ -1827,7 +2045,7 @@ Page({
}
//-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
- if (th.data.def_pick_store && (th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
+ if (th.data.def_pick_store && (g_distr_type==0 || th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
for (var k = 0; k < e.data.data.pageData.length; k++) {
if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
e.data.data.pageData.splice(k, 1); //删除
@@ -1840,8 +2058,8 @@ Page({
th.setData({all_pick_list:e.data.data.pageData});
- //--获取线下库存,而且不是新的门店规则,同时不能是活动--
- if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){
+ //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
+ if(th.data.sales_rules==2 && !th.data.is_newsales_rules && ((th.data.prom_type!=1 && th.data.prom_type!=6 && th.data.prom_type!=4) || is_normal==1)){
setTimeout(function(){
th.deal_pickup_dline(e);
},800)
@@ -1859,8 +2077,8 @@ Page({
//------------处理门店---------------
deal_pickup(e){
var th=this;
-
var g_distr_type=th.data.sele_g.distr_type;
+ wx.hideLoading();
//单总量超出5个的时候
if (e.data.data.total > 5) {
@@ -1874,6 +2092,7 @@ Page({
},
success: function(ee) {
if (ee.data.code == 0) {
+
if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
var def_arr = new Array();
var ishas = 0;
@@ -1969,10 +2188,7 @@ Page({
};
newarr.push(item);
}
-
-
-
-
+
th.setData({
is_show_sto_cat: 1,
all_sto: newarr
@@ -2001,7 +2217,7 @@ Page({
}
}
});
- } else {
+ } else {
th.setData({
is_show_sto_cat: 0,
only_pk: e.data.data.pageData
@@ -2017,6 +2233,7 @@ Page({
}
}
},
+
//------------处理线下门店库存--------
deal_pickup_dline(e){
var pkno=[],th=this;
@@ -2048,8 +2265,10 @@ Page({
data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000}
})
}).then(res=>{
+
+ wx.hideLoading();
if(res.data.code==0){
- if(res.data.data.pageData){
+ if(res.data.data.pageData && res.data.data.pageData.length>0){
var plist=res.data.data.pageData;
var def_pick_store=th.data.def_pick_store;
//以原来的数组为外循环，保证距离的顺序
@@ -2237,19 +2456,19 @@ Page({
async check_prom(gid, prom_type, prom_id) {
var ee = this,
th = ee;
- if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4 || prom_type == 5) {
+ if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5) {
this.setData({
prom_type: 0,
isshow: 1,
});
return false;
}
- if(prom_type==4){
- th.setData({is_integral_normal:1});
- }
- //if (prom_type != 3 && prom_type!=0){
- //---判断秒杀----
- if (prom_type == 1) {
+
+
+
+ //if (prom_type != 3 && prom_type!=0){
+ //---判断秒杀----
+ if (prom_type == 1) {
//-------判断活动是否抢光---------
await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
1: 1
@@ -2351,6 +2570,54 @@ Page({
})
}
+ if(prom_type==4){
+ //th.setData({is_integral_normal:1});
+ var rdata={
+ store_id:o.stoid,stype:1,stypeup:1,goods_id:gid
+ }
+
+ var integrals=0;
+ var get_datas= {
+ user_id:getApp().globalData.user_id, store_id:o.stoid,
+ };
+ await getApp().request.promiseGet("/api/weshop/users/getAllPoints", {
+ data: get_datas
+ }).then(res => {
+ if(res.data.code==0){
+ integrals=res.data.data.Integral;
+ }
+ })
+
+ //获取一下积分活动
+ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", {
+ data: rdata
+ }).then(res => {
+ //调用接口有数据的时候
+ if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
+ var inte_data=res.data.data.pageData[0];
+ var can_integral=(parseFloat(integrals)>=parseFloat(inte_data.integral));
+ ee.setData({
+ prom_price:parseFloat(inte_data.addmoney),
+ prom_integral:parseFloat(inte_data.integral),
+ prom_type: 4,
+ prom_id: inte_data.id,
+ prom_buy_limit: inte_data.limitvipqty,
+ prom_act: inte_data,
+ isshow: 1,
+ can_integral:can_integral,
+ });
+ ee.get_sto();
+
+ }else{
+ ee.setData({prom_type: 0, isshow: 1,});
+ ee.get_sku(os.stoid, ee.data.data.sku, gid);
+ return false;
+ }
+ })
+
+ }
+
+
//---判断拼单----
if (prom_type == 6) {
//-------判断活动是否抢光---------
@@ -2740,11 +3007,13 @@ Page({
if (ind == 1) {
//如果拼单的sku data是空的，就要先获取一下
if (th.data.sku_g_pt) {
+ th.get_sto(1);
th.setData({
is_normal: ind,
openSpecModal_pt: 1
});
} else {
+ th.get_sto(1);
th.get_sku(o.stoid, th.data.data.sku, th.data.gid, 1, function() {
th.setData({
is_normal: ind,
@@ -2753,7 +3022,7 @@ Page({
});
}
} else {
-
+
//拼单商品从这里进，先判断有没有买过商品，
getApp().request.get("/api/weshop/order/page", {
data: {
@@ -4022,8 +4291,8 @@ Page({
var plist=null;
var lock=0;
- //---如果是活动的时候---
- if(th.data.prom_type==1 || th.data.prom_type==6){
+ //---如果是活动的时候,同时不是普通购买---
+ if((th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4) && !th.data.is_normal ) {
func(); return false;
}
@@ -4360,6 +4629,8 @@ Page({
collocationGoods:r_data.collocationPromList,
prom_goods:r_data.promGoodsLists,
})
+
+ th.is_show_more_buy();
}
})
},
@@ -4475,5 +4746,56 @@ Page({
urls: [this.data.shareImgPath]
});
},
+
+ is_show_more_buy:function(){
+ var prom_goods=this.data.prom_goods;
+ var per_price=this.data.sele_g.shop_price
+ if(this.data.card_field && this.data.sele_g[this.data.card_field]>0){
+ per_price=this.data.sele_g[this.data.card_field];
+ }
+ var all_price=per_price*this.data.goodsInputNum;
+ var con=null;
+ for(var i in prom_goods){
+ var item=prom_goods[i];
+ if(item.prom_type==1){
+ if(item.condition>this.data.goodsInputNum) {
+ con=item;
+ con.need=(item.condition-this.data.goodsInputNum)+"件";
+ break;
+ }
+ }else{
+ if(item.condition>this.data.goodsInputNum){
+ con=item;
+ con.need=(item.condition-this.data.goodsInputNum)+"元";
+ break;
+ }
+ }
+ }
+
+ this.setData({hui_condition:con});
+
+ },
+
+ //-- 积分购 --
+ go_pay_integral:function(){
+ this.setData({openSpecModal_inte:1});
+ },
+ //-- 积分购普通购买 --
+ go_pay_integral_normal:function(){
+ this.get_sto(1)
+ this.setData({openSpecModal_inte_normal:1});
+ },
+
+ closeSpecModal_inte:function(){
+ this.setData({openSpecModal_inte:0});
+ } ,
+ closeSpecModal_inte_normal:function(){
+ this.get_sto()
+ this.setData({openSpecModal_inte_normal:0});
+ },
+
+ addCart_inte:function(t){
+ this.add_cart_func_inte(t);
+ }
});
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 3f7bd0a..d4d492d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -230,8 +230,41 @@
-
-
+
+
+
+
+
+
+
+ {{prom_integral}}
+ 积分
+ +
+ {{filters.toFix(prom_price,2)}}元
+ 零售价:￥{{data.market_price}}
+
+
+
+
+
+
+ 分享
+
+
+
+ {{data.goods_name}}
+
+
+
+ 销量：{{prom_act.buy_num}}件
+ 折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折
+ {{categories3[0].num}}人评价
+
+
+
+
+
+
@@ -241,7 +274,7 @@
{{card_name}}
￥{{filters.toFix(data[card_field],2)}}
-
+
零售价:￥{{data.market_price}}
@@ -350,7 +383,7 @@
-
+
{{data.goods_name}}
@@ -835,7 +868,7 @@
立即购买
-
+
@@ -916,6 +949,26 @@
支付尾款
+
+
+
+
+
+
+
+
+ {{filters.toFix(sele_g[card_field],2)}}
+
+
+ {{filters.toFix(sele_g.shop_price,2)}}
+
+
+ 单独购买
+
+ 立即兑换
+ 立即兑换
+
+
@@ -926,7 +979,7 @@
-
+
@@ -935,41 +988,31 @@
{{sele_g.goods_name}}
-
- ￥
-
-
- {{sele_g[card_field]}}
-
-
- {{sele_g.shop_price}}
-
-
+
+ ￥
+
+ {{sele_g[card_field]}}
+ {{sele_g.shop_price}}
- ￥{{prom_price}}
-
+ ￥{{prom_price}}
+
-
- 已售：{{sele_g.sales_sum}}
-
- 可售：{{def_pick_store.CanOutQty}}
- 可售:0
-
-
- 可售：{{sele_g.store_count}}
-
-
-
+
+ 已售：{{sele_g.sales_sum}}
+
+ 可售：{{def_pick_store.CanOutQty}}
+ 可售:0
+
+ 可售：{{sele_g.store_count}}
+
-
- 已售：{{prom_act.buy_num+prom_act.virtual}}
- 已售：{{prom_act.buy_num}}
- 可售：{{prom_act.goods_num-prom_act.buy_num}}
-
-
-
+
+ 已售：{{prom_act.buy_num+prom_act.virtual}}
+ 已售：{{prom_act.buy_num}}
+ 可售：{{prom_act.goods_num-prom_act.buy_num}}
+
@@ -1006,15 +1049,15 @@
地址:{{def_pick_store.fulladdress}}
-
-
- 商品属性
-
-
- {{item.gg}}
+
+
+ 商品属性
+
+
+ {{item.gg}}
+
+
-
-
@@ -1025,6 +1068,20 @@
+
+
+
+
+ 再买{{hui_condition.need}}
+ ，免{{hui_condition.money}}元
+ ，打{{hui_condition.sale}}折
+ ，包邮
+ ，送{{hui_condition.intValue}}积分
+ ，送优惠券
+ ，送赠品
+ ，送礼包
+
+
+
@@ -1072,12 +1129,9 @@
-
-
-
-
-
-
+
+
+
@@ -1103,152 +1157,23 @@
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{sele_g.goods_name}}
-
-
-
-
- ￥ {{sele_g[card_field]}}
-
-
- ￥ {{sele_g.shop_price}}
-
-
- ￥ {{prom_price}}
-
-
-
-
- 已售：{{sele_g.sales_sum}}
- 可售：{{sele_g.store_count}}
-
-
-
-
- 已售：{{prom_act.buy_num}}
- 已售：{{prom_act.buy_num}}
- 可售：{{prom_act.goods_num-prom_act.buy_num}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
-
- 选择门店
-
-
-
- 更多门店
-
-
-
- 地址:{{def_pick_store.fulladdress}}
-
-
-
- 商品属性
-
-
- {{item.gg}}
-
-
-
-
-
-
- {{item.gg}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 购买数量
-
- -
-
- +
-
-
-
-
-
-
-
- 选择门店
-
-
-
-
- {{item.name}}
-
-
- {{item.pickup_name}}
-
-
-
-
-
- {{sec_sto.name}}
-
- {{item.pickup_name}}
-
-
-
-
-
-
- 确定
-
-
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 1004874..d8ef818 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -659,7 +659,6 @@ border-radius: 0 56rpx 55rpx 0;
position: fixed;
bottom: 50rpx;
left: 4%;
-
}
.spec-cart-btn {
@@ -671,6 +670,10 @@ left: 4%;
border-radius: 40rpx;
}
+.spec-cart-btn.w40 {
+ width: 46%;
+}
+
.spec-add-cart {
background-color: #ffb03f;
}
@@ -2682,4 +2685,9 @@ button.custom-service::after{
position: absolute;
right: 20rpx;
top: 10rpx;
-}
\ No newline at end of file
+}
+
+.goods-price .rel_txt{
+ position: relative; top: 32rpx; font-size: 30rpx;
+}
+.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 12rpx;}
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 7f066a6..c8ff1f4 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -52,9 +52,14 @@
{{item.goods_name}}
-
+
- ￥{{item.prom_price}}
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+