ソースを参照

调整字体样式添加导航

sakura 1 年間 前
コミット
b822dada86

+ 11 - 18
pages.json

@@ -301,17 +301,6 @@
             }
             
         }
-        ,{
-            "path" : "pages/school/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "希望小学",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        
         ,{
             "path" : "pages/school/library/library",
             "style" :                                                                                    
@@ -413,7 +402,16 @@
         		"enablePullDownRefresh" : false,
 				"navigationStyle": "custom"
         	}
-        }
+        },
+		{
+			"path" : "pages/school/index/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "爱心捐赠",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
+		}
         
     ],
 	"globalStyle": {
@@ -446,12 +444,7 @@
 				"iconPath": "static/images/ftmenu3.png",
 				"selectedIconPath": "static/images/ftmenu3.png"
 			},
-			{
-				"pagePath": "pages/school/index/index",
-				"text": "爱心地",
-				"iconPath": "static/images/ftmenu4.png",
-				"selectedIconPath": "static/images/ftmenu4.png"
-			},
+			
 			{
 				"pagePath": "pages/home/myhome",
 				"text": "我的",

+ 5 - 5
pages/home/detail/detail.scss

@@ -70,12 +70,12 @@
 					.time_yuyue2{		
 						
 						width: 100%;
-						padding: 0px 0px 20px 20px;
+						padding: 0px 0px 0 20px;
 						font-size: 14px;
 						color: #666666;
 						display: flex;
 									  						
-						 height: 60px;
+						
 									  	.ico{
 									  				  							 padding-top: 2px;
 									  				  							 flex:0 0 20px;
@@ -85,7 +85,7 @@
 			  						 					 							 
 			  						  flex:0 0 90%;
 			  						 text-align: left;
-									 height: 80px;
+									 // height: 80px;
 			  						 }
 			  }
 			  
@@ -98,7 +98,7 @@
 			    font-size: 12px;
 			    font-weight: bold;
 			    margin-bottom: 15px;
-				margin-top: -60px;
+				margin-top: -10px;
 				margin-left: 25px;
 			}
 			
@@ -107,7 +107,7 @@
 			    display: flex; /* 启用 flexbox */
 			    align-items: center; /* 垂直居中对齐所有子元素 */
 			    flex: 0 0 70%; /* 固定宽度 */
-			    height: 80px;
+			    // height: 80px;
 			    text-align: left; /* 保持文本靠右对齐 */
 			}
 			  

+ 9 - 8
pages/home/detail/detail.vue

@@ -20,11 +20,11 @@
 					</view>
 					<view class="time">日期:{{eventsInfo.eventsDate}} 时间:{{eventsInfo.eventTime}}</view>
 				</view>
-				<view class="time_yuyue2">
-					<view class="ico">
+				<view class="time_yuyue2" @click="onOpenMap">
+					<view class="ico" >
 						<image src="/static/images/daohang.png" style="width: 16px; height: 16px;"></image>
 					</view>
-					<view class="didian">{{eventsInfo.address}}</view>
+					<view >{{eventsInfo.address}}</view>
 					
 				</view>
 				<view class="kefu">
@@ -108,8 +108,8 @@
 				</view>
 			</view>
 		</view>
-		<map id="map" ref="map" style="display: none;" v-if="info && info.id>0" :show-location="true"
-			:latitude="info.latitude" :longitude="info.longitude"></map>
+		<map id="map" ref="map" style="display: none;" v-if="eventsInfo && eventsInfo.id>0" :show-location="true"
+			:latitude="eventsInfo.latitude" :longitude="eventsInfo.longitude"></map>
 	</view>
 </template>
 
