Commit 566fcb2f authored by 石家欣's avatar 石家欣

sjx

parent e41f2694
...@@ -264,10 +264,11 @@ ...@@ -264,10 +264,11 @@
.text{ .text{
font-size: 32upx; font-size: 32upx;
margin-top: 20upx;
} }
.prcie{ .prcie{
font-size: 60upx; font-size: 40upx;
margin-top: 10upx;
} }
} }
...@@ -347,3 +348,11 @@ ...@@ -347,3 +348,11 @@
} }
} }
} }
.xiayiye{
width: 100%;
text-align: center;
}
.mb-20{
margin-bottom: 15upx;
}
\ No newline at end of file
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<view> <view>
<text class="bj pr-10" @tap="detailsFun(item)">编辑</text> <text class="bj pr-10" @tap="detailsFun(item)">编辑</text>
<view class="text">优惠</view> <view class="text">优惠</view>
<view class="prcie">{{item.money}}</view> <view class="prcie mb-20">{{item.money}}</view>
<text class="bj pr-10" @tap="deleteFun(item)">删除</text> <text class="bj pr-10" @tap="deleteFun(item)">删除</text>
</view> </view>
</view> </view>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<!-- 选择参与活动的商品的弹出 --> <!-- 选择参与活动的商品的弹出 -->
<!-- 底部分享弹窗 --> <!-- 底部分享弹窗 -->
<uni-popup :show="showshare" :type="type" @change="change"> <uni-popup :show="showshare" style="z-index: 99;" :type="type" @change="change">
<view class="childboxmain"> <view class="childboxmain">
<view class="titlebox flex ali-c jus-b"> <view class="titlebox flex ali-c jus-b">
<view class="title">选择参与优惠的商品</view> <view class="title">选择参与优惠的商品</view>
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
</view> </view>
</label> </label>
</checkbox-group> </checkbox-group>
<view class="xiayiye title" @tap="shop_goodsFun" v-if="xianshi" >下一页>>></view>
</view> </view>
</scroll-view> </scroll-view>
<view class="submitbtns active" @tap="showshare=false" >确定</view> <view class="submitbtns active" @tap="showshare=false" >确定</view>
...@@ -250,6 +251,7 @@ ...@@ -250,6 +251,7 @@
}, },
data() { data() {
return { return {
xianshi:true,
istruesub:true, istruesub:true,
tabactive:1, tabactive:1,
showshare: false,//弹窗 showshare: false,//弹窗
...@@ -294,6 +296,7 @@ ...@@ -294,6 +296,7 @@
cardlist:[],//已发的卡券 cardlist:[],//已发的卡券
isallshow:false, isallshow:false,
page:0, page:0,
pages:0,
}; };
}, },
onLoad(){ onLoad(){
...@@ -305,7 +308,7 @@ ...@@ -305,7 +308,7 @@
//滚动到最底部 //滚动到最底部
onReachBottom(){ onReachBottom(){
console.log("11"); console.log("11");
this.shop_goodsFun();
if(!this.isallshow && this.tabactive==2){ if(!this.isallshow && this.tabactive==2){
this.shop_couponFun(); this.shop_couponFun();
} }
...@@ -341,10 +344,12 @@ ...@@ -341,10 +344,12 @@
//获取商城商品 //获取商城商品
async shop_goodsFun(){ async shop_goodsFun(){
this.pages++;
let res = await couponGoods({ let res = await couponGoods({
page:this.pages,
}); });
if(res.code==0){
let list = res.data; let list = res.data;
list.map((item,index)=>{ list.map((item,index)=>{
if(item.goods_id){ if(item.goods_id){
...@@ -360,11 +365,21 @@ ...@@ -360,11 +365,21 @@
item.checked = false; item.checked = false;
return item; return item;
}) })
this.shoplist = list; // this.shoplist = list;
if(res.code==0){
if( list.length!=0){
this.shoplist = [...this.shoplist,...list];
}else{
this.$api.msg("没有更多了~");
this.isallshow = true;
this.xianshi = false;
}
}else{ }else{
this.parameter.range_type= 1; this.parameter.range_type= 1;
// this.$api.msg(res.msg); this.$api.msg(res.msg);
} }
}, },
//coupons 商户发放卡券 提交发放卡券的方法 submit //coupons 商户发放卡券 提交发放卡券的方法 submit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment