Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

更新：增加订单详情功能
2025-11-28 18:03:53 +08:00 · 2025-11-28 18:03:13 +08:00 · 2025-11-28 14:31:09 +08:00 · 2025-11-28 14:31:02 +08:00
22 changed files with 377 additions and 92 deletions
--- a/api/config.ts
+++ b/api/config.ts
@@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development';
 */
 const BASE_URL_MAP = {
  development: {
-		// MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
-		MAIN: 'https://global.nuttyreading.com/', // 线上
+		MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
+		// MAIN: 'https://global.nuttyreading.com/', // 线上
 		// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
 		// CDN: 'https://cdn-dev.example.com', // 暂时用不到
  },
--- a/api/modules/order.ts
+++ b/api/modules/order.ts
@@ -9,7 +9,8 @@ import type {
  ICoupon,
  ICourseOrderCreateParams,
  IOrderInitData,
-  IGoodsDiscountParams
+  IGoodsDiscountParams,
+  IOrderDetail
 } from '@/types/order'
 import type { IUserInfo } from '@/types/user'

@@ -30,19 +31,6 @@ export const orderApi = {
    return res
  },

-  /**
-   * 验证 Google Pay 支付
-   * @param params 支付验证参数
-   */
-  async verifyGooglePay(params: IGooglePayVerifyParams) {
-    const res = await mainClient.request<IApiResponse>({
-      url: 'pay/googlepay/googleVerify',
-      method: 'POST',
-      data: params
-    })
-    return res
-  },
-
  /**
   * 获取用户信息（包含虚拟币余额）
   */
@@ -106,7 +94,7 @@ export const orderApi = {
  },

  /**
-   * 获取地区优惠金额
+   * 获取活动优惠金额
   * @param productList 商品列表
   */
  async getDistrictAmount(productList: IGoodsDiscountParams[]) {
@@ -155,5 +143,18 @@ export const orderApi = {
      data
    })
    return res
-  }
+  },
+
+  /**
+   * 获取订单详情
+   * @param orderId 订单ID
+   */
+  async getOrderDetail(orderId: string) {
+    const res = await mainClient.request<IApiResponse<{ buyOrder: IOrderDetail, productInfo: IOrderGoods[] }>>({
+      url: 'common/buyOrder/commonOrderDetail',
+      method: 'POST',
+      data: { orderId }
+    })
+    return res
+  },
 }
--- a/components/book/BookCard.vue
+++ b/components/book/BookCard.vue
@@ -26,7 +26,7 @@
          <text>{{ $t('book.listen') }}</text>
        </view>
        
-        <view 
+        <!-- <view 
          v-if="!isIOS" 
          class="action-btn review" 
          @click.stop="handleReview"
@@ -35,7 +35,7 @@
            <image src="@/static/icon/icon_pl.png" mode="aspectFit" />
          </view>
          <text>{{ $t('book.comment') }}</text>
-        </view>
+        </view> -->
      </view>
    </view>
  </view>
--- a/components/order/ProductInfo.vue
+++ b/components/order/ProductInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="order-item-content">
+  <view class="order-item-content" :class="size === 'large' ? 'size-large' : ''">
    <view class="order-item-product-info">
      <image
        :src="productImg"
