diff --git a/components/home/productSwiper.vue b/components/home/productSwiper.vue
index 386d643..978b576 100644
--- a/components/home/productSwiper.vue
+++ b/components/home/productSwiper.vue
@@ -1,9 +1,9 @@
 <template>
-  <view>
+  <view class="product-swiper__view">
     <swiper 
       class="swiper" 
       :current="current"
-      :autoplay="true"
+      :autoplay="autoplay"
       @change="onChange"
     >
       <swiper-item v-for="item in list" :key="item.id">
@@ -49,6 +49,12 @@
 	export default {
 		components: {
       indicator,
+    },
+    props: {
+      autoplay: {
+        type: Boolean,
+        default: false,
+      },
     },
 		data() {
 			return {
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 4b34d46..8b0213a 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -134,8 +134,6 @@
 			// },
 			totalPrice() {
 				return this.selectedList.reduce((price, item) => {
-					// todo: check key
-					// return price + item.price * (item.count || 1)
 					return price + item.currentPrice
 				}, 0)
 			},
@@ -267,8 +265,6 @@
         })
 			},
 			onBuy() {
-				// todo: check id
-
 				const list = this.selectedList.map(item => {
 					const { id, product, currentPrice, specId, specName } = item
 
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 499268d..5632067 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -119,15 +119,12 @@
 				list1: [
 					{ id: '001', label: '检测预约', icon: '/pages_order/static/center/icon-detectBook.png', path: '/pages_order/checkup/checkupRecords' },
 					{ id: '002', label: '联系客服', icon: '/pages_order/static/center/icon-service.png', key: 'service' },
-					// todo: check key
-					{ id: '003', label: '服用说明', icon: '/pages_order/static/center/icon-instruc.png', path: `/pages_order/common?key=instruc&title=服用说明` },
-					// todo: check key
-					{ id: '004', label: '用户须知', icon: '/pages_order/static/center/icon-userAgreement.png', path: `/pages_order/common?key=userAgreement&title=用户须知` },
+					{ id: '003', label: '服用说明', icon: '/pages_order/static/center/icon-instruc.png', path: `/pages_order/common?key=medication_instructions&title=服用说明` },
+					{ id: '004', label: '用户须知', icon: '/pages_order/static/center/icon-userAgreement.png', path: `/pages_order/common?key=user_notice&title=用户须知` },
 				],
 				list2: [
 					{ id: '005', label: '我的评价', icon: '/pages_order/static/center/icon-comment.png', key: 'comment' },
-					// todo: check key
-					{ id: '006', label: '关于我们', icon: '/pages_order/static/center/icon-aboutUs.png', path: `/pages_order/common?key=aboutUs&title=关于我们` },
+					{ id: '006', label: '关于我们', icon: '/pages_order/static/center/icon-aboutUs.png', path: `/pages_order/common?key=about_us&title=关于我们` },
 					{ id: '007', label: '修改信息', icon: '/pages_order/static/center/icon-modifyInfo.png', path: `/pages_order/auth/wxUserInfo?mode=edit` },
 					{ id: '008', label: '退出登录', icon: '/pages_order/static/center/icon-logout.png', key: 'logout' },
 				],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6fb6479..91d5e56 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,11 +6,15 @@
 		</navbar>
 
 		<view class="content">
-			<productSwiper></productSwiper>
+			<view id="productSwiper" class="swiper">
+				<productSwiper :autoplay="autoplay.productSwiper"></productSwiper>
+			</view>
 
 			<view class="section">
 				<sectionHeader title="个性推荐" desc="Personal Recommendation"></sectionHeader>
-				<recommend-swiper></recommend-swiper>
+				<view id="recommendSwiper" class="swiper">
+					<recommend-swiper :autoplay="autoplay.recommendSwiper"></recommend-swiper>
+				</view>
 				<health-records-intro></health-records-intro>
 			</view>
 
@@ -62,6 +66,12 @@
 		},
 		data() {
 			return {
+				isMounted: false,
+        observer: null,
+				autoplay: {
+					productSwiper: false,
+					recommendSwiper: false,
+				},
 			}
 		},
 		onLoad() {
@@ -71,7 +81,37 @@
 			}
 
 		},
+		onShow() {
+			if (this.isMounted) {
+				this.observeElement()
+			}
+		},
+    mounted() {
+      this.observeElement()
+			this.isMounted = true
+    },
+    unmounted() {
+      this.observer.disconnect()
+    },
+		onHide() {
+      this.observer.disconnect()
+			this.observer = null
+			this.autoplay.productSwiper = false
+			this.autoplay.recommendSwiper = false
+		},
 		methods: {
+      observeElement() {
+        this.observer = uni.createIntersectionObserver(this, { observeAll: true, thresholds: [0, 1] });
+
+        this.observer.relativeTo('.content').observe('.swiper', res => {
+					if (res.intersectionRatio === 0) {
+						this.autoplay[res.id] = false
+					} else if (res.intersectionRatio === 1) {
+						this.autoplay[res.id] = true
+					}
+        })
+ 
+      },
 		},
 	}
 </script>
