From 61d2c4bdf36ffcfef3fe66b506cbef7f1927ea99 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 19 Oct 2020 11:42:25 +0800
Subject: [PATCH] 1. 直播分享 2. 券分享
---
packageA/pages/liveStreamDetails/liveStreamDetails.js | 13 +++++++++++++
packageA/pages/live_share/live_share.js | 4 +---
packageA/pages/quan/quan.js | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
packageA/pages/quan/quan.json | 7 ++++---
packageA/pages/quan/quan.wxml | 44 +++++++++++++++++++++++++++++---------------
5 files changed, 161 insertions(+), 117 deletions(-)
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index ffa1f30..ae5f577 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -397,6 +397,19 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
onLoad: function (options) {
var that = this;
this.getSystemInfo();
+
+ var first_leader=options.first_leader;
+ if(first_leader){
+ //-- user_id代过来免登陆 --
+ getApp().globalData.user_id=first_leader;
+ getApp().getUserFir();
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.id;
+ }
+ })
+ }
getApp().request.promiseGet("/api/weshop/wx/livelist/get",{
data:{ id: options.id }
diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js
index 25b70ff..e340ea0 100644
--- a/packageA/pages/live_share/live_share.js
+++ b/packageA/pages/live_share/live_share.js
@@ -17,9 +17,7 @@ Page({
is_no_data:0, //没有数据
is_no_more:0, //没有更多数据
key_str:'',
- pattern:0, //分成的方式
- currentPage:1, //当前的页码
-
+ currentPage:1, //当前的页码
share_hidden:1, //-- 分享的按钮隐藏 --
},
diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js
index 28ce466..154edc6 100644
--- a/packageA/pages/quan/quan.js
+++ b/packageA/pages/quan/quan.js
@@ -1,46 +1,45 @@
// packageA//pages/goods_share/goods_share.js
+var app=getApp(),oo = app.globalData.setting,os=oo,ut = require("../../../utils/util.js");
Page({
/**
* 页面的初始数据
*/
- data: {
- // tab
- tab: ['秒杀','拼单','促销','专享礼包'],
- currentIndex: 0,
+ data: {
//促销页tab
tab2: ['免费发放'],
- currentIndex2: 0,
- //秒杀和拼单底部tab
- currentIndex3: 0,
- // 控制价格
- active1: false,
- // 控制佣金
- active2: false,
- //popup
- hiddenPopup: true,
+ currentIndex2:0,
+ list:[],
+ is_load:0, //是否正在加载
+ is_no_data:0, //没有数据
+ is_no_more:0, //没有更多数据
+ key_str:'',
+ currentPage:1, //当前的页码
+ share_hidden:1, //-- 分享的按钮隐藏 --
+ hiddenPopup:1,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
+ var th=this;
+ //接受有没有导购的参数
+ var first_leader=options.first_leader;
+ if(first_leader){
+ //-- user_id代过来免登陆 --
+ getApp().globalData.user_id=first_leader;
+ getApp().getUserFir();
+ }
+ this.requestGoodsList();
+ this.setData({getcurday:ut.gettimestamp()});
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
-
- },
+ onShow: function () { },
/**
* 生命周期函数--监听页面隐藏
@@ -48,14 +47,6 @@ Page({
onHide: function () {
},
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
@@ -74,71 +65,98 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
-
+ var th=this;
+ var id=th.data.hui_active.id;
+ var url="/packageA/pages/quan_pro/quan_pro?id="+id;
+
+ if(getApp().globalData.user_id){
+ url+="&first_leader="+getApp().globalData.user_id;
+ }
+ var title=th.data.hui_active.name;
+ var ob={
+ title:title,
+ path:url,
+ };
+ th.setData({share_hidden:1});
+ return ob;
+ },
+
+ requestGoodsList:function(){
+ var th=this;
+ if(th.data.is_load) return false; //-- 正在加载
+ if(th.data.is_no_data) return false; //-- 没有数据
+ if(th.data.is_no_more) return false; //-- 没有更多
+ th.data.is_load=1;
+
+ var url="/api/weshop/prom/coupon/pageCouponList";
+ var req_data={
+ page:this.data.currentPage,
+ store_id:oo.stoid,
+ type:1
+ }
+
+ //-- ---调用接口----
+ app.request.promiseGet(url,{data:req_data,isShowLoading:1}).then(res=>{
+ th.data.is_load=0;
+ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+ th.data.currentPage++;
+ var data=res.data.data.pageData;
+ if(res.data.data.page*10>res.data.data.total){th.setData({is_no_more:1});}
+ var list=th.data.list;
+ list=list.concat(data);
+ th.setData({list:list});
+ }else{
+ if(th.data.currentPage==1){
+ th.setData({is_no_data:1});
+ }
+ }
+ })
},
+
+
+ //---点击分享优惠活动---
+ share_index:function(e){
+
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ //getApp().my_warnning("请先登录",0,this);
+ wx.navigateTo({ url: '/pages/togoin/togoin', })
+ return false;
+ }
+
+ var index=e.currentTarget.dataset.index;
+ var item=this.data.list[index];
+ this.setData({share_hidden:0,hui_active:item});
+
+ var com = this.selectComponent("#share_button"); //组件的id
+ com.set_type(1);
+ },
+ //-- ---更多加载----
+ refresh:function(){
+ this.requestGoodsList();
+ },
+
+ //---点击分享优惠活动---
+ share_index:function(e){
+
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ //getApp().my_warnning("请先登录",0,this);
+ wx.navigateTo({ url: '/pages/togoin/togoin', })
+ return false;
+ }
+
+ var index=e.currentTarget.dataset.index;
+ var item=this.data.list[index];
+ this.setData({share_hidden:0,hui_active:item});
+
+ var com = this.selectComponent("#share_button"); //组件的id
+ com.set_type(1);
+ },
+
+
+
- // 点击价格排序
- sort1() {
- if(this.data.active2) {
- this.setData({
- active2: !this.data.active2
- });
- };
- this.setData({
- active1: !this.data.active1
- });
-
- },
- // 点击佣金排序
- sort2() {
- if(this.data.active1) {
- this.setData({
- active1: !this.data.active1
- });
- };
- this.setData({
- active2: !this.data.active2
- });
- },
- // 点击tab
- clickTab(e) {
- this.setData({
- currentIndex: e.target.dataset.index,
- });
- },
- // 点击促销页tab
- clickTab2(e) {
- this.setData({
- currentIndex2: e.target.dataset.index,
- });
- },
- // 点击秒杀和拼单底部tab
- clickTab3(e) {
- this.setData({
- currentIndex3: e.target.dataset.index,
- });
- },
- // 关闭弹出层
- closePopup() {
- this.setData({
- hiddenPopup: true
- });
- },
- // 显示弹出层
- showPopup() {
- this.setData({
- hiddenPopup: false
- });
- },
- clickShare() {
- this.setData({
- hiddenPopup: false
- });
- },
- select(e) {
- var index = e.target.dataset.index;
- this.setData({
- hiddenPopup: true
- });
- },
})
\ No newline at end of file
diff --git a/packageA/pages/quan/quan.json b/packageA/pages/quan/quan.json
index 4c964d8..e3d91c4 100644
--- a/packageA/pages/quan/quan.json
+++ b/packageA/pages/quan/quan.json
@@ -1,6 +1,7 @@
-{
- "usingComponents": {
- "nodata": "/components/nodata/nodata"
+{
+ "usingComponents": {
+ "nodata": "/components/nodata/nodata",
+ "share_button": "/components/share/share"
},
"navigationBarTitleText": "优惠券列表",
"enablePullDownRefresh": false
diff --git a/packageA/pages/quan/quan.wxml b/packageA/pages/quan/quan.wxml
index 2bef9b4..86fbeda 100644
--- a/packageA/pages/quan/quan.wxml
+++ b/packageA/pages/quan/quan.wxml
@@ -1,3 +1,4 @@
+
@@ -11,30 +12,42 @@
-
-
- 暂无数据
-
-
+
+
- 全场通用券
- 限时使用：2012-12-31 至 2013-12-31
+ {{item.name}}
+ 限时使用：
+ {{filters.format_time(getcurday+3600*24*item.startdays)}}
+ {{filters.format_time(item.use_start_time)}}至
+ {{filters.format_time(item.use_end_time)}}不限
+
+ 限时使用：
+ {{filters.format_time(getcurday+3600*24*item.startdays)}}至 {{filters.format_time(getcurday+3600*24*item.days)}}不限
+
- ￥25
+ ￥{{filters.toFix(item.money,2)}}
- 全场任意产品通用
- 分享
+ 全场任意产品通用
+ 名牌({{item.useobjectname}})
+ 品类({{item.useobjectname}})
+ 用途({{item.useobjectname}})
+ 分类一({{item.useobjectname}})
+ 单品({{item.useobjectname}})
+
+ 分享
-
-
+
-
- - 已全部加载 -
+
+
+ 暂无数据
+ - 已全部加载 -
-
+
+
--
libgit2 0.21.4