diff --git a/app.js b/app.js
index 672a0a1..59fa07e 100644
--- a/app.js
+++ b/app.js
@@ -1064,7 +1064,7 @@ App({
var third_rate = dis_config.third_rate; // 三级比例
if(this.globalData.userInfo.first_leader){
- return parseFloat(parseFloat(first_money).toFixed(2));
+ return parseFloat(parseFloat(fir_num).toFixed(2));
}else{
return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
}
diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 421c6cf..f910db6 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -33,6 +33,8 @@ Page({
flag: true,
isLogin: false,
+ imgUrl: app.globalData.setting.imghost,
+ show_no_integral:false
},
@@ -46,11 +48,16 @@ Page({
});
self.loadCheckedRecord();
}else{
- wx.showToast({
- title: "网络繁忙，请重试",
- icon: 'none',
- duration: 2000
- })
+ if(res.data.msg.indexOf('未开启签到')!=-1){
+ self.setData({ show_no_integral: true });
+ }else{
+ wx.showToast({
+ title: res.data.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+
}
},
});
@@ -390,5 +397,10 @@ Page({
if(url){
getApp().goto(url);
}
+ },
+
+ back_to(){
+ wx.navigateBack();
}
+
})
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index 4f8bb65..14445d3 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -139,4 +139,20 @@
+
+
+
+
+ 提示
+
+
+
+
+ 商家暂时未开启积分签到，敬请期待哦！
+
+
+
+
+
\ No newline at end of file
diff --git a/packageA/pages/checkin/checkin.wxss b/packageA/pages/checkin/checkin.wxss
index f524734..ab477ff 100644
--- a/packageA/pages/checkin/checkin.wxss
+++ b/packageA/pages/checkin/checkin.wxss
@@ -354,3 +354,44 @@ page,
flex-wrap: wrap;
text-align:center;
}
+
+.cover-layer {
+ position: fixed;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1000;
+ background: rgba(0,0,0,0.4);
+ width: 100%;
+ height: 100%;
+}
+
+.pop_up_no{
+ z-index: 2000;
+ position: fixed;
+ width:80%;
+ height:500rpx;
+ left: 50%;
+ top:50%;
+ transform:translate(-50%,-50%);
+ background-color: #fff;
+ font-size: 28rpx;
+ border-radius: 20rpx;
+}
+
+.pop_up_no .title{
+ height: 90rpx;
+ background-color: #ffd601;
+ text-align: center;
+ line-height: 90rpx;
+ border-top-right-radius: 20rpx;
+ border-top-left-radius: 20rpx;
+}
+
+.pop_up_no .content{
+ text-align: center;
+}
+.pop_up_no .close_img{
+ width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
+ }
\ No newline at end of file
diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js
index 3baf596..304a1dd 100644
--- a/packageA/pages/quan_list/quan_list.js
+++ b/packageA/pages/quan_list/quan_list.js
@@ -32,6 +32,9 @@ Page({
//---展示---
onShow: function () {
+ //检查能不能分享
+ getApp().check_can_share();
+
console.log("onShow:1");
this.data.curpage = 1;
this.setData({ dataList: null });
@@ -41,6 +44,8 @@ Page({
//var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
//th.setData({dataList: data});
this.setData({ getcurday: ut.gettimestamp() });
+
+
},
onHide: function () {
@@ -184,5 +189,36 @@ Page({
var index = e.currentTarget.dataset.ind;
var item = this.data.dataList[index];
getApp().goto("/packageA/pages/quan_pro/quan_pro?id=" + item.id);
- }
+ },
+
+
+ //发送给好友
+ onShareAppMessage:async function(e) {
+ getApp().globalData.no_clear=1;
+ var url= `packageA/pages/quan_list/quan_list`;
+ var userInfo = getApp().globalData.userInfo;
+ //是分销商才带
+ if (userInfo) {
+ url += "?first_leader=" + userInfo.user_id;
+ }
+ var ob = {
+ title:"优惠券列表",
+ path: url,
+ //imageUrl:this.data.url+this.data.store_config.store_logo,
+ };
+ return ob;
+ },
+
+ //发送给朋友圈
+ onShareTimeline() {
+ getApp().globalData.no_clear=1;
+ var user_id= getApp().globalData.user_id
+ return {
+ title:"优惠券列表",
+ query: 'first_leader='+user_id
+ }
+ },
+
+
+
});
diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js
index 59d4fde..77a823f 100644
--- a/packageA/pages/quan_pro/quan_pro.js
+++ b/packageA/pages/quan_pro/quan_pro.js
@@ -44,6 +44,10 @@ Page({
//---展示,显示券的信息---
onShow: function() {
+
+ //检查能不能分享
+ getApp().check_can_share();
+
var th=this;
var user_id=getApp().globalData.user_id;
getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
@@ -170,4 +174,33 @@ Page({
show_success:0
})
},
+
+ //发送给好友
+ onShareAppMessage:async function(e) {
+ getApp().globalData.no_clear=1;
+ var url= "packageA/pages/quan_pro/quan_pro?id="+this.data.id;
+ var userInfo = getApp().globalData.userInfo;
+ //是分销商才带
+ if (userInfo) {
+ url += "&first_leader=" + userInfo.user_id;
+ }
+ var ob = {
+ title:this.data.q_data.name,
+ path: url,
+ //imageUrl:this.data.url+this.data.store_config.store_logo,
+ };
+ return ob;
+ },
+
+ //发送给朋友圈
+ onShareTimeline() {
+ getApp().globalData.no_clear=1;
+ var user_id= getApp().globalData.user_id
+ return {
+ title:this.data.q_data.name,
+ query: 'id='+this.data.id+'&first_leader='+user_id
+ }
+ },
+
+
});
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index d30a627..e4d74d2 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,6 +1,6 @@
-
+
跳过 {{sec_show}}
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index a4f3416..0a32e1a 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -132,7 +132,7 @@ Page({
//------获取订单商品-------
rq.get("/api/weshop/ordergoods/list",{
- data: { store_id: os.stoid, order_id: oid},
+ data: { store_id: os.stoid, order_id: oid,pageSize:600},
success:async function (eb) {
r.order_goods=eb.data.data.pageData;
var glist = r.order_goods;