diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 036b356..bedc1bb 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -349,5 +349,29 @@ Page({ var nav_b = th.selectComponent("#nav_b"); //组件的id nav_b.close_box(); nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy"); - } + }, + + //--- 分享设置 -- + onShareAppMessage: function (e) { + var curPage=this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + + pagePath+="?isBuy="+this.data.isBuy; + if(this.data.isBuy==0){ + pagePath+="&lbId="+this.data.getGiftID; + }else{ + pagePath+="&orderSn="+this.data.orderSn; + } + + return { + title: "礼包详情", + path:pagePath, + } + }, + + + }); \ No newline at end of file diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js index 8ab5ca6..6138b07 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.js +++ b/pages/giftpack/mygiftpack/mygiftpack.js @@ -116,4 +116,19 @@ Page({ }, + +//--- 分享设置 -- +onShareAppMessage: function (e) { + var curPage=this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + return { + title: "专享礼包", + path:pagePath, + } +}, + + }); \ No newline at end of file diff --git a/pages/store/index.js b/pages/store/index.js index 3dbea01..8601e17 100644 --- a/pages/store/index.js +++ b/pages/store/index.js @@ -12,6 +12,7 @@ Page({ is_no_more:0, key_word:'', //关键字搜索 cat_id:0, //分类ID + islading:0, }, onShow:function(){ @@ -65,6 +66,8 @@ Page({ get_list:function(){ if(this.data.is_no_more==1) return false; + if(this.data.islading==1) return false; + this.data.islading=1; var th=this,req = getApp().request; var dd = { store_id: o.stoid, @@ -84,6 +87,7 @@ Page({ req.promiseGet("/api/weshop/pickup/list", { data: dd, }).then(res => { + this.data.islading=0; wx.hideLoading(); if(res.data.code==0){ if(res.data.data.pageData.length<=0){ @@ -132,6 +136,7 @@ Page({ cid: item['cat_id'] }) this.data.page=1; + this.data.is_no_more=0; this.setData({ pick_list:null}) this.get_list(); @@ -139,7 +144,8 @@ Page({ //搜索关键字 sear:function(){ - this.data.page=1; + this.data.page=1; + this.data.is_no_more=0; this.setData({ pick_list:null}) this.get_list(); }, diff --git a/pages/store/index.wxml b/pages/store/index.wxml index e780603..2a5c362 100644 --- a/pages/store/index.wxml +++ b/pages/store/index.wxml @@ -1,8 +1,8 @@ - + - + diff --git a/pages/store/index.wxss b/pages/store/index.wxss index 23dab93..3906111 100644 --- a/pages/store/index.wxss +++ b/pages/store/index.wxss @@ -42,7 +42,7 @@ position: relative; .bcolor{background-color: #f5f5f5; height: 126rpx;} .sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;} -.sear_inp input{ position: relative; top:10rpx;width: 400rpx; display: inline-block;} +.sear_inp input{width: 400rpx;} .select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center } -.sear_btn{ width: 50rpx; height: 100%; display: inline-block;} +.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}