From 521cea56f26ef3f49d467f2af79aa80ebda70500 Mon Sep 17 00:00:00 2001
From: tanghaolin <1723298894@qq.com>
Date: 星期四, 03 十一月 2022 11:29:41 +0800
Subject: [PATCH] 添加操作手册跳转
---
app.json | 1
mine/index/index.js | 28 ++++
mine/index/index.wxss | 88 +++++---------
mine/index/index.wxml | 161 +++++++++++---------------
project.private.config.json | 2
video/single/index.js | 27 +---
map/index.wxml | 2
video/single/index.wxml | 41 ++----
8 files changed, 145 insertions(+), 205 deletions(-)
diff --git a/app.json b/app.json
index 603be7e..6641328 100644
--- a/app.json
+++ b/app.json
@@ -53,7 +53,6 @@
"reportForm/Detail/index",
"video/station/index",
"video/single/index",
- "video/playBack/index",
"setting/index/index"
],
"requiredPrivateInfos": [
diff --git a/map/index.wxml b/map/index.wxml
index bb02ec2..05190c1 100644
--- a/map/index.wxml
+++ b/map/index.wxml
@@ -84,7 +84,7 @@
<view bindtap="tapOpenStationBimPageInList" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-BIM"></icon> <span style="padding-left:10px;padding-right:10px;">妯″瀷</span>
</view>
- <view bindtap="tapOpenReportForm" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
+ <view wx:if="{{false}}" bindtap="tapOpenReportForm" data-stationid="{{markerTipInfo.markerInfo.ObjectID}}" data-stationname="{{markerTipInfo.markerInfo.ObjectName}}">
<icon class="iconfont icon-liebiao2"></icon> <span style="padding-left:10px;padding-right:10px;">鎶ヨ〃</span>
</view>
</view>
diff --git a/mine/index/index.js b/mine/index/index.js
index f5ebd55..addccdc 100644
--- a/mine/index/index.js
+++ b/mine/index/index.js
@@ -4,7 +4,7 @@
Page({
data: {
userInfo: null,
- isDeBug: Constant.isDeBug
+ isDeBug: Constant.isDeBug,
},
onLoad: function () {
var that = this;
@@ -50,6 +50,32 @@
}
})
},
+ //鎵撳紑甯姪鎵嬪唽鏂囨。
+ openHelpBookDoc(){
+ let _this = this
+ wx.showLoading({
+ title: '璺宠浆涓�',
+ })
+ const downHelpBookDoc = wx.downloadFile({
+ url: 'https://www.beng35.com/assets/miniProgram/NT_helpBook.pdf',
+ success:res=>{
+ wx.openDocument({
+ filePath: res.tempFilePath,
+ showMenu:true,
+ success:res=>{
+ console.log(res,"鏂囨。鎵撳紑鎴愬姛")
+ wx.hideLoading()
+ },
+ fail:err=>{
+
+ }
+ })
+ },
+ fail:err=>{
+ console.log(err)
+ }
+ })
+ },
//鎵竴鎵�
onScan: function () {
// 鍏佽浠庣浉鏈哄拰鐩稿唽鎵爜
diff --git a/mine/index/index.wxml b/mine/index/index.wxml
index 8796d86..e761478 100644
--- a/mine/index/index.wxml
+++ b/mine/index/index.wxml
@@ -1,99 +1,70 @@
-<view class="header">
- <view class="user" hoverClass="none">
- <view class="user_box">
- <view catchtap="previewImage" class="logo">
- <image src="{{userInfo.avatarUrl}}"></image>
- </view>
- <block>
- <view class="user_info">
- <view class="user_name">
- <view>
- {{userInfo.RealName==null?'':userInfo.RealName}}
- </view>
- <!-- userInfo.gender==1 琛ㄧず鎬у埆涓虹敺 -->
- <icon wx:if="{{userInfo.gender==1}}" class="iconfont icon-xingbie-nan" style="color:#75B9EB;"></icon>
- <!-- userInfo.gender==2 琛ㄧず鎬у埆涓哄コ -->
- <icon wx:elif="{{userInfo.gender==2}}" class="iconfont icon-xingbienv" style="color:#FF9DC6;"></icon>
+<scroll-view scroll-y class="scrollPage">
+ <view class="UCenter-bg">
+ <image src="{{userInfo.avatarUrl}}" class="png" mode="widthFix" style="border-radius: 50%;"></image>
+ <view class="text-xl">{{userInfo.nickName==null?'':userInfo.nickName}}
+ <!-- userInfo.gender==0 琛ㄧず鎬у埆涓虹敺 -->
+ <icon wx:if="{{userInfo.gender==0}}" class="iconfont icon-xingbie-nan" style="color:#75B9EB;"></icon>
+ <!-- userInfo.gender==1 琛ㄧず鎬у埆涓哄コ -->
+ <icon wx:elif="{{userInfo.gender==1}}" class="iconfont icon-xingbienv" style="color:#FF9DC6;"></icon>
<!-- userInfo.gender==0 琛ㄧず鏈煡 -->
<icon wx:else class=""></icon>
- </view>
- <view class="vip_expires">娆㈣繋鎮�! {{userInfo.nickName}}
- </view>
- </view>
- </block>
+ </view>
+ <view class="margin-top-sm">
+ <text>By:鏅鸿兘鍐滅亴娉电珯绯荤粺</text>
+ </view>
+ <image src="http://www.beng35.com/assets/miniProgram/user_ui_wave.gif" mode="scaleToFill" class="gif-wave"></image>
+ </view>
+ <view class="padding flex text-center text-grey bg-white shadow-warp">
+
+ </view>
+ <view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius">
+ <view class="cu-item arrow">
+ <navigator class="content" bindtap="openHelpBookDoc" url="" hover-class="none">
+ <text class="cuIcon-newsfill text-blue"></text>
+ <text class="text-grey">鎿嶄綔鎵嬪唽</text>
+ </navigator>
+ </view>
+ <view class="cu-item arrow">
+ <view class="content" bindtap="openSetting" hover-class="none">
+ <text class="cuIcon-settingsfill text-gray"></text>
+ <text class="text-grey">璁剧疆</text>
+ </view>
+ </view>
+ <view class="cu-item arrow">
+ <navigator class="content" url="/other/about/EventechInfo" hover-class="none">
+ <text class="cuIcon-formfill text-green"></text>
+ <text class="text-grey">鎶�鏈敮鎸�</text>
+ </navigator>
+ </view>
+ <view class="cu-item arrow">
+ <view class="content" bindtap="changePassWord">
+ <text class="cuIcon-lock text-red"></text>
+ <text class="text-grey">淇敼瀵嗙爜</text>
+ </view>
+ </view>
+ <view class="cu-item arrow">
+ <button bindtap="reLogin" class="cu-btn content" >
+ <text class="cuIcon-exit text-cyan"></text>
+ <text class="text-grey">閲嶆柊鐧诲綍</text>
+ </button>
+ </view>
+ <view class="cu-item arrow">
+ <button class="cu-btn content" bindtap="removeStorage">
+ <text class="cuIcon-deletefill text-cyan"></text>
+ <text class="text-grey">娓呴櫎缂撳瓨</text>
+ </button>
+ </view>
+ <view class="cu-item arrow" wx:if="{{isDeBug}}">
+ <button class="cu-btn content" bindtap="onTest">
+ <text class="iconfont icon-qiyeguanwang"></text>
+ <text class="text-grey">娴嬭瘯</text>
+ </button>
+ </view>
+ <view class="cu-item">
+ <view class="content" hover-class="none">
+ <text class="cuIcon-creativefill text-orange"></text>
+ <text class="text-grey">褰撳墠鐗堟湰:1.22.1102A</text>
+ </view>
</view>
</view>
- <image src='http://www.beng35.com/assets/miniProgram/user_ui_wave.gif' mode='scaleToFill' class='gif-wave'></image>
-</view>
-
-<view class="section">
- <view class="tui-table-view">
- <navigator url="/station/search/index" wx:if="{{isDeBug}}" class=" tui-col-3">
- <icon class="iconfont icon-xiaowuzonghe-renyuanfangjiansousuo"></icon>
- <view class="cmdBtnLabel">鎼滅储</view>
- </navigator>
- <navigator url="/other/about/EventechInfo" class="tui-col-3">
- <icon class="iconfont icon-shouquanshuoming"></icon>
- <view class="cmdBtnLabel">璇存槑</view>
- </navigator>
- <view bindtap="openSetting" class="tui-col-3">
- <icon class="iconfont icon-Set_icon"></icon>
- <view class="cmdBtnLabel">璁剧疆</view>
- </view>
- <view bindtap="onScan" class="tui-col-3">
- <icon class="iconfont icon-saoyisao1"></icon>
- <view class="cmdBtnLabel">鎵竴鎵�</view>
- </view>
- <view url="" bindtap="removeStorage" class="tui-col-3">
- <icon class="iconfont icon-Delete_icon"></icon>
- <view class="cmdBtnLabel">娓呴櫎缂撳瓨</view>
- </view>
- <view url="" bindtap="reLogin" class="tui-col-3">
- <icon class="iconfont icon-tuichu"></icon>
- <view class="cmdBtnLabel">閲嶆柊鐧诲綍</view>
- </view>
-
- <view url="" wx:if="{{isDeBug}}" bindtap="onTest" class="tui-col-3">
- <icon class="iconfont icon-qiyeguanwang"></icon>
- <view class="cmdBtnLabel">娴嬭瘯</view>
- </view>
-
- <view url="" bindtap="changePassWord" class="tui-col-3">
- <icon class="iconfont icon-mima"></icon>
- <view class="cmdBtnLabel">淇敼瀵嗙爜</view>
- </view>
- </view>
-</view>
-
-<!-- <view class="widgets__item">
- <view class="widgets__list widgets__list_show">
- <navigator url="/Inspection/journey/journey" class="widget">
- <text class="widget__name">琛岀▼</text>
- <image class="widget__arrow" src="../../image/arrowright.png" mode="aspectFill" />
- <view class="widget__line widget__line_first"></view>
- </navigator>
- <navigator url="../wallet/wallet" class="widget">
- <text class="widget__name">閽卞寘</text>
- <image class="widget__arrow" src="../../image/arrowright.png" mode="aspectFill" />
- <view class="widget__line widget__line_first"></view>
- </navigator>
- <navigator url="../settings/settings" class="widget">
- <text class="widget__name">璁剧疆</text>
- <image class="widget__arrow" src="../../image/arrowright.png" mode="aspectFill" />
- <view class="widget__line widget__line_first"></view>
- </navigator>
- <navigator url="../settings/settings" class="widget">
- <text class="widget__name">瀹㈡湇涓績</text>
- <image class="widget__arrow" src="../../image/arrowright.png" mode="aspectFill" />
- <view class="widget__line widget__line_first"></view>
- </navigator>
- <navigator url="../settings/settings" class="widget">
- <text class="widget__name">閫�鍑虹櫥褰�</text>
- <image class="widget__arrow" src="../../image/arrowright.png" mode="aspectFill" />
- <view class="widget__line widget__line_first"></view>
- </navigator>
- </view>
-</view> -->
-
-<!-- <view class='zan-font-14 zan-c-gray-dark' style='text-align:center;margin-top:50rpx'>鍏佽寰俊鎺堟潈鍚庯紝鍙綋楠屾洿澶氬姛鑳�</view>-->
-<!-- <button open-type='getUserInfo'>鎺堟潈鐧诲綍</button> -->
\ No newline at end of file
+</scroll-view>
\ No newline at end of file
diff --git a/mine/index/index.wxss b/mine/index/index.wxss
index 92487bd..e9e33c3 100644
--- a/mine/index/index.wxss
+++ b/mine/index/index.wxss
@@ -118,65 +118,39 @@
background-color: #fff;
/* border: 2rpx solid #efeff4; */
}
-
-/* .widgets__item{
- margin-top: 20rpx;
- margin-bottom: 20rpx;
- background-color: #FFFFFF;
- overflow: hidden;
- border-radius: 4rpx;
- cursor: pointer;
-}
-.widgets__info{
- display: flex;
- padding: 40rpx;
- align-items: center;
- flex-direction: row;
-}
-.widgets__info_show .widgets__info-img{
- transform: rotate(-90deg);
-}
-.widgets__info-name{
- flex: 1;
-}
-.widgets__info-img{
- width: 32rpx;
- height: 32rpx;
- transition: transform .4s;
- transform: rotate(90deg);
+.UCenter-bg {
+ background-size: cover;
+ height: 425rpx;
+ display: flex;
+ justify-content: center;
+ overflow: hidden;
+ position: relative;
+ flex-direction: column;
+ align-items: center;
+ color: #fff;
+ font-weight: 300;
+ background-color: #16b5cb;
+ text-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
}
-.widgets__list{
- display: none;
+.UCenter-bg text {
+ opacity: 0.8;
}
-.widgets__list_show{
- display: block;
+
+.UCenter-bg image {
+ width: 200rpx;
+ height: 200rpx;
}
-.widget{
- position: relative;
- padding-top: 26rpx;
- padding-bottom: 26rpx;
- padding-left: 40rpx;
- padding-right: 40rpx;
+
+.UCenter-bg .gif-wave{
+ position: absolute;
+ width: 100%;
+ bottom: 0;
+ left: 0;
+ z-index: 99;
+ mix-blend-mode: screen;
+ height: 100rpx;
}
-.widget__arrow{
- position: absolute;
- top: 28rpx;
- right: 44rpx;
- width: 32rpx;
- height: 32rpx;
-}
-.widget__line{
- content: " ";
- position: absolute;
- left: 40rpx;
- top: 0;
- right: 0;
- height: 2rpx;
- background-color: #F0F0F0;
-}
-.widget__line_first{
- left: 0;
- right: 0;
- background-color: #D8D8D8;
-} */
+.cu-list.menu>.cu-item{
+ min-height: 100rpx;
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 182a7f6..b675ac7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,5 +5,5 @@
"urlCheck": true
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "libVersion": "2.26.2"
+ "libVersion": "2.27.1"
}
\ No newline at end of file
diff --git a/video/single/index.js b/video/single/index.js
index 5725184..5e9dbec 100644
--- a/video/single/index.js
+++ b/video/single/index.js
@@ -42,6 +42,7 @@
moreVideo: [],
fullScreen: false, // 鎿嶄綔鏄惁鏄剧ず
btnCmd:"",//褰撳墠鎿嶄綔鐨刢md鎸夐挳
+ videoTabBarIndex:1 //褰撳墠鐨則abbar绱㈠紩
},
onLoad(options) {
this.videoContext = wx.createVideoContext('myVideo')
@@ -168,27 +169,11 @@
},
})
},
-//鏍规嵁鏃堕棿鑾峰彇瀛樺偍鏂囦欢淇℃伅
-getStoreByTime(){
- let that = this
- let m_caremaInfo = that.data.list
- // console.log(token,deviceNo + ":" + channelNo,132)
- wx.request({
- url: Constant.YING_SHI_URL + "api/lapp/video/by/time",
- header: {
- 'content-type': 'application/x-www-form-urlencoded'
- },
- method: 'POST',
- data: {
- accessToken : m_caremaInfo.TokenInfo.ViewToken,
- deviceSerial:m_caremaInfo.SeriesNO,
- },
- success: function (res) {
- console.log(res, '鏍规嵁鏃堕棿鑾峰彇瀛樺偍鏂囦欢淇℃伅')
- },
- fail: function (res) {
- console.log('澶辫触')
- },
+//鐩戞帶鍔熻兘tabBar鍒囨崲
+videoTabBarChange(e){
+ console.log(e,173)
+ this.setData({
+ videoTabBarIndex:e.currentTarget.dataset.id
})
},
fullScreenStart(e) {
diff --git a/video/single/index.wxml b/video/single/index.wxml
index aae96d0..0589b16 100644
--- a/video/single/index.wxml
+++ b/video/single/index.wxml
@@ -53,8 +53,15 @@
-<!-- -->
-<view class="ykt-detail-wraper" wx:if="{{list.LiveUrl && list}}">
+<!-- 鐩戞帶鍔熻兘鍒囨崲tabbar -->
+<!-- <scroll-view scroll-x class="bg-white nav">
+ <view class='flex text-center'>
+ <view class="cu-item flex-sub {{videoTabBarIndex ==1?'text-cyan cur':''}}" bindtap="videoTabBarChange" data-id="1">鍩烘湰淇℃伅</view>
+ <view class="cu-item flex-sub {{videoTabBarIndex ==2?'text-cyan cur':''}}" bindtap="videoTabBarChange" data-id="2">鍛婅璁板綍 </view>
+ </view>
+</scroll-view> -->
+<!-- 鍩烘湰淇℃伅 -->
+<view class="ykt-detail-wraper" wx:if="{{list.LiveUrl && list && videoTabBarIndex == 1}}">
<view class="ykt-head">
<text class="ykt-type-name">{{list.Name}}</text>
</view>
@@ -75,37 +82,15 @@
<text class="detail-item-label">鏄惁鏃嬭浆</text>
<text class="detail-item-value">{{list.IsRotateAble==true ? '鍙棆杞�' : '涓嶅彲鏃嬭浆'}}</text>
</view>
- <!-- <view class="detail-item">
- <text class="detail-item-label">鎾斁鍦板潃</text>
- <text class="detail-item-value">{{list.TokenInfo.LiveUrl}}</text>
- </view> -->
- <!-- <view class="detail-item">
- <text class="detail-item-label">鎾斁杩涘害</text>
- <text class="detail-item-value">{{videoTime.currentTime}}</text>
- </view>
- <view class="detail-item">
- <text class="detail-item-label">鎾斁鏃堕暱</text>
- <text class="detail-item-value">{{videoTime.duration}}</text>
- </view> -->
</view>
- <view class="v_operation" wx:if='{{list.IsRotateAble==true }}' style="bottom: 11%;right: 35%;top: unset;">
+ <view class="v_operation" wx:if='{{list.IsRotateAble==true }}' style="bottom: 9%;right: 35%;top: unset;">
<icon class="iconfont icon-jiantou IsRotateAble {{btnCmd=='top'?'btn-cmd-active':''}}" style="top: -15px;" data-cmd='0' data-direction="top" bindtouchstart="fullScreenStart" bindtouchend="fullScreenEnd"></icon>
<icon class="iconfont icon-jiantou IsRotateAble {{btnCmd=='bottom'?'btn-cmd-active':''}}" style="bottom: -55px;top:52rpx" data-cmd='1' data-direction="bottom" bindtouchstart="fullScreenStart" bindtouchend="fullScreenEnd"></icon>
<icon class="iconfont icon-jiantou IsRotateAble {{btnCmd=='left'?'btn-cmd-active':''}}" style="left: -15px;" data-cmd='2' data-direction="left" bindtouchstart="fullScreenStart" bindtouchend="fullScreenEnd"></icon>
<icon class="iconfont icon-jiantou IsRotateAble {{btnCmd=='right'?'btn-cmd-active':''}}" style="right:-15px;" data-cmd='3' data-direction="right" bindtouchstart="fullScreenStart" bindtouchend="fullScreenEnd"></icon>
</view>
</view>
+<!-- 鍛婅鍒楄〃 -->
+<!-- <scroll-view scroll-y>
-<button wx:if="{{false}}" bindtap="toPlayBack">鍥炴斁</button>
-<!-- <video-swiper
- class="video-swiper"
- video-list="{{videoList}}"
- bindplay="onPlay"
- bindpause="onPause"
- bindtimeupdate="onTimeUpdate"
- bindended="onEnded"
- binderror="onError"
- bindwaiting="onWaiting"
- bindprogress="onProgress"
- bindloadedmetadata="onLoadedMetaData"
-></video-swiper> -->
\ No newline at end of file
+</scroll-view> -->
\ No newline at end of file
--
Gitblit v1.9.3