diff --git a/app.wxss b/app.wxss index 552eb48..51e5315 100644 --- a/app.wxss +++ b/app.wxss @@ -671,9 +671,9 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { font-family: 'iconfont'; /* Project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff2?t=1621240949872') format('woff2'), - url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff?t=1621240949872') format('woff'), - url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.ttf?t=1621240949872') format('truetype'); + src: url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff2?t=1623117016358') format('woff2'), + url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff?t=1623117016358') format('woff'), + url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.ttf?t=1623117016358') format('truetype'); } .iconfont { @@ -684,6 +684,10 @@ background: #ffe3e2; -moz-osx-font-smoothing: grayscale; } +.icon-plyy:before { + content: "\e729"; +} + .icon-sandian:before { content: "\e665"; } diff --git a/components/diy_searchbox/diy_searchbox.js b/components/diy_searchbox/diy_searchbox.js index 75b51e0..ef93b4c 100644 --- a/components/diy_searchbox/diy_searchbox.js +++ b/components/diy_searchbox/diy_searchbox.js @@ -19,6 +19,8 @@ Component({ inputShowed:1, inputval:'在店铺内搜索', keyword:'', + + searchRecord: [], }, ready: function() { var th=this; @@ -27,7 +29,27 @@ Component({ if(e.hot_keywords) th.setData({keyword:e.hot_keywords}); }) + + var arr=wx.getStorageSync('searchRecord') || [] //若无存储则为空 + + this.setData({ + searchRecord: arr + }); + + }, + + + pageLifetimes:{ + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + var th=this; + var arr=wx.getStorageSync('searchRecord') || [] //若无存储则为空 + this.setData({ + searchRecord: arr,inputval:'',first:1,is_his:0 + }); + } }, + methods: { //智能跳转 go_url:function (e) { @@ -41,13 +63,23 @@ Component({ return false; } this.setData({first:0,inputShowed:1,inputval:''}); - }, + + }, + inputFocus:function(){ + if(this.data.is_init) return false; + this.setData({is_his:1,}) + }, - onblur:function(){ - var val=this.data.inputval; - if(val==''){ - this.setData({first:1,}); - } + onblur:function(){ + var th=this; + setTimeout(function(){ + if(th.data.click_sear) return false; + var val=th.data.inputval; + if(val==''){ + th.setData({first:1,}); + } + th.setData({is_his:0,}) + },300) }, set_input:function(e){ var val=e.detail.value; @@ -56,7 +88,23 @@ Component({ sear:function(){ var url="/pages/goods/search/search?s_key="+this.data.inputval; getApp().goto(url); - } + }, + + del_his:function(){ + this.setData({ + searchRecord: [] + }); + wx.setStorage({ key: 'searchRecord', data:[]}); + }, + + sear_key:function(e){ + this.data.click_sear=1; + var str=e.currentTarget.dataset.item; + var url="/pages/goods/search/search?s_key="+str; + this.data.click_sear=0; + getApp().goto(url); + + }, } }) \ No newline at end of file diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml index d5e8e66..11956e2 100644 --- a/components/diy_searchbox/diy_searchbox.wxml +++ b/components/diy_searchbox/diy_searchbox.wxml @@ -1,6 +1,8 @@ + + - + @@ -11,35 +13,69 @@ - + + + + {{item}} + + 清除 + + + - - - - - - - - - - 在店铺内搜索 - - - - - - - - - - - + + + + + + + + + + + 在店铺内搜索 + + + + + + + + + + {{item}} + + 清除 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/diy_searchbox/diy_searchbox.wxss b/components/diy_searchbox/diy_searchbox.wxss index 168ff87..9c87092 100644 --- a/components/diy_searchbox/diy_searchbox.wxss +++ b/components/diy_searchbox/diy_searchbox.wxss @@ -42,7 +42,7 @@ .s2_cen{ width: 80%; - height: 70rpx; + /* height: 70rpx; */ color: #fff; text-align: left; font-size: 28rpx; @@ -108,3 +108,53 @@ .icon-search:before { content: "\e7b3"; } + + +.his_str { + position: absolute; + width: 600rpx; + top: 74rpx; + z-index: 999; + color: black; + background-color: white; + border: 2rpx solid #f0f0f0; + box-sizing: border-box; + border-radius: 0 0 12rpx 12rpx; +} + +.his_str.his_str1 { + width: 708rpx; +} + +.his_str1.his_str { + top: 96rpx; +} + +.pr { + position: relative; +} + +.ali-c { + align-items: center; +} + +.item { + padding: 0 20rpx; + line-height: 70rpx; + text-align: left; + border-bottom: 2rpx solid #f6f6f6; +} + + +.clear { + text-align: right; + padding: 0 20rpx; + line-height: 70rpx; + color: #FF5B5A; + font-size: 26rpx; +} + +/* .w100 { + width: 100%; + box-sizing: border-box; +} */ \ No newline at end of file diff --git a/packageA/images/1.jpg b/packageA/images/1.jpg new file mode 100644 index 0000000..11bbed6 --- /dev/null +++ b/packageA/images/1.jpg diff --git a/packageA/images/cloud.jpg b/packageA/images/cloud.jpg new file mode 100644 index 0000000..00742e0 --- /dev/null +++ b/packageA/images/cloud.jpg diff --git a/packageA/images/index/tuangou-pic.jpg b/packageA/images/index/tuangou-pic.jpg deleted file mode 100644 index 36eee5d..0000000 --- a/packageA/images/index/tuangou-pic.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/circle.jpg b/packageA/images/liveStreamDetails/circle.jpg deleted file mode 100644 index 03ac38f..0000000 --- a/packageA/images/liveStreamDetails/circle.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/cover.jpg b/packageA/images/liveStreamDetails/cover.jpg deleted file mode 100644 index 7514369..0000000 --- a/packageA/images/liveStreamDetails/cover.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/friend.jpg b/packageA/images/liveStreamDetails/friend.jpg deleted file mode 100644 index 2cc79d3..0000000 --- a/packageA/images/liveStreamDetails/friend.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/goods.jpg b/packageA/images/liveStreamDetails/goods.jpg deleted file mode 100644 index 5cf5ab5..0000000 --- a/packageA/images/liveStreamDetails/goods.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/home.jpg b/packageA/images/liveStreamDetails/home.jpg deleted file mode 100644 index 172dac0..0000000 --- a/packageA/images/liveStreamDetails/home.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/playbill.jpg b/packageA/images/liveStreamDetails/playbill.jpg deleted file mode 100644 index 3fe65e7..0000000 --- a/packageA/images/liveStreamDetails/playbill.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/save.jpg b/packageA/images/liveStreamDetails/save.jpg deleted file mode 100644 index 562f648..0000000 --- a/packageA/images/liveStreamDetails/save.jpg +++ /dev/null diff --git a/packageA/images/liveStreamDetails/share.jpg b/packageA/images/liveStreamDetails/share.jpg deleted file mode 100644 index c1b29c7..0000000 --- a/packageA/images/liveStreamDetails/share.jpg +++ /dev/null diff --git a/packageA/images/qywx.png b/packageA/images/qywx.png new file mode 100644 index 0000000..b5550a4 --- /dev/null +++ b/packageA/images/qywx.png diff --git a/packageA/images/wx.png b/packageA/images/wx.png new file mode 100644 index 0000000..0f04c2a --- /dev/null +++ b/packageA/images/wx.png diff --git a/packageA/images/wx2.png b/packageA/images/wx2.png new file mode 100644 index 0000000..7abb479 --- /dev/null +++ b/packageA/images/wx2.png diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index b817b78..80bdda0 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -923,24 +923,29 @@ Page({ 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); }, //---点击分享商品--- - share_good:function(e){ - + share_good: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,share_good:item}); - + //如果是搭配购 + if(item.main_goods_id){ + item.goods_id=item.main_goods_id; + item.goods_name=item.main_goods_name; + } + + this.setData({share_hidden:0,share_good:item}); var com = this.selectComponent("#share_button"); //组件的id com.set_type(0); }, diff --git a/packageA/pages/activity_share/activity_share.wxml b/packageA/pages/activity_share/activity_share.wxml index 30ac856..ea5378f 100644 --- a/packageA/pages/activity_share/activity_share.wxml +++ b/packageA/pages/activity_share/activity_share.wxml @@ -98,7 +98,9 @@ 活动详情 - 分享 + + 分享 + 分享 diff --git a/packageA/pages/choujiang/choujiang.js b/packageA/pages/choujiang/choujiang.js new file mode 100644 index 0000000..bfd8d88 --- /dev/null +++ b/packageA/pages/choujiang/choujiang.js @@ -0,0 +1,66 @@ +// packageA//pages/choujiang/choujiang.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/packageA/pages/choujiang/choujiang.json b/packageA/pages/choujiang/choujiang.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageA/pages/choujiang/choujiang.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageA/pages/choujiang/choujiang.wxml b/packageA/pages/choujiang/choujiang.wxml new file mode 100644 index 0000000..df12915 --- /dev/null +++ b/packageA/pages/choujiang/choujiang.wxml @@ -0,0 +1,26 @@ + + + + + + 停止位置: + + + + + + + + + + + + + + + + + + + + diff --git a/packageA/pages/choujiang/choujiang.wxss b/packageA/pages/choujiang/choujiang.wxss new file mode 100644 index 0000000..d7f0dfc --- /dev/null +++ b/packageA/pages/choujiang/choujiang.wxss @@ -0,0 +1 @@ +/* packageA//pages/choujiang/choujiang.wxss */ \ No newline at end of file diff --git a/packageA/pages/distribution/main/main.js b/packageA/pages/distribution/main/main.js deleted file mode 100644 index d39f078..0000000 --- a/packageA/pages/distribution/main/main.js +++ /dev/null @@ -1,204 +0,0 @@ -// packageA//pages/distribution/main/main.js -const app = getApp(); -let self = null; - -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - self = this;//保存全局指针 - - app.isLogin().then(function(data) {//进入页面前已经授权登录成功 - self.setData({ - userInfo: data, - }); - }); - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - console.log('onshow'); - let url = '/api/weshop/users/distribut/getMoney'; - if(app.globalData.userInfo) { - if(!this.data.isLogin) { - this.setData({ - userInfo: app.globalData.userInfo, - imghost: app.globalData.setting.imghost, - isLogin: true, - }); - - // 请求数据 - app.request.get(url + '/' + this.data.userInfo.store_id + '/' + this.data.userInfo.user_id, { - success: function(res) { - console.log('success~~`', self.data.userInfo); - if(res.data.code == 0){ - - self.setData({ - data: res.data.data, - }); - - } else { - // if(!res.data.data.is_distribut) {//如果不是分销商:0不是，1是 - - app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', { - data: { - storeId: self.data.userInfo.store_id, - userId: self.data.userInfo.user_id, - first_leader: self.data.userInfo.first_leader, - }, - isShowLoading: true, - }).then(function(res) { - console.log('!!!===>', res); - self.setData({ - fenxiao: res.data.data, - }); - }); - - // }; - }; - }, - - }); - - - }; - }; - - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, - - /** - * 点击跳转 - */ - goto(e) { - let url = ''; - if(e.target.dataset.url) { - url = e.target.dataset.url; - } else { - url = e.currentTarget.dataset.url; - } - console.log(url); - app.goto(url); - }, - - - - /** - * 获取输入框 - */ - getInput(e) { - this.setData({ - inputValue: e.detail.value, - }); - }, - - - /** - * 验证 - */ - verify(e) { - let pass = e.target.dataset.pass; - let mobile = 0; - if(this.data.inputValue) { - mobile = this.data.inputValue; - if(!pass) { - app.request.put('/api/weshop/users/distribut/updateUserRecommender', { - data: { - storeId: self.data.userInfo.store_id, - userId: self.data.userInfo.user_id, - mobile: mobile, - }, - success: function (res) { - if(res.code = -1) { - wx.showToast({ - title: res.data.msg, - icon: 'none', - duration: 2000 - }); - }; - console.log('!!!===>', res); - - if(res.data.msg == '绑定上下级关系成功！') { - app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', { - data: { - storeId: self.data.userInfo.store_id, - userId: self.data.userInfo.user_id, - first_leader: self.data.userInfo.first_leader, - }, - isShowLoading: true, - }).then(function(res) { - console.log('!!!===>', res); - self.setData({ - fenxiao: res.data.data, - }); - }); - }; - - } - }); - - } - } else { - wx.showToast({ - title: '手机号码不能为空', - icon: 'none', - duration: 2000 - }); - }; - - }, -}) \ No newline at end of file diff --git a/packageA/pages/distribution/main/main.json b/packageA/pages/distribution/main/main.json deleted file mode 100644 index fc0a95e..0000000 --- a/packageA/pages/distribution/main/main.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "我的分销", - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/packageA/pages/distribution/main/main.wxml b/packageA/pages/distribution/main/main.wxml deleted file mode 100644 index 6f107e6..0000000 --- a/packageA/pages/distribution/main/main.wxml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - {{filter.show_default(userInfo.nickname)}} - - - - - 可提现金额 - {{filter.show_default(data.liudong_money)}} - - - - - {{filter.show_default(data.today_money)}} - 今日收入 - - - {{filter.show_default(data.sales_volume)}} - 总销售额 - - - {{filter.show_default(data.distribut_money)}} - 累计佣金 - - - - - - 上架商品 - 下架商品 - - - - - - 分销订单 - - - - 分销排行 - - - - 我的团队 - - - - 佣金明细 - - - - 我的名片 - - - - 会员中心 - - - - 我的小店 - - - - 新手必看 - - - - - - 分销规则说明 - - - - - - - 仅限PLUS卡({{item.conditonRemark}})的会员, 立即升级 - - - - - - - - - 验证 - - - - - - - - {{item.conditonRemark}} - - - - - - - - 成功成为分销商,分享商品给好友即可获得相应收益 - - - - - 去购买 - - - - - - - diff --git a/packageA/pages/distribution/main/main.wxss b/packageA/pages/distribution/main/main.wxss deleted file mode 100644 index fca7a37..0000000 --- a/packageA/pages/distribution/main/main.wxss +++ /dev/null @@ -1,226 +0,0 @@ -page { - background-color: #f4f4f4; -} - -.main > view { - background-color: white; -} - -.avatar-container { - padding-top: 60rpx; - padding-bottom: 60rpx; - background: url(https://mshopimg.yolipai.net/miniapp/images/user_index_powder.jpg) no-repeat 100% 100%; - /* background-size: 100%; */ -} - -.avatar { - width: 160rpx; - height: 160rpx; - border-radius: 50%; - background-color: #eee; -} - -.nickname { - display: inline-block; - background-color: rgba(0,0,0,.5); - padding: 4rpx 20rpx; - color: white; - border-radius: 24rpx; -} - -.pd2622 { - padding: 20rpx 60rpx 20rpx 20rpx; -} - -.money::before { - content: '￥'; - font-size: 24rpx; -} - -/* .bdb { - border-bottom: 2rpx solid #f8f8f8; -} */ - -.arrow-r { - /* display: relative; */ -} - -.arrow-r::after { - font-family: iconfont; - content: '\e61f'; - position: absolute; - right: 20rpx; - color: #ddd; -} -.line { - position: relative; -} -.line::after { - content: ''; - position: absolute; - right: 0; - background-color: #f8f8f8; - width: 2rpx; - height: 30rpx; - top: 50%; - transform: translateY(-50%); -} - -.circle { - width: 80rpx; - height: 80rpx; - line-height: 80rpx; - border-radius: 50%; - color: white; - margin: 0 auto; - background-color: red; -} - -.fs40 { - font-size: 40rpx; -} - - -.bgBlue { - background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%); -} -.bgPink { - background-image: linear-gradient(to right, #b8cbb8 0%, #b8cbb8 0%, #b465da 0%, #cf6cc9 33%, #ee609c 66%, #ee609c 100%); -} -.bgRed { - background-image: linear-gradient(to right, #f78ca0 0%, #f9748f 19%, #fd868c 60%, #fe9a8b 100%); -} -.bgYellow { - background-image: linear-gradient(120deg, #f6d365 0%, #fda085 100%); -} -.bgGreen { - background-image: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%); -} -.bgPurple { - background-image: linear-gradient(to top, #9795f0 0%, #fbc8d4 100%); -} - -.mask { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0,0,0,.5) !important; -} - -.popup { - position: fixed; - z-index: 1; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 90%; - border-radius: 12rpx; - overflow: hidden; -} - -.icon-container { - border-radius: 50%; - background-color: #FCEA0D; - width: 50rpx; - line-height: 50rpx; - height: 50rpx; - text-align: center; - font-size: 28rpx !important; - margin-right: 10rpx; - flex-shrink: 0; -} - -.item { - padding: 20rpx; - display: flex; - align-items: center; - font-size: 26rpx; - position: relative; -} - -.title { - background-image: linear-gradient( 135deg, #FF6768 10%, #EA5455 100%); - color: white; - font-size: 28rpx; - position: relative; -} - -.icon-close { - position: absolute; - right: 20rpx; - color: white; -} - -.verify { - color: white; - background-color: #FF6768; - padding: 0 20rpx; - border-radius: 6rpx; - display: flex; - align-items: center; - margin-left: 10rpx; -} - -.input { - border-radius: 6rpx; - height: 50rpx; -} - -.item ~ .item .left::before { - content: ''; - position: absolute; - left: 45rpx; - top: -45rpx; - width: 2rpx; - height: 100%; - background: linear-gradient(to bottom, #eee, #eee 8rpx, transparent 8rpx, transparent); - background-size: 100% 16rpx; - z-index: -1; -} - -.left { - display: flex; - align-items: center; - padding-right: 20rpx; -} - - -/*checkbox 整体大小 */ -checkbox { - /* width: 240rpx; - height: 90rpx; */ -} -/*checkbox 选项框大小 */ -checkbox .wx-checkbox-input { - width: 34rpx; - height: 34rpx; - border-radius: 50%; - -} -/*checkbox选中后样式 */ -checkbox .wx-checkbox-input.wx-checkbox-input-checked { - background-color: #FF6768; - border-color: #FF6768; - /* color: white; */ -} -/*checkbox选中后图标样式 */ -checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { - width: 34rpx; - height: 34rpx; - line-height: 34rpx; - text-align: center; - font-size: 24rpx; - color: #fff; - background: transparent; - transform: translate(-50%, -50%) scale(1); - -webkit-transform: translate(-50%, -50%) scale(1); -} - -.item:not(:last-of-type) { - display: flex; - justify-content: space-between; -} - - diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index fe21a4e..711a282 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -86,7 +86,10 @@ - + + + {{store_config.service_bz}} + diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js index 108618c..eb543cc 100644 --- a/packageA/pages/liveStream/liveStream.js +++ b/packageA/pages/liveStream/liveStream.js @@ -10,7 +10,7 @@ var t = require("../../../utils/util"), o = s.globalData.setting, os = o; var regeneratorRuntime = require('../../../utils/runtime.js'); - +1 Page({ /** * 页面的初始数据 diff --git a/packageA/pages/my_service/appment_main.js.rej b/packageA/pages/my_service/appment_main.js.rej new file mode 100644 index 0000000..efecfee --- /dev/null +++ b/packageA/pages/my_service/appment_main.js.rej @@ -0,0 +1,10 @@ +diff a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js (rejected hunks) +@@ -647,7 +647,7 @@ + var project_id = th.data.project_id; //服务项目id + getApp().request.promiseGet(url, { + data: { +- storeId: a.stoid, ++ storeId: th.data.options.storeid, + userId: th.data.options.userid, + projectId: project_id + } diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js index db8bc9b..73a63b6 100644 --- a/packageA/pages/my_service2/appment_main.js +++ b/packageA/pages/my_service2/appment_main.js @@ -4,7 +4,6 @@ var e = getApp(), t = e.request, d = e.globalData; Page({ - /** * 页面的初始数据 */ diff --git a/packageA/pages/my_service2/appment_main.js.rej b/packageA/pages/my_service2/appment_main.js.rej new file mode 100644 index 0000000..efecfee --- /dev/null +++ b/packageA/pages/my_service2/appment_main.js.rej @@ -0,0 +1,10 @@ +diff a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js (rejected hunks) +@@ -647,7 +647,7 @@ + var project_id = th.data.project_id; //服务项目id + getApp().request.promiseGet(url, { + data: { +- storeId: a.stoid, ++ storeId: th.data.options.storeid, + userId: th.data.options.userid, + projectId: project_id + } diff --git a/packageA/pages/my_service2/appment_main.wxml.rej b/packageA/pages/my_service2/appment_main.wxml.rej new file mode 100644 index 0000000..be50729 --- /dev/null +++ b/packageA/pages/my_service2/appment_main.wxml.rej @@ -0,0 +1,143 @@ +diff a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml (rejected hunks) +@@ -17,54 +17,120 @@ + ∟ + + ++ ++ ++ ++ ++ 时间 ++ 8:00 ++ 9:00 ++ ++ ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 张三 ++ 100 ++ 200 ++ ++ ++ 1张三 ++ 300 ++ 300 ++ ++ ++ ++ ++ ++ ++ 项目1 ++ ++ ++ ++ 项目1 ++ ++ ++ ++ ++ ++ + +- ++ + +- ++ + + +- +- ++ ++ + +- ++ + +- ++ ++ ++ ++ + + +- ++ + +- ++ + + +- ++ ++ + + +- ++ + +- ++ + + + {{name}} + + + + + + + {{comment}} + + + 暂无介绍 + + + + + + + + + + 服务预约 + + + + + {{weeks[index]}} + {{item.time}} + + + + + {{weeks[index]}}(约满) + {{item.time}} + + + + + + + + + + + + + + {{it}} + + + + + + + {{it}} + + + + + + 确定选择 + + + + + + + + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/beauty_deta.wxss b/packageA/pages/my_service2/beauty_deta.wxss new file mode 100644 index 0000000..09fc465 --- /dev/null +++ b/packageA/pages/my_service2/beauty_deta.wxss @@ -0,0 +1,134 @@ +.container { + border-top: 7rpx solid rgb(245, 245, 245); +} + +.backcolor { + position: absolute; + top: 0rpx; + left: 0rpx; + z-index: 0; + width: 100%; + height: 270rpx; + background-color: rgb(214, 1, 33); + +} + +.comments { + position: absolute; + top: 45rpx; + left: 0rpx; + z-index: 1; + padding: 0rpx 23rpx; +} + +.name { + font-weight: bold; + float: left; + width: 250rpx; +} + +.head { + width: 130rpx; + height: 130rpx; + border-radius: 50%; + float: right; + margin: 0rpx 15rpx; + /* border: 2rpx solid red; */ +} + +.introduce { + margin-top: 90rpx; + text-indent: 2em; + color: rgb(102, 102, 102); +} + +.Personal { + width: 640rpx; + height: 300rpx; + background-color: rgb(255, 255, 255); + border-radius: 5rpx; + box-shadow: 0rpx 2rpx 2rpx 2rpx rgb(250, 228, 230); + margin-bottom: 65rpx; + padding-top: 40rpx; + padding-left: 35rpx; + padding-right: 35rpx; +} + +.choice { + height: 70rpx; + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); + margin-top: 30rpx; +} + +.scroll-h { + white-space: nowrap; + width: 704rpx; + overflow: visible; + height: 125rpx; + color: transparent; +} + +.scroll-item-h { + display: inline-block; + width: 172rpx; + text-align: center; + overflow: visible; + height: 70rpx; + padding: 15rpx 0rpx; +} +::-webkit-scrollbar{ + width: 0; + height: 0; + color: transparent; +} +.box { + width: 0px; + height: 0px; + margin-left: 15rpx; + border-top: 21rpx solid transparent; + border-right: 21rpx solid transparent; + border-left: 21rpx solid transparent; + display: inline-block; + transform: rotate(180deg); + border-bottom: 21rpx solid rgb(214, 1, 33); +} + +.bd { + /* border: 2rpx solid rgb(238, 238, 238); */ + background-color: rgb(255, 255, 255); + color: rgb(20, 20, 20); +} + +.chbd { + border: 2rpx solid rgb(214, 1, 33); + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} + +.Times { + background-color: rgb(238, 243, 247); + margin-bottom: 30rpx; + padding:34rpx 27rpx; +} + +.Time { + border: 2rpx solid rgb(238, 238, 238); + width: 160rpx; + height: 70rpx; + background-color: rgb(255, 255, 255); + text-align: center; + padding-top: 15rpx; + padding-bottom: 15rpx; +} +.chTime{ + border-color: rgb(214, 1, 33); +} +.nochTime{ + color: rgb(174,177,177); + background-color: rgb(250,250,250); +} +.abs { + left: 55rpx; + bottom: -39rpx; +} diff --git a/packageA/pages/my_service2/cosmetology_list.js b/packageA/pages/my_service2/cosmetology_list.js new file mode 100644 index 0000000..1e6c4fb --- /dev/null +++ b/packageA/pages/my_service2/cosmetology_list.js @@ -0,0 +1,121 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; + + +Page({ + + /** + * 页面的初始数据 + */ + data: { + defimgurl: "/miniapp/images/no-head.jpg", + iurl: a.imghost, + cosmetology_list: [], //美容师列表 + is_cosmetology_read: 0, //是否有读过美容师接口,该属性用在没有美容师列表的排版 + curpage: 1, //当前分页数 + pageSize: 10, //页大小 + total: 0, //总数量 + ismore: 0, //是否加载完毕 + itemId: 0, //服务id, + storageId: 0, //线下门店id + projectId:"",//项目id + }, + + onReachBottom: function() { + var th = this; + if (this.data.total <= th.data.pageSize) return; + if (this.data.ismore) return; + wx.showLoading({ + title: '加载中...', + }) + th.query_cology(); + }, + + + query_cology: function() { + var th = this; + var url = "/api/weshop/marketing/reservation/staff/pagenew"; + var itemId = th.data.itemId; //服务id + var storageId = th.data.storageId; + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + serviceId: itemId, + storageId: storageId, + page: th.data.curpage, + pageSize: th.data.pageSize + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + th.data.curpage++; + var arr1 = th.data.cosmetology_list; + var arr2 = res.data.data; + var arr3 = [...arr1, ...arr2]; + + + th.setData({ + cosmetology_list: arr3, + total: res.data.data.total, + is_service_read: 1, + is_cosmetology_read:1 + }), wx.stopPullDownRefresh(); //停止下拉刷新 + } else { + th.setData({ + is_cosmetology_read:1, + ismore:1 + }) + } + }) + }, + + + //图片失败，默认图片 + bind_bnerr1: function(e) { + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/no-head.jpg"; + console.log(_errObj,"zzzzzzz"); + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + console.log('options--->', options); + var th = this; + this.setData({ + options, + projectId: options.projectId, + itemId: options.itemId, + storageId: options.storageId + }) + }, + + /** + * 生命周期函数--监听页面显示 + */ + 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(); + }, + + +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/cosmetology_list.json b/packageA/pages/my_service2/cosmetology_list.json new file mode 100644 index 0000000..90bf58b --- /dev/null +++ b/packageA/pages/my_service2/cosmetology_list.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "美容师列表", + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/cosmetology_list.wxml b/packageA/pages/my_service2/cosmetology_list.wxml new file mode 100644 index 0000000..00a22ca --- /dev/null +++ b/packageA/pages/my_service2/cosmetology_list.wxml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + {{item.StaffName}} + + + + + + + + + {{it.LabelName}} + + + + + + + + 预约 + + + + + {{item.Remark1}} + + + + 暂无介绍 + + + + + + + + 到底了 + + + + + + + + + + 暂无美容师 + + + 其他项目 + + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/cosmetology_list.wxss b/packageA/pages/my_service2/cosmetology_list.wxss new file mode 100644 index 0000000..4a8fb7b --- /dev/null +++ b/packageA/pages/my_service2/cosmetology_list.wxss @@ -0,0 +1,124 @@ +page{ + height: 100%; +} +.container{ + background-color: rgb(255,255,255); +} +.appointment { + width: 100%; + height: 305rpx; +} + +.single { + margin-left: 10rpx; + border-bottom: 1rpx solid rgb(229, 229, 229); + padding-bottom: 30rpx; + padding-left: 20rpx; + padding-right: 35rpx; + padding-top: 30rpx; +} + +.portrait { + width: 140rpx; + height: 140rpx; + border-radius: 50%; + margin-right: 30rpx; +} +.UserName{ + max-width: 250rpx; +} +.Stars { + width: 25rpx; + height: 25rpx; + margin-right: 7rpx; +} +.Labels{ + width: 100%; + margin-top: 15rpx; +} +.Label { + margin-top: 25rpx; +} + +.Labelitem { + width: 100rpx; + height: 30rpx; + border-radius: 20rpx; + line-height: 30rpx; + margin-right: 10rpx; + padding:0rpx 9rpx; +} + +.itone { + border: 2rpx solid rgb(22, 232, 131); + color: rgb(22, 232, 131); +} + +.itwo { + border: 2rpx solid rgb(92, 135, 248); + color: rgb(92, 135, 248); +} + +.ith { + border: 2rpx solid rgb(244, 143, 55); + color: rgb(244, 143, 55); +} + +.gofu { + width: 120rpx; + padding: 5rpx 0rpx; + border-radius: 25rpx; +} + +.go { + border: 1rpx solid rgb(196, 26, 46); + color: rgb(196, 26, 46); + background-color: rgb(255,255,255); +} + +.gofull { + border: 1rpx solid rgb(185, 185, 185); + color: rgb(185, 185, 185); + background-color: rgb(255,255,255); +} + +.information { + margin-top: 25rpx; + text-indent: 2em; + color: rgb(103, 103, 103); +} +/* 无订单 */ +.empty_order image { + width: 330rpx; + height: 280rpx; + margin-top: 120rpx; +} + +.empty_order .xc-ash { + margin-top: 10rpx; + font-weight: 600px; +} + +.empty_order navigator { + margin-top: 60rpx; + border-radius: 40rpx; +} + +.empty_order navigator view { + width: 247rpx; + height: 56rpx; + background-color: rgb(255, 72, 72); + border-radius: 40rpx; +} +.After_all { + height: 80rpx; +} + +.After_all .Line { + border-top: 3rpx solid rgb(0, 0, 0); + width: 130rpx; +} + +.After_all .end { + margin: 0rpx 15rpx; +} diff --git a/packageA/pages/my_service2/hist_service.js b/packageA/pages/my_service2/hist_service.js new file mode 100644 index 0000000..8bad05a --- /dev/null +++ b/packageA/pages/my_service2/hist_service.js @@ -0,0 +1,161 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + iurl: a.imghost, + isPickerShow: false, + isPickerRender: false, + startTime: "", + endTime: "", + pickerConfig: { + endDate: true, + column: "", + dateLimit: true, + initStartTime: "2019-01-01 12:32:44", + initEndTime: "2019-12-01 12:32:44", + limitStartTime: "1917-05-06 12:32:44", + limitEndTime: "2055-05-06 12:32:44" + }, + hist_List: [], //服务项目列表 + is_service_read: 0, + curpage: 1, //当前分页数 + pageSize: 15, //页大小 + total: 0, + ismore: 0, //是否加载完毕 + is_screen: 0, //是否通过筛选来选择历史服务 + is_reset: 0, //是否重复点击 + is_nav: 1, //是否显示导航栏 + }, + pickerShow: function() { + this.setData({ + isPickerShow: true, + isPickerRender: true, + chartHide: true + }); + }, + pickerHide: function() { + var th = this; + th.setData({ + isPickerShow: false, + chartHide: false + }); + }, + //--选择时间-- + setPickerTime: function(val) { + let data = val.detail, + gl_data = getApp().globalData, + th = this; + th.setData({ + startTime: data.startTime, + endTime: data.endTime, + val: 0, + distance: 0, + hist_List: [], + curpage: 1, + is_screen: 1, + is_nav: 1 + }); + th.query_hist(); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var th = this; + console.log('xxoptions==>', options); + this.setData({ + options, + }); + th.query_hist(); + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + var th = this; + if (th.data.total <= th.data.pageSize) return false; + if (th.data.ismore) return false; + + wx.showLoading({ + title: '加载中...', + }) + th.query_hist(); + }, + //重置历史服务数据 + his_reset: function() { + var th = this; + var is_reset = th.data.is_reset; + if (is_reset == 0) { + th.setData({ + hist_List: [], + curpage: 1, + is_service_read: 0, + is_screen: 1, + is_reset: 1, + startTime: "", + endTime: "", + is_nav: 1 + }) + th.query_hist(); + } + }, + query_hist: function() { + + var th = this; + var startTime = th.data.startTime.substring(0, 10); //开始 + var endTime = th.data.endTime.substring(0, 10); //结束 + var url = "/api/weshop/marketing/reservation/history/reservation/page"; + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + beginDate: startTime, + endDate: endTime, + page: th.data.curpage, + pageSize: th.data.pageSize + } + }).then(res => { + wx.hideLoading(); + th.setData({ + is_reset: 0 + }) + if (res.data.code == 0) { + th.data.curpage++; + var arr1 = th.data.hist_List; + var arr2 = res.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + var ismore = 0; + if (arr3.length == res.data.total) ismore = 1 + th.setData({ + hist_List: arr3, + total: res.data.data.total, + ismore: ismore, + is_service_read: 1, + }), wx.stopPullDownRefresh(); //停止下拉刷新 + } else { + th.setData({ + is_service_read: 1, + is_screen: 0, + ismore: 1 + }) + if (startTime!="") { + th.setData({ + total:0 + }) + } + } + }) + } +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/hist_service.json b/packageA/pages/my_service2/hist_service.json new file mode 100644 index 0000000..b81e3be --- /dev/null +++ b/packageA/pages/my_service2/hist_service.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "历史预约", + "usingComponents": { + "timePicker": "/components/timePicker/timePicker", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/hist_service.wxml b/packageA/pages/my_service2/hist_service.wxml new file mode 100644 index 0000000..2e8cb8e --- /dev/null +++ b/packageA/pages/my_service2/hist_service.wxml @@ -0,0 +1,77 @@ + + + + + 共使用 + {{total}} + 次服务 + + + + 重置 + + + + 筛选 + + + + + + + + + + + + + {{item.ServiceName==''?'匿名':item.ServiceName}} + + (服务美容师： + + + (预约美容师： + + {{item.BeauticianName}} + ) + + {{item.ArrangeTime}} + + + + 未服务 + 已服务 + 已过期 + 已取消 + 已评价 + + + + + + + 到底了 + + + + + + 该时间段无预约记录 + + + + + + + 暂无服务记录 + + + 前往使用 + + + + + + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/hist_service.wxss b/packageA/pages/my_service2/hist_service.wxss new file mode 100644 index 0000000..8882a8d --- /dev/null +++ b/packageA/pages/my_service2/hist_service.wxss @@ -0,0 +1,121 @@ +page { + height: 100%; +} + +.box { + width: 0px; + height: 0px; + margin-left: 15rpx; + border-top: 11rpx solid rgba(0, 0, 0, 0); + border-right: 10rpx solid rgba(0, 0, 0, 0); + border-left: 10rpx solid rgba(0, 0, 0, 0); + display: inline-block; + margin-bottom: 10rpx; + color: red; + transform: rotate(0deg); + border-bottom: 18rpx solid rgb(153, 153, 153); +} + +.exption { + padding: 0rpx 45rpx; + background-color: rgb(238, 238, 238); + height: 70rpx; + color: rgb(153, 153, 153); + position: fixed; + top:0rpx; + left: 0rpx; + width: 660rpx; +} + +.count { + margin: 0rpx 5rpx; +} + +.Resetfram { + margin-right: 40rpx; +} + +.Reset { + margin-right: 5rpx; +} + +.Resetsub { + width: 30rpx; + height: 30rpx; +} +.items{ + margin-top: 70rpx; +} +.item { + margin: 0rpx 25rpx; + padding: 0rpx 20rpx; + height: 100rpx; + border-bottom: 1rpx solid rgb(242, 242, 242); +} + +.itemName { + margin-right: 10rpx; + max-width: 130rpx; +} + +.itemUsna { + max-width: 150rpx; +} + +.serState { + color: rgb(255, 82, 125); +} + +.container { + position: fixed; + width: 100%; + top: 0rpx; +} + +/* 无历史服务 */ + +.empty_order { + height: 100%; + background-color: rgb(238, 238, 238); +} + +.empty_order image { + width: 329rpx; + height: 229rpx; + margin-top: 202rpx; +} + +.empty_order .xc-ash { + margin-top: 10rpx; + font-weight: 600px; +} + +.empty_order navigator { + margin-top: 65rpx; + border-radius: 40rpx; +} + +.empty_order navigator view { + width: 247rpx; + height: 65rpx; + background-color: rgb(255, 72, 72); + border-radius: 40rpx; +} + +.After_all { + height: 80rpx; +} + +.After_all .Line { + border-top: 3rpx solid rgb(0, 0, 0); + width: 130rpx; +} + +.After_all .end { + margin: 0rpx 15rpx; +} +.slot{ + color: rgb(153, 153, 153); + height:300rpx; + width:100%; +} \ No newline at end of file diff --git a/packageA/pages/my_service2/i_service.js b/packageA/pages/my_service2/i_service.js new file mode 100644 index 0000000..e820f39 --- /dev/null +++ b/packageA/pages/my_service2/i_service.js @@ -0,0 +1,262 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + qr_code_object: { + val: "12121", + content: "请将二维码展示给核销员，服务更快捷！" + }, + iurl: a.imghost, + defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg", + service_List: [], //服务项目列表 + is_service_read: 0, + curpage: 1, //当前分页数 + pageSize: 10, //页大小 + total: 0, + ismore: 0, //是否加载完毕 + userinfo: null, + is_sub: 0, //是否重复提交预约 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + console.log('options==>', options); + var userinfo = getApp().globalData.userInfo; + if (userinfo == null) { + //界面必须使用warn 做ID,并调用 + // return false; + }; + this.setData({ + userinfo: userinfo, + options, + }); + var th = this; + // if(options.UserId) { + th.query_service(); + // }; + + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var th = this; + 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; + if (this.data.ismore) return; + + th.query_service(); + }, + //查询服务项目列表 + query_service: function() { + wx.showLoading({ + title: '加载中', + }) + var th = this; + var url = "/api/weshop/marketing/reservation/sm/page?State=1"; + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.UserId, + page: th.data.curpage, + pageSize: th.data.pageSize + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + th.data.curpage++; + var arr1 = th.data.service_List; + var arr2 = res.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + var ismore = 0; + if (arr3.length == res.data.data.total) ismore = 1 + th.setData({ + service_List: arr3, + total: res.data.data.total, + ismore: ismore, + is_service_read: 1, + }), + wx.stopPullDownRefresh(); //停止下拉刷新 + } else { + th.setData({ + is_service_read: 1 + }) + } + }) + }, + /*-- 打开服务项目 --*/ + open_fw: function(e) { + wx.showLoading({ + title: '加载中', + }) + var th = this; + var url = e.currentTarget.dataset.url; + var service_id = e.currentTarget.dataset.service_id; //服务id + var project_id = e.currentTarget.dataset.project_id; + var ind = e.currentTarget.dataset.ind; + var item = this.data.service_List[ind]; + var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|"; + var tt = th.format_time(1); + ewm = ewm + tt; + th.data.qr_code_object.val = ewm; + th.data.qr_code_object.is_fw = 1; + var qc_com = th.selectComponent("#qc_com"); //组件的id + getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", { + data: { + serviceId: service_id, + storeId: a.stoid, + userId: th.data.options.UserId, + } + }).then(res => { + wx.hideLoading(); + th.setData({ + is_sub: 0 + }) + if (res.data.data != null) { + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open_cancel(1); + my_confirm.open( + "已有预约记录!", + "预约详情", + "继续使用", + function() { + my_confirm.open_cancel(0); + var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number; + wx.navigateTo({ + url: deta_url + }) + }, + function() { + my_confirm.open_cancel(0); + qc_com.open(th.data.qr_code_object) + } + + ) + + } else { + qc_com.open(th.data.qr_code_object) + } + }) + + }, + //图片失败，默认图片 + bind_bnerr1: function(e) { + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/no_cate_def.png"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + format_time: function(isFull) { + var d = new Date(); + var m = d.getMonth() + 1; + if (m < 10) m = "0" + m; + var dd = d.getDate(); + if (dd < 10) dd = "0" + dd; + var fm = [d.getFullYear(), m, dd].join('-'); + if (isFull == 1) + fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') + return fm; + }, + //跳转到首页 + goto: function(e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + //校正是否可预约 + correcting: function(e) { + var th = this; + wx.showLoading({ + title: '加载中', + }) + if (th.data.is_sub == 0) { + th.setData({ + is_sub: 1 + }) + var url = e.currentTarget.dataset.url; + var service_id = e.currentTarget.dataset.service_id; //服务id + var project_id = e.currentTarget.dataset.project_id; + getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", { + data: { + serviceId: service_id, + storeId: a.stoid, + userId: th.data.options.UserId, + } + }).then(res => { + wx.hideLoading(); + th.setData({ + is_sub: 0 + }) + if (res.data.code == 0) { + if (res.data.data != null) { + + var number = res.data.data.Number; + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open_cancel(1); + my_confirm.open( + "已有预约记录!", + "预约详情", + "继续预约", + function() { + my_confirm.open_cancel(0); + var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId; + wx.navigateTo({ + url: deta_url + }) + }, + function() { + my_confirm.open_cancel(0); + getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", { + data: { + projectId: project_id, + serviceId: service_id, + storeId: a.stoid, + userId: th.data.options.UserId, + } + }).then(res => { + if (res.data.code == 0) { + wx.navigateTo({ + url: url + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + } + ) + } else { + wx.navigateTo({ + url: url, + }) + } + + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + } + }, + //关闭导航 + close: function () { + var th = this; + var nav_b = th.selectComponent("#nav_b"); //组件的id + nav_b.close_box(); + } + +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/i_service.json b/packageA/pages/my_service2/i_service.json new file mode 100644 index 0000000..6d98624 --- /dev/null +++ b/packageA/pages/my_service2/i_service.json @@ -0,0 +1,10 @@ +{ + "navigationBarTitleText": "服务项目", + "enablePullDownRefresh": false, + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn", + "my_confirm": "/components/my_confirm/my_confirm", + "nav_b": "/components/nav_b/nav_b" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/i_service.wxml b/packageA/pages/my_service2/i_service.wxml new file mode 100644 index 0000000..ab433e5 --- /dev/null +++ b/packageA/pages/my_service2/i_service.wxml @@ -0,0 +1,139 @@ + + + + 服务记录 + 历史预约 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.ServiceName}} + + + + 剩余次数： + {{item.ObtainTimes}} + + + + 有效期至 + {{item.Validay==""?"长期有效":item.Validay}} + + + + + + + + 帮你预约 + + + + + + + + + + + + 时间 + 8:00 + 9:00 + + + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + 张三 + 100 + 200 + + + + + + + + + + diff --git a/packageA/pages/my_service2/i_service.wxss b/packageA/pages/my_service2/i_service.wxss new file mode 100644 index 0000000..d9d46a8 --- /dev/null +++ b/packageA/pages/my_service2/i_service.wxss @@ -0,0 +1,200 @@ +page { + overflow-x: scroll; +} + +/* 背景定位 */ + +.backimage { + position: absolute; + top: 0rpx; + left: 0rpx; + z-index: -1; + width: 100%; + /* height: 100%; */ +} + +/* 历史服务定位 */ + +.History { + position: absolute; + top: 30rpx; + right: 20rpx; + z-index: 1; + color: rgb(255, 255, 255); +} + +.rel { + background-color: rgb(255, 255, 255); + width: 350rpx; + height: 430rpx; + border-radius: 20rpx; + display: inline-block; + margin-right: 15rpx; + margin-bottom: 20rpx; + box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233); +} + +.abs { + left: 10rpx; + top: 10rpx; +} + +.equity_money { + width: 50rpx; + height: 55rpx; +} + +.Serviceitems { + position: absolute; + top: 370rpx; + left: 0rpx; + z-index: 2; + padding-left: 18rpx; + padding-bottom: 20rpx; +} + +.itemimage { + width: 120rpx; + height: 120rpx; + border-radius: 50%; + margin-top: 30rpx; + margin-bottom: 20rpx; +} + +.itemName { + margin-bottom: 25rpx; + color: rgb(48, 48, 48); +} + +.itemName .Name { + max-width: 250rpx; + text-align: center; +} + +.itemCount { + margin-bottom: 5rpx; + color: rgb(177, 177, 177); + align-items: baseline; +} + +.itemEffective { + margin-bottom: 30rpx; + color: rgb(177, 177, 177); + align-items: baseline; +} + +.functionMax { + padding: 0rpx 25rpx; + color: rgb(254, 255, 255); +} + +.Use { + width: 170rpx; + height: 50rpx; + line-height: 50rpx; + border-radius: 25rpx; + background-color: red; +} + +.appointment { + width: 115rpx; + height: 50rpx; + line-height: 50rpx; + border-radius: 25rpx; + margin-left: 20rpx; +} + +.Date { + margin-left: 10rpx; +} + +/* 无服务项目 */ + +.cover { + position: fixed; + z-index: 1; + left: 0rpx; + top: 390rpx; + width: 100%; + height: 200rpx; + background-color: rgb(255, 255, 255); +} + +/* 无历史服务 */ + +.empty_order { + position: fixed; + left: 0rpx; + top: 500rpx; + z-index: 2; + width: 100%; +} + +.empty_order image { + width: 329rpx; + height: 229rpx; + margin-top: 80rpx; +} + +.empty_order .xc-ash { + margin-top: 10rpx; + font-weight: 600px; +} + +.empty_order navigator { + margin-top: 60rpx; + border-radius: 40rpx; +} + +.empty_order navigator view { + width: 247rpx; + height: 56rpx; + background-color: rgb(255, 72, 72); + border-radius: 40rpx; +} + +.After_all { + height: 80rpx; +} + +.After_all .Line { + border-top: 3rpx solid rgb(0, 0, 0); + width: 130rpx; +} + +.After_all .end { + margin: 0rpx 15rpx; +} + +.btn { + background-color: red; + padding: 10rpx 20rpx; + border-radius: 30rpx; +} + +.table { + background-color: white; + border-top: 2rpx solid rgba(218, 217, 217, 1); + border-left: 2rpx solid rgba(218, 217, 217, 1); + margin-top: 400rpx; +} +.blue { + background: rgba(241, 252, 255, 1); +} +.td { + width: 100rpx; + height: 100rpx; + display: flex; + align-items: center; + justify-content: center; + border-right: 2rpx solid rgba(218, 217, 217, 1); + border-bottom: 2rpx solid rgba(218, 217, 217, 1); +} + +.left { + box-shadow: 4px 0px 6px #e7e9eb; +} + +.right { + width: calc(100% - 102rpx); +} diff --git a/packageA/pages/my_service2/tment_details.js b/packageA/pages/my_service2/tment_details.js new file mode 100644 index 0000000..7434cca --- /dev/null +++ b/packageA/pages/my_service2/tment_details.js @@ -0,0 +1,143 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, + iurl: a.imghost, + tment_details: [], //预约详情 + number: "", //订单号 + arrangeTime: "", //预约年月日 + day: "", //判断是上午还是下午 + states: 3, //3为取消预约 + }, + //取消预约 + cancel_tment: function(e) { + var th = this; + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "确定取消？", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + var index = e.currentTarget.dataset.index; + var states = th.data.states; + var tment_details = th.data.tment_details; + var number = th.data.number; + var json = { + "number": number, + "storeId": a.stoid, + "states": states, + "isxz": 1 + }; + var data = JSON.stringify(json); + var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 + wx.request({ + url: url, + data: data, + method: 'put', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + my_confirm.open_cancel(0); + if (res.data.code == 0) { + getApp().my_warnning("取消成功", 1, th); + var start = 'tment_details[' + 0 + '].State'; + th.setData({ + [start]: 3 + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + } + ); + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + + console.log("预约详情"); + console.log(options); + + var th = this; + th.setData({ + options, + number: options.number + }) + }, + //查询美容师详情 + query_bea: function() { + var th = this; + var number = th.data.number; + var url = "/api/weshop/marketing/reservation/reservation/page"; + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + number: number + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + var data = res.data.data.pageData; + var arrangeTime = data[0].ArrangeTime.substring(0, 11); + var day = data[0].ArrangeTime.substring(11, 16); + th.setData({ + tment_details: data, + arrangeTime: arrangeTime, + day: day + }) + + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //显示核销码 + code_show: function(e) { + var th = this; + //--获取成功的时候-- + var no = e.currentTarget.dataset.order_sn; + var qc_com = th.selectComponent("#qc_com"); //组件的id + var obj = { + val: no, + content: "请将二维码展示给核销员，使用更快捷" + }; + qc_com.open(obj) + }, + //跳到首页 + goto: function(e) { + var th = this; + wx.navigateTo({ + url: '/pages/index/index/index', + }) + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var th = this; + th.query_bea(); + }, + //关闭导航 + close: function () { + var th = this; + var nav_b = th.selectComponent("#nav_b"); //组件的id + nav_b.close_box(); + } +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_details.json b/packageA/pages/my_service2/tment_details.json new file mode 100644 index 0000000..98e6ad7 --- /dev/null +++ b/packageA/pages/my_service2/tment_details.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "预约详情", + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn", + "my_confirm": "/components/my_confirm/my_confirm", + "nav_b": "/components/nav_b/nav_b" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_details.wxml b/packageA/pages/my_service2/tment_details.wxml new file mode 100644 index 0000000..6a4baec --- /dev/null +++ b/packageA/pages/my_service2/tment_details.wxml @@ -0,0 +1,126 @@ + + + + + + 预约状态： + 未服务 + 已服务 + 已过期 + 已取消 + 已评价 + + + + + + + 预约订单: + {{number}} + + + + + + + 预约门店: + {{item.StorageName}} + + + + + 预约项目: + {{item.ServiceName}} + + + + + 预约时间: + {{arrangeTime}} + {{day}} + + + + + + + + + 服务美容师: + + + 预约美容师: + + + {{item.BeauticianName}} + + + + + + 预 + 约 + 人: + + {{item.VIPName}} + + + + + 手 + 机 + 号: + + {{item.MobileTel}} + + + + + + + + + + + + + + 温馨提示 + + 1.预约成功后需在指定时间前到达; + 2.如有任何问题可致电咨询; + 3.如需退约，需提前取消。 + + + + + + 取消预约 + + + 我的服务 + + + + 更改时间 + + + 发表评价 + + + 查看评价 + + + 重新预约 + + + + + + + + + + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_details.wxss b/packageA/pages/my_service2/tment_details.wxss new file mode 100644 index 0000000..d525a6a --- /dev/null +++ b/packageA/pages/my_service2/tment_details.wxss @@ -0,0 +1,118 @@ +page { + width: 100%; + background-color: rgb(238, 238, 238); +} + +/* 公用 */ + +.lf { + padding: 0rpx 40rpx; +} + +.bt { + margin: 0rpx 15rpx; + padding: 0rpx 25rpx; + border-top: 2rpx dashed rgb(238, 238, 238); + padding-top: 50rpx; + padding-bottom: 50rpx; +} + +.bmt { + margin-bottom: 35rpx; +} + +.name { + width: 160rpx; + margin-right: 25rpx; +} + +.value { + max-width: 390rpx; +} + +/* 公用 */ + +.container { + padding-bottom:70rpx; +} + +.padding{ + margin: 0rpx 20rpx; +} + +.Subscriber { + overflow: hidden; + margin-top: 25rpx; + background-color: rgb(255, 255, 255); + border-radius: 10rpx; +} + +.statusBar { + height: 80rpx; + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} + +.date { + margin-right: 25rpx; +} + +.items { + margin: 40rpx 0rpx; +} + +.Tips { + margin-top: 20rpx; + padding-top: 35rpx; + height: 255rpx; + border-radius: 10rpx; + background-color: rgb(255, 255, 255); + margin-bottom: 50rpx; +} + +.Cozy { + width: 165rpx; + height: 43rpx; + margin-bottom: 20rpx; + color: rgb(255, 255, 255); + background-size: 100%; +} + +.subs { + width: 710rpx; + padding: 15rpx 20rpx; + position: fixed; + bottom:0rpx; + background-color: rgb(255,255,255); +} + +.sub { + width: 325rpx; + height: 65rpx; + border-radius: 30rpx; + color: rgb(255, 255, 255); +} +.code{ + margin-left: 10rpx; + width: 50rpx; + height: 50rpx; +} +.rb { + background-color: rgb(214, 1, 33); +} + +/* 棒槌 */ + +.Stickl { + width: 39rpx; + height: 10rpx; + background-color: rgb(153, 153, 153); + transform: rotate(270deg); + border-radius: 20rpx; + left: 95rpx; + top: -15rpx; +} + +.Stickr { + left: 590rpx; +} diff --git a/packageA/pages/my_service2/tment_eval.js b/packageA/pages/my_service2/tment_eval.js new file mode 100644 index 0000000..35595f5 --- /dev/null +++ b/packageA/pages/my_service2/tment_eval.js @@ -0,0 +1,288 @@ + var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, //接口网址 + iurl: a.imghost, + defimgurl: "/miniapp/images/no-head.jpg", + stars_index: -1, //当前点击的星星下标 + labels: [], //星级标签数组 + sub_evaluate: 0, //是否评价成功 + proposal: "", //用户输入的建议 + proposal_size: 100, //评价意见和建议限定字数 + number: "", //订单单号 + beautician: "", //美容师信息 + fromType: "服务评价", //评价来源 + arrangeTime: "", //服务日期 + is_evaluate: 0, //是否评价 + EvaluateDatetime: "", //评价时间 + is_act:0, //是否能购获取图片 + actId:0, //活动ID + giftBagId:0, //礼包ID + + }, + //点击星级 + check_stars: function(e) { + var th = this; + var is_evaluate = th.data.is_evaluate; //0可点击 + if (is_evaluate == 0) { + var index = e.currentTarget.dataset.index; + var stars_index = th.data.stars_index; + if (index != stars_index) { + var url = "/api/weshop/marketing/reservation/star/label/list"; + getApp().request.promiseGet(url, { + data: { + Star: index + 1, + storeId: a.stoid, + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + labels: res.data.data + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + return; + } + }) + th.setData({ + stars_index: index + }) + } + } + }, + //输入评价意见和建议 + input_proposal: function(e) { + var th = this; + var value = e.detail.value; + th.setData({ + proposal: value + }) + }, + //图片失败，默认图片 + bind_bnerr1: function (e) { + var th = this; + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/no-head.jpg"; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + //选择标签 + check_label: function(e) { + var th = this; + var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签 + if (evaluate == 0) { + var index = e.currentTarget.dataset.index; + var label_id = th.data.labels[index].check; + var labels = 'labels[' + index + '].check'; + if (label_id) { + label_id = 0 + } else { + label_id = 1 + } + th.setData({ + [labels]: label_id + }) + } + }, + //查询美容师信息 + query_bea: function() { + var th = this; + var url = "/api/weshop/marketing/reservation/reservation/page"; + var number = th.data.number; //订单编号 + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + number: number + } + }).then(res => { + if (res.data.code == 0) { + var data = res.data.data.pageData; + var arrangeTime = data[0].ArrangeTime; + th.setData({ + beautician: data, + arrangeTime: arrangeTime + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //获取预约评价 + evaluate_get: function() { + var th = this; + var url = "/api/weshop/evaluation/evaluate/get"; + getApp().request.promiseGet(url, { + data: { + number: th.data.number, + storeId: a.stoid, + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + stars_index: res.data.data.Star-1, + labels: res.data.data.EvaluationList, + proposal: res.data.data.Remark, + EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19) + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //提交评价 + evaluate_save: function() { + var th = this; + var stars = th.data.stars_index; //评价星级 + var proposal = th.data.proposal; + //判断是否评级 + if (stars < 0) { + getApp().my_warnning("请进行评分", 0, th); + return false; + } else if (proposal == "") { + getApp().my_warnning("给点建议呗", 0, th); + return false; + } + wx.showLoading({ + title: '加载中', + }) + var labels = th.data.labels; //星级标签数组 + var evaLabList = []; //用户选择的评价标签 + // 查询评价标签 + for (var i = 0; i < labels.length; i++) { + if (labels[i].check) { + evaLabList.push(labels[i].LabelName); + } + } + var url = th.data.url + "/api/weshop/evaluation/evaluate/insert"; + var posNo = th.data.number; //收银单号 + var proposal = th.data.proposal; //用户建议内容 + var fromType = th.data.fromType; //评价来源 + var json = { + "evaLabList": evaLabList, + "fromType": 2, + "number": posNo, + "remark": proposal, + "star": stars + 1, + "storeId": a.stoid, + }; + var data = JSON.stringify(json); //转换成json格式 + wx.request({ + url: url, + data: data, + method: 'POST', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + wx.hideLoading(); + if (res.data.code == 0) { + getApp().my_warnning("评价成功", 1, th); + var namber=th.data.number; + setTimeout(function() { + wx.redirectTo({ + url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 + }); + }, 2000); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + + }, + //图片失败，默认图片 + bind_bnerr1: function(e) { + var th = this; + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + + var _errObj = {}; + _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg"; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var th = this; + th.setData({ + options, + number: options.Number, + is_evaluate: options.evaluate + }) + th.query_bea(); + th.judge_act(); + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var th = this; + var is_evaluate = th.data.is_evaluate; + if (is_evaluate == 1) { + th.evaluate_get(); + } + }, + //评价其他跳转 + evaluate_qt:function(){ + + wx.redirectTo({ + url: "/pages/user/my_service/tment_order_list?state="+2 + }); + }, + //点击领取礼包 + clike_lb:function(){ + + var id=this.data.actId; + var gifbagid = this.data.gifbagid; + console.log(id,"订单", this.data.number), + wx.redirectTo({ + url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number + }); + + }, + + //--评价有礼判断--- + judge_act: function () { + var th = this; + var url = "/api/weshop/marketing/comment/act/judge"; + getApp().request.promiseGet(url, { + data: { + orderNumber: th.data.number, + orderType: 2, + storeId: a.stoid, + userId: th.data.options.userid, + } + }).then(res => { + if (res.data.code == 0) { + var id = res.data.data.id; + var giftbagid = res.data.data.giftbagid; + th.setData({ + is_act: 1, + actId: id, + giftBagId: giftbagid + }) + } else{ + th.setData({ + is_act:0 + }) + } + }) + }, + +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_eval.json b/packageA/pages/my_service2/tment_eval.json new file mode 100644 index 0000000..8d44d3f --- /dev/null +++ b/packageA/pages/my_service2/tment_eval.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "预约评价", + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_eval.wxml b/packageA/pages/my_service2/tment_eval.wxml new file mode 100644 index 0000000..2a52ff8 --- /dev/null +++ b/packageA/pages/my_service2/tment_eval.wxml @@ -0,0 +1,105 @@ + + + + + + + + + + + + 服务美容师： + + {{it.BeauticianName}} + + + + + 服务项目： + {{it.ServiceName}} + + + + + 服务时间： + {{it.WriteTime}} + + + + + 评价时间： + {{EvaluateDatetime}} + + + + + + + + + + + + + + + + + {{proposal}} + + + + + + + {{item.LabelName}} + + + + + + + {{item.LabelName}} + + + + + + + + + + + + + + + + 评价成功 + + + + + + + 确认提交 + + + + + + + 评价其他 + + + + 点击领取礼品 + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_eval.wxss b/packageA/pages/my_service2/tment_eval.wxss new file mode 100644 index 0000000..8b0b898 --- /dev/null +++ b/packageA/pages/my_service2/tment_eval.wxss @@ -0,0 +1,144 @@ +.container { + border-top: 7rpx solid rgb(245, 245, 245); + padding-bottom: 100rpx; + background-color: rgb(255, 255, 255); +} + +.head { + height: 270rpx; +} + +.headimg { + width: 190rpx; + height: 190rpx; + border-radius: 50%; +} + +.item { + margin-bottom: 20rpx; +} + +.itemlf { + width: 195rpx; +} + +.itemlr { + width: 360rpx; +} + +.starss { + margin-top: 15rpx; + border-top: 3rpx dashed rgb(203, 203, 203); + padding-top: 25rpx; + padding-left: 15rpx; +} + +.stars { + width: 50rpx; + height: 50rpx; + margin-right: 20rpx; +} + +.datetime { + width: 190rpx; +} + +.tea_labs { + padding: 0rpx 56rpx; + margin-top: 20rpx; +} + +.proposal { + right: 20rpx; + bottom: 20rpx; + color: rgb(152, 152, 152); +} + +.textarea { + width: 100%; + height: 200rpx; + margin-top: 70rpx; + border: 2rpx solid rgb(203, 203, 203); + border-radius: 13rpx; + padding-top: 25rpx; + padding-left: 30rpx; + margin-bottom: 30rpx; + padding-right: 15rpx; + padding-bottom: 20rpx; +} + +.labels { + display: inline-block; + max-height: 240rxp; + line-height: 50rpx; + padding-left: 15rpx; +} + +.label { + padding: 0rpx 10rpx; + height: 48rpx; + line-height: 48rpx; + border: 2rpx solid rgb(218, 218, 218); + color: rgb(152, 152, 152); + border-radius: 5rpx; + margin-right: 20rpx; + width: 165rpx; + display: inline-block; + text-align: center; + margin-bottom: 10rpx; +} + +/* 选择标签的样式 */ + +.checklabel { + border: 2rpx solid rgb(214, 1, 33); + background-color: rgb(255, 231, 235); + color: rgb(214, 1, 33); +} + +.feedback { + color: rgb(152, 152, 152); + margin-bottom: 70rpx; +} + +.Subs { + background-color: rgb(255, 255, 255); + position: fixed; + width: 100%; + bottom: 40rpx; +} + +.Submission { + width: 400rpx; + height: 65rpx; + border-radius: 60rpx; + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} +.Submission.yellow-b{ + background-color: #ffb03f; + +} + +.clonri { + margin: 0rpx; +} + +.subSuccess { + position: fixed; + z-index: 3; + top: 435rpx; + left: 66rpx; + background-color: #a6a6a6a4; + width: 615rpx; + height: 315rpx; + border-radius: 20rpx; + color: rgb(255, 255, 255); +} + +.Success { + width: 110rpx; + height: 110rpx; + margin-top: 50rpx; + margin-bottom: 45rpx; +} diff --git a/packageA/pages/my_service2/tment_order_list.js b/packageA/pages/my_service2/tment_order_list.js new file mode 100644 index 0000000..7e0b0a7 --- /dev/null +++ b/packageA/pages/my_service2/tment_order_list.js @@ -0,0 +1,233 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, //接口网址 + iurl: a.imghost, //图片网址 + activeCategoryId: 0, //类别选中下标 + defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg", + categories: [{ + name: "全部", + id: 0 + }, { + name: "未服务", + id: 1 + }, { + name: "已服务", + id: 2 + }, { + name: "已过期", + id: 3 + }], + tm_order_list: [], //我的预约订单列表 + curpage: 1, //当前分页数 + pageSize: 10, //页大小 + total: 0, + ismore: 0, //是否加载完毕 + is_read: 0, //是否加载接口 + states: 4, //4为取消预约 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + this.setData({ + options, + }); + var state=options.state; + if (state != null && state != undefined && state!=""){ + this.setData({ activeCategoryId: state }); + } + + }, + changeTab: function(e) { + var th = this; + var id = e.currentTarget.dataset.id; + var activeCategoryId = th.data.activeCategoryId; + if (id != activeCategoryId) { + th.setData({ + activeCategoryId: id, + tm_order_list: [], + curpage: 1, + ismore: 0, + is_read: 0 + }) + th.query_orderList(); + } else { + return false; + } + }, + //显示核销码 + code_show: function(e) { + var th = this; + //--获取成功的时候-- + var no = e.currentTarget.dataset.order_sn; + var qc_com = th.selectComponent("#qc_com"); //组件的id + var obj = { + val: no, + content: "请将二维码展示给核销员，使用更快捷" + }; + qc_com.open(obj) + }, + query_orderList: function() { + wx.showLoading({ + title: '加载中', + }) + var th = this; + var url = "/api/weshop/marketing/reservation/reservation/page"; + + var state_index = th.data.activeCategoryId; + if (state_index == 0) { + state_index = ""; + } else { + --state_index; + } + th.setData({ + is_read: 0 + }) + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + state: state_index, + page: th.data.curpage, + pageSize: th.data.pageSize + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + th.data.curpage++; + var arr1 = th.data.tm_order_list; + var arr2 = res.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + for(var i = 0;i + + + + {{item.name}} + + + + + + + + + 订单编号：{{item.Number}} + + + 未服务 + 已服务 + 已过期 + 已取消 + 已评价 + + + + + + + + + + + + + + 预约门店: + {{item.StorageName}} + + + 预约项目: + {{item.ServiceName}} + + + + 服务美容师: + + + + 预约美容师: + + + {{item.BeauticianName}} + + + 预约时间: + {{item.ArrangeTime}} + + + 服务时间: + {{item.WriteTime}} + + + + + + + + + 取消预约 + + + 查看详情 + + 更改时间 + 发表评价 + 重新预约 + 评价详情 + + + + + 到底了 + + + + + + + + + + + 无预约记录 + + + 立即预约 + + + + + + + + + \ No newline at end of file diff --git a/packageA/pages/my_service2/tment_order_list.wxss b/packageA/pages/my_service2/tment_order_list.wxss new file mode 100644 index 0000000..2219dee --- /dev/null +++ b/packageA/pages/my_service2/tment_order_list.wxss @@ -0,0 +1,152 @@ +page { + height: 100%; +} + +.container { + background-color: rgb(255, 255, 255); +} + +.type-navbar { + border-top: 3rpx solid rgb(221, 221, 221); + display: flex; + justify-content: space-between; + position: fixed; + background-color: rgb(255,255,255); + width:696rpx; +} +.itemMax{ + margin-top: 93rpx; +} + +.type-box { + height: 88rpx; + line-height: 88rpx; + padding: 0rpx 15rpx; + border-bottom: 5rpx solid rgb(255, 255, 255); +} + +.chtypebox { + border-bottom: 5rpx solid rgb(224, 18, 18); +} + +.Commodity_number { + height: 80rpx; + border-top: 13rpx solid rgb(245, 245, 245); +} + +.Commodity_number image { + width: 30rpx; + height: 32rpx; +} + +.padding { + padding: 0rpx 27rpx; +} + +.lin { + border-left: 2rpx solid rgb(211, 29, 54); + margin-left: 17rpx; + margin-right: 14rpx; + height: 40rpx; +} + +.order_number { + max-width: 550rpx; +} +.state{ + color: rgb(216,63,82); +} +.items { + border-top: 4rpx solid rgb(245, 245, 245); + border-bottom: 4rpx solid rgb(245, 245, 245); + height: 260rpx; +} +.code{ + width: 55rpx; + height: 55rpx; +} +.itemimage { + width: 190rpx; + height: 190rpx; + margin-right: 20rpx; + border-radius: 50%; + border: 1px solid #eee; +} + +.details { + height: 190rpx; +} + +.itemname { + width: 150rpx; + margin-right: 20rpx; +} + +.itemvalue { + max-width: 300rpx; +} + +.Unimportance { + width: 140rpx; + height: 40rpx; + line-height: 40rpx; + border-radius: 8rpx; + background-color: rgb(255, 255, 255); + margin-left: 20rpx; + border: 2rpx solid rgb(191, 191, 191); +} + +.important { + background-color: rgb(212, 28, 52); + border: 2rpx solid rgb(212, 28, 52); + color: rgb(255, 255, 255); +} + +.Unim { + height: 110rpx; +} + +.exactly { + height: 80rpx; + background-color: rgb(245, 245, 245); +} + +.exactly_text { + margin: 0rpx 15rpx; +} + +.line { + border-top: 2rpx solid rgb(0, 0, 0); + width: 130rpx; +} + +/* 无预约 */ + +.empty_order image { + width: 300rpx; + height: 280rpx; + margin-top: 202rpx; +} + +.empty_order .xc-ash { + margin-top: 10rpx; + font-weight: 600px; +} + +.empty_order navigator { + margin-top: 60rpx; + border-radius: 40rpx; +} + +.empty_order navigator view { + width: 247rpx; + height: 65rpx; + background-color: rgb(255, 72, 72); + border-radius: 40rpx; +} +.base{ + display: flex; + height: 38rpx; + line-height: 38rpx; + align-items: baseline; +} \ No newline at end of file diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index f9a751b..164645f 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -239,7 +239,7 @@ Page({ var dd = { store_id: r.stoid, isstop: 0, - pageSize: 300 + pageSize: 2000 } th.setData({ sort_store: 0 @@ -251,140 +251,142 @@ Page({ dd.lon = th.data.lon; } //----------获取门店---------------- - getApp().request.promiseGet("/api/weshop/pickup/list", { + getApp().request.get("/api/weshop/pickup/list", { data: dd, - }).then(res => { - var e = res; - if (e.data.code == 0) { - //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- - if (th.data.def_pick_store) { - for (var k = 0; k < e.data.data.pageData.length; k++) { - if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { - e.data.data.pageData.splice(k, 1); //删除 - break; - } - } - e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 - } - - //单总量超出5个的时候 - if (e.data.data.total > 5) { - i.get("/api/weshop/storagecategory/page", { - data: { - store_id: r.stoid, - is_show: 1, - pageSize: 300 - }, - success: function(ee) { - if (ee.data.code == 0) { - if (ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); - var sto_cate = ee.data.data.pageData; - var sto_arr = e.data.data.pageData; - var newarr = new Array(); - var qita = new Array(); - - //----要进行门店分组-------- - for (var i = 0; i < sto_arr.length; i++) { - //找一下这个门店有没有在分类数组内 - var find2 = 0, - find2name = ""; - for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - break; - } - } - - if (newarr.length > 0) { - var find = 0; - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - for (var ii = 0; ii < newarr.length; ii++) { - if (sto_arr[i].category_id == newarr[ii].cat_id) { - newarr[ii].s_arr.push(sto_arr[i]); - find = 1; - break; - } - } - if (find == 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - s_arr: arr0 - }; - newarr.push(item); - } - } else { - qita.push(sto_arr[i]); - } - } else { - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - s_arr: arr0 - }; - newarr.push(item); - } else { - qita.push(sto_arr[i]); - } - } - } - - //----安排其他的分类----- - if (qita.length > 0) { - var item = { - cat_id: -1, - name: "其他", - s_arr: qita - }; - newarr.push(item); - } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); - - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } - }); - } else { - th.setData({ - is_show_sto_cat: 0, - only_pk: e.data.data.pageData - }); - } + success:function(res){ + var e = res; + if (e.data.code == 0) { + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- + if (th.data.def_pick_store) { + for (var k = 0; k < e.data.data.pageData.length; k++) { + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { + e.data.data.pageData.splice(k, 1); //删除 + break; + } + } + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 + } + + //单总量超出5个的时候 + if (e.data.data.total > 5) { + i.get("/api/weshop/storagecategory/page", { + data: { + store_id: r.stoid, + is_show: 1, + pageSize: 300 + }, + success: function(ee) { + if (ee.data.code == 0) { + if (ee.data.data.pageData.length > 0) { + var def_arr = new Array(); + var ishas = 0; + //-- 开始就看5个门店 -- + for (var k = 0; k < 5; k++) { + if (k == e.data.data.pageData.length) break; + def_arr.push(e.data.data.pageData[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + var sto_cate = ee.data.data.pageData; + var sto_arr = e.data.data.pageData; + var newarr = new Array(); + var qita = new Array(); + + //----要进行门店分组-------- + for (var i = 0; i < sto_arr.length; i++) { + //找一下这个门店有没有在分类数组内 + var find2 = 0, + find2name = ""; + for (var m = 0; m < sto_cate.length; m++) { + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + break; + } + } + + if (newarr.length > 0) { + var find = 0; + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + for (var ii = 0; ii < newarr.length; ii++) { + if (sto_arr[i].category_id == newarr[ii].cat_id) { + newarr[ii].s_arr.push(sto_arr[i]); + find = 1; + break; + } + } + if (find == 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + s_arr: arr0 + }; + newarr.push(item); + } + } else { + qita.push(sto_arr[i]); + } + } else { + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + s_arr: arr0 + }; + newarr.push(item); + } else { + qita.push(sto_arr[i]); + } + } + } + + //----安排其他的分类----- + if (qita.length > 0) { + var item = { + cat_id: -1, + name: "其他", + s_arr: qita + }; + newarr.push(item); + } + th.setData({ + is_show_sto_cat: 1, + all_sto: newarr + }); + + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + } + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + } + } + }); + } else { + th.setData({ + is_show_sto_cat: 0, + only_pk: e.data.data.pageData + }); + } + } + } - }, 200) + }) }, diff --git a/packageA/pages/shop_details/shop_details.json b/packageA/pages/shop_details/shop_details.json new file mode 100644 index 0000000..4abc9b2 --- /dev/null +++ b/packageA/pages/shop_details/shop_details.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "门店详情" +} \ No newline at end of file diff --git a/packageA/pages/shop_details/shop_details.wxml b/packageA/pages/shop_details/shop_details.wxml new file mode 100644 index 0000000..a3f9c2d --- /dev/null +++ b/packageA/pages/shop_details/shop_details.wxml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + {{shop.pickup_name}} + {{shop.fulladdress}} + + + 导航 + 999.0千米 + + + + + + {{shop.pickup_phone}} + 电话 + + + \ No newline at end of file diff --git a/packageA/pages/shop_details/shop_details.wxss b/packageA/pages/shop_details/shop_details.wxss new file mode 100644 index 0000000..ecfbfea --- /dev/null +++ b/packageA/pages/shop_details/shop_details.wxss @@ -0,0 +1,75 @@ +page { + height: 100%; + background-color: #F7F7F7; +} +.container { + background-color: white; +} +.swiper-container { + background-color: pink; +} +.img { + display: block; + width: 100%; + height: 100%; +} +.shop-container { + padding: 0 30rpx; +} + +.address-container { + align-items: center; +} + +.left { + padding-right: 40rpx; +} + +.address { + color: #6E6E6E; + font-size: 26rpx; + text-align: justify; + padding-top: 20rpx; +} + +.distance { + padding-top: 20rpx; + color: #6E6E6E; + font-size: 26rpx; + text-align: right; +} + +.right { + flex-shrink: 0; + text-align: right; +} + + +.btn { + display: inline-block; + height: 60rpx; + line-height: 60rpx; + padding: 0 30rpx; + border-radius: 30rpx; + border: 2rpx solid #B0B0B0; + font-size: 26rpx; +} + + + + +.section { + align-items: center; + justify-content: space-between; + padding: 36rpx 0; + border-bottom: 2rpx solid #F0F0F0; +} + +.section:last-child { + border-bottom: none; +} + +.iconfont { + margin-right: 20rpx; + font-size: 28rpx; +} \ No newline at end of file diff --git a/packageA/pages/text/text.js b/packageA/pages/text/text.js new file mode 100644 index 0000000..079769c --- /dev/null +++ b/packageA/pages/text/text.js @@ -0,0 +1,66 @@ +// packageA//pages/text/text.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/packageA/pages/text/text.json b/packageA/pages/text/text.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageA/pages/text/text.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageA/pages/text/text.wxml b/packageA/pages/text/text.wxml new file mode 100644 index 0000000..5d51b9c --- /dev/null +++ b/packageA/pages/text/text.wxml @@ -0,0 +1,2 @@ + +packageA//pages/text/text.wxml diff --git a/packageA/pages/text/text.wxss b/packageA/pages/text/text.wxss new file mode 100644 index 0000000..1fd4d8f --- /dev/null +++ b/packageA/pages/text/text.wxss @@ -0,0 +1 @@ +/* packageA//pages/text/text.wxss */ \ No newline at end of file diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 230b0b6..1fbe898 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -267,13 +267,22 @@ Page({ var isok = 1; await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => { if (res.data.code == 0) { - var r_data = res.data.data; + var r_data = res.data.data; if (!r_data.promGoodsLists) { var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; getApp().request.delete(url, {}); - //商品已经下架 + //商品已经无活动 isok = 0; - } + }else{ + //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 + if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){ + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; + getApp().request.delete(url, {}); + //商品已经下架 + isok = 0; + } + } + } else { var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; getApp().request.delete(url, {}); diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 78d189b..9015c36 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -490,6 +490,11 @@ Page({ return false; } } + + //阶梯团强制带1，自提~~~ + if(th.data.kt_type==3 ){ + th.data.bn_exp_type=1; + } var item={ 'user_id': to.globalData.user_id, diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index b7230fd..986b46c 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2086,7 +2086,7 @@ Page({ var e = res; if (e.data.code == 0) arrdata = e.data.data.pageData; }) - if(!arrdata) return fasle; + if(!arrdata) return false; var arrsku = new Array(); var gitem = null; diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 7e1a067..ad9f3be 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -26,6 +26,7 @@ Page({ searchRecord: [], keyword: '', + is_his:0, }, onLoad: function(t) { @@ -282,7 +283,8 @@ Page({ historyRecord() { let self = this; let keyword = this.data.key_str; - let searchRecord = this.data.searchRecord; + let searchRecord = this.data.searchRecord; + if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || []; if(keyword) { if(searchRecord.indexOf(keyword) > -1) { diff --git a/pages/user/my_service/i_service.json b/pages/user/my_service/i_service.json index 516d6e0..6d98624 100644 --- a/pages/user/my_service/i_service.json +++ b/pages/user/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/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index c528692..f49713a 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -96,4 +96,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss index b9364d4..4e7f96e 100644 --- a/pages/user/my_service/i_service.wxss +++ b/pages/user/my_service/i_service.wxss @@ -166,3 +166,18 @@ page { margin: 0rpx 15rpx; color: #ccc; } + +.icon-container { + position: fixed; + right: 10rpx; + bottom: 440rpx; + background-color: #272636; + color: white; + width: 80rpx; + height: 80rpx; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + z-index: 999; +} diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index d04c545..3aa5dea 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -287,7 +287,7 @@ Page({ var dd = { store_id: r.stoid, isstop: 0, - pageSize: 300 + pageSize: 2000 } th.setData({ sort_store: 0 @@ -299,140 +299,141 @@ Page({ dd.lon = th.data.lon; } //----------获取门店---------------- - getApp().request.promiseGet("/api/weshop/pickup/list", { + getApp().request.get("/api/weshop/pickup/list", { data: dd, - }).then(res => { - var e = res; - if (e.data.code == 0) { - //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- - if (th.data.def_pick_store) { - for (var k = 0; k < e.data.data.pageData.length; k++) { - if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { - e.data.data.pageData.splice(k, 1); //删除 - break; - } - } - e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 - } - - //单总量超出5个的时候 - if (e.data.data.total > 5) { - i.get("/api/weshop/storagecategory/page", { - data: { - store_id: r.stoid, - is_show: 1, - pageSize: 300 - }, - success: function(ee) { - if (ee.data.code == 0) { - if (ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); - var sto_cate = ee.data.data.pageData; - var sto_arr = e.data.data.pageData; - var newarr = new Array(); - var qita = new Array(); - - //----要进行门店分组-------- - for (var i = 0; i < sto_arr.length; i++) { - //找一下这个门店有没有在分类数组内 - var find2 = 0, - find2name = ""; - for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - break; - } - } - - if (newarr.length > 0) { - var find = 0; - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - for (var ii = 0; ii < newarr.length; ii++) { - if (sto_arr[i].category_id == newarr[ii].cat_id) { - newarr[ii].s_arr.push(sto_arr[i]); - find = 1; - break; - } - } - if (find == 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - s_arr: arr0 - }; - newarr.push(item); - } - } else { - qita.push(sto_arr[i]); - } - } else { - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - s_arr: arr0 - }; - newarr.push(item); - } else { - qita.push(sto_arr[i]); - } - } - } - - //----安排其他的分类----- - if (qita.length > 0) { - var item = { - cat_id: -1, - name: "其他", - s_arr: qita - }; - newarr.push(item); - } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); - - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - } - } - }); - } else { - th.setData({ - is_show_sto_cat: 0, - only_pk: e.data.data.pageData - }); - } - } - }, 200) + success:function(res){ + var e = res; + if (e.data.code == 0) { + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- + if (th.data.def_pick_store) { + for (var k = 0; k < e.data.data.pageData.length; k++) { + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { + e.data.data.pageData.splice(k, 1); //删除 + break; + } + } + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 + } + + //单总量超出5个的时候 + if (e.data.data.total > 5) { + i.get("/api/weshop/storagecategory/page", { + data: { + store_id: r.stoid, + is_show: 1, + pageSize: 300 + }, + success: function(ee) { + if (ee.data.code == 0) { + if (ee.data.data.pageData.length > 0) { + var def_arr = new Array(); + var ishas = 0; + //-- 开始就看5个门店 -- + for (var k = 0; k < 5; k++) { + if (k == e.data.data.pageData.length) break; + def_arr.push(e.data.data.pageData[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + var sto_cate = ee.data.data.pageData; + var sto_arr = e.data.data.pageData; + var newarr = new Array(); + var qita = new Array(); + + //----要进行门店分组-------- + for (var i = 0; i < sto_arr.length; i++) { + //找一下这个门店有没有在分类数组内 + var find2 = 0, + find2name = ""; + for (var m = 0; m < sto_cate.length; m++) { + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + break; + } + } + + if (newarr.length > 0) { + var find = 0; + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + for (var ii = 0; ii < newarr.length; ii++) { + if (sto_arr[i].category_id == newarr[ii].cat_id) { + newarr[ii].s_arr.push(sto_arr[i]); + find = 1; + break; + } + } + if (find == 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + s_arr: arr0 + }; + newarr.push(item); + } + } else { + qita.push(sto_arr[i]); + } + } else { + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + s_arr: arr0 + }; + newarr.push(item); + } else { + qita.push(sto_arr[i]); + } + } + } + + //----安排其他的分类----- + if (qita.length > 0) { + var item = { + cat_id: -1, + name: "其他", + s_arr: qita + }; + newarr.push(item); + } + th.setData({ + is_show_sto_cat: 1, + all_sto: newarr + }); + + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + } + } else { + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + } + } + }); + } else { + th.setData({ + is_show_sto_cat: 0, + only_pk: e.data.data.pageData + }); + } + } + } + }) },2)