From 589d4a46e1f3b2b0b5a8ead5f609a85903761e79 Mon Sep 17 00:00:00 2001 From: Lee-1203 <342694918@qq.com> Date: Mon, 18 Jul 2022 16:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9-0718?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/style.css | 10 + .../customer-service/customer-service.vue | 21 +- pages.json | 7 + pages/tabbar/my/my.vue | 36 ++- pages/tabbar/news/detail.vue | 27 +- pagesA/cart/prepare.vue | 15 +- pagesB/video/playVideo.vue | 86 +++++++ static/public/icon-back.png | Bin 0 -> 1107 bytes .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../customer-service/customer-service.js.map | 2 +- .../components/customer/customer-one.js.map | 2 +- .../components/enter-cart/enter-cart.js.map | 2 +- .../components/foot-tab/foot-tab.js.map | 2 +- .../components/nav-tab/nav-tab.js.map | 2 +- .../components/nothing/nothing-page.js.map | 2 +- .../product-list/product-list.js.map | 2 +- .../components/pull-list/pull-list.js.map | 2 +- .../shopping-carts/cart-slide.js.map | 2 +- .../components/status-navs/status-nav.js.map | 2 +- .../components/swiper-tab/swiper-tab.js.map | 2 +- .../components/swipers/swiper-pu.js.map | 2 +- .../mp-weixin/pages/tabbar/my/my.js.map | 2 +- .../mp-weixin/pages/tabbar/news/detail.js.map | 2 +- .../mp-weixin/pagesA/cart/prepare.js.map | 2 +- .../mp-weixin/pagesB/ucenter/ucenter.js.map | 2 +- .../mp-weixin/pagesB/video/playVideo.js.map | 1 + unpackage/dist/dev/mp-weixin/app.json | 120 ++++----- unpackage/dist/dev/mp-weixin/common/main.js | 4 +- unpackage/dist/dev/mp-weixin/common/main.wxss | 10 + .../components/containers/status-container.js | 22 +- .../customer-service/customer-service.js | 52 ++-- .../customer-service/customer-service.wxml | 2 +- .../components/customer/customer-one.js | 28 +-- .../components/enter-cart/enter-cart.js | 28 +-- .../mp-weixin/components/foot-tab/foot-tab.js | 28 +-- .../mp-weixin/components/nav-tab/nav-tab.js | 28 +-- .../components/nothing/nothing-page.js | 28 +-- .../mp-weixin/components/nothing/pitera.js | 20 +- .../components/product-list/product-list.js | 28 +-- .../components/pull-list/pull-list.js | 28 +-- .../components/shopping-carts/cart-slide.js | 30 +-- .../components/status-navs/status-nav.js | 28 +-- .../components/swiper-tab/swiper-tab.js | 28 +-- .../mp-weixin/components/swipers/swiper-pu.js | 28 +-- .../dev/mp-weixin/pages/login/agreement.js | 2 +- .../dev/mp-weixin/pages/tabbar/cate/cate.js | 6 +- .../dev/mp-weixin/pages/tabbar/index/index.js | 12 +- .../dev/mp-weixin/pages/tabbar/kit/detail.js | 6 +- .../dev/mp-weixin/pages/tabbar/kit/kit.js | 6 +- .../dist/dev/mp-weixin/pages/tabbar/my/my.js | 62 +++-- .../dev/mp-weixin/pages/tabbar/my/my.wxml | 2 +- .../mp-weixin/pages/tabbar/news/collection.js | 6 +- .../dev/mp-weixin/pages/tabbar/news/detail.js | 27 +- .../mp-weixin/pages/tabbar/news/detail.wxml | 2 +- .../dev/mp-weixin/pages/tabbar/news/news.js | 10 +- .../dist/dev/mp-weixin/pagesA/cart/cart.js | 2 +- .../dist/dev/mp-weixin/pagesA/cart/finish.js | 4 +- .../dist/dev/mp-weixin/pagesA/cart/prepare.js | 19 +- .../dev/mp-weixin/pagesA/cart/prepare.wxml | 2 +- .../dev/mp-weixin/pagesA/cart/settlement.js | 2 +- .../dist/dev/mp-weixin/pagesA/order/detail.js | 4 +- .../dist/dev/mp-weixin/pagesA/order/order.js | 2 +- .../dist/dev/mp-weixin/pagesA/shop/detail.js | 6 +- .../dist/dev/mp-weixin/pagesA/shop/shop.js | 2 +- .../dist/dev/mp-weixin/pagesB/about/about.js | 2 +- .../pagesB/disclaimers/disclaimers.js | 2 +- .../dev/mp-weixin/pagesB/search/search.js | 6 +- .../dev/mp-weixin/pagesB/ucenter/ucenter.js | 2 +- .../dev/mp-weixin/pagesB/video/playVideo.js | 235 ++++++++++++++++++ .../dev/mp-weixin/pagesB/video/playVideo.json | 5 + .../dev/mp-weixin/pagesB/video/playVideo.wxml | 1 + .../dev/mp-weixin/pagesB/video/playVideo.wxss | 16 ++ .../dist/dev/mp-weixin/project.config.json | 3 +- .../dev/mp-weixin/project.private.config.json | 2 +- .../dev/mp-weixin/static/public/icon-back.png | Bin 0 -> 1107 bytes 75 files changed, 846 insertions(+), 389 deletions(-) create mode 100644 pagesB/video/playVideo.vue create mode 100644 static/public/icon-back.png create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/video/playVideo.js.map create mode 100644 unpackage/dist/dev/mp-weixin/pagesB/video/playVideo.js create mode 100644 unpackage/dist/dev/mp-weixin/pagesB/video/playVideo.json create mode 100644 unpackage/dist/dev/mp-weixin/pagesB/video/playVideo.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pagesB/video/playVideo.wxss create mode 100644 unpackage/dist/dev/mp-weixin/static/public/icon-back.png diff --git a/commons/style.css b/commons/style.css index 1023692..bba9713 100644 --- a/commons/style.css +++ b/commons/style.css @@ -965,6 +965,16 @@ video#my-video{ align-items: center; flex-wrap: nowrap; height: 96rpx; + position: relative; +} +.my-content .item>.get-phone-btn{ + width: 90rpx; + height: 100%; + opacity: 0; + position: absolute; + top: 0; + right: 0; + z-index: 1; } .my-content .item .left{ flex-wrap: nowrap; diff --git a/components/customer-service/customer-service.vue b/components/customer-service/customer-service.vue index 5cedb61..8979ee6 100644 --- a/components/customer-service/customer-service.vue +++ b/components/customer-service/customer-service.vue @@ -3,7 +3,7 @@ - + @@ -33,7 +33,24 @@ }, methods:{ toService(){ - console.log('咨询客服') + this.$requst.post('/api/user/business-qr').then(res=>{ + // console.log(res,'商家客服') + if(res.code==0) { + if(res.data.contact.toString()){ + uni.makePhoneCall({ + phoneNumber:res.data.contact.toString(),//电话号码 + success:function(e){ + console.log(e); + }, + fail:function(e){ + console.log(e); + } + }) + }else{ + this.$toolAll.tools.showToast('电话号码为空!'); + } + } + }) }, } } diff --git a/pages.json b/pages.json index b9247e9..f81d8fe 100644 --- a/pages.json +++ b/pages.json @@ -162,6 +162,13 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } + }, + { //视频播放 + "path" : "video/playVideo", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } } ] } diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue index 3147deb..c4c0e04 100644 --- a/pages/tabbar/my/my.vue +++ b/pages/tabbar/my/my.vue @@ -42,6 +42,7 @@ + @@ -143,6 +144,7 @@ isChecked:false, //验证会员码 cacheBusinessId:-1, //商户id showObj:'0123457', //隐藏Index + mobile:'',// 联系电话 } }, onReachBottom() { @@ -191,6 +193,7 @@ this.headPortrait = res.data.headimgurl, this.nickName = res.data.nickname this.businessCode = res.data.business_code + this.mobile = res.data.mobile, this.myOrder[0].num = newArr.all, this.myOrder[1].num = newArr.ordered, this.myOrder[2].num = newArr.completed, @@ -233,9 +236,11 @@ return false; }else{ if(index == 0){ - uni.navigateTo({ - url:`/pagesB/ucenter/ucenter` - }) + if(this.mobile!==''){ + uni.navigateTo({ + url:`/pagesB/ucenter/ucenter` + }) + } } if(index == 1){ if(this.businessCode == ''){ @@ -265,6 +270,31 @@ } } }, + // 获取授权信息 + onGetPhoneNumber(e){ + if(e.detail.errMsg=="getPhoneNumber:fail user deny"){ //用户决绝授权 + this.$toolAll.tools.showToast('您已拒绝授权'); + uni.navigateTo({ + url:`/pagesB/ucenter/ucenter` + }) + }else{ //允许授权 + let params={ + iv:e.detail.iv, + encryptedData:e.detail.encryptedData + } + this.$requst.post('/api/user/bind-phone',params).then(res=>{ + if(res.code==0) { + this.$toolAll.tools.showToast('绑定成功'); + uni.navigateTo({ + url:`/pagesB/ucenter/ucenter` + }) + }else{ + this.$toolAll.tools.showToast(res.msg); + } + }) + + } + }, // 提交会员申请 submitEv(){ if(this.checkEmpty() && this.flag){ diff --git a/pages/tabbar/news/detail.vue b/pages/tabbar/news/detail.vue index 74ec445..3f868bf 100644 --- a/pages/tabbar/news/detail.vue +++ b/pages/tabbar/news/detail.vue @@ -5,13 +5,9 @@ - - + - - - {{articleDetail.title}} @@ -100,24 +96,11 @@ } }, methods: { - // 全屏播放 + // 播放视频 playEv(url){ - this.videoContext = uni.createVideoContext("my-video", this); // this这个是实例对象 必传 - this.videoUrl = url; - this.videoContext.play(); - this.videoContext.requestFullScreen({ direction: 90 }); - this.videoPlay = true; // 显示播放盒子 - }, - // 退出全屏 - screenChange(e) { - if (e.detail.fullScreen) { - //退出全屏 - this.videoPlay = false; // 隐藏播放盒子 - } - }, - closeVideo(){ - //退出全屏 - this.videoPlay = false; // 隐藏播放盒子 + uni.navigateTo({ + url: `/pagesB/video/playVideo?src=${url}` + }) }, //收藏 diff --git a/pagesA/cart/prepare.vue b/pagesA/cart/prepare.vue index 6855785..d1df4d8 100644 --- a/pagesA/cart/prepare.vue +++ b/pagesA/cart/prepare.vue @@ -1,7 +1,7 @@