diff --git a/components/diy_nav/diy_nav.js b/components/diy_nav/diy_nav.js index 2365b15..f3160d0 100644 --- a/components/diy_nav/diy_nav.js +++ b/components/diy_nav/diy_nav.js @@ -46,7 +46,8 @@ Component({ //智能跳转 go_url:function (e) { var url=e.currentTarget.dataset.url; - getApp().goto(url); + console.log('url==>', url); + // getApp().goto(url); } } }) \ No newline at end of file diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js index 00c2c47..c0644a1 100644 --- a/packageA/pages/cardList/cardList.js +++ b/packageA/pages/cardList/cardList.js @@ -16,6 +16,8 @@ Page({ currentQuery: { store_id: app.globalData.setting.stoid, }, + + default_img: '/miniapp/images/default_g_img.gif', }, /** diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml index d558238..6c16f9f 100644 --- a/packageA/pages/cardList/cardList.wxml +++ b/packageA/pages/cardList/cardList.wxml @@ -1,6 +1,6 @@ - + @@ -26,6 +26,6 @@ - + - 已经到底了 - diff --git a/packageA/pages/cardList/cardList.wxss b/packageA/pages/cardList/cardList.wxss index 4d4c4ae..80d7aff 100644 --- a/packageA/pages/cardList/cardList.wxss +++ b/packageA/pages/cardList/cardList.wxss @@ -20,7 +20,7 @@ page { display: block; width: 240rpx; height: 240rpx; - background-color: pink; + /* background-color: pink; */ } .price { diff --git a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js index 34f6d04..ee72b65 100644 --- a/packageA/pages/my_service/appment_main.js +++ b/packageA/pages/my_service/appment_main.js @@ -96,7 +96,7 @@ Page({ var buyType = th.data.buyType; //服务项目类型 var storeId = a.stoid; //商家id var storageId = th.data.storageId; //门店id - var userId = d.user_id; //用户id + var userId = th.data.options.userid; //用户id var remarks = th.data.remarks; //用户备注 var project_id = th.data.project_id; //项目id var validay = th.data.validay; @@ -153,7 +153,7 @@ Page({ "page": "/pages/user/my_service/tment_details?number=" + number, "storeId": a.stoid, "typeId": "1011", - "userId": d.user_id + "userId": th.data.options.userid }; var data = JSON.stringify(json); //调用发送预约成功模版接口 @@ -373,7 +373,7 @@ Page({ key_word = key_word.replace(/\s+/g, ""); getApp().request.promiseGet(url, { data: { - userId:getApp().globalData.user_id, + userId: th.data.options.userid, storeId: a.stoid, serviceId: itemId, latitude: th.data.lat, @@ -428,7 +428,7 @@ Page({ getApp().request.promiseGet(url, { data: { storeId: a.stoid, - userId: d.user_id, + userId: th.data.options.userid, serviceId: itemid, storageId: storageId } @@ -527,6 +527,7 @@ Page({ onLoad: function(options) { var th = this; th.setData({ + options, itemId: options.service_id, buyType: options.BuyType, project_id: options.ProjectID, @@ -564,16 +565,18 @@ Page({ // 获取当前默认导购信息及归属门店信息 getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', { data: { - store_id: 1, - guide_id: 73, - UserCode: '01', + store_id: a.stoid, + guide_id: e.globalData.guide_id, + UserCode: th.data.options.usercode, } }).then(res => { - console.log('res==>', res.data.data); - th.setData({ - store_name: res.data.data.StorageName, - beautician_name: res.data.data.StaffName, - }); + console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode); + if(res.data.data.Tech) { + th.setData({ + store_name: res.data.data.StorageName, + beautician_name: res.data.data.StaffName, + }); + } }); }, @@ -630,7 +633,7 @@ Page({ getApp().request.promiseGet(url, { data: { storeId: a.stoid, - userId: d.user_id, + userId: th.data.options.userid, projectId: project_id } }).then(res => { diff --git a/packageA/pages/my_service/hist_service.js b/packageA/pages/my_service/hist_service.js index 724d21f..c6ceab4 100644 --- a/packageA/pages/my_service/hist_service.js +++ b/packageA/pages/my_service/hist_service.js @@ -120,7 +120,7 @@ Page({ getApp().request.promiseGet(url, { data: { storeId: a.stoid, - userId: this.data.options.userid, + userId: th.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 00a3e8e..6f78f4b 100644 --- a/packageA/pages/my_service/i_service.js +++ b/packageA/pages/my_service/i_service.js @@ -40,7 +40,10 @@ Page({ options, }); var th = this; - th.query_service(); + // if(options.UserId) { + th.query_service(); + // }; + }, /** * 生命周期函数--监听页面显示 diff --git a/packageA/pages/my_service/i_service.wxml b/packageA/pages/my_service/i_service.wxml index 81b5351..38a6872 100644 --- a/packageA/pages/my_service/i_service.wxml +++ b/packageA/pages/my_service/i_service.wxml @@ -1,8 +1,8 @@ - 服务记录 - 历史预约 + 服务记录 + 历史预约 @@ -50,7 +50,7 @@ - + 帮你预约 diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js index ada8828..8660dc8 100644 --- a/packageA/pages/service_record/service_record.js +++ b/packageA/pages/service_record/service_record.js @@ -28,6 +28,7 @@ Page({ }, onShow: function() { + reqData.url = '/api/weshop/marketing/servicewrite/page'; reqData.data = { storeId: app.globalData.setting.stoid, }; @@ -39,8 +40,6 @@ Page({ 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); }); }; diff --git a/packageA/pages/shop_details/shop_details.js b/packageA/pages/shop_details/shop_details.js new file mode 100644 index 0000000..6ac8106 --- /dev/null +++ b/packageA/pages/shop_details/shop_details.js @@ -0,0 +1,20 @@ +Page({ + data: { + shop: null, + }, + + onLoad(options) { + let shop = JSON.parse(decodeURIComponent(options.shop)) + this.setData({ + shop: shop, + }); + }, + + // 监听拨打电话 + onPhone() { + wx.makePhoneCall({ + phoneNumber: this.data.shop.pickup_phone, + }) + }, + +}) \ No newline at end of file diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index cd465d8..d239a70 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -65,6 +65,7 @@ 到底了 + @@ -75,7 +76,8 @@ - 暂无服务项目 + + 暂无服务卡项，立即购买！ 回到首页