diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml
index 6a874f3..d3ddcc5 100644
--- a/components/diy_searchbox/diy_searchbox.wxml
+++ b/components/diy_searchbox/diy_searchbox.wxml
@@ -34,14 +34,14 @@
-
-
- 在店铺内搜索
+
+
+ 在店铺内搜索
-
-
-
+
+
+
diff --git a/components/diy_searchbox/diy_searchbox.wxss b/components/diy_searchbox/diy_searchbox.wxss
index 8df14d5..168ff87 100644
--- a/components/diy_searchbox/diy_searchbox.wxss
+++ b/components/diy_searchbox/diy_searchbox.wxss
@@ -85,4 +85,26 @@
.flex{ display: flex; align-items: center;}
.find_img{margin: 0 20rpx; }
.find_inp{text-align: left; width: 620rpx;}
-.find_inp2{text-align: left; width: 520rpx;}
\ No newline at end of file
+.find_inp2{text-align: left; width: 520rpx;}
+
+
+@font-face {font-family: "iconfont";
+ src: url('iconfont.eot?t=1607568098927'); /* IE9 */
+ src: url('iconfont.eot?t=1607568098927#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALAAAsAAAAABmAAAAJ1AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcApsgQwBNgIkAwgLBgAEIAWEbQcwG7IFyC6wbdiTQGyMi0WNir+9Fm8e4RAP/6397pud/aJ4Uk0uWTSRSTRKIkFspMDpGgqN+fZzt/8RazTS0XwWUU8Ta1/um9zuTxpailoSb/A6tG0kPJvEFYB1Rtl89ekqqzifuJ/6V0ADyXe+m0tEUFRyJODApgOMKhrZJjTjDWMXuITjBBpGtXCdDU2EQIXMGheIJ1lkQEXOK8ssURMqNUuzeAOlWnqhrvEafj9+rUQFSVmwSi4fB3nQ83lsp9CTxUkPPgF8BLS6RIFlQCZua6PnaMHotEa0xCSwr8Lg87hY9C1ir0bB/jorvwWGoeiexK7kVvMTyHH3KGBr1C2kvho1nw+v5pbDPZGLXOPI7W04lwtV8CN5NHtN7tJJiwuUQ9cnXjb3PqlBXYtDLSxSjl26sODsxV2ZjMvjTmTScSpBpdM58XQG9LB+VlxQVwLBn+bvdvzWmhl8/HtoyPrZqe3ZFvwhcc+mrEstc8qquNaejI4am9DQwD/s7HM/Vjd4O8lQM3hT9qqRFIWaaVKmLaPUtIaKmkM0LBle3dQPo0WuY9EcQOixj6TjHYUeN6RMu0NpyCsqeoJGw33Ubtk0G3JVP0YMQTxks1DmTENwrKQqKgwg0dEYnJWGjAjCSTkAfW5vMTGMDITnmJFMiX5CBChgU4dD4DSkaSa0sKkgjrglQqw2j0eoe5ObM3VQ5RSGMAiEB7GyIBnHZBD8zkRV6fMBiMihYeCWshpvBIIlyb1DPm7eHqRhldGr7F5eSUoR+RGEABJgJh00BAYhGo0JsuoHKRAO4SaNCFvaeOx2Ql+Ve32N/gGFrApLn8LuV6g8IwZzEgA=') format('woff2'),
+ url('iconfont.woff?t=1607568098927') format('woff'),
+ url('iconfont.ttf?t=1607568098927') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('iconfont.svg?t=1607568098927#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-search:before {
+ content: "\e7b3";
+}
diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js
index d444460..d6c092e 100644
--- a/packageA/pages/activity_share/activity_share.js
+++ b/packageA/pages/activity_share/activity_share.js
@@ -56,10 +56,15 @@ Page({
var th=this;
//接受有没有导购的参数
var first_leader=options.first_leader;
+ var StaffId=options.StaffId;
+ var StorageId=options.StorageId;
if(first_leader){
//-- user_id代过来免登陆 --
getApp().globalData.user_id=first_leader;
getApp().getUserFir();
+
+ //设置分享会员和导购id和归属门店ID
+ this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId});
}
this.requestGoodsList();
@@ -85,10 +90,9 @@ Page({
},
fail: function(res) {}
});
- }
-
+ }
th.setData({poster:json_data})
-
+
}
}
})
@@ -154,45 +158,56 @@ Page({
path:url,
imageUrl: img,
};
- th.setData({share_hidden:1});
- return ob;
-
+ th.setData({share_hidden:1});
+ th.insert_act_share(title,lbid);
+ return ob;
}else{
//---秒杀，拼团，促销---
var item=this.data.share_good;
if(item){
var price = item.price;
if(!price) price=item.shop_price;
-
-
+
var title= item.goods_name;
var img=this.data.url+item.original_img;
var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
if(getApp().globalData.user_id){
- url+="&first_leader="+getApp().globalData.user_id;
+ url+="&first_leader="+getApp().globalData.user_id;
}
var ob={
title: price + "元 " +title,
path:url,
imageUrl: img,
};
- th.setData({share_hidden:1,share_good:null});
+ th.setData({share_hidden:1,share_good:null});
+
+ //插入活动
+ if(item.prom_type==3){
+ var hui_active=this.data.hui_active;
+ th.insert_act_share(hui_active.name,hui_active.id);
+ }else{
+ th.insert_act_share(item.title,item.id);
+ }
+
return ob;
}else{
var url="/pages/index/index/index";
if(getApp().globalData.user_id){
url+="?first_leader="+getApp().globalData.user_id;
}
- var hui_active=this.data.hui_active;
- var title=hui_active.name;
+ var hui_active=this.data.hui_active;
+
+ var title=hui_active.title;
+ if(!title) title=hui_active.name;
if(!title) title=hui_active.main_goods_name;
if(!title) title=hui_active.giftTitle;
var ob={
- title: title,
- path:url,
+ title: title,path:url,
};
- th.setData({share_hidden:1,share_good:null});
+ th.setData({share_hidden:1,share_good:null});
+ //插入活动
+ th.insert_act_share(title,hui_active.id);
return ob;
}
}
@@ -506,6 +521,13 @@ Page({
if(user_id>0){
scene+="_"+user_id;
}
+
+ if(th.data.share_good.prom_type==3){
+ th.insert_act_share(th.data.hui_active.name,th.data.hui_active.id); //插入分享
+ }else{
+ th.insert_act_share(th.data.share_good.title,th.data.share_good.id); //插入分享
+ }
+
///二微码
var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
@@ -1086,7 +1108,29 @@ Page({
var lbid=item.lbId;
var url="/pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
getApp().goto(url);
+ },
+
+ //-- 推送活动分享 --
+ insert_act_share:function(title,actid){
+ var th = this;
+ var url="/api/weshop/sharetypeList/save";
+ var req_data={
+ shareActId:actid,
+ shareActName:title,
+ shareType:3,
+ shareUserId:th.data.first_leader,
+ shareStaffId:th.data.StaffId,
+ shareStorageId:th.data.StorageId,
+ shareTime:ut.gettimestamp(),
+ storeId:os.stoid
+ }
+ //插入数据
+ getApp().request.post(url,{
+ data:req_data,
+ success:function(){}
+ })
+
}
-
+
})
\ No newline at end of file
diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js
index 40ae229..13fbcbe 100644
--- a/packageA/pages/goods_share/goods_share.js
+++ b/packageA/pages/goods_share/goods_share.js
@@ -33,10 +33,15 @@ Page({
var th=this;
//接受有没有导购的参数
var first_leader=options.first_leader;
+ var StaffId=options.StaffId;
+ var StorageId=options.StorageId;
if(first_leader){
//-- user_id代过来免登陆 --
getApp().globalData.user_id=first_leader;
getApp().getUserFir();
+
+ //设置分享会员和导购id和归属门店ID
+ this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId});
}
this.requestGoodsList();
@@ -150,6 +155,7 @@ Page({
imageUrl: img,
};
th.setData({share_hidden:1});
+ th.insert_goods_share();
return ob;
},
@@ -326,6 +332,9 @@ Page({
that.setData({
canvasHidden: false,share_hidden:1
})
+
+ //点击分享
+ this.insert_goods_share();
var app = getApp();
var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
@@ -350,10 +359,10 @@ Page({
//先画背景
var pg_path = "../../../images/share/share_bg.png";
- //-- 如果有自定义海报的时候，判断背景的图片 --
- if(th.data.share_b_img){
+ //-- 如果有自定义海报的时候，判断背景的图片 --
+ if(th.data.share_b_img){
pg_path=th.data.share_b_img;
- }
+ }
context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
//-- 是自定义海报的情况下 --
@@ -803,6 +812,30 @@ Page({
var item=this.data.list[index];
var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
getApp().goto(url);
+ },
+
+ insert_goods_share:function(){
+ var th = this;
+ var item=this.data.share_good;
+ var url="/api/weshop/sharetypeList/save";
+ var req_data={
+ shareActId:item.goods_id,
+ shareActName:item.goods_name,
+ shareType:2,
+ shareUserId:th.data.first_leader,
+ shareStaffId:th.data.StaffId,
+ shareStorageId:th.data.StorageId,
+ shareTime:ut.gettimestamp(),
+ storeId:os.stoid
+ }
+ //插入数据
+ getApp().request.post(url,{
+ data:req_data,
+ success:function(){
+
+ }
+ })
+
}
diff --git a/packageA/pages/goods_share/goods_share.wxml b/packageA/pages/goods_share/goods_share.wxml
index 57dee07..61f3f51 100644
--- a/packageA/pages/goods_share/goods_share.wxml
+++ b/packageA/pages/goods_share/goods_share.wxml
@@ -1,4 +1,5 @@
+
@@ -59,7 +60,7 @@
{{card_name}}
- ￥{{filter.toFix(item[card_field],2)}}
+ ￥{{filters.toFix(item[card_field],2)}}
diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index 76c92f3..8edae35 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -34,6 +34,7 @@ Page({
is_no_more:0, //没有更多数据
key_str:'',
pattern:0, //分成的方式
+ pageSize:10,
currentPage:1, //当前的页码
// canvasHidden: 1, //-- 隐藏画布 --
@@ -56,17 +57,25 @@ Page({
triggered: false,
isPullDownRefresh: false,
+
+
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.request_list({
+ var th=this;
+ this.data.requestData={
store_id:oo.stoid,
stype:1,
- stypeup:1
- });
+ stypeup:1,
+ page:th.data.currentPage2,
+ pageSize:th.data.pageSize
+ };
+
+
+ this.request_list(this.data.requestData);
// var th=this;
// //接受有没有导购的参数
// var first_leader=options.first_leader;
@@ -216,18 +225,25 @@ Page({
//-- 点击tab --
clickTab(e) {
var th=this;
- var data = {
- store_id:oo.stoid,
- stype:e.target.dataset.index,
- stypeup:1,
- };
+ var psize=th.data.curr
+
this.setData({
is_no_data2:0,
is_no_more2:0,
list2:[],
is_load2: 0,
currentPage2:1,
+ pageSize:psize
});
+ var data = {
+ store_id:oo.stoid,
+ stype:e.target.dataset.index,
+ stypeup:1,
+ page:th.data.currentPage2,
+ pageSize:psize
+ };
+
+
if(this.data.currentIndex!=e.target.dataset.index){
this.setData({
currentIndex: e.target.dataset.index,
@@ -269,6 +285,8 @@ Page({
// 开启加载状态
this.data.is_load2=1;
+
+
// var req_data = {
// page:th.data.currentPage2
// }
@@ -307,7 +325,18 @@ Page({
})
},
+ //-- 滚动到底部 --
+ request_list_lower:function(){
+ var data=this.data.requestData;
+ data.page=this.data.currentPage2;
+ this.setData({
+ requestData: data
+ })
+ this.request_list(data);
+
+ },
+
//---图片失败，默认图片---
diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml
index 04be247..72de11f 100644
--- a/packageA/pages/jfbuy/jfbuy.wxml
+++ b/packageA/pages/jfbuy/jfbuy.wxml
@@ -27,7 +27,7 @@
-
+
{{time==""?'选择时间':time}}
∟
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index b9d08e7..eaf4fdb 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -19,7 +19,7 @@ Page({
comment: "", //美容师评价
aweeks: [], //七天的预约时间
head_img: "", //美容师头像
- time: ["08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00"],
+ time:['08:00','08:30', '09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '12:00', '12:30', '13:00', '13:30', '14:00','14:30', '15:00', '15:30', '16:00', '16:30', '17:00','17:30', '18:00','18:30', '19:00', '19:30', '20:00', '20:30', '21:00', '21:30', '22:00','22:30'],
weeks: [], //星期几数组
time_index: -1, //选择预约时间下标
date_id: 0, //选择日期的id
@@ -42,12 +42,16 @@ Page({
var minutes = myDate.getMinutes(); //获取当前分钟数(0-59)
var hours = myDate.getHours() + ":" + minutes; //获取当前小时数(0-23)
var beautician_id = options.BeauticianID;
+ var storageId = options.StorageId;
+
+
th.setData({
beautician_id: beautician_id,
itemId: options.itemId,
modify: options.modify,
hours: hours,
- projectId: options.projectId
+ projectId: options.projectId,
+ storageId:storageId
})
if (options.url != undefined) {
th.setData({
@@ -69,8 +73,7 @@ Page({
StaffName: options.StaffName
})
}
- th.query_beatea();
- th.query_aweek();
+ th.query_beatea(th.query_aweek);
},
/**
* 生命周期函数--监听页面显示
@@ -112,7 +115,7 @@ Page({
}
},
//获取美容师信息
- query_beatea: function() {
+ query_beatea: function(func) {
var th = this;
var url = "/api/weshop/marketing/reservation/staff/get"; //接口路径
var beautician_id = th.data.beautician_id;
@@ -124,11 +127,16 @@ Page({
}).then(res => {
if (res.data.code == 0) {
var data = res.data.data;
- th.setData({
+ var ob={
name: data.StaffName,
comment: data.Remark1,
head_img: data.PhotoUrl
- })
+ };
+ if(!th.data.storageId){
+ ob.storageId=data.StorageId;
+ }
+ th.setData(ob);
+ func();
} else {
getApp().my_warnning(res.data.msg, 0, th);
}
@@ -226,15 +234,18 @@ Page({
query_aweek: function() {
var th = this;
var beautician_id = th.data.beautician_id; //美容师id
+ var storageId=th.data.storageId;
+
var itemId = th.data.itemId; //服务id
var projectId = th.data.projectId; //项目id
- var url = "/api/weshop/marketing/reservation/staff/seven/time/list"; //接口地址
+ var url = "/api/weshop/marketing/reservation/staff/seven/time/listnew"; //接口地址
getApp().request.promiseGet(url, {
data: {
projectId: projectId,
beauticianId: beautician_id,
serviceId: itemId,
storeId: a.stoid,
+ storageId:storageId
}
}).then(res => {
if (res.data.code == 0) {
@@ -281,11 +292,12 @@ Page({
var SeekTime = th.data.aweeks[date_id].time;
var val = th.data.aweeks[date_id].val;
- var url = "/api/weshop/marketing/reservation/staff/time/list";
+ var url = "/api/weshop/marketing/reservation/staff/time/listnew";
getApp().request.promiseGet(url, {
data: {
projectId: projectId,
- beauticianId: th.data.beautician_id,
+ staffId: th.data.beautician_id,
+ storageId:th.data.storageId,
serviceId: th.data.itemId,
seekTime: SeekTime,
storeId: a.stoid,
@@ -301,8 +313,8 @@ Page({
//不等于空就是有可以预约的时间
if (time_list != null) {
- if (res.data.data[0].GroupHour != undefined) {
- if (res.data.data[0].GroupHour.length > 11) {
+ if (res.data.data && res.data.data[0]!= undefined) {
+ if (res.data.data[0].GroupHour && res.data.data[0].GroupHour.length > 11) {
getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
}
}
@@ -310,17 +322,15 @@ Page({
for (var i = 0; i < time.length; i++) {
for (var ii = 0; ii < time_list.length; ii++) {
//判断固定的时间和可以预约的时间
- if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
+ if (time[i] == time_list[ii].begintime.substring(0, 5)) {
var date_id = th.data.date_id;
- if (date > time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
+ if (date > time_list[ii].begintime.substring(0, 2) && date_id == 0) {
new_time[i] = "";
break;
- } else {
- new_time[i] = time_list[ii].GroupHour.substring(0, 5);
+ }else{
+ new_time[i] = time_list[ii].begintime.substring(0, 5);
break;
}
-
-
} else {
new_time[i] = "";
}
@@ -393,7 +403,17 @@ Page({
return 1;
}
return 0;
- }
+ },
+
+ check_is_in_arr:function(val,pdata) {
+ if(!val || !pdata) return false;
+ for(var i in pdata){
+ if(pdata[i].begintime.indexOf(val)!=-1){
+ return true;
+ }
+ }
+ return false;
+ }
diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
index 6147a7e..5d71119 100644
--- a/pages/user/my_service/cosmetology_list.js
+++ b/pages/user/my_service/cosmetology_list.js
@@ -32,7 +32,7 @@ Page({
},
query_cology: function() {
var th = this;
- var url = "/api/weshop/marketing/reservation/staff/page";
+ var url = "/api/weshop/marketing/reservation/staff/pagenew";
var itemId = th.data.itemId; //服务id
var storageId = th.data.storageId;
getApp().request.promiseGet(url, {
@@ -49,20 +49,20 @@ Page({
if (res.data.code == 0) {
th.data.curpage++;
var arr1 = th.data.cosmetology_list;
- var arr2 = res.data.data.pageData;
+ var arr2 = res.data.data;
var arr3 = [...arr1, ...arr2];
- var ismore = 0;
- if (arr3.length == res.data.data.total) ismore = 1
+
+
th.setData({
cosmetology_list: arr3,
- total: res.data.data.total,
- ismore: ismore,
+ total: res.data.data.total,
is_service_read: 1,
is_cosmetology_read:1
}), wx.stopPullDownRefresh(); //停止下拉刷新
} else {
th.setData({
- is_cosmetology_read:1
+ is_cosmetology_read:1,
+ ismore:1
})
}
})
@@ -95,6 +95,13 @@ Page({
*/
onShow: function() {
var th = this;
+ th.data.curpage++;
+ th.setData({
+ cosmetology_list: [],
+ total: 0,
+ is_service_read: 0,
+ is_cosmetology_read:0
+ })
th.query_cology();
},
diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml
index 02f99a7..66049b0 100644
--- a/pages/user/my_service/cosmetology_list.wxml
+++ b/pages/user/my_service/cosmetology_list.wxml
@@ -8,7 +8,7 @@
-
+
{{item.StaffName}}
@@ -27,7 +27,7 @@
-
+
预约