diff --git a/pages.json b/pages.json
index a6a42a7..5ee6082 100644
--- a/pages.json
+++ b/pages.json
@@ -85,13 +85,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path": "pages/index/events_info",
- "style": {
- "navigationBarTitleText": "智慧云商协",
- "enablePullDownRefresh": false
- }
- },
{
"path": "pages/index/goods_list",
"style": {
@@ -107,7 +100,7 @@
}
},
{
- "path": "pages/index/pizz_info/pizz_info",
+ "path": "pages/index/pizz_info",
"style": {
"navigationBarTitleText": "智慧云商协",
"enablePullDownRefresh": false
diff --git a/pages/index/directory.vue b/pages/index/directory.vue
index bfe8e55..1080dfe 100644
--- a/pages/index/directory.vue
+++ b/pages/index/directory.vue
@@ -14,9 +14,9 @@
-
+
- 河南省青年企业家协会
+ {{HomeTitle}}
@@ -29,10 +29,10 @@
style="height: 100vh;background-color: #EBF4F7;">
-
- {{ item }}
+ {{ item.industry_name }}
@@ -45,26 +45,29 @@
- {{item.name}}
+ {{item.position_name}}
-
-
- {{v.name}}
- {{v.family}}
+ {{v.nikename}}
+ {{v.nation}}
- {{v.desc}}
+ {{v.enterprise_Introduction}}
+
+ 暂无
+
@@ -73,79 +76,24 @@
-
- 申请入会
-
-
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/pages/index/home.vue b/pages/index/home.vue
index b132afa..c8e3f72 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -209,6 +209,8 @@
this.getNewsGoryList();
this.getActivityList();
this.getAssociationIndex();
+
+ //this.$emit('childEvent', '修改后的数据');
},
getAssociationIndex() {
associationIndex()
@@ -218,12 +220,14 @@
var key = res.data;
const transformedSelectList = key.map(item => ({
value: item.id,
- label: item.association_name
+ label: item.association_name,
+ icon: item.association_image
}));
const foundNumber = transformedSelectList.find((element) => element.value == store.state
.Gid);
this.HomeTitle = foundNumber.label;
this.selectList = transformedSelectList;
+ this.$parent.childEvent(foundNumber);
}
})
.catch(error => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 02584e0..85aa907 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -62,8 +62,8 @@
},
{
// 服务、案例、品牌、合作、发现、探索
- activeIcon: '/static/logo.png',
- inactiveIcon: '/static/logo.png',
+ activeIcon: '',
+ inactiveIcon: '',
iconSize: 110,
out: true
},
@@ -81,7 +81,8 @@
// tabbar当前被选中的序号
currentIndex: 0,
// 自定义底栏对应页面的加载情况
- tabberPageLoadFlag: []
+ tabberPageLoadFlag: [],
+ apiImgUrl:this.$store.state.imgUrl,
}
},
onLoad(options) {
@@ -116,6 +117,11 @@
}
},
methods: {
+ childEvent(data) {
+ console.log(data);
+ this.tabbarList[2].activeIcon=this.apiImgUrl+data.icon;
+ this.tabbarList[2].inactiveIcon=this.apiImgUrl+data.icon;
+ },
wxshare() {
this.$wxshare({
url: 'http://ysh.0rui.cn/#/pages/index/index',
diff --git a/pages/index/my_apply.vue b/pages/index/my_apply.vue
index dd74b63..f2cbc46 100644
--- a/pages/index/my_apply.vue
+++ b/pages/index/my_apply.vue
@@ -16,23 +16,33 @@
+ @click="openUrl('/pages/index/pizz_info?id='+userInfo.association_id)">
-
+
- 河南机器人行业协会
- 成立时间:2021-09-08
+ {{userInfo.association_name}}
+ 成立时间:{{userInfo.association_createtime}}
-
审核中
+
+
+ 正式会员
+
+
+
+ 被拒绝
+
@@ -41,13 +51,39 @@
\ No newline at end of file
+.see {
+ display: flex;
+ justify-content: space-between;
+ padding-top: 10rpx;
+ border-radius: 6rpx;
+ color: #666;
+ line-height: 1.6;
+}
+
diff --git a/pages/index/pizz.vue b/pages/index/pizz.vue
index 827b9d1..c6ecd4c 100644
--- a/pages/index/pizz.vue
+++ b/pages/index/pizz.vue
@@ -60,7 +60,7 @@
+ @click="tn('/pages/index/pizz_info?id='+item.id)">
@@ -78,11 +78,11 @@
-
-
- 快速入驻
-
+
+
+
+
+
@@ -104,12 +104,17 @@ import store from '@/store/index.js'
this.getAssociationIndex();
},
methods: {
+ onsubmit(){
+ this.page=1;
+ this.list=[];
+ this.getAssociationIndex();
+ },
getAssociationIndex() {
- associationIndex()
+ associationIndex({association_name:this.content})
.then(res => {
console.log(res);
if (res.code == 1) {
- this.list = res.data;
+ this.list.push(...res.data);
}
})
.catch(error => {
diff --git a/pages/index/pizz_info.vue b/pages/index/pizz_info.vue
new file mode 100644
index 0000000..452b826
--- /dev/null
+++ b/pages/index/pizz_info.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 协会地址
+ {{info.association_dizhi}}
+
+
+ 协会邮箱
+ {{info.association_emal}}
+
+
+ 联系方式
+ {{info.association_phone}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.position_name}}
+
+
+
+
+
+ {{v.nikename}}
+
+
+
+
+ 暂无
+
+
+
+
+
+
+
+
+
+ 会员名录
+
+ 申请入会
+
+
+
+
+
+
+
+
diff --git a/pages/index/pizz_info/pizz_info.vue b/pages/index/pizz_info/pizz_info.vue
deleted file mode 100644
index 471ad02..0000000
--- a/pages/index/pizz_info/pizz_info.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 河南机器人行业协会
- 成立时间:2021-09-08
-
-
-
-
-
- 协会地址
- 郑州市金水路17号
-
-
- 协会邮箱
- hnqqx@126.com
-
-
- 联系方式
- 0371-65560130
-
-
-
-
-
-
-
-
-
-
-
- 河南省青年企业家协会(HeNan Young
- Entrepreneurs’Association),简称为省青企协,是全省性的青年企业家的群众组织,是共青团联系青年企业家的桥梁和纽带,是具有独立法人资格的非营利性社会团体,是中国青年企业家协会、河南省青年联合会、河南省企业联合会(河南省企业家协会)的团体会员。
-
-
-
-
-
-
-
- 会员名录
-
- 申请入会
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/service.vue b/pages/index/service.vue
index 9c7b35c..c62129a 100644
--- a/pages/index/service.vue
+++ b/pages/index/service.vue
@@ -117,7 +117,7 @@
-
@@ -261,6 +261,7 @@ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);margin-bottom: 20rpx;">
name: '已结束',
id: 3
}],
+ apiImgUrl:this.$store.state.imgUrl,
content: '',
topCurrent: 0,
actList: [],
diff --git a/pages/index/tissue.vue b/pages/index/tissue.vue
index c65cd40..90c3e65 100644
--- a/pages/index/tissue.vue
+++ b/pages/index/tissue.vue
@@ -14,212 +14,63 @@
- 会长
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
+
+ {{item.position_name}}
+
+
+
+
+
+ {{v.nikename}}
+
+
+
+
+ 暂无
+
+
+
+
-
- 名誉会长
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
- 副会长
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
- 秘书长
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
- 副秘书长
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
- 理事
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
- 会员
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
-
-
-
-
- 朱荣梅
-
-
-
-
-
-
Please enable JavaScript to continue.