From 32f8a021307f48698c89709b7fea91f272e6a95c Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Thu, 12 Aug 2021 13:57:39 +0800 Subject: [PATCH] 移位置 --- packageB/pages/user/choice_guide/choice_guide.js | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/user/choice_guide/choice_guide.json | 7 +++++++ packageB/pages/user/choice_guide/choice_guide.wxml | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/user/choice_guide/choice_guide.wxss | 17 +++++++++++++++++ packageB/pages/video/index.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/video/index.json | 8 ++++++++ packageB/pages/video/index.wxml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/video/index.wxss | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ pages/user/choice_guide/choice_guide.js | 121 ------------------------------------------------------------------------------------------------------------------------- pages/user/choice_guide/choice_guide.json | 7 ------- pages/user/choice_guide/choice_guide.wxml | 65 ----------------------------------------------------------------- pages/user/choice_guide/choice_guide.wxss | 17 ----------------- pages/video/index.js | 60 ------------------------------------------------------------ pages/video/index.json | 8 -------- pages/video/index.wxml | 47 ----------------------------------------------- pages/video/index.wxss | 49 ------------------------------------------------- 16 files changed, 374 insertions(+), 374 deletions(-) create mode 100644 packageB/pages/user/choice_guide/choice_guide.js create mode 100644 packageB/pages/user/choice_guide/choice_guide.json create mode 100644 packageB/pages/user/choice_guide/choice_guide.wxml create mode 100644 packageB/pages/user/choice_guide/choice_guide.wxss create mode 100644 packageB/pages/video/index.js create mode 100644 packageB/pages/video/index.json create mode 100644 packageB/pages/video/index.wxml create mode 100644 packageB/pages/video/index.wxss delete mode 100644 pages/user/choice_guide/choice_guide.js delete mode 100644 pages/user/choice_guide/choice_guide.json delete mode 100644 pages/user/choice_guide/choice_guide.wxml delete mode 100644 pages/user/choice_guide/choice_guide.wxss delete mode 100644 pages/video/index.js delete mode 100644 pages/video/index.json delete mode 100644 pages/video/index.wxml delete mode 100644 pages/video/index.wxss diff --git a/packageB/pages/user/choice_guide/choice_guide.js b/packageB/pages/user/choice_guide/choice_guide.js new file mode 100644 index 0000000..59394b7 --- /dev/null +++ b/packageB/pages/user/choice_guide/choice_guide.js @@ -0,0 +1,121 @@ +var a = getApp(), + os = a.globalData.setting, + util = require("../../../utils/util.js"), + ut = util; +Page({ + data: { + url: os.url, + iurl: os.imghost, + total: 0, //数据的总量 + ismore: 0,//数据是否加载完毕 + page:1, + pageSize:10, + isload:0, + show_pop:0, + sele_item:null, + input_val:null, + }, + //------初始化加载---------- + onLoad: function(t) {}, + + onShow: function() { + this.data.ismore=0;this.data.isload=0; + this.setData({list:null}); + this.get_list(); + }, + + //--点击分享事件--- + onShareAppMessage: function(t) { + return o.share; + }, + + get_list: function() { + var th = this, e = th; + var r_data={ + storeId: os.stoid, + pickupId: a.globalData.userInfo.pickup_id, + page: th.data.page, + pageSize: th.data.pageSize + }; + + //关键字搜索 + if(this.data.input_val){ + r_data.KeyWord= encodeURIComponent(this.data.input_val); + } + + getApp().request.promiseGet("/api/weshop/users/staff/page", { + data:r_data + }).then(res => { + th.setData({isload:1}); + if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { + th.data.page++;//当前页数+1 + var arr1 = th.data.list;//获取明细数组 + var arr2 = res.data.data.pageData;//获取当前查询数据 + if(!arr1) arr1=[]; + + var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面 + var ismore = 0; + if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断 + + th.setData({ + list: arr3, + total: res.data.data.total, + ismore: ismore, + }) + } + }) + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + if (this.data.total <= this.data.pageSize) return; + if (this.data.ismore) { + t.my_warnning("加载完啦!", 0, this);return + }; + this.get_list(); + }, + + //返回 + back:function () { + wx.navigateBack({ delta: 1}) + }, + + pop_sele:function (e) { + var index=e.currentTarget.dataset.index; + var item=this.data.list[index]; + this.setData({show_pop:1,sele_item:item}); + }, + close_pop:function () { + this.setData({show_pop:0}); + }, + //选择了导购，就跳转到会员中心页面 + go_user_info:function () { + var item=this.data.sele_item; + getApp().globalData.choice_guide=item; + getApp().goto("/pages/user/userinfo/userinfo"); + }, + + img_err:function (e) { + var txt=e.currentTarget.dataset.err_img; + this.setData({[txt]:this.data.iurl+'/miniapp/images/no-head.jpg'}); + }, + + get_input_val:function(e){ + var value=e.detail.value; + this.data.input_val=value; + }, + sear:function(){ + this.data.ismore=0;this.data.page=1; + this.setData({isload:0}); + this.setData({list:null}); + this.get_list(); + } + + + + + +}); \ No newline at end of file diff --git a/packageB/pages/user/choice_guide/choice_guide.json b/packageB/pages/user/choice_guide/choice_guide.json new file mode 100644 index 0000000..fb6a217 --- /dev/null +++ b/packageB/pages/user/choice_guide/choice_guide.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "人员列表", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageB/pages/user/choice_guide/choice_guide.wxml b/packageB/pages/user/choice_guide/choice_guide.wxml new file mode 100644 index 0000000..e72b521 --- /dev/null +++ b/packageB/pages/user/choice_guide/choice_guide.wxml @@ -0,0 +1,65 @@ + + + + + + + + 查询 + + + + + + + + + + + + + {{item.StaffName}} + {{item.Remark1?item.Remark1:'暂无介绍'}} + + + + + 选择 + + + + + + + + + + + 暂无顾问明细 + + + 返回 + + + + + + + + \ No newline at end of file diff --git a/packageB/pages/user/choice_guide/choice_guide.wxss b/packageB/pages/user/choice_guide/choice_guide.wxss new file mode 100644 index 0000000..fca6187 --- /dev/null +++ b/packageB/pages/user/choice_guide/choice_guide.wxss @@ -0,0 +1,17 @@ +.big_box{padding: 0 20rpx } +.head_pic{ width: 160rpx; height: 160rpx; border-radius: 50%} +.pic2{ width: 100rpx; height: 100rpx; } + +.item{border-bottom: 0.01rem solid #eeeeee; padding: 20rpx 0;} +.choice_btn{ width: 130rpx; height: 50rpx; border-radius: 50rpx; + border:1rpx solid #cb3549; color: #cb3549; +} +.box{ position: fixed; z-index: 6666; bottom: 0; left: 0;background-color: #fff;width: 100%;} +.t_choice_btn{ width: 160rpx; height: 50rpx; background-color:#169bd5; border-radius: 10rpx; color: #fff } + +.sear_all{ width: 93%; margin: 0 auto; height: 80rpx; margin-top: 20rpx } +.sear_all .inp_div,.sear_all .sear_btn{ height: 80rpx; line-height: 80rpx } +.inp_div{ width: 80%; overflow: hidden;background-color: #f2f2f2} +.sear_all .inp_div input{ margin-left: 54rpx; width: 100%; height: 100%; border: 0; border-radius: 0; } +.sear_btn{ width: 20%;background-color: #ff6768; text-align: center;color: #fff; font-size: 32rpx} +.find_img{width: 44rpx; height: 44rpx; position: absolute; left: 8rpx; top: 18rpx; z-index: 10} \ No newline at end of file diff --git a/packageB/pages/video/index.js b/packageB/pages/video/index.js new file mode 100644 index 0000000..82614ac --- /dev/null +++ b/packageB/pages/video/index.js @@ -0,0 +1,60 @@ +Page({ + onReady: function (res) { + + }, + bindInputBlur: function(e) { + this.inputValue = e.detail.value + }, + bindButtonTap: function() { + var that = this + wx.chooseVideo({ + sourceType: ['album', 'camera'], + maxDuration: 60, + camera: ['front','back'], + success: function(res) { + that.setData({ + src: res.tempFilePath + }) + } + }) + }, + bindSendDanmu: function () { + this.videoContext.sendDanmu({ + text: this.inputValue, + color: getRandomColor() + }) + }, + onShow:function(){ + var goods_list = this.selectComponent("#goods_list"); //组件的id + goods_list.init(); + setTimeout(function() { + goods_list.get_list(); + }, 300) + }, + + //---------分享配置-------- + onShareAppMessage: function (e) { + return { + title: "直播视频回放", + } + }, + //调用视频接口 + onLoad:function(e){ + var r_id=e.id,th=this; + if(!r_id) r_id=1; + getApp().request.get("/api/wx/weappLiveReplaylist/get?id="+r_id,{ + data:{stoid:getApp().globalData.setting.stoid}, + success:function(res){ + if(res.data.code==0){ + th.setData({src:res.data.data.media_url}) + } + } + }) + }, + //---加载更多是靠这个函数---- + onReachBottom: function() { + var goods_list = this.selectComponent("#goods_list"); //组件的id + if (goods_list) goods_list.get_list(); + }, + +}) \ No newline at end of file diff --git a/packageB/pages/video/index.json b/packageB/pages/video/index.json new file mode 100644 index 0000000..6cb999b --- /dev/null +++ b/packageB/pages/video/index.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "直播视频回放", + "enablePullDownRefresh": false, + "usingComponents": { + "goods_recommend":"/components/goods_list/goods_list", + "nav_box": "/components/nav_box/nav_box" + } +} \ No newline at end of file diff --git a/packageB/pages/video/index.wxml b/packageB/pages/video/index.wxml new file mode 100644 index 0000000..9f7e86c --- /dev/null +++ b/packageB/pages/video/index.wxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + 好物推荐 + + + + + + + + + + + + GOOD HOT THING + + + + + + + + + \ No newline at end of file diff --git a/packageB/pages/video/index.wxss b/packageB/pages/video/index.wxss new file mode 100644 index 0000000..04a0b0d --- /dev/null +++ b/packageB/pages/video/index.wxss @@ -0,0 +1,49 @@ +.page-body-button { + margin-bottom: 30rpx; +} + +video { + width: 100%; +} + +/* 热门好物 */ + +.title .China { + width: 100%; + margin-top: 10rpx; + margin-bottom: 10rpx; + line-height: 0rpx; +} + +.title .China .line view { + width: 2rpx; +} + +.title .China .line { + height: 40rpx; + color: rgb(51, 51, 51); +} + +.title .China .line view { + border-left: 3rpx solid #000; + margin-left: 5rpx; +} + +.title .China .line .one { + height: 23rpx; +} + +.title .China .line .two { + height: 15rpx; +} + +.title .China .line .three { + height: 18rpx; +} + +.title .China .Recommend { + margin: 0rpx 20rpx; + font-size: 28rpx; + line-height: 39rpx; + font-weight: bold; +} \ No newline at end of file diff --git a/pages/user/choice_guide/choice_guide.js b/pages/user/choice_guide/choice_guide.js deleted file mode 100644 index 59394b7..0000000 --- a/pages/user/choice_guide/choice_guide.js +++ /dev/null @@ -1,121 +0,0 @@ -var a = getApp(), - os = a.globalData.setting, - util = require("../../../utils/util.js"), - ut = util; -Page({ - data: { - url: os.url, - iurl: os.imghost, - total: 0, //数据的总量 - ismore: 0,//数据是否加载完毕 - page:1, - pageSize:10, - isload:0, - show_pop:0, - sele_item:null, - input_val:null, - }, - //------初始化加载---------- - onLoad: function(t) {}, - - onShow: function() { - this.data.ismore=0;this.data.isload=0; - this.setData({list:null}); - this.get_list(); - }, - - //--点击分享事件--- - onShareAppMessage: function(t) { - return o.share; - }, - - get_list: function() { - var th = this, e = th; - var r_data={ - storeId: os.stoid, - pickupId: a.globalData.userInfo.pickup_id, - page: th.data.page, - pageSize: th.data.pageSize - }; - - //关键字搜索 - if(this.data.input_val){ - r_data.KeyWord= encodeURIComponent(this.data.input_val); - } - - getApp().request.promiseGet("/api/weshop/users/staff/page", { - data:r_data - }).then(res => { - th.setData({isload:1}); - if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { - th.data.page++;//当前页数+1 - var arr1 = th.data.list;//获取明细数组 - var arr2 = res.data.data.pageData;//获取当前查询数据 - if(!arr1) arr1=[]; - - var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面 - var ismore = 0; - if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断 - - th.setData({ - list: arr3, - total: res.data.data.total, - ismore: ismore, - }) - } - }) - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - if (this.data.total <= this.data.pageSize) return; - if (this.data.ismore) { - t.my_warnning("加载完啦!", 0, this);return - }; - this.get_list(); - }, - - //返回 - back:function () { - wx.navigateBack({ delta: 1}) - }, - - pop_sele:function (e) { - var index=e.currentTarget.dataset.index; - var item=this.data.list[index]; - this.setData({show_pop:1,sele_item:item}); - }, - close_pop:function () { - this.setData({show_pop:0}); - }, - //选择了导购，就跳转到会员中心页面 - go_user_info:function () { - var item=this.data.sele_item; - getApp().globalData.choice_guide=item; - getApp().goto("/pages/user/userinfo/userinfo"); - }, - - img_err:function (e) { - var txt=e.currentTarget.dataset.err_img; - this.setData({[txt]:this.data.iurl+'/miniapp/images/no-head.jpg'}); - }, - - get_input_val:function(e){ - var value=e.detail.value; - this.data.input_val=value; - }, - sear:function(){ - this.data.ismore=0;this.data.page=1; - this.setData({isload:0}); - this.setData({list:null}); - this.get_list(); - } - - - - - -}); \ No newline at end of file diff --git a/pages/user/choice_guide/choice_guide.json b/pages/user/choice_guide/choice_guide.json deleted file mode 100644 index fb6a217..0000000 --- a/pages/user/choice_guide/choice_guide.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "人员列表", - "enablePullDownRefresh": false, - "usingComponents": { - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/user/choice_guide/choice_guide.wxml b/pages/user/choice_guide/choice_guide.wxml deleted file mode 100644 index e72b521..0000000 --- a/pages/user/choice_guide/choice_guide.wxml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - 查询 - - - - - - - - - - - - - {{item.StaffName}} - {{item.Remark1?item.Remark1:'暂无介绍'}} - - - - - 选择 - - - - - - - - - - - 暂无顾问明细 - - - 返回 - - - - - - - - \ No newline at end of file diff --git a/pages/user/choice_guide/choice_guide.wxss b/pages/user/choice_guide/choice_guide.wxss deleted file mode 100644 index fca6187..0000000 --- a/pages/user/choice_guide/choice_guide.wxss +++ /dev/null @@ -1,17 +0,0 @@ -.big_box{padding: 0 20rpx } -.head_pic{ width: 160rpx; height: 160rpx; border-radius: 50%} -.pic2{ width: 100rpx; height: 100rpx; } - -.item{border-bottom: 0.01rem solid #eeeeee; padding: 20rpx 0;} -.choice_btn{ width: 130rpx; height: 50rpx; border-radius: 50rpx; - border:1rpx solid #cb3549; color: #cb3549; -} -.box{ position: fixed; z-index: 6666; bottom: 0; left: 0;background-color: #fff;width: 100%;} -.t_choice_btn{ width: 160rpx; height: 50rpx; background-color:#169bd5; border-radius: 10rpx; color: #fff } - -.sear_all{ width: 93%; margin: 0 auto; height: 80rpx; margin-top: 20rpx } -.sear_all .inp_div,.sear_all .sear_btn{ height: 80rpx; line-height: 80rpx } -.inp_div{ width: 80%; overflow: hidden;background-color: #f2f2f2} -.sear_all .inp_div input{ margin-left: 54rpx; width: 100%; height: 100%; border: 0; border-radius: 0; } -.sear_btn{ width: 20%;background-color: #ff6768; text-align: center;color: #fff; font-size: 32rpx} -.find_img{width: 44rpx; height: 44rpx; position: absolute; left: 8rpx; top: 18rpx; z-index: 10} \ No newline at end of file diff --git a/pages/video/index.js b/pages/video/index.js deleted file mode 100644 index 82614ac..0000000 --- a/pages/video/index.js +++ /dev/null @@ -1,60 +0,0 @@ -Page({ - onReady: function (res) { - - }, - bindInputBlur: function(e) { - this.inputValue = e.detail.value - }, - bindButtonTap: function() { - var that = this - wx.chooseVideo({ - sourceType: ['album', 'camera'], - maxDuration: 60, - camera: ['front','back'], - success: function(res) { - that.setData({ - src: res.tempFilePath - }) - } - }) - }, - bindSendDanmu: function () { - this.videoContext.sendDanmu({ - text: this.inputValue, - color: getRandomColor() - }) - }, - onShow:function(){ - var goods_list = this.selectComponent("#goods_list"); //组件的id - goods_list.init(); - setTimeout(function() { - goods_list.get_list(); - }, 300) - }, - - //---------分享配置-------- - onShareAppMessage: function (e) { - return { - title: "直播视频回放", - } - }, - //调用视频接口 - onLoad:function(e){ - var r_id=e.id,th=this; - if(!r_id) r_id=1; - getApp().request.get("/api/wx/weappLiveReplaylist/get?id="+r_id,{ - data:{stoid:getApp().globalData.setting.stoid}, - success:function(res){ - if(res.data.code==0){ - th.setData({src:res.data.data.media_url}) - } - } - }) - }, - //---加载更多是靠这个函数---- - onReachBottom: function() { - var goods_list = this.selectComponent("#goods_list"); //组件的id - if (goods_list) goods_list.get_list(); - }, - -}) \ No newline at end of file diff --git a/pages/video/index.json b/pages/video/index.json deleted file mode 100644 index 6cb999b..0000000 --- a/pages/video/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "直播视频回放", - "enablePullDownRefresh": false, - "usingComponents": { - "goods_recommend":"/components/goods_list/goods_list", - "nav_box": "/components/nav_box/nav_box" - } -} \ No newline at end of file diff --git a/pages/video/index.wxml b/pages/video/index.wxml deleted file mode 100644 index 9f7e86c..0000000 --- a/pages/video/index.wxml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - 好物推荐 - - - - - - - - - - - - GOOD HOT THING - - - - - - - - - \ No newline at end of file diff --git a/pages/video/index.wxss b/pages/video/index.wxss deleted file mode 100644 index 04a0b0d..0000000 --- a/pages/video/index.wxss +++ /dev/null @@ -1,49 +0,0 @@ -.page-body-button { - margin-bottom: 30rpx; -} - -video { - width: 100%; -} - -/* 热门好物 */ - -.title .China { - width: 100%; - margin-top: 10rpx; - margin-bottom: 10rpx; - line-height: 0rpx; -} - -.title .China .line view { - width: 2rpx; -} - -.title .China .line { - height: 40rpx; - color: rgb(51, 51, 51); -} - -.title .China .line view { - border-left: 3rpx solid #000; - margin-left: 5rpx; -} - -.title .China .line .one { - height: 23rpx; -} - -.title .China .line .two { - height: 15rpx; -} - -.title .China .line .three { - height: 18rpx; -} - -.title .China .Recommend { - margin: 0rpx 20rpx; - font-size: 28rpx; - line-height: 39rpx; - font-weight: bold; -} \ No newline at end of file -- libgit2 0.21.4