123

2024-05-08 18:14:41 +08:00 · 2024-05-08 18:14:41 +08:00 · 759a154a26
parent e91c93896b
commit 759a154a26
204 changed files with 5237 additions and 4507 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
--- a/.idea/UniappTool.xml
+++ b/.idea/UniappTool.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
-    <option name="basePath" value="$PROJECT_DIR$" />
-    <option name="generalBasePath" value="$PROJECT_DIR$" />
-    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
-    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
-    <option name="scanNum" value="1" />
-    <option name="type" value="store" />
-    <option name="uniapp" value="true" />
-    <option name="vueVersion" value="2" />
-  </component>
-</project>
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <excludedPredefinedLibrary name="uni-api" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/云商会.iml" filepath="$PROJECT_DIR$/.idea/云商会.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.idea/云商会.iml
+++ b/.idea/云商会.iml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/App.vue
+++ b/App.vue
@ -2,11 +2,13 @@
 	import Vue from 'vue'
 	import store from './store/index.js'
 	import updateCustomBarInfo from './tuniao-ui/libs/function/updateCustomBarInfo.js'
-
+	import {
+		UserLogin
+	} from '@/util/api.js';
 	export default {
 		onLaunch: function() {
 			var Gid = uni.getStorageSync('Gid');
-      if(Gid){
+			if (Gid) {
 				store.commit('$tStore', {
 					name: 'Gid',
 					value: Gid
@ -91,6 +93,54 @@
 			// console.log('App Hide')
 		},
 		methods: {
+			getUserLogin(returnA) {
+				uni.getProvider({
+					service: 'oauth',
+					success: function(res) {
+						console.log(res)
+						if (~res.provider.indexOf('weixin')) {
+							uni.login({
+								provider: "weixin",
+								success: function(loginRes) {
+									UserLogin({
+											code: loginRes.code
+										})
+										.then(response => {
+											console.log(response);
+											if (response.code == 1) {
+												console.log();
+												if (typeof(response.data.id) == 'undefined') {
+													uni.setStorageSync('openid', response.data
+														.openid);
+												} else {
+													uni.setStorageSync('uid', response.data
+														.id);
+												}
+
+											} else {
+												uni.showToast({
+													icon: 'none',
+													title: response.msg,
+													duration: 2000
+												});
+											}
+											//returnA(response);
+										})
+										.catch(error => {
+											uni.showToast({
+												icon: 'none',
+												title: error,
+												duration: 2000
+											});
+										});
+								}
+							});
+						} else {
+							console.log(123);
+						}
+					}
+				});
+			},
 			addWidthToImages(html) {
 				// 匹配并更新已有 style 属性的 img 标签
 				html = html.replace(/(<img\b[^>]*\bstyle\s*=\s*['"])([^'"]*)(['"][^>]*>)/g,
--- a/manifest.json
+++ b/manifest.json
@ -1,28 +1,28 @@
 {
-	"name": "智慧云商协",
-	"appid": "__UNI__F702B81",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
+    "name" : "智慧云商协",
+    "appid" : "__UNI__F702B81",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
    /* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
        },
        /* 模块配置 */
-		"modules": {},
+        "modules" : {},
        /* 应用发布信息 */
-		"distribute": {
+        "distribute" : {
            /* android打包配置 */
-			"android": {
-				"permissions": [
+            "android" : {
+                "permissions" : [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -41,54 +41,54 @@
                ]
            },
            /* ios打包配置 */
-			"ios": {},
+            "ios" : {},
            /* SDK配置 */
-			"sdkConfigs": {
-				"share": {}
+            "sdkConfigs" : {
+                "share" : {}
            }
        }
    },
    /* 快应用特有相关 */
-	"quickapp": {},
+    "quickapp" : {},
    /* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxabc0f954cce7fe56",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true
+    "mp-weixin" : {
+        "appid" : "wx51c40ff1c6337652",
+        "setting" : {
+            "urlCheck" : true,
+            "minified" : true,
+            "postcss" : true
        },
-		"usingComponents": true
+        "usingComponents" : true
    },
-	"mp-alipay": {
-		"usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
    },
-	"mp-baidu": {
-		"usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
    },
-	"mp-toutiao": {
-		"usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
    },
-	"uniStatistics": {
-		"enable": false
+    "uniStatistics" : {
+        "enable" : false
    },
-	"vueVersion": "2",
-	"h5": {
-		"router": {
-			"base": ""
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : ""
        },
-		"template": "",
-		"devServer": {
-			"port": 80,
-			"https": false,
-			"disableHostCheck": true,
-			"proxy": {
-				"/api": {
-					"target": "http://192.168.3.130", //域名
-					"changeOrigin": true,
-					"secure": false,
-					"pathRewrite": {
-						"^/api": "/api"
+        "template" : "",
+        "devServer" : {
+            "port" : 80,
+            "https" : false,
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://192.168.3.130", //域名
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/api" : "/api"
                    }
                }
            }
--- a/pages/index/directory.vue
+++ b/pages/index/directory.vue
@ -14,7 +14,8 @@
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<view class="tn-flex tn-flex-col-center tn-flex-row-between" @click="selectShow= true" style="padding: 30rpx;">
+			<view class="tn-flex tn-flex-col-center tn-flex-row-between" @click="selectShow= true"
+				style="padding: 30rpx;">
 				<view>
 					<text>{{HomeTitle}}</text>
 					<text class="tn-icon-down-triangle"></text>
@ -43,11 +44,12 @@
 							<!-- 分类内容子栏目 -->
 							<view class="tn-classify__content__sub-classify__content ">
 								<view v-for="(item,index) in list" :key="index">
-									<view
+									<view v-if="item.neirong"
 										style="font-weight: 300;;background-color: #EBF4F7;color:#4AA2EF;width: 100%;height: 60rpx;line-height: 60rpx;text-align: center;">
 										{{item.position_name}}
 									</view>
-									<view v-if="item.neirong" v-for="(v,k) in item.neirong" @click="tn('/pages/index/user_info')"
+									<view v-if="item.neirong" v-for="(v,k) in item.neirong"
+										@click="tn('/pages/index/my_card?id='+v.member_id)"
 										class="tn-classify__content__sub-classify__content__item tn-flex tn-flex-center  tn-flex-col-center">
 										<!-- 标题，有需要可以显示出来 -->
 										<view style="width: 100rpx;height: 100rpx">
@ -60,36 +62,38 @@
 												<text>{{v.nikename}}</text>
 												<text style="margin-left: 50rpx;">{{v.nation}}</text>
 											</view>
-											<view style="font-size: 24rpx;margin-top: 10rpx;">
+											<view class="tn-text-ellipsis-2"
+												style="font-size: 24rpx;margin-top: 10rpx;">
 												<text>{{v.enterprise_Introduction}}</text>
 											</view>
 										</view>
 									</view>
-                  <view v-if="!item.neirong" style="text-align: center;padding: 20rpx">
+								</view>
+								<view v-if="list.length==0" style="text-align: center;padding: 20rpx">
 									暂无
 								</view>
 							</view>
-
-							</view>
 						</view>
 					</block>
 				</scroll-view>
 			</view>
 		</view>
-<!--		<view @click="tn('/pages/index/apply_in')" style="line-height: 40rpx;text-align: center;position: fixed;bottom:15%;right: 20rpx;width: 120rpx;height: 120rpx;border-radius: 50%;background: linear-gradient(270deg, #EE7E45, #EE9657);-->
-<!--box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
-<!--			<view style="color: #fff;letter-spacing: 2rpx;padding: 20rpx;font-size: 32rpx;">申请入会-->
-<!--			</view>-->
-<!--		</view>-->
+		<!--		<view @click="tn('/pages/index/apply_in')" style="line-height: 40rpx;text-align: center;position: fixed;bottom:15%;right: 20rpx;width: 120rpx;height: 120rpx;border-radius: 50%;background: linear-gradient(270deg, #EE7E45, #EE9657);-->
+		<!--box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
+		<!--			<view style="color: #fff;letter-spacing: 2rpx;padding: 20rpx;font-size: 32rpx;">申请入会-->
+		<!--			</view>-->
+		<!--		</view>-->
 		<tn-select v-model="selectShow" mode="single" :list="selectList" @confirm="confirm"></tn-select>
 	</view>
 </template>

 <script>
-import {
-  addressList, associationIndex, newIndustryIndex
-} from '@/util/api.js';
-import store from "@/store";
+	import {
+		addressList,
+		associationIndex,
+		newIndustryIndex
+	} from '@/util/api.js';
+	import store from "@/store";
 	export default {
 		data() {
 			return {
@ -108,13 +112,13 @@ import store from "@/store";
 				rightScrollViewTop: 0,
 				// 当前选中的tabbar序号
 				currentTabbarIndex: 0,
-        apiImgUrl:this.$store.state.imgUrl,
-        industry_list:[],
-        leftId:0,
-        selectShow:false,
-        HomeTitle:'',
-        selectList:[],
-        gid:store.state.Gid
+				apiImgUrl: this.$store.state.imgUrl,
+				industry_list: [],
+				leftId: 0,
+				selectShow: false,
+				HomeTitle: '',
+				selectList: [],
+				gid: store.state.Gid
 			}
 		},
 		computed: {
@ -127,7 +131,8 @@ import store from "@/store";
 						if (this.currentTabbarIndex > 0 && index === this.currentTabbarIndex - 1) {
 							clazz += ' tn-classify__tabbar__item--active--prev'
 						}
-						if (this.currentTabbarIndex < this.industry_list.length && index === this.currentTabbarIndex + 1) {
+						if (this.currentTabbarIndex < this.industry_list.length && index === this.currentTabbarIndex +
+							1) {
 							clazz += ' tn-classify__tabbar__item--active--next'
 						}
 						return clazz
@ -137,18 +142,18 @@ import store from "@/store";
 		},
 		onLoad(d) {
 			console.log(d.id);
-      if(typeof (d.id) != 'undefined'){
-          this.gid=d.id;
+			if (typeof(d.id) != 'undefined') {
+				this.gid = d.id;
 			}
 			this.getIndustryList();
 			this.getAssociationIndex();
 		},
 		methods: {
-      confirm(d){
+			confirm(d) {

 				var info = d[0];
 				this.list = [];
-        this.gid=info.value;
+				this.gid = info.value;
 				this.getAssociationIndex();
 				this.getIndustryList();
 			},
@ -175,15 +180,15 @@ import store from "@/store";
 						});
 					})
 			},
-      getIndustryList(){
+			getIndustryList() {
 				newIndustryIndex({
 						association_id: this.gid
 					})
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
-                this.industry_list=res.data;
-                this.leftId=res.data[0].id;
+						if (res.code == 1) {
+							this.industry_list = res.data;
+							this.leftId = res.data[0].id;
 							this.getAddressList();
 						}
 					})
@ -195,15 +200,15 @@ import store from "@/store";
 						});
 					})
 			},
-      getAddressList(){
+			getAddressList() {
 				addressList({
-          association_id:this.gid,
-          industry_id:this.leftId
+						association_id: this.gid,
+						industry_id: this.leftId
 					})
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
-                this.list=res.data.ret;
+						if (res.code == 1) {
+							this.list = res.data.ret;
 						}
 					})
 					.catch(error => {
@ -216,8 +221,8 @@ import store from "@/store";
 			},
 			clickClassifyNav(index) {
 				this.currentTabbarIndex = index;
-        this.leftId=this.industry_list[index].id;
-        this.list=[];
+				this.leftId = this.industry_list[index].id;
+				this.list = [];
 				this.getAddressList();
 				//this.handleLeftScrollView(index)
 				//this.switchClassifyContent();
--- a/pages/index/discovery.vue
+++ b/pages/index/discovery.vue
@ -16,17 +16,17 @@
          <swiper-item
              style="padding: 0px;border-radius: 0;">
            <view class="swiper-item image-banner"
-							:style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size: 100%;    background-repeat: no-repeat;border-radius: 0;'">
+                  :style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size:auto 100% ; background-position:center;  background-repeat: no-repeat;border-radius: 0;'">
            </view>
          </swiper-item>
        </swiper>
-				<view style="position: absolute;top: 10px;right: 10px;">
-					<view
-						style="position: relative;;width: 70rpx;height: 60rpx;background-color: rgba(255, 255, 255, 0.9);border-radius: 8rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">
-						<image src="/static/c1455.png" mode="widthFix"
-							style="width: 40rpx;position: absolute;left: 0;right: 0;margin: 0 auto;top: 15rpx;"></image>
-					</view>
-				</view>
+<!--        <view style="position: absolute;top: 10px;right: 10px;">-->
+<!--          <view-->
+<!--              style="position: relative;;width: 70rpx;height: 60rpx;background-color: rgba(255, 255, 255, 0.9);border-radius: 8rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
+<!--            <image src="/static/c1455.png" mode="widthFix"-->
+<!--                   style="width: 40rpx;position: absolute;left: 0;right: 0;margin: 0 auto;top: 15rpx;"></image>-->
+<!--          </view>-->
+<!--        </view>-->
      </view>
    </view>
    <view style="padding:20rpx 30rpx;">
@ -50,12 +50,12 @@
               style="font-weight: ;" activeColor="#000" :barWidth="50" :barHeight="6"
               :barStyle="{'background': 'linear-gradient(-45deg, #4AA2EF, #3A7FF4)','borderRadius': '4rpx'}"
               :current="current" name="name" @change="change"></tn-tabs>
-<!--			<view style="margin-top: 20rpx;position: relative;">-->
-<!--				<image src="/static/b1.png"-->
-<!--					style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
-<!--				</image>-->
-<!--				<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix"></image>-->
-<!--			</view>-->
+      <!--			<view style="margin-top: 20rpx;position: relative;">-->
+      <!--				<image src="/static/b1.png"-->
+      <!--					style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
+      <!--				</image>-->
+      <!--				<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix"></image>-->
+      <!--			</view>-->
      <view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==0">
        <div v-html="info.association_desc"></div>
      </view>
@ -67,7 +67,9 @@
      </view>
      <view style="padding: 30rpx;text-align: center; " v-if="current==1">
        <template v-for="(item, index) in architecture">
-        <tn-button backgroundColor="#E83A30" height="50rpx" width="250rpx" fontColor="#ffffff">{{item.position_name}}</tn-button>
+          <tn-button backgroundColor="#E83A30" height="50rpx" width="250rpx" fontColor="#ffffff">
+            {{item.position_name}}
+          </tn-button>
          <tn-grid align="center" col="5">
            <tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong">
              <view style="padding: 30rpx;">
@ -85,17 +87,21 @@
        </template>
      </view>
    </view>
-		<view style="position: fixed;bottom: 250rpx;width: 100%;">
-			<view class="tn-flex tn-flex-row-around">
-				<view @click="openUrl('/pages/index/directory?id='+info.id)"
-					style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50rpx;">
-					会员名录</view>
 	<view v-if="userInfo.association_id!=info.id" @click="openUrl('/pages/index/apply_in')"
-					style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50rpx;">
-					申请入会</view>
+	      style="position: fixed;bottom: 260rpx;right: 20rpx;line-height: 35rpx;color: #fff;;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50%;">
+	  <view style="padding-top: 16rpx;">申请</view>
+	  <view>入会</view>
+	</view>
+    <view style="position: fixed;bottom: 250rpx; width: 100%;">
+      <view class="tn-flex tn-flex-row-around" >
+        <view @click="openUrl('/pages/index/directory?id='+info.id)"
+              style="position: absolute; right:20rpx;color: #fff;  line-height:35rpx;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50%;">
+         <view style="padding-top: 16rpx;">会员</view> <view>名录</view>
        </view>
      </view>
    </view>
+    
+  </view>
 </template>

 <script>
@ -103,7 +109,8 @@ import {
  associationInfo, architectureList, getUserIndex,
 } from '@/util/api.js';
 import store from "@/store";
-	export default {
+
+export default {
  data() {
    return {
      topCurrent: 0,
@ -121,20 +128,20 @@ import store from "@/store";
      }],
      current: 0,
      cardCur: 0,
-        info:{},
-        apiImgUrl:this.$store.state.imgUrl,
-        architecture:[],
-        userInfo:{}
+      info: {},
+      apiImgUrl: this.$store.state.imgUrl,
+      architecture: [],
+      userInfo: {}
    }
  },
  methods: {
-      getUserInfo(){
+    getUserInfo() {
      var uid = uni.getStorageSync('uid');
-        if(uid){
-          getUserIndex({member_id:uid})
+      if (uid) {
+        getUserIndex({member_id: uid})
            .then(res => {
              console.log(res);
-                if(res.code==1){
+              if (res.code == 1) {
                this.userInfo = res.data;
              }
            })
@ -154,8 +161,8 @@ import store from "@/store";
      })
          .then(res => {
            console.log(res);
-              if(res.code==1){
-                this.architecture=res.data;
+            if (res.code == 1) {
+              this.architecture = res.data;
            }
          })
          .catch(error => {
@ -166,19 +173,19 @@ import store from "@/store";
            });
          })
    },
-      getAssociationInfo(){
+    getAssociationInfo() {
      console.log('discovery');
      associationInfo({
        association_id: store.state.Gid,
      })
          .then(res => {
            console.log(res);
-              if(res.code==1){
-                var key=res.data;
-                if(key.association_desc.indexOf("<img")!=-1){
-                  key.association_desc=getApp().addWidthToImages(key.association_desc);
+            if (res.code == 1) {
+              var key = res.data;
+              if (key.association_desc.indexOf("<img") != -1) {
+                key.association_desc = getApp().addWidthToImages(key.association_desc);
              }
-                this.info=key;
+              this.info = key;
            }
          })
          .catch(error => {
@ -196,7 +203,7 @@ import store from "@/store";
    },
    openUrl(url) {
      var uid = uni.getStorageSync('uid');
-        if(!uid){
+      if (!uid) {
        uni.showToast({
          title: '请登录！',
          icon: 'none',
@ -208,7 +215,7 @@ import store from "@/store";
        url: url
      })
    },
-      openPages(url){
+    openPages(url) {
      uni.navigateTo({
        url: url
      })
@ -217,9 +224,13 @@ import store from "@/store";
      this.current = e;
    },
  }
-	}
+}
 </script>

 <style>
 	
+.tn-flex-row-around{
+	position: relative;
+	
+}
 </style>
--- a/pages/index/event_info.vue
+++ b/pages/index/event_info.vue
@ -43,37 +43,38 @@
 				</view>
 			</view>
 		</view>
-		<view style="position: fixed;bottom: 30rpx;background-color: #ffffff;padding: 30rpx;width: 100%;">
-<!--			<view class="tn-flex tn-flex-center tn-flex-row-center tn-flex-col-center"-->
-<!--				style="background-color: #FDF2EC;text-align: center;padding: 30rpx;">-->
-<!--				<view style="font-weight: 600;">-->
-<!--					<text style="margin-right: 10rpx;">距报名结束剩<text style="color: #F73909;">119</text>天</text>-->
-<!--					<tn-count-down fontColor="#F73909" backgroundColor="#FDF2EC" :fontSize="30" :timestamp="86400"-->
-<!--						:showDays="true" :showHours="true" :showSeconds="true" :showMinutes="true"></tn-count-down>-->
-<!--				</view>-->
-<!--			</view>-->
-			<view style="text-align: center;margin-top: 30rpx;">
-				<tn-button v-if="info.type=='未开始'" backgroundColor="#F73909" height="80rpx" width="100%" fontColor="#ffffff"
-					shape="round">报名</tn-button>
-        <tn-button v-if="info.type=='已结束'||info.type=='进行中'" disabled backgroundColor="#E6E6E6" height="80rpx" width="100%" fontColor="#ffffff"
-                   shape="round">报名已结束</tn-button>
+		<view style="position: fixed;bottom: 30rpx; width: 100%;">
+			<!--			<view class="tn-flex tn-flex-center tn-flex-row-center tn-flex-col-center"-->
+			<!--				style="background-color: #FDF2EC;text-align: center;padding: 30rpx;">-->
+			<!--				<view style="font-weight: 600;">-->
+			<!--					<text style="margin-right: 10rpx;">距报名结束剩<text style="color: #F73909;">119</text>天</text>-->
+			<!--					<tn-count-down fontColor="#F73909" backgroundColor="#FDF2EC" :fontSize="30" :timestamp="86400"-->
+			<!--						:showDays="true" :showHours="true" :showSeconds="true" :showMinutes="true"></tn-count-down>-->
+			<!--				</view>-->
+			<!--			</view>-->
+			<view style="text-align: center;padding:0 30rpx;">
+				<tn-button @click="application_add" v-if="info.type=='未开始'" backgroundColor="#F73909" height="80rpx"
+					width="100%" fontColor="#ffffff" shape="round">报名</tn-button>
+				<tn-button v-if="info.type=='已结束'||info.type=='进行中'" disabled backgroundColor="#E6E6E6" height="80rpx"
+					width="100%" fontColor="#ffffff" shape="round">报名已结束</tn-button>
 			</view>
 		</view>
 	</view>
 </template>

 <script>
-import {
+	import {
 		eventInfo,
-} from '@/util/api.js';
-import store from '@/store/index.js'
+		applicationAdd
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
 	export default {
 		data() {
 			return {
 				topCurrent: 0,
 				id: 0,
-        info:{},
-        apiImgUrl:this.$store.state.imgUrl
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl
 			}
 		},
 		mounted() {
@ -99,6 +100,45 @@ import store from '@/store/index.js'
 			this.getEventInfo();
 		},
 		methods: {
+			application_add() {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					uni.showToast({
+						title: '请登录后报名！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				applicationAdd({
+						association_id: store.state.Gid,
+						member_id: uid,
+						activity_id: this.id,
+						application_time: new Date().toISOString().slice(0, 19).replace('T', ' ')
+					})
+					.then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: '报名成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
 			getEventInfo() {
 				eventInfo({
 						association_id: store.state.Gid,
@ -107,11 +147,11 @@ import store from '@/store/index.js'
 					.then(res => {
 						console.log(res);
 						if (res.code == 1) {
-                var key=res.data;
-                if(key.activity_content.indexOf("<img")!=-1){
-                  key.activity_content=getApp().addWidthToImages(key.activity_content);
+							var key = res.data;
+							if (key.activity_content.indexOf("<img") != -1) {
+								key.activity_content = getApp().addWidthToImages(key.activity_content);
 							}
-                this.info=key;
+							this.info = key;
 						}
 					})
 					.catch(error => {
--- a/pages/index/events_my.vue
+++ b/pages/index/events_my.vue
@ -7,7 +7,7 @@
 				</view>
 				<view class="tn-margin-top"
 					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
-					<tn-tabs :list="[{name:'参与活动'}]" :current="topCurrent" activeColor="#000" :bold="false"
+					<tn-tabs :list="[{name:'我参与的活动'}]" :current="topCurrent" activeColor="#000" :bold="false"
 						:fontSize="36"></tn-tabs>
 				</view>
 			</view>
@ -15,7 +15,7 @@
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<view style="padding:10px 30rpx;">
 				<view v-for="(item,index) in list" class="tn-flex tn-flex-row-between"
-					@click="openUrl('/pages/index/event_info')"
+					@click="openUrl('/pages/index/event_info?id='+item.activity_id)"
 					style="background-color: #ffffff;padding: 20rpx;border-radius: 10rpx;margin-bottom: 30rpx;box-shadow: rgba(12, 0, 5, 0.1) 0px 0px 5px 0px;">
 					<view style="position:relative;">
 						<view style="font-size: 28rpx;">{{item.activity_name}}</view>
@ -23,17 +23,18 @@
 							style="position: absolute;bottom: 0rpx;width:420rpx;color: #808080;">
 							<view>{{item.activity_start_time}}</view>
 							<view style="margin-left: 10rpx">
-								<tn-button v-if="item.type=='未开始'" padding="0px" width="100rpx" height="40rpx"
-									size="sm" backgroundColor="#6BC7F0 " fontColor="tn-color-white">未开始</tn-button>
-								<tn-button  v-if="item.type=='进行中'" padding="0px" width="100rpx" height="40rpx"
-									size="sm" backgroundColor="#EE9556 " fontColor="tn-color-white">进行中</tn-button>
+								<tn-button v-if="item.type=='未开始'" padding="0px" width="100rpx" height="40rpx" size="sm"
+									backgroundColor="#6BC7F0 " fontColor="tn-color-white">未开始</tn-button>
+								<tn-button v-if="item.type=='进行中'" padding="0px" width="100rpx" height="40rpx" size="sm"
+									backgroundColor="#EE9556 " fontColor="tn-color-white">进行中</tn-button>
 								<tn-button v-if="item.type=='已结束'" padding="0px" width="100rpx" height="40rpx" size="sm"
 									backgroundColor="#E12B33 " fontColor="tn-color-white">已结束</tn-button>
 							</view>
 						</view>
 					</view>
 					<view style="margin-left: 20rpx;">
-						<image src="/static/hd1.jpg" style="width: 200rpx;height: 135rpx;;border-radius: 10rpx;">
+						<image :src="apiImgUrl+item.activity_image"
+							style="width: 200rpx;height: 135rpx;border-radius: 10rpx;">
 						</image>
 					</view>
 				</view>
@ -43,26 +44,31 @@
 </template>

 <script>
-import {UserApplication} from "@/util/api";
-import store from "@/store";
+	import {
+		UserApplication
+	} from "@/util/api";
+	import store from "@/store";
 	export default {
 		data() {
 			return {
 				topCurrent: 0,
-        list:[]
+				list: [],
+				apiImgUrl: this.$store.state.imgUrl,
 			}
 		},
 		onLoad() {
 			var uid = uni.getStorageSync('uid');
-      this.uid=uid;
+			this.uid = uid;
 			this.getUserApplication();
 		},
 		methods: {
-      getUserApplication(){
-        UserApplication({member_id: 2})
+			getUserApplication() {
+				UserApplication({
+						member_id: 2
+					})
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
+						if (res.code == 1) {
 							this.list = res.data;
 						}
 					})
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@ -7,7 +7,7 @@
            :fontSize="36"></tn-tabs> -->
 					<view style="text-align: center;font-size: 36rpx;" @click="selectShow = true">
 						<text>{{HomeTitle}}</text>
-<!--						<image src="/static/c1455.png" style="width: 25rpx;height: 25rpx;margin-left: 10rpx;"></image>-->
+						<!--						<image src="/static/c1455.png" style="width: 25rpx;height: 25rpx;margin-left: 10rpx;"></image>-->
 					</view>
 				</view>
 			</view>
@ -29,25 +29,31 @@
 			</view>


-			<swiper class="card-swiper" :circular="true" :autoplay="true" duration="500" interval="8000"
+			<swiper class="card-swiper" current="0" :circular="true" duration="500" interval="8000"
 				@change="cardSwiper">
 				<swiper-item v-for="(item,index) in swiperList" :key="index" :class="cardCur==index?'cur':''">
 					<!-- <view class="swiper-item image-banner"
            :style="'background-image:url('+ item.url + ');background-size: cover;border-radius: 15rpx;'">
          </view> -->
-					<image :src="item.url" mode="widthFix" style="width: 100%;border-radius: 15rpx;"></image>
+					<video v-if="item.video" id="myVideo"
+						src="https://ysx.0rui.cn/uploads/20240508/b3b1cb700d9cf2ecc4e2fcc16f277b5c.mp4"
+						:controls="false" loop autoplay object-fit="contain"
+						style="width: 100%;border-radius: 15rpx;height: 167px;" @error="videoErrorCallback"></video>
+					<image v-if="!item.video" :src="item.url" mode="widthFix" style="width: 100%;border-radius: 15rpx;">
+					</image>
 				</swiper-item>
 			</swiper>
 			<view class="indication">
 				<block v-for="(item,index) in swiperList" :key="index">
 					<view class="spot" :class="cardCur==index?'active':''"></view>
 				</block>
+
 			</view>
 		</view>
 		<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"
 			style="padding:0px 30rpx 0rpx 30rpx;text-align: center;font-size: 28rpx;">
 			<view @click="openUrl('/pages/index/tissue')"
-				style="width: 25%;background: linear-gradient(270deg, #3CBAEA, #6BC7F0);;border-radius: 16rpx;padding:35rpx 20rpx;">
+				style="width: 33%;background: linear-gradient(270deg, #3CBAEA, #6BC7F0);;border-radius: 16rpx;padding:25rpx 20rpx;">
 				<view>
 					<image src="/static/c3.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">
 					</image>
@ -57,7 +63,7 @@
 				</view>
 			</view>
 			<view @click="opentab(1)"
-				style="width: 25%;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 16rpx;padding:35rpx 20rpx;margin-left:10rpx;">
+				style="width: 33%;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 16rpx;padding:25rpx 20rpx;margin-left:10rpx;">
 				<view>
 					<image src="/static/c2.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">
 					</image>
@ -67,7 +73,7 @@
 				</view>
 			</view>
 			<view @click="openUrl('/pages/index/directory')"
-				style="width: 25%;background: linear-gradient(270deg, #45B335, #89C33D);border-radius: 16rpx;padding:35rpx 20rpx;margin-left:10rpx;">
+				style="width: 33%;background: linear-gradient(270deg, #45B335, #89C33D);border-radius: 16rpx;padding:25rpx 20rpx;margin-left:10rpx;">
 				<view>
 					<image src="/static/c1.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">
 					</image>
@ -77,16 +83,16 @@
 				</view>

 			</view>
-			<view @click="openUrl('/pages/index/knowledge_list')"
-				style="width: 25%;background-image: linear-gradient(135deg, #667eea 0%, #764ba2 100%);;border-radius: 16rpx;padding:35rpx 20rpx;margin-left:10rpx;">
-				<view>
-					<image src="/static/book.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">
-					</image>
-				</view>
-				<view style="margin-top: 10rpx;">
-					<text style="color: #FFF;">商学院</text>
-				</view>
-			</view>
+			<!--			<view @click="openUrl('/pages/index/knowledge_list')"-->
+			<!--				style="width: 25%;background-image: linear-gradient(135deg, #667eea 0%, #764ba2 100%);;border-radius: 16rpx;padding:35rpx 20rpx;margin-left:10rpx;">-->
+			<!--				<view>-->
+			<!--					<image src="/static/book.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">-->
+			<!--					</image>-->
+			<!--				</view>-->
+			<!--				<view style="margin-top: 10rpx;">-->
+			<!--					<text style="color: #FFF;">商学院</text>-->
+			<!--				</view>-->
+			<!--			</view>-->
 		</view>
 		<view @click.stop="opentab(1)" class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"
 			style="padding: 30rpx;">
@ -104,8 +110,10 @@
 						<image :src="apiImgUrl+item.activity_image" style="width: 350rpx;height: 170rpx;">
 						</image>
 					</view>
-					<view style="padding:10rpx 20rpx;font-weight: 400;">
-						<view class="tn-text-ellipsis-2">{{ item.activity_name }}</view>
+					<view style="padding:10rpx 20rpx;font-weight: 400;min-height: 100rpx;">
+						<view class="tn-text-ellipsis-2" style="text-align: left;">
+							<text>{{ item.activity_name }}</text>
+						</view>
 					</view>
 					<view style="position: absolute;top: 10rpx;left: 10rpx;">
 						<tn-button v-if="item.type=='进行中'" width="80rpx" height="40rpx" size="sm"
@ -120,7 +128,8 @@
 					</view>
 				</view>
 			</scroll-view>
-      <view style="background-color: #ffffff;padding: 20rpx;text-align: center" v-if="actList.length==0">暂无活动</view>
+			<view style="background-color: #ffffff;padding: 20rpx;text-align: center" v-if="actList.length==0">暂无活动
+			</view>
 		</view>
 		<view style="background-color: #ffffff;">
 			<tn-tabs :list="goryList" :isScroll="true" :activeItemStyle="{fontSize:'35rpx',fontWeight:'600'}"
@ -131,13 +140,14 @@
 				@click="openUrl('/pages/index/new_info?id='+item.news_id)"
 				style="background-color: #ffffff;padding: 20rpx;border-radius: 10rpx;margin-bottom: 10rpx;">
 				<view style="position:relative;">
-					<view class="tn-text-ellipsis-2" style="font-size: 28rpx;">{{ item.news_title }}</view>
+					<view class="tn-text-ellipsis-2" style="font-size: 28rpx;">{{ item.news_title }}
+					</view>
 					<view class="tn-flex tn-flex-row-between"
-						style="bottom: 0rpx;width: 100%;color: #808080;padding-top: 80rpx;  min-width: 380rpx;overflow: hidden">
+						style="width: 100%;color: #808080;position: absolute; bottom: 0rpx; min-width: 380rpx;overflow: hidden">
 						<view>{{ item.name }}</view>
 						<view>
-							<text class="tn-icon-eye"></text>
-							<text>{{ item.news_hits }}</text>
+							<text class="tn-icon-eye" style="vertical-align: middle;"></text>
+							<text style="vertical-align: middle;">{{ item.news_hits }}</text>
 						</view>
 					</view>
 				</view>
@ -173,10 +183,13 @@
 				cardCur: 0,
 				isAndroid: true,
 				swiperList: [{
+					url: '/static/1fcf0b1ee9e590f5253841bf25ba60cd.mp4',
+					video: true,
+				}, {
 					url: '/static/banner.jpg',
 				}, {
 					url: '/static/banner2.jpg',
-				}],
+				}, ],
 				goryList: [],
 				news_list: [],
 				actList: [],
@ -186,10 +199,13 @@
 				gory_id: 0,
 				type: 1,
 				HomeTitle: '',
-        apiImgUrl:this.$store.state.imgUrl
+				apiImgUrl: this.$store.state.imgUrl
 			}
 		},
 		mounted() {
+			getApp().getUserLogin((r) => {
+				console.log('---Login---', r);
+			})
 			this.getNewsGoryList();
 			this.getActivityList();
 			this.getAssociationIndex();
@ -227,7 +243,13 @@
 								.Gid);
 							this.HomeTitle = foundNumber.label;
 							this.selectList = transformedSelectList;
+							//#ifdef MP-WEIXIN
 							this.$parent.childEvent(foundNumber);
+							//#endif
+							// #ifdef  H5
+							console.log('H5');
+							this.$parent.$parent.$parent.$parent.childEvent(foundNumber);
+							// #endif
 						}
 					})
 					.catch(error => {
@ -335,7 +357,13 @@
 				uni.$emit('depId', {
 					index: 1
 				})
-			}
+			},
+			videoErrorCallback: function(e) {
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
 		}
 	}
 </script>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -82,7 +82,7 @@
 				currentIndex: 0,
 				// 自定义底栏对应页面的加载情况
 				tabberPageLoadFlag: [],
-        apiImgUrl:this.$store.state.imgUrl,
+				apiImgUrl: this.$store.state.imgUrl,
 			}
 		},
 		onLoad(options) {
@ -118,9 +118,10 @@
 		},
 		methods: {
 			childEvent(data) {
+				console.log(123);
 				console.log(data);
-        this.tabbarList[2].activeIcon=this.apiImgUrl+data.icon;
-        this.tabbarList[2].inactiveIcon=this.apiImgUrl+data.icon;
+				this.tabbarList[2].activeIcon = this.apiImgUrl + data.icon;
+				this.tabbarList[2].inactiveIcon = this.apiImgUrl + data.icon;
 			},
 			wxshare() {
 				this.$wxshare({
@ -163,10 +164,15 @@
 					this.tabberPageLoadFlag[index] = true
 				}
 				this.currentIndex = index
-        if(index===2){
-          setTimeout(()=>{
+				if (index === 1) {
+					setTimeout(() => {
+						this.$refs.service.getNewInfo();
+					}, 100)
+				}
+				if (index === 2) {
+					setTimeout(() => {
 						this.$refs.discovery.getNewInfo();
-          },100)
+					}, 100)
 				}

 			}
--- a/pages/index/knowledge_list.vue
+++ b/pages/index/knowledge_list.vue
@ -1,5 +1,5 @@
 <template>
-	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;">
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;height: 100vh">
 		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
 			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
 				<view style="padding-left: 15rpx;" @click="goBack()">
@ -14,14 +14,13 @@
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 			<view style="padding:10px 30rpx;">
-				<view v-for="(item,index) in 10" class="tn-flex tn-flex-row-between"
-					@click="openUrl('/pages/index/new_info')"
+				<view v-for="(item,index) in news_list" class="tn-flex tn-flex-row-between"
+					@click="openUrl('/pages/index/new_info?id='+item.news_id)"
 					style="background-color: #ffffff;padding: 20rpx;border-radius: 10rpx;margin-bottom: 10rpx;">
 					<view style="position:relative;">
-						<view style="font-size: 28rpx;">青年企业家能力提升 计划培训班(第20期)</view>
+						<view class="tn-text-ellipsis-2" style="font-size: 28rpx;">{{item.news_title}}</view>
 						<view class="tn-flex tn-flex-row-between"
 							style="position: absolute;bottom: 0rpx;width: 100%;color: #808080;">
-							<view>河南青企协</view>
 							<view>
 								<text class="tn-icon-eye"></text>
 								<text>568</text>
@ -29,7 +28,7 @@
 						</view>
 					</view>
 					<view style="margin-left: 20rpx;">
-						<image src="/static/s1.jpg" style="width: 200rpx;height: 135rpx;;border-radius: 10rpx;">
+						<image :src="apiImgUrl+item.news_image" style="width: 200rpx;height: 135rpx;;border-radius: 10rpx;">
 						</image>
 					</view>
 				</view>
@ -39,13 +38,49 @@
 </template>

 <script>
+	import {newsList} from "@/util/api";
+  import store from "@/store";
+
  export default {
 		data() {
 			return {
-				topCurrent: 0
+				topCurrent: 0,
+        gory_id:53,
+        news_list:[],
+        apiImgUrl:this.$store.state.imgUrl,
+        page:1,
+        size:10
 			}
 		},
+    onLoad() {
+      this.getNewsList();
+    },
+    onReachBottom() {
+      this.page = this.page + 1;
+     this.getNewsList();
+    },
 		methods: {
+      getNewsList() {
+        newsList({
+          association_id: store.state.Gid,
+          gory_id: this.gory_id,
+          page: this.page,
+          size: this.size
+        })
+            .then(res => {
+              console.log(res);
+              if (res.code == 1) {
+                this.news_list.push(...res.data.ret);
+              }
+            })
+            .catch(error => {
+              uni.showToast({
+                title: error,
+                icon: 'none',
+                duration: 2000
+              });
+            })
+      },
 			openUrl(url) {
 				uni.navigateTo({
 					url: url
--- a/pages/index/my_card.vue
+++ b/pages/index/my_card.vue
@ -16,7 +16,8 @@
 		<view :style="{paddingTop: vuex_custom_bar_height +20+'px'}">
 			<view class="tn-strip-bottom">
 				<view class="slideshow">
-          <image :src="apiImgUrl+userThisInfo.photo_image" style="width: 300rpx;height: 300rpx;border-radius: 50%;"></image>
+					<image :src="apiImgUrl+userThisInfo.photo_image"
+						style="width: 300rpx;height: 300rpx;border-radius: 50%;"></image>
 				</view>
 				<view class='tn-margin'>
 					<view class="tn-text-bold">
@ -99,10 +100,12 @@
 </template>

 <script>
-import {getUserIndex} from "@/util/api";
-import store from "@/store";
+	import {
+		getUserIndex
+	} from "@/util/api";
+	import store from "@/store";

-export default {
+	export default {
 		data() {
 			return {
 				topCurrent: 0,
@ -111,7 +114,7 @@ export default {
 				userInfo: {},
 				userThisInfo: {},
 				apiImgUrl: this.$store.state.imgUrl,
-      is:false
+				is: false
 			}
 		},
 		onLoad(d) {
@ -126,25 +129,27 @@ export default {
 			return {
 				title: this.userThisInfo.nikename,
 				path: '/pages/index/my_card?id=' + this.userThisInfo.member_id,
-      imageUrl: this.apiImgUrl+this.userThisInfo.photo_image
+				imageUrl: this.apiImgUrl + this.userThisInfo.photo_image
 			}
 		},
 		methods: {
-    callPhone(){
+			callPhone() {
 				// 电话号码为示例，请替换为实际需要拨打的号码
 				const phoneNumber = this.userThisInfo.phone;
 				uni.makePhoneCall({
 					phoneNumber: phoneNumber, // 电话号码
-            success: function () {
+					success: function() {
 						console.log('拨打电话成功');
 					},
-            fail: function () {
+					fail: function() {
 						console.log('拨打电话失败');
 					}
 				});
 			},
 			getThisUserInfo() {
-      getUserIndex({member_id: this.this_uid})
+				getUserIndex({
+						member_id: this.this_uid
+					})
 					.then(res => {
 						if (res.code == 1) {
 							this.userThisInfo = res.data;
@ -159,14 +164,17 @@ export default {
 					})
 			},
 			getUserInfo() {
-      getUserIndex({member_id: this.uid})
+				getUserIndex({
+						member_id: this.this_uid
+					})
 					.then(res => {
+						console.log(res)
 						if (res.code == 1) {
+							this.userInfo = res.data;
 							if (this.this_uid != this.uid) {
 								this.getThisUserInfo();
-              }else{
-                this.is=true;
-                this.userInfo = res.data;
+							} else {
+								this.is = true;
 								this.userThisInfo = res.data;
 							}

@ -197,33 +205,33 @@ export default {
 			}

 		}
-}
+	}
 </script>

 <style lang="scss" scoped>
-.page-c {
+	.page-c {
 		background-color: #EBF4F7;
-  height: 100vh;
-}
+		min-height: 100vh;
+	}

-/* 底部安全边距 start*/
-.tn-tabbar-height {
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
 		min-height: 120rpx;
 		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
 		height: calc(140rpx + constant(safe-area-inset-bottom));
-}
+	}

-.tn-footerfixed {
+	.tn-footerfixed {
 		position: fixed;
 		width: 100%;
 		bottom: calc(180rpx + env(safe-area-inset-bottom));
 		z-index: 1024;
 		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);

-}
+	}

-/* 按钮 */
-.button-1 {
+	/* 按钮 */
+	.button-1 {
 		background-color: rgba(0, 0, 0, 0.15);
 		position: fixed;
 		/* bottom:200rpx;
@ -232,9 +240,9 @@ export default {
 		right: 30rpx;
 		z-index: 1001;
 		border-radius: 100px;
-}
+	}

-.button-2 {
+	.button-2 {
 		background-color: rgba(0, 0, 0, 0.15);
 		position: fixed;
 		/* bottom:200rpx;
@ -243,10 +251,10 @@ export default {
 		right: 30rpx;
 		z-index: 1001;
 		border-radius: 100px;
-}
+	}

-/* 图标容器15 start */
-.icon15 {
+	/* 图标容器15 start */
+	.icon15 {
 		&__item {
 			width: 30%;

@ -282,39 +290,39 @@ export default {
 				}
 			}
 		}
-}
+	}


-/* 相册 */
-.slideshow {
+	/* 相册 */
+	.slideshow {
 		overflow: hidden;
 		text-align: center;
-}
+	}


-/* 简历内容 */
-.king-list {
+	/* 简历内容 */
+	.king-list {
 		display: block;
 		// background-color: #ffffff;
-}
+	}

-.king-list .king-icon {
+	.king-list .king-icon {
 		width: 100%;
 		text-align: left;
 		padding: 20rpx 0 20rpx 37rpx;
 		font-size: 26rpx;
 		color: #888;
 		display: block;
-}
+	}

-.king-list > .king-item {
+	.king-list>.king-item {
 		padding: 30rpx 30rpx 30rpx 120rpx;
 		position: relative;
 		display: block;
 		z-index: 0;
-}
+	}

-.king-list > .king-item::after {
+	.king-list>.king-item::after {
 		content: "";
 		display: block;
 		position: absolute;
@ -324,9 +332,9 @@ export default {
 		height: 100%;
 		top: 0;
 		z-index: 8;
-}
+	}

-.king-list > .king-item::before {
+	.king-list>.king-item::before {
 		display: block;
 		position: absolute;
 		top: 36rpx;
@ -338,15 +346,15 @@ export default {
 		border: none;
 		line-height: 50rpx;
 		left: 36rpx;
-}
+	}


-/* 名片微调 */
-.img-solid {
+	/* 名片微调 */
+	.img-solid {
 		border: 1rpx solid #eee;
-}
+	}

-.share-img {
+	.share-img {
 		position: fixed;
 		/* padding: 10rpx; */
 		width: 100rpx;
@ -359,59 +367,59 @@ export default {
 		box-shadow: 0rpx 8rpx 30rpx 0rpx rgba(0, 0, 0, 0.3);
 		border: none;
 		border: 6rpx solid rgba(255, 255, 255, 0);
-}
+	}

-.resume {
+	.resume {
 		display: flex;
 		justify-content: space-between;
 		padding-top: 10rpx;
 		border-radius: 6rpx;
 		color: #666;
 		line-height: 1.6;
-}
+	}

-.resume + .resume {
+	.resume+.resume {
 		margin-top: 20rpx;
-}
+	}

-.resume2 {
+	.resume2 {
 		padding-top: 10rpx;
 		border-radius: 6rpx;
 		display: block;
 		color: #666;
 		line-height: 1.6;
 		text-align: justify;
-}
+	}

-/* 间隔线 start*/
-.tn-strip-bottom {
+	/* 间隔线 start*/
+	.tn-strip-bottom {
 		width: 100%;
 		border-bottom: 5rpx solid #ffffff;
-}
+	}

-/* 间隔线 end*/
+	/* 间隔线 end*/


-.bg-img-cont {
+	.bg-img-cont {
 		background-size: cover;
 		background-position: center;
 		background-repeat: no-repeat;
 		height: 350rpx;
 		margin: 20rpx 0;
 		border-radius: 8rpx;
-}
+	}


-// .button-no {
-//   border: none;
-//   width: 100%;
-//   height: 100%;
-//   background-color: rgba(0, 0, 0, 0);
-// }
+	// .button-no {
+	//   border: none;
+	//   width: 100%;
+	//   height: 100%;
+	//   background-color: rgba(0, 0, 0, 0);
+	// }


-/* 标签内容 start*/
-.tn-tag-content {
+	/* 标签内容 start*/
+	.tn-tag-content {
 		&__item {
 			display: inline-block;
 			line-height: 45rpx;
@ -422,16 +430,16 @@ export default {
 				padding-right: 10rpx;
 			}
 		}
-}
+	}

-/* 标签内容 end*/
+	/* 标签内容 end*/

-.see {
+	.see {
 		display: flex;
 		justify-content: space-between;
 		padding-top: 10rpx;
 		border-radius: 6rpx;
 		color: #666;
 		line-height: 1.6;
-}
+	}
 </style>
--- a/pages/index/my_desc.vue
+++ b/pages/index/my_desc.vue
@ -13,27 +13,8 @@
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<view style="padding: 30rpx;    line-height: 50rpx;">
-				<p>一、发展服务</p>
-				<p>发展服务既为个人也为企业。比如：推举会员当选政协委员、人大代表，积极参政议政；积极申请推荐会员进入市青年企业家“领航计划”班学习；组织参观会员企业学习管理；组织会员参加对外商贸考察等等。</p>
-				<p>二、政策服务</p>
-				<p>区青企协根据形势发展的需要，不定期地为会员提供各类优惠政策的指引和告知。</p>
-				<p>三、协调服务</p>
-				<p>区青企协积极为会员企业与外单位或合作企业搭建沟通的平台，互帮互助，进行工作协调。</p>
-				<p>四、宣传服务</p>
-				<p>积极利用报纸、电视、网络，宣传会员及企业的活动和正能量，例如：杰出企业家评选、关爱员工的企业家评选，企业庆典活动，员工表彰活动，剪彩挂牌活动等等，青企协都给予大力的宣传。</p>
-				<p>五、亲子服务</p>
-				<p>番禺区青企协举办一系列的亲子登山、亲子植树、亲子扶贫等等活动，和谐家庭关系，教育孩子成长。</p>
-				<p>六、文体服务</p>
-				<p>比如：组织参加文化展览，组织网球、乒乓球、羽毛球比赛，组织观看企业晚会，组织学习企业文化等等。</p>
-				<p>七、信息服务</p>
-				<p>比如：为会员企业提供积分入学、积分入户、优秀外来工评选、加入企业人才库、企业招聘等等各种信息服务。</p>
-				<p>八、社会服务</p>
-				<p>引领青年企业家热心公益，回报社会。比如：组织会员及其企业参加志愿活动、慈善爱心活动等等。</p>
-				<p>九、提醒服务</p>
-				<p>比如：每逢节假日向会员发送温馨问候的短信；遇到极端天气，向会员发出安全提醒短信等等。并且在青企协微信群里提供知识、文化、新闻方面的精神层面的服务。</p>
-				<p>十、资源共享服务</p>
-				<p>会员里面培训机构、律师、会计学校、审计机构、医生、地产商都有，资源充足，涵盖面广。番禺区青企协积极为会员排忧解难，为有需要的会员提供资源对接，谋求共同发展。</p>
+			<view style="padding: 30rpx;line-height: 50rpx;">
+			    <view v-html="info.association_guizhang"></view>
 			</view>
 		</view>

@ -41,13 +22,42 @@
 </template>

 <script>
+import {associationInfo, UserApplication} from "@/util/api";
+import store from "@/store";
 	export default {
 		data() {
 			return {
-				topCurrent: 0
+				topCurrent: 0,
+        info:{}
 			}
 		},
+    onLoad() {
+      this.getAssociationInfo();
+    },
 		methods: {
+      getAssociationInfo(){
+        console.log('discovery');
+        associationInfo({
+          association_id: store.state.Gid,
+        })
+            .then(res => {
+              console.log(res);
+              if(res.code==1){
+                var key=res.data;
+                if(key.association_guizhang.indexOf("<img")!=-1){
+                  key.association_guizhang=getApp().addWidthToImages(key.association_guizhang);
+                }
+                this.info=key;
+              }
+            })
+            .catch(error => {
+              uni.showToast({
+                title: error,
+                icon: 'none',
+                duration: 2000
+              });
+            })
+      },
 			goBack() {
 				if (getCurrentPages().length > 1) {
 					uni.navigateBack()
--- a/pages/index/my_idea.vue
+++ b/pages/index/my_idea.vue
@ -21,7 +21,7 @@
 				</view>
 			</view>
 			<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
-				<input placeholder="填写姓名" name="input" placeholder-style="color:#AAAAAA"></input>
+				<input placeholder="填写姓名" name="input" v-model="formData.name" placeholder-style="color:#AAAAAA"></input>
 			</view>
 			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
 				<view class="tn-flex justify-content-item">
@ -29,7 +29,7 @@
 				</view>
 			</view>
 			<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
-				<input placeholder="填写联系方式" name="input" placeholder-style="color:#AAAAAA"></input>
+				<input placeholder="填写联系方式"  v-model="formData.phone" name="input" placeholder-style="color:#AAAAAA"></input>
 			</view>
 			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
 				<view class="tn-flex justify-content-item">
@ -37,13 +37,13 @@
 				</view>
 			</view>
 			<view class="tn-margin tn-bg-gray--light tn-padding" style="border-radius: 10rpx;">
-				<textarea maxlength="500" placeholder="填写反馈内容" placeholder-style="color:#AAAAAA"></textarea>
+				<textarea maxlength="500" v-model="formData.content" placeholder="填写反馈内容" placeholder-style="color:#AAAAAA"></textarea>
 			</view>
 			<!-- 悬浮按钮-->
 			<view class="tn-flex tn-footerfixed">
 				<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
 					<tn-button backgroundColor="#FBBD12" fontColor="#ffffff" padding="40rpx 0" width="60%" shadow
-						fontBold @tap="upload">
+						fontBold @tap="submit">
 						<!-- <text class="tn-icon-light tn-padding-right-xs tn-color-black"></text> -->
 						<text>提 交</text>
 					</tn-button>
@ -58,17 +58,55 @@
 </template>

 <script>
+import { messageAdd} from "@/util/api";
+import store from "@/store";
 	export default {
 		data() {
 			return {
 				topCurrent: 0,
-
+        formData:{
+          name:'',
+          phone:'',
+          content:'',
+          association_id:store.state.Gid,
+          member_id:uni.getStorageSync('uid'),
+          createtime:new Date().toISOString().slice(0, 19).replace('T', ' ')
+        }
 			}
 		},
 		onLoad() {

 		},
 		methods: {
+      submit(){
+        messageAdd(this.formData)
+            .then(res => {
+              console.log(res);
+              if(res.code==1){
+                uni.showToast({
+                  title: '提交成功！',
+                  icon: 'none',
+                  duration: 2000
+                });
+                this.formData.name='';
+                this.formData.phone='';
+                this.formData.content='';
+              }else{
+                uni.showToast({
+                  title: res.msg,
+                  icon: 'none',
+                  duration: 2000
+                });
+              }
+            })
+            .catch(error => {
+              uni.showToast({
+                title: error,
+                icon: 'none',
+                duration: 2000
+              });
+            })
+      },
 			// 跳转
 			tn(e) {
 				uni.navigateTo({
--- a/pages/index/my_pizz.vue
+++ b/pages/index/my_pizz.vue
@ -30,7 +30,6 @@
 					</view>
 				</view>
 			</view>
-
 		</view>
 	</view>
 </template>
--- a/pages/index/pizz_info.vue
+++ b/pages/index/pizz_info.vue
@ -19,17 +19,17 @@
          <swiper-item
              style="padding: 0px;border-radius: 0;">
            <view class="swiper-item image-banner"
-                  :style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size: 100%;    background-repeat: no-repeat;border-radius: 0;'">
+                  :style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size: contain;  background-position:center;  background-repeat: no-repeat;border-radius: 0;'">
            </view>
          </swiper-item>
        </swiper>
-        <view style="position: absolute;top: 10px;right: 10px;">
+       <!-- <view style="position: absolute;top: 10px;right: 10px;">
          <view
              style="position: relative;;width: 70rpx;height: 60rpx;background-color: rgba(255, 255, 255, 0.9);border-radius: 8rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">
            <image src="/static/c1455.png" mode="widthFix"
                   style="width: 40rpx;position: absolute;left: 0;right: 0;margin: 0 auto;top: 15rpx;"></image>
          </view>
-        </view>
+        </view> -->
      </view>
    </view>
    <view style="padding:20rpx 30rpx;">
@ -88,15 +88,29 @@
        </template>
      </view>
    </view>
-    <view style="position: fixed;bottom: 50rpx;width: 100%;">
-      <view class="tn-flex tn-flex-row-around">
-        <view @click="openUrl('/pages/index/directory?id='+info.id)"
+   <!-- <view style="position: fixed;bottom: 50rpx;width: 100%;">
+      <view class="tn-flex tn-flex-row-around"> -->
+       <!-- <view @click="openUrl('/pages/index/directory?id='+info.id)"
              style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50rpx;">
-          会员名录</view>
-        <view v-if="userInfo.association_id!=association_id" @click="openUrl('/pages/index/apply_in')"
+          会员名录</view> -->
+		  
+     <!--   <view v-if="userInfo.association_id!=association_id" @click="openUrl('/pages/index/apply_in')"
              style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50rpx;">
-          申请入会</view>
+          申请入会</view> -->
+		  <view v-if="userInfo.association_id!=association_id" @click="openUrl('/pages/index/apply_in')"
+		        style="position: fixed;bottom: 260rpx;right: 20rpx;line-height: 35rpx;color: #fff;;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50%;">
+		    <view style="padding-top: 16rpx;">申请</view>
+		    <view>入会</view>
 		  </view>
+		  <view style="position: fixed;bottom: 250rpx; width: 100%;">
+		    <view class="tn-flex tn-flex-row-around" >
+		      <view @click="openUrl('/pages/index/directory?id='+info.id)"
+		            style="position: absolute; right:20rpx;color: #fff;  line-height:35rpx;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50%;">
+		       <view style="padding-top: 16rpx;">会员</view> <view>名录</view>
+		      </view>
+		    </view>
+		  </view>
+      <!-- </view> -->
    </view>
  </view>
 </template>
--- a/pages/index/service.vue
+++ b/pages/index/service.vue
@ -43,7 +43,8 @@
          <text class="tn-icon-down-triangle"></text>
        </view>
      </view> -->
-			<tn-tabs :list="tabList" :isScroll="false" :current="current" name="name" @change="tabChange" activeColor="#3668FC"></tn-tabs>
+      <tn-tabs :list="tabList" :isScroll="false" :current="current" name="name" @change="tabChange"
+               activeColor="#3668FC"></tn-tabs>
      <!-- <view style="padding: 30rpx;">
        <view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between"
          style="text-align: center;padding: 30rpx;background-color: #FFF;border-radius: 20rpx;">
@ -114,7 +115,7 @@
        <tn-grid align="left" :col="2">
          <block v-for="(item,index) in actList">
            <tn-grid-item style="width:50%">
-							<view @click="openUrl('/pages/index/event_info')"
+              <view @click="openUrl('/pages/index/event_info?id='+item.id)"
                    style="margin-bottom: 30rpx;background-color: #FFF;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);position: relative;display: inline-block;width: 350rpx;text-align: center;border-radius: 20rpx;overflow: hidden;">
                <view>
                  <image :src="apiImgUrl+item.activity_image"
@ -122,24 +123,29 @@
                  </image>
                </view>
                <view style="padding:10rpx 20rpx;font-weight: 400;">
-									<view class="tn-text-ellipsis">{{item.activity_name}}</view>
+                  <view class="tn-text-ellipsis "style="text-align: left;">{{ item.activity_name }}</view>
                  <view class="tn-flex tn-flex-row-between"
                        style="font-size: 24rpx;color:#808080;padding: 15rpx 0rpx;">
-										<!-- <view>{{item.name}}</view>
                    <view>
-											<text class="tn-icon-eye"></text>
-											<text style="margin-left: 5rpx;">{{item.eye}}</text>
-										</view> -->
+                      <text v-if="item.activity_type==1">线下活动</text>
+                      <text v-if="item.activity_type==2">调查问卷</text>
+                      <text v-if="item.activity_type==3">公益捐赠</text>
+                      <text v-if="item.activity_type==4">学习培训</text>
+                    </view>
+<!--                    <view>-->
+<!--                      <text class="tn-icon-eye"></text>-->
+<!--                      <text style="margin-left: 5rpx;">{{item.eye}}</text>-->
+<!--                    </view>-->
                  </view>
                </view>
-								<view style="position: absolute;top: 10rpx;left: 10rpx;">
-									<tn-button v-if="item.is==0" padding="0" width="80rpx" height="40rpx" size="sm"
-										backgroundColor="#6BC7F0 " fontColor="tn-color-white">报名中</tn-button>
-									<tn-button v-if="item.is==1" padding="0" width="80rpx" height="40rpx" size="sm"
-										backgroundColor="#EE9556 " fontColor="tn-color-white">预告</tn-button>
-									<tn-button v-if="item.is==2" padding="0" width="80rpx" height="40rpx" size="sm"
-										backgroundColor="#E12B33 " fontColor="tn-color-white">进行中</tn-button>
-								</view>
+                <!--								<view style="position: absolute;top: 10rpx;left: 10rpx;">-->
+                <!--									<tn-button v-if="item.is==0" padding="0" width="80rpx" height="40rpx" size="sm"-->
+                <!--										backgroundColor="#6BC7F0 " fontColor="tn-color-white">报名中</tn-button>-->
+                <!--									<tn-button v-if="item.is==1" padding="0" width="80rpx" height="40rpx" size="sm"-->
+                <!--										backgroundColor="#EE9556 " fontColor="tn-color-white">预告</tn-button>-->
+                <!--									<tn-button v-if="item.is==2" padding="0" width="80rpx" height="40rpx" size="sm"-->
+                <!--										backgroundColor="#E12B33 " fontColor="tn-color-white">进行中</tn-button>-->
+                <!--								</view>-->
              </view>
            </tn-grid-item>
          </block>
@ -241,50 +247,55 @@ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);margin-bottom: 20rpx;">
 </template>

 <script>
-	import {
+import {
  activityIndex,
-	} from '@/util/api.js';
-	import store from '@/store/index.js'
+} from '@/util/api.js';
+import store from '@/store/index.js'

-	export default {
+export default {
  data() {
+    //1.线下活动2.调查问卷3.公益捐赠4.学习培训
    return {
      current: 0,
-        load_status:'loading ',
+      load_status: 'loading ',
      tabList: [{
-					name: '进行中',
+        name: '全部',
+        id: 0
+      }, {
+        name: '线下活动',
        id: 1
      }, {
-					name: '未开始',
+        name: '调查问卷',
        id: 2
      }, {
-					name: '已结束',
+        name: '公益捐赠',
        id: 3
+      }, {
+        name: '学习培训',
+        id: 4
      }],
-        apiImgUrl:this.$store.state.imgUrl,
+      apiImgUrl: this.$store.state.imgUrl,
      content: '',
      topCurrent: 0,
      actList: [],
      page: 1,
-				tabType: 1,
    }
  },
  mounted() {

-			this.getActivityIndex();
+   // this.getActivityIndex();
  },
  methods: {
-      onsubmit(){
-        this.page=1;
-        this.actList=[];
+    onsubmit() {
+      this.page = 1;
+      this.actList = [];
      this.getActivityIndex();
    },
    tabChange(d) {
      console.log(d);
-        this.current=d;
-        this.page=1;
-        this.actList=[];
-				this.tabType = this.tabList[d].id;
+      this.current = d;
+      this.page = 1;
+      this.actList = [];
      this.getActivityIndex();
    },
    ReachBottom() {
@ -293,20 +304,27 @@ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);margin-bottom: 20rpx;">
      this.getActivityIndex();
      //this.getIndex();
    },
+    getNewInfo(){
+      this.current = 0;
+      this.page = 1;
+      this.actList = [];
+      this.getActivityIndex();
+    },
    getActivityIndex() {
+      var type=this.tabList[this.current].id;
      activityIndex({
        association_id: store.state.Gid,
-						type: this.tabType,
        page: this.page,
        size: 10,
-          activity_name:this.content
+        activity_name: this.content,
+        activity_type:type
      })
          .then(res => {
            console.log(res);
            if (res.code == 1) {
-							this.actList.push(... res.data.ret);
-						}else{
-              this.load_status='nomore';
+              this.actList.push(...res.data.ret);
+            } else {
+              this.load_status = 'nomore';
            }
          })
          .catch(error => {
@ -322,7 +340,7 @@ box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);margin-bottom: 20rpx;">
      })
    }
  }
-	}
+}
 </script>

 <style lang="scss" scoped>
--- a/pages/index/tissue.vue
+++ b/pages/index/tissue.vue
@ -1,5 +1,5 @@
 <template>
-	<view style="letter-spacing: 1rpx;">
+	<view style="letter-spacing: 1rpx;background-color: #F2F2F2;min-height: 100vh;">
 		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
 			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
 				<view style="padding-left: 15rpx;" @click="goBack()">
@ -12,14 +12,21 @@
 				</view>
 			</view>
 		</tn-nav-bar>
-		<view :style="{paddingTop: vuex_custom_bar_height+ 'px'}">
-			<view style="padding: 30rpx;text-align: center;">
+		<view :style="{paddingTop: vuex_custom_bar_height+ 'px',}">
+			<view style="position: fixed;width: 100%;background-color: #F2F2F2;z-index: 1;">
+				<tn-tabs :list="list" :isScroll="false" :current="current" name="name" activeColor="#000000"
+					:activeItemStyle="{backgroundColor:'#ffffff'}" :showBar='false' @change="change"></tn-tabs>
+			</view>
+			<view style="padding: 30rpx;text-align: center;padding-top: 94rpx;">
 				<template v-for="(item, index) in architecture">
-          <tn-button backgroundColor="#E83A30" height="50rpx" width="250rpx" fontColor="#ffffff">{{item.position_name}}</tn-button>
-          <tn-grid align="center" col="5">
-            <tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong">
+					<tn-button backgroundColor="#ffffff" height="50rpx"
+						fontColor="#000000">{{item.position_name}}</tn-button>
+					<tn-grid align="center" col="5" hoverClass="none">
+						<tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong"
+							@click="openInfo('/pages/index/my_card?id='+v.member_id)">
 							<view style="padding: 30rpx;">
-                <image :src="apiImgUrl+v.photo_image" style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+								<image :src="apiImgUrl+v.photo_image"
+									style="width: 100rpx;height: 100rpx;border-radius: 50%;">
 								</image>
 								<view>{{v.nikename}}</view>
 							</view>
@ -38,29 +45,44 @@
 </template>

 <script>
-	import {architectureList} from "@/util/api";
+	import {
+		architectureList
+	} from "@/util/api";
 	import store from "@/store";

 	export default {
 		data() {
 			return {
 				topCurrent: 0,
-        architecture:[],
-        apiImgUrl:this.$store.state.imgUrl,
+				architecture: [],
+				apiImgUrl: this.$store.state.imgUrl,
+				current: 0,
+				list: [{
+					name: '理事会'
+				}, {
+					name: '监事会'
+				}],
+				type: 1
 			}
 		},
-    onLoad() {
+		onLoad(d) {
 			this.getArchitectureList();
 		},
 		methods: {
+			openInfo(u) {
+				uni.navigateTo({
+					url: u
+				})
+			},
 			getArchitectureList() {
 				architectureList({
 						association_id: store.state.Gid,
+						type: this.type,
 					})
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
-                this.architecture=res.data;
+						if (res.code == 1) {
+							this.architecture = res.data;
 						}
 					})
 					.catch(error => {
@ -80,6 +102,11 @@
 					})

 				}
+			},
+			change(index) {
+				this.current = index;
+				this.type = index + 1;
+				this.getArchitectureList();
 			}
 		}
 	}
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@ -4,29 +4,30 @@
 			style="background: linear-gradient(50deg, #034EF9 0%, #05ACFF 99%);height: 400rpx;">

 			<view class="tn-flex tn-flex-center tn-flex-col-center" style="padding: 30rpx;width: 100%;">
-				<view  v-if="login" >
-					<image :src="apiImgUrl+userInfo.photo_image" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+				<view v-if="login">
+					<image :src="apiImgUrl+userInfo.photo_image"
+						style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
 				</view>
-        <view  v-if="!login" >
+				<view v-if="!login">
 					<image src="/static/def.png" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
 				</view>
 				<view style="width: 100%;">
 					<view v-if="login" class="tn-flex tn-flex-col-center tn-flex-row-between">
 						<view style="margin-left: 20rpx;color: #fff">
-							<view style="font-size: 35rpx;">{{userInfo.nikename}}</view>
+							<view style="font-size: 35rpx;">{{ userInfo.nikename }}</view>
 							<view style="font-size: 24rpx;margin-top: 10rpx;" v-if="userInfo.status==1">接口返回商会+职位</view>
 						</view>
-<!--						<view @click="tn('/pages/index/my_edit')">-->
-<!--							<image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>-->
-<!--						</view>-->
+						<!--						<view @click="tn('/pages/index/my_edit')">-->
+						<!--							<image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>-->
+						<!--						</view>-->
 					</view>
 					<view v-if="!login" class="tn-flex tn-flex-col-center tn-flex-row-between">
 						<view style="margin-left: 20rpx;color: #fff">
 							<tn-button @click="loginMod = true">点击登陆</tn-button>
 						</view>
-<!--            <view @click="tn('/pages/index/my_edit')">-->
-<!--              <image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>-->
-<!--            </view>-->
+						<!--            <view @click="tn('/pages/index/my_edit')">-->
+						<!--              <image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>-->
+						<!--            </view>-->
 					</view>
 				</view>
 			</view>
@ -71,42 +72,43 @@
 			</view>
 			<view style="background-color: #fff;">
 				<view style="padding:0px 20rpx;">
-<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_pizz')">-->
-<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
-<!--							<image src="/static/ico7.png" style="width: 50rpx;height: 50rpx"></image>-->
-<!--							<view style="margin-left: 20rpx;">所在商/协会</view>-->
-<!--						</view>-->
-<!--					</tn-list-cell>-->
+					<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_pizz')">-->
+					<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
+					<!--							<image src="/static/ico7.png" style="width: 50rpx;height: 50rpx"></image>-->
+					<!--							<view style="margin-left: 20rpx;">所在商/协会</view>-->
+					<!--						</view>-->
+					<!--					</tn-list-cell>-->
 					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_apply')">
 						<view class="tn-flex tn-flex-center tn-flex-col-center">
 							<image src="/static/ico8.png" style="width: 50rpx;height: 50rpx"></image>
 							<view style="margin-left: 20rpx;">入会申请记录</view>
 						</view>
 					</tn-list-cell>
-					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_msg')">
-						<view class="tn-flex tn-flex-center tn-flex-col-center">
-							<image src="/static/ico9.png" style="width: 50rpx;height: 50rpx"></image>
-							<view style="margin-left: 20rpx;">我的消息</view>
-						</view>
-					</tn-list-cell>
-					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_assist')">
-						<view class="tn-flex tn-flex-center tn-flex-col-center">
-							<image src="/static/ico10.png" style="width: 50rpx;height: 50rpx"></image>
-							<view style="margin-left: 20rpx;">常见问题</view>
-						</view>
-					</tn-list-cell>
-					<!-- <tn-list-cell :arrow="true" @click="tn('/pages/index/my_settings')">
-						<view class="tn-flex tn-flex-center tn-flex-col-center">
-							<image src="/static/ico11.png" style="width: 50rpx;height: 50rpx"></image>
-							<view style="margin-left: 20rpx;">设置</view>
-						</view>
-					</tn-list-cell> -->
+					<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_msg')">-->
+					<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
+					<!--							<image src="/static/ico9.png" style="width: 50rpx;height: 50rpx"></image>-->
+					<!--							<view style="margin-left: 20rpx;">我的消息</view>-->
+					<!--						</view>-->
+					<!--					</tn-list-cell>-->
+					<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_assist')">-->
+					<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
+					<!--							<image src="/static/ico10.png" style="width: 50rpx;height: 50rpx"></image>-->
+					<!--							<view style="margin-left: 20rpx;">常见问题</view>-->
+					<!--						</view>-->
+					<!--					</tn-list-cell>-->
+
 					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_idea')">
 						<view class="tn-flex tn-flex-center tn-flex-col-center">
 							<image src="/static/ico12.png" style="width: 50rpx;height: 50rpx"></image>
 							<view style="margin-left: 20rpx;">意见反馈</view>
 						</view>
 					</tn-list-cell>
+					<tn-list-cell :arrow="true" @click="loginAut">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico11.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">退出帐号</view>
+						</view>
+					</tn-list-cell>
 				</view>
 			</view>
 		</view>
@ -116,15 +118,18 @@
 				<view class="text">
 					<tn-form ref="form" :labelWidth="120">
 						<tn-form-item label="手机号" prop="phone">
-              <tn-input v-model="loginData.phone"/>
+							<tn-input v-model="loginData.phone" />
 						</tn-form-item>
 						<tn-form-item label="密码" prop="password">
-              <tn-input v-model="loginData.password" type="password"/>
+							<tn-input v-model="loginData.password" type="password" />
 						</tn-form-item>
 					</tn-form>
 					<view style="text-align: center;margin-top: 30rpx;">
-            <tn-button backgroundColor="#E6E6E6" fontColor="#ffffff" @click="loginMod = false">取消</tn-button>
-            <tn-button backgroundColor="tn-bg-blue" fontColor="tn-color-white" style="margin-left: 30rpx" @click="submitLogin">确定</tn-button>
+						<tn-button backgroundColor="#E6E6E6" fontColor="#ffffff"
+							@click="loginMod = false">取消</tn-button>
+						<tn-button backgroundColor="tn-bg-blue" fontColor="tn-color-white" style="margin-left: 30rpx"
+							@click="submitLogin">确定
+						</tn-button>
 					</view>
 				</view>
 			</view>
@ -133,38 +138,45 @@
 </template>

 <script>
-import {getUserIndex, loginDo} from "@/util/api";
+	import {
+		getUserIndex,
+		loginDo
+	} from "@/util/api";
 	import store from "@/store";

 	export default {
 		data() {
 			return {
 				topCurrent: 0,
-        login:false,
-        loginMod:false,
-        userInfo:{},
-        apiImgUrl:this.$store.state.imgUrl,
-        loginData:{
-          phone:'',
-          password:'',
-          association_id:store.state.Gid
+				login: false,
+				loginMod: false,
+				userInfo: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				loginData: {
+					openid: '',
+					phone: '',
+					password: '',
+					association_id: store.state.Gid
 				},
 			}
 		},
 		mounted() {
 			var uid = uni.getStorageSync('uid');
-      if(uid){
+			console.log(uid);
+			if (uid) {
 				this.getUserInfo(uid);
 			}
 		},
 		methods: {
-      getUserInfo(uid){
-        getUserIndex({member_id:uid})
+			getUserInfo(uid) {
+				getUserIndex({
+						member_id: uid
+					})
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
+						if (res.code == 1) {
 							this.userInfo = res.data;
-                this.login=true;
+							this.login = true;
 						}
 					})
 					.catch(error => {
@ -175,20 +187,27 @@ import {getUserIndex, loginDo} from "@/util/api";
 						});
 					})
 			},
-      submitLogin(){
+			submitLogin() {
+				this.loginData.openid = uni.getStorageSync('openid');
 				loginDo(this.loginData)
 					.then(res => {
 						console.log(res);
-              if(res.code==1){
+						if (res.code == 1) {
 							uni.showToast({
 								title: '登陆成功！',
 								icon: 'none',
 								duration: 2000
 							});
-                uni.setStorageSync('uid', res.data.member_id);
+							uni.setStorageSync('uid', res.data.id);
 							this.userInfo = res.data;
-                this.login=true;
-                this.loginMod=false;
+							this.login = true;
+							this.loginMod = false;
+						} else {
+							uni.showToast({
+								title: '帐号或密码错误！',
+								icon: 'none',
+								duration: 2000
+							});
 						}
 					})
 					.catch(error => {
@ -199,10 +218,23 @@ import {getUserIndex, loginDo} from "@/util/api";
 						});
 					})
 			},
+			loginAut() {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要退出吗？',
+					success: function(res) {
+						if (res.confirm) {
+							uni.removeStorageSync('uid');
+							that.login = false;
+						}
+					}
+				});
+			},
 			tn(e) {
 				var uid = uni.getStorageSync('uid');
-        if(!uid){
-          this.loginMod=true;
+				if (!uid) {
+					this.loginMod = true;
 					return;
 				}
 				uni.navigateTo({
--- a/static/123.png
+++ b/static/123.png
--- a/static/c1.jpg
+++ b/static/c1.jpg
--- a/static/h6.jpg
+++ b/static/h6.jpg
--- a/static/h7.jpg
+++ b/static/h7.jpg
--- a/static/h8.jpg
+++ b/static/h8.jpg
--- a/static/hd1.jpg
+++ b/static/hd1.jpg
--- a/static/hd2.jpg
+++ b/static/hd2.jpg
--- a/static/hd3.jpg
+++ b/static/hd3.jpg
--- a/static/hd4.jpg
+++ b/static/hd4.jpg
--- a/static/hd5.jpg
+++ b/static/hd5.jpg
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/s1.jpg
+++ b/static/s1.jpg
--- a/static/ser.png
+++ b/static/ser.png
--- a/static/t7.jpg
+++ b/static/t7.jpg
--- a/static/u1.jpg
+++ b/static/u1.jpg
--- a/static/u2.jpg
+++ b/static/u2.jpg
--- a/static/x1.jpg
+++ b/static/x1.jpg
--- a/static/x2.png
+++ b/static/x2.png
--- a/static/x3.png
+++ b/static/x3.png
--- a/static/x4.png
+++ b/static/x4.png
--- a/static/x5.png
+++ b/static/x5.png
--- a/store/index.js
+++ b/store/index.js
@ -47,8 +47,10 @@ const store = new Vuex.Store({
 		// 自定义导航栏的高度
 		vuex_custom_bar_height: 0,
 		Gid: 1,
-		imgUrl: "http://192.168.3.130",
-		apiUrl: "http://192.168.3.130/api"
+		// imgUrl: "http://192.168.3.130",
+		// apiUrl: "http://192.168.3.130/api"
+		imgUrl: "https://ysx.0rui.cn",
+		apiUrl: "https://ysx.0rui.cn/api"
 	},
 	mutations: {
 		$tStore(state, payload) {
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/apply_in.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/apply_in.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/directory.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/directory.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/discovery.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/discovery.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/enter_in.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/enter_in.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/event_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/event_info.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_info.js.map
@ -1 +0,0 @@
-{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,oBAAI,CAAC,C","file":"pages/index/events_info.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/index/events_info.vue'\ncreatePage(Page)"],"sourceRoot":""}
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_list.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_list.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_my.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/events_my.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_info.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_list.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_list.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_my.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/goods_my.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/home.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/home.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/knowledge_list.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/knowledge_list.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_apply.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_apply.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_assist.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_assist.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_card.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_card.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_desc.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_desc.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_edit.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_edit.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_idea.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_idea.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_msg.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_msg.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_pizz.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_pizz.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_settings.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/my_settings.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/new_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/new_info.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pizz.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pizz.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pizz_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/pizz_info.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/search.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/search.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/service.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/service.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/tissue.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/tissue.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/user.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/user.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/user_info.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/user_info.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-badge/tn-badge.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-badge/tn-badge.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-button/tn-button.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-button/tn-button.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-calendar/tn-calendar.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-calendar/tn-calendar.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-checkbox/tn-checkbox.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-checkbox/tn-checkbox.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-column-notice/tn-column-notice.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-column-notice/tn-column-notice.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-form-item/tn-form-item.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-form-item/tn-form-item.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-form/tn-form.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-form/tn-form.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-grid-item/tn-grid-item.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-grid-item/tn-grid-item.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-grid/tn-grid.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-grid/tn-grid.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-image-upload-drag/tn-image-upload-drag.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-image-upload-drag/tn-image-upload-drag.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-image-upload/tn-image-upload.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-image-upload/tn-image-upload.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-input/tn-input.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-input/tn-input.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-line-progress/tn-line-progress.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-line-progress/tn-line-progress.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-list-cell/tn-list-cell.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-list-cell/tn-list-cell.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-load-more/tn-load-more.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-load-more/tn-load-more.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-loading/tn-loading.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-loading/tn-loading.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-modal/tn-modal.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-modal/tn-modal.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-nav-bar/tn-nav-bar.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-nav-bar/tn-nav-bar.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-notice-bar/tn-notice-bar.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-notice-bar/tn-notice-bar.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-popup/tn-popup.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-popup/tn-popup.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-radio-group/tn-radio-group.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-radio-group/tn-radio-group.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-radio/tn-radio.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/tuniao-ui/components/tn-radio/tn-radio.js.map
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,oBAAI,CAAC,C","file":"pages/index/events_info.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/index/events_info.vue'\ncreatePage(Page)"],"sourceRoot":""}