Merge pull request 'feat: 接口对接;' (#4) from fox into master

Reviewed-on: http://175.178.51.79:3000/Augcl/studytour-front/pulls/4

api/fetch.js

@@ -1,7 +1,7 @@
 import api from './api.js'
 
 const fetch = (key, data = {}, transform = true, loadingTitle) => {
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     
     const callback = (res) => {
       if (!transform) {

api/model/activity.js

@@ -19,7 +19,9 @@ const api = {
 	// 首页&分类-收藏研学活动
 	collectionActivity: {
 		url: '/activity/collectionActivity',
-		method: 'GET',
+		method: 'POST',
+		auth: true,
+		limit : 500,
 	},
 }
 

api/model/login.js

@@ -5,14 +5,14 @@
 const api = {
 	// 微信登录接口
 	wxLogin: {
-		url: '/login_common/appletLogin',
+		url: '/login/login',
 		method: 'GET', 
 		limit : 500,
 		showLoading : true,
 	},
 	// 获取绑定手机号码
 	bindPhone: {
-		url: '/login_common/bindPhone',
+		url: '/login/bindPhone',
 		method: 'GET',
 		auth: true,
 	},

api/model/order.js

@@ -20,13 +20,41 @@ const api = {
 		showLoading : true,
 	},
 	// 我的订单-支付订单
-	createOrder: {
+	payOrder: {
 		url: '/order/payOrder',
 		method: 'POST',
 		auth: true, 
 		limit : 500,
 		showLoading : true,
 	},
+	// 我的订单-查询出行人列表
+	queryTouristList: {
+		url: '/order/queryTouristList',
+		method: 'GET',
+		auth: true, 
+	},
+	// 我的订单-查询出行人详情
+	queryTouristById: {
+		url: '/order/queryTouristById',
+		method: 'GET',
+		auth: true, 
+	},
+	// 我的订单-添加出行人
+	addTourist: {
+		url: '/order/addTourist',
+		method: 'POST',
+		auth: true, 
+		limit : 500,
+		showLoading : true,
+	},
+	// 我的订单-修改出行人信息
+	updateTourist: {
+		url: '/order/updateTourist',
+		method: 'POST',
+		auth: true, 
+		limit : 500,
+		showLoading : true,
+	},
 }
 
 export default api

components/config/PrivacyAgreementPoup.vue

@@ -50,7 +50,6 @@
 			if(wx.getPrivacySetting){
 				wx.getPrivacySetting({
 					success: res => {
-						console.log(res)
 						if (res.needAuthorization) {
 							// 需要弹出隐私协议
 							this.init()

components/home/bgSwiperView.vue

@@ -21,22 +21,12 @@
       this.getData()
     },
     methods: {
-      getData() {
-
-        // todo: fetch
-
-        this.bannerList = [
-          {
-            image: '/static/image/bg.png',
-          },
-          {
-            image: '/static/image/bg.png',
-          },
-          {
-            image: '/static/image/bg.png',
-          },
-        ]
+      async getData() {
+				try {
+					this.bannerList = (await this.$fetch('queryBannerList', { type: 0 })).records // type：0-首页顶部 1-首页中部
+				} catch (err) {
 
+				}
       },
     },
   }

components/home/categoryView.vue

@@ -27,31 +27,31 @@
             id: '001',
             icon: '/static/image/temp-1.png',
             label: '主题研学',
-            path: `/pages/index/category?categoryId=009`,
+            path: `/pages/index/category?categoryId=1962345709817106434`,
           },
           {
             id: '002',
             icon: '/static/image/temp-2.png',
             label: '社会实践',
-            path: `/pages/index/category?categoryId=008`,
+            path: `/pages/index/category?categoryId=1962346300198948866`,
           },
           {
             id: '003',
             icon: '/static/image/temp-3.png',
             label: '研学交流',
-            path: `/pages/index/category?categoryId=010`,
+            path: `/pages/index/category?categoryId=1962346769759670273`,
           },
           {
             id: '004',
             icon: '/static/image/temp-4.png',
             label: '周末研学',
-            path: `/pages/index/category?categoryId=006`,
+            path: `/pages/index/category?categoryId=1962346834884628481`,
           },
           {
             id: '005',
             icon: '/static/image/temp-5.png',
             label: '假期专项',
-            path: `/pages/index/category?categoryId=011`,
+            path: `/pages/index/category?categoryId=1962346960097185793`,
           },
           {
             id: '006',
@@ -68,7 +68,7 @@
             id: '008',
             icon: '/static/image/temp-8.png',
             label: '本地研学',
-            path: `/pages/index/category?categoryId=012`,
+            path: `/pages/index/category?categoryId=1962347024639135745`,
           },
           {
             id: '009',

components/home/productView.vue

@@ -66,22 +66,17 @@
       }
     },
     created() {
-      this.fetchCategory()
+      this.fetchRecommend()
     },
     methods: {
-      fetchCategory() {
+      fetchRecommend() {
         // todo: fetch
-
         this.tabs = [
           { name: '全部' },
-          // todo: jump to detail
-          { id: '001', name: '草原运动会', disabled: true, },
-          { id: '002', name: '我的韶山行', disabled: true, },
-          { id: '003', name: '出境游', disabled: true, },
+          { id: '1962342791093227522', name: '研学活动一', disabled: true, },
         ]
       },
       onClickTab(e) {
-        console.log('onClickTab', e.index)
         this.current = 0
         const index = e.index
 

components/home/recommendView.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="recommend">
-    <view class="flex recommend-item" v-for="item in recommendList" :key="item.id">
+    <view class="flex recommend-item" v-for="item in recommendList" :key="item.id" @click="onClick(item)">
       <image class="img" :src="item.icon" mode="widthFix"></image>
       <view>
         <view class="label">{{ item.label }}</view>
@@ -32,22 +32,34 @@
             label: '限时优惠',
             desc: '速抢折扣',
             highlight: true,
+            path: `/pages_order/product/search?isDiscount=1&title=限时优惠`,
           },
           {
             id: '002',
             icon: '/static/image/temp-12.png',
             label: '口碑爆款',
             desc: '热销推荐',
+            path: `/pages_order/product/search?isHot=1&title=口碑爆款`,
           },
           {
             id: '003',
             icon: '/static/image/temp-13.png',
             label: '新上线路',
             desc: '全新上线',
+            path: `/pages_order/product/search?isNew=1&title=新上线路`,
           },
         ]
 
       },
+      onClick(target) {
+        const { path } = target
+
+        if (path) {
+          uni.navigateTo({
+            url: path
+          })
+        }
+      },
     },
   }
 </script>

components/home/swiperView.vue

@@ -22,31 +22,12 @@
       this.getData()
     },
     methods: {
-      getData() {
-
-        // todo: fetch
-
-        this.bannerList = [
-          {
-            image: '/static/image/temp-14.png',
-          },
-          {
-            image: '/static/image/temp-14.png',
-          },
-          {
-            image: '/static/image/temp-14.png',
-          },
-          {
-            image: '/static/image/temp-14.png',
-          },
-          {
-            image: '/static/image/temp-14.png',
-          },
-          {
-            image: '/static/image/temp-14.png',
-          },
-        ]
+      async getData() {
+				try {
+					this.bannerList = (await this.$fetch('queryBannerList', { type: 1 })).records // type：0-首页顶部 1-首页中部
+				} catch (err) {
 
+				}
       },
 			onClickBanner(index) {
 				console.log('onClickBanner', index)

components/partner/posterPopup.vue

@@ -265,7 +265,7 @@
             ctx.restore();
             ctx.save()
             
-            maxWidth = 520 * Ratio / dpr
+            maxWidth = 560 * Ratio / dpr
             lineHeight = 60 * Ratio / dpr
             ctx.font = "normal normal 600 16px normal";
             ctx.fillStyle = "#181818";

components/product/productCard.vue

@@ -8,8 +8,7 @@
     <view class="flex flex-column product-info">
       <view class="product-info-top">
         <view class="product-name text-ellipsis-2">{{ data.title }}</view>
-        <!-- todo: check key -->
-        <view class="product-desc text-ellipsis">{{ data.tagList.join('·') }}</view>
+        <view class="product-desc text-ellipsis" v-if="tagDesc">{{ tagDesc }}</view>
       </view>
       <view class="flex product-info-bottom">
         <view class="product-detail">
@@ -68,11 +67,22 @@
       }
     },
     computed: {
+      tagDesc() {
+        // todo: check key
+        const { tagList } = this.data
+
+        return tagList?.length ? tagList.split('、').join('·') : ''
+        return
+        const { categoryId_dictText, timeId_dictText, ageId_dictText } = this.data
+
+        return [categoryId_dictText, timeId_dictText, ageId_dictText].filter(val => val).join('·')
+      },
       priceInt() {
-        return parseInt(this.data.priceDiscount)
+        return Math.floor(this.data.priceDiscount)
       },
       priceFrac() {
-        return (this.data.priceDiscount % this.priceInt).toFixed(2).slice(1)
+        let frac = this.data.priceDiscount % this.priceInt
+        return frac > 0 ? frac.toFixed(2).slice(1) : ''
       },
       collectBtnWidth() {
         return this.isCollected ? 80 : 56

pages/index/category.vue

@@ -224,66 +224,145 @@
 			async fetchCategoryList() {
         this.categoryList = [
           {
-            id: '001',
-            name: '国际游',
-            children: [],
+            "key": "1962345168240185345",
+            "title": "国际游",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '002',
-            name: '夏令营',
-            children: [],
+            "key": "1962345225345634305",
+            "title": "夏令营",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '003',
-            name: '周末营',
-            children: [],
+            "key": "1962345290571255810",
+            "title": "周末营",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '004',
-            name: '周边游',
-            children: [],
+            "key": "1962345372007862273",
+            "title": "周边游",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '005',
-            name: '定制游',
-            children: [],
+            "key": "1962345497681793025",
+            "title": "定制游",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '006',
-            name: '周末活动',
-            children: [],
+            "key": "1962345589524467714",
+            "title": "周末活动",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '007',
-            name: '亲子活动',
-            children: [],
+            "key": "1962345642188148737",
+            "title": "亲子活动",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '008',
-            name: '社会实践',
-            children: [],
+            "key": "1962345709817106434",
+            "title": "主题研学",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '009',
-            name: '主题研学',
-            children: [],
+            "key": "1962346300198948866",
+            "title": "社会实践",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '010',
-            name: '研学交流',
-            children: [],
+            "key": "1962346769759670273",
+            "title": "研学交流",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '011',
-            name: '假期专项',
-            children: [],
+            "key": "1962346834884628481",
+            "title": "周末研学",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
           {
-            id: '012',
-            name: '本地研学',
-            children: [],
+            "key": "1962346960097185793",
+            "title": "假期专享",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
           },
-        ]
+          {
+            "key": "1962347024639135745",
+            "title": "本地研学",
+            "icon": null,
+            "parentId": "0",
+            "value": null,
+            "code": null,
+            "children": null,
+            "leaf": true
+          }
+        ].map(item => {
+          const { key, title } = item
+
+          return {
+            id: key,
+            name: title,
+            children: []
+          }
+        })
+
         return
 				try {
 					this.categoryList = (await this.$fetch('getCategoryList', { pageSize: 1000 }))?.records?.map(item => ({ id: item.id, name: item.name, children: [] }))
@@ -421,6 +500,12 @@
       },
 			async queryProductList(categoryId) {
 
+				try {
+					return (await this.$fetch('queryActivityList', { ...this.queryParams, categoryId }))?.records || []
+				} catch (err) {
+					return []
+				}
+
         return [
 					{
 						id: '001',
@@ -477,12 +562,6 @@
 						applyNum: 4168,
 					},
 				]
-
-				try {
-					return (await this.$fetch('queryActivityList', { ...this.queryParams, categoryId }))?.records || []
-				} catch (err) {
-					return []
-				}
 			},
 			async initList() {
         console.log('queryParams', this.queryParams)

pages/index/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page__view">
+	<movable-area class="page__view">
 		<!-- <view class="bg">
 			<image class="img" src="@/static/image/bg.png" mode="widthFix"></image>
 		</view> -->
@@ -54,12 +54,22 @@
 			</view>
 
 		</view>
-
-		<!-- todo: 联系客服 -->
+		
+		<movable-view v-if="showBtnService" class="movable-view" :x="273" :y="628" direction="all">
+			<view class="movable-content">
+				<button class="flex btn btn-service" open-type="contact">
+					<view class="label">联系客服</view>
+					<image class="icon" src="@/static/image/icon-service.png" mode="widthFix"></image>
+				</button>
+				<button class="flex btn btn-close" @click.stop="showBtnService = false">
+					<image class="icon" src="@/static/image/icon-close.png" mode="widthFix"></image>
+				</button>
+			</view>
+		</movable-view>
 
 		<tabber select="home" />
 
-	</view>
+	</movable-area>
 </template>
 
 <script>
@@ -88,12 +98,11 @@
 			return {
 				keyword: '',
 				isFocusSearch: false,
-				// todo
-				mixinsListApi: '',
+				mixinsListApi: 'queryActivityList',
+				showBtnService: true,
 			}
 		},
 		onLoad() {
-			this.fetchBanner()
 		},
 		computed: {
 			searchStyle() {
@@ -113,67 +122,7 @@
 				return this.isFocusSearch ? focusStyle : blurStyle
 			},
 		},
-		methods: {			
-			// todo: delete
-			getData() {
-				this.list = [
-					{
-						id: '001',
-						image: '/static/image/temp-20.png',
-						title: '新疆天山行7/9日丨醉美伊犁&吐鲁番双套餐',
-						tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '002',
-						image: '/static/image/temp-20.png',
-						title: '坝上双草原6日|乌兰布统+锡林郭勒＋长城',
-						tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '003',
-						image: '/static/image/temp-20.png',
-						title: '牛湖线探秘 | 清远牛湖线徒步，探秘天坑与大草原',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '004',
-						image: '/static/image/temp-20.png',
-						title: '低海拔藏区草原，汉藏文化大穿越',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '005',
-						image: '/static/image/temp-20.png',
-						title: '新丝路到敦煌7日 | 甘青轻松穿越，沙漠＋草原',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '006',
-						image: '/static/image/temp-20.png',
-						title: '呼伦贝尔6/8日|经典or环线双套餐可选',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-				]
-				this.total = this.list.length
-			},
+		methods: {
 			search() {
 				console.log('search', this.keyword)
         uni.navigateTo({
@@ -181,13 +130,6 @@
 				})
 				// this.keyword = ''
 			},
-			async fetchBanner() {
-				try {
-					await this.$fetch('queryBannerList')
-				} catch (err) {
-
-				}
-			},
 		},
 	}
 </script>
@@ -311,4 +253,49 @@
 		}
 	}
 
+	.movable {
+
+		&-view {
+    	position: fixed;
+			width: auto;
+			height: auto;
+		}
+
+		&-content {
+			position: relative;
+
+			.btn {
+				&-service {
+					column-gap: 4rpx;
+					padding: 6rpx 6rpx 6rpx 18rpx;
+					background: linear-gradient(to right, #21FEEC, #019AF9);
+					border: 2rpx solid #00A9FF;
+					border-radius: 40rpx;
+
+					.label {
+						white-space: nowrap;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						text-shadow: 0 1px 2px #135A98;
+					}
+
+					.icon {
+						width: 64rpx;
+						height: auto;
+					}
+				}
+
+				&-close {
+					width: 32rpx;
+					height: auto;
+					position: absolute;
+					top: 0;
+					left: 0;
+					transform: translate(-10rpx, -10rpx);
+				}
+			}
+		}
+	}
+
 </style>

pages_order/article/index.vue

@@ -2,7 +2,7 @@
   <view class="page__view">
     
 		<!-- 导航栏 -->
-		<navbar :title="details.title" leftClick @leftClick="$utils.navigateBack" />
+		<navbar :title="details.title" leftClick @leftClick="$utils.navigateBack" bgColor="#FFFFFF" />
 
     <!-- <image class="img" :src="details.details" mode="widthFix"></image> -->
     <uv-parse :content="details.details"></uv-parse>
@@ -33,6 +33,9 @@
 </script>
 
 <style scoped lang="scss">
+  .page__view {
+    background: $uni-bg-color;
+  }
 
   .img {
     width: 100vw;

pages_order/article/search.vue

@@ -25,7 +25,7 @@
 
     <view class="list">
       <template v-if="total">
-        <view class="list-item" v-for="item in list" :key="item.id" @click="jumpToDetail(item.id)">
+        <view class="flex list-item" v-for="item in list" :key="item.id" @click="jumpToDetail(item.id)">
           <view class="cover">
             <image class="img" :src="item.image" mode="aspectFill"></image>
           </view>
@@ -72,9 +72,6 @@
       this.getData()
     },
     methods: {
-      // todo: delete
-      getData() {
-      },
       search() {
         this.queryParams.pageNo = 1
         this.queryParams.pageSize = 10
@@ -108,6 +105,10 @@
 
 <style scoped lang="scss">
 
+  .page__view {
+    background: linear-gradient(#DAF3FF, #FBFEFF 250rpx, #FBFEFF);
+  }
+
 	.search {
 		$h: 64rpx;
 		$radius: 32rpx;
@@ -150,14 +151,15 @@
     padding: 12rpx 40rpx;
 
     &-item {
+      align-items: flex-start;
       column-gap: 16rpx;
+      padding: 24rpx;
+      background: #F9F9F9;
+      border: 2rpx solid #FFFFFF;
+      border-radius: 24rpx;
 
       & + & {
         margin-top: 40rpx;
-        padding: 24rpx;
-        background: #F9F9F9;
-        border: 2rpx solid #FFFFFF;
-        border-radius: 24rpx;
       }
 
       .cover {

pages_order/auth/wxUserInfo.vue

@@ -136,7 +136,7 @@
 			},
 			getPhone(e){
 				this.$api('bindPhone', {
-					code : e.detail.code
+					phoneCode : e.detail.code
 				}, res => {
 					if(res.code == 200){
 						

pages_order/comment/commentRecordsOfProduct.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="page__view">
 
-		<navbar title="全部评论" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="全部评论" leftClick @leftClick="$utils.navigateBack" bgColor="#FFFFFF" />
 
     <view class="main">
 

pages_order/live/index.vue

@@ -4,9 +4,9 @@
 		<navbar :title="detail.title" leftClick @leftClick="$utils.navigateBack" />
 
     <view class="header">
-      <image class="icon" :src="detail.image" mode="widthFix"></image>
-      <view class="flex" style="padding: 0 40rpx;">
-        <view class="flex">
+      <image class="cover-img" :src="detail.image" mode="widthFix"></image>
+      <view class="flex" style="padding: 40rpx 40rpx 0 40rpx;">
+        <view class="flex flex-column">
           <view class="title">{{ detail.title }}</view>
           <view class="tag">{{ detail.createTime }}</view>
         </view>
@@ -19,10 +19,9 @@
     <view class="main">
 
       <view class="section" v-for="item in list" :key="item.id">
-        <view class="section-header">
+        <view class="flex section-header">
           <view class="avatar">
-            <!-- todo: check key -->
-            <image class="avatar-img" src="@/pages_order/static/temp-30.png" mode="scaleToFill"></image>
+            <image class="avatar-img" :src="item.avatar" mode="scaleToFill"></image>
           </view>
           <view class="info">
             <view class="flex title">
@@ -73,7 +72,7 @@
         // todo
 				mixinsListApi: '',
         // todo: fetch
-        isManager: true,
+        isManager: false,
       }
     },
     computed: {
@@ -92,21 +91,52 @@
     },
     methods: {
       async fetchDetail() {
-        this.bannerList = [
-          {
-            url: '/pages_order/static/temp-23.png',
-            title: '趣玩新加坡',
-            createTime: '2025-04-18',
-          },
+        // todo: fetch
+        this.detail = {
+          id: '001',
+          image: '/static/image/temp-20.png',
+          title: '趣玩新加坡',
+          createTime: '2025-04-18',
+        }
+      },
+      // todo: delete
+      getData() {
+        this.list = [
           {
-            url: '/pages_order/static/temp-24.png',
-            title: '坝上双草原',
-            createTime: '2025-04-18',
+            id: '001',
+            avatar: '/pages_order/static/temp-30.png',
+            name: '战斗世界',
+            address: '241 Orchard Road, Singapore 238863',
+            createTime: '2023-04-18 12:00:00',
+            images: [
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+            ]
           },
           {
-            url: '/pages_order/static/temp-25.png',
-            title: '牛湖线',
-            createTime: '2025-04-18',
+            id: '001',
+            avatar: '/pages_order/static/temp-30.png',
+            name: '战斗世界',
+            address: '10 Bayfront Avenue, Singapore 018956',
+            createTime: '2023-04-18 12:00:00',
+            images: [
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+            ]
           },
         ]
       },
@@ -129,9 +159,15 @@
 
   .header {
     margin-top: 40rpx;
+    font-size: 0;
+
+    .cover-img {
+      width: 100%;
+      height: auto;
+      border-radius: 40rpx;
+    }
 
     .title {
-      margin-top: 12rpx;
       font-size: 28rpx;
       font-weight: 600;
       color: #252545;
@@ -165,13 +201,14 @@
   }
 
   .main {
-    padding: 0 40rpx;
+    padding: 0 40rpx 40rpx 40rpx;
   }
 
   .section {
     margin-top: 40rpx;
 
     &-header {
+      column-gap: 24rpx;
 
       .avatar {
         flex: none;
@@ -189,12 +226,12 @@
 
       .info {
         flex: 1;
-        column-gap: 24rpx;
+        min-width: 0;
 
         .title {
           column-gap: 8rpx;
           white-space: nowrap;
-          font-size: 26rpx;
+          font-size: 36rpx;
           font-weight: 600;
           color: #252545;
 
@@ -205,6 +242,7 @@
 
           .address {
             flex: 1;
+            font-weight: 400;
             font-size: 24rpx;
             color: #00A9FF;
           }
@@ -212,6 +250,9 @@
 
         .desc {
           margin-top: 8rpx;
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #8B8B8B;
         }
       }
 
@@ -228,6 +269,7 @@
     gap: 16rpx;
 
     &-item {
+      height: 300rpx;
       border: 2rpx solid #CDCDCD;
       border-radius: 12rpx;
       overflow: hidden;

pages_order/live/list.vue

@@ -17,7 +17,7 @@
         @change="changeHandler"
       >
       </SYStackedCarousel>
-      <view class="flex" v-if="swiperCurrent">
+      <view class="flex flex-column" v-if="swiperCurrent">
         <view class="title">{{ swiperCurrent.title }}</view>
         <view class="tag">{{ swiperCurrent.createTime }}</view>
       </view>
@@ -30,12 +30,12 @@
       </view>
 
       <view class="section" v-for="item in list" :key="item.id">
-        <view class="section-header">
+        <view class="flex section-header">
           <view class="flex title">
             <view>{{ item.title }}</view>
             <view v-if="isManager" class="btn btn-add" @click="onAdd(item.id)">新增记录</view>
           </view>
-          <button class="flex btn btn-all" @click="showAll">
+          <button class="flex btn btn-all" @click="showAll(item.id)">
             <view>查看全部</view>
             <image class="icon" src="@/static/image/icon-arrow-right.png" mode="widthFix"></image>
           </button>
@@ -95,22 +95,51 @@
       async fetchBanner() {
         this.bannerList = [
           {
-            url: '/pages_order/static/temp-23.png',
+            url: '/static/image/temp-20.png',
             title: '趣玩新加坡',
             createTime: '2025-04-18',
           },
           {
-            url: '/pages_order/static/temp-24.png',
+            url: '/static/image/temp-20.png',
             title: '坝上双草原',
             createTime: '2025-04-18',
           },
           {
-            url: '/pages_order/static/temp-25.png',
+            url: '/static/image/temp-20.png',
             title: '牛湖线',
             createTime: '2025-04-18',
           },
         ]
       },
+      // todo: delete
+      getData() {
+        this.list = [
+          {
+            id: '001',
+            title: '桂林深度游',
+            images: [
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+            ]
+          },
+          {
+            id: '002',
+            title: '西双版纳雨林10+体验',
+            images: [
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+              '/pages_order/static/temp-38.png',
+            ]
+          },
+        ]
+      },
       clickHandler(item, index) {
         console.log("item: ", item);
         console.log("index: ", index);
@@ -125,6 +154,9 @@
       onAdd() {
         this.$refs.formPopup.open()
       },
+      showAll(id) {
+				this.$utils.navigateTo(`/pages_order/live/index?id=${id}`)
+      },
     },
   }
 </script>
@@ -152,7 +184,7 @@
   }
 
   .main {
-    padding: 0 40rpx;
+    padding: 0 40rpx 40rpx 40rpx;
   }
 
   .header {
@@ -178,6 +210,7 @@
     margin-top: 64rpx;
 
     &-header {
+      justify-content: space-between;
       font-size: 36rpx;
       font-weight: 500;
       color: #191919;
@@ -222,6 +255,7 @@
     gap: 16rpx;
 
     &-item {
+      height: 300rpx;
       border: 2rpx solid #CDCDCD;
       border-radius: 12rpx;
       overflow: hidden;

pages_order/order/components/orderInfoView.vue

@@ -14,7 +14,7 @@
             <view>{{ getTypeDesc(item.type) }}</view>
             <view class="light">{{ getTypeTips(item.type) }}</view>
           </view>
-          <view class="info-bottom">{{ item.idNo }}</view>
+          <view class="info-bottom">{{ item.cerNo }}</view>
         </view>
         <view class="flex price">¥<view class="highlight">{{ item.price }}</view></view>
       </view>

pages_order/order/orderConfirm/index.vue

@@ -342,7 +342,9 @@
             phone,
           }
 
-          await this.$fetch('createOrder', params)
+          const result = await this.$fetch('createOrder', params)
+
+          // todo: check result includes order id?
 
           const orderInfo = {
             product,
@@ -362,7 +364,7 @@
           
           // todo: get id?
           uni.navigateTo({
-            url: `/pages_order/order/orderPay/index`
+            url: `/pages_order/order/orderPay/index?id=${result.id}`
           })
 
         } catch (err) {
@@ -370,20 +372,6 @@
         }
 
       },
-      onPaySuccess() {
-        setTimeout(() => {
-          // todo: check → jump to order list page ?
-          uni.reLaunch({
-            url: `/pages_order/order/orderList/index`
-          });
-        }, 700)
-      },
-      onPayCancel() {
-        // todo: check → jump to order list page?
-				uni.redirectTo({
-					url: `/pages_order/order/orderList/index?index=1`
-        });
-      },
     },
   }
 </script>

pages_order/order/orderConfirm/infoPopup.vue

@@ -169,46 +169,7 @@
       },
       async getDefaultMembers() {
         try {
-          // todo: fetch defalt members
-          return [
-            {
-              id: '001',
-              name: '李梓发',
-              idNo: '430223********9999',
-              type: 0,
-            },
-            {
-              id: '002',
-              name: '吴彦谦',
-              idNo: '430223********9999',
-              type: 0,
-            },
-            {
-              id: '003',
-              name: '冯云',
-              idNo: '430223********9999',
-              type: 1,
-            },
-            {
-              id: '004',
-              name: '冯思钗',
-              idNo: '430223********9999',
-              type: 2,
-            },
-            {
-              id: '005',
-              name: '李书萍',
-              idNo: '430223********9999',
-              type: 0,
-            },
-            {
-              id: '006',
-              name: '冯艺莲',
-              idNo: '430223********9999',
-              type: 1,
-            },
-          ]
-
+          return (await this.$fetch('queryTouristList', { isDefault: '1' })).records
         } catch (err) {
           return []
         }

pages_order/order/orderConfirm/memberCard.vue

@@ -18,7 +18,7 @@
         <view>{{ data.name }}</view>
         <view :class="['tag', `tag-${data.type}`]">{{ typeDesc }}</view>
       </view>
-      <view class="id">{{ data.idNo }}</view>
+      <view class="id">{{ data.cerNo }}</view>
     </view>
   </view>
 </template>

pages_order/order/orderConfirm/timeOptionsSelect.vue

@@ -58,10 +58,11 @@
     },
     methods: {
       priceInt(priceDiscount) {
-        return parseInt(priceDiscount)
+        return Math.floor(priceDiscount)
       },
       priceFrac(priceDiscount) {
-        return (priceDiscount % this.priceInt(priceDiscount)).toFixed(2).slice(1)
+        let frac = priceDiscount % this.priceInt(priceDiscount)
+        return frac > 0 ? frac.toFixed(2).slice(1) : ''
       },
     },
   }

pages_order/order/orderDetail/index.vue

@@ -91,6 +91,7 @@
     },
     data() {
       return {
+        id: null,
         detail: {},
       }
     },
@@ -118,10 +119,10 @@
 				return total
 			},
     },
-    onLoad() {
-      // console.log('orderInfo', this.orderInfo)
-      // this.detail = this.orderInfo
-      // todo: check fetch by id?
+    onLoad(arg) {
+      const { id } = arg
+      this.id = id
+
       this.getData()
     },
     onPullDownRefresh() {
@@ -131,6 +132,10 @@
       async getData() {
           try {
 
+            this.detail = await this.$fetch('queryOrderById', { orderId: this.id })
+
+            return
+
             this.detail = {
               product: {
                 id: '001',
@@ -181,7 +186,7 @@
               members: [
                 {
                   id: "001",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "李梓发",
@@ -189,7 +194,7 @@
                 },
                 {
                   id: "002",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "吴彦谦",
@@ -197,7 +202,7 @@
                 },
                 {
                   id: "003",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "冯云",
@@ -205,7 +210,7 @@
                 },
                 {
                   id: "004",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "冯思钗",

pages_order/order/orderPay/index.vue

@@ -91,6 +91,7 @@
     },
     data() {
       return {
+        id: null,
         detail: {},
       }
     },
@@ -118,7 +119,9 @@
 				return total
 			},
     },
-    onLoad() {
+    onLoad({ id }) {
+      this.id = id
+
       // console.log('orderInfo', this.orderInfo)
       // this.detail = this.orderInfo
       // todo: check fetch by id?
@@ -181,7 +184,7 @@
               members: [
                 {
                   id: "001",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "李梓发",
@@ -189,7 +192,7 @@
                 },
                 {
                   id: "002",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "吴彦谦",
@@ -197,7 +200,7 @@
                 },
                 {
                   id: "003",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "冯云",
@@ -205,7 +208,7 @@
                 },
                 {
                   id: "004",
-                  idNo: "430223********9999",
+                  cerNo: "430223********9999",
                   isDefault: false,
                   isSelected: true,
                   name: "冯思钗",
@@ -236,8 +239,10 @@
       async onPay() {
         try {
      
-          // todo: fetch pay
+          const result = await this.$fetch('payOrder', { orderId: this.id })
           
+          await uni.requestPaymentWxPay({ result })
+       
           uni.showToast({
             title: '支付成功',
             icon: 'none'

pages_order/product/collectList.vue

@@ -6,7 +6,7 @@
   
     <view class="list">
       <view class="list-item" v-for="item in list" :key="item.id">
-        <productCard :data="item" :isCollected="true" @collect="getData"></productCard>
+        <productCard :data="item.activity" :isCollected="true" @collect="getData"></productCard>
       </view>
     </view>
   </view>
@@ -24,8 +24,7 @@
 		},
     data() {
       return {
-        // todo: queryCollectionActivityList
-				mixinsListApi: '',
+				mixinsListApi: 'queryCollectionActivityList',
       }
     },
   }

pages_order/product/productDetail.vue

@@ -1,8 +1,9 @@
 <template>
   <view class="page__view">
-		<navbar title="活动详情" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="transparent" />
 
     <view class="main">
+		  <navbar title="活动详情" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="transparent" />
+
       <view class="swiper">
         <uv-swiper 
           :list="bannerList" 
@@ -18,10 +19,9 @@
         <view class="card info">
           <view class="card-header">{{ detail.title }}</view>
           <view class="card-content">
-            <!-- todo: check key -->
             <view class="desc">{{ detail.brief }}</view>
-            <view class="flex tags" v-if="detail.tagDetails">
-              <view class="tag" v-for="(tag, tIdx) in detail.tagDetails" :key="tIdx">
+            <view class="flex tags" v-if="tagList.length">
+              <view class="tag" v-for="(tag, tIdx) in tagList" :key="tIdx">
                 {{ tag }}
               </view>
             </view>
@@ -147,11 +147,18 @@
 
 				return Array.isArray(image) ? image : image.split(',')
 			},
+      tagList() {
+        // todo: check key
+        const { tagDetails } = this.detail || {}
+
+        return tagDetails?.length ? tagDetails.split('、') : []
+      },
       priceInt() {
-        return parseInt(this.detail.priceDiscount)
+        return Math.floor(this.detail.priceDiscount)
       },
       priceFrac() {
-        return (this.detail.priceDiscount % this.priceInt).toFixed(2).slice(1)
+        let frac = this.detail.priceDiscount % this.priceInt
+        return frac > 0 ? frac.toFixed(2).slice(1) : ''
       },
       displayContent() {
         const {
@@ -181,6 +188,18 @@
     },
     methods: {
       async fetchDetail(activityId) {
+
+        try {
+          const result = await this.$fetch('queryActivityById', { activityId })
+
+          // todo: init options
+          this.detail = result
+        } catch (err) {
+
+        }
+
+        return
+
         // todo: delete
         this.detail = {
           id: '001',
@@ -239,18 +258,6 @@
             <p>
           `,
         }
-
-        return
-
-        try {
-          const result = await this.$fetch('queryActivityById', { activityId })
-
-          // todo: init options
-          this.detail = result
-        } catch (err) {
-
-        }
-
       },
       async fetchComment(id) {
 
@@ -298,18 +305,12 @@
     min-height: 100vh;
 	  background: linear-gradient(#DAF3FF, #F3F3F3 500rpx, #F3F3F3);
     position: relative;
-  
-    /deep/ .nav-bar__view {
-      position: fixed;
-      top: 0;
-      left: 0;
-    }
-    
   }
 
   .main {
     width: 100vw;
-    padding: calc(var(--status-bar-height) + 120rpx) 0 198rpx 0;
+    // padding: calc(var(--status-bar-height) + 120rpx) 0 198rpx 0;
+    padding-bottom: 198rpx;
     box-sizing: border-box;
 	}
 
@@ -357,6 +358,7 @@
 
       .desc {
         font-size: 26rpx;
+        white-space: pre-wrap;
         color: #8B8B8B;
       }
 

pages_order/product/search.vue

@@ -2,7 +2,7 @@
   <view class="page__view">
 
     <!-- 导航栏 -->
-		<navbar title="搜索结果" leftClick @leftClick="$utils.navigateBack" bgColor="transparent" color="#191919" />
+		<navbar :title="title" leftClick @leftClick="$utils.navigateBack" bgColor="transparent" color="#191919" />
 
     <!-- 搜索栏 -->
     <view :class="['flex', 'search', isFocusSearch ? 'is-focus' : '']" >
@@ -56,6 +56,7 @@
     },
     data() {
       return {
+				title: '搜索结果',
 				keyword: '',
 				isFocusSearch: false,
 				queryParams: {
@@ -68,75 +69,27 @@
         mixinsListApi: 'queryActivityList',
       }
     },
-    onLoad({ search }) {
+    onLoad({ search, title, isDiscount, isHot, isNew }) {
       if (search) {
         this.keyword = search
 				this.queryParams.title = search
 			}
+      if (title) {
+        this.title = title
+      }
+      if (isDiscount) {
+        this.queryParams.isDiscount = isDiscount
+      }
+      if (isHot) {
+        this.queryParams.isHot = isHot
+      }
+      if (isNew) {
+        this.queryParams.isNew = isNew
+      }
       
       this.getData()
     },
-    methods: {	
-			// todo: delete
-			getData() {
-				this.list = [
-					{
-						id: '001',
-						image: '/static/image/temp-20.png',
-						title: '新疆天山行7/9日丨醉美伊犁&吐鲁番双套餐',
-						tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '002',
-						image: '/static/image/temp-20.png',
-						title: '坝上双草原6日|乌兰布统+锡林郭勒＋长城',
-						tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '003',
-						image: '/static/image/temp-20.png',
-						title: '牛湖线探秘 | 清远牛湖线徒步，探秘天坑与大草原',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '004',
-						image: '/static/image/temp-20.png',
-						title: '低海拔藏区草原，汉藏文化大穿越',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '005',
-						image: '/static/image/temp-20.png',
-						title: '新丝路到敦煌7日 | 甘青轻松穿越，沙漠＋草原',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-					{
-						id: '006',
-						image: '/static/image/temp-20.png',
-						title: '呼伦贝尔6/8日|经典or环线双套餐可选',
-            tagList: ['国内游','7-9天','12岁+'],
-						priceDiscount: 688.99,
-						priceOrigin: 1200,
-						applyNum: 4168,
-					},
-				]
-				this.total = this.list.length
-			},
+    methods: {
       search() {
         this.queryParams.pageNo = 1
         this.queryParams.pageSize = 10

pages_order/traveler/travelerCard.vue

@@ -2,24 +2,20 @@
   <view class="card">
     <view class="flex top">
       <view>
-        <uv-checkbox-group
-          v-model="selectCheckboxValue"
-          @change="onSelectChange"
-        >
-          <uv-checkbox
-            size="36rpx"
-            icon-size="36rpx"
-            activeColor="#00A9FF"
-            :name="1"
-          ></uv-checkbox>
-        </uv-checkbox-group>
+        <uv-checkbox
+          size="36rpx"
+          icon-size="36rpx"
+          activeColor="#00A9FF"
+          :name="data.id"
+        ></uv-checkbox>
       </view>
       <view class="info">
         <view class="flex name">
           <view>{{ data.name }}</view>
+          <!-- todo: transform periodId to desc -->
           <view :class="['tag', `tag-${data.type}`]">{{ typeDesc }}</view>
         </view>
-        <view class="id">{{ data.idNo }}</view>
+        <view class="id">{{ data.cerNo }}</view>
       </view>
     </view>
     <view class="flex bottom">
@@ -70,25 +66,10 @@
     },
     data() {
       return {
-        selectCheckboxValue: [],
         defaultCheckboxValue: [],
       }
     },
     computed: {
-      isSelected: {
-        set(val) {
-          this.selectCheckboxValue = val ? [1]: []
-
-          if (this.data.isSelected == val) {
-            return
-          }
-
-          this.$emit('selectChange', val)
-        },
-        get() {
-          return this.selectCheckboxValue.length ? true : false
-        }
-      },
       isDefault: {
         set(val) {
           this.defaultCheckboxValue = val ? [1]: []
@@ -110,7 +91,6 @@
     watch: {
       data: {
         handler(val) {
-          this.isSelected = val.isSelected
           this.isDefault = val.isDefault
         },
         immediate: true,
@@ -118,9 +98,6 @@
       }
     },
     methods: {
-      onSelectChange(val) {
-        this.isSelected = val.length ? true : false
-      },
       onDefaultChange(val) {
         this.isDefault = val.length ? true : false
       },

pages_order/traveler/travelerList.vue

@@ -4,17 +4,16 @@
 		<navbar title="选择出行人" leftClick @leftClick="$utils.navigateBack" color="#191919" bgColor="#FFFFFF" />
 
 		<view class="main">
-
-      <view class="card" v-for="item in list" :key="item.id">
-        <travelerCard 
-          :data="item" 
-          @defaultChange="onDefaultChange(item.id, $event)"
-          @selectChange="onSelectChange(item.id, $event)"
-          @edit="onEdit(item.id)"
-          @delete="onDelete(item.id)"
-        ></travelerCard>
-      </view>
-
+      <uv-checkbox-group v-model="selectedIdList" placement="column">
+        <view class="card" v-for="item in list" :key="item.id">
+          <travelerCard 
+            :data="item" 
+            @defaultChange="onDefaultChange(item.id, $event)"
+            @edit="onEdit(item.id)"
+            @delete="onDelete(item.id)"
+          ></travelerCard>
+        </view>
+		  </uv-checkbox-group>
     </view>
   
 		<view class="flex bottom">
@@ -41,8 +40,7 @@
     },
     data() {
       return {
-        // todo: check key
-				mixinsListApi: '',
+				mixinsListApi: 'queryTouristList',
         queryParams: {
           pageNo: 1,
           pageSize: 10,
@@ -63,91 +61,32 @@
       this.$store.commit('setTravelerList', list)
     },
     methods: {
-      updateSelectIdList() {
-        this.selectedIdList = this.list.filter(item => item.isSelected).map(item => item.id)
-      },
-      // todo: delete
-      getData() {
-        let records = [
-          {
-            id: '001',
-            name: '李梓发',
-            idNo: '430223********9999',
-            type: 0,
-            isSelected: false,
-            isDefault: false,
-          },
-          {
-            id: '002',
-            name: '吴彦谦',
-            idNo: '430223********9999',
-            type: 0,
-            isSelected: false,
-            isDefault: false,
-          },
-          {
-            id: '003',
-            name: '冯云',
-            idNo: '430223********9999',
-            type: 1,
-            isSelected: false,
-            isDefault: false,
-          },
-          {
-            id: '004',
-            name: '冯思钗',
-            idNo: '430223********9999',
-            type: 2,
-            isSelected: false,
-            isDefault: false,
-          },
-          {
-            id: '005',
-            name: '李书萍',
-            idNo: '430223********9999',
-            type: 0,
-            isSelected: false,
-            isDefault: false,
-          },
-          {
-            id: '006',
-            name: '冯艺莲',
-            idNo: '430223********9999',
-            type: 1,
-            isSelected: false,
-            isDefault: false,
-          },
-        ]
-
-        this.selectedIdList.forEach(id => {
-          const target = records.find(item => item.id === id)
-          target.isSelected = true
+      getDataThen(records) {
+        this.list = records.map(item => {
+          return {
+            ...item,
+            // todo: transform periodId to type and type desc
+            type: 0, // 0-成人 1-青少年 2-儿童
+            isDefault: item.isDefault == '1' ? true : false
+          }
         })
-
-        this.list = records
-        this.updateSelectIdList()
       },
       async onDefaultChange(id, val) {
         try {
-          // todo: fetch
-          // await this.$fetch('setAddressDefault', { addressId })
-
           const target = this.list.find(item => item.id === id)
 
-          target.isDefault = val
+          const params = {
+            ...target,
+            isDefault: val ? '1' : '0',
+          }
+          
+          await this.$fetch('updateTourist', params)
 
-          this.updateSelectIdList()
+          target.isDefault = val
         } catch (err) {
 
         }
       },
-      onSelectChange(id, val) {
-        const target = this.list.find(item => item.id === id)
-
-        target.isSelected = val
-
-        this.updateSelectIdList()
-      },
       async onDelete(id) {
         
         uni.showToast({
@@ -157,7 +96,7 @@
         
         try {
           // todo: check api & key
-          // await this.$fetch('deleteAddress', { id })
+          // await this.$fetch('deleteTourist', { id })
 
           uni.showToast({
             icon: 'success',

pages_order/traveler/travelerPopup.vue

@@ -25,13 +25,13 @@
               </uv-form-item>
             </view>
             <view class="form-item">
-              <uv-form-item prop="idNo" :customStyle="formItemStyle">
+              <uv-form-item prop="cerNo" :customStyle="formItemStyle">
                 <view class="form-item-label">
                   <image class="icon" src="@/pages_order/static/icon-require.png" mode="widthFix"></image>
                   身份证号
                 </view>
                 <view class="form-item-content">
-                  <formInput v-model="form.idNo"></formInput>
+                  <formInput v-model="form.cerNo"></formInput>
                 </view>
               </uv-form-item>
             </view>
@@ -42,7 +42,7 @@
                   类型
                 </view>
                 <view class="form-item-content">
-                  <uv-radio-group v-model="form.type"
+                  <uv-radio-group v-model="form.periodId"
                     iconColor="#00A9FF"
                     iconSize="36rpx"
                     size="36rpx"
@@ -50,7 +50,7 @@
                     labelSize="26rpx"
                   >
                       <uv-radio 
-                        v-for="(item, index) in typeOptions" 
+                        v-for="(item, index) in periodOptions" 
                         :key="index" 
                         :label="item.label" 
                         :name="item.value"
@@ -61,13 +61,13 @@
               </uv-form-item>
             </view>
             <view class="form-item">
-              <uv-form-item prop="gender" :customStyle="formItemStyle">
+              <uv-form-item prop="sex" :customStyle="formItemStyle">
                 <view class="form-item-label">
                   <image class="icon" src="@/pages_order/static/icon-require.png" mode="widthFix"></image>
                   性别
                 </view>
                 <view class="form-item-content">
-                  <uv-radio-group v-model="form.gender"
+                  <uv-radio-group v-model="form.sex"
                     iconColor="#00A9FF"
                     iconSize="36rpx"
                     size="36rpx"
@@ -75,7 +75,7 @@
                     labelSize="26rpx"
                   >
                     <uv-radio 
-                      v-for="(item, index) in genderOptions" 
+                      v-for="(item, index) in sexOptions" 
                       :key="index" 
                       :label="item.label" 
                       :name="item.value"
@@ -97,10 +97,10 @@
               </uv-form-item>
             </view>
             <view class="form-item">
-              <uv-form-item prop="wx" :customStyle="formItemStyle">
+              <uv-form-item prop="wechat" :customStyle="formItemStyle">
                 <view class="form-item-label">微信号</view>
                 <view class="form-item-content">
-                  <formInput v-model="form.wx"></formInput>
+                  <formInput v-model="form.wechat"></formInput>
                 </view>
               </uv-form-item>
             </view>
@@ -137,24 +137,24 @@
               </uv-form-item>
             </view>
             <view class="form-item">
-              <uv-form-item prop="emergencyContact" :customStyle="formItemStyle">
+              <uv-form-item prop="emergencyPhone" :customStyle="formItemStyle">
                 <view class="form-item-label">
                   <image class="icon" src="@/pages_order/static/icon-require.png" mode="widthFix"></image>
                   紧急联系人
                 </view>
                 <view class="form-item-content">
-                  <formInput v-model="form.emergencyContact"></formInput>
+                  <formInput v-model="form.emergencyPhone"></formInput>
                 </view>
               </uv-form-item>
             </view>
             <view class="form-item">
-              <uv-form-item prop="guardiancontact" :customStyle="formItemStyle">
+              <uv-form-item prop="chaperonPhone" :customStyle="formItemStyle">
                 <view class="form-item-label">
                   <image class="icon" src="@/pages_order/static/icon-require.png" mode="widthFix"></image>
                   监护人联系方式
                 </view>
                 <view class="form-item-content">
-                  <formInput v-model="form.guardiancontact"></formInput>
+                  <formInput v-model="form.chaperonPhone"></formInput>
                 </view>
               </uv-form-item>
             </view>
@@ -211,17 +211,17 @@
         title: null,
         form: {
           name: null,
-          idNo: null,
-          type: 0,
-          gender: 0,
+          cerNo: null,
+          periodId: 0,
+          sex: 0,
           phone: null,
-          wx: null,
+          wechat: null,
           school: null,
           grade: null,
           age: null,
           remark: null,
-          emergencyContact: null,
-          guardiancontact: null,
+          emergencyPhone: null,
+          chaperonPhone: null,
         },
         rules: {
           'name': {
@@ -229,17 +229,17 @@
             required: true,
             message: '请输入姓名',
           },
-          'idNo': {
+          'cerNo': {
             type: 'string',
             required: true,
             message: '请输入身份证号',
           },
-          'type': {
+          'periodId': {
             type: 'string',
             required: true,
             message: '请选择类型',
           },
-          'gender': {
+          'sex': {
             type: 'string',
             required: true,
             message: '请选择性别',
@@ -249,20 +249,20 @@
             required: true,
             message: '请输入手机号',
           },
-          'emergencyContact': {
+          'emergencyPhone': {
             type: 'string',
             required: true,
             message: '请输入紧急联系人联系方式',
           },
-          'guardiancontact': {
+          'chaperonPhone': {
             type: 'string',
             required: true,
             message: '请输入监护人联系方式',
           },
         },
         formItemStyle: { padding: 0 },
-        // todo: check
-        typeOptions: [
+        // todo: fetch
+        periodOptions: [
           {
             id: '001',
             label: '成人',
@@ -279,7 +279,8 @@
             value: '2',
           },
         ],
-        genderOptions: [
+        // todo: check
+        sexOptions: [
           {
             id: '001',
             label: '男',
@@ -295,10 +296,40 @@
       }
     },
     methods: {
-      async fetchTravelerDetail(id) {
+      async fetchTravelerDetail(personId) {
         try {
 
-          // todo: fetch
+          const result = await this.$fetch('queryTouristById', { personId })
+
+          const {
+            name,
+            cerNo,
+            periodId,
+            sex,
+            phone,
+            wechat,
+            school,
+            grade,
+            age,
+            remark,
+            emergencyPhone,
+            chaperonPhone,
+          } = result
+
+          this.form = {
+            name,
+            cerNo,
+            periodId,
+            sex,
+            phone,
+            wechat,
+            school,
+            grade,
+            age,
+            remark,
+            emergencyPhone,
+            chaperonPhone,
+          }
 
         } catch (err) {
 
@@ -315,17 +346,18 @@
           this.title = '添加出行人'
           this.form = {
             name: null,
-            idNo: null,
-            type: 0,
-            gender: 0,
+            cerNo: null,
+            // todo: fetch default
+            periodId: 0,
+            sex: 0,
             phone: null,
-            wx: null,
+            wechat: null,
             school: null,
             grade: null,
             age: null,
             remark: null,
-            emergencyContact: null,
-            guardiancontact: null,
+            emergencyPhone: null,
+            chaperonPhone: null,
           }
         }
 
@@ -353,16 +385,39 @@
           await this.$refs.form.validate()
 
           const {
+            name,
+            cerNo,
+            periodId,
+            sex,
+            phone,
+            wechat,
+            school,
+            grade,
+            age,
+            remark,
+            emergencyPhone,
+            chaperonPhone,
           } = this.form
 
           const params = {
+            name,
+            cerNo,
+            periodId,
+            sex,
+            phone,
+            wechat,
+            school,
+            grade,
+            age,
+            remark,
+            emergencyPhone,
+            chaperonPhone,
           }
 
           if (this.id) {
             params.id = this.id
 
-            // todo: fetch
-            // await this.$fetch('updateAddress', params)
+            await this.$fetch('updateTourist', params)
             
             uni.showToast({
               icon: 'success',
@@ -371,8 +426,7 @@
 
           } else {
 
-            // todo: fetch
-            // await this.$fetch('addAddress', params)
+            await this.$fetch('addTourist', params)
             
             uni.showToast({
               icon: 'success',

store/store.js

@@ -86,6 +86,8 @@ const store = new Vuex.Store({
 		},
 		// 获取用户个人信息
 		getUserInfo(state){
+			// todo delete
+			return
 			api('getInfo', res => {
 				if(res.code == 200){
 					state.userInfo = res.result
@@ -125,13 +127,6 @@ const store = new Vuex.Store({
 		async collect(state, activityId) {
 			console.log('collect', activityId)
 
-			// todo: delete
-			uni.showToast({
-				icon: 'success',
-				title: '已收藏',
-			});
-			return true
-
 			try {
 
 				await fetch('collectionActivity', { activityId })

uni_modules/uv-tabs/components/uv-tabs/uv-tabs.vue

@@ -135,7 +135,6 @@
 			current: {
 				immediate: true,
 				handler (newValue, oldValue) {
-					console.log('watch current', newValue, oldValue, this.innerCurrent)
 					// 内外部值不相等时，才尝试移动滑块
 					if (newValue !== this.innerCurrent) {
 						this.innerCurrent = newValue

uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue

@@ -202,7 +202,6 @@
 		},
 		watch: {
 			current(newVal){
-				console.log('watch current', newVal)
 				if(!this.touching) 
 					this.$nextTick(()=>{
 						this.init(newVal?newVal:0);
@@ -277,7 +276,6 @@
 			},
 			// 左边菜单点击
 			async clickHandler(currentIndex) {
-				console.log('clickHandler', currentIndex, this.activeIndex)
 				if (currentIndex == this.activeIndex) return;
 				this.touching = true;
 				this.activeIndex = currentIndex;
@@ -287,7 +285,6 @@
 					// #ifndef MP-WEIXIN
 					this.contentScrollTo = `content_${currentIndex}`;
 					// #endif
-					console.log('contentScrollTop', this.contentScrollTop)
 				}
 				this.timer && clearTimeout(this.timer);
 				throttle(()=>{