diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js index c0245df..2fabf60 100644 --- a/components/diy_advertising/diy_advertising.js +++ b/components/diy_advertising/diy_advertising.js @@ -18,6 +18,23 @@ Component({ someData: {}, max_sw_height:260, }, + + ready: function () { + var data_arr=this.properties.object.data; + var is_show=0; + for(var i in data_arr){ + var item=data_arr[i]; + var now=new Date(); + if((!item.beg_date || now>new Date(item.beg_date)) + && (!item.end_date || now - + + - {{item.title}} + {{item.title}} - {{item.title}} + {{item.title}} + diff --git a/components/diy_notice/g_filter.wxs b/components/diy_notice/g_filter.wxs index 9be2a42..9719e7d 100644 --- a/components/diy_notice/g_filter.wxs +++ b/components/diy_notice/g_filter.wxs @@ -2,8 +2,28 @@ var g_filters = { has_char:function(url,key){ if(!url) return -1; return url.indexOf(key); + }, + beg_time:function(beg_date){ + var fmt1 = beg_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1<=tnow) return 1; + return 0; + }, + end_time:function(end_date){ + var fmt1 = end_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1>=tnow) return 1; + return 0; } } module.exports = { - has_char: g_filters.has_char + has_char: g_filters.has_char, + beg_time: g_filters.beg_time, + end_time: g_filters.end_time, } \ No newline at end of file diff --git a/components/diy_scan/diy_scan.wxml b/components/diy_scan/diy_scan.wxml index 5717414..e72adf5 100644 --- a/components/diy_scan/diy_scan.wxml +++ b/components/diy_scan/diy_scan.wxml @@ -1,7 +1,24 @@ - + + - {{object.title}} + + {{object.title}} + {{object.title}} + - + + + + + + + + {{object.title}} + {{object.title}} + + + + diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 6d796be..c06928f 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -2166,8 +2166,12 @@ Page({ }, onShareTimeline() { + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; + return { - title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name, + title:this.data.data.goods_name + '-' + store_name, imageUrl:this.data.gallery[0].image_url, } }, diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index 3c8f04d..9202010 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -24,7 +24,9 @@ Page({ dis_switch:0, //-- 分销开关 -- pattern:0, //-- 分成的方式 -- share_hidden:1, //-- 分享的按钮隐藏 -- - share_good:null //--- 要分享的商品 --- + share_good:null ,//--- 要分享的商品 --- + + is_no_distri:0 }, /** * 生命周期函数--监听页面加载 @@ -90,17 +92,47 @@ Page({ } }); + + //看有没有开启分销功能 + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + var dis=rs.data.data; + if( dis && dis.switch==0){ + th.setData({is_no_distri:1}) + } + }) + //看有没有开启分销功能 + getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{ + if(res.data.code==0){ + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item=arr[0]; + if(item.is_sy==0){ + var now = Date.parse(new Date());now = now / 1000; + if(item.end_time价格 + 佣金 佣金 + 最新 @@ -77,7 +79,7 @@ 已售：{{item.sales_sum}} - 分成金额： + 分成金额： ￥{{item.commission}} ￥{{item.fir_rate+item.sec_rate+item.thi_rate}} diff --git a/packageA/pages/goods_share/goods_share.wxss b/packageA/pages/goods_share/goods_share.wxss index 969bd02..fec871d 100644 --- a/packageA/pages/goods_share/goods_share.wxss +++ b/packageA/pages/goods_share/goods_share.wxss @@ -40,6 +40,7 @@ page { display: flex; font-size: 30rpx; border-bottom: 2rpx solid #f8f8f8; + justify-content: space-around; } .title .iconfont { color: #ccc; @@ -47,7 +48,7 @@ page { margin-left: 8rpx; } .title-item { - width: 25%; + /* width: 25%; */ box-sizing: border-box; text-align: center; padding: 20rpx; diff --git a/pages/activity/pind_list/g_filter.wxs b/pages/activity/pind_list/g_filter.wxs new file mode 100644 index 0000000..9719e7d --- /dev/null +++ b/pages/activity/pind_list/g_filter.wxs @@ -0,0 +1,29 @@ +var g_filters = { + has_char:function(url,key){ + if(!url) return -1; + return url.indexOf(key); + }, + beg_time:function(beg_date){ + var fmt1 = beg_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1<=tnow) return 1; + return 0; + }, + end_time:function(end_date){ + var fmt1 = end_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1>=tnow) return 1; + return 0; + } +} +module.exports = { + has_char: g_filters.has_char, + beg_time: g_filters.beg_time, + end_time: g_filters.end_time, +} \ No newline at end of file diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 10325d2..c12e46f 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -16,6 +16,7 @@ Page({ isshow:0, iurl: os.imghost, ad_data:null, + max_sw_height:200, }, //------初始化加载---------- @@ -26,6 +27,7 @@ Page({ console.log("------------"); console.log(first_leader); + getApp().getConfig(); if (first_leader) { getApp().globalData.first_leader = first_leader; @@ -44,12 +46,17 @@ Page({ }).then(res => { if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var a = res.data.data.pageData; - var tt = { - 'ad_code': os.imghost + a[0].ad_code, - 'media_link': '', - 'ad_weapplink':a[0].ad_weapplink - }; - th.setData({ad_data:tt}); + var narr=[]; + for(var i in a){ + var tt = { + 'ad_code': os.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink':a[i].ad_weapplink + }; + narr.push(tt); + } + + th.setData({ad_data:narr}); } }) }, @@ -201,6 +208,29 @@ Page({ _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; } - } + }, + + imageLoad:function(e){ + var imgwidth = e.detail.width; + var imgheight = e.detail.height; + //宽高比 + var ratio = imgwidth / imgheight; + //计算的高度值 + var viewHeight = 750 / ratio; + var hei=this.data.max_sw_height; + + if (hei< viewHeight) { + this.setData({ max_sw_height: viewHeight }); + } + }, + + onShareTimeline() { + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; + return { + title: '秒杀活动-' + store_name, + } + }, }); diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index 15504b8..1b8d4d4 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -1,7 +1,26 @@ + - + + + + + + + + + + + + + + + + + diff --git a/pages/activity/pind_list/pind_list.wxss b/pages/activity/pind_list/pind_list.wxss index 8fb81f6..71b3167 100644 --- a/pages/activity/pind_list/pind_list.wxss +++ b/pages/activity/pind_list/pind_list.wxss @@ -3,7 +3,7 @@ page{ } .kill-list{ width: 95%; - margin-top: -50rpx; + margin-top: -10rpx; position:absolute; left: 2.5%; diff --git a/pages/activity/seckill_list/g_filter.wxs b/pages/activity/seckill_list/g_filter.wxs new file mode 100644 index 0000000..9719e7d --- /dev/null +++ b/pages/activity/seckill_list/g_filter.wxs @@ -0,0 +1,29 @@ +var g_filters = { + has_char:function(url,key){ + if(!url) return -1; + return url.indexOf(key); + }, + beg_time:function(beg_date){ + var fmt1 = beg_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1<=tnow) return 1; + return 0; + }, + end_time:function(end_date){ + var fmt1 = end_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1>=tnow) return 1; + return 0; + } +} +module.exports = { + has_char: g_filters.has_char, + beg_time: g_filters.beg_time, + end_time: g_filters.end_time, +} \ No newline at end of file diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index 5aa7f4f..68b6117 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -12,6 +12,7 @@ Page({ ismore:1, //是否可以加载更多 isshow:0, ad_data:null, + max_sw_height:200, }, //------初始化加载---------- @@ -22,7 +23,8 @@ Page({ var th=this; console.log("------------"); - console.log(first_leader); + console.log(first_leader); + getApp().getConfig(); if (first_leader) { getApp().globalData.first_leader = first_leader; @@ -41,12 +43,16 @@ Page({ }).then(res => { if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var a = res.data.data.pageData; - var tt = { - 'ad_code': os.imghost + a[0].ad_code, - 'media_link': '', - 'ad_weapplink':a[0].ad_weapplink - }; - th.setData({ad_data:tt}); + var narr=[]; + for(var i in a){ + var tt = { + 'ad_code': os.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink':a[i].ad_weapplink + }; + narr.push(tt); + } + th.setData({ad_data:narr}); } }) @@ -199,9 +205,26 @@ Page({ }, onShareTimeline() { + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; return { - title: '秒杀活动-' + getApp().globalData.config.store_name, + title: '秒杀活动-' + store_name, } }, + + imageLoad:function(e){ + var imgwidth = e.detail.width; + var imgheight = e.detail.height; + //宽高比 + var ratio = imgwidth / imgheight; + //计算的高度值 + var viewHeight = 750 / ratio; + var hei=this.data.max_sw_height; + + if (hei< viewHeight) { + this.setData({ max_sw_height: viewHeight }); + } + } }); diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index f714cf7..9e378d4 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -1,9 +1,30 @@ - + - + + + + + + + + + + + + + + + + + + + + diff --git a/pages/activity/seckill_list/seckill_list.wxss b/pages/activity/seckill_list/seckill_list.wxss index 196e138..6cc6698 100644 --- a/pages/activity/seckill_list/seckill_list.wxss +++ b/pages/activity/seckill_list/seckill_list.wxss @@ -17,7 +17,7 @@ /* overflow-y: scroll; */ } .seckill_list{ -margin-top: -50rpx; +margin-top: -10rpx; left: 2%; } .seckill{ diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index d4c1754..230b0b6 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -31,6 +31,7 @@ Page({ btn_click:1, service_data:null, + max_sw_height:200, }, onLoad: function() { var a = this,ee=a; @@ -100,12 +101,16 @@ Page({ }).then(res => { if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ var a = res.data.data.pageData; - var tt = { - 'ad_code': os.imghost + a[0].ad_code, - 'media_link': '', - 'ad_weapplink':a[0].ad_weapplink - }; - th.setData({ad_data:tt}); + var narr=[]; + for(var i in a){ + var tt = { + 'ad_code': os.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink':a[i].ad_weapplink + }; + narr.push(tt); + } + th.setData({ad_data:narr}); }else{ //--获取是否又秒杀活动-- getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { @@ -2038,5 +2043,19 @@ Page({ refresh_input:function(){ this.data.btn_click=0; - } + }, + + imageLoad:function(e){ + var imgwidth = e.detail.width; + var imgheight = e.detail.height; + //宽高比 + var ratio = imgwidth / imgheight; + //计算的高度值 + var viewHeight = 715 / ratio; + var hei=this.data.max_sw_height; + + if (hei< viewHeight) { + this.setData({ max_sw_height: viewHeight }); + } + } }); \ No newline at end of file diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index 0c90842..c839bd5 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -1,3 +1,4 @@ + @@ -7,9 +8,30 @@ - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss index a1602a5..94bdba2 100644 --- a/pages/cart/cart/cart.wxss +++ b/pages/cart/cart/cart.wxss @@ -353,3 +353,12 @@ page { .quan_color{ background-color: #ff5306; height: 40rpx;color: #fff; padding: 0 10rpx; border-radius: 10rpx; margin-left: 10rpx} .red_c{color:#ff5306} .title_show{ margin: 10rpx 0 10px 0;padding: 0 20rpx} + + +.swiper image { + height: auto; + width: 100%; + margin: 0; + padding: 0; + vertical-align: top; +} diff --git a/pages/cart/cart/g_filter.wxs b/pages/cart/cart/g_filter.wxs new file mode 100644 index 0000000..9719e7d --- /dev/null +++ b/pages/cart/cart/g_filter.wxs @@ -0,0 +1,29 @@ +var g_filters = { + has_char:function(url,key){ + if(!url) return -1; + return url.indexOf(key); + }, + beg_time:function(beg_date){ + var fmt1 = beg_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1<=tnow) return 1; + return 0; + }, + end_time:function(end_date){ + var fmt1 = end_date.substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t1 = getDate(fmt2); + var tnow=getDate(); + if(t1>=tnow) return 1; + return 0; + } +} +module.exports = { + has_char: g_filters.has_char, + beg_time: g_filters.beg_time, + end_time: g_filters.end_time, +} \ No newline at end of file diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index deebde2..5517e31 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1118,6 +1118,7 @@ Page({ } //如果有设置不包邮区商品 if(by_qc.goods_list!="" && by_qc.goods_list!=undefined && by_qc!=null && freight_free>0){ + freight_free=0; no_ex_good=by_qc.goods_list; } } @@ -1210,24 +1211,34 @@ Page({ continue; } + + var no_ex_good_arr=null; + if(no_ex_good) no_ex_good_arr=no_ex_good.split(','); + //----------------如果是选择了物流--------------------- - if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){ - //如果地址不为空 - if (th.data.user_addr!=null){ - switch (item[j]['exp_sum_type']) { - case 1: - //统一运费 - o_shipping_price += item[j]['uniform_exp_sum'];break; - case 2: - if (goods_weight < 0) goods_weight = 0; - //累积商品重量 每种商品的重量 * 数量 - goods_weight += item[j]['weight'] * item[j]['goods_num']; break; - case 3: - if (goods_piece < 0) goods_piece = 0; - //累积商品数量 - goods_piece += item[j]['goods_num'];break; - } - } + if(cart_item.exp_type == 0 && item[j].is_free_shipping==0 && (!no_ex_good_arr || no_ex_good_arr.indexOf(item[j].goods_id+'')>-1 )){ + + + //如果地址不为空 + if (th.data.user_addr!=null){ + switch (item[j]['exp_sum_type']) { + case 1: + //统一运费 + o_shipping_price += item[j]['uniform_exp_sum'];break; + case 2:+'' + if (goods_weight < 0) goods_weight = 0; + //累积商品重量 每种商品的重量 * 数量 + goods_weight += item[j]['weight'] * item[j]['goods_num']; + + break; + case 3: + if (goods_piece < 0) goods_piece = 0; + //累积商品数量 + goods_piece += item[j]['goods_num']; + break; + } + } + } } diff --git a/pages/distribution/distribution.js b/pages/distribution/distribution.js index 16617a1..e76fa70 100644 --- a/pages/distribution/distribution.js +++ b/pages/distribution/distribution.js @@ -171,20 +171,33 @@ Page({ title: "全部满足成为分销商", icon: 'none', duration: 2000 - }); - //-- 会员的分销的内容要进行存储 -- - app.globalData.userInfo.is_distribut=1; - wx.setStorageSync("userinfo",app.globalData.userInfo); - setTimeout(function(){ - self.getDis_data(); - self.setData({ - userInfo: app.globalData.userInfo, - }); - },2000) + }); + + if(app.globalData.userInfo) { + //-- 会员的分销的内容要进行存储 -- + app.globalData.userInfo.is_distribut=1; + wx.setStorageSync("userinfo",app.globalData.userInfo); + setTimeout(function(){ + self.getDis_data(); + self.setData({ + userInfo: app.globalData.userInfo, + }); + },2000) + } + } - } - - + } + else{ + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 2000 + }); + setTimeout(function(){ + getApp().goto("/pages/user/index/index"); + },1500) + + } }else{ self.getDis_data() @@ -284,7 +297,7 @@ Page({ var txt="fenxiao["+index+"].pass"; var txt2="data.is_distribut"; var txt3="userInfo.is_distribut"; - getApp().globalData.userInfo.is_distribut=1; + if(getApp().globalData.userInfo) getApp().globalData.userInfo.is_distribut=1; setTimeout(function(){ diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 8c42c13..dc8bf88 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -578,7 +578,7 @@ Page({ //---------分享配置-------- onShareAppMessage: function (e) { - url="pages/goods/categoryList/categoryList"; + var url="pages/goods/categoryList/categoryList"; var userInfo=getApp().globalData.userInfo; //是分销商才带 if(userInfo){ @@ -1042,8 +1042,11 @@ Page({ }, onShareTimeline(){ + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; return { - title:'商品分类-'+getApp().globalData.config.store_name, + title:'商品分类-'+store_name, } } diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 412d9ec..b7230fd 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -4452,7 +4452,7 @@ Page({ } var img_url=ee.data.data.original_img; - if((this.data.prom_type==1 && this.data.prom_type==6) || this.data.prom_act.share_imgurl){ + if((this.data.prom_type==1 || this.data.prom_type==6) && this.data.prom_act.share_imgurl){ img_url=this.data.iurl+this.data.prom_act.share_imgurl; } @@ -5233,8 +5233,11 @@ Page({ onShareTimeline() { + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; return { - title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name, + title:this.data.data.goods_name + '-' + store_name, imageUrl:this.data.gallery[0].image_url, } }, diff --git a/pages/index/index/index.js b/pages/index/index/index.js index f653c44..a3220ea 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -668,7 +668,7 @@ Page({ } var ob={ - title: getApp().globalData.config.store_name, + title: title, path:url, }; console.log(ob); @@ -1042,9 +1042,11 @@ Page({ // title: '首页-' + getApp().globalData.config.store_name, // } // }); - + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; return { - title: '首页-' + getApp().globalData.config.store_name, + title: '首页-' + store_name, } }, diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js index 959e9fd..a4190df 100644 --- a/pages/user/assistance/assistance.js +++ b/pages/user/assistance/assistance.js @@ -241,8 +241,11 @@ Page({ }, onShareTimeline() { + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; return { - title: '好友助力-' + getApp().globalData.config.store_name, + title: '好友助力-' + store_name, } }, diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index d2603dd..7937315 100644 --- a/pages/user/coupons/coupons.js +++ b/pages/user/coupons/coupons.js @@ -178,37 +178,40 @@ Page({ data.cashcount = parseInt(data.CashCount); getApp().globalData.Integral = data.Integral; - getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{data:{user_id: user_id, store_id: os.stoid, pageSize:200}}).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ - var b_arr=res.data.data.pageData; - var b_can_arr=[]; //未使用 - var b_out_arr=[]; //已过期 - var b_isuse_arr=[]; //已过期 - for(var i in b_arr){ - b_arr[i].isby=1; - if(b_arr[i].isuse==0){ - if(b_arr[i].use_end_time<=ut.gettimestamp()){ - b_out_arr.push(b_arr[i]); - }else{ - b_can_arr.push(b_arr[i]); - } - - }else{ - b_isuse_arr.push(b_arr[i]); - } - } - data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 - th.data.b_can_arr=b_can_arr; //可使用 - th.data.b_out_arr=b_out_arr; //过期 - th.data.b_isuse_arr=b_isuse_arr; //已使用 - th.setData({ udata: data}); - func();s_guoqi(); - - }else{ - th.setData({ udata: data}); - func();s_guoqi(); - } - }) + getApp().request.get("/api/weshop/userfeemail/pageAndArea",{ + data:{user_id: user_id, store_id: os.stoid, pageSize:200}, + success:function(res){ + if(res.data.code==0 && res.data.data && res.data.data.total>0 ){ + var b_arr=res.data.data.pageData; + var b_can_arr=[]; //未使用 + var b_out_arr=[]; //已过期 + var b_isuse_arr=[]; //已过期 + for(var i in b_arr){ + b_arr[i].isby=1; + if(b_arr[i].isuse==0){ + if(b_arr[i].use_end_time<=ut.gettimestamp()){ + b_out_arr.push(b_arr[i]); + }else{ + b_can_arr.push(b_arr[i]); + } + + }else{ + b_isuse_arr.push(b_arr[i]); + } + } + data.cashcount= data.cashcount+b_can_arr.length; //加上包邮券的数量 + th.data.b_can_arr=b_can_arr; //可使用 + th.data.b_out_arr=b_out_arr; //过期 + th.data.b_isuse_arr=b_isuse_arr; //已使用 + th.setData({ udata: data}); + func();s_guoqi(); + + }else{ + th.setData({ udata: data}); + func();s_guoqi(); + } + } + }) } }) @@ -227,23 +230,21 @@ Page({ page: 1 }; - getApp().request.promiseGet("/api/weshop/users/listQuan", { - data:get_data - }).then(res=>{ - - if(res.data.code==0 && res.data){ - var a = res.data,val = a.data.total; - var details = a.data.pageData; - if (details.length == 0){ - if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); - return false; - } - var all_length=val; - if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; - th.setData({ number: all_length}); - } - - + getApp().request.get("/api/weshop/users/listQuan", { + data:get_data, + success:function(res){ + if(res.data.code==0 && res.data){ + var a = res.data,val = a.data.total; + var details = a.data.pageData; + if (details.length == 0){ + if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); + return false; + } + var all_length=val; + if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; + th.setData({ number: all_length}); + } + } }) }, @@ -272,47 +273,48 @@ Page({ if(this.data.b_can_arr) init_num=this.data.b_can_arr.length; wx.showLoading(); th.data.isloading=1; - getApp().request.promiseGet("/api/weshop/users/listQuan", { + getApp().request.get("/api/weshop/users/listQuan", { data: get_data, - }).then(res => { - th.data.isloading=0; - var a = res.data; - val = a.data.total; - var details = a.data.pageData; - th.setData({isset:1}); - - //没有找到优惠券的时候 - if (details.length == 0 && th.data.current_page==1) { - this.setData({sheng:0}); - getApp().showWarning("未找更多数据"); - if(big_arr.length>0) { - th.setData({ details: big_arr, }); - th.setData({ val: init_num}); - setTimeout(function(){ - details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - },1000) - } - return false; - } - - th.setData({ val: val+init_num }); - //数组合并 - big_arr=big_arr.concat(details); - //设置数组 - th.setData({ details: big_arr, }); - //延迟显示二维码的内容 - setTimeout(function () { - if(th.data.current_page==1) details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - wx.hideLoading(); - }, 1200) + success:function(res){ + th.data.isloading=0; + var a = res.data; + val = a.data.total; + var details = a.data.pageData; + th.setData({isset:1}); + + //没有找到优惠券的时候 + if (details.length == 0 && th.data.current_page==1) { + th.setData({sheng:0}); + getApp().showWarning("未找更多数据"); + if(big_arr.length>0) { + th.setData({ details: big_arr, }); + th.setData({ val: init_num}); + setTimeout(function(){ + details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + },1000) + } + return false; + } + + th.setData({ val: val+init_num }); + //数组合并 + big_arr=big_arr.concat(details); + //设置数组 + th.setData({ details: big_arr, }); + //延迟显示二维码的内容 + setTimeout(function () { + if(th.data.current_page==1) details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + wx.hideLoading(); + }, 1200) + } }) @@ -341,54 +343,55 @@ Page({ if(big_arr.length==0 && this.data.b_out_arr){ big_arr=this.data.b_out_arr; } - init_num=this.data.b_out_arr.length; + if(this.data.b_out_arr) + init_num=this.data.b_out_arr.length; wx.showLoading();th.data.isloading=1; - getApp().request.promiseGet("/api/weshop/users/listQuan" + getApp().request.get("/api/weshop/users/listQuan" , { data: get_data, - }).then(res => { - - th.data.isloading=0; - var a = res.data; - number = a.data.total; - var details = a.data.pageData; - - if (details.length == 0) { - this.setData({overdue_sheng:0}); - getApp().showWarning("未找更多数据"); - if( big_arr.length>0 && th.data.current_page==1) { - th.setData({ details: big_arr, }); - th.setData({ number: init_num}); - setTimeout(function(){ - details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - } - },1000) - - } - return false; - } - - big_arr=big_arr.concat(details); - - this.setData({ - details: big_arr, number:number+init_num, - }); - - - setTimeout(function () { - if(th.data.current_page==1) details=big_arr; - for (var i = 0; i < details.length; i++) { - var no = i + len; - qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); - - } - wx.hideLoading(); - }, 800) + success:function(res){ + th.data.isloading=0; + var a = res.data; + number = a.data.total; + var details = a.data.pageData; + + if (details.length == 0) { + this.setData({overdue_sheng:0}); + getApp().showWarning("未找更多数据"); + if( big_arr.length>0 && th.data.current_page==1) { + th.setData({ details: big_arr, }); + th.setData({ number: init_num}); + setTimeout(function(){ + details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + } + },1000) + + } + return false; + } + + big_arr=big_arr.concat(details); + + this.setData({ + details: big_arr, number:number+init_num, + }); + + + setTimeout(function () { + if(th.data.current_page==1) details=big_arr; + for (var i = 0; i < details.length; i++) { + var no = i + len; + qrcode('qrcode' + no, details[i].CashRepNo?details[i].CashRepNo:details[i].no, 460, 460); + + } + wx.hideLoading(); + }, 800) + } }) }, diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 7793a2d..5d4724e 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -60,33 +60,36 @@ Page({ onLoad: function(options) { var th=this; //-- 读取会员中心按钮列表 -- - getApp().request.promiseGet("/api/weshop/userTool/page?pageSize=100", { - }).then(res => { - if(res.data.code==0 ){ - var d_list=res.data.data.pageData; - getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ - var dis=rs.data.data; - for(var i in d_list){ - if(d_list[i].name=='我的分销' && dis && dis.switch==0){ - d_list.splice(i,1); - } - } - th.setData({user_tool:d_list}); - }) - } - }) + getApp().request.get("/api/weshop/userTool/page?pageSize=100", { + success:function(res){ + if(res.data.code==0 ){ + var d_list=res.data.data.pageData; + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + var dis=rs.data.data; + for(var i in d_list){ + if(d_list[i].name=='我的分销' && dis && dis.switch==0){ + d_list.splice(i,1); + } + } + th.setData({user_tool:d_list}); + }) + } + } + }) this.birthday(); - getApp().request.promiseGet("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { data: { enabled: 1 - } - }).then(res => { - if(res.data.code==0 && res.data.data){ - var item=res.data.data.pageData[0]; - if (item && item.ad_code) - th.setData({ad_img:item.ad_code}) - } - }) + }, + success:function(res){ + if(res.data.code==0 && res.data.data){ + var item=res.data.data.pageData[0]; + if (item && item.ad_code) th.setData({ad_img:item.ad_code}) + } + } + }) + + app.getUserFir(); }, diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml index 2e8cb8e..0ad282f 100644 --- a/pages/user/my_service/hist_service.wxml +++ b/pages/user/my_service/hist_service.wxml @@ -39,7 +39,12 @@ - 未服务 + + + 未服务 + 更改时间 + + 已服务 已过期 已取消 diff --git a/pages/user/my_service/hist_service.wxss b/pages/user/my_service/hist_service.wxss index 8882a8d..71cd3cf 100644 --- a/pages/user/my_service/hist_service.wxss +++ b/pages/user/my_service/hist_service.wxss @@ -64,6 +64,7 @@ page { .serState { color: rgb(255, 82, 125); + text-align: right; } .container { diff --git a/utils/util.js b/utils/util.js index 5ea96e6..9d52c7e 100644 --- a/utils/util.js +++ b/utils/util.js @@ -467,6 +467,21 @@ function convert_arr_key(list,key){ }) return keyObs; } + +function ajax_ok(res){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + return 1; + } + return 0; +} +function ajax_ok2(res){ + if(res.data.code==0 && res.data.data && res.data.data.length>0){ + return 1; + } + return 0; +} + + module.exports = { formatTime: function(e, r) { var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) { @@ -574,5 +589,7 @@ module.exports = { base64_encode:base64_encode, //64位加密 ob_to_parm:ob_to_parm ,//对象变成参数 sha1:sha1, //sha1进行签名 - convert_arr_key:convert_arr_key //将JS数组对象按其某个键值重组成Map对象 + convert_arr_key:convert_arr_key, //将JS数组对象按其某个键值重组成Map对象 + ajax_ok:ajax_ok, //将JS数组对象按其某个键值重组成Map对象 + ajax_ok2:ajax_ok2 //将JS数组对象按其某个键值重组成Map对象 };