@@ -249,12 +249,13 @@
 				});
 			},
 			onOpenMap(e) {
+				console.log(112);
 				let _this = this;
 				_this._mapContext = uni.createMapContext("map", _this);
 				_this._mapContext.openMapApp({
-					longitude: parseFloat(_this.info.longitude),
-					latitude: parseFloat(_this.info.latitude),
-					destination: _this.info.address,
+					longitude: parseFloat(31.20393719991159),//_this.eventsInfo.longitude
+					latitude: parseFloat(121.43760859966278),//_this.eventsInfo.latitude
+					destination: _this.eventsInfo.address,
 					success: (res) => {
 						console.log("success");
 					},

+ 312 - 275
pages/home/myhome.vue

@@ -1,72 +1,109 @@
 <template>
-   <view class="container">
-	    <page-top-bar  />
-	   <view class="container">
-		   <view class="banner"><img src="https://business.coffunity.cn/uploads/banner.webp" style="width: 100%;"></img></view>
-		   <view class="person_info">
-			   <view class="avatar"><img :src="userInfo.avatar"></img></view>
-			   <view class="info">
-			   <view class="name">{{truncateString(userInfo.nickname, 10) }}</view>
-			   <view class="setup">
-				   <view class="vi" ><button hover-class="none" open-type="contact" style="background: none; color: white; font-size:13px;"><img src="/static/images/kefu.png" style="width: 24px; height: 23px;"></img></button></view>
-			   <view @click="onViewBind" class="vi"><img src="/static/images/shezhi.png" style="width: 24px; height: 24px;"></img></view>
-			   </view>
-			   <view class="tel"> <view class="ico"><img src="/static/images/mobile.png" style="width: 11px; height: 11px;"></img></view><view class="telnmu"  @click="onViewBind" v-if="userInfo.mobile">{{userInfo.mobile}}</view><view class="telnmu" @click="onViewBind" v-else>请绑定手机</view> </view>
-			   </view>
-			   <view class="section1">
-				   <view class="column"  @click="onViewCalendar"><view class="cell"><img src="/static/images/yuyue.png" style="width: 49px; height: 46px;"></img></view><view class="cell">预 约</view></view>
-				   <view class="column" @click="onViewhd"><view class="cell" ><img src="/static/images/huodong_da.png" style="width: 46px; height: 46px;"></img></view><view class="cell">活 动</view></view>
-				   <view class="column" @click="onVieworder"><view class="cell" ><img src="/static/images/dingdan.png" style="width: 60px; height: 45px;"></img></view><view class="cell">订 单</view></view>
-				   <view class="column"><view class="cell"><img src="/static/images/aixin.png" style="width: 60px; height: 44px;"></img></view><view class="cell">爱心捐赠</view></view>
-			   </view>
-			   <view class="section2">
-				   
-				   <view class="row"><view class="menu" @click="onViewaddress">
-						
-						<view class="name"><uni-icons type="right" size="16"></uni-icons>我的收货地址</view>
-					</view></view>
-				    <view class="row"><view class="menu" @click="onViewCalendar">
-						
-						<view class="name"><uni-icons type="right" size="16"></uni-icons>我的预约行程</view>
-					</view></view>
-					 <view class="row">
-	<view class="menu" @click="onViewEquity">
-					
-						<view class="name">	<uni-icons type="right" size="16"></uni-icons>我的卡券</view>
-					</view></view>
-					  <view class="row"><view class="menu" @click="onOpenRenew">
-						
-						<view class="name"><uni-icons type="right" size="16"></uni-icons>成为会员</view>
-					</view></view>
-					<view class="row" style="margin-top: -10px;">
-						
-						<button  open-type= "share" style="background: none; " hover-class="none"><uni-icons type="right" size="16"></uni-icons>分享小程序</button>
+	<view class="container">
+		<page-top-bar />
+		<view class="container">
+			<view class="banner"><img src="https://business.coffunity.cn/uploads/banner.webp"
+					style="width: 100%;"></img></view>
+			<view class="person_info">
+				<view class="avatar"><img :src="userInfo.avatar"></img></view>
+				<view class="info">
+					<view class="name">{{truncateString(userInfo.nickname, 10) }}</view>
+					<view class="setup">
+						<view class="vi"><button hover-class="none" open-type="contact"
+								style="background: none; color: white; font-size:13px;"><img
+									src="/static/images/kefu.png" style="width: 24px; height: 23px;"></img></button>
+						</view>
+						<view @click="onViewBind" class="vi"><img src="/static/images/shezhi.png"
+								style="width: 24px; height: 24px;"></img></view>
 					</view>
-			   </view>
-			   
-			   
-		   </view>
-		   
-	   </view>
-	   <!-- 续费 -->
-	   <uni-popup ref="showRenewForm">
-	   	<RenewForm :leveList="leveList"  @onCloseRenew="onCloseRenew"/>
-	   </uni-popup>
-	   	
-	   <!-- vip表单 -->
-	   <uni-popup ref="vipForm">
-	   	<VipForm :userInfo="userInfo"   @onOpenRenew="onOpenRenew"/>
-	   </uni-popup>
-	   
-	   <!-- 号外号外 -->
-	   <uni-popup ref="hwPopForm" type="center" style="z-index: 60;">
-	   	 <SoundForm :dataList="movieList"></SoundForm>
-	   </uni-popup>
-	   <page-btm-bar :active="5" />
-	  
-   </view>
-   
-   
+					<view class="tel">
+						<view class="ico"><img src="/static/images/mobile.png" style="width: 11px; height: 11px;"></img>
+						</view>
+						<view class="telnmu" @click="onViewBind" v-if="userInfo.mobile">{{userInfo.mobile}}</view>
+						<view class="telnmu" @click="onViewBind" v-else>请绑定手机</view>
+					</view>
+				</view>
+				<view class="section1">
+					<view class="column" @click="onViewCalendar">
+						<view class="cell"><img src="/static/images/yuyue.png" style="width: 49px; height: 46px;"></img>
+						</view>
+						<view class="cell">预 约</view>
+					</view>
+					<view class="column" @click="onViewhd">
+						<view class="cell"><img src="/static/images/huodong_da.png"
+								style="width: 46px; height: 46px;"></img></view>
+						<view class="cell">活 动</view>
+					</view>
+					<view class="column" @click="onVieworder">
+						<view class="cell"><img src="/static/images/dingdan.png"
+								style="width: 60px; height: 45px;"></img></view>
+						<view class="cell">订 单</view>
+					</view>
+					<view class="column" @click="goSchool">
+						<view class="cell"><img src="/static/images/aixin.png" style="width: 60px; height: 44px;"></img>
+						</view>
+						<view class="cell">爱心捐赠</view>
+					</view>
+				</view>
+				<view class="section2">
+
+					<view class="row">
+						<view class="menu" @click="onViewaddress">
+
+							<view class="name"><uni-icons type="right" size="16"></uni-icons>我的收货地址</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="menu" @click="onViewCalendar">
+
+							<view class="name"><uni-icons type="right" size="16"></uni-icons>我的预约行程</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="menu" @click="onViewEquity">
+
+							<view class="name"> <uni-icons type="right" size="16"></uni-icons>我的卡券</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="menu" @click="onOpenRenew">
+
+							<view class="name"><uni-icons type="right" size="16"></uni-icons>成为会员</view>
+						</view>
+					</view>
+					<view class="row" style="margin-top: 10px;padding-top: 0;">
+							<!-- <view class="menu" >
+							
+								<view class="name"><uni-icons type="right" size="16"></uni-icons>分享小程序</view>
+							</view> -->
+						<button open-type="share" style="background: none;color: rgb(51, 51, 51);font-size: 17px; font-weight: normal;" hover-class="none"><uni-icons type="right"
+								size="16"></uni-icons>分享小程序</button>
+					</view>
+				</view>
+
+
+			</view>
+
+		</view>
+		<!-- 续费 -->
+		<uni-popup ref="showRenewForm">
+			<RenewForm :leveList="leveList" @onCloseRenew="onCloseRenew" />
+		</uni-popup>
+
+		<!-- vip表单 -->
+		<uni-popup ref="vipForm">
+			<VipForm :userInfo="userInfo" @onOpenRenew="onOpenRenew" />
+		</uni-popup>
+
+		<!-- 号外号外 -->
+		<uni-popup ref="hwPopForm" type="center" style="z-index: 60;">
+			<SoundForm :dataList="movieList"></SoundForm>
+		</uni-popup>
+		<page-btm-bar :active="5" />
+
+	</view>
+
+
 </template>
 <script>
 	import audio from '../../diy/audio.vue';
@@ -77,7 +114,7 @@
 	import VipForm from '@/components/VipForm/VipForm.vue'
 	import RenewForm from '@/components/RenewForm/RenewForm.vue'
 	import SoundForm from '@/components/SoundForm/SoundForm.vue'
- 	import {
+	import {
 		mapState,
 		mapMutations
 	} from 'vuex'
@@ -98,37 +135,37 @@
 				loading: true,
 				windowHeight: 0,
 				is_template: false,
-				is_popup: 1, 
-				params:[],
-				paramsList:[],
-				movieList:[],
+				is_popup: 1,
+				params: [],
+				paramsList: [],
+				movieList: [],
 				dialogBtnType: 2,
 				dialogBtnStyle: {
-				    color: '#fff',
-				    backgroundColor: 'red',
+					color: '#fff',
+					backgroundColor: 'red',
 				},
-				is_coupon:true,			
-			    cityCode: '', 
-				showMoreMenu:false,
-				
-				leveList:[],
+				is_coupon: true,
+				cityCode: '',
+				showMoreMenu: false,
+
+				leveList: [],
 			}
 		},
-       
-		 onLoad() { 
-			
-			    
-			     
+
+		onLoad() {
+
+
+
 			// #ifdef MP-ALIPAY
 			this.$scope.onBeforeGetCoupon = this.onBeforeGetCoupon.bind(this)
 			this.$scope.onGetCouponSuccess = this.onGetCouponSuccess.bind(this)
 			this.$scope.onGetCouponFail = this.onGetCouponFail.bind(this)
 			this.$scope.onUseImmediately = this.onUseImmediately.bind(this)
-			this.$scope.onClose = this.onClose.bind(this)	
+			this.$scope.onClose = this.onClose.bind(this)
 			// #endif
 			uni.hideTabBar();
 			if (this.$store.state.store_id) {
-				 this.http();
+				this.http();
 				// #ifdef MP-ALIPAY
 				this.getCouponList();
 				// #endif
@@ -137,9 +174,9 @@
 				if (this.$store.state.systemInfo.set.is_pop != 0) {
 					let is_pop = this.$store.state.systemInfo.set.is_pop;
 					this.can_popup(is_pop);
-					    // is_pop == 2 ? this.Coupons() :
-						// is_pop == 1 ? this.homePop(1) :
-						// is_pop == 3 ? this.homePop(3) : '';
+					// is_pop == 2 ? this.Coupons() :
+					// is_pop == 1 ? this.homePop(1) :
+					// is_pop == 3 ? this.homePop(3) : '';
 				}
 			}
 			uni.getSystemInfo({
@@ -147,40 +184,40 @@
 					this.windowHeight = e.windowHeight;
 				}
 			})
-			
-			
+
+
 		},
 
-		
-			//分享小程序
-			onShareAppMessage() {
-			    const promise = new Promise(resolve => {
-			      setTimeout(() => {
-			        resolve({
-			          title: this.systemInfo.title,
-					  imageUrl:this.detail.image[0],
-					  path: '/pages/home/home',
-			        })
-			      }, 2000)
-			    })
-			    return {
-			      title: this.systemInfo.title,
-				  imageUrl:this.detail.image[0],
-			      path: '/pages/home/home',
-			      promise 
-			    }
-			},
-
-		
-		
- 
+
+		//分享小程序
+		onShareAppMessage() {
+			const promise = new Promise(resolve => {
+				setTimeout(() => {
+					resolve({
+						title: this.systemInfo.title,
+						imageUrl: this.detail.image[0],
+						path: '/pages/home/home',
+					})
+				}, 2000)
+			})
+			return {
+				title: this.systemInfo.title,
+				imageUrl: this.detail.image[0],
+				path: '/pages/home/home',
+				promise
+			}
+		},
+
+
+
+
 		onShow() {
 			if (getApp().globalData.runMethod) {
-			    this.onOpenRenew();
-			    // 清除全局数据,以便下次不会再执行
-			    getApp().globalData.runMethod = false;
-			  }
-			uni.hideTabBar(); 
+				this.onOpenRenew();
+				// 清除全局数据,以便下次不会再执行
+				getApp().globalData.runMethod = false;
+			}
+			uni.hideTabBar();
 			this.$store.dispatch('getOpenid', this.store_id);
 			this.getOnLineList();
 			this.initVipPackage();
@@ -272,8 +309,8 @@
 		onShareAppMessage(e) {
 			return {}
 		},
-		
-		
+
+
 
 		onHide() {
 			this.$store.commit('SET_REFRESH', true)
@@ -284,231 +321,231 @@
 		},
 
 		onShareTimeline() {
-			return{
-				title:this.systemInfo.title,
-				imageUrl:this.URL+this.systemInfo.thumb,
+			return {
+				title: this.systemInfo.title,
+				imageUrl: this.URL + this.systemInfo.thumb,
 			}
 		},
 
 		methods: {
 			...mapMutations(['SET_COUPON', 'SET_AUDIO', 'SET_SWIPER']),
-			 onBeforeGetCoupon(resultList) {
-			  return this.params
-			},
-			
-			initInfo(){
-    let _this=this;
-    _this.$http.request('account/getInfo', {  
-        id:_this.userInfo.id,                     
-    }, "", "", true).then(res => { 
-        // Set default values for userInfo.nickname and userInfo.avatar
-        this.userInfo = {
-            nickname: '微信用户',
-            avatar: 'https://business.coffunity.cn/upload/default-avatar.jpg'
-        };
-        // Only update userInfo.nickname if nickname from server is not empty
-        if (res.data.nickname && res.data.nickname.trim() !== '') {
-            this.userInfo.nickname = res.data.nickname;
-        }
-        // Only update userInfo.avatar if avatar from server is not 'https://business.coffunity.cn'
-        if (res.data.avatar && res.data.avatar.trim() !== 'https://business.coffunity.cn') {
-            this.userInfo.avatar = res.data.avatar;
-        }
-        // other code...
-    }).catch(err => {})
-},
-			onMyFav(){
+			onBeforeGetCoupon(resultList) {
+				return this.params
+			},
+
+			initInfo() {
+				let _this = this;
+				_this.$http.request('account/getInfo', {
+					id: _this.userInfo.id,
+				}, "", "", true).then(res => {
+					// Set default values for userInfo.nickname and userInfo.avatar
+					this.userInfo = {
+						nickname: '微信用户',
+						avatar: 'https://business.coffunity.cn/upload/default-avatar.jpg'
+					};
+					// Only update userInfo.nickname if nickname from server is not empty
+					if (res.data.nickname && res.data.nickname.trim() !== '') {
+						this.userInfo.nickname = res.data.nickname;
+					}
+					// Only update userInfo.avatar if avatar from server is not 'https://business.coffunity.cn'
+					if (res.data.avatar && res.data.avatar.trim() !== 'https://business.coffunity.cn') {
+						this.userInfo.avatar = res.data.avatar;
+					}
+					// other code...
+				}).catch(err => {})
+			},
+			onMyFav() {
 				console.log("myfav");
 			},
-			
-			
-			onCloseRenew(e){
+
+
+			onCloseRenew(e) {
 				this.$refs.showRenewForm.close();
 			},
-			
-			
-			onViewZc(e){
+			goSchool() {
+				console.log(112);
 				uni.navigateTo({
-					url:'/pages/theater/movie/movie?id='+e.id,
+					url: '/pages/school/index/index',
 				})
 			},
-			
-			onViewhd(){
-				console.log(112);
+			onViewZc(e) {
+				uni.navigateTo({
+					url: '/pages/theater/movie/movie?id=' + e.id,
+				})
+			},
+
+			onViewhd() {
 				uni.switchTab({
-					url:'/pages/theater/index/index',
+					url: '/pages/theater/index/index',
 				})
 			},
-			
-			onVieworder(){
+
+			onVieworder() {
 				uni.navigateTo({
-					url:'/pages/myOrderList/myOrderList',
+					url: '/pages/myOrderList/myOrderList',
 				})
 			},
-			
-			onViewBind(e){
+
+			onViewBind(e) {
 				uni.navigateTo({
-					url:'/pages/user-detail/user-detail'
+					url: '/pages/user-detail/user-detail'
 				})
 			},
-			 truncateString(str, maxLength) {
-			      return //str.length > maxLength ? str.substring(0, maxLength)+'...' : str;
-			    },
-			initVipPackage(){
-				let _this=this; 
-				_this.$http.request('account/getLevelList', { 
-				}, "", "", true).then(res => {
-					 
-					_this.leveList=res.data; 
-					 
+			truncateString(str, maxLength) {
+				return //str.length > maxLength ? str.substring(0, maxLength)+'...' : str;
+			},
+			initVipPackage() {
+				let _this = this;
+				_this.$http.request('account/getLevelList', {}, "", "", true).then(res => {
+
+					_this.leveList = res.data;
+
 				}).catch(err => {})
 			},
-			
+
 			//获取线上影片
-			getOnLineList(){
-				let _this=this; 
-				_this.$http.request('zc/home', { 
-				}, "", "", true).then(res => { 
-					_this.movieList=res.data; 
+			getOnLineList() {
+				let _this = this;
+				_this.$http.request('zc/home', {}, "", "", true).then(res => {
+					_this.movieList = res.data;
 				}).catch(err => {})
 			},
-			
-			
-			
-			onOpenWindows(){
+
+
+
+			onOpenWindows() {
 				uni.navigateTo({
-					url:'/pages/Center/Center'
+					url: '/pages/Center/Center'
 				})
 			},
-			
-			onOpenVip(e){
-				this.$refs.vipForm.open('center'); 
+
+			onOpenVip(e) {
+				this.$refs.vipForm.open('center');
 			},
-			
+
 			//打开收音机
-			onOpenHw(e){ 
+			onOpenHw(e) {
 				this.$refs.hwPopForm.open('center');
 			},
-			
-			onOpenRenew(e){
-				this.$refs.vipForm.close(); 
+
+			onOpenRenew(e) {
+				this.$refs.vipForm.close();
 				this.$refs.showRenewForm.open("bottom");
-			}, 
-			
-			onShowMoreMenu(){
-			    this.showMoreMenu = !this.showMoreMenu;
-			  },
-			  onOverlayTap() {
-			    this.showMoreMenu = false;
-			  },
-			
-			onViewCalendar(e){
+			},
+
+			onShowMoreMenu() {
+				this.showMoreMenu = !this.showMoreMenu;
+			},
+			onOverlayTap() {
+				this.showMoreMenu = false;
+			},
+
+			onViewCalendar(e) {
 				uni.navigateTo({
-					url:'/pages/my-calendar/my-calendar',
+					url: '/pages/my-calendar/my-calendar',
 				})
 			},
-			onViewTheater(e){
+			onViewTheater(e) {
 				uni.switchTab({
-					url:'/pages/theater/index/index'
+					url: '/pages/theater/index/index'
 				})
 			},
-			
-			onViewCoffee(e){
+
+			onViewCoffee(e) {
 				uni.switchTab({
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
-			
-			onViewFitness(e){
+
+			onViewFitness(e) {
 				uni.switchTab({
-					url:'/pages/fitness/index/index'
+					url: '/pages/fitness/index/index'
 				})
 			},
-			onViewSchool(e){
+			onViewSchool(e) {
 				uni.switchTab({
-					url:'/pages/school/index/index',
+					url: '/pages/school/index/index',
 				})
 			},
-			onViewLibary(e){
+			onViewLibary(e) {
 				uni.navigateTo({
-					url:'/pages/school/library/library',
+					url: '/pages/school/library/library',
 				})
 			},
-			
-			onViewEquity(e){
+
+			onViewEquity(e) {
 				uni.navigateTo({
-					url:'/pages/equity/equity',
+					url: '/pages/equity/equity',
 				})
 			},
-			
-			onViewaddress(e){
-				
+
+			onViewaddress(e) {
+
 				uni.navigateTo({
-					url:'/pages/address/address',
+					url: '/pages/address/address',
 				})
 			},
-		 
-          // 领券请求 成功调用的事件,领券结果可能成功也可能失败。
-			onGetCouponSuccess(resultList) { 
-			  this.getResultList(resultList);
-		      this.is_coupon = false;
+
+			// 领券请求 成功调用的事件,领券结果可能成功也可能失败。
+			onGetCouponSuccess(resultList) {
+				this.getResultList(resultList);
+				this.is_coupon = false;
 			},
 			onGetCouponFail(result) {
 
 			},
 			// 点击 立即使用 按钮触发的事件,前提是设置了 dialogBtnType 值为 2。
 			onUseImmediately() {
-			  this.paramsList=[];
-			  uni.switchTab({
-			    url: '/pages/index/index',
-			  })
+				this.paramsList = [];
+				uni.switchTab({
+					url: '/pages/index/index',
+				})
 			},
-			
+
 			onClose() {
-			  this.paramsList=[];
-			},
-			
-			getResultList(resultList){
-				let arr=[];
-				for(let i of resultList){
-					 arr.push({
-						activityId:i.activityId,
-						voucherCode:i.voucherCode
-					 })  
+				this.paramsList = [];
+			},
+
+			getResultList(resultList) {
+				let arr = [];
+				for (let i of resultList) {
+					arr.push({
+						activityId: i.activityId,
+						voucherCode: i.voucherCode
+					})
 				}
 				// console.log(JSON.stringify(arr),"arr")
 				this.$http.request('oil/successcode', {
-					activityArr:JSON.stringify(arr),
-					user_id:this.userInfo.id,
+					activityArr: JSON.stringify(arr),
+					user_id: this.userInfo.id,
 					store_id: this.store_id,
-				  }, "", true, true).then(res => {
-				})
+				}, "", true, true).then(res => {})
 			},
-			
-			getCouponList(){
+
+			getCouponList() {
 				this.$http.request('oil/couponlist', {
 					store_id: this.store_id,
-					user_id:this.userInfo.id,
-					page:1,
-					limit:100,
+					user_id: this.userInfo.id,
+					page: 1,
+					limit: 100,
 				}, "", true, true).then(res => {
-					  this.paramsList = res.data;
-					  if(res.data.length>0){
-						 for(let i of res.data){
-							  // MERCHANT_UPLOAD 非劵码
-							  // MERCHANT_API  导码
-							  this.params.push({
-								  activityId:i.activity_id,
-								  outBizNo:i.content.out_biz_no,
-								  customizeSendTime:i.content.publish_end_time,
-								  voucherCode:i.voucherCode
-							  })  
-						 }
-					  }
-					  // console.log(this.params,"this.params")
+					this.paramsList = res.data;
+					if (res.data.length > 0) {
+						for (let i of res.data) {
+							// MERCHANT_UPLOAD 非劵码
+							// MERCHANT_API  导码
+							this.params.push({
+								activityId: i.activity_id,
+								outBizNo: i.content.out_biz_no,
+								customizeSendTime: i.content.publish_end_time,
+								voucherCode: i.voucherCode
+							})
+						}
+					}
+					// console.log(this.params,"this.params")
 				})
 			},
-			
+
 			// 是否弹窗	
 			can_popup(type) {
 				let couponList = [];
@@ -523,7 +560,7 @@
 					}
 				})
 			},
-	
+
 			Coupons() {
 				let couponList = [];
 				this.$http.request('xcx/home_pop_up', {
@@ -539,12 +576,12 @@
 							if (couponList.length > 0) {
 								this.$refs.popup.open();
 								this.popup_log();
-							} 
+							}
 						}
 					};
 				})
 			},
-			
+
 			// 获取语音||轮播图
 			homePop(type) {
 				this.$http.request('xcx/home_pop_up', {
@@ -572,7 +609,7 @@
 					}
 				})
 			},
-			
+
 			popup_log() {
 				this.$http.request('xcx/popup_log', {
 					store_id: this.store_id,
@@ -608,7 +645,7 @@
 					}
 				})
 			},
-			
+
 		}
 	}
 </script>

+ 2 - 2
pages/school/index/index.vue

@@ -60,7 +60,7 @@
 		<uni-popup ref="popKey">
 			<DonateKeyForm :info="donateInfo" :storeId="store_id" @onSuccess="onSuccess"></DonateKeyForm>
 		</uni-popup>
-		<page-btm-bar :active="4" />
+		<!-- <page-btm-bar :active="4" /> -->
 	</view>
 </template>
 
@@ -99,7 +99,7 @@
 			
 			onHome(e){
 				uni.switchTab({
-					url:'/pages/home/home'
+					url:'/pages/theater/index/index'
 				})
 			},
 			

+ 3 - 2
pages/theater/movie/movie.vue

@@ -44,11 +44,11 @@
 							</view>
 						
 						</block>
-						<view class="part">
+						<view class="part" @click="onOpenMap">
 							<view class="icon">
 								<uni-icons custom-prefix="custom-icon" type="location" size="20" color="#bd3c3c"></uni-icons>
 							</view>
-							<view class="text" @click="onOpenMap">
+							<view class="text" >
 								地点:{{info.address}}
 							</view>
 						</view>
@@ -315,6 +315,7 @@
 			}, 
 			onOpenMap(e){
 			  let _this=this; 
+			  console.log(_this.info);
 			  _this._mapContext = uni.createMapContext("map", _this); 
 			  _this._mapContext.openMapApp({
 				  longitude:parseFloat(_this.info.longitude),