@@ -91,8 +131,13 @@
 	}
 
 	.content {
-		// padding: 80rpx 32rpx 182rpx 32rpx;
+		width: 100vw;
+		height: calc(100vh - (var(--status-bar-height) + 120rpx) - (env(safe-area-inset-bottom) + 120rpx));
 		padding: 70rpx 0 182rpx 0;
+		// padding-bottom: calc(env(safe-area-inset-bottom) + 120rpx + 182rpx);
+		box-sizing: border-box;
+		overflow-x: hidden;
+		overflow-y: auto;
 	}
 
 	.section {
diff --git a/pages/index/product.vue b/pages/index/product.vue
index 4b209fc..d5c5895 100644
--- a/pages/index/product.vue
+++ b/pages/index/product.vue
@@ -95,7 +95,6 @@
       onTabChange(e) {
         console.log('current', e.index)
         this.current = e.index
-        // todo
 
         this.queryParams.pageNo = 1
         this.queryParams.pageSize = 10
diff --git a/pages/index/report.vue b/pages/index/report.vue
index aa862f3..56dc5e0 100644
--- a/pages/index/report.vue
+++ b/pages/index/report.vue
@@ -12,7 +12,7 @@
         <recommend-test></recommend-test>
       </view>
 
-			<view class="section">
+			<view id="paperList" class="section">
 				<view class="filter">
 					<view class="filter-item" 
 						v-for="item in filters" 
@@ -67,32 +67,55 @@
       }
     },
 		onShow() {
-			console.log('onShow')
 			if(uni.getStorageSync('token')){
 				this.$store.commit('getUserInfo')
-				this.fetchRecentReport()
-				this.getData()
+				this.initData()
 			}
 		},
     methods: {
-			async fetchRecentReport() {
+			async initData() {
 				try {
 					const result = await this.$fetch('getRecentReport')
-					const [currentReport, lastReport] = result
-					
-					let change = 0
 
-					if (lastReport) {
-						change = parseInt(currentReport.score - lastReport.score)
+					if (result?.length) {
+						const [currentReport, lastReport] = result
+						
+						let change = 0
+
+						if (lastReport) {
+							change = parseInt(currentReport.score - lastReport.score)
+						}
+						
+						this.summaryData = {
+							id: currentReport.id,
+							paperId: currentReport.paperId,
+							score: parseInt(currentReport.score),
+							change,
+						}
+
+						this.getData()
+						return
 					}
-					
+
+					this.queryParams.type = 1 // 未完成
+
+					await this.getData()
+
 					this.summaryData = {
-						id: currentReport.id,
-						paperId: currentReport.paperId,
-						score: parseInt(currentReport.score),
-						change,
+						id: null,
+						paperId: this.list[0]?.id,
+						score: 0,
+						change: 0,
 					}
-					console.log('summaryData', this.summaryData)
+					
+					this.$nextTick(() => {
+						uni.pageScrollTo({
+							// scrollTop: 600,       // 滚动到页面的顶部
+							duration: 300,      // 动画时长（单位 ms）
+							selector: '#paperList' // 通过选择器指定滚动目标（H5 端支持）
+						})
+					})
+
 				} catch (err) {
 
 				}
diff --git a/pages_order/address/addressCard.vue b/pages_order/address/addressCard.vue
index d2315f0..86a5528 100644
--- a/pages_order/address/addressCard.vue
+++ b/pages_order/address/addressCard.vue
@@ -63,8 +63,6 @@
             return
           }
 
-          // todo: set this address as default
-
           this.$emit('defaultChange', val)
         },
         get() {
@@ -86,7 +84,6 @@
         this.isDefault = 1
       },
       onEdit() {
-        // todo
         this.$emit('edit')
       },
       onDelete() {
@@ -94,7 +91,6 @@
           title: '确认删除？',
           success : e => {
             if(e.confirm){
-							// todo
               this.$emit('delete')
             }
           }
diff --git a/pages_order/address/addressPopup.vue b/pages_order/address/addressPopup.vue
index ae51187..dd2a1a6 100644
--- a/pages_order/address/addressPopup.vue
+++ b/pages_order/address/addressPopup.vue
@@ -286,8 +286,6 @@
 
   .footer {
     width: 100%;
-    // todo：check
-    // height: 214rpx;
     padding: 32rpx 40rpx;
     box-sizing: border-box;
     border-top: 2rpx solid #F1F1F1;
diff --git a/pages_order/applyService/serviceSelectPopup.vue b/pages_order/applyService/serviceSelectPopup.vue
index 9013fc7..b669a97 100644
--- a/pages_order/applyService/serviceSelectPopup.vue
+++ b/pages_order/applyService/serviceSelectPopup.vue
@@ -63,7 +63,6 @@
       return {
         id: null,
         appletOrderProductList: [],
-        // todo: check type value
         typeOptions: [
           {
             id: '001',
@@ -83,7 +82,6 @@
         ],
         form: {
           type: null,
-          // todo: check key
           appletOrderProductList: [],
         },
         rules: {
@@ -139,7 +137,6 @@
             appletOrderProductList,
           } = this.form
 
-          // todo: submit
 				  this.$store.commit('setApplyServiceProduct', appletOrderProductList)
 
           this.$utils.navigateTo(`/pages_order/applyService/index?id=${this.id}&type=${type}`)
@@ -249,8 +246,6 @@
 
   .footer {
     width: 100%;
-    // todo：check
-    // height: 214rpx;
     padding: 32rpx 40rpx;
     box-sizing: border-box;
     border-top: 2rpx solid #F1F1F1;
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 9e92ec8..4b1b0fa 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -25,10 +25,8 @@
 				</uv-checkbox-group>
 				<view class="desc">
 					我已阅读并同意
-					<!-- todo: 替换配置项key -->
 					<text class="highlight" @click="$refs.modal.open('user_ys', '服务协议与隐私条款')">《服务协议与隐私条款》</text>
 					和
-					<!-- todo: 替换配置项key -->
 					<text class="highlight" @click="$refs.modal.open('user_bh', '个人信息保护指引')">《个人信息保护指引》</text>
 				</view>
 			</view>
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index d1cee2d..dc8acd6 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -166,7 +166,6 @@
 						avatar,
 					}
 
-        // todo: check 415 Unsupported Media Type
 					const res = await this.$fetch('updateInfo', params, false)
 					
 					if (res.code == 200) {
diff --git a/pages_order/center/reportCard.vue b/pages_order/center/reportCard.vue
index 64ce46b..90ae1b4 100644
--- a/pages_order/center/reportCard.vue
+++ b/pages_order/center/reportCard.vue
@@ -68,9 +68,9 @@
     data() {
       return {
         data: {
-          BMI: 20.3,
-          BMIchange: -0.2,
-          BMItag: '正常',
+          BMI: null,
+          BMIchange: null,
+          BMItag: null,
           fat: null,
           fatChange: null,
           fatTag: null,
@@ -186,7 +186,6 @@
 
 .divider {
   flex: none;
-  // todo
   width: 4rpx;
   height: 32rpx;
   background: #B5B8CE;
diff --git a/pages_order/checkup/checkupBook/apply.vue b/pages_order/checkup/checkupBook/apply.vue
index c142d3d..b0a48ae 100644
--- a/pages_order/checkup/checkupBook/apply.vue
+++ b/pages_order/checkup/checkupBook/apply.vue
@@ -432,7 +432,6 @@
           }
 
           if (currentHour > startHour) {
-            // todo: check
             startHour = currentHour
           }
           
@@ -557,8 +556,6 @@
           });
           
           setTimeout(() => {
-            // todo: check
-            // this.$utils.navigateBack()
             this.$utils.redirectTo(`/pages_order/checkup/checkupBook/detail?id=${this.id}`)
           }, 800)
           
diff --git a/pages_order/checkup/checkupBook/detail.vue b/pages_order/checkup/checkupBook/detail.vue
index 32a53bb..179c87f 100644
--- a/pages_order/checkup/checkupBook/detail.vue
+++ b/pages_order/checkup/checkupBook/detail.vue
@@ -226,11 +226,9 @@
         this.$refs.checkupTrackingNoPopup.open(this.id)
       },
       onBook() {
-        // todo: check redirectTo or navigateTo
         this.$utils.redirectTo(`/pages_order/checkup/checkupBook/apply?id=${this.detail.id}&type=${this.detail.type}`)
       },
       onEdit() {
-        // todo: check redirectTo or navigateTo
         this.$utils.redirectTo(`/pages_order/checkup/checkupBook/apply?id=${this.detail.id}&type=${this.detail.type}`)
       },
       async onCancel() {
diff --git a/pages_order/checkup/checkupCard.vue b/pages_order/checkup/checkupCard.vue
index a6df07a..0f25eab 100644
--- a/pages_order/checkup/checkupCard.vue
+++ b/pages_order/checkup/checkupCard.vue
@@ -14,7 +14,6 @@
         <template v-if="data.status == 0">
           <view class="flex row">
             <view class="row-label">下单时间：</view>
-            <!-- todo: check key -->
             <view class="row-content">{{ data.createTime }}</view>
           </view>
         </template>
diff --git a/pages_order/checkup/checkupTrackingNoPopup.vue b/pages_order/checkup/checkupTrackingNoPopup.vue
index 22c7701..59df712 100644
--- a/pages_order/checkup/checkupTrackingNoPopup.vue
+++ b/pages_order/checkup/checkupTrackingNoPopup.vue
@@ -165,8 +165,6 @@
 
   .footer {
     width: 100%;
-    // todo：check
-    // height: 214rpx;
     padding: 32rpx 40rpx;
     box-sizing: border-box;
     border-top: 2rpx solid #F1F1F1;
diff --git a/pages_order/comment/commentCard.vue b/pages_order/comment/commentCard.vue
index bb56e3f..7b24976 100644
--- a/pages_order/comment/commentCard.vue
+++ b/pages_order/comment/commentCard.vue
@@ -1,16 +1,13 @@
 <template>
   <view class="card">
-    <!-- todo: delete -->
     <view class="flex header">
       <view class="flex left">
         <view class="avatar">
-          <!-- todo: check key -->
           <image class="avatar-img" :src="data.user.avatar"></image>
         </view>
         <view class="info">
           <view class="name">{{ data.user.name }}</view>
           <view>{{ $dayjs(data.createTime).format('YYYY-MM-DD') }}</view>
-          <!-- todo: check key -->
           <!-- <view>{{ `${data.countDesc || ''} | ${$dayjs(data.createTime).format('YYYY-MM-DD')}` }}</view> -->
         </view>
       </view>
diff --git a/pages_order/home/followUsIntro.vue b/pages_order/home/followUsIntro.vue
index 291550e..1fbed12 100644
--- a/pages_order/home/followUsIntro.vue
+++ b/pages_order/home/followUsIntro.vue
@@ -3,7 +3,6 @@
     <view>
       <view class="card" v-for="article in list" :key="article.id"  @click="jumpToArticle(article.id)">
         <image class="card-img" :src="article.image" mode="scaleToFill"></image>
-        <!-- todo: check is need to show? -->
         <!-- <view class="card-title">{{ article.title }}</view> -->
       </view>
     </view>
diff --git a/pages_order/home/healthRecordsIntro.vue b/pages_order/home/healthRecordsIntro.vue
index 6b2452f..23c94d5 100644
--- a/pages_order/home/healthRecordsIntro.vue
+++ b/pages_order/home/healthRecordsIntro.vue
@@ -2,7 +2,6 @@
   <view class="view">
     <view class="top">
       <view class="route">
-        <!-- todo -->
         <image class="img" :src="configList.home_science_3" mode="widthFix"></image>
       </view>
     </view>
diff --git a/pages_order/home/recommendSwiper.vue b/pages_order/home/recommendSwiper.vue
index 792f42f..abddc0d 100644
--- a/pages_order/home/recommendSwiper.vue
+++ b/pages_order/home/recommendSwiper.vue
@@ -3,7 +3,7 @@
     <swiper 
       class="swiper" 
       :current="current"
-      :autoplay="true"
+      :autoplay="autoplay"
       :display-multiple-items="1.5"
       @change="onChange"
     >
@@ -47,6 +47,12 @@
   export default {
 		components: {
       indicator,
+    },
+    props: {
+      autoplay: {
+        type: Boolean,
+        default: false,
+      },
     },
 		data() {
 			return {
diff --git a/pages_order/order/orderConfirm/index.vue b/pages_order/order/orderConfirm/index.vue
index 70b72c0..b0eab1e 100644
--- a/pages_order/order/orderConfirm/index.vue
+++ b/pages_order/order/orderConfirm/index.vue
@@ -51,12 +51,9 @@
 				</uv-checkbox-group>
 				<view class="desc">
           我已阅读并同意
-					<!-- todo: 替换配置项key -->
-					<text class="highlight" @click="$refs.modal.open('config_agreement', '用户协议')">《用户协议》</text>
-					<!-- todo: 替换配置项key -->
-					<text class="highlight" @click="$refs.modal.open('config_privacy', '隐私协议')">《隐私协议》</text>
-					<!-- todo: 替换配置项key -->
-					<text class="highlight" @click="$refs.modal.open('config_privacy', '消费者告知')">《消费者告知》</text>
+					<text class="highlight" @click="$refs.modal.open('user_agreement', '用户协议')">《用户协议》</text>
+					<text class="highlight" @click="$refs.modal.open('privacy_policy', '隐私协议')">《隐私协议》</text>
+					<text class="highlight" @click="$refs.modal.open('consumer_notification', '消费者告知')">《消费者告知》</text>
 				</view>
 			</view>
       <view class="flex bar">
@@ -126,15 +123,6 @@
       // todo: check include Overseas Product ?
 			// this.$utils.navigateTo('/pages_order/order/userInfo/infoFill')
 
-      return
-      this.orderData = {
-        id: '001',
-        number: 'BH872381728321983929',
-        createTime: '2025-04-28 08:14',
-      }
-
-      console.log('orderData', this.orderData)
-
     },
     onUnload() {
       this.$store.commit('setAddressInfo', null)
@@ -211,28 +199,19 @@
         return this.productList.every(item => item.type == '1')
       },
       onPaySuccess() {
-        // todo: check  → jump?
         setTimeout(() => {
           if (this.isDetectProduct()) {
-            // uni.reLaunch({
-            //   url: `/pages_order/order/orderDetail/index?id=${id}`
-            // });
             uni.reLaunch({
               url: `/pages_order/checkup/checkupRecords`
             });
             return
           }
-          // todo: check → jump to order list page ?
           uni.reLaunch({
             url: `/pages_order/order/orderList/index`
           });
         }, 700)
-        // uni.reLaunch({
-        //   url: '/pages_order/order/orderList/index'
-        // })
       },
       onPayCancel() {
-        // todo: check → jump to order list page?
 				uni.redirectTo({
 					url: `/pages_order/order/orderList/index?index=1`
         });
diff --git a/pages_order/order/orderDetail/index.vue b/pages_order/order/orderDetail/index.vue
index 8d4817b..d9c82c0 100644
--- a/pages_order/order/orderDetail/index.vue
+++ b/pages_order/order/orderDetail/index.vue
@@ -23,12 +23,10 @@
                 <view class="row">{{ item.productName }}</view>
                 <view class="flex row">
                   <view class="row-label">产品类型：</view>
-                  <!-- todo: check key -->
                   <view class="row-content">{{ getTypeDesc(item.type) || '--' }}</view>
                 </view>
                 <view class="flex row">
                   <view class="row-label">产品内容：</view>
-                  <!-- todo: check key -->
                   <view class="row-content">{{ item.content || '--' }}</view>
                 </view>
                 <view class="flex price">
@@ -119,16 +117,17 @@
           <template v-else-if="status == 1">
             <button class="flex col btn" @click="onApplyService">申请售后</button>
             <!-- 自采检测 -->
-            <template v-if="detectProduct && detectProduct.subscribeType == 0">
+            <!-- <template v-if="detectProduct && detectProduct.subscribeType == 0">
               <button class="flex col btn btn-primary" @click="onDetectModify">修改</button>
-            </template>
+            </template> -->
           </template>
           <!-- 待收货 -->
           <template v-else-if="status == 2">
             <button class="flex col btn" @click="onApplyService">申请售后</button>
+            <button class="flex col btn btn-primary" @click="onConfirmReceipt">确认收货</button>
             <!-- 检测 subscribeType: 0自采，1上门，2到店，3已取消 -->
-            <template v-if="detectProduct">
-              <!-- 自采检测 -->
+            <!-- <template v-if="detectProduct">
+              自采检测
               <template v-if="detectProduct.subscribeType == 0">
                 <button class="flex col btn btn-primary" @click="onDetectSendBack">线上回寄试剂盒</button>
               </template>
@@ -136,10 +135,10 @@
                 <button class="flex col btn btn-primary" @click="onDetectBook">检测预约</button>
               </template>
             </template>
-            <!-- 其他商品 -->
+            其他商品
             <template v-else>
               <button class="flex col btn btn-primary" @click="onConfirmReceipt">确认收货</button>
-            </template>
+            </template> -->
           </template>
           <!-- 待评价 -->
           <template v-else-if="status == 3">
@@ -208,15 +207,15 @@
       statusDesc() {
         return STATUS_AND_DESC_MAPPING[this.status]
       },
-      detectProduct() {
-        const { appletOrderProductList } = this.orderData || {}
+      // detectProduct() {
+      //   const { appletOrderProductList } = this.orderData || {}
 
-        if (appletOrderProductList?.length == 1 && appletOrderProductList?.[0]?.type == 1) { // type: 产品类型（0营养剂，1预约，2课程）
-          return appletOrderProductList[0]
-        }
+      //   if (appletOrderProductList?.length == 1 && appletOrderProductList?.[0]?.type == 1) { // type: 产品类型（0营养剂，1预约，2课程）
+      //     return appletOrderProductList[0]
+      //   }
         
-        return null
-      },
+      //   return null
+      // },
     },
     onShow() {
       console.log('onShow')
diff --git a/pages_order/order/payPopup.vue b/pages_order/order/payPopup.vue
index 16f5080..e7f45c3 100644
--- a/pages_order/order/payPopup.vue
+++ b/pages_order/order/payPopup.vue
@@ -43,10 +43,8 @@
             </uv-checkbox-group>
             <view class="desc">
               我已阅读并同意
-              <!-- todo: 替换配置项key -->
-              <text class="highlight" @click="$refs.modal.open('config_privacy', '应用内支付用户协议')">《应用内支付用户协议》</text>
-              <!-- todo: 替换配置项key -->
-              <text class="highlight" @click="$refs.modal.open('config_agreement', '支付与隐私的声明')">《支付与隐私的声明》</text>
+              <text class="highlight" @click="$refs.modal.open('payment_user_agreement', '应用内支付用户协议')">《应用内支付用户协议》</text>
+              <text class="highlight" @click="$refs.modal.open('statement_on_payment_and_privacy', '支付与隐私的声明')">《支付与隐私的声明》</text>
             </view>
           </view>
         </view>
@@ -287,8 +285,6 @@
 
   .footer {
     width: 100%;
-    // todo：check
-    // height: 214rpx;
     padding: 32rpx 40rpx;
     box-sizing: border-box;
     border-top: 2rpx solid #F1F1F1;
diff --git a/pages_order/product/agreementPopup.vue b/pages_order/product/agreementPopup.vue
index db68e51..7d1be1f 100644
--- a/pages_order/product/agreementPopup.vue
+++ b/pages_order/product/agreementPopup.vue
@@ -28,17 +28,7 @@ export default {
   },
   methods: {
     open() {
-      // todo
-      // this.content = this.configList[key]
-
-      this.content = `
-        <p>
-          亲爱的用户，欢迎选购我们的健康营养素包。<br/>
-          在购买前请仔细阅读以下内容：我们所提供的营养素包，均严格遵循国际健康标准与规范进行研发和生产，旨在根据您的问卷调查或个人体检情况，精准匹配适合您的营养补充方案。<br/>
-          在下单购买时，请确保您所提供的身体信息真实准确，以便我们为您推荐最合适的营养素组合。同时，由于海外运输及海关政策可能会影响包裹的送达时间，我们会在发货后第一时间为您更新物流信息，预计送达时间仅供参考，请耐心等待。<br/>
-          若您在购买过程中有任何疑问，或是收到产品后遇到任何问题，我们的客服团队将竭诚为您提供 24 小时服务，祝您健康常伴！
-        </p>
-      `
+      this.content = this.configList.tips_cross_border
 
       this.$refs.popup.open()
     },
diff --git a/pages_order/product/productCard.vue b/pages_order/product/productCard.vue
index 7dd2aad..bfa6917 100644
--- a/pages_order/product/productCard.vue
+++ b/pages_order/product/productCard.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="card product-card__view" :style="cardStyle" @click="jumpToProductDetail">
     <view class="card-img flex" :style="imgStyle">
-      <image class="img" :src="coverImg" mode="scaleToFill"></image>
+      <image class="img" :src="coverImg" mode="aspectFit"></image>
     </view>
     <view class="card-detail">
       <view class="product-name text-ellipsis">{{ data.name }}</view>
diff --git a/pages_order/product/productCustomView.vue b/pages_order/product/productCustomView.vue
index 70cf46d..087e287 100644
--- a/pages_order/product/productCustomView.vue
+++ b/pages_order/product/productCustomView.vue
@@ -25,6 +25,7 @@
         }" 
         lineWidth="0"
         lineHeight="0"
+        :current="level1"
         @change="onLevel1TabChange"
       ></uv-tabs>
       <view v-if="tabs[level1] && tabs[level1].children && tabs[level1].children.length"
@@ -48,6 +49,7 @@
           }" 
           lineWidth="0"
           lineHeight="0"
+          :current="level2"
           @change="onLevel2TabChange"
         ></uv-tabs>
       </view>
@@ -96,50 +98,6 @@
     mounted() {
 
       this.fetchCategory()
-
-      return
-
-			this.list = [
-        {
-          id: '001',
-					url: '/pages_order/static/index/recommend-pic.png', 
-          name: '月度装定制营养包',
-          sales: 24770,
-          price: 688.00,
-          originalPrice: 1664,
-        },
-        {
-          id: '002',
-					url: '/pages_order/static/index/recommend-pic.png', 
-          name: '月度装定制营养包',
-          sales: 24770,
-          price: 688.00,
-          originalPrice: 1664,
-        },
-        {
-          id: '003',
-					url: '/pages_order/static/index/recommend-pic.png', 
-          name: '月度装定制营养包',
-          sales: 24770,
-          price: 688.00,
-          originalPrice: 1664,
-        },
-			]
-
-      let children = [
-        { name: '草本类' },
-        { name: '蔬菜类' },
-        { name: '维生素类' },
-        { name: '草本类' },
-        { name: '蔬菜类' },
-      ]
-
-      this.tabs = [
-        { name: '全部' },
-        { name: '皮肤', children, },
-        { name: '身材管理', children, },
-        { name: '精力', children, },
-      ]
     },
     methods: {
       async fetchCategory() {
@@ -147,10 +105,9 @@
           let result = await this.$fetch('getProductCategory', { type: this.type }) // type: 产品类型（0营养剂，1预约，2课程）
 
           this.tabs = result.reduce((arr, item) => {
-            const { id, name } = item
+            const { id, name, child } = item
 
-            // todo: check children?
-            let obj = { id, name }
+            let obj = { id, name, children: child }
 
             arr.push(obj) 
 
@@ -163,13 +120,18 @@
       onLevel1TabChange(e) {
         console.log('level1', e.index)
         this.level1 = e.index
-        this.level2 = this.tabs[this.level1].children?.length ? 0 : null
-        this.$emit('categoryChange', { classId: this.tabs[this.level1].id })
+        if (this.tabs[this.level1].children?.length) {
+          this.level2 = 0
+          this.$emit('categoryChange', { classId: this.tabs[this.level1].children[this.level2].id })
+        } else {
+          this.level2 = null
+          this.$emit('categoryChange', { classId: this.tabs[this.level1].id })
+        }
       },
       onLevel2TabChange(e) {
         console.log('level2', e.index)
         this.level2 = e.index
-        // todo
+        this.$emit('categoryChange', { classId: this.tabs[this.level1].children[this.level2].id })
       },
     },
   }
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 13b8bff..aa198b0 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -48,7 +48,6 @@
           <view class="flex row">
             <view class="flex row-content">
               <view class="label">服务：</view>
-              <!-- todo: check key -->
               <view class="value">{{ detail.service }}</view>
             </view>
           </view>
@@ -181,7 +180,7 @@
       },
       onBuy() {
 
-        const { specId, specs } = this.detail
+        const { specId, specs, isCrossBorder } = this.detail
 
         console.log('specId', specId, 'specs', specs, !specId && specs?.length)
 
@@ -191,8 +190,10 @@
           return
         }
 
-        // todo: check timing
-        // this.$refs.agreementPopup.open()
+        if (isCrossBorder == 'Y') {
+          this.$refs.agreementPopup.open()
+          return
+        }
 
 				this.$store.commit('createOrder', [this.detail])
       },
diff --git a/pages_order/product/specOptionsPopup.vue b/pages_order/product/specOptionsPopup.vue
index 62cef72..3c0ba2f 100644
--- a/pages_order/product/specOptionsPopup.vue
+++ b/pages_order/product/specOptionsPopup.vue
@@ -251,8 +251,6 @@ export default {
 
 .footer {
   width: 100%;
-  // todo：check
-  // height: 214rpx;
   padding: 32rpx 40rpx;
   box-sizing: border-box;
 
diff --git a/pages_order/report/compare/reportRecordCard.vue b/pages_order/report/compare/reportRecordCard.vue
index d27c1b7..771e844 100644
--- a/pages_order/report/compare/reportRecordCard.vue
+++ b/pages_order/report/compare/reportRecordCard.vue
@@ -62,16 +62,6 @@
       }
     },
     methods: {
-      onChange(arr) {
-        this.checked = arr[0] == 1 ? true : false
-      },
-      jumpToReport() {
-        console.log('data', this.data)
-        this.$utils.navigateTo(`/pages_order/report/result/index?id=${this.data.id}`)
-      },
-      jumpToContinueAnswer() {
-        // todo
-      },
     },
   }
 </script>
diff --git a/pages_order/report/compare/select.vue b/pages_order/report/compare/select.vue
index a7de91e..ac61f11 100644
--- a/pages_order/report/compare/select.vue
+++ b/pages_order/report/compare/select.vue
@@ -44,7 +44,6 @@
         // queryParams: {
         //   pageNo: 1,
         //   pageSize: 10,
-        //   // todo
         //   status: 1,
         // },
 				// mixinsListApi: '',
diff --git a/pages_order/report/reportSummary/index.vue b/pages_order/report/reportSummary/index.vue
index f7b3dc2..12d4153 100644
--- a/pages_order/report/reportSummary/index.vue
+++ b/pages_order/report/reportSummary/index.vue
@@ -9,7 +9,7 @@
       <text class="score-change-unit">分</text>
     </view>
 
-    <button class="btn btn-test" @click="jumpToTest">重新测评</button>
+    <button v-if="data.paperId" class="btn btn-test" @click="jumpToTest">重新测评</button>
 
     <view class="user flex">
       <view class="avatar">
@@ -19,7 +19,7 @@
         <view class="info-title"><text class="highlight">{{ userInfo.name }}</text><text>的专属配方</text></view>
         <view class="info-desc">{{ userInfo.phone }}</view>
       </view>
-      <button class="btn btn-formula" @click="showFormula">查看配方</button>
+      <button v-if="data.id" class="btn btn-formula" @click="showFormula">查看配方</button>
     </view>
   </view>
 </template>
diff --git a/pages_order/report/result/index.vue b/pages_order/report/result/index.vue
index 30a0589..7361145 100644
--- a/pages_order/report/result/index.vue
+++ b/pages_order/report/result/index.vue
@@ -72,7 +72,6 @@
       })
     },
     unmounted() {
-      console.log('unmounted')
       this.observer.disconnect()
     },
     methods: {
diff --git a/pages_order/report/result/resultSummary.vue b/pages_order/report/result/resultSummary.vue
index a87e5d7..8c2227a 100644
--- a/pages_order/report/result/resultSummary.vue
+++ b/pages_order/report/result/resultSummary.vue
@@ -23,7 +23,6 @@
     <view class="flex">
       <radarChart :score="data.scoreDetail"></radarChart>
     </view>
-    <!-- todo: use detail -->
     <view class="section" v-for="item in data.detail" :key="item.id">
       <div class="title">
         <div class="title-zh">{{ item.name }}</div>
diff --git a/pages_order/report/test/intro.vue b/pages_order/report/test/intro.vue
index 37442b8..2e349b2 100644
--- a/pages_order/report/test/intro.vue
+++ b/pages_order/report/test/intro.vue
@@ -27,10 +27,8 @@
 				</uv-checkbox-group>
 				<view class="desc">
           我已阅读并同意
-					<!-- todo: 替换配置项key -->
-					<text class="highlight" @click="$refs.modal.open('config_agreement', '用户协议')">《用户协议》</text>
-					<!-- todo: 替换配置项key -->
-					<text class="highlight" @click="$refs.modal.open('config_privacy', '隐私协议')">《隐私协议》</text>
+					<text class="highlight" @click="$refs.modal.open('user_agreement', '用户协议')">《用户协议》</text>
+					<text class="highlight" @click="$refs.modal.open('privacy_policy', '隐私协议')">《隐私协议》</text>
 				</view>
 			</view>
       <view class="bar">