diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 8e75ff3..115d86e 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -4,7 +4,7 @@ var oo=t.globalData.setting;
var regeneratorRuntime = require('../../../utils/runtime.js');
var util_pay = require("../../../utils/pay.js");
-Page({
+Page({
data: {
url: t.globalData.setting.url,
resourceUrl: t.globalData.setting.resourceUrl,
@@ -75,7 +75,15 @@ Page({
selected_quan_pick:null,
is_close_quan:0,
disabled:0,
+ open_express:0,//控制选择物流名列表 的属性
+
+ is_express:0,//选中物流的属性
+
+ express_name:"商家自配",
+ expres_name:"",//点击选定
+ isopen:0,//券的说明
+ is_coupon:0,//选择券的控制属性
},
onLoad: function(t) {
@@ -143,6 +151,7 @@ Page({
//-------------------获取物流---------------
get_wuliu(func) {
+
var th = this;
to.getwuliu(function (e) {
console.log("ws");
@@ -400,6 +409,7 @@ Page({
}).then(res=>{
if(res.data.code==0)
quanlist=res.data.data.pageData;
+
})
}
@@ -417,7 +427,7 @@ Page({
t.data.data.prom_id = 0;
t.data.data.prom_type = 0;
-
+ console.log("44444444444444券的列表", quanlist);
th.setData({
bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
@@ -463,6 +473,7 @@ Page({
}
}
}
+ console.log("3333333333券的列表", quanlist);
th.setData({
bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
@@ -1198,6 +1209,7 @@ Page({
var is_using= th.check_in_sele(quanlist[i].CashRepNo,pickid);
if(is_using) quanlist[i].is_using=1;
}
+ console.log("2222222券的列表", quanlist);
th.setData({open_quan:1,selected_quan_pick:pickid,selected_quan_list:quanlist,disabled:1});
}
},
@@ -1229,6 +1241,7 @@ Page({
for(var ind in quanlist){
quanlist[ind].show_red=0;
}
+
this.setData({selected_quan_list:quanlist});
var using_quan=this.data.using_quan;
var th=this;
@@ -1335,7 +1348,50 @@ Page({
}
return arr;
- }
+ },
+ // 开启物流的弹窗
+ express_name:function(){
+ this.setData({ open_express: 1});
+ },
+ // 关闭物流的弹窗
+ close_express:function(){
+ this.setData({ open_express:0 });
+ },
+ // 选择物流
+ click_express_name:function(e){
+ var express_name=e.currentTarget.dataset.name;
+ var index=e.currentTarget.dataset.idxe;
+ this.setData({ expres_name: express_name, is_express:index});
+ },
+ //点击确定物流
+ determine_expres:function(){
+
+ var name=this.data.expres_name
+ this.setData({ express_name: name, open_express: 0});
+ },
+ //设置默认物流
+ set_default:function(){
+
+ },
+ //点击打开优惠券使用说明
+ clik_coupons:function(e){
+
+ var ind = e.currentTarget.dataset.idx;
+ var is_open = this.data.selected_quan_list[ind].is_open;
+ console.log(is_open,"是什么东西");
+ if (is_open == 1) is_open = 0;
+ else is_open = 1;
+
+ var txt = "selected_quan_list[" + ind + "].is_open"
+ var obj = {}; obj[txt] = is_open;
+ this.setData(obj);
+ },
+ //选择券
+ sele_coupon:function(e){
+ var ind = e.currentTarget.dataset.ind;
+ console.log("下标", ind);
+ this.setData({ is_coupon: ind});
+ }
});
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 334ba4e..840a580 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -1,6 +1,9 @@
+
+
+