@@ -18,17 +18,19 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { t } from '@/utils/i18n'
+import type { IGoods } from '@/types/order'
 interface Props {
-  data: any
+  data: IGoods
  type: string
+  size?: 'small' | 'large'
 }
 const props = defineProps<Props>()

 const productImg = computed(() => {
-  
+  console.log(props.data)
  switch (props.type) {
    case 'order':
-      return props.data[0]?.product?.productImages || ''
+      return props.data?.productImages || ''
    case 'abroadBook':
      return props.data?.images || ''
    case 'vip':
@@ -44,9 +46,9 @@ const productImg = computed(() => {
 const title = computed(() => {
  switch (props.type) {
    case 'order':
-      return props.data[0]?.product?.productName || ''
+      return (props.data?.goodsType == '02' ? '(电子书)' : '') + props.data?.productName || ''
    case 'abroadBook':
-      return props.data?.name || ''
+      return '(电子书)' + props.data?.name || ''
    case 'vip':
      return props.data?.title + '<text style="color: #ff4703; font-weight: bold;">(' + props.data?.year + '年)</text>' || ''
    case 'abroadVip':
@@ -60,7 +62,7 @@ const title = computed(() => {
 const price = computed(() => {
  switch (props.type) {
    case 'order':
-      return props.data[0]?.product?.price || 0
+      return props.data?.price || 0
    case 'abroadBook':
      return props.data?.abroadPrice || 0
    case 'vip':
@@ -107,6 +109,7 @@ const price = computed(() => {
    color: #333;
    text-align: right;
    font-size: 12px;
+    white-space: nowrap;

    .count {
      font-weight: normal;
@@ -114,4 +117,17 @@ const price = computed(() => {
    }
  }
 }
+
+.order-item-content.size-large {
+  .order-item-product-cover {
+    width: 70px;
+    height: 70px;
+  }
+  .order-item-product-name {
+    font-size: 16px;
+  }
+  .order-item-product-price {
+    font-size: 14px;
+  }
+}
 </style>
--- a/locale/en.json
+++ b/locale/en.json
@@ -19,7 +19,8 @@
    "requestException": "Request exception",
    "coin": "Coin",
    "days": "Days",
-    "and": "and"
+    "and": "and",
+    "call": "Call"
  },
  "tabar.course": "COURSE",
  "tabar.book": "EBOOK",
@@ -481,7 +482,8 @@
 		"rechargeAmount": "Recharge amount",
 		"valueAddedServices": "Value-added services",
 		"readAgree": "I have read and agreed",
-		"readAgreeServices": "Please read and agree to the value-added services first"
+		"readAgreeServices": "Please read and agree to the value-added services first",
+    "orderDetails": "Order Details"
  },
  "vip": {
    "courseVip": "Course VIP",
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -19,7 +19,8 @@
    "requestException": "请求异常",
    "coin": "天医币",
    "days": "天",
-    "and": "和"
+    "and": "和",
+    "call": "拨打电话"
  },
  "tabar.course": "课程",
  "tabar.book": "图书",
@@ -481,7 +482,8 @@
 		"rechargeAmount": "充值金额",
 		"valueAddedServices": "增值服务",
 		"readAgree": "我已阅读并同意",
-		"readAgreeServices": "请先阅读并同意增值服务"
+		"readAgreeServices": "请先阅读并同意增值服务",
+    "orderDetails": "订单详情"
  },
  "vip": {
    "courseVip": "课程VIP",
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "吴门国际",
    "appid" : "__UNI__1250B39",
    "description" : "吴门国际",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "0.1.1",
+    "versionCode" : 11,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pages.json
+++ b/pages.json
@@ -187,6 +187,12 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "%order.bookVip%"
 			}
+		}, {
+			"path": "pages/user/order/details",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "%order.orderDetails%"
+			}
 		}, {
 			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
 			"style": {
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -40,7 +40,7 @@
      </view>
      
      <!-- 书评列表 (非iOS) -->
-      <view v-if="!isIOS" class="comments-section">
+      <!-- <view v-if="!isIOS" class="comments-section">
        <view class="section-header">
          <text class="section-title">{{ $t('bookDetails.message') }}</text>
          <view v-if="commentList.length > 0" class="more-link" @click="goToReview">
@@ -55,7 +55,7 @@
          />
          <text v-else class="empty-text">{{ nullText }}</text>
        </view>
-      </view>
+      </view> -->
      
      <!-- 相关推荐 -->
      <view class="related-books">
--- a/pages/course/details/course.vue
+++ b/pages/course/details/course.vue
@@ -134,7 +134,7 @@
          <view>
            1.手机、pad、电脑均为可登陆电子设备，均有唯一标识码，一个用户名仅允许在一个手机或一个ipad或一个电脑登陆，请根据您的使用习惯自行选择。<br />
            2.如若申请变更登陆设备请联系客服，<br />
-            客服电话:13110039505;022-24142321<br />
+            客服电话:021-08371305<br />
            客服微信号:yilujiankangkefu<br />
            3.如因违反上述使用规定...概不退款，本公司保留追究用户相关法律责任的权利。<br />
            4.点击“同意”按钮即表示您同意遵守以上条款。
--- a/pages/login/forget.vue
+++ b/pages/login/forget.vue
@@ -23,7 +23,7 @@
        :placeholder="$t('login.codePlaceholder')" 
      />
      <wd-button type="info" :class="['code-btn', { active: !readonly }]" @click="getCode">
-        {{ t('login.getCode') }}
+        {{ codeText }}
      </wd-button>
    </view>
    
@@ -70,14 +70,12 @@

 <script setup lang="ts">
 import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
+import { t } from '@/utils/i18n'
 import { commonApi } from '@/api/modules/common'
 import { resetPassword } from '@/api/modules/auth'
 import { validateEmail, checkPasswordStrength } from '@/utils/validator'
 import { getNotchHeight } from '@/utils/system'

-const { t } = useI18n()
-
 // 表单数据
 const email = ref('')
 const code = ref('')
@@ -85,7 +83,7 @@ const password = ref('')
 const confirmPassword = ref('')

 // 验证码相关
-const codeText = ref('Get Code')
+const codeText = ref(t('login.getCode'))
 const readonly = ref(false)

 // 密码强度相关
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
  <view class="login-page">
    <!-- Logo 背景区域 -->
    <view class="logo-bg">
-      <text class="welcome-text">Hello! Welcome to<br>太湖国际</text>
+      <text class="welcome-text">Hello! Welcome to<br>WU'S INTERNATIONAL</text>
      <image src="@/static/icon/login_icon.png" mode="aspectFit" class="icon-hua-1"></image>
      <image src="@/static/icon/login_icon.png" mode="aspectFit" class="icon-hua-2"></image>
    </view>
@@ -37,8 +37,8 @@
            maxlength="6"
            @confirm="onSubmit"
          />
-          <wd-button type="info" :class="['code-btn', { active: !readonly }]" @click="onSetCode">
-            {{ t('login.getCode') }}
+          <wd-button type="info" :class="['code-btn', { 'active': !readonly }]" @click="onSetCode">
+            {{ codeText }}
          </wd-button>
        </view>
      </view>
@@ -83,7 +83,7 @@

      <!-- 协议同意 -->
      <view class="protocol-box">
-        <view class="select" :class="{ active: agree }" @click="agreeAgreements"></view>
+        <view class="select" :class="{ 'active': agree }" @click="agreeAgreements"></view>
        <view class="protocol-text">
          {{ $t('login.agree') }}
          <text class="highlight" @click="yhxy">《{{ $t('login.userAgreement') }}》</text>
@@ -94,7 +94,7 @@

      <!-- 登录按钮 -->
      <view class="btn-box">
-        <button @click="onSubmit" class="login-btn" :class="{ active: btnShow }">
+        <button @click="onSubmit" class="login-btn" :class="{ 'active': btnShow }">
          {{ $t('login.goLogin') }}
        </button>
      </view>
@@ -148,8 +148,7 @@ import { commonApi } from '@/api/modules/common'
 import { validateEmail } from '@/utils/validator'
 import { onPageJump } from '@/utils'

-import { useI18n } from 'vue-i18n'
-const { t } = useI18n()
+import { t } from '@/utils/i18n'

 const userStore = useUserStore()

@@ -165,7 +164,7 @@ const agree = ref(false)
 const isSee = ref(false)

 // 验证码相关
-const codeText = ref('Get Code')
+const codeText = ref(t('login.getCode'))
 const readonly = ref(false)
 const btnShow = ref(true)

--- a/pages/user/about/index.vue
+++ b/pages/user/about/index.vue
@@ -36,7 +36,7 @@
        </view>
      </view> -->
      <wd-cell-group border class="contact-info">
-        <wd-cell :title="$t('user.hotline')" clickable icon="call" value="022-24142321" @click="handlePhoneCall"></wd-cell>
+        <wd-cell :title="$t('user.hotline')" clickable icon="call" value="021-08371305" @click="handlePhoneCall"></wd-cell>
        <!-- <wd-cell :title="$t('user.wechat')" value="yilujiankangkefu" clickable @click="handlePhoneCall" /> -->
      </wd-cell-group>

@@ -83,7 +83,7 @@ const getAppVersion = () => {
 * 拨打电话
 */
 const handlePhoneCall = () => {
-  makePhoneCall('022-24142321', t('user.hotline'))
+  makePhoneCall('021-08371305', t('user.hotline'))
 }

 /**
--- a/pages/user/feedback/index.vue
+++ b/pages/user/feedback/index.vue
@@ -89,6 +89,8 @@

 <script setup lang="ts">
 import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+
 import { useUserStore } from '@/stores/user'
 import { submitFeedback } from '@/api/modules/user'
 import type { IFeedbackForm } from '@/types/user'
@@ -97,6 +99,14 @@ import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 const userStore = useUserStore()

+onLoad((options: any) => {
+  const orderSn = options.orderSn
+  if (orderSn) {
+    form.value.relation = orderSn
+    form.value.type = '3'
+  }
+})
+
 // 问题类型选项
 const issueTypeOptions = computed(() => [
  { label: t('user.issueTypeAccount'), value: '1' },
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -13,9 +13,6 @@
 				<view class="user-details">
 					<text class="nickname">{{ userInfo.nickname || $t('user.notSet') }}</text>
 					<text v-if="userInfo.email" class="email">{{ userInfo.email }}</text>
-					<text v-if="vipInfo.endTime && platform === 'ios'" class="vip-time">
-						VIP {{ vipInfo.endTime.split(' ')[0] }} {{ $t('user.vipExpireTime') }}
-					</text>
 				</view>
 			</view>
 		</view>
@@ -26,18 +23,18 @@
 				<view class="vip-card-title">{{ $t('user.vip') }}</view>
 				<view class="vip-card-content">
 					<view class="vip-item-list">
-						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
+						<view v-if="vipInfo?.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
 						<view v-else>办理课程VIP，畅享更多权益</view>
 					</view>
-					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small" @click="goCourseVipSub">{{ $t('vip.renewal') }}</wd-button>
+					<wd-button v-if="vipInfo?.length > 0" plain type="primary" size="small" @click="goCourseVipSub">{{ $t('vip.renewal') }}</wd-button>
 					<wd-button v-else plain type="primary" size="small" @click="goCourseVipSub">{{ $t('vip.openVip') }}</wd-button>
 				</view>
 				<view class="vip-card-content">
 					<view class="vip-item-list">
-						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
+						<view v-if="vipInfoEbook?.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
 						<view v-else>办理电子书VIP，畅享更多权益</view>
 					</view>
-					<wd-button v-if="!vipInfoEbook.length" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+					<wd-button v-if="!vipInfoEbook?.length" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
 				</view>
 			</view>
 		</view>
--- a/pages/user/order/details.vue
+++ b/pages/user/order/details.vue
@@ -0,0 +1,153 @@
+<template>
+  <view class="page-wrapper">
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('order.orderDetails')"></nav-bar>
+
+    <!-- 订单信息 -->
+    <view class="order-info">
+      <view class="order-status">{{ sysStore.orderStatusMap[order.orderStatus] }}</view>
+      <!-- 三种订单类型商品信息 -->
+      <ProductInfo v-if="order.orderType === 'order'" size="large" :data="productList[0]" :type="order.orderType" />
+      <ProductInfo v-if="order.orderType === 'vip'" size="large" :data="order.vipBuyConfigEntity" :type="order.orderType" />
+      <ProductInfo v-if="order.orderType === 'abroadVip'" size="large" :data="order.ebookvipBuyConfig" :type="order.orderType" />
+      <!-- 三种订单类型商品信息 end -->
+      
+      <wd-divider class="p-0!" />
+
+      <!-- 付款信息 -->
+      <wd-cell-group>
+        <wd-cell title="商品总价" :value="`${order.orderMoney} ${$t('global.coin')}`" />
+        <wd-cell v-if="order.districtMoney > 0" title="活动优惠" :value="`- ${order.districtMoney} ${$t('global.coin')}`" />  
+        <wd-cell v-if="order.vipDiscountAmount > 0" title="VIP专享立减" :value="`- ${order.vipDiscountAmount} ${$t('global.coin')}`" />
+        <wd-cell v-if="order.jfDeduction > 0" title="积分抵扣">
+          <text class="text-red-500 text-lg font-bold">{{ `- ${order.jfDeduction}` }}</text>
+        </wd-cell>
+        <wd-cell title="实付金额">
+          <text class="text-red-500 text-lg font-bold">{{ `${order.realMoney}` }}</text> {{ $t('global.coin') }}
+        </wd-cell>
+      </wd-cell-group>
+
+      <wd-divider class="p-0!" />
+
+      <!-- 下单信息 -->
+      <wd-cell-group>
+        <wd-cell title="订单编号" title-width="4em">
+          <text class="text-xs">{{ order.orderSn }}</text>
+          <wd-icon name="file-copy" size="14px" color="#65A1FA" class="ml-1!" @click="copyToClipboard(order.orderSn)"></wd-icon>
+        </wd-cell>
+        <wd-cell title="创建时间" :value="order.createTime" />
+        <wd-cell title="付款时间" :value="order.paymentDate" />
+      </wd-cell-group>
+    </view>
+
+    <view class="text-center">
+      <text @click="toWorkOrder" class="text-[cadetblue] text-sm">订单有问题？去申诉</text>
+    </view>
+    
+    <view class="contact-customer" @click="makePhoneCall(sysStore.customerServicePhone)">
+      <wd-icon name="service" size="30px"></wd-icon>
+      <view class="text-sm">联系客服</view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useSysStore } from '@/stores/sys'
+import { orderApi } from '@/api/modules/order'
+import type { IOrderDetail, IOrderGoods } from '@/types/order'
+import ProductInfo from '@/components/order/ProductInfo.vue'
+import { copyToClipboard, makePhoneCall } from '@/utils/index'
+
+const sysStore = useSysStore()
+// 订单详情
+const order = ref<IOrderDetail>({
+  orderMoney: 0,
+  districtMoney: 0,
+  vipDiscountAmount: 0,
+  jfDeduction: 0,
+  realMoney: 0,
+})
+const productList = ref<IOrderGoods[]>([])
+
+onLoad(async (options: { orderId: string }) => {
+  const orderId = options.orderId
+  if (orderId) {
+    const res = await orderApi.getOrderDetail(orderId)
+    const orderDetails = res.data.buyOrder
+    order.value = orderDetails
+    switch (orderDetails.orderType) {
+      case 'order':
+        productList.value = res.data.productInfo
+        break
+      case 'vip':
+        productList.value = orderDetails.vipBuyConfigEntity
+        break
+      case 'abroadVip':
+        productList.value = orderDetails
+        break
+      default:
+        break
+    }
+  }
+})
+
+const toWorkOrder = () => {
+  uni.navigateTo({
+    url: '/pages/user/feedback/index?orderSn=' + order.value.orderSn
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+body {
+  background-color: #F8F9FA;
+}
+.page-wrapper {
+  padding: 20rpx;
+}
+
+.order-info {
+  padding: 30rpx;
+  background-color: #fff;
+  border-radius: 10px;
+  margin-bottom: 15px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+
+  .order-status {
+    margin-bottom: 20rpx;
+    padding: 10rpx 0;
+    width: 6em;
+    background-color: #34D19D;
+    color: #fff;
+    border-radius: 0 10px 10px 0;
+    text-align: center;
+    font-size: 16px;
+    font-weight: bold;
+  }
+}
+
+
+:deep(.wd-cell-group) {
+  padding: 0 !important;
+
+  .wd-cell__wrapper {
+    padding: 0 !important;
+  }
+}
+
+.contact-customer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #fff;
+  border-radius: 50%;
+  width: 80px;
+  height: 80px;
+  margin: 40rpx auto 0;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.05);
+  line-height: 1;
+}
+</style>
--- a/pages/user/order/index.vue
+++ b/pages/user/order/index.vue
@@ -3,14 +3,14 @@
    <template #top>
      <!-- 自定义导航栏 -->
      <nav-bar :title="$t('user.myOrders')"></nav-bar>
-      <wd-tabs v-model="orderStatus" @change="handleOrderStatusTabChange">
+      <!-- <wd-tabs v-model="orderStatus" @change="handleOrderStatusTabChange">
        <wd-tab v-for="item in ordersTabs" :key="item.value" :title="item.name" :name="item.value"></wd-tab>
-      </wd-tabs>
+      </wd-tabs> -->
    </template>

    <!-- 订单列表 -->
    <view class="order-list">
-      <wd-card v-for="order in orderList" :key="order.id" type="rectangle" custom-class="order-item">
+      <wd-card v-for="order in orderList" :key="order.id" type="rectangle" custom-class="order-item" @click="toDetails(order)">
        <template #title>
          <view class="order-item-title">
            <view class="order-item-sn">
@@ -23,8 +23,7 @@
        </template>
        
        <!-- 三种订单类型商品信息 -->
-        <ProductInfo v-if="order.orderType === 'order'" :data="order.productList" :type="order.orderType" />
-        <ProductInfo v-if="order.orderType === 'abroadBook'" :data="order.bookEntity" :type="order.orderType" />
+        <ProductInfo v-if="order.orderType === 'order'" :data="order.productList[0].product" :type="order.orderType" />
        <ProductInfo v-if="order.orderType === 'vip'" :data="order.vipBuyConfigEntity" :type="order.orderType" />
        <ProductInfo v-if="order.orderType === 'abroadVip'" :data="order.ebookvipBuyConfig" :type="order.orderType" />
        <!-- 三种订单类型商品信息 end -->
@@ -48,12 +47,16 @@ import type { IOrder } from '@/types/order'
 import { useI18n } from 'vue-i18n'
 import { copyToClipboard } from '@/utils/index'
 import ProductInfo from '@/components/order/ProductInfo.vue'
+import { useSysStore } from '@/stores/sys'

 const { t } = useI18n()
 const paging = ref<any>(null)

+// 订单状态映射
+const orderStatusMap = useSysStore().orderStatusMap
+
 // 订单状态
-const orderStatus = ref<string>('-1')
+const orderStatus = ref<string>('3')
 const ordersTabs = [
  {
    name: "全部",
@@ -72,12 +75,6 @@ const ordersTabs = [
  },
 ]

-// 订单状态映射
-const orderStatusMap = {
-  '0': '待付款',
-  '3': '已完成',
-}
-
 /**
 * 处理订单状态切换
 */
@@ -122,22 +119,17 @@ const getOrderImage = (order: IOrder) => {
  }
 }

-const getOrderTitle = (order: IOrder) => {
-  switch (order.orderType) {
-    case 'order':
-      return order.productList[0]?.product?.productName || ''
-    case 'abroadBook':
-      return order.bookEntity?.name || ''
-    case 'vip':
-      return order.vipBuyConfigEntity?.title || ''
-    case 'point':
-      return ''
-    default:
-      return ''
-  }
+/**
+ * 跳转订单详情
+ */
+const toDetails = (order: IOrder) => {
+  uni.navigateTo({
+    url: '/pages/user/order/details?orderId=' + order.orderId
+  })
 }


+
 </script>

 <style lang="scss" scoped>
--- a/pages/user/settings/index.vue
+++ b/pages/user/settings/index.vue
@@ -102,22 +102,22 @@ const getCurrentLanguageName = () => {

 // 设置项列表
 const settingItems = computed(() => [
-  {
-    id: 0,
-    label: t('user.language'),
-    value: getCurrentLanguageName(),
-    type: 'language'
-  },
+  // {
+  //   id: 0,
+  //   label: t('user.language'),
+  //   value: getCurrentLanguageName(),
+  //   type: 'language'
+  // },
  {
    id: 1,
    label: t('user.hotline'),
-    value: '022-24142321',
+    value: '021-08371305',
    type: 'tel'
  },
  {
    id: 2,
    label: t('user.customerEmail'),
-    value: 'appyilujiankang@sina.com',
+    value: 'AmazingLimited@163.com',
    type: 'email'
  },
  {
--- a/stores/sys.ts
+++ b/stores/sys.ts
@@ -15,6 +15,11 @@ export const useSysStore = defineStore('sys', {
      7: '国学VIP',
      8: '心理学VIP',
      9: '中西汇通学VIP',
+    },
+    customerServicePhone: '021-08371305',
+    orderStatusMap: {
+      '0': '待付款',
+      '3': '已完成',
    }
  }),

--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -8,7 +8,14 @@
    --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
      "Courier New", monospace;
    --color-red-500: oklch(63.7% 0.237 25.331);
+    --color-white: #fff;
    --spacing: 0.25rem;
+    --text-xs: 0.75rem;
+    --text-xs--line-height: calc(1 / 0.75);
+    --text-sm: 0.875rem;
+    --text-sm--line-height: calc(1.25 / 0.875);
+    --text-lg: 1.125rem;
+    --text-lg--line-height: calc(1.75 / 1.125);
    --font-weight-bold: 700;
    --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
    --default-transition-duration: 150ms;
@@ -244,6 +251,24 @@
  .table {
    display: table;
  }
+  .h-20 {
+    height: calc(var(--spacing) * 20);
+  }
+  .h-\[80px\] {
+    height: 80px;
+  }
+  .h-\[80rpx\] {
+    height: 80rpx;
+  }
+  .w-20 {
+    width: calc(var(--spacing) * 20);
+  }
+  .w-\[80px\] {
+    width: 80px;
+  }
+  .w-\[80rpx\] {
+    width: 80rpx;
+  }
  .w-\[100px\] {
    width: 100px;
  }
@@ -265,6 +290,15 @@
  .flex-wrap {
    flex-wrap: wrap;
  }
+  .items-center {
+    align-items: center;
+  }
+  .justify-center {
+    justify-content: center;
+  }
+  .rounded-full {
+    border-radius: calc(infinity * 1px);
+  }
  .border {
    border-style: var(--tw-border-style);
    border-width: 1px;
@@ -278,6 +312,15 @@
  .bg-\[transparent\] {
    background-color: transparent;
  }
+  .bg-white {
+    background-color: var(--color-white);
+  }
+  .p-0 {
+    padding: calc(var(--spacing) * 0);
+  }
+  .p-0\! {
+    padding: calc(var(--spacing) * 0) !important;
+  }
  .pt-1 {
    padding-top: calc(var(--spacing) * 1);
  }
@@ -299,6 +342,22 @@
  .text-right {
    text-align: right;
  }
+  .text-lg {
+    font-size: var(--text-lg);
+    line-height: var(--tw-leading, var(--text-lg--line-height));
+  }
+  .text-sm {
+    font-size: var(--text-sm);
+    line-height: var(--tw-leading, var(--text-sm--line-height));
+  }
+  .text-xs {
+    font-size: var(--text-xs);
+    line-height: var(--tw-leading, var(--text-xs--line-height));
+  }
+  .font-\[26rpx\] {
+    --tw-font-weight: 26rpx;
+    font-weight: 26rpx;
+  }
  .font-bold {
    --tw-font-weight: var(--font-weight-bold);
    font-weight: var(--font-weight-bold);
@@ -312,9 +371,24 @@
  .text-\[\#fff\] {
    color: #fff;
  }
+  .text-\[\'10px\'\] {
+    color: '10px';
+  }
+  .text-\[\'12px\'\] {
+    color: '12px';
+  }
+  .text-\[26rpx\] {
+    color: 26rpx;
+  }
+  .text-\[cadetblue\] {
+    color: cadetblue;
+  }
  .text-\[red\] {
    color: red;
  }
+  .text-red-500 {
+    color: var(--color-red-500);
+  }
  .lowercase {
    text-transform: lowercase;
  }
@@ -328,6 +402,14 @@
  .underline {
    text-decoration-line: underline;
  }
+  .shadow-\[0_0_10px_rgba\(0\,0\,0\,0\.1\)\] {
+    --tw-shadow: 0 0 10px var(--tw-shadow-color, rgba(0,0,0,0.1));
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
+  .shadow-\[0_0_10px_rgba\(0\,0\,0\,0\.05\)\] {
+    --tw-shadow: 0 0 10px var(--tw-shadow-color, rgba(0,0,0,0.05));
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
  .ring {
    --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
--- a/types/order.d.ts
+++ b/types/order.d.ts
@@ -11,6 +11,7 @@ export interface IGoods {
  isVipPrice?: number               // 是否有VIP优惠 0-否 1-是
  productAmount?: number            // 购买数量
  delFlag?: number                 // 删除标记 -1-已下架
+  goodsType?: string           // 商品类型 "05"： 课程 "02"： 电子书
 }

 /**
@@ -138,3 +139,24 @@ export interface IPaymentOption {
  value: '4' | '5'
  name: string
 }
+
+/**
+ * 订单详情
+ */
+export interface IOrderDetail {
+  id: number
+  orderSn: string
+  orderMoney: number
+  realMoney: number
+  paymentDate: string
+  createTime: string
+  orderType: string
+  districtMoney?: number
+  vipDiscountAmount?: number
+  couponId?: number
+  couponName?: string
+  couponAmount?: number
+  jfDeduction?: number
+  remark?: string
+  [key: string]: any
+}
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -21,7 +21,7 @@ export const onPageBack = () => {
 * @param {string} phoneNumber - 要拨打的电话号码
 * @param {string} title - 拨打电话提示的标题，默认值为空字符串
 */
-export const makePhoneCall = (phoneNumber: string, title: string = '') => {
+export const makePhoneCall = (phoneNumber: string, title: string = t('global.call')) => {
  uni.showModal({
    title: title,
    content: phoneNumber,
Author	SHA1	Message	Date
chenghuan	1d7d00b6b6	Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app	2025-11-28 18:03:53 +08:00
chenghuan	bdf1b41098	更新：增加订单详情功能	2025-11-28 18:03:13 +08:00
chenghuan	0e7952ac4e	Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app	2025-11-28 14:31:09 +08:00
chenghuan	8f890a6802	修复：内测问题修改 v0.1.1	2025-11-28 14:31:02 +08:00