修复bug

common.scss

@@ -81,6 +81,10 @@
                     font-size: 32rpx;
                     color: #fff;
                     padding-top: 11rpx;
+					width: 380rpx;
+					overflow:hidden; //超出的文本隐藏
+					text-overflow:ellipsis; //溢出用省略号显示
+					white-space:nowrap; //溢出不换行
                 }
                 .date {
                     padding: 25rpx 0 19rpx;
@@ -97,9 +101,28 @@
 						flex-shrink: 0;
                     }
                 }
+                .emil {
+                    padding: 25rpx 0 19rpx;
+                    display: flex;
+                    align-items: center;
+      //               &::before {
+      //                   content: '';
+      //                   display: block;
+      //                   background: url('@/static/image/cart/timeIcon.png') no-repeat;
+      //                   background-size: 100% 100%;
+      //                   width: 24rpx;
+      //                   height: 24rpx;
+      //                   margin-right: 10rpx;
+						// flex-shrink: 0;
+      //               }
+                }
                 .address {
                     display: flex;
                     align-items: center;
+					width: 360rpx;
+					overflow:hidden; //超出的文本隐藏
+					text-overflow:ellipsis; //溢出用省略号显示
+					white-space:nowrap; //溢出不换行
                     &::before {
                         content: '';
                         display: block;

components/active/active-item.vue

@@ -107,6 +107,10 @@
 							font-size: 32rpx;
 							color: #fff;
 							padding-top: 11rpx;
+							width: 380rpx;
+							overflow:hidden; //超出的文本隐藏
+							text-overflow:ellipsis; //溢出用省略号显示
+							white-space:nowrap; //溢出不换行
 						}
 
 						.date {
@@ -128,6 +132,10 @@
 						.address {
 							display: flex;
 							align-items: center;
+							width: 360rpx;
+							overflow:hidden; //超出的文本隐藏
+							text-overflow:ellipsis; //溢出用省略号显示
+							white-space:nowrap; //溢出不换行
 
 							&::before {
 								content: '';

components/cart/CardList.vue

@@ -27,7 +27,7 @@
 				class="mini-btn" size="mini">取消活动</button>
 
 				<button @click.stop="skip(item,1)" 
-				v-if="item.state == 1 && item.type == 0" 
+				v-if="item.state == 1" 
 				:style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
 				class="mini-btn" size="mini">活动签到</button>
 

components/travel/travelList.vue

@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<view class="info cardStyle_"
+		v-for="(item, index) in cardListData" 
+		:key="index" @click="toDetail(item)">
+		    <view class="left">
+		        <image :src="item.image" alt="">
+		    </view>
+		    <view class="right">
+		        <view class="detailed">
+		            <view class="title">{{item.title}}</view>
+		            <view class="date">{{item.startTime}}</view>
+		            <view class="address">{{item.address}}</view>
+		        </view>
+		        <view class="data">
+		            <text>¥{{item.price}}</text>
+		            <text>{{item.num}}/{{item.sum}}</text>
+		            <text class="btn" v-if="item.state == 0">报名中</text>
+					<text class="btn-2" v-if="item.state == 1">已结束</text>
+		        </view>
+		    </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"travelList",
+		props : ['cardListData'],
+		data() {
+			return {
+				
+			};
+		},
+		methods : {
+			toDetail({ id }) {
+				uni.navigateTo({
+					url:`/pages_order/lvyou-detail?travelId=${id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.info {
+	position: relative;
+	margin: 20rpx 0;
+	padding: 35rpx 0 35rpx 24rpx;
+	border-radius: 26rpx;
+	.right {
+		.data {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.btn {
+				background: #381615;
+				color: $uni-color-primary;
+				padding: 10rpx 40rpx;
+				border-radius: 30rpx 0px 0px 30rpx;
+			}
+			.btn-2 {
+				background: #333;
+				color: #999;
+				padding: 10rpx 40rpx;
+				border-radius: 30rpx 0px 0px 30rpx;
+			}
+		}
+	}
+}
+</style>

components/zhaomu/zlx-item.vue

@@ -12,7 +12,8 @@
 				</view>
 				<view class="price" v-if="showBottom">
 					<view class="num-box">{{ item.doNum }}/{{ item.num }}</view>
-					<view class="btn-box" @click="qiandaoClick">开始签到</view>
+					<view class="btn-box" @click="qiandaoClick"
+					>开始签到</view>
 					<!-- <view class="btn-box jieshu-btn" v-else>已结束</view> -->
 				</view>
 			</view>

config.js

@@ -7,15 +7,14 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
-		// baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
-		// baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
+		// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
+		baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
 	},
 	prod : {
 		// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "vtrip",
-    "appid" : "__UNI__53D8233",
+    "appid" : "__UNI__197A38F",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/center.vue

@@ -123,7 +123,7 @@
 						src:require('@/static/image/center/line-7.png'),
 						name:'主理人签到',
 						url:'/pages_my/zlx-qiandao',
-						// role : true,
+						role : true,
 					}
 				],
 				vipType : ['普通会员', '黄金会员', '渠道商'],

pages/index/index.vue

@@ -74,7 +74,8 @@
 					itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"
 				></uv-tabs>
 				
-				<active-item :cardListData="cardListData"/>
+				<active-item :cardListData="cardListData" v-if="params.state != 2"/>
+				<travelList :cardListData="travelList" v-else/>
 				<uv-load-more :status="status" fontSize="24rpx" dashed line />
 			</view>
 		
@@ -122,11 +123,13 @@
 	// import Position from '@/utils/position.js'
 	import tabber from '@/components/base/tabbar.vue'
 	import activeItem from '@/components/active/active-item.vue'
+	import travelList from '@/components/travel/travelList.vue'
 	import { mapState } from 'vuex'
 	export default {
 		components:{
 			tabber,
-			activeItem
+			activeItem,
+			travelList,
 		},
 		data() {
 			return {
@@ -145,10 +148,12 @@
 				hdList: [
 					{ id: 0, name: '近期活动' },
 					{ id: 1, name: '往期活动' },
+					{ id: 2, name: '旅行' },
 				],
 				lineBg: require('@/static/image/cart/tabIcon.png'),
 				cardListData: [],
 				city : '定位中',
+				travelList : [],
 			}
 		},
 		onPageScroll(e) {
@@ -185,9 +190,7 @@
 			}
 		},
 		onPullDownRefresh() {
-			this.params.pageNo = 1
-			this.cardListData = []
-			this.getActivityPageList()
+			this.search()
 		},
 		methods:{
 			getLocationDetail(){
@@ -199,9 +202,10 @@
 			search() {
 				this.params.pageNo = 1
 				this.cardListData = []
+				this.travelList = []
 				this.getActivityPageList()
 			},
-			getActivityPageList() {
+			async getActivityPageList() {
 				this.$api('activityPageList', {
 					...this.params,
 					cityId : this.selectArea.id
@@ -217,6 +221,36 @@
 						}
 					}
 				})
+				this.$api('travelPageList', {
+					// ...this.params,
+					pageNo: this.params.pageNo,
+					pageSize: this.params.pageSize,
+					title: this.params.title,
+				}, res=>{
+					uni.stopPullDownRefresh()
+					if(res.code == 200) {
+						this.totalPage = res.result.pages
+						this.travelList = [...this.travelList,...res.result.records]
+					}
+				})
+				
+				// let list1 = await this.getApi('activityPageList')
+				// let list2 = await this.getApi('travelPageList')
+				
+				// console.log(list1, list2);
+				
+			},
+			getApi(api){
+				return new Promise((success, error) => {
+					this.$api(api, {
+						...this.params,
+						cityId : this.selectArea.id
+					}, res => {
+						if(res.code == 200) {
+							success(res.result.records)
+						}
+					})
+				})
 			},
 			getBanner() {
 				this.$api('banner',res=>{
@@ -226,10 +260,8 @@
 				})
 			},
 			tabs(val) {
-				this.params.pageNo = 1
-				this.cardListData = []
 				this.params.state = val.id
-				this.getActivityPageList()
+				this.search()
 			},
 			skip(val) {
 				if(!val) {

pages/index/member.vue

@@ -118,6 +118,13 @@
 			},
 			getList() {
 				this.status = "loading"
+				
+				let data = {
+					...this.params
+				}
+				
+				// if(!uni.getStorageSync('to'))
+				
 				this.$api('recruitPageList',this.params,res=>{
 					uni.stopPullDownRefresh()
 					if(res.code == 200) {

pages_login/fuwutiaokuan.vue

@@ -46,6 +46,7 @@
 		top: 0;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 	}

pages_login/wxLogin.vue

@@ -11,7 +11,7 @@
 		<!-- 登录按钮 -->
 		<view @click="login" class="login-btn">
 			<uni-icons type="weixin" size="30" color="#fff"></uni-icons>
-			<text class="wx">微信登录</text>
+			<text class="wx">微信授权登录</text>
 		</view>
 		
 		<view @click="toHome" 

pages_my/qiandao-list.vue

@@ -5,16 +5,16 @@
 	
 		<view class="content">
 			<zlx-item 
-			:item="detail.activityInfo"
+			:item="detail.activityInfo || detail.travel"
 			:showBottom="false"></zlx-item>
 			<view class="xie-box-val" v-for="(item,i) in list" :key="i">
 				<view class="val-text">
 					<view>{{item.name}}</view>
 					<view class="phone-box">{{item.phone}}</view>
-					<view class="type-box">{{typeList[item.typeprice].name}}X{{item.num}}</view>
+					<view class="type-box">{{typeList[item.typePrice].name}}X{{item.num}}</view>
 				</view>
 				<view class="choose-box">
-					<view class="normol-box" v-if="item.state == 0"></view>
+					<view class="normol-box" v-if="item.open == 'N'"></view>
 					<image src="./static/choose-icon.png" mode="widthFix" v-else></image>
 				</view>
 			</view>
@@ -58,6 +58,7 @@
 						price:268
 					}
 				],
+				type : 0,
 			}
 		},
 		onPageScroll(e) {
@@ -67,9 +68,11 @@
 				this.bgColor = 'transparent'
 			}
 		},
-		onLoad({id}) {
+		onLoad({id, type}) {
 			this.queryParams.recruitId = id
 			this.queryParams.pageSize = 20
+			this.queryParams.type = type
+			this.type = type
 			this.getActivityInfo()
 		},
 		methods:{
@@ -81,9 +84,9 @@
 							orderId: code.result
 						}, res => {
 							if (res.code == 200) {
-								self.$refs.toast.show({
-									type: 'success',
-									message: res.result
+								uni.showToast({
+									title: res.message,
+									icon: 'none'
 								})
 							}
 							self.getData()
@@ -93,8 +96,9 @@
 				})
 			},
 			getActivityInfo(){
-				this.$api('activityInfo', {
+				this.$api(['activityInfo', 'travelInfo'][this.type], {
 					activityId : this.queryParams.recruitId,
+					travelId : this.queryParams.recruitId,
 				}, res => {
 					if(res.code == 200){
 						this.detail = res.result

pages_my/travelList.vue

@@ -38,24 +38,12 @@
                     @popupChange="change"
                 ></uv-drop-down-popup>
             </view>
-            <view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index" @click="toDetail(item)">
-                <view class="left">
-                    <image :src="item.image" alt="">
-                </view>
-                <view class="right">
-                    <view class="detailed">
-                        <view class="title">{{item.title}}</view>
-                        <view class="date">{{item.startTime}}</view>
-                        <view class="address">{{item.address}}</view>
-                    </view>
-                    <view class="data">
-                        <text>¥{{item.price}}</text>
-                        <text>{{item.num}}/{{item.sum}}</text>
-                        <text class="btn" v-if="item.state == 0">报名中</text>
-						<text class="btn-2" v-if="item.state == 1">已结束</text>
-                    </view>
-                </view>
-            </view>
+           
+		   
+		   <view class=""
+		   style="padding: 0 20rpx;">
+				<travelList :cardListData="cardListData"/>
+		   </view>
         </view>
 		
 		<uv-calendars ref="calendars" 
@@ -67,6 +55,7 @@
 <script>
     import Navbar from '@/pages/components/Navbar.vue'
     import { globalMixin } from '../pages/mixins/globalMixin';
+	import travelList from '@/components/travel/travelList.vue'
 	export default{
         onPageScroll() {
 			// 滚动后及时更新位置
@@ -74,7 +63,8 @@
 		},
         mixins: [globalMixin],
         components:{
-            Navbar
+            Navbar,
+			travelList,
 		},
         computed: {
 			dropItem(name) {
@@ -170,11 +160,6 @@
 					}
                 })
             },
-            toDetail({ id }) {
-				uni.navigateTo({
-					url:`/pages_order/lvyou-detail?travelId=${id}`
-				})
-			},
             change(e) {
 				console.log('弹窗打开状态：',e);
 			},
@@ -260,31 +245,7 @@
     
     .content {
 		margin-top: 40rpx;
-        .info {
-            position: relative;
-            margin: 10rpx 32rpx 36rpx;;
-            padding: 35rpx 0 35rpx 24rpx;
-            border-radius: 26rpx;
-            .right {
-                .data {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    .btn {
-                        background: #381615;
-                        color: $uni-color-primary;
-                        padding: 10rpx 40rpx;
-                        border-radius: 30rpx 0px 0px 30rpx;
-                    }
-					.btn-2 {
-                        background: #333;
-					    color: #999;
-					    padding: 10rpx 40rpx;
-					    border-radius: 30rpx 0px 0px 30rpx;
-					}
-                }
-            }
-        }
+        
     }
 }
 

pages_my/zlx-qiandao.vue

@@ -2,7 +2,15 @@
 	<view>
 		<view class="head-box"></view>
 		<uv-navbar autoBack title="主理人签到" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
-	
+		
+		<uv-sticky offsetTop="350rpx" :bgColor="bgColor">
+			<uv-tabs :scrollable="false" @click="tabs" :list="tabList" lineWidth="40" :current="tabCurrent"
+				:lineColor="`url(${lineBg}) 100% 100%`"
+				:activeStyle="{color: '#FD5C5C', fontWeight: 'bold',transform: 'scale(1.05)'}"
+				:inactiveStyle="{color: '#999', transform: 'scale(1)'}"
+				itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"></uv-tabs>
+		</uv-sticky>
+		
 		<view class="content">
 			<zlx-item 
 			v-for="(item, index) in list"
@@ -24,8 +32,20 @@
 		},
 		data() {
 			return {
+				lineBg: require('@/static/image/cart/tabIcon.png'),
 				bgColor:'transparent',
 				mixinsListApi : 'activityMemberPageList',//activityMemberPageList getTwoPageList
+				tabCurrent : 0,
+				tabList: [
+					{
+						id: 0,
+						name: '活动'
+					},
+					{
+						id: 1,
+						name: '旅行'
+					},
+				],
 			}
 		},
 		onPageScroll(e) {
@@ -39,9 +59,14 @@
 			this.queryParams.type = 0
 		},
 		methods:{
+			tabs(e) {
+				this.tabCurrent = e.index
+				this.queryParams.type = e.id
+				this.getData()
+			},
 			qiandaoClick(id) {
 				uni.navigateTo({
-					url:'/pages_my/qiandao-list?id=' + id
+					url:`/pages_my/qiandao-list?id=${id}&type=${this.queryParams.type}`
 				})
 			},
 		}

pages_order/huodong-detail.vue

@@ -103,7 +103,9 @@
 					<uv-icon name="close" color="#fff" @click="$refs.popup.close();"></uv-icon>
 				</view>
 				<view class="popup-list">
-					<view class="list-item" v-for="(item,i) in typeList" :key="i" @click="chooseClick(item,i)">
+					<view class="list-item" 
+					v-for="(item,i) in typeList" :key="i" 
+					@click="chooseClick(item,i)">
 						<view class="item-l" :class="chooseIndex == i ? 'chooose-class' : ''">
 							<view>{{item.name}}</view>
 							<view class="item-l-val">￥{{item.price}}</view>
@@ -141,18 +143,18 @@
 				numValue:0,
 				ewmImg:'',
 				typeList:[
-					{
-						name:'早鸟票',
-						price:168
-					},
-					{
-						name:'单人票',
-						price:198.01
-					},
-					{
-						name:'尊享票',
-						price:268
-					}
+					// {
+					// 	name:'早鸟票',
+					// 	price: 0
+					// },
+					// {
+					// 	name:'单人票',
+					// 	price: 0
+					// },
+					// {
+					// 	name:'尊享票',
+					// 	price: 0
+					// }
 				],
 				activityId:'',
 				isCollect : false,
@@ -193,9 +195,7 @@
 						}
 				},
 				fail: function(res) {
-
-						console.log("失败", res)
-
+					console.log("失败", res)
 				}
 			}
 		},
@@ -230,14 +230,42 @@
 				}
 				this.$api('activityInfo', data,res=> {
 					if(res.code==200) {
+						
+						let adminUser = res.result.adminUser || {}
+						
 						this.activityDetails = res.result.activityInfo
-						this.numValue =  res.result.adminUser.num
-						this.ewmImg =  res.result.adminUser.img
+						this.numValue = adminUser.num
+						this.ewmImg = adminUser.img
 						this.adminUserInfo =  res.result.adminUserInfo
 						this.isCollect =  res.result.collect
-						this.typeList[0].price = res.result.activityInfo.birdPrice;
-						this.typeList[1].price = res.result.activityInfo.personPrice;
-						this.typeList[2].price = res.result.activityInfo.expensivePrice;
+						
+						this.typeList = []
+						
+						if(res.result.activityInfo.birdPrice){
+							this.typeList.push({
+								price : res.result.activityInfo.birdPrice,
+								name : '早鸟票',
+								type : 0,
+							})
+						}
+						if(res.result.activityInfo.personPrice){
+							this.typeList.push({
+								price : res.result.activityInfo.personPrice,
+								name : '单人票',
+								type : 1,
+							})
+						}
+						if(res.result.activityInfo.expensivePrice){
+							this.typeList.push({
+								price : res.result.activityInfo.expensivePrice,
+								name : '尊享票',
+								type : 2,
+							})
+						}
+						
+						// this.typeList[0].price = res.result.activityInfo.birdPrice;
+						// this.typeList[1].price = res.result.activityInfo.personPrice;
+						// this.typeList[2].price = res.result.activityInfo.expensivePrice;
 					}
 				})
 			},
@@ -264,7 +292,7 @@
 			confirmClick(typePrice) {
 				this.$api('createOrder',{
 					id:this.activityId,
-					typePrice:typePrice,
+					typePrice: this.typeList[typePrice].type,
 					type:0
 				},res=>{
 					if(res.code === 200) {

pages_order/invoiceRecords.vue

@@ -25,7 +25,7 @@
                         <view class="date">{{item.createTime}}</view>
 						<view class="date"
 						style="padding-top: 0;">{{item.name}}</view>
-                        <view class="address">{{item.emil}}</view>
+                        <view class="emil">{{item.emil}}</view>
                     </view>
                     <view class="data">
                         <text>标准票</text>

pages_order/orderDetails.vue

@@ -53,7 +53,7 @@
 		</view>
 		<view style="padding: 65rpx 35rpx;" 
 		@click="open"
-		v-if="dataInfo.state == 1 && dataInfo.type == 0">
+		v-if="dataInfo.state == 1">
 			<uv-button :custom-style="customStyle" type="primary" shape="circle" color="#381615" text="活动签到"></uv-button>
 		</view>
 		

pages_order/payOrder.vue

@@ -158,9 +158,7 @@
 							})
 							
 						}).catch(n => {
-							setTimeout(uni.switchTab, 800, {
-								url: '/pages/index/cart'
-							})
+							setTimeout(uni.navigateBack, 800, -1)
 						})
 					}
 				})

pages_zlx/zlx-form.vue

@@ -109,6 +109,10 @@
 		<view class="btn-box" v-if="info.state != 1">
 			<uv-button text="保存" color="#381615" shape="circle" :customStyle="btnCustomStyle" @click="confrim"></uv-button>
 		</view>
+	
+		<view class="btn-box" v-else>
+			<uv-button text="已审核通过" color="#381615" shape="circle" :customStyle="btnCustomStyle"></uv-button>
+		</view>
 	</view>
 </template>
 
@@ -294,6 +298,7 @@
 	}
 	.content {
 		margin-top: 40rpx;
+		padding-bottom: 100rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);