diff --git a/app.json b/app.json
index 9248edf..c1181b9 100644
--- a/app.json
+++ b/app.json
@@ -1,168 +1,169 @@
-{
- "pages": [
- "pages/start/start",
- "pages/indexNew/indexNew",
- "pages/index/index",
- "pages/mine/mine",
- "pages/association/association",
- "pages/discussion/discussion",
- "pages/toRegister/toRegister",
- "pages/toScan/toScan",
- "pages/complete/complete",
- "pages/formid/formid",
- "pages/register/register",
- "pages/detail/detail",
- "pages/accept/accept",
- "pages/gridLeaderRegister/gridLeaderRegister",
- "pages/heart/heart",
- "pages/heartNew/heartNew"
- ],
- "subPackages": [
- {
- "root": "subpages/home",
- "name": "home",
- "pages": [
- "pages/webview/webview",
- "pages/agreement/agreement",
- "pages/notice/notice",
- "pages/noticeNew/noticeNew",
- "pages/info/info",
- "pages/noticeDetail/noticeDetail",
- "pages/newsDetail/newsDetail",
- "pages/newsList/newsList"
- ]
- },
- {
- "root": "subpages/changegrid",
- "name": "changeGrid",
- "pages": [
- "pages/changeGrid/changeGrid"
- ]
- },
- {
- "root": "subpages/association",
- "name": "association",
- "pages": [
- "pages/joinassociation/joinassociation",
- "pages/createassociation/createassociation",
- "pages/associationMember/associationMember",
- "pages/associationDetail/associationDetail",
- "pages/inviteFriend/inviteFriend",
- "pages/incomingVerify/incomingVerify",
- "pages/unpassAssociation/unpassAssociation",
- "pages/topicList/topicList",
- "pages/addTopic/addTopic",
- "pages/topicDetail/topicDetail",
- "pages/replyOrRemark/replyOrRemark",
- "pages/changeToIssue/changeToIssue"
- ]
- },
- {
- "root": "subpages/associationNew",
- "name": "associationNew",
- "pages": [
- "pages/associationlist/associationlist",
- "pages/community/community",
- "pages/gMembersList/gMembersList",
- "pages/gOfficialsList/gOfficialsList",
- "pages/talklist/talklist",
- "pages/eventlist/eventlist",
- "pages/addTopic/addTopic"
- ]
- },
- {
- "root": "subpages/discussion",
- "name": "discussion",
- "pages": [
- "pages/addIssue/addIssue",
- "pages/discussionDetail/discussionDetail",
- "pages/publishEvaluation/publishEvaluation",
- "pages/remarkOrReply/remarkOrReply",
- "pages/searchDiscussion/searchDiscussion",
- "pages/categoryList/categoryList"
- ]
- },
- {
- "root": "subpages/mine",
- "name": "mine",
- "pages": [
- "pages/eventDetail/eventDetail",
- "pages/inviteRecord/inviteRecord",
- "pages/gridManage/gridManage"
- ]
- },
- {
- "root": "subpages/integralCentre",
- "name": "integralCentre",
- "pages": [
- "pages/index/index"
- ]
- },
- {
- "root": "subpages/heart",
- "pages": [
- "pages/heartDetail/heartDetail",
- "pages/leaderboard/leaderboard",
- "pages/leaderboardNew/leaderboardNew",
- "pages/myNews/myNews",
- "pages/clockIn/clockIn",
- "pages/volunteer/volunteer",
- "pages/signed/signed",
- "pages/refusedOrEndedDetail/refusedOrEndedDetail",
- "pages/cancelDetail/cancelDetail"
- ]
- },
- {
- "root": "subpages/understandJs",
- "pages": [
- "pages/index/index",
- "pages/impression/impression",
- "pages/delicious/delicious",
- "pages/sclerotia/sclerotia",
- "pages/archives/archives",
- "pages/noticeDetail/noticeDetail"
- ]
- }
- ],
- "preloadRule": {
- "pages/indexNew/indexNew": {
- "network": "all",
- "packages": [
- "subpages/changegrid"
- ]
- },
- "pages/discussion/discussion": {
- "network": "all",
- "packages": [
- "discussion"
- ]
- },
- "pages/association/association": {
- "network": "all",
- "packages": [
- "subpages/association"
- ]
- },
- "pages/mine/mine": {
- "network": "all",
- "packages": [
- "mine"
- ]
- }
- },
- "window": {
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "WeChat",
- "navigationBarTextStyle": "black"
- },
- "networkTimeout": {
- "request": 6000
- },
- "permission": {
- "scope.userLocation": {
- "desc": "e锦水将获取您的位置信息"
- }
- },
- "sitemapLocation": "sitemap84.json"
+{
+ "pages": [
+ "pages/start/start",
+ "pages/indexNew/indexNew",
+ "pages/index/index",
+ "pages/mine/mine",
+ "pages/association/association",
+ "pages/discussion/discussion",
+ "pages/toRegister/toRegister",
+ "pages/toScan/toScan",
+ "pages/complete/complete",
+ "pages/formid/formid",
+ "pages/register/register",
+ "pages/detail/detail",
+ "pages/accept/accept",
+ "pages/gridLeaderRegister/gridLeaderRegister",
+ "pages/heart/heart",
+ "pages/heartNew/heartNew"
+ ],
+ "subPackages": [
+ {
+ "root": "subpages/home",
+ "name": "home",
+ "pages": [
+ "pages/webview/webview",
+ "pages/agreement/agreement",
+ "pages/notice/notice",
+ "pages/noticeNew/noticeNew",
+ "pages/info/info",
+ "pages/noticeDetail/noticeDetail",
+ "pages/newsDetail/newsDetail",
+ "pages/newsList/newsList"
+ ]
+ },
+ {
+ "root": "subpages/changegrid",
+ "name": "changeGrid",
+ "pages": [
+ "pages/changeGrid/changeGrid"
+ ]
+ },
+ {
+ "root": "subpages/association",
+ "name": "association",
+ "pages": [
+ "pages/joinassociation/joinassociation",
+ "pages/createassociation/createassociation",
+ "pages/associationMember/associationMember",
+ "pages/associationDetail/associationDetail",
+ "pages/inviteFriend/inviteFriend",
+ "pages/incomingVerify/incomingVerify",
+ "pages/unpassAssociation/unpassAssociation",
+ "pages/topicList/topicList",
+ "pages/addTopic/addTopic",
+ "pages/topicDetail/topicDetail",
+ "pages/replyOrRemark/replyOrRemark",
+ "pages/changeToIssue/changeToIssue"
+ ]
+ },
+ {
+ "root": "subpages/associationNew",
+ "name": "associationNew",
+ "pages": [
+ "pages/associationlist/associationlist",
+ "pages/community/community",
+ "pages/guideInfo/guideInfo",
+ "pages/gMembersList/gMembersList",
+ "pages/gOfficialsList/gOfficialsList",
+ "pages/talklist/talklist",
+ "pages/eventlist/eventlist",
+ "pages/addTopic/addTopic"
+ ]
+ },
+ {
+ "root": "subpages/discussion",
+ "name": "discussion",
+ "pages": [
+ "pages/addIssue/addIssue",
+ "pages/discussionDetail/discussionDetail",
+ "pages/publishEvaluation/publishEvaluation",
+ "pages/remarkOrReply/remarkOrReply",
+ "pages/searchDiscussion/searchDiscussion",
+ "pages/categoryList/categoryList"
+ ]
+ },
+ {
+ "root": "subpages/mine",
+ "name": "mine",
+ "pages": [
+ "pages/eventDetail/eventDetail",
+ "pages/inviteRecord/inviteRecord",
+ "pages/gridManage/gridManage"
+ ]
+ },
+ {
+ "root": "subpages/integralCentre",
+ "name": "integralCentre",
+ "pages": [
+ "pages/index/index"
+ ]
+ },
+ {
+ "root": "subpages/heart",
+ "pages": [
+ "pages/heartDetail/heartDetail",
+ "pages/leaderboard/leaderboard",
+ "pages/leaderboardNew/leaderboardNew",
+ "pages/myNews/myNews",
+ "pages/clockIn/clockIn",
+ "pages/volunteer/volunteer",
+ "pages/signed/signed",
+ "pages/refusedOrEndedDetail/refusedOrEndedDetail",
+ "pages/cancelDetail/cancelDetail"
+ ]
+ },
+ {
+ "root": "subpages/understandJs",
+ "pages": [
+ "pages/index/index",
+ "pages/impression/impression",
+ "pages/delicious/delicious",
+ "pages/sclerotia/sclerotia",
+ "pages/archives/archives",
+ "pages/noticeDetail/noticeDetail"
+ ]
+ }
+ ],
+ "preloadRule": {
+ "pages/indexNew/indexNew": {
+ "network": "all",
+ "packages": [
+ "subpages/changegrid"
+ ]
+ },
+ "pages/discussion/discussion": {
+ "network": "all",
+ "packages": [
+ "discussion"
+ ]
+ },
+ "pages/association/association": {
+ "network": "all",
+ "packages": [
+ "subpages/association"
+ ]
+ },
+ "pages/mine/mine": {
+ "network": "all",
+ "packages": [
+ "mine"
+ ]
+ }
+ },
+ "window": {
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTitleText": "WeChat",
+ "navigationBarTextStyle": "black"
+ },
+ "networkTimeout": {
+ "request": 6000
+ },
+ "permission": {
+ "scope.userLocation": {
+ "desc": "e锦水将获取您的位置信息"
+ }
+ },
+ "sitemapLocation": "sitemap84.json"
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 1086aa5..8534479 100644
--- a/project.config.json
+++ b/project.config.json
@@ -22,7 +22,7 @@
"disablePlugins": [],
"outputPath": ""
},
- "useCompilerModule": false,
+ "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false
},
"compileType": "miniprogram",
diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss
index eef74e0..8663950 100644
--- a/subpages/associationNew/components/communityList/communityList.wxss
+++ b/subpages/associationNew/components/communityList/communityList.wxss
@@ -1,44 +1,44 @@
-.hover-btn {
- box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
-}
-.community-item{
- width: 690rpx;
- height: 300rpx;
- border-radius: 10rpx;
- position: relative;
- margin: 0 auto;
- margin-top: 28rpx;
-}
-.community-item image{
- width: 100%;
- height: 100%;
- position: absolute;
- border-radius: 10rpx;
-}
-.community-item .cover-image{
- width: 100%;
- height: 100%;
- position: absolute;
- background: rgba(0, 0, 0, 0.1);
- border-radius: 10rpx;
- text-align: center;
- display: flex;
- flex-direction: column;
- justify-content: center;
-}
-.community-item .cover-image .community-name{
- color: white;
- font-size: 48rpx;
-}
-.community-item .cover-image .community-add{
- width: 150rpx;
- height: 46rpx;
- text-align: left;
- padding: 0;
- margin-top: 32rpx;
- border: 0px;
-}
-.community-item .cover-image .community-add image{
- width: 100%;
- height: 100%;
+.hover-btn {
+ box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
+}
+.community-item{
+ width: 690rpx;
+ height: 300rpx;
+ border-radius: 10rpx;
+ position: relative;
+ margin: 0 auto;
+ margin-top: 28rpx;
+}
+.community-item image{
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ border-radius: 10rpx;
+}
+.community-item .cover-image{
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ background: rgba(0, 0, 0, 0.2);
+ border-radius: 10rpx;
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+}
+.community-item .cover-image .community-name{
+ color: white;
+ font-size: 48rpx;
+}
+.community-item .cover-image .community-add{
+ width: 150rpx;
+ height: 46rpx;
+ text-align: left;
+ padding: 0;
+ margin-top: 32rpx;
+ border: 0px;
+}
+.community-item .cover-image .community-add image{
+ width: 100%;
+ height: 100%;
}
\ No newline at end of file
diff --git a/subpages/associationNew/components/membersList/membersList.wxml b/subpages/associationNew/components/membersList/membersList.wxml
index 5b82e93..e0a985b 100644
--- a/subpages/associationNew/components/membersList/membersList.wxml
+++ b/subpages/associationNew/components/membersList/membersList.wxml
@@ -1,56 +1,59 @@
-
-
-
-
-
-
- {{item.nickname}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
- {{item.mobile}}
-
-
-
-
-
- {{item.motto}}
-
-
-
+
+
+
+
+
+
+ {{item.nickname}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.mobile}}
+
+
+
+
+
+ {{item.motto}}
+
+
+
\ No newline at end of file
diff --git a/subpages/associationNew/components/membersList/membersList.wxss b/subpages/associationNew/components/membersList/membersList.wxss
index 13e200d..aa0ca4f 100644
--- a/subpages/associationNew/components/membersList/membersList.wxss
+++ b/subpages/associationNew/components/membersList/membersList.wxss
@@ -1,164 +1,172 @@
-.hover-btn {
- box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
-}
-.line {
- width: 690rpx;
- height: 2rpx;
- margin: 0 auto;
- background: rgba(240, 240, 240, 1);
-}
-.members-item{
- background: rgba(255, 255, 255, 1);
- margin-top: 20rpx;
- position: relative;
-}
-.members-item .item-top{
- width: 750rpx;
- height: 130rpx;
- display: flex;
- flex-direction: row;
- justify-content: left;
- align-items: center;
-}
-.members-item .item-top .head-icon{
- width: 90rpx;
- height: 90rpx;
- border-radius: 50%;
- margin-left: 29rpx;
-}
-.members-item .item-top .user-name{
- font-size: 32rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: rgba(0, 0, 0, 1);
- margin-left: 20rpx;
-}
-.members-item .item-top .leader-logo{
- width: 59rpx;
- height: 28rpx;
- margin-left: 8rpx;
-}
-.members-item .item-bottom{
- height: 100rpx;
- width: 750rpx;
- position: relative;
-}
-.members-item .item-bottom .levelup-btn{
- display: inline-block;
- width: 180rpx;
- height: 48rpx;
- padding: 0;
- position: relative;
- border: none;
- margin-left: 29rpx;
- margin-top: 26rpx;
-}
-.members-item .item-bottom .takeout-btn{
- display: inline-block;
- width: 140rpx;
- height: 48rpx;
- padding: 0;
- position: relative;
- border: none;
- z-index: 0;
- margin-left: 20rpx;
-}
-.members-item .item-bottom .forbidden-btn{
- display: inline-block;
- width: 170rpx;
- height: 48rpx;
- padding: 0;
- position: absolute;
- z-index: 0;
- margin-left: 20rpx;
- right: 32rpx;
- top: 26rpx;
- border: 1rpx solid rgba(241, 86, 28, 1);
- border-radius: 23rpx;
-}
-.levelup-btn image, .takeout-btn image, .forbidden-btn image, .call-btn image{
- width: 100%;
- height: 100%;
- position: absolute;
- left: 0;
- top: 0;
-}
-.forbidden-btn image{
- width: 24rpx;
- height: 14rpx;
- position: absolute;
- left: 135rpx;
- top: 18rpx;
-}
-.levelup-btn text, .takeout-btn text{
- font-size: 26rpx;
- font-family: PingFang SC;
- font-weight: bold;
- color: rgba(255, 255, 255, 1);
- z-index: 1;
- position: absolute;
- left: 25rpx;
- top: 0;
- height: 48rpx;
- line-height: 48rpx;
-}
-.forbidden-btn text{
- font-size: 26rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: rgba(242, 80, 27, 1);
- z-index: 1;
- position: absolute;
- left: 28rpx;
- top: 0;
- height: 48rpx;
- line-height: 48rpx;
-}
-.disForbidden-btn {
- border: 1rpx solid rgba(170, 170, 170, 1) !important;
-}
-.disForbidden-btn text{
- color: rgba(170, 170, 170, 1) !important;
-}
-
-.members-item .item-top .call-btn{
- width: 156rpx;
- height: 56rpx;
- padding: 0;
- position: absolute;
- border: none;
- right: 31rpx;
-}
-.members-item .item-top .np-info{
- display: flex;
- flex-direction: column;
-}
-.members-item .item-top .user-phone{
- font-size: 32rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: rgba(240, 133, 38, 1);
- margin-left: 20rpx;
-}
-.members-item .item-bottom2{
- height: 100rpx;
- width: 750rpx;
- position: relative;
- display: flex;
- align-items: center;
-}
-.member-label{
- margin-left: 30rpx;
- margin-right: 37rpx;
- font-size: 28rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: rgba(153, 153, 153, 1);
- display: -webkit-box;
- overflow: hidden;
- text-overflow: ellipsis;
- word-wrap: break-word;
- white-space: normal !important;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
-}
+.hover-btn {
+ box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
+}
+.line {
+ width: 690rpx;
+ height: 2rpx;
+ margin: 0 auto;
+ background: rgba(240, 240, 240, 1);
+}
+.members-item{
+ background: rgba(255, 255, 255, 1);
+ margin-top: 20rpx;
+ position: relative;
+}
+.members-item .item-top{
+ width: 750rpx;
+ height: 130rpx;
+ display: flex;
+ flex-direction: row;
+ justify-content: left;
+ align-items: center;
+}
+.members-item .item-top .head-icon{
+ width: 90rpx;
+ height: 90rpx;
+ border-radius: 50%;
+ margin-left: 29rpx;
+}
+.members-item .item-top .user-name{
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: rgba(0, 0, 0, 1);
+ margin-left: 20rpx;
+}
+.members-item .item-top .identity-logo{
+ height: 28rpx;
+ margin-left: 8rpx;
+}
+.members-item .item-top .identity0{
+ width: 59rpx;
+}
+.members-item .item-top .identity1{
+ width: 76rpx;
+}
+.members-item .item-top .this-community{
+ width: 116rpx;
+}
+.members-item .item-bottom{
+ height: 100rpx;
+ width: 750rpx;
+ position: relative;
+}
+.members-item .item-bottom .levelup-btn{
+ display: inline-block;
+ width: 180rpx;
+ height: 48rpx;
+ padding: 0;
+ position: relative;
+ border: none;
+ margin-left: 29rpx;
+ margin-top: 26rpx;
+}
+.members-item .item-bottom .takeout-btn{
+ display: inline-block;
+ width: 140rpx;
+ height: 48rpx;
+ padding: 0;
+ position: relative;
+ border: none;
+ z-index: 0;
+ margin-left: 20rpx;
+}
+.members-item .item-bottom .forbidden-btn{
+ display: inline-block;
+ width: 170rpx;
+ height: 48rpx;
+ padding: 0;
+ position: absolute;
+ z-index: 0;
+ margin-left: 20rpx;
+ right: 32rpx;
+ top: 26rpx;
+ border: 1rpx solid rgba(241, 86, 28, 1);
+ border-radius: 23rpx;
+}
+.levelup-btn image, .takeout-btn image, .forbidden-btn image, .call-btn image{
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+}
+.forbidden-btn image{
+ width: 24rpx;
+ height: 14rpx;
+ position: absolute;
+ left: 135rpx;
+ top: 18rpx;
+}
+.levelup-btn text, .takeout-btn text{
+ font-size: 26rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: rgba(255, 255, 255, 1);
+ z-index: 1;
+ position: absolute;
+ left: 25rpx;
+ top: 0;
+ height: 48rpx;
+ line-height: 48rpx;
+}
+.forbidden-btn text{
+ font-size: 26rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: rgba(242, 80, 27, 1);
+ z-index: 1;
+ position: absolute;
+ left: 28rpx;
+ top: 0;
+ height: 48rpx;
+ line-height: 48rpx;
+}
+.disForbidden-btn {
+ border: 1rpx solid rgba(170, 170, 170, 1) !important;
+}
+.disForbidden-btn text{
+ color: rgba(170, 170, 170, 1) !important;
+}
+
+.members-item .item-top .call-btn{
+ width: 156rpx;
+ height: 56rpx;
+ padding: 0;
+ position: absolute;
+ border: none;
+ right: 31rpx;
+}
+.members-item .item-top .np-info{
+ display: flex;
+ flex-direction: column;
+}
+.members-item .item-top .user-phone{
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: rgba(240, 133, 38, 1);
+ margin-left: 20rpx;
+}
+.members-item .item-bottom2{
+ height: 100rpx;
+ width: 750rpx;
+ position: relative;
+ display: flex;
+ align-items: center;
+}
+.member-label{
+ margin-left: 30rpx;
+ margin-right: 37rpx;
+ font-size: 28rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: rgba(153, 153, 153, 1);
+ display: -webkit-box;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-wrap: break-word;
+ white-space: normal !important;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+}
diff --git a/subpages/associationNew/images/leader-logo.png b/subpages/associationNew/images/leader-logo.png
deleted file mode 100644
index a27b847..0000000
Binary files a/subpages/associationNew/images/leader-logo.png and /dev/null differ
diff --git a/subpages/associationNew/images/leader-logo@2x.png b/subpages/associationNew/images/leader-logo@2x.png
new file mode 100644
index 0000000..7870bc7
Binary files /dev/null and b/subpages/associationNew/images/leader-logo@2x.png differ
diff --git a/subpages/associationNew/images/leader2-logo@2x.png b/subpages/associationNew/images/leader2-logo@2x.png
new file mode 100644
index 0000000..49e2e97
Binary files /dev/null and b/subpages/associationNew/images/leader2-logo@2x.png differ
diff --git a/subpages/associationNew/images/resident@2x.png b/subpages/associationNew/images/resident@2x.png
new file mode 100644
index 0000000..9d9a47e
Binary files /dev/null and b/subpages/associationNew/images/resident@2x.png differ
diff --git a/subpages/associationNew/pages/community/community.js b/subpages/associationNew/pages/community/community.js
index bdbd22c..34362d7 100644
--- a/subpages/associationNew/pages/community/community.js
+++ b/subpages/associationNew/pages/community/community.js
@@ -1,66 +1,71 @@
-import { getImageUrl} from '../../utils/api'
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- partyGroupId: '',
- imageUrlList: [],
- pageNo: 1,
- pageSize: 10
- },
- onLoad: function (options) {
- this.data.partyGroupId = options.code
- getImageUrl().then(res => {
- this.setData({
- imageUrlList: [...res.data]
- })
- })
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- //跳转页面
- navToGroupMembers (e) {
- console.log(this.data.partyGroupId)
- wx.navigateTo({
- url: `/subpages/associationNew/pages/gMembersList/gMembersList?partyGroupId=${this.data.partyGroupId}`
- })
- },
- navToNewPage (e) {
- // console.log(e.currentTarget.dataset.page);
- if (e.currentTarget.dataset.page === 'help') {
- wx.navigateTo({
- url: `/subpages/associationNew/pages/gOfficialsList/gOfficialsList?partyGroupId=${this.data.partyGroupId}`
- })
- } else if (e.currentTarget.dataset.page === 'gather') {
- console.log('/subpages/associationNew/pages/community/community.js')
- wx.navigateTo({
- url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=1` //`#/话对捧个场`
- })
- } else if (e.currentTarget.dataset.page === 'applause') {
- wx.navigateTo({
- url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=0` //`#/事好鼓个掌`
- })
- }
- }
-})
+import { getImageUrl} from '../../utils/api'
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ partyGroupId: '',
+ imageUrlList: [],
+ pageNo: 1,
+ pageSize: 10
+ },
+ onLoad: function (options) {
+ this.data.partyGroupId = options.code
+ getImageUrl().then(res => {
+ this.setData({
+ imageUrlList: [...res.data]
+ })
+ })
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ //跳转页面-群成员
+ navToGroupMembers (e) {
+ console.log(this.data.partyGroupId)
+ wx.navigateTo({
+ url: `/subpages/associationNew/pages/gMembersList/gMembersList?partyGroupId=${this.data.partyGroupId}`
+ })
+ },
+ navToForumGuide (e) {
+ console.log('前往论坛指南')
+ wx.navigateTo({
+ url: `/subpages/associationNew/pages/guideInfo/guideInfo?partyGroupId=${this.data.partyGroupId}`
+ })
+ },
+ navToNewPage (e) {
+ // console.log(e.currentTarget.dataset.page);
+ if (e.currentTarget.dataset.page === 'help') {
+ wx.navigateTo({
+ url: `/subpages/associationNew/pages/gOfficialsList/gOfficialsList?partyGroupId=${this.data.partyGroupId}`
+ })
+ } else if (e.currentTarget.dataset.page === 'gather') {
+ wx.navigateTo({
+ url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=1` //`#/话对捧个场`
+ })
+ } else if (e.currentTarget.dataset.page === 'applause') {
+ wx.navigateTo({
+ url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=0` //`#/事好鼓个掌`
+ })
+ }
+ }
+})
diff --git a/subpages/associationNew/pages/community/community.wxml b/subpages/associationNew/pages/community/community.wxml
index 6d856ed..bc8fc0a 100644
--- a/subpages/associationNew/pages/community/community.wxml
+++ b/subpages/associationNew/pages/community/community.wxml
@@ -1,13 +1,17 @@
-
+
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index 5dba400..7fdf802 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -1,58 +1,65 @@
-
-
-
-
- {{item.nickname}}
- {{item.createdTime}}
-
-
- {{item.topicContent}}
-
-
-
-
-
-
-
-
-
- {{item.supportNum}}
-
-
-
- {{item.commentNum}}
-
-
-
- 评论
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{item.nickname}}
+
+ {{item.createdTime}}
+
+
+ {{item.topicContent}}
+
+
+
+
+
+
+
+
+
+ {{item.supportNum}}
+
+
+
+ {{item.commentNum}}
+
+
+
+ 评论
+
+
+
+
+ {{likesItem.nickname}},
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index 9689360..aed8c02 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -1,214 +1,235 @@
-page {
- background: #f7f7f7;
-}
-
-.item-list {
- width: 100%;
- padding: 40rpx 29rpx 20rpx 29rpx;
- background: #fff;
- margin-top: 20rpx;
-}
-
-.user-info {
- width: calc(100% - 58rpx);
- height: 64rpx;
- display: flex;
- align-items: center;
-}
-
-.user-info image {
- border-radius: 50rpx;
- width: 64rpx;
- height: 64rpx;
-}
-
-.user-info .name-date {
- margin-left: 14rpx;
- height: 100%;
- display: flex;
- flex-direction: column;
-}
-
-.user-info .name-date .name {
- font-size: 28rpx;
- font-weight: bold;
- color: rgba(51, 51, 51, 1);
-}
-
-.user-info .name-date .date {
- font-size: 20rpx;
- font-weight: 500;
- color: rgba(153, 153, 153, 1);
-}
-
-.details-info {
- width: calc(100% - 58rpx);
- font-size: 36rpx;
- font-weight: 500;
- color: rgba(51, 51, 51, 1);
- line-height: 54rpx;
-}
-
-.image-list {
- width: calc(100% - 58rpx);
- margin-top: 30rpx;
- display: grid;
- grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr));
- grid-gap: 7rpx;
-}
-
-.image-list .image-item {
- width: 100%;
- height: 100%;
- object-fit: cover;
- border-radius: 8rpx;
-}
-
-.attitude {
- width: calc(100% - 300rpx);
- margin-top: 21rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- /* justify-content: center; */
- height: 28rpx;
- padding: 0 50rpx;
-}
-
-.attitude .all {
- display: flex;
- align-items: center;
-}
-
-.attitude .all image {
- width: 28rpx;
- height: 28rpx;
-}
-
-.attitude .all .give-data {
- font-size: 24rpx;
- font-weight: 500;
- color: rgba(51, 51, 51, 1);
- margin-left: 9rpx;
- /* width: 196rpx; */
-}
-
-.attitude .all .give-data.color {
- color: #FFB103;
-}
-
-.comment {
- width: calc(100% - 98rpx);
- padding: 26rpx 20rpx;
- background: #F2F2F2;
- border-radius: 8rpx;
- margin-top: 25rpx;
-}
-
-.comment .comment-list {
- width: 100%;
- margin-top: 11rpx;
- font-size: 28rpx;
- color: #999999;
-}
-
-.comment .comment-list text {
- color: #333333;
-}
-
-/* 评论样式 */
-.release {
- align-items: flex-end;
- /*底部对齐*/
- box-sizing: border-box;
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- padding: 13rpx 20rpx;
- background-color: #fff;
- font-size: 28rpx;
- z-index: 999;
-}
-
-.replyinfo1 {
- display: flex;
- justify-content: space-between;
- /*两端对齐*/
- font-size: 35rpx;
-}
-
-.replyinfo2 {
- display: flex;
- justify-content: space-between;
- /*两端对齐*/
-}
-
-.release textarea {
- width: calc(100% - 200rpx);
- min-height: 34rpx;
- max-height: 102rpx;
- /*最多显示三行*/
- border-width: 15rpx 20rpx;
- /*使用padding与预期留白不一致,故使用border*/
- border-style: solid;
- border-color: #F2F2F2;
- line-height: 34rpx;
- font-size: 28rpx;
- background-color: #F2F2F2;
- border-radius: 4rpx;
-}
-
-.release .text {
- font-size: 40rpx;
- color: #c9c9c9;
-}
-
-.cancel {
- width: 240rpx;
- height: 64rpx;
- line-height: 64rpx;
- text-align: center;
- color: #6c0;
- margin: 0 3px;
- padding: 0;
-}
-
-.release .submit {
- width: 160rpx;
- height: 60rpx;
- line-height: 60rpx;
- text-align: center;
- margin: 0 3px;
- padding: 0;
- font-size: 32rpx;
- font-weight: 500;
- color: rgba(255, 255, 255, 1);
- background: linear-gradient(to right, #e95027, #db1a1f);
- border-radius: 50rpx;
-}
-
-
-.pro-box .info .text .delete {
- color: #f68135;
- border-radius: 50rpx;
- border: 1px solid #f68135;
- font-size: 28 rpx;
- width: 150rpx;
- height: 48rpx;
- text-align: center;
-}
-
-.addIssue {
- width: 178rpx;
- height: 178rpx;
- position: fixed;
- bottom: 30%;
- right: 14rpx;
-}
-
-.addIssue image {
- width: 100%;
- height: 100%;
- object-fit: cover;
+page {
+ background: #f7f7f7;
+}
+
+.item-list {
+ width: 100%;
+ padding: 40rpx 29rpx 20rpx 29rpx;
+ background: #fff;
+ margin-top: 20rpx;
+}
+
+.user-info {
+ width: calc(100% - 58rpx);
+ height: 64rpx;
+ display: flex;
+ align-items: center;
+}
+
+.user-info image {
+ border-radius: 50rpx;
+ width: 64rpx;
+ height: 64rpx;
+}
+
+.user-info .name-date {
+ margin-left: 14rpx;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+}
+
+.user-info .name-date .name {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: rgba(51, 51, 51, 1);
+}
+
+.user-info .name-date .community-logo {
+ height: 28rpx;
+ width: 116rpx;
+ margin-left: 8rpx;
+}
+
+.user-info .name-date .date {
+ font-size: 20rpx;
+ font-weight: 500;
+ color: rgba(153, 153, 153, 1);
+}
+
+.details-info {
+ width: calc(100% - 58rpx);
+ font-size: 36rpx;
+ font-weight: 500;
+ color: rgba(51, 51, 51, 1);
+ line-height: 54rpx;
+}
+
+.image-list {
+ width: calc(100% - 58rpx);
+ margin-top: 30rpx;
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr));
+ grid-gap: 7rpx;
+}
+
+.image-list .image-item {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ border-radius: 8rpx;
+}
+
+.attitude {
+ width: calc(100% - 300rpx);
+ margin: 21rpx 0rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ /* justify-content: center; */
+ height: 28rpx;
+ padding: 0 50rpx;
+}
+
+.attitude .all {
+ display: flex;
+ align-items: center;
+}
+
+.attitude .all image {
+ width: 30rpx;
+ height: 30rpx;
+}
+
+.attitude .all .give-data {
+ font-size: 26rpx;
+ font-weight: 500;
+ color: rgba(51, 51, 51, 1);
+ margin-left: 9rpx;
+ /* width: 196rpx; */
+}
+
+.attitude .all .give-data.color {
+ color: #FFB103;
+}
+
+.likes {
+ width: calc(100% - 98rpx);
+ padding: 24rpx 20rpx 12rpx 20rpx;
+ background: #F2F2F2;
+ border-radius: 8rpx;
+ margin-top: 25rpx;
+ font-size: 28rpx;
+ color: #333333;
+}
+.line {
+ width: calc(100% - 60rpx);
+ height: 1px;
+ background-color: #999999;
+}
+
+.comment {
+ width: calc(100% - 98rpx);
+ padding: 12rpx 20rpx 24rpx 20rpx;
+ background: #F2F2F2;
+ border-radius: 8rpx;
+ /* margin-top: 25rpx; */
+}
+
+.comment .comment-list {
+ width: 100%;
+ margin-top: 11rpx;
+ font-size: 28rpx;
+ color: #999999;
+}
+
+.comment .comment-list text {
+ color: #333333;
+}
+
+/* 评论样式 */
+.release {
+ align-items: flex-end;
+ /*底部对齐*/
+ box-sizing: border-box;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ padding: 13rpx 20rpx;
+ background-color: #fff;
+ font-size: 28rpx;
+ z-index: 999;
+}
+
+.replyinfo1 {
+ display: flex;
+ justify-content: space-between;
+ /*两端对齐*/
+ font-size: 35rpx;
+}
+
+.replyinfo2 {
+ display: flex;
+ justify-content: space-between;
+ /*两端对齐*/
+}
+
+.release textarea {
+ width: calc(100% - 200rpx);
+ min-height: 34rpx;
+ max-height: 102rpx;
+ /*最多显示三行*/
+ border-width: 15rpx 20rpx;
+ /*使用padding与预期留白不一致,故使用border*/
+ border-style: solid;
+ border-color: #F2F2F2;
+ line-height: 34rpx;
+ font-size: 28rpx;
+ background-color: #F2F2F2;
+ border-radius: 4rpx;
+}
+
+.release .text {
+ font-size: 40rpx;
+ color: #c9c9c9;
+}
+
+.cancel {
+ width: 240rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ color: #6c0;
+ margin: 0 3px;
+ padding: 0;
+}
+
+.release .submit {
+ width: 160rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ text-align: center;
+ margin: 0 3px;
+ padding: 0;
+ font-size: 32rpx;
+ font-weight: 500;
+ color: rgba(255, 255, 255, 1);
+ background: linear-gradient(to right, #e95027, #db1a1f);
+ border-radius: 50rpx;
+}
+
+
+.pro-box .info .text .delete {
+ color: #f68135;
+ border-radius: 50rpx;
+ border: 1px solid #f68135;
+ font-size: 28 rpx;
+ width: 150rpx;
+ height: 48rpx;
+ text-align: center;
+}
+
+.addIssue {
+ width: 178rpx;
+ height: 178rpx;
+ position: fixed;
+ bottom: 30%;
+ right: 14rpx;
+}
+
+.addIssue image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.js b/subpages/associationNew/pages/guideInfo/guideInfo.js
new file mode 100644
index 0000000..dfa88bb
--- /dev/null
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.js
@@ -0,0 +1,15 @@
+import { getGuideInfo} from '../../utils/api'
+Page({
+ data: {
+ partyGroupId: '',
+ guideInfoData: ''
+ },
+ onLoad: function (options) {
+ this.data.partyGroupId = options.partyGroupId
+ getGuideInfo(this.data.partyGroupId).then(res => {
+ this.setData({
+ guideInfoData: res.data
+ })
+ })
+ }
+})
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.json b/subpages/associationNew/pages/guideInfo/guideInfo.json
new file mode 100644
index 0000000..69f3c32
--- /dev/null
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ },
+ "navigationBarTitleText": "论坛指南"
+}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxml b/subpages/associationNew/pages/guideInfo/guideInfo.wxml
new file mode 100644
index 0000000..360b6e0
--- /dev/null
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxml
@@ -0,0 +1,5 @@
+
+
+ {{guideInfoData}}
+
+
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxss b/subpages/associationNew/pages/guideInfo/guideInfo.wxss
new file mode 100644
index 0000000..065f96f
--- /dev/null
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxss
@@ -0,0 +1,9 @@
+page {
+ width:100%;
+ height: auto;
+ overflow-y: auto;
+ background: #f7f7f7;
+}
+.guide-content {
+ font-size: 34rpx;
+}
\ No newline at end of file
diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js
index 6928dd2..1619e5a 100644
--- a/subpages/associationNew/utils/api.js
+++ b/subpages/associationNew/utils/api.js
@@ -1,128 +1,135 @@
-const request = require('../../../utils/request')
-/**
- *获取图片
- */
-export function getImageUrl() {
- return request.get('imgConfig/getImgUrl/1')
-}
-/**
- *获取图片党群列表首页
- */
-export function getImageUrl2() {
- return request.get('imgConfig/getImgUrl/2')
-}
-/**
- *进入党群
- */
-export function getJoinGroup({partyGroupId}) {
- return request.get('partyGroup/group/join',{
- partyGroupId
- })
-}
-/**
- *党群名称列表
- */
-export function getPartyGroupList() {
- return request.get('partyGroup/group/list')
-}
-/**
- * 群成员列表
- */
-export function getPartyUserList({pageIndex, pageSize, partyGroupId}) {
- return request.get('partyGroup/user/list',{
- pageIndex,
- pageSize,
- partyGroupId
- })
-}
-/**
- * 官小带个长列表
- */
-export function getOfficialsList({pageIndex, pageSize, partyGroupId}) {
- return request.get('partyGroup/officials/list',{
- pageIndex,
- pageSize,
- partyGroupId
- })
-}
-/**
- * 当前用户信息
- */
-export function getCurrentUserInfo(partyGroupId) {
- return request.get('partyGroup/user/currentUserInfo/'+partyGroupId)
-}
-/**
- * 用户身份修改
- */
-export function postModifyIdentity({groupUserId, identityFlag}) {
- return request.post('partyGroup/user/modifyIdentity',{
- groupUserId,
- identityFlag
- })
-}
-/**
- * 用户禁言
- */
-export function postUserBanned({groupUserId, bannedFlag}) {
- return request.post('partyGroup/user/banned',{
- groupUserId,
- bannedFlag
- })
-}
-
-/**
- * 话题列表
- */
-export function topiclist({pageIndex,pageSize,timestamp,topicType,partyGroupId,partyTopicId}) {
- return request.get('partyGroup/topic/list',{
- pageIndex,
- pageSize,
- timestamp,
- topicType,
- partyGroupId,
- partyTopicId
- })
-}
-
-
-/**
- * 发布话题
- */
-
-export function addTopic({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) {
- return request.post('partyGroup/topic/submit',{
- topicType,
- topicContent,
- topicAddress,
- topicLatitude,
- topicLongitude,
- partyGroupId,
- images
- })
-}
-
-/**
- * 话题评论
- */
-
-export function commentSubmit({topicId, faCommentId,content}) {
- return request.post('partyGroup/comment/submit',{
- topicId,
- faCommentId,
- content
- })
-}
-
-/**
- * 表态话题(赞/踩)
- */
-export function statement({attitude, topicId}) {
- return request.post('partyGroup/topic/statement',{
- topicId,
- attitude
- })
-}
-
-
-
-
+const request = require('../../../utils/request')
+/**
+ *获取图片
+ */
+export function getImageUrl() {
+ return request.get('imgConfig/getImgUrl/1')
+}
+/**
+ *获取图片党群列表首页
+ */
+export function getImageUrl2() {
+ return request.get('imgConfig/getImgUrl/2')
+}
+/**
+ *进入党群
+ */
+export function getJoinGroup({partyGroupId}) {
+ return request.get('partyGroup/group/join',{
+ partyGroupId
+ })
+}
+/**
+ *党群名称列表
+ */
+export function getPartyGroupList() {
+ return request.get('partyGroup/group/list')
+}
+/**
+ * 群成员列表
+ */
+export function getPartyUserList({pageIndex, pageSize, partyGroupId}) {
+ return request.get('partyGroup/user/list',{
+ pageIndex,
+ pageSize,
+ partyGroupId
+ })
+}
+/**
+ * 官小带个长列表
+ */
+export function getOfficialsList({pageIndex, pageSize, partyGroupId}) {
+ return request.get('partyGroup/officials/list',{
+ pageIndex,
+ pageSize,
+ partyGroupId
+ })
+}
+/**
+ * 当前用户信息
+ */
+export function getCurrentUserInfo(partyGroupId) {
+ return request.get('partyGroup/user/currentUserInfo/'+partyGroupId)
+}
+/**
+ * 用户身份修改
+ */
+export function postModifyIdentity({groupUserId, identityFlag}) {
+ return request.post('partyGroup/user/modifyIdentity',{
+ groupUserId,
+ identityFlag
+ })
+}
+/**
+ * 用户禁言
+ */
+export function postUserBanned({groupUserId, bannedFlag}) {
+ return request.post('partyGroup/user/banned',{
+ groupUserId,
+ bannedFlag
+ })
+}
+
+/**
+ * 话题列表
+ */
+export function topiclist({pageIndex,pageSize,timestamp,topicType,partyGroupId,partyTopicId}) {
+ return request.get('partyGroup/topic/list',{
+ pageIndex,
+ pageSize,
+ timestamp,
+ topicType,
+ partyGroupId,
+ partyTopicId
+ })
+}
+
+
+/**
+ * 发布话题
+ */
+
+export function addTopic({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) {
+ return request.post('partyGroup/topic/submit',{
+ topicType,
+ topicContent,
+ topicAddress,
+ topicLatitude,
+ topicLongitude,
+ partyGroupId,
+ images
+ })
+}
+
+/**
+ * 话题评论
+ */
+
+export function commentSubmit({topicId, faCommentId,content}) {
+ return request.post('partyGroup/comment/submit',{
+ topicId,
+ faCommentId,
+ content
+ })
+}
+
+/**
+ * 表态话题(赞/踩)
+ */
+export function statement({attitude, topicId}) {
+ return request.post('partyGroup/topic/statement',{
+ topicId,
+ attitude
+ })
+}
+
+/**
+ * 获取论坛指南
+ */
+export function getGuideInfo(partyGroupId) {
+ return request.get('partyGroup/group/guideInfo/'+partyGroupId)
+}
+
+
+
+
diff --git a/utils/config.js b/utils/config.js
index c74543c..295d26d 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,29 +1,29 @@
-module.exports = {
- BASEURL: BASEURL,
- WEBROOT: WEBROOT,
- Token: getToken,
- userId: ""
-};
-
-function BASEURL() {
- // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' //党群1+1
- // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
- // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
- // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址
- // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
- // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
- // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
- return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
-}
-
-function WEBROOT() {
- // return "http://10.10.10.117:8080/#/" // 本地 h5前端地址
- return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址
- // return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址
- // return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址
- // return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址
-}
-
-function getToken() {
- return wx.getStorageSync("token");
-}
+module.exports = {
+ BASEURL: BASEURL,
+ WEBROOT: WEBROOT,
+ Token: getToken,
+ userId: ""
+};
+
+function BASEURL() {
+ // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' //党群1+1
+ return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+ // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
+ // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址
+ // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
+ // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
+ // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
+ // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+}
+
+function WEBROOT() {
+ // return "http://10.10.10.117:8080/#/" // 本地 h5前端地址
+ return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址
+ // return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址
+ // return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址
+ // return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址
+}
+
+function getToken() {
+ return wx.getStorageSync("token");
+}