diff --git a/app.json b/app.json
index 70151a1..6c8b6f4 100644
--- a/app.json
+++ b/app.json
@@ -121,7 +121,6 @@
"pages/hongBaoDetails/hongBaoDetails",
"pages/service_record/service_record",
"pages/checkin/checkin",
- "pages/distribution/main/main",
"pages/distribution/myteam/myteam",
"pages/distribution/order/order",
"pages/distribution/commision/commision",
@@ -132,7 +131,15 @@
"pages/distribution/rookie/rookie",
"pages/service_share/service_share",
"pages/cardList/cardList",
- "pages/cardDetails/cardDetails"
+ "pages/goodsInfo/goodsInfo",
+ "pages/my_service/appment_main",
+ "pages/my_service/i_service",
+ "pages/my_service/cosmetology_list",
+ "pages/my_service/hist_service",
+ "pages/my_service/tment_details",
+ "pages/my_service/tment_eval",
+ "pages/my_service/tment_order_list",
+ "pages/my_service/beauty_deta"
]
}],
diff --git a/packageA/pages/my_service/appment_main.json b/packageA/pages/my_service/appment_main.json
index 104895a..d6e82a4 100644
--- a/packageA/pages/my_service/appment_main.json
+++ b/packageA/pages/my_service/appment_main.json
@@ -1,7 +1,8 @@
{
"navigationBarTitleText": "预约服务",
- "usingComponents": {
- "warn": "/components/long_warn/long_warn",
- "nav_b": "/components/nav_b/nav_b"
- }
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn",
+ "nav_b": "/components/nav_b/nav_b"
+ }
}
\ No newline at end of file
diff --git a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml
index 788e683..756e539 100644
--- a/packageA/pages/my_service/appment_main.wxml
+++ b/packageA/pages/my_service/appment_main.wxml
@@ -83,14 +83,12 @@
注：剩余可预约人数{{tment_count}}人
-
-
+
+
diff --git a/packageA/pages/my_service/hist_service.js b/packageA/pages/my_service/hist_service.js
index 4365592..724d21f 100644
--- a/packageA/pages/my_service/hist_service.js
+++ b/packageA/pages/my_service/hist_service.js
@@ -69,6 +69,10 @@ Page({
*/
onLoad: function(options) {
var th = this;
+ // console.log('xxoptions==>', options);
+ this.setData({
+ options,
+ });
th.query_hist();
},
/**
@@ -116,7 +120,7 @@ Page({
getApp().request.promiseGet(url, {
data: {
storeId: a.stoid,
- userId: d.user_id,
+ userId: this.data.options.userid,
beginDate: startTime,
endDate: endTime,
page: th.data.curpage,
diff --git a/packageA/pages/my_service/i_service.js b/packageA/pages/my_service/i_service.js
index 20d4b62..00a3e8e 100644
--- a/packageA/pages/my_service/i_service.js
+++ b/packageA/pages/my_service/i_service.js
@@ -29,13 +29,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
+ console.log('options==>', options);
var userinfo = getApp().globalData.userInfo;
if (userinfo == null) {
//界面必须使用warn 做ID,并调用
- return false;
- }
+ // return false;
+ };
this.setData({
- userinfo: userinfo
+ userinfo: userinfo,
+ options,
});
var th = this;
th.query_service();
@@ -48,6 +50,7 @@ Page({
var my_confirm = th.selectComponent("#my_confirm"); //组件的id
my_confirm.open_cancel(0);
},
+
onReachBottom: function() {
var th = this;
if (this.data.total <= th.data.pageSize) return;
@@ -65,7 +68,7 @@ Page({
getApp().request.promiseGet(url, {
data: {
storeId: a.stoid,
- userId: d.user_id,
+ userId: th.data.options.UserId,
page: th.data.curpage,
pageSize: th.data.pageSize
}
@@ -113,7 +116,7 @@ Page({
data: {
serviceId: service_id,
storeId: a.stoid,
- userId: d.user_id
+ userId: th.data.options.UserId,
}
}).then(res => {
wx.hideLoading();
@@ -190,7 +193,7 @@ Page({
data: {
serviceId: service_id,
storeId: a.stoid,
- userId: d.user_id
+ userId: th.data.options.UserId,
}
}).then(res => {
wx.hideLoading();
@@ -221,7 +224,7 @@ Page({
projectId: project_id,
serviceId: service_id,
storeId: a.stoid,
- userId: d.user_id
+ userId: th.data.options.UserId,
}
}).then(res => {
if (res.data.code == 0) {
diff --git a/packageA/pages/my_service/i_service.json b/packageA/pages/my_service/i_service.json
index 516d6e0..6d98624 100644
--- a/packageA/pages/my_service/i_service.json
+++ b/packageA/pages/my_service/i_service.json
@@ -1,5 +1,6 @@
{
"navigationBarTitleText": "服务项目",
+ "enablePullDownRefresh": false,
"usingComponents": {
"qr_code": "/components/qr_code/qr_code",
"warn": "/components/long_warn/long_warn",
diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml
index 7191905..81b5351 100644
--- a/packageA/pages/my_service/i_service.wxml
+++ b/packageA/pages/my_service/i_service.wxml
@@ -1,8 +1,8 @@
- 服务记录
- 历史预约
+ 服务记录
+ 历史预约
diff --git a/packageA/pages/my_service/my_service.js b/packageA/pages/my_service/my_service.js
deleted file mode 100644
index e69de29..0000000
--- a/packageA/pages/my_service/my_service.js
+++ /dev/null
diff --git a/packageA/pages/my_service/my_service.wxml b/packageA/pages/my_service/my_service.wxml
deleted file mode 100644
index e69de29..0000000
--- a/packageA/pages/my_service/my_service.wxml
+++ /dev/null
diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js
index 7d083f1..ada8828 100644
--- a/packageA/pages/service_record/service_record.js
+++ b/packageA/pages/service_record/service_record.js
@@ -14,10 +14,11 @@ Page({
endDate: '结束日期',
},
- onLoad: function(t) {
+ onLoad: function(options) {
_this = this;
this.setData({
+ options,
currentDate: this.currentDate(),
});
@@ -27,15 +28,23 @@ Page({
},
onShow: function() {
- this.isLogin()
- .then(function(data) {
- reqData.url = '/api/weshop/marketing/servicewrite/page';
- reqData.data = {
- storeId: app.globalData.setting.stoid,
- userId: app.globalData.user_id,
- };
- _this.getData(true, reqData.url, reqData.data);
- });
+ reqData.data = {
+ storeId: app.globalData.setting.stoid,
+ };
+
+ if(this.data.options.userid) {
+ reqData.data.userId = this.data.options.userid;
+ _this.getData(true, reqData.url, reqData.data);
+ } else {
+ reqData.data.userId = app.globalData.user_id;
+ this.isLogin()
+ .then(function(data) {
+ reqData.url = '/api/weshop/marketing/servicewrite/page';
+
+ _this.getData(true, reqData.url, reqData.data);
+ });
+ };
+
},