diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 74f13f0..04a45a7 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.5.0"
+ const versionNum = "1.5.1"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/project.config.json b/project.config.json
index 62829b2..60f8cc5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -18,6 +18,8 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
+ "useMultiFrameRuntime": false,
+ "useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
@@ -27,9 +29,7 @@
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
- "packNpmRelationList": [],
- "useMultiFrameRuntime": false,
- "useApiHook": true
+ "packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js
index ddad79a..1b0c574 100644
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js
+++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js
@@ -11,13 +11,22 @@ Page({
deptList: [],
nodata: false,
loadMoreType: 'none',
- loadMoreVisible: false
+ loadMoreVisible: false,
+ swiperBannerList: [],
+ indicatorDots: false, //指示点
+ autoplay: true, //true,//自动播放
+ circular: true, //衔接滑动
+ interval: 5000, //自动播放间隔时长(ms)
+ duration: 500, //幻灯片切换时长(ms)
+ currentSwiper: 0,
+ showTitle: true, //视频标题
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ this.getBannerList('7')
this.getFullDictInfo()
},
@@ -48,28 +57,76 @@ Page({
getFullDictInfo () {
const dictType = 'notice_yjfu_lbzx'
- api.getFullDictInfo(dictType).then(res => {
- console.log(res)
+ api.modulelist(dictType).then(res => {
this.setData({
- deptList: [...this.data.deptList,...res.data],
- loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
- loadMoreVisible: res.data.length === this.data.pageSize ? false : true
+ deptList: res.data,
})
- if (this.data.deptList.length == 0) {
- this.setData({
- nodata: true,
- loadMoreType: 'none',
- loadMoreVisible: false,
- })
- }
- }).catch(err => {
- this.setData({
- deptList: [],
- nodata: true,
- loadMoreType: 'none',
- loadMoreVisible: false,
+ })
+ // api.getFullDictInfo(dictType).then(res => {
+ // console.log(res)
+ // this.setData({
+ // deptList: [...this.data.deptList,...res.data],
+ // loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+ // loadMoreVisible: res.data.length === this.data.pageSize ? false : true
+ // })
+ // if (this.data.deptList.length == 0) {
+ // this.setData({
+ // nodata: true,
+ // loadMoreType: 'none',
+ // loadMoreVisible: false,
+ // })
+ // }
+ // }).catch(err => {
+ // this.setData({
+ // deptList: [],
+ // nodata: true,
+ // loadMoreType: 'none',
+ // loadMoreVisible: false,
+ // })
+ // console.log(err)
+ // })
+ },
+ getBannerList: function(bannerNum) {
+ let that = this
+ api.bannerList(bannerNum).then(function(res) {
+ // console.log('res==', res.data)
+ that.setData({
+ swiperBannerList: res.data
})
- console.log(err)
+ })
+ },
+ swiperChange: function(e) {
+ wx.createVideoContext('video'+this.data.currentSwiper).pause()
+ this.setData({
+ currentSwiper: e.detail.current,
+ autoplay: true
+ })
+ },
+ bindplay() {
+ this.setData({
+ autoplay: false
+ })
+ wx.getNetworkType({
+ success (res) {
+ const networkType = res.networkType
+ if (res.networkType != 'wifi') {
+ wx.showToast({
+ title: '当前为非WI-FI环境,请注意流量消耗',
+ icon: 'none',
+ duration: 3000
+ })
+ }
+ }
+ })
+ },
+ bindended() {
+ this.setData({
+ autoplay: true
+ })
+ },
+ bindcontrolstoggle(e) {
+ this.setData({
+ showTitle: e.detail.show
})
},
/**
@@ -78,7 +135,7 @@ Page({
navigateToDict (e) {
console.log(e.currentTarget.dataset.dict)
wx.navigateTo({
- url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.dictName}&dictType=${e.currentTarget.dataset.dict.dictType}&dictValue=${e.currentTarget.dataset.dict.dictValue}`
+ url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=notice_yjfu_lbzx&dictValue=${e.currentTarget.dataset.dict.moduleCode}`
})
}
})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml
index 15029e4..f789592 100644
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml
+++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxml
@@ -1,11 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{item.dictName}}
+
+ {{item.name}}
+
diff --git a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss
index e805071..9e5fee7 100644
--- a/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss
+++ b/subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss
@@ -92,10 +92,13 @@ button::after {
gap: 20rpx 0;
width: 690rpx;
padding: 20rpx 0;
- margin: 50rpx auto 0rpx;
+ margin: 0rpx auto;
position: relative;
z-index: 999;
}
+.dept-list .list-item:nth-of-type(1) {
+ margin-top: 12rpx;
+}
.list-item {
width: 100%;
height: 130rpx;
@@ -111,11 +114,151 @@ button::after {
font-family:PingFang SC;
font-weight:bold;
color:rgba(51,51,51,1);
- margin-left: 40rpx;
+ margin-left: 40rpx;
+ display: flex;
+ align-items: center;
}
.list-item .list-arrow {
width: 16rpx;
height: 26rpx;
margin-right: 42rpx;
}
+.list-item .list-name .list-icon {
+ width: 106rpx;
+ height: 106rpx;
+ margin-right: 10rpx;
+}
+
+/* 轮播图start */
+
+.altitle {
+ position: absolute;
+ width: 100%;
+ height: 66rpx;
+ background-color: black;
+ margin-top: 237rpx;
+ border-bottom-right-radius: 16rpx;
+ border-bottom-left-radius: 16rpx;
+ opacity: 0.5;
+ font-size: 22rpx;
+ font-weight: 500;
+ color: rgba(255, 255, 255, 1);
+ }
+
+ .altitle-name {
+ margin: 10rpx 20rpx;
+ }
+
+ .container {
+ width: 100vw;
+ }
+
+ .page-body {
+ padding-top: 30rpx;
+ background: #fff;
+ height: 300rpx;
+ }
+
+ .page-section {
+ width: 100%;
+ margin-bottom: 60rpx;
+ }
+
+ .page-section_center {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
+ .page-section:last-child {
+ margin-bottom: 0;
+ }
+
+ .page-section-gap {
+ box-sizing: border-box;
+ padding: 0 30rpx;
+ }
+
+ .page-section-spacing {
+ box-sizing: border-box;
+ /* padding: 0 20rpx; */
+ height: 300rpx;
+ background-color: #fff;
+ }
+
+ .page-section-title {
+ font-size: 28rpx;
+ color: #999;
+ margin-bottom: 10rpx;
+ padding-left: 30rpx;
+ padding-right: 30rpx;
+ }
+
+ .page-section-gap .page-section-title {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ .swiper-item {
+ display: block;
+ height: 300rpx;
+ }
+
+ .banner {
+ overflow: hidden;
+ height: 300rpx;
+ display: flex;
+ width: 100%;
+ border-radius: 16rpx;
+ }
+
+ .dots {
+ display: flex;
+ justify-content: center;
+ margin-top: -16rpx;
+ z-index: 999;
+ position: relative;
+ }
+
+ .dots .dot {
+ width: 8rpx;
+ height: 8rpx;
+ border-radius: 8rpx;
+ margin-left: 10rpx;
+ background: #d2d5da;
+ transition: all 0.3s;
+ }
+
+ .dots .dot.active {
+ width: 24rpx;
+ background: #fff;
+ }
+
+ .page-section-title {
+ margin-top: 60rpx;
+ position: relative;
+ }
+
+ swiper {
+ width: 710rpx;
+ height: 300rpx;
+ box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
+ border-radius: 16rpx;
+ overflow: hidden;
+ -webkit-backface-visibility: hidden;
+ -webkit-transform: translate3d(0, 0, 0);
+ }
+
+ .video-title {
+ width: 100%;
+ height: 50rpx;
+ line-height: 50rpx;
+ padding-left: 40rpx;
+ color: white;
+ background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ position: absolute;
+ top: 0;
+ }
+ /* 轮播图end */
diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js
index 716bf3a..23cecbf 100644
--- a/subpages/oneKeyService/pages/warning/warning.js
+++ b/subpages/oneKeyService/pages/warning/warning.js
@@ -21,6 +21,7 @@ Page({
interval: 5000, //自动播放间隔时长(ms)
duration: 500, //幻灯片切换时长(ms)
currentSwiper: 0,
+ showTitle: true, //视频标题
},
/**
@@ -163,6 +164,11 @@ Page({
autoplay: true
})
},
+ bindcontrolstoggle(e) {
+ this.setData({
+ showTitle: e.detail.show
+ })
+ },
// swiperChange2: function(e) {
// this.setData({
// 'options2.currentSwiper': e.detail.current,
diff --git a/subpages/oneKeyService/pages/warning/warning.wxml b/subpages/oneKeyService/pages/warning/warning.wxml
index 7cae75d..c8715f5 100644
--- a/subpages/oneKeyService/pages/warning/warning.wxml
+++ b/subpages/oneKeyService/pages/warning/warning.wxml
@@ -7,10 +7,13 @@
-
-
+ {{item.title}}
+ -->
+
+
+
+ {{item.title}}
+
diff --git a/subpages/oneKeyService/pages/warning/warning.wxss b/subpages/oneKeyService/pages/warning/warning.wxss
index bfa09c4..f41938b 100644
--- a/subpages/oneKeyService/pages/warning/warning.wxss
+++ b/subpages/oneKeyService/pages/warning/warning.wxss
@@ -172,6 +172,7 @@ page {
}
swiper {
+ width: 710rpx;
height: 300rpx;
box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
border-radius: 16rpx;
@@ -180,4 +181,15 @@ swiper {
-webkit-transform: translate3d(0, 0, 0);
}
+.video-title {
+ width: 100%;
+ height: 50rpx;
+ line-height: 50rpx;
+ padding-left: 40rpx;
+ color: white;
+ background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ position: absolute;
+ top: 0;
+}
/* 轮播图end */
\ No newline at end of file
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
index 0d85310..fb65aa5 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
@@ -20,7 +20,8 @@ Page({
interval: 5000, //自动播放间隔时长(ms)
duration: 500, //幻灯片切换时长(ms)
currentSwiper: 0,
- nodata: false
+ nodata: false,
+ showTitle: true
},
/**
@@ -106,6 +107,11 @@ Page({
autoplay: true
})
},
+ bindcontrolstoggle(e) {
+ this.setData({
+ showTitle: e.detail.show
+ })
+ },
videoBannerList () {
api.videoBannerList('3').then( res => {
this.setData({
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
index 8f74807..a5a9995 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml
@@ -10,8 +10,11 @@
-
-
+
+
+
+ {{item.title}}
+
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
index c889c9b..62380f9 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
+++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxss
@@ -253,4 +253,15 @@ swiper {
-webkit-transform: translate3d(0, 0, 0);
}
+.video-title {
+ width: 100%;
+ height: 50rpx;
+ line-height: 50rpx;
+ padding-left: 40rpx;
+ color: white;
+ background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ background: -webkit-linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0));
+ position: absolute;
+ top: 0;
+}
/* 轮播图end */
\ No newline at end of file