From ec8ce023eeea3e69097492d3dfd7d1cf986e391e Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 23 Nov 2020 17:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A6=E9=A6=99=E9=94=A6?=
=?UTF-8?q?=E6=B0=B4=E6=A8=A1=E5=9D=97=EF=BC=9B=E6=88=91=E8=A6=81=E4=B8=BE?=
=?UTF-8?q?=E6=8A=A5=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/indexNew/indexNew.js | 57 ++++++++++++++-----
pages/indexNew/indexNew.wxml | 12 +++-
pages/indexNew/indexNew.wxss | 36 +++++++++++-
.../pages/moduleList/moduleList.js | 16 ++++--
.../pages/moduleList/moduleList.wxml | 30 +++++-----
utils/config.js | 4 +-
6 files changed, 119 insertions(+), 36 deletions(-)
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 8f171b5..935f465 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -81,8 +81,9 @@ Page({
signMsg: '',
signCode: 0,
isSignUp: 0,
- yjfwPID: '', //一键服务pid
- jmjsPID: '', //解码锦水pid
+ yjfw: {},
+ jmjs: {},
+ sxjs: {},
},
onShow: function () {
if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) {
@@ -99,6 +100,7 @@ Page({
newsList: []
})
this.getNewsList()
+ this.getModuleList()
}
}
},
@@ -186,14 +188,6 @@ Page({
that.setData({
zyzqnGridId:item.residentValue
})
- } else if (item.residentType === 'module_category' && item.residentCode === 'module_category_yjfw') {
- that.setData({
- yjfwPID:item.residentValue
- })
- } else if (item.residentType === 'module_category' && item.residentCode === 'module_category_jmjs') {
- that.setData({
- jmjsPID:item.residentValue
- })
}
})
}
@@ -278,6 +272,36 @@ Page({
})
})
},
+ getModuleList: function () {
+ let params = {
+ pageIndex: 1,
+ pageSize: 10,
+ pid: '0'
+ }
+ api.moduleCategory(params).then(res => {
+ console.log('获取模块列表',res.data)
+ res.data.forEach( item => {
+ if (item.categoryCode == 'sxjs') {
+ this.data.sxjs = { ...item }
+ this.setData({
+ sxjs: this.data.sxjs
+ })
+ } else if (item.categoryCode == 'jmjs') {
+ this.data.jmjs = { ...item }
+ this.setData({
+ jmjs: this.data.jmjs
+ })
+ } else if (item.categoryCode == 'yjfw') {
+ this.data.yjfw = { ...item }
+ this.setData({
+ yjfw: this.data.yjfw
+ })
+ }
+ })
+ }).catch(err => {
+ console.log(err)
+ })
+ },
onReachBottom () {
this.setData({
loadMoreVisible: true
@@ -427,6 +451,7 @@ Page({
that.getNewsList()
that.getIssueList()
that.getProjectList()
+ that.getModuleList()
}
}
})
@@ -454,10 +479,16 @@ Page({
currentIndex: e.detail.current
})
},
+ //跳转到 书香锦水 页面
+ toSxjs () {
+ wx.navigateTo({
+ url: `/subpages/oneKeyService/pages/moduleList/moduleList?pid=${this.data.sxjs.id}&bannerflag=${this.data.sxjs.bannerFlag}&categorycode=${this.data.sxjs.categoryCode}&modulestyle=${this.data.sxjs.moduleStyle}&categoryname=${this.data.sxjs.categoryName}`
+ })
+ },
//跳转到 一键服务页面(新) 2020.07.15
toOneKeyService () {
wx.navigateTo({
- url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.yjfwPID}&title=一键服务`
+ url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.yjfw.id}&title=一键服务`
})
},
// 点击-更多，跳转通知列表
@@ -477,7 +508,7 @@ Page({
//了解锦水
toUnderstandJs (){
wx.navigateTo({
- url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.jmjsPID}&title=解码锦水`
+ url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.jmjs.id}&title=解码锦水`
})
},
@@ -739,7 +770,7 @@ Page({
let params = {
pageIndex: page,
pageSize: 10,
- pid: this.data.yjfwPID
+ pid: this.data.yjfw.id
}
let op = {}
return new Promise((resolve, reject) => {
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 8bd3ebf..a6eeec1 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -137,13 +137,13 @@
- 一键服务
+ {{yjfw.categoryName}}
- 解码锦水
+ {{jmjs.categoryName}}
+
+
+
+
+
+
+
+
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index 592e0e2..994a19e 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -662,4 +662,38 @@ page {
text-align: center;
font-size: 36rpx;
color: #04BCA0;
-}
\ No newline at end of file
+}
+
+/* 悬浮按钮 -start- */
+.movable-area{
+ pointer-events:none;
+ z-index: 999;
+ width: 100%;
+ height: 90%;
+ position: fixed;
+ top: 60px;
+ left: 0;
+ right: 0;
+ bottom: 0;
+}
+.movable-view{
+ pointer-events:auto;
+ width: 178rpx;
+ height: 178rpx;
+ transform: translateX(560rpx) translateY(680rpx) translateZ(0rpx) scale(1);
+ transform-origin: center center;
+ will-change: auto;
+ position: absolute;
+ top: 1100rpx;
+ left: 560rpx;
+}
+.report-issue {
+ width: 178rpx;
+ height: 178rpx;
+}
+.report-issue image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+/* 悬浮按钮 -end- */
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js
index 1423fe2..a36c519 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.js
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.js
@@ -292,7 +292,7 @@ Page({
})
} else {
wx.showToast({
- title: '样式不能为空',
+ title: '该模块未选择展示形式',
icon: 'none',
duration: 2000
})
@@ -330,9 +330,17 @@ Page({
if (this.verifyCompleteInfo()) {
return false
}
- wx.navigateTo({
- url: "/subpages/oneKeyService/pages/reportIssue/reportIssue"
- })
+ if (e.currentTarget.dataset.code == 'notice_jsqf_wyjb') {
+ wx.navigateTo({
+ url: "/subpages/oneKeyService/pages/reportIssue/reportIssue"
+ })
+ } else {
+ wx.showToast({
+ title: '暂未开放',
+ icon: 'none',
+ duration: 2000
+ })
+ }
},
//type-9 拨打电话
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.wxml b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
index f5c01f4..2319fc2 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.wxml
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
@@ -39,20 +39,22 @@
-
-
-
- {{item.categoryName}}
-
-
-
-
+
+
+
+
+ {{item.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/config.js b/utils/config.js
index e94fe91..d099316 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,8 +6,8 @@ module.exports = {
};
function BASEURL() {
- // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
- return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+ return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+ // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'http://192.168.43.19:9094/epdc-api/api/'
}