diff --git a/common.scss b/common.scss
index 1ad0e84..248910f 100644
--- a/common.scss
+++ b/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;
diff --git a/components/active/active-item.vue b/components/active/active-item.vue
index 83bbfe5..55dc31f 100644
--- a/components/active/active-item.vue
+++ b/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: '';
diff --git a/components/cart/CardList.vue b/components/cart/CardList.vue
index fd2e62b..5e13953 100644
--- a/components/cart/CardList.vue
+++ b/components/cart/CardList.vue
@@ -27,7 +27,7 @@
class="mini-btn" size="mini">取消活动
diff --git a/components/travel/travelList.vue b/components/travel/travelList.vue
new file mode 100644
index 0000000..a18108e
--- /dev/null
+++ b/components/travel/travelList.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.startTime}}
+ {{item.address}}
+
+
+ ¥{{item.price}}
+ {{item.num}}/{{item.sum}}
+ 报名中
+ 已结束
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/zhaomu/zlx-item.vue b/components/zhaomu/zlx-item.vue
index 7f2c4f2..2bf3fdc 100644
--- a/components/zhaomu/zlx-item.vue
+++ b/components/zhaomu/zlx-item.vue
@@ -12,7 +12,8 @@
{{ item.doNum }}/{{ item.num }}
- 开始签到
+ 开始签到
diff --git a/config.js b/config.js
index af2b79e..28ad995 100644
--- a/config.js
+++ b/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',
diff --git a/manifest.json b/manifest.json
index fa716f2..ceff888 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "vtrip",
- "appid" : "__UNI__53D8233",
+ "appid" : "__UNI__197A38F",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 8947ccc..fb30740 100644
--- a/pages/index/center.vue
+++ b/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 : ['普通会员', '黄金会员', '渠道商'],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f270cbb..e021aec 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,7 +74,8 @@
itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"
>
-
+
+
@@ -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) {
diff --git a/pages/index/member.vue b/pages/index/member.vue
index b69e4c7..5a94ce4 100644
--- a/pages/index/member.vue
+++ b/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) {
diff --git a/pages_login/fuwutiaokuan.vue b/pages_login/fuwutiaokuan.vue
index 44d8f71..1b526d7 100644
--- a/pages_login/fuwutiaokuan.vue
+++ b/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);
}
diff --git a/pages_login/wxLogin.vue b/pages_login/wxLogin.vue
index 07563d4..675a61c 100644
--- a/pages_login/wxLogin.vue
+++ b/pages_login/wxLogin.vue
@@ -11,7 +11,7 @@
- 微信登录
+ 微信授权登录
{{item.name}}
{{item.phone}}
- {{typeList[item.typeprice].name}}X{{item.num}}
+ {{typeList[item.typePrice].name}}X{{item.num}}
-
+
@@ -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
diff --git a/pages_my/travelList.vue b/pages_my/travelList.vue
index 37dd7cc..ba9c02d 100644
--- a/pages_my/travelList.vue
+++ b/pages_my/travelList.vue
@@ -38,24 +38,12 @@
@popupChange="change"
>
-
-
-
-
-
-
- {{item.title}}
- {{item.startTime}}
- {{item.address}}
-
-
- ¥{{item.price}}
- {{item.num}}/{{item.sum}}
- 报名中
- 已结束
-
-
-
+
+
+
+
+
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;
- }
- }
- }
- }
+
}
}
diff --git a/pages_my/zlx-qiandao.vue b/pages_my/zlx-qiandao.vue
index 22b3429..a8e6346 100644
--- a/pages_my/zlx-qiandao.vue
+++ b/pages_my/zlx-qiandao.vue
@@ -2,7 +2,15 @@
-
+
+
+
+
+
{{item.name}}
￥{{item.price}}
@@ -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) {
diff --git a/pages_order/invoiceRecords.vue b/pages_order/invoiceRecords.vue
index 49b125e..a923c5e 100644
--- a/pages_order/invoiceRecords.vue
+++ b/pages_order/invoiceRecords.vue
@@ -25,7 +25,7 @@
{{item.createTime}}
{{item.name}}
- {{item.emil}}
+ {{item.emil}}
标准票
diff --git a/pages_order/orderDetails.vue b/pages_order/orderDetails.vue
index 007b909..5dbe521 100644
--- a/pages_order/orderDetails.vue
+++ b/pages_order/orderDetails.vue
@@ -53,7 +53,7 @@
+ v-if="dataInfo.state == 1">
diff --git a/pages_order/payOrder.vue b/pages_order/payOrder.vue
index 58fcc20..1b781c1 100644
--- a/pages_order/payOrder.vue
+++ b/pages_order/payOrder.vue
@@ -158,9 +158,7 @@
})
}).catch(n => {
- setTimeout(uni.switchTab, 800, {
- url: '/pages/index/cart'
- })
+ setTimeout(uni.navigateBack, 800, -1)
})
}
})
diff --git a/pages_zlx/zlx-form.vue b/pages_zlx/zlx-form.vue
index a1b1fb4..77a3c69 100644
--- a/pages_zlx/zlx-form.vue
+++ b/pages_zlx/zlx-form.vue
@@ -109,6 +109,10 @@
+
+
+
+
@@ -294,6 +298,7 @@
}
.content {
margin-top: 40rpx;
+ padding-bottom: 100rpx;
padding: 0 30rpx;
padding-top: calc(var(--status-bar-height) + 110rpx);