Skip to content

杨炀 / gd_yc

Go to a project
Toggle navigation
Toggle navigation pinning
8826cb0f by 华明祺
Options

Merge branch 'master' of https://code.itechtop.cn/yangyang/gd_yc

2 parents 8ed5d1b6 6d5c091f
Inline Side-by-side
Showing 7 changed files with 81 additions and 43 deletions
common/hotel.js
...@@ -7,9 +7,9 @@ function getTrainList(venueId) { ...@@ -7,9 +7,9 @@ function getTrainList(venueId) {
7 method: 'get' 7 method: 'get'
8 }) 8 })
9 } 9 }
10 function getActivityDetail(id) { 10 function getTrainDetail(id) {
11 return request({ 11 return request({
12 url: `/logex/activity/${id}`, 12 url: `/train/info/${id}`,
13 method: 'get', 13 method: 'get',
14 params: id 14 params: id
15 }) 15 })
...@@ -230,7 +230,7 @@ function newsSubmitOrderHotel(form) { ...@@ -230,7 +230,7 @@ function newsSubmitOrderHotel(form) {
230 params: form 230 params: form
231 }) 231 })
232 } 232 }
233 export {getTrainList,getActivityHotelList,getActivityDetail,getHotelById,getHotelRooms,submitOrder,getbilllist,getbilldetailbyId, 233 export {getTrainList,getActivityHotelList,getTrainDetail,getHotelById,getHotelRooms,submitOrder,getbilllist,getbilldetailbyId,
234 payForOrder,cancelOrder,getCanInvoiceBills,submitInvoice,getInvoiceByActiveId,getInvoiceDetailBills, 234 payForOrder,cancelOrder,getCanInvoiceBills,submitInvoice,getInvoiceByActiveId,getInvoiceDetailBills,
235 getInvoiceDetail,getInvoiceByUserId,editInvoice,addAddress,regionsList,addressList,delAddress, 235 getInvoiceDetail,getInvoiceByUserId,editInvoice,addAddress,regionsList,addressList,delAddress,
236 checkResidueRoom,getActivityRestaurantList,getMenuById, 236 checkResidueRoom,getActivityRestaurantList,getMenuById,
......
node_modules/.vite/deps/_metadata.json
1 { 1 {
2 "hash": "3d4f5fa7", 2 "hash": "a42c9c29",
3 "browserHash": "a63ce521", 3 "browserHash": "49b54077",
4 "optimized": { 4 "optimized": {
5 "lodash": { 5 "lodash": {
6 "src": "../../lodash/lodash.js", 6 "src": "../../lodash/lodash.js",
7 "file": "lodash.js", 7 "file": "lodash.js",
8 "fileHash": "ab53c0da", 8 "fileHash": "d2ae1b17",
9 "needsInterop": true 9 "needsInterop": true
10 } 10 }
11 }, 11 },
......
node_modules/.vite/deps/lodash.js
...@@ -3,9 +3,9 @@ var __commonJS = (cb, mod) => function __require() { ...@@ -3,9 +3,9 @@ var __commonJS = (cb, mod) => function __require() {
3 return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports; 3 return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
4 }; 4 };
5 5
6 // ../../../../../../Users/huamingqi/projects/train/gd_yc/node_modules/lodash/lodash.js 6 // ../../../../../../Users/yangyang/gd_yc/node_modules/lodash/lodash.js
7 var require_lodash = __commonJS({ 7 var require_lodash = __commonJS({
8 "../../../../../../Users/huamingqi/projects/train/gd_yc/node_modules/lodash/lodash.js"(exports, module) { 8 "../../../../../../Users/yangyang/gd_yc/node_modules/lodash/lodash.js"(exports, module) {
9 (function() { 9 (function() {
10 var undefined; 10 var undefined;
11 var VERSION = "4.17.21"; 11 var VERSION = "4.17.21";
......
pages_hotel/hotel/detail.vue
...@@ -7,14 +7,17 @@ ...@@ -7,14 +7,17 @@
7 </swiper> 7 </swiper>
8 <view class="whitepobox"> 8 <view class="whitepobox">
9 <view>{{form.name}}</view> 9 <view>{{form.name}}</view>
10 <view class="pp"><image src="./img/tag01.png" class="iconSquera"/>{{form.hdStart?.substring(0, 10)}} — {{form.hdEnd?.substring(0, 10)}}</view> 10 <view class="pp">培训时间：{{form.hdStart?.substring(0, 10)}} — {{form.hdEnd?.substring(0, 10)}}</view>
11 <view class="pp"><image src="./img/tag02.png" class="iconSquera"/>{{form.address}}</view> 11 <view class="pp">培训地点：{{form.address}}</view>
12 <view class="pp">报道时间：{{form.address}}</view>
13 <view class="pp">主办单位：{{form.address}}</view>
14 <view class="pp">承办单位：{{form.address}}</view>
12 </view> 15 </view>
13 16
14 <view class="whiteItem"> 17 <view class="whiteItem">
15 <view class="tt"> 预订说明</view> 18 <view class="tt"> 培训简介</view>
16 <view class="pp" :class="allNow?'autoHeight':'onelineHeight'" v-html="form.reserveDes"></view> 19 <view class="pp" :class="allNow?'autoHeight':'onelineHeight'" v-html="form.introduction"></view>
17 <view class="formore" @click="changeIntroductionHeight" v-show="form.reserveDes?.length>20"> 20 <view class="formore" @click="changeIntroductionHeight" v-show="form.introduction?.length>20">
18 <view v-show="!allNow">展开详情 <uni-icons type="bottom" color='#1EC886' size="12"></uni-icons></view> 21 <view v-show="!allNow">展开详情 <uni-icons type="bottom" color='#1EC886' size="12"></uni-icons></view>
19 <view v-show="allNow"> 收起 <uni-icons type="top" color='#1EC886' size="12"></uni-icons></view> 22 <view v-show="allNow"> 收起 <uni-icons type="top" color='#1EC886' size="12"></uni-icons></view>
20 23
...@@ -35,7 +38,7 @@ ...@@ -35,7 +38,7 @@
35 <view class="tt">其他事项</view> 38 <view class="tt">其他事项</view>
36 <view class="myList"> 39 <view class="myList">
37 <uni-list :border="false"> 40 <uni-list :border="false">
38 <uni-list-item :border="true" title="活动简介" showArrow :clickable="true" @click="goIllustrate"> 41 <uni-list-item :border="true" title="报名提醒" showArrow :clickable="true" @click="goIllustrate">
39 <template v-slot:header> 42 <template v-slot:header>
40 <view class="slot-box"> 43 <view class="slot-box">
41 <image class="slot-image" src="./img/qt01.png" mode="widthFix"></image> 44 <image class="slot-image" src="./img/qt01.png" mode="widthFix"></image>
...@@ -56,7 +59,7 @@ ...@@ -56,7 +59,7 @@
56 </view> 59 </view>
57 </template> 60 </template>
58 </uni-list-item> 61 </uni-list-item>
59 <uni-list-item :border="true" title="在线客服" :clickable="true"> 62 <!-- <uni-list-item :border="true" title="在线客服" :clickable="true">
60 <template v-slot:header> 63 <template v-slot:header>
61 <view class="slot-box"> 64 <view class="slot-box">
62 <image class="slot-image" src="./img/qt04.png" mode="widthFix"></image> 65 <image class="slot-image" src="./img/qt04.png" mode="widthFix"></image>
...@@ -67,7 +70,7 @@ ...@@ -67,7 +70,7 @@
67 <uni-icons type="forward" color="#bbb" size="16"></uni-icons> 70 <uni-icons type="forward" color="#bbb" size="16"></uni-icons>
68 </button> 71 </button>
69 </template> 72 </template>
70 </uni-list-item> 73 </uni-list-item> -->
71 74
72 </uni-list> 75 </uni-list>
73 </view> 76 </view>
...@@ -127,15 +130,15 @@ ...@@ -127,15 +130,15 @@
127 }) 130 })
128 onShow(option => { 131 onShow(option => {
129 if (app.globalData.isLogin) { 132 if (app.globalData.isLogin) {
130 getActivity() 133 getData()
131 } else { 134 } else {
132 app.firstLoadCallback = () => { 135 app.firstLoadCallback = () => {
133 getActivity() 136 getData()
134 }; 137 };
135 } 138 }
136 }) 139 })
137 onPullDownRefresh(() => { 140 onPullDownRefresh(() => {
138 getActivity() 141 getData()
139 }) 142 })
140 let goPath 143 let goPath
141 let currUser 144 let currUser
...@@ -181,8 +184,8 @@ ...@@ -181,8 +184,8 @@
181 } 184 }
182 } 185 }
183 186
184 function getActivity() { 187 function getData() {
185 hotel.getActivityDetail(id.value).then(res => { 188 hotel.getTrainDetail(id.value).then(res => {
186 form.value = res.data 189 form.value = res.data
187 app.globalData.carStart = res.data.carStart 190 app.globalData.carStart = res.data.carStart
188 app.globalData.carEnd = res.data.carEnd 191 app.globalData.carEnd = res.data.carEnd
...@@ -225,7 +228,7 @@ ...@@ -225,7 +228,7 @@
225 } 228 }
226 } 229 }
227 function goIllustrate(){ 230 function goIllustrate(){
228 let path = `/pages_hotel/hotel/illustrate?activeId=${id.value}`; 231 let path = `/pages_hotel/hotel/illustrate?trainId=${id.value}`;
229 if (checkUserPhone(path)) { 232 if (checkUserPhone(path)) {
230 uni.navigateTo({ 233 uni.navigateTo({
231 url: path 234 url: path
......
pages_hotel/hotel/illustrate.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <view> 2 <view>
3 <!-- 预订说明 --> 3 <!-- 预订说明 -->
4 <view class="whiteItem"> 4 <view class="whiteItem">
5 <view v-html="introduction" class="richzz"> 5 <view v-html="reminder" class="richzz">
6 6
7 </view> 7 </view>
8 </view> 8 </view>
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
25 const data = reactive({ 25 const data = reactive({
26 id: null, 26 id: null,
27 form:{}, 27 form:{},
28 introduction:'' 28 reminder:''
29 }) 29 })
30 const { 30 const {
31 id,form,introduction 31 id,form,reminder
32 } = toRefs(data); 32 } = toRefs(data);
33 onLoad(option => { 33 onLoad(option => {
34 hotel.getActivityDetail(option.activeId).then(res => { 34 hotel.getTrainDetail(option.trainId).then(res => {
35 introduction.value = res.data.introduction 35 reminder.value = res.data.reminder
36 }) 36 })
37 37
38 }) 38 })
......
pages_hotel/hotel/img/归档.zip 0 → 100644
No preview for this file type
pages_hotel/hotel/index.vue
1 <template> 1 <template>
2 <view class="pb50"> 2 <view class="pb50">
3 <view class="active" v-for="(item, index) in list" :key="index" @click="goDetail(item)"> 3 <view style="padding:0 30rpx;">
4 <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="button" activeColor="#15CFAB"></uni-segmented-control>
5 </view>
6 <view>
7 <view class="active" v-for="(item, index) in showList" :key="index" @click="goDetail(item)">
4 <swiper class="activeSwiper" circular :autoplay="autoplay"> 8 <swiper class="activeSwiper" circular :autoplay="autoplay">
5 <swiper-item v-for="(pic,index) in item.photos?.split(',')" :key="index"> 9 <swiper-item v-for="(pic,index) in item.photos?.split(',')" :key="index">
6 <image class="cover" mode="aspectFill" :src="pic"></image> 10 <image class="cover" mode="aspectFill" :src="pic"></image>
...@@ -8,17 +12,19 @@ ...@@ -8,17 +12,19 @@
8 </swiper> 12 </swiper>
9 13
10 <view class="name">{{item.name}}</view> 14 <view class="name">{{item.name}}</view>
11 <view class="pp" style="display: flex;"><image src="./img/tag01.png" class="iconSquera"/>{{item.hdStart.substring(0, 10)}} — {{item.hdEnd.substring(0, 10)}}</view> 15 <view class="pp" style="display: flex;">培训时间：{{item.trainStart.substring(0, 10)}} — {{item.trainEnd.substring(0, 10)}}</view>
12 <view class="pp" style="display: flex;"><image src="./img/tag02.png" class="iconSquera"/>{{item.address}}</view> 16 <view class="pp" style="display: flex;">报道时间：{{item.reportDate.substring(0, 10)}}</view>
17 <view class="pp" style="display: flex;">主办单位：{{item.organizer}}</view>
18 <view class="pp" style="display: flex;">承办单位：{{item.address}}</view>
19 <view class="pp" style="display: flex;">培训地点：{{item.address}}</view>
13 <button class="btn btn1">点击进入</button> 20 <button class="btn btn1">点击进入</button>
14 </view> 21 </view>
15 </view> 22 </view>
16 <view class="nodata" v-if="list.length==0"> 23 </view>
24 <view class="nodata" v-if="showList.length==0">
17 <image mode="aspectFit" src="/static/nodata.png"></image> 25 <image mode="aspectFit" src="/static/nodata.png"></image>
18 <text> 暂无活动</text> 26 <text> 暂无活动</text>
19 </view> 27 </view>
20 <!-- 我的 -->
21 <view class="myEnter" @click="goMycenter"><image src="./img/user.png" mode="aspectFill"></image></view>
22 </template> 28 </template>
23 29
24 <script setup> 30 <script setup>
...@@ -29,11 +35,16 @@ ...@@ -29,11 +35,16 @@
29 const app = getApp(); 35 const app = getApp();
30 const { proxy } = getCurrentInstance(); 36 const { proxy } = getCurrentInstance();
31 const data = reactive({ 37 const data = reactive({
38 showList: [],
32 list: [], 39 list: [],
33 queryParam: {}, 40 list0: [],
34 autoplay:true 41 list1: [],
42 query: {},
43 autoplay:true,
44 items: ['全部', '进行中', '已过期'],
45 current: 1
35 }); 46 });
36 const { list,queryParam,autoplay } = toRefs(data); 47 const { showList,list,list0,list1,query,autoplay,items,current } = toRefs(data);
37 48
38 onShow(option =>{ 49 onShow(option =>{
39 if (app.globalData.isLogin) { 50 if (app.globalData.isLogin) {
...@@ -48,21 +59,45 @@ ...@@ -48,21 +59,45 @@
48 getList(); 59 getList();
49 }); 60 });
50 function getList(){ 61 function getList(){
62 list0.value = []
63 list1.value = []
51 hotel.getTrainList().then(res => { 64 hotel.getTrainList().then(res => {
52 list.value = res.rows; 65 list.value = res.rows
66 for(var n of list.value){
67 if(n.status == 0){
68 list0.value.push(n)
69 }
70 if(n.status == 1){
71 list1.value.push(n)
72 }
73 }
74 getShowList(current.value)
53 }); 75 });
54 } 76 }
55 function goDetail(item){ 77 function goDetail(item){
56 let path = `/pages_hotel/hotel/detail?id=${item.id}`; 78 let path = `/pages_hotel/hotel/detail?id=${item.trainId}`;
57 uni.navigateTo({ 79 uni.navigateTo({
58 url: path 80 url: path
59 }); 81 });
60 } 82 }
61 function goMycenter(){ 83 function onClickItem(e){
62 let path = `/pages_hotel/hotel/mycenter`; 84 if(current.value != e.currentIndex){
63 uni.navigateTo({ 85 current.value = e.currentIndex
64 url: path 86 }
65 }); 87 getShowList(e.currentIndex)
88 }
89 function getShowList(n){
90 switch (n){
91 case 0:
92 showList.value = list.value
93 break;
94 case 1:
95 showList.value = list0.value
96 break;
97 case 2:
98 showList.value = list1.value
99 break;
100 }
66 } 101 }
67 </script> 102 </script>
68 103
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!