diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 6efcfa0..c191192 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1,7 +1,7 @@ var t = require("../../../utils/util.js"), ut = t, e = require("../../../utils/common.js"), - a = require("../../../utils/wxParse/wxParse.js"), + a = require("../../../utils/wxParse/wxParse.js"), s = getApp(), i = s.request, rq = i, @@ -18,14 +18,14 @@ var more = function(e) { var utils = require('../../../utils/util.js'); var regeneratorRuntime = require('../../../utils/runtime.js'); - + Page({ data: { - start_stop:2,//秒杀开始 结束 的控制(1正在进行，2即将开始) - color_type:0,//线条控制 - color_type_one:0, - color_type_two:1, - + start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始) + color_type: 0, //线条控制 + color_type_one: 0, + color_type_two: 1, + gid: "", stoid: o.stoid, url: o.url, @@ -50,7 +50,8 @@ Page({ activeCategoryId: 0, supportPageScroll: !1, address: { - address: "", district: 0 + address: "", + district: 0 }, shipping: "", shippingCost: 0, @@ -75,29 +76,30 @@ Page({ }], activeCategoryId3: 1, categories3: [{ - name: "全部", - id: 1, - num: 0 - }, - { + name: "全部", + id: 1, + num: 0 + }, + { name: "有图", id: 5, num: 0 }, { - name: "好评", - id: 2, - num: 0 - }, { - name: "中评", - id: 3, - num: 0 - }, { - name: "差评", - id: 4, - num: 0 - }, ], + name: "好评", + id: 2, + num: 0 + }, { + name: "中评", + id: 3, + num: 0 + }, { + name: "差评", + id: 4, + num: 0 + }, + ], select: { price: 0, @@ -119,11 +121,11 @@ Page({ is_show_sto_cat: 1, //是否显示门店分类 only_pk: null, all_sto: null, - sec_sto: null, //选择了的门店分类 - pickpu_list:null, //读出的所有门店list - def_pickpu_list:null, //一开始5个门店list - sec_pick_index:0, //第二级门店选择ID - fir_pick_index:0, //第一级门店选择ID + sec_sto: null, //选择了的门店分类 + pickpu_list: null, //读出的所有门店list + def_pickpu_list: null, //一开始5个门店list + sec_pick_index: 0, //第二级门店选择ID + fir_pick_index: 0, //第一级门店选择ID //同一条形码的所有商品 sku_g: null, @@ -147,17 +149,17 @@ Page({ prom_start_time: null, prom_act: null, pd_xx: 0, - is_normal: 0, //是否普通购买 - teamgroup:null, //有多少人开团 - grounp_tatal:0, //有几个人开团 - timer:[], + is_normal: 0, //是否普通购买 + teamgroup: null, //有多少人开团 + grounp_tatal: 0, //有几个人开团 + timer: [], //商品的购买次数 prom_buy_num: -1, g_buy_num: null, - prom_goods_num:0, //活动商品数量 - prom_buy_num:0, //活动商品购买数量 - prom_redis_num:0, //活动商品redis数量 + prom_goods_num: 0, //活动商品数量 + prom_buy_num: 0, //活动商品购买数量 + prom_redis_num: 0, //活动商品redis数量 //拼单的规则显示 is_show_gz: 0, @@ -169,136 +171,167 @@ Page({ openSpecModal_ind: 0, //---计时器开关---- - is_timer:1, - isshow:0, - bconfig:null, //基础配置 + is_timer: 1, + isshow: 0, + bconfig: null, //基础配置 - fir_comments:null, //详情页上的评价 - fir_quan:null, //详情页上的券 - quan_list:null, //券列表 + fir_comments: null, //详情页上的评价 + fir_quan: null, //详情页上的券 + quan_list: null, //券列表 - coupon:0, + coupon: 0, //会员分享的头像 - share_head:"", - share_goods_img:"", + share_head: "", + share_goods_img: "", //----------视频图片data参数--------- - current: 0,//图片计数 - swiperCurrent:0,//轮播的下标 - hiddenn:0,//控制轮播计数显示 + current: 0, //图片计数 + swiperCurrent: 0, //轮播的下标 + hiddenn: 0, //控制轮播计数显示 - currentTab: 0,// 选择器控制参数 + currentTab: 0, // 选择器控制参数 mapurl: "", - mapurl_f_img:"", - videopicture: 0,//视频图片的控制 + mapurl_f_img: "", + videopicture: 0, //视频图片的控制 - video: 0,//视频图片切换器 + video: 0, //视频图片切换器 index: 0, - noon: 0,//开始视频的隐藏 + noon: 0, //开始视频的隐藏 - screenWidth:0, - canvasHidden:1, + screenWidth: 0, + canvasHidden: 1, //--推荐-- - recommend_list:[], - store_config:null, - is_show_pl:0, //是否品类 - is_show_pp:0, //是否品牌 - is_show_gb:0, //是否国别 - is_closecoupon:0, + recommend_list: [], + store_config: null, + is_show_pl: 0, //是否品类 + is_show_pp: 0, //是否品牌 + is_show_gb: 0, //是否国别 + is_closecoupon: 0, //是否点赞中 iszaning: 0, - select_store:0,//选择更多 - index:1, - more_store:0,//选择门店 - sort_store:0,//门店分类 - choice_sort_store:0,//选择分类门店 - new_user:0,//新用户 + select_store: 0, //选择更多 + index: 1, + more_store: 0, //选择门店 + sort_store: 0, //门店分类 + choice_sort_store: 0, //选择分类门店 + new_user: 0, //新用户 + + def_pick_store: null, // 默认的门店 + lat: null, //维度 + lon: null, //经度 - def_pick_store:null,// 默认的门店 - lat:null, //维度 - lon:null, //经度 + is_get_local_ok: 0, //获取坐标是否完成 + region_name: "门店分类", //区域的名字 + is_gps: 1, + open_ind_store: 0, //哪里打开的门店列表的控制属性 + default_store: {}, //创建添加默认门店地址的对象 - is_get_local_ok:0,//获取坐标是否完成 - region_name:"门店分类",//区域的名字 - is_gps:1, - open_ind_store:0,//哪里打开的门店列表的控制属性 - default_store:{},//创建添加默认门店地址的对象 + comments_no_more:0, + get_c:0, }, //------初始化加载---------- onLoad: function(t) { - wx.setNavigationBarTitle({ title: "商品详情",}) - var ee = this, that=ee,th=ee, + wx.setNavigationBarTitle({ + title: "商品详情", + }) + var ee = this, + that = ee, + th = ee, gid = t.goods_id; - + //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- if (gid == undefined || gid == null || gid == "") { gid = decodeURIComponent(postdata.scene); } - ee.setData({ gid: gid }); + ee.setData({ + gid: gid + }); //----获取系统参数----- - getApp().getConfig2(function (e) { - ee.setData({bconfig:e}); - - if (e.categoryset.indexOf("," + 1 + ",") != -1) { ee.setData({ is_show_pl: 1 }); } - if (e.categoryset.indexOf("," + 3 + ",") != -1) { ee.setData({ is_show_pp: 1 }); } - if (e.categoryset.indexOf("," + 2 + ",") != -1) { ee.setData({ is_show_gb: 1 }); } - - var json_d = JSON.parse(e.switch_list); - ee.setData({ store_config: e, is_closecoupon: json_d.is_closecoupon }); - ee.init(gid); - //------几人评价------- - n.init(th, "", "comments"); - th.requestCardNum(), wx.pageScrollTo && th.setData({ - supportPageScroll: !0 + getApp().getConfig2(function(e) { + ee.setData({ + bconfig: e + }); + + if (e.categoryset.indexOf("," + 1 + ",") != -1) { + ee.setData({ + is_show_pl: 1 }); + } + if (e.categoryset.indexOf("," + 3 + ",") != -1) { + ee.setData({ + is_show_pp: 1 + }); + } + if (e.categoryset.indexOf("," + 2 + ",") != -1) { + ee.setData({ + is_show_gb: 1 + }); + } - + var json_d = JSON.parse(e.switch_list); + ee.setData({ + store_config: e, + is_closecoupon: json_d.is_closecoupon + }); + ee.init(gid); + //------几人评价------- + //n.init(th, "", "comments"); + + th.requestCardNum(), wx.pageScrollTo && th.setData({ + supportPageScroll: !0 + }); }); //获取用户设备信息，屏幕宽度 wx.getSystemInfo({ success: res => { - that.setData({ screenWidth: res.screenWidth }) + that.setData({ + screenWidth: res.screenWidth + }) } }); //获取用户的默认门店 - getApp().get_user_store(function (e) { - var w_time=setInterval(function () { - if(that.data.is_get_local_ok==0) return false; - var distance=null; - if( that.data.lat!=null && e.distance==undefined){ - //distance=Math.sqrt((e.lat-th.data.lat)*(e.lat-th.data.lat)+(e.lon-th.data.lon)* (e.lon-th.data.lon)); - var distance=ut.getDistance(e.lat,th.data.lat,e.lon,th.data.lon); - e.distance=distance; - } - if(e) that.setData({def_pick_store:e,sto_sele_name:e.pickup_name,sto_sele_id:e.pickup_id,sto_sele_distr:e.distr_type}) - clearInterval(w_time); - },500) - }) + getApp().get_user_store(function(e) { + var w_time = setInterval(function() { + if (that.data.is_get_local_ok == 0) return false; + var distance = null; + if (that.data.lat != null && e.distance == undefined) { + //distance=Math.sqrt((e.lat-th.data.lat)*(e.lat-th.data.lat)+(e.lon-th.data.lon)* (e.lon-th.data.lon)); + var distance = ut.getDistance(e.lat, th.data.lat, e.lon, th.data.lon); + e.distance = distance; + } + if (e) that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type + }) + clearInterval(w_time); + }, 500) + }); - - }, //------------程序初始化入口------------- async init(gid) { - var ee = this,th=ee, + var ee = this, + th = ee, gallery = null, is_collect = 0, collect_id = 0, categories3 = ee.data.categories3, - fir_com=null, - fir_quan=null, - mapurl=null, - mapurl_f_img=null; + fir_com = null, + fir_quan = null, + mapurl = null, + mapurl_f_img = null; //------图片滚动---------- @@ -381,51 +414,50 @@ Page({ is_show:1, }, }).then(res => { - fir_com=res.data.data.pageData; + fir_com = res.data.data.pageData; }) - if(fir_com){ - for(var ind in fir_com){ - if(fir_com[ind].head_pic=="") fir_com[ind].head_pic= ee.data.iurl+"/miniapp/images/hui_hear_pic.png"; - if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img); - if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img); - } + if (fir_com) { + for (var ind in fir_com) { + if (fir_com[ind].head_pic == "") fir_com[ind].head_pic = ee.data.iurl + "/miniapp/images/hui_hear_pic.png"; + if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img); + if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img); + } } - if (th.data.is_closecoupon!=1){ + if (th.data.is_closecoupon != 1) { //----获取详情页的券的数量---- await getApp().request.promiseGet("/api/weshop/prom/coupon/page", { data: { store_id: os.stoid, - type:1, + type: 1, pageSize: 3, - page:1, + page: 1, }, }).then(res1 => { - fir_quan=res1.data.data.pageData; + fir_quan = res1.data.data.pageData; }) } - //--------获取视频图片--------- - await getApp().request.promiseGet("/api/weshop/goodsVideos/get/"+os.stoid+"/"+ee.data.gid, { - 1:1 + await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, { + 1: 1 }).then(res1 => { - if(res1.data.code==0){ - mapurl=res1.data.data.video_url; - mapurl_f_img=res1.data.data.video_img; - } + if (res1.data.code == 0) { + mapurl = res1.data.data.video_url; + mapurl_f_img = res1.data.data.video_img; + } }) - + ee.setData({ gallery: gallery, is_collect: is_collect, collect_id: collect_id, categories3: categories3, - fir_quan:fir_quan, - fir_comments:fir_com, - mapurl_f_img:mapurl_f_img, - mapurl:mapurl, + fir_quan: fir_quan, + fir_comments: fir_com, + mapurl_f_img: mapurl_f_img, + mapurl: mapurl, }); ee.requestRecommend(); @@ -435,8 +467,10 @@ Page({ //---展示--- onShow: function() { - this.data.is_timer=1; - var ee = this,gid = this.data.gid,i=getApp().request; + this.data.is_timer = 1; + var ee = this, + gid = this.data.gid, + i = getApp().request; this.wait_for_store_config(); @@ -485,7 +519,7 @@ Page({ if (t.data.data.original_img.indexOf(o.imghost) == -1) t.data.data.original_img = o.imghost + t.data.data.original_img; - if(t.data.data.goods_content==null) t.data.data.goods_content=""; + if (t.data.data.goods_content == null) t.data.data.goods_content = ""; //-----商品详情--- a.wxParse("content", "html", t.data.data.goods_content, ee, 6); e.wxParseAddFullImageUrl(ee, "content"); @@ -513,12 +547,14 @@ Page({ t.data.data.gg = gg; var uu = []; uu.push(t.data.data); - ee.setData({ sku_g: uu,}); + ee.setData({ + sku_g: uu, + }); } ee.data.g_buy_num = new Map(); ee.check_prom(gid, ee.data.data.prom_type, ee.data.data.prom_id); - var th=ee; + var th = ee; if (ee.data.cat_name == '') { //过去国别，分类，品牌的名称 i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { @@ -560,7 +596,7 @@ Page({ }); this.data.enterAddressPage && (this.data.enterAddressPage = !1); - + }, enterAddress: function() { @@ -569,8 +605,8 @@ Page({ }); }, onUnload: function() {}, - onHide:function(){ - this.data.is_timer=0; + onHide: function() { + this.data.is_timer = 0; }, //----------三个选项按钮----------- tabClick: function(t) { @@ -591,9 +627,9 @@ Page({ e.data.c_curr_p = 1; this.setData({ activeCategoryId3: t.currentTarget.id, - comments: null + comments: null,comments_no_more:0,get_c:0, }); - this.requestComments(); + this.requestComments_new(); } }, @@ -605,13 +641,14 @@ Page({ tabComment: function() { this.setData({ - activeCategoryId: 2 - }), this.data.comments || this.requestComments(); + activeCategoryId: 2,comments_no_more:0,get_c:0 + }), this.data.comments || this.requestComments_new(); }, //商品详情的时候调用 tabGoodsContent: function() { - var th = this,i=getApp().request; + var th = this, + i = getApp().request; this.setData({ activeCategoryId: 1 }); @@ -654,46 +691,53 @@ Page({ }, //获取redis中的数量 - async getactLen(func){ - var r_num=0,prom_type=this.data.prom_type,prom_id=this.data.prom_id; - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { + async getactLen(func) { + var r_num = 0, + prom_type = this.data.prom_type, + prom_id = this.data.prom_id; + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { 1: 1 }).then(res => { var em = res; if (em.data.code == 0) { - r_num=em.data.data; + r_num = em.data.data; } }) func(r_num); }, //------------加入购物车-------------- - addCart: function(t) { - var th=this; + addCart: function(t) { + var th = this; var ind = t.currentTarget.dataset.openSpecModal_ind; - th.setData({open_ind_store: ind}); + th.setData({ + open_ind_store: ind + }); //如果是秒杀的话，要看redis够不够 - if(this.data.prom_type==1){ - this.getactLen(function (num) { - if(num o.store_count) return s.my_warnning("超出商品库存",0,th); + if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); + if (th.data.goodsInputNum > o.store_count) return s.my_warnning("超出商品库存", 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); + if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); //--------------此时操作的数据------------ var newd = { @@ -744,8 +788,8 @@ Page({ //-----如果是秒杀，团购，积分购,拼团----- if (th.data.prom_type == 1) { newd.goods_price = th.data.prom_price; - newd.member_goods_price= th.data.prom_price, - newd.prom_type = th.data.prom_type; + newd.member_goods_price = th.data.prom_price, + newd.prom_type = th.data.prom_type; newd.prom_id = th.data.prom_id; } else if (th.data.prom_type == 3) { newd.prom_type = 0; @@ -776,20 +820,24 @@ Page({ i.put("/api/weshop/cart/update", { data: updata, success: function(t) { - getApp().my_warnning('加入购物车成功', 1, th,450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({cartGoodsNum:c_num}); - th.closeSpecModal(); + getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + th.closeSpecModal(); } }); } else { i.post("/api/weshop/cart/save", { data: newd, success: function(t) { - getApp().my_warnning('加入购物车成功', 1, th,450); - var c_num=th.data.cartGoodsNum+e.data.goodsInputNum; - th.setData({cartGoodsNum:c_num}); - th.closeSpecModal(); + getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + e.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + th.closeSpecModal(); } }); } @@ -845,11 +893,10 @@ Page({ this.checkCartNum(Number(t.detail.value)); }, - //------检查数量是不是超出限购------ checkCartNum: function(t) { var th = this; - this.get_buy_num(this.data.sele_g,async function() { + this.get_buy_num(this.data.sele_g, async function() { //--判断商品是否超出限购-- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { @@ -863,7 +910,7 @@ Page({ //--判断商品是否超出活动限购-- 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) { + if (t + th.data.prom_buy_num > th.data.prom_buy_limit) { wx.showModal({ title: '超出商品活动限购', }); @@ -871,20 +918,22 @@ Page({ } } - 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 + 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; - }); + redis_num = res.data.data; + }); - if(t>redis_num){ - wx.showModal({ title: '超出商品活动库存', }); - return false; - } + if (t > redis_num) { + wx.showModal({ + title: '超出商品活动库存', + }); + return false; + } } @@ -896,7 +945,6 @@ Page({ }) }, - closeSpecModal: function() { this.setData({ openSpecModal: !1, @@ -905,14 +953,19 @@ Page({ }, openSpecModel: function(t) { var open_store = t.currentTarget.dataset.ind; - + this.setData({ - store: 0, choice_sort_store: 0, sort_store: 0, open_ind_store: open_store, + store: 0, + choice_sort_store: 0, + sort_store: 0, + open_ind_store: open_store, }) //--先判断会员状态-- - var user_info=getApp().globalData.userInfo; - if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){ - wx.navigateTo({ url: '/pages/getphone/getphone', }) + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/getphone/getphone', + }) return false; } @@ -924,10 +977,11 @@ Page({ }, //---------点击收藏和不收藏------------ collectGoods: function() { - var t = this,i=getApp().request; + var t = this, + i = getApp().request; var user_id = s.globalData.user_id; if (user_id == '') { - getApp().getUserFir(function () {}); + getApp().getUserFir(function() {}); getApp().showWarning("未登录"); return false; } else { @@ -936,7 +990,8 @@ Page({ success: function(e) { if (e.data.code == 0) { t.setData({ - is_collect: 0,collect_id: 0, + is_collect: 0, + collect_id: 0, }); } } @@ -968,21 +1023,21 @@ Page({ //---------联系客服------------ contactService: function() { s.getConfig(function(t) { - if(t.store_tel==undefined){ - getApp().request.get("/api/weshop/store/get/" + os.stoid,{ - isShowLoading:1, - data:{}, - success:function (rs) { - getApp().globalData.config = rs.data.data; - if(rs.data.data.store_tel==null && rs.data.data.store_tel==undefined ){ - getApp().my_warnning("商家未设置电话",0,th); - return false; - } - s.confirmBox("请联系客服：" + rs.data.data.store_tel); - } - }) - }else{ - s.confirmBox("请联系客服：" + t.store_tel); + if (t.store_tel == undefined) { + getApp().request.get("/api/weshop/store/get/" + os.stoid, { + isShowLoading: 1, + data: {}, + success: function(rs) { + getApp().globalData.config = rs.data.data; + if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { + getApp().my_warnning("商家未设置电话", 0, th); + return false; + } + s.confirmBox("请联系客服：" + rs.data.data.store_tel); + } + }) + } else { + s.confirmBox("请联系客服：" + t.store_tel); } }); }, @@ -1022,8 +1077,6 @@ Page({ }); }, - - previewGoodsCommentImgs: function(t) { var e = this, a = this.data.data.comment[t.currentTarget.dataset.cidx].img; @@ -1052,7 +1105,7 @@ Page({ bind_bnerr: function(e) { var _errImg = e.target.dataset.errorimg; var _errObj = {}; - _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif"; + _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; }, @@ -1061,7 +1114,7 @@ Page({ var _errImg = e.target.dataset.errorimg; var _errObj = {}; - _errObj[_errImg] = this.data.iurl+"/miniapp/images/hui_hear_pic.png" + _errObj[_errImg] = this.data.iurl + "/miniapp/images/hui_hear_pic.png" this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; }, @@ -1125,17 +1178,24 @@ Page({ var sku_g = this.data.sku_g; var item = null; for (var i in sku_g) { - if (sku_g[i].goods_id == gid) { item = sku_g[i]; break } + if (sku_g[i].goods_id == gid) { + item = sku_g[i]; + break + } } - if (item) this.setData({ sele_g: item, gid: gid }); + if (item) this.setData({ + sele_g: item, + gid: gid + }); }, //---------拿出门店分类和门店------------ get_sto(e) { - var th=this; - var timer_get=setInterval(function () { - if(th.data.is_get_local_ok==0) return false; - var dd = null,i=getApp().request; + var th = this; + var timer_get = setInterval(function() { + if (th.data.is_get_local_ok == 0) return false; + var dd = null, + i = getApp().request; var g_distr_type = th.data.data.distr_type; if (g_distr_type != 0) { dd = { @@ -1152,9 +1212,9 @@ Page({ } } //如果有距离的话 - if(th.data.lat!=null){ - dd.lat=th.data.lat; - dd.lon=th.data.lon; + if (th.data.lat != null) { + dd.lat = th.data.lat; + dd.lon = th.data.lon; } clearInterval(timer_get); //----------获取门店---------------- @@ -1164,9 +1224,9 @@ Page({ var e = res; if (e.data.code == 0) { //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- - if(th.data.def_pick_store) { - for(var k=0;k 0) { - var def_arr=new Array(); - var ishas=0; + var def_arr = new Array(); + var ishas = 0; //-- 开始就看5个门店 -- - for(var k=0;k<5;k++){ - if(k==e.data.data.pageData.length) break; + for (var k = 0; k < 5; k++) { + if (k == e.data.data.pageData.length) break; def_arr.push(e.data.data.pageData[k]); } - th.setData({def_pickpu_list:def_arr,pickpu_list:ee.data.data.pageData}); + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); @@ -1203,7 +1266,7 @@ Page({ for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, - find2name = ""; + find2name = ""; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { find2 = sto_cate[m].cat_id; @@ -1289,7 +1352,7 @@ Page({ } } }) - },200) + }, 200) }, @@ -1333,62 +1396,77 @@ Page({ }, //评论的调用 - requestComments: function() { - var e = this, th = e; - var tp = e.data.activeCategoryId3; + requestComments_new: async function(){ + var e = this, th = e,ee=e; var tp = e.data.activeCategoryId3; var t = '/api/weshop/comment/pageComment?page=' + e.data.c_curr_p; - var req_where={ - store_id: o.stoid, - pageSize: 5, - parent_id: 0, - goods_id: th.data.gid, - commenttype: tp, - is_show:1, + wx.showLoading(); + var req_where = { + store_id: o.stoid, pageSize: 5, + parent_id: 0, goods_id: th.data.gid, commenttype: tp, } - if(getApp().globalData.userInfo){ - req_where.userId=getApp().globalData.userInfo.user_id; + if (getApp().globalData.userInfo) { + req_where.userId = getApp().globalData.userInfo.user_id; } - n.request(t, async function(ee) { - var tot = ee.data.data.total; - e.setData({ - com_num: tot,get_c:1 - }); + var rs_data=null; + await getApp().request.promiseGet(t, { data: req_where}).then(res=>{ + var tot = res.data.data.total; e.data.c_curr_p++; + e.setData({ + com_num: tot, //已经有加载 + }); + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + rs_data=res.data.data.pageData; + }else{ + th.setData({comments_no_more:1,auto:1}); + } + }) - var cda = th.data.comments; - for(var ind in cda){ - var ep= cda[ind]; - if(ep.is_req!=1){ - await getApp().request.promiseGet("/api/weshop/comment/pageComment",{ - data:{store_id:o.stoid ,parent_id:ep.comment_id} - }).then(res=>{ - cda[ind].is_req=1; - if(cda[ind].head_pic==''){ - cda[ind].head_pic= th.data.iurl+"/miniapp/images/hui_hear_pic.png"; - } - if(res.data.data.pageData && res.data.data.pageData.length>0){ - cda[ind].replay_list=res.data.data.pageData; - } - if(ep.weapp_img!="" && ut.isString(ep.weapp_img)){ - cda[ind].weapp_img=JSON.parse(ep.weapp_img); - } - }) - } + if (rs_data){ + //var cda = th.data.comments; + var cda = rs_data,com_data=th.data.comments; + for (var ind in cda) { + var ep = cda[ind]; + if (cda[ind].head_pic == '') { + cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png"; + } + if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) { + cda[ind].weapp_img = JSON.parse(ep.weapp_img); + } + if (ep.img != "" && ut.isString(ep.img)) { + cda[ind].img = ut.unserialize(ep.img); + } + + //--测量多有字的宽带，计算有多少行-- + var widh=ut.measureText(ep.content,30); + var lines=widh/712; + cda[ind].seeMore=false; + if(lines>3) cda[ind].seeMore=true; + + await getApp().request.promiseGet("/api/weshop/comment/pageComment", { + data: {store_id: o.stoid, parent_id: ep.comment_id } + }).then(res => { + if (res.data.data.pageData && res.data.data.pageData.length > 0) { + cda[ind].replay_list = res.data.data.pageData; + } + }) } - th.setData({ - comments: cda - }); + if (!com_data) com_data = cda; + else com_data = com_data.concat(cda); - }, null,req_where); + th.setData({ comments: com_data}); + } + th.setData({get_c: 1}); + wx.hideLoading(); }, //加载更多是靠这个函数 onReachBottom: function() { - if (this.data.activeCategoryId == 2) - n.canloadMore() && this.requestComments(); + if (this.data.activeCategoryId == 2){ + if(!this.data.comments_no_more) this.requestComments_new(); + } }, //--------检查是否活动，活动是否开始，或者是否结束------- @@ -1397,7 +1475,8 @@ Page({ th = ee; if (prom_type == 3 || prom_type == 0) { this.setData({ - prom_type: prom_type,isshow:1, + prom_type: prom_type, + isshow: 1, }); return false; } @@ -1420,7 +1499,8 @@ Page({ success: function(t) { if (t.data.code != 0) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1428,25 +1508,28 @@ Page({ //----已经结束----- if (t.data.data.is_end == 1) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; } //----已经过期----- var now = ut.gettimestamp(); - if (t.data.data.end_time < now ) { + if (t.data.data.end_time < now) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; } /*-- 还没有开始预热的也不显示 --*/ - if (t.data.data.show_time >now) { + if (t.data.data.show_time > now) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1455,7 +1538,7 @@ Page({ var t_gd = ee.data.data; var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); - + ee.setData({ prom_price: t.data.data.price, prom_type: 1, @@ -1464,7 +1547,7 @@ Page({ prom_act: t.data.data, prom_end_time: prom_end_time, prom_start_time: prom_start_time, - isshow:1, + isshow: 1, }); var newTime = ut.gettimestamp(); @@ -1515,7 +1598,8 @@ Page({ success: function(t) { if (t.data.code != 0) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1523,7 +1607,8 @@ Page({ //----已经结束----- if (t.data.data.is_end == 1) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1532,7 +1617,8 @@ Page({ var now = ut.gettimestamp(); if (t.data.data.end_time < now) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1541,7 +1627,8 @@ Page({ /*-- 还没有开始预热的也不显示 --*/ if (t.data.data.show_time > now) { ee.setData({ - prom_type: 0,isshow:1, + prom_type: 0, + isshow: 1, }); ee.get_sku(os.stoid, ee.data.data.sku, gid); return false; @@ -1562,51 +1649,55 @@ Page({ th.data.buy_order = odr; if (odr.pt_status == 0 && odr.order_status == 1) { th.setData({ - user_order_pt_state: 1 + user_order_pt_state: 1 }); } if (odr.pt_status == 1 && odr.order_status == 1) { - if (odr.is_zsorder == 4){ - getApp().request.promiseGet("/api/weshop/teamgroup/page/", { - data: { store_id: os.stoid, team_id: odr.pt_prom_id, listno: odr.pt_listno } - }).then(res => { - var now=ut.gettimestamp(); - var tgr = res.data.data.pageData[0]; - //如果团的时间已经到了 - if (now >= tgr.kt_end_time){ - th.update_jiti(tgr.id); - }else{ - th.setData({ - user_order_pt_state: 2 - }); - } - }) - - }else{ - th.setData({ - user_order_pt_state: 2 - }); - } - } - - if (odr.pt_status == 2 && odr.is_zsorder == 4) { + if (odr.is_zsorder == 4) { + getApp().request.promiseGet("/api/weshop/teamgroup/page/", { + data: { + store_id: os.stoid, + team_id: odr.pt_prom_id, + listno: odr.pt_listno + } + }).then(res => { + var now = ut.gettimestamp(); + var tgr = res.data.data.pageData[0]; + //如果团的时间已经到了 + if (now >= tgr.kt_end_time) { + th.update_jiti(tgr.id); + } else { + th.setData({ + user_order_pt_state: 2 + }); + } + }) + + } else { th.setData({ - user_order_pt_state: 3, + user_order_pt_state: 2 }); - th.data.wk_order_id=odr.order_id; + } + } + + if (odr.pt_status == 2 && odr.is_zsorder == 4) { + th.setData({ + user_order_pt_state: 3, + }); + th.data.wk_order_id = odr.order_id; } } }, }); //----------查看阶梯团------------ - if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined){ - t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); - var max_num=0; - t.data.data.ct_rylist.forEach(function (val,ind) { - if(val.rynum>max_num) max_num=val.rynum; - }) - t.data.data.max_ct_num=max_num; + if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) { + t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); + var max_num = 0; + t.data.data.ct_rylist.forEach(function(val, ind) { + if (val.rynum > max_num) max_num = val.rynum; + }) + t.data.data.max_ct_num = max_num; } var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); @@ -1619,7 +1710,7 @@ Page({ prom_act: t.data.data, prom_end_time: prom_end_time, prom_start_time: prom_start_time, - isshow:1, + isshow: 1, }); var newTime = now; @@ -1651,40 +1742,51 @@ Page({ }, //--获取有多少人在开团-- - async get_team_group(prom_id){ - var teamgroup=[],th=this,grounp_tatal=0; - //如果活动是开团不是商家团 - if(this.data.prom_act.kttype>1) { - //获取活动从表信息team_id - await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + async get_team_group(prom_id) { + var teamgroup = [], + th = this, + grounp_tatal = 0; + //如果活动是开团不是商家团 + if (this.data.prom_act.kttype > 1) { + //获取活动从表信息team_id + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: { + store_id: os.stoid, + pageSize: 3, + page: 1, + state: 2, + team_id: prom_id + } + }).then(res => { + teamgroup = res.data.data.pageData; + grounp_tatal = res.data.data.total; + }) + //获取订单的总数这个接口不能用 + for (i = 0; i < teamgroup.length; i++) { + await getApp().request.promiseGet("/api/weshop/order/page", { data: { - store_id: os.stoid, pageSize: 3, page: 1, - state: 2, - team_id: prom_id + store_id: os.stoid, + pt_status: 1, + pt_listno: teamgroup[i].listno } }).then(res => { - teamgroup = res.data.data.pageData; - grounp_tatal = res.data.data.total; + var order = res.data.data.pageData; + teamgroup[i].open_num = order.length; }) - //获取订单的总数这个接口不能用 - for (i = 0; i < teamgroup.length; i++) { - await getApp().request.promiseGet("/api/weshop/order/page", { - data: { store_id: os.stoid, pt_status: 1, pt_listno: teamgroup[i].listno } - }).then(res => { - var order = res.data.data.pageData; - teamgroup[i].open_num = order.length; - }) - await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => { - var user = res.data.data; - teamgroup[i].user = user; - }) - } + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => { + var user = res.data.data; + teamgroup[i].user = user; + }) + } - if (teamgroup.length > 0) { - th.setData({ teamgroup: teamgroup, grounp_tatal: grounp_tatal }); - th.countDown2(); - } + if (teamgroup.length > 0) { + th.setData({ + teamgroup: teamgroup, + grounp_tatal: grounp_tatal + }); + th.countDown2(); } + } }, //---小于10的格式化函数---- @@ -1694,7 +1796,7 @@ Page({ //----倒计时函数----- countDown(time, prom_st) { - if(!this.data.is_timer) return false; + if (!this.data.is_timer) return false; var th = this; // 获取当前时间，同时得到活动结束时间数组 var endTime = time; @@ -1799,8 +1901,8 @@ Page({ if (tt.data.code == 0) { map.set(gd.goods_id, g_buy_num); th.setData({ - g_buy_num: map, - prom_buy_num: tt.data.data.goodsbuynum, + g_buy_num: map, + prom_buy_num: tt.data.data.goodsbuynum, }); "function" == typeof func && func(); } @@ -1841,10 +1943,17 @@ Page({ //--点击弹起拼单-- openSpecModel_pt: function(e) { + + + this.setData({ open_ind_store: 4});//拼团直接给4 + + //--先判断会员状态-- - var user_info=getApp().globalData.userInfo; - if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){ - wx.navigateTo({ url: '/pages/getphone/getphone', }) + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/getphone/getphone', + }) return false; } @@ -1877,7 +1986,7 @@ Page({ pageSize: 1, page: 1 }, - success: function (e) { + success: function(e) { //--跳转到已经购买的情况-- if (e.data.data.pageData.length > 0) { var odr = e.data.data.pageData[0]; @@ -1886,12 +1995,12 @@ Page({ wx.showModal({ title: "您已经购买了该商品待支付中", success: function(a) { - if(a.confirm){ - wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, - }); - } - } + if (a.confirm) { + wx.navigateTo({ + url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, + }); + } + } }); } else if (odr.pt_status == 1 && odr.order_status == 1) { wx.navigateTo({ @@ -1904,8 +2013,7 @@ Page({ }); } - } - else{ + } else { th.setData({ is_normal: ind, openSpecModal_pt: 1 @@ -1918,30 +2026,33 @@ Page({ //-----------------拼单生成方法--------------------- addCart_pt: function() { - var th=this; - if(this.data.is_normal==0){ - //看一下有没有起购数，如果有起购数，要计算起购数 - var qnum=parseFloat(th.data.prom_act.minbuynum); - if(qnum>0 && th.data.goodsInputNum 0 && th.data.goodsInputNum < qnum) { + getApp().confirmBox("拼团商品至少要买" + qnum + "件!"); + return false; + } - th.addcart_pt_func(); - }else{ + th.addcart_pt_func(); + } else { th.addcart_pt_func(); } }, - addcart_pt_func:function(){ + addcart_pt_func: function() { if (oo.user_id == null) { - s.my_warnning("还未登录！",0,this);return; + s.my_warnning("还未登录！", 0, this); + return; } - var e = this, th = e,o = this.data.sele_g; - if (o.store_count <= 0) return s.my_warnning("库存已为空！",0,th); + var e = this, + th = e, + o = this.data.sele_g; + if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); //----------添加到购物车时，要判断限购数量，-------- - e.get_buy_num(o,async function(ee) { + e.get_buy_num(o, async function(ee) { //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { @@ -1964,28 +2075,29 @@ Page({ } } - var redis_num=0 - //-------判断活动是否抢光--------- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/"+th.data.sele_g.prom_id , { - 1: 1 - }).then(res => { - redis_num=res.data.data; - }) + var redis_num = 0 + //-------判断活动是否抢光--------- + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { + 1: 1 + }).then(res => { + redis_num = res.data.data; + }) - if(th.data.goodsInputNum>redis_num){ - wx.showModal({ - title: '提示',content: '超出商品活动库存' - }); - return false; - } + if (th.data.goodsInputNum > redis_num) { + wx.showModal({ + title: '提示', + content: '超出商品活动库存' + }); + return false; + } - if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0",0,th); - if (th.data.goodsInputNum > o.store_count) return s.my_warnning("超出商品库存",0,th); + if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); + if (th.data.goodsInputNum > o.store_count) return s.my_warnning("超出商品库存", 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); + if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); //--------------此时操作的数据------------ var newd = { goods_id: o.goods_id, @@ -2010,8 +2122,8 @@ Page({ if (newd.kt_type > 1) { newd.is_pt_tz = 1; //开团类型 } - if (newd.kt_type == 3 && th.data.is_normal!=1){ - th.data.sto_sele_distr=1; + if (newd.kt_type == 3 && th.data.is_normal != 1) { + th.data.sto_sele_distr = 1; } } else if (th.data.prom_type == 3) { @@ -2036,14 +2148,14 @@ Page({ //-------跳转pt商品------- go_to_nopay: function() { - var th=this; + var th = this; wx.navigateTo({ url: "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id, }); }, //-------跳转pt teamshow------- go_to_team_show: function() { - var th=this; + var th = this; wx.navigateTo({ url: "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn, }); @@ -2051,7 +2163,7 @@ Page({ //---拼团倒计时--- countDown2() { - if(!this.data.is_timer) return false; + if (!this.data.is_timer) return false; var th = this; // 获取当前时间，同时得到活动结束时间数组 var newTime = ut.gettimestamp(); @@ -2077,7 +2189,10 @@ Page({ } else { //活动已结束，全部设置为'00' obj = { - day: '00',hou: '00',min: '00', sec: '00' + day: '00', + hou: '00', + min: '00', + sec: '00' } } var txt = "timer[" + j + "]"; @@ -2088,11 +2203,11 @@ Page({ setTimeout(th.countDown2, 1000); }, //跳转参加团 - go_cj_team:function (e) { - var ind=e.currentTarget.dataset.ind; - var item=this.data.teamgroup[ind]; - var id=item.id; - var th=this; + go_cj_team: function(e) { + var ind = e.currentTarget.dataset.ind; + var item = this.data.teamgroup[ind]; + var id = item.id; + var th = this; getApp().request.get("/api/weshop/order/page", { data: { @@ -2103,205 +2218,231 @@ Page({ page: 1 }, success: function(e) { - if (e.data.code != 0) { - getApp().my_warnning("读取订单失败",0,th); - return fasle; - } - //--跳转到已经购买的情况-- - if ( e.data.data.pageData.length > 0) { - var odr = e.data.data.pageData[0]; - //还未支付 - if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0) ) { - wx.showModal({ - title: "您已经购买了该商品待支付中", - success: function(a) { - if(a.confirm){ - wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, - }); - } - } - }); - }else if (odr.pt_status == 1 && odr.order_status == 1){ - wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, - }); - }else{ - wx.navigateTo({ - url: "/pages/team/team_show/team_show?tg_id="+id, - }); - } - } - //--跳转到参团-- - else{ + if (e.data.code != 0) { + getApp().my_warnning("读取订单失败", 0, th); + return fasle; + } + //--跳转到已经购买的情况-- + if (e.data.data.pageData.length > 0) { + var odr = e.data.data.pageData[0]; + //还未支付 + if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) { + wx.showModal({ + title: "您已经购买了该商品待支付中", + success: function(a) { + if (a.confirm) { + wx.navigateTo({ + url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, + }); + } + } + }); + } else if (odr.pt_status == 1 && odr.order_status == 1) { wx.navigateTo({ - url: "/pages/team/team_show/team_show?tg_id="+id, + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + }); + } else { + wx.navigateTo({ + url: "/pages/team/team_show/team_show?tg_id=" + id, }); } + } + //--跳转到参团-- + else { + wx.navigateTo({ + url: "/pages/team/team_show/team_show?tg_id=" + id, + }); + } } }) }, - //跳到团更多 - go_t_more:function(){ - var team_id=this.data.prom_id; - wx.navigateTo({ - url: "/pages/team/team_more/team_more?team_id="+team_id, - }); - }, + //跳到团更多 + go_t_more: function() { + var team_id = this.data.prom_id; + wx.navigateTo({ + url: "/pages/team/team_more/team_more?team_id=" + team_id, + }); + }, - //--点赞功能-- - click_zan:function (e) { - var com_id=e.currentTarget.dataset.com_id; - var item_id=e.currentTarget.dataset.item_id; - var app=getApp(),th=this; + //--点赞功能-- + click_zan: function(e) { + var com_id = e.currentTarget.dataset.com_id; + var item_id = e.currentTarget.dataset.item_id; + var app = getApp(), + th = this; - if(app.globalData.userInfo==null || app.globalData.userInfo==undefined ){ - app.confirmBox("您还未登录"); - return false; - } + if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) { + app.confirmBox("您还未登录"); + return false; + } - var iszan=th.data.comments[item_id].userZanNum; - if(this.data.iszaning) return false; - this.data.iszaning=1; + var iszan = th.data.comments[item_id].userZanNum; + if (this.data.iszaning) return false; + this.data.iszaning = 1; - app.request.post("/api/weshop/commentZan/save",{ - data:{store_id:o.stoid,user_id:app.globalData.user_id,goods_id:th.data.gid,comment_id:com_id}, - success:function (ee) { + app.request.post("/api/weshop/commentZan/save", { + data: { + store_id: o.stoid, + user_id: app.globalData.user_id, + goods_id: th.data.gid, + comment_id: com_id + }, + success: function(ee) { - if (ee.data.code == "-1") { - app.my_warnning("不能给自己点赞", 0, th); - th.data.iszaning=0; - return; - } + if (ee.data.code == "-1") { + app.my_warnning("不能给自己点赞", 0, th); + th.data.iszaning = 0; + return; + } - if(ee.data.code==0 && iszan!=1){ - var num=th.data.comments[item_id].zan_num; num++; - var text="comments["+item_id+"].zan_num"; - var text1="comments["+item_id+"].userZanNum"; - var _errObj = {}; - _errObj[text]=num; - _errObj[text1]=1; - th.setData(_errObj); - - }else{ - var num=th.data.comments[item_id].zan_num; num--; - var text="comments["+item_id+"].zan_num"; - var text1="comments["+item_id+"].userZanNum"; - var _errObj = {}; - _errObj[text]=num; - _errObj[text1]=0; - th.setData(_errObj); - } + if (ee.data.code == 0 && iszan != 1) { + var num = th.data.comments[item_id].zan_num; + num++; + var text = "comments[" + item_id + "].zan_num"; + var text1 = "comments[" + item_id + "].userZanNum"; + var _errObj = {}; + _errObj[text] = num; + _errObj[text1] = 1; + th.setData(_errObj); - setTimeout(function(){ - th.data.iszaning = 0; - },500) - - } - }) - }, + } else { + var num = th.data.comments[item_id].zan_num; + num--; + var text = "comments[" + item_id + "].zan_num"; + var text1 = "comments[" + item_id + "].userZanNum"; + var _errObj = {}; + _errObj[text] = num; + _errObj[text1] = 0; + th.setData(_errObj); + } + + setTimeout(function() { + th.data.iszaning = 0; + }, 500) + + } + }) + }, /*----券的开关---*/ - switchCoupon:async function(event){ + switchCoupon: async function(event) { var coupon = event.currentTarget.dataset.coupon; - var app=getApp(); - var url="/api/weshop/prom/coupon/pageCouponList"; - var quan_list=this.data.quan_list; - var th=this; + var app = getApp(); + var url = "/api/weshop/prom/coupon/pageCouponList"; + var quan_list = this.data.quan_list; + var th = this; //当开启，且列表为空的情况下要 - if(!quan_list && coupon=="1") { - wx.showLoading(); - await app.request.promiseGet(url, { - data: { - store_id: os.stoid, - type: 1, - pageSize: 100, - page: 1, - user_id:app.globalData.user_id - } - }).then(res => { - wx.hideLoading(); - quan_list = res.data.data.pageData; - }) + if (!quan_list && coupon == "1") { + wx.showLoading(); + await app.request.promiseGet(url, { + data: { + store_id: os.stoid, + type: 1, + pageSize: 100, + page: 1, + user_id: app.globalData.user_id + } + }).then(res => { + wx.hideLoading(); + quan_list = res.data.data.pageData; + }) - if(quan_list){ - for(var ind in quan_list){ - var ep=quan_list[ind]; - var start=ut.formatTime(ep.use_start_time,"yyyy-MM-dd"); - var end=ut.formatTime(ep.use_end_time,"yyyy-MM-dd"); - start=start.replace("00:00:00",""); - end=end.replace("00:00:00",""); - quan_list[ind].start=start; - quan_list[ind].end=end; - } + if (quan_list) { + for (var ind in quan_list) { + var ep = quan_list[ind]; + var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd"); + var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd"); + start = start.replace("00:00:00", ""); + end = end.replace("00:00:00", ""); + quan_list[ind].start = start; + quan_list[ind].end = end; } + } - th.setData({coupon: coupon, quan_list: quan_list}); - }else{ - th.setData({coupon: coupon}); + th.setData({ + coupon: coupon, + quan_list: quan_list + }); + } else { + th.setData({ + coupon: coupon + }); } }, //--查看评价-- - look_pj:function () { - this.tabComment(); this.doScrollTop(); + look_pj: function() { + this.tabComment(); + this.doScrollTop(); }, //-----领取券----- - get_quan:function (e) { - var cid=e.currentTarget.dataset.cid; - var index=e.currentTarget.dataset.ind; - var item=this.data.quan_list[index]; - + get_quan: function(e) { + var cid = e.currentTarget.dataset.cid; + var index = e.currentTarget.dataset.ind; + var item = this.data.quan_list[index]; + //如果券还在领取中，不能再点 - if (item.linging==1){ + if (item.linging == 1) { getApp().my_warnning('领取中..', 0, this); return false; } //如果领取的次数到了 - if(item.everyone_num>0 && item.lqnum>=item.everyone_num){ - getApp().my_warnning('领取失败，您已领完该券',0,this); + if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) { + getApp().my_warnning('领取失败，您已领完该券', 0, this); return false; } - var lq_num=item.lqnum; - - var pdata={'uid':oo.user_id,'cid':cid,'store_id':os.stoid,'type':5}; - var app=getApp(),th=this; - app.request.post("/api/weshop/couponList/saveCouponList",{ - data:pdata, - success:function (res) { - if(res.data.code==0){ - app.my_warnning("领取成功",1,th); - lq_num++; - var text="quan_list["+index+"].lqnum"; - var text2 = "quan_list[" + index + "].linging"; - var obj = {}; obj[text] = lq_num; obj[text2] = 0; - th.setData(obj); - }else{ - app.confirmBox(res.data.msg); - var text2 = "quan_list[" + index + "].linging"; - var obj = {}; obj[text2] = 0; - th.setData(obj); - } + var lq_num = item.lqnum; + + var pdata = { + 'uid': oo.user_id, + 'cid': cid, + 'store_id': os.stoid, + 'type': 5 + }; + var app = getApp(), + th = this; + app.request.post("/api/weshop/couponList/saveCouponList", { + data: pdata, + success: function(res) { + if (res.data.code == 0) { + app.my_warnning("领取成功", 1, th); + lq_num++; + var text = "quan_list[" + index + "].lqnum"; + var text2 = "quan_list[" + index + "].linging"; + var obj = {}; + obj[text] = lq_num; + obj[text2] = 0; + th.setData(obj); + } else { + app.confirmBox(res.data.msg); + var text2 = "quan_list[" + index + "].linging"; + var obj = {}; + obj[text2] = 0; + th.setData(obj); } + } }) }, //--定义的保存图片方法，分享团--- - saveImageToPhotosAlbum: function () { + saveImageToPhotosAlbum: function() { //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 var type = this.data.prom_type; if (type == 6) type = 2; if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; - wx.showLoading({ title: '生成中...', }) - var that = this, th = that; + wx.showLoading({ + title: '生成中...', + }) + var that = this, + th = that; //设置画板显示，才能开始绘图 that.setData({ canvasHidden: false @@ -2318,9 +2459,9 @@ Page({ //读取文件成功则OK-- wx.getImageInfo({ src: path3, - success: function (res) { + success: function(res) { //回调写法 - th.get_head_temp(th.get_goods_temp, function () { + th.get_head_temp(th.get_goods_temp, function() { var vpath = res.path; var context = wx.createCanvasContext('share'); //先画背景 @@ -2335,14 +2476,14 @@ Page({ var tj_path = "../../../images/share/q_tj.png"; context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); context.setFontSize(16 * unit) - context.setLineJoin('round'); //交点设置成圆角 + context.setLineJoin('round'); //交点设置成圆角 context.setFillStyle("white") context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); //---产品名称--- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 console.log("ssssssss", th.data.data.goods_name); - + context.setFillStyle("black"); context.setFontSize(21.3 * unit) th.draw_Text(context, th.data.data.goods_name, @@ -2371,7 +2512,7 @@ Page({ context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit); //-------大图后面就不一样了----------- switch (type) { - case 0: //普通商品的展示 + case 0: //普通商品的展示 //中间的几个字 var g_path = "../../../images/share/s_gou.png"; context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); @@ -2401,7 +2542,7 @@ Page({ //---二维吗图--- context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); break; - case 1: //秒杀商品的展示 + case 1: //秒杀商品的展示 //---画线--- context.setLineWidth(1 * unit) context.moveTo(32 * unit, 670 * unit) @@ -2409,7 +2550,7 @@ Page({ context.stroke(); //画秒杀的图片 - var miaos_path='../../../images/share/miao_share.png'; + var miaos_path = '../../../images/share/miao_share.png'; context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); //---文字--- @@ -2421,7 +2562,7 @@ Page({ context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); break; - case 2://会员团和商家团的展示 + case 2: //会员团和商家团的展示 //---画线--- context.setLineWidth(1 * unit) context.moveTo(32 * unit, 670 * unit) @@ -2456,7 +2597,7 @@ Page({ //---二维吗图--- context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); break - case 3://阶梯团的展示 + case 3: //阶梯团的展示 //---画线--- context.setLineWidth(1 * unit) context.moveTo(32 * unit, 670 * unit) @@ -2511,35 +2652,37 @@ Page({ context.restore(); //把画板内容绘制成图片，并回调 画板图片路径 - context.draw(false, function () { - setTimeout(function () { - wx.canvasToTempFilePath({ - x: 0, y: 0, - width: 750, - height: 1217, - destWidth: 1.2 * 750 * 750 / that.data.screenWidth, - destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, - canvasId: 'share', - success: function (res) { - that.setData({ - shareImgPath: res.tempFilePath, canvasHidden: true - }) - if (!res.tempFilePath) { - wx.showModal({ - title: '提示', - content: '图片绘制中，请稍后重试', - showCancel: false - }) - return false; - } - wx.previewImage({ - //将图片预览出来 - urls: [that.data.shareImgPath] - }); - wx.hideLoading(); - } - }) - },500) + context.draw(false, function() { + setTimeout(function() { + wx.canvasToTempFilePath({ + x: 0, + y: 0, + width: 750, + height: 1217, + destWidth: 1.2 * 750 * 750 / that.data.screenWidth, + destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, + canvasId: 'share', + success: function(res) { + that.setData({ + shareImgPath: res.tempFilePath, + canvasHidden: true + }) + if (!res.tempFilePath) { + wx.showModal({ + title: '提示', + content: '图片绘制中，请稍后重试', + showCancel: false + }) + return false; + } + wx.previewImage({ + //将图片预览出来 + urls: [that.data.shareImgPath] + }); + wx.hideLoading(); + } + }) + }, 500) }); }); @@ -2549,21 +2692,21 @@ Page({ //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 - draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth,unit) { + draw_Text: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) { var lineWidth = 0; var lastSubStrIndex = 0; //每次开始截取的字符串的索引 - var han=0; + var han = 0; for (let i = 0; i < str.length; i++) { - if(han==2) return; + if (han == 2) return; //lineWidth += ctx.measureText(str[i]).width; lineWidth += ut.measureText(str[i], 21.3 * unit); if (lineWidth > canvasWidth) { han++; - - if (han==2) - ctx.fillText(str.substring(lastSubStrIndex, i)+'...', leftWidth, initHeight); //绘制截取部分 + + if (han == 2) + ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分 else - ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight); + ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight); initHeight += 22; //22为字体的高度 lineWidth = 0; @@ -2578,15 +2721,17 @@ Page({ // ----视频图片---- // 图片计数器 - swiperChange: function (e) { + swiperChange: function(e) { var that = this; - if (e.detail.current>0){ + if (e.detail.current > 0) { that.setData({ - hiddenn:1, videopicture:1, + hiddenn: 1, + videopicture: 1, }) - }else{ + } else { that.setData({ - hiddenn:0,videopicture:0, + hiddenn: 0, + videopicture: 0, }) } if (e.detail.source == 'touch') { @@ -2597,18 +2742,24 @@ Page({ }, /*---视频相关--*/ - videopicture: function (e) { + videopicture: function(e) { var vipi = e.currentTarget.dataset.vipi; - this.setData({ videopicture: vipi, swiperCurrent:vipi, noon: 0,current:1 }); + this.setData({ + videopicture: vipi, + swiperCurrent: vipi, + noon: 0, + current: 1 + }); }, - videoPlay: function (e) { + videoPlay: function(e) { var _index = e.currentTarget.id this.setData({ - _index: _index, noon: 1 + _index: _index, + noon: 1 }) - setTimeout(function () { + setTimeout(function() { //将点击视频进行播放 var videoContext = wx.createVideoContext(_index) videoContext.play(); @@ -2617,46 +2768,59 @@ Page({ //--加载更多商品-- - requestRecommend: function () { - var e = this, t = '/api/weshop/goods/page?page=1'; - var th_recommend_list=e.data.recommend_list; - getApp().request.get(t,{ - data: { is_mainshow: 1, isonsale: 1, is_recommend:1, is_on_sale: 1, store_id: os.stoid, pageSize: 6 }, - success:function (ee) { - var recommend_list=ee.data.data.pageData; - if(recommend_list && recommend_list.length>0){ - var dd=[...th_recommend_list,...recommend_list]; - e.setData({recommend_list,dd}); - e.data.currentPage++; - }else{ - e.setData({nomore:1}); + requestRecommend: function() { + var e = this, + t = '/api/weshop/goods/page?page=1'; + var th_recommend_list = e.data.recommend_list; + getApp().request.get(t, { + data: { + is_mainshow: 1, + isonsale: 1, + is_recommend: 1, + is_on_sale: 1, + store_id: os.stoid, + pageSize: 6 + }, + success: function(ee) { + var recommend_list = ee.data.data.pageData; + if (recommend_list && recommend_list.length > 0) { + var dd = [...th_recommend_list, ...recommend_list]; + e.setData({ + recommend_list, + dd + }); + e.data.currentPage++; + } else { + e.setData({ + nomore: 1 + }); } } }) }, //--获取头像的本地缓存,回调写法-- - get_head_temp:function (tt,func) { - var ee=this; - if(ee.data.share_head){ + get_head_temp: function(tt, func) { + var ee = this; + if (ee.data.share_head) { tt(func); return false; } //---获取分享图片的本地地址,头像和商品图片---- var path2 = getApp().globalData.userInfo.head_pic; - if(path2==""){ - ee.data.share_head ="../../../images/share/hui_hear_pic.png"; + if (path2 == "") { + ee.data.share_head = "../../../images/share/hui_hear_pic.png"; tt(func); - }else { - path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn"); + } else { + path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, - success: function (res) { + success: function(res) { //res.path是网络图片的本地地址 ee.data.share_head = res.path; tt(func); }, - fail: function (res) { + fail: function(res) { ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 tt(func); } @@ -2664,294 +2828,409 @@ Page({ } }, //--获取商品图片的本地缓存，回调写法-- - get_goods_temp:function (tt) { - var ee=this; - if(ee.data.share_goods_img) { + get_goods_temp: function(tt) { + var ee = this; + if (ee.data.share_goods_img) { tt(); return false; } //获取商品是分享图信息 wx.getImageInfo({ - src: ee.data.data.original_img, - success: function (res) { + src: ee.data.data.original_img, + success: function(res) { //res.path是网络图片的本地地址 ee.data.share_goods_img = res.path; tt(); }, - fail: function (res) { + fail: function(res) { - ee.data.share_goods_img= "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 + ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 tt(); } }); }, //--外侧评价的点击效果--- - clik_evaluate:function(e){ - var val=e.currentTarget.dataset.val; + clik_evaluate: function(e) { + var val = e.currentTarget.dataset.val; this.setData({ - activeCategoryId: 2, activeCategoryId3: val , comments: null + activeCategoryId: 2, + activeCategoryId3: val, + comments: null }); this.requestComments(); }, //--跳转到商品详情页面-- - go_goods: function (e) { + go_goods: function(e) { var gid = e.currentTarget.dataset.gid; var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; getApp().goto(url); }, //--跳转到支付尾款界面-- - go_pay_wk:function () { - var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id; + go_pay_wk: function() { + var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; getApp().goto(url); }, - pop_err_img:function(e){ - var txt = e.currentTarget.dataset.errorimg; - var ob={}; - ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif"; - this.setData(ob); + pop_err_img: function(e) { + var txt = e.currentTarget.dataset.errorimg; + var ob = {}; + ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); }, //--调用更新阶梯团的接口-- - update_jiti:function(id){ - var th=this; + update_jiti: function(id) { + var th = this; //--更新阶梯团-- - getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/"+os.stoid+"/"+id, { - success: function (ee) { - //--等于0是要去支付尾款，接口调用失败，就要去查看参团详情-- - if (ee.data.code==0) { - th.setData({ - user_order_pt_state: 3, - }); - }else if(ee.data.code==-1){ - th.setData({ - user_order_pt_state: 2, - }); - } - } + getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/" + os.stoid + "/" + id, { + success: function(ee) { + //--等于0是要去支付尾款，接口调用失败，就要去查看参团详情-- + if (ee.data.code == 0) { + th.setData({ + user_order_pt_state: 3, + }); + } else if (ee.data.code == -1) { + th.setData({ + user_order_pt_state: 2, + }); + } + } }) }, // 选择门店 - choice_store:function(ee){ - var th=this; - //var ind=ee.currentTarget.dataset.ind; - var bconfig = th.data.bconfig; - - if (bconfig.is_sort_storage){ - wx.getLocation({ - type: 'wgs84', - success: function (res) { - - th.data.lat = res.latitude; - th.data.lon = res.longitude; - th.data.is_get_local_ok = 1; - th.setData({ is_gps: 1 }); - //th.onShow(); - th.get_sto(); - }, - fail: function (res) { - //th.onShow(); - th.get_sto(); - if (res.errCode == 2) { - th.setData({ is_gps: 0 }); - if (th.data.is_gps == 0) { - getApp().confirmBox("请开启GPS定位", null, 25000, !1); - } - } else { - th.setData({ is_gps: "3" }); - } - - th.data.is_get_local_ok = 1; - } - }) - } - this.setData({ - //open_ind_store: ind, - store:1, - openSpecModal: !1, - openSpecModal_pt: !1 - }) -}, - //关闭选择门店 -close_popup:function(e){ - - this.setData({ - store: 0, choice_sort_store: 0, sort_store: 0 - }) -}, -//选择更多门店 - more_store:function(){ - this.setData({ sort_store: 1 }); - }, - sort_store:function() { - + choice_store: function(ee) { + var th = this; + //var ind=ee.currentTarget.dataset.ind; + var bconfig = th.data.bconfig; + + if (bconfig.is_sort_storage) { + wx.getLocation({ + type: 'wgs84', + success: function(res) { + + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.data.is_get_local_ok = 1; + th.setData({ + is_gps: 1 + }); + //th.onShow(); + th.get_sto(); + }, + fail: function(res) { + //th.onShow(); + th.get_sto(); + if (res.errCode == 2) { + th.setData({ + is_gps: 0 + }); + if (th.data.is_gps == 0) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + } + } else { + th.setData({ + is_gps: "3" + }); + } + + th.data.is_get_local_ok = 1; + } + }) + }else{ + th.get_sto(); + } + + this.setData({ + //open_ind_store: ind, + store: 1, + openSpecModal: !1, + openSpecModal_pt: !1 + }) + }, + //关闭选择门店 + close_popup: function(e) { + + this.setData({ + store: 0, + choice_sort_store: 0, + sort_store: 0 + }) + }, + //选择更多门店 + more_store: function() { + this.setData({ + sort_store: 1 + }); + }, + sort_store: function() { + }, // 返回按钮 - returns:function(){ - this.setData({ sort_store: 0,choice_sort_store:0}); + returns: function() { + this.setData({ + sort_store: 0, + choice_sort_store: 0 + }); }, //---选择分类门店--- - choice_sort_store:function(e){ - var index=e.currentTarget.dataset.index; + choice_sort_store: function(e) { + var index = e.currentTarget.dataset.index; var region_name = e.currentTarget.dataset.region; - var item = this.data.all_sto[index]; - this.setData({ region_name: region_name, sort_store: 0, choice_sort_store:1, sec_sto: item,sec_pick_index:0 }); - }, + var item = this.data.all_sto[index]; + this.setData({ + region_name: region_name, + sort_store: 0, + choice_sort_store: 1, + sec_sto: item, + sec_pick_index: 0 + }); + }, - - choose_for_store_fir:function (e) { - var index_c=e.currentTarget.dataset.ind; - - this.setData({fir_pick_index:index_c}) + + choose_for_store_fir: function(e) { + var index_c = e.currentTarget.dataset.ind; + + this.setData({ + fir_pick_index: index_c + }) }, //确定def_pick为选择的门店 - sure_pick:function (e) { - var th=this; var item=null; - var openindstore = e.currentTarget.dataset.openindstore; - - if(th.data.choice_sort_store==0 ){ - var index=th.data.fir_pick_index; - if(th.data.is_show_sto_cat==1){ - item=th.data.def_pickpu_list[index]; - }else{ - item=th.data.only_pk[index]; //当没有门店分类的时候 - } + sure_pick: function(e) { + var th = this; + var item = null; + var openindstore = th.data.open_ind_store; - }else{ - var index=th.data.sec_pick_index; - item=th.data.sec_sto.s_arr[index]; + if (th.data.choice_sort_store == 0) { + var index = th.data.fir_pick_index; + if (th.data.is_show_sto_cat == 1) { + item = th.data.def_pickpu_list[index]; + } else { + item = th.data.only_pk[index]; //当没有门店分类的时候 } - //th.setData({fir_pick_index:0}); - console.log("选择门店刷新","def_pick_store",item); - th.setData({def_pick_store:item,sto_sele_name:item.pickup_name, - sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0, fir_pick_index:0}); + } else { + var index = th.data.sec_pick_index; + item = th.data.sec_sto.s_arr[index]; + } - if (openindstore == 1) { - th.setData({ - openSpecModal: !0, - openSpecModal_ind: openindstore, }); - } else if (openindstore == 2) { - th.setData({ - openSpecModal: !0, - openSpecModal_ind: openindstore, }); - } else { - th.setData({ - store: 0, choice_sort_store: 0, sort_store: 0 - }) - } + //th.setData({fir_pick_index:0}); + console.log("选择门店刷新", "def_pick_store", item); + th.setData({ + def_pick_store: item, + sto_sele_name: item.pickup_name, + sto_sele_id: item.pickup_id, + sto_sele_distr: item.distr_type, + store: 0, + choice_sort_store: 0, + fir_pick_index: 0 + }); + + if (openindstore == 1) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + }); + } else if (openindstore == 2) { + th.setData({ + openSpecModal: !0, + openSpecModal_ind: openindstore, + + openSpecModal_pt:1 + }); + } + + else if (openindstore == 4) { //4就是拼团 + th.setData({ + openSpecModal_pt: 1, //打开拼团购买界面 + store: 0, //关闭门店 + choice_sort_store: 0, //关闭门店2级 + sort_store: 0, //关闭门店2级 + }); + } + + else { + th.setData({ + store: 0, + choice_sort_store: 0, + sort_store: 0 + }) + } }, //---点击二级之后的选择--- - choose_for_store: function (e) { + choose_for_store: function(e) { var index_c = e.currentTarget.dataset.ind; - - this.setData({ sec_pick_index: index_c, fir_pick_index: index_c }) + + this.setData({ + sec_pick_index: index_c, + fir_pick_index: index_c + }) }, //把选择的门店设置成默认的门店def_pick - set_def_pick:function (e) { - var th = this; var item = null; - - if(th.data.choice_sort_store==0 ){ - - var index=th.data.fir_pick_index; - - if(th.data.is_show_sto_cat==1){ - item=th.data.def_pickpu_list[index]; - }else{ - item=th.data.only_pk[index]; //当没有门店分类的时候 - - } - }else{ - var index=th.data.sec_pick_index; - item=th.data.sec_sto.s_arr[index]; + set_def_pick: function(e) { + var th = this; + var item = null; + + if (th.data.choice_sort_store == 0) { + + var index = th.data.fir_pick_index; + + if (th.data.is_show_sto_cat == 1) { + item = th.data.def_pickpu_list[index]; + } else { + item = th.data.only_pk[index]; //当没有门店分类的时候 + } - - var store_id=o.stoid; + } else { + var index = th.data.sec_pick_index; + item = th.data.sec_sto.s_arr[index]; + } + + var store_id = o.stoid; var user_id = getApp().globalData.user_id; var def_pickup_id = item.pickup_id; - - getApp().request.put('/api/weshop/users/update',{ - data: { user_id,def_pickup_id}, - success:function(res){ - - if (res.data.code==0){ - if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0}); - s.showWarning("设置门店地址成功", null, 500, !1); - getApp().globalData.pk_store = item; - }else{ - console.log("门店地址失败"); - s.showWarning("设置默认门店地址失败", null, 500, !1); - } + getApp().request.put('/api/weshop/users/update', { + data: { + user_id, + def_pickup_id + }, + success: function(res) { + + if (res.data.code == 0) { + if (th.data.choice_sort_store == 0) th.setData({ + fir_pick_index: 0 + }); + s.showWarning("设置门店地址成功", null, 500, !1); + getApp().globalData.pk_store = item; + } else { + console.log("门店地址失败"); + s.showWarning("设置默认门店地址失败", null, 500, !1); } + + } }); - + th.setData({ - def_pick_store: item, sto_sele_name: item.pickup_name, - sto_sele_id: item.pickup_id, sto_sele_distr: item.distr_type, store: 0, choice_sort_store: 0 + def_pick_store: item, + sto_sele_name: item.pickup_name, + sto_sele_id: item.pickup_id, + sto_sele_distr: item.distr_type, + store: 0, + choice_sort_store: 0 }); - var openindstore = e.currentTarget.dataset.openindstore; + var openindstore = th.data.open_ind_store; if (openindstore == 1) { th.setData({ openSpecModal: !0, openSpecModal_ind: openindstore, - store: 0, choice_sort_store: 0, sort_store: 0, + store: 0, + choice_sort_store: 0, + sort_store: 0, }); } else if (openindstore == 2) { th.setData({ openSpecModal: !0, openSpecModal_ind: openindstore, - store: 0, choice_sort_store: 0, sort_store: 0, + store: 0, + choice_sort_store: 0, + sort_store: 0, }); - } else { + } + else if (openindstore == 4) { //4就是拼团 + th.setData({ + openSpecModal_pt: 1, //打开拼团购买界面 + store: 0, //关闭门店 + choice_sort_store: 0, //关闭门店2级 + sort_store: 0, //关闭门店2级 + }); + } + + else { th.setData({ - store: 0, choice_sort_store: 0, sort_store: 0, + store: 0, + choice_sort_store: 0, + sort_store: 0, }) } - - }, - wait_for_store_config:function(){ - var th=this; - var t_time=setInterval(function(){ - if (th.data.bconfig==null) false; - var e = th.data.bconfig; - if (e.is_sort_storage) { - wx.getLocation({ - type: 'wgs84', - success: function (res) { - th.data.lat = res.latitude; - th.data.lon = res.longitude; - th.data.is_get_local_ok = 1; - }, - fail: function (res) { - if (res.errCode == 2) { - th.setData({ is_gps: 0 }); - if (th.data.is_gps == 0) { - getApp().confirmBox("请开启GPS定位", null, 10000, !1); - } + }, - } else { - th.setData({ is_gps: "3" }); + wait_for_store_config: function() { + var th = this; + var t_time = setInterval(function() { + if (th.data.bconfig == null) false; + var e = th.data.bconfig; + if (e.is_sort_storage) { + wx.getLocation({ + type: 'wgs84', + success: function(res) { + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.data.is_get_local_ok = 1; + }, + fail: function(res) { + if (res.errCode == 2) { + th.setData({ + is_gps: 0 + }); + if (th.data.is_gps == 0) { + getApp().confirmBox("请开启GPS定位", null, 10000, !1); } - th.data.is_get_local_ok = 1; + } else { + th.setData({ + is_gps: "3" + }); } - }) - } else { - th.data.is_get_local_ok = 1; + + th.data.is_get_local_ok = 1; + } + }) + } else { + th.data.is_get_local_ok = 1; + } + clearInterval(t_time); + }, 500) + }, + //显示全部 + toggleHandler: function(e) { + var that = this, + index = e.currentTarget.dataset.index; + for (var i = 0; i < that.data.comments.length; i++) { + if (index == i) { + for (var i = 0; i < that.data.comments.length; i++) { + that.data.comments[index].auto = true; + that.data.comments[index].seeMore = false; } - clearInterval(t_time); - },500) - } - + } + } + that.setData({ + comments: that.data.comments + }) + }, + + //收起更多 + toggleContent: function(e) { + var that = this, + index = e.currentTarget.dataset.index; + for (var i = 0; i < that.data.comments.length; i++) { + if (index == i) { + that.data.comments[index].auto = true; + that.data.comments[index].seeMore = true; + } + } + that.setData({ + comments: that.data.comments + }) + }, + }); \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index a532d05..8d5fb6e 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -2,6 +2,7 @@ + @@ -378,8 +379,8 @@ - - {{item.content?item.content:''}} + + {{item.content?item.content:''}} {{item.add_time}} @@ -511,7 +512,7 @@ - + - - 暂无评价 + + 暂无评价 + + + 已经加载到底部 @@ -660,6 +666,7 @@ + @@ -679,7 +686,8 @@ 立即购买 - + + 加入购物车 @@ -692,7 +700,6 @@ - @@ -760,7 +767,6 @@ - + + @@ -815,7 +823,8 @@ 地址:{{def_pick_store.fulladdress}} - + + @@ -839,7 +848,7 @@ - 加入购物车{{prom_act.buy_num}} + 加入购物车 立即购买 @@ -896,6 +905,32 @@ + + + + + + + {{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}} + @@ -914,17 +949,22 @@ + + - - + \ No newline at end of file diff --git a/pages/user/comment/comment.wxss b/pages/user/comment/comment.wxss index 4eccce0..cd0a6ca 100644 --- a/pages/user/comment/comment.wxss +++ b/pages/user/comment/comment.wxss @@ -185,4 +185,5 @@ } .title_width{ width: 146rpx; text-align:center } .shop-font{ color: rgb(153, 153, 153);} -.reply{ margin-top: 10rpx} \ No newline at end of file +.reply{ margin-top: 10rpx} +.get_bottom{ text-align: center; color: #999; margin-bottom: 20rpx} \ No newline at end of file diff --git a/utils/LoadMore.js b/utils/LoadMore.js index 75d47ff..be27638 100644 --- a/utils/LoadMore.js +++ b/utils/LoadMore.js @@ -76,32 +76,33 @@ var e = function() { //格式化 var glist=""; - for (var i = 0; i < g.length; i++) { + + for (var ii = 0; ii < g.length; ii++) { //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) { - if (g[i].prom_type == 1) { - glist += g[i].goods_id+","; + if (g[ii].prom_type == 1) { + glist += g[ii].goods_id+","; } - if (g[i].original_img!=undefined){ - if (g[i].original_img.indexOf(oo.imghost)==-1) - g[i].original_img = oo.imghost + g[i].original_img; + if (g[ii].original_img!=undefined){ + if (g[ii].original_img.indexOf(oo.imghost)==-1) + g[ii].original_img = oo.imghost + g[ii].original_img; } - if (g[i].add_time != undefined){ - var tx = g[i].add_time + ""; + if (g[ii].add_time != undefined){ + var tx = g[ii].add_time + ""; if (tx.indexOf('-') == -1) { - g[i].add_time = ut.formatTime(g[i].add_time, 'yyyy-MM-dd hh:mm:ss'); + g[ii].add_time = ut.formatTime(g[ii].add_time, 'yyyy-MM-dd hh:mm:ss'); } } if (rurl.indexOf('comment/page')!=-1){ console.log('comment/page'); - console.log(g[i].img); - var tx1 = g[i].img; + console.log(g[ii].img); + var tx1 = g[ii].img; if (tx1 != "" && tx1 != null && ut.isString(tx1)){ var arr = ut.unserialize(tx1); - g[i].img=arr; + g[ii].img=arr; } else if (!ut.isArray(tx1)){ - g[i].img=""; + g[ii].img=""; } } }