feat: 订单详情

.env.production

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://app.bjtdba.com'
+VITE_GLOB_API_URL = 'https://test.bjtdba.com'

src/apis/product.ts

@@ -76,10 +76,10 @@ enum API {
  */
 export function getProductDetail(product_id: string): Promise<ProductDetailModel> {
     return defHttp.get({
-        url: API.GET_PRODUCT_DETAIL,
-        data: {
-            product_id
-        }
+        url: API.GET_PRODUCT_DETAIL + `/${product_id}`,
+        // data: {
+        //     product_id
+        // }
     })
 }
 

src/pages/home/index.vue

@@ -121,6 +121,12 @@ function loadProductList() {
   })
 }
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
+
+function handleBannerClick() {
+  uni.navigateTo({
+    url: '/pages/vip/index'
+  })
+}
 </script>
 <template>
   <div class="h-screen ">
@@ -128,7 +134,11 @@ const homeBanner = CDN_URL + '/static/assets/home-banner.png'
             :exClass="headerClass"
     />
     <div class="flex flex-col gap-3 ">
-      <image :src="homeBanner" mode="widthFix" class="h-full w-full "></image>
+      <image
+          @click="handleBannerClick"
+          :src="homeBanner"
+             mode="widthFix" class="h-60 w-full "
+      ></image>
       <Navs/>
 
       <Announcement :list="state.announcementList"/>

src/pages/order-confirm/index.vue

@@ -49,6 +49,7 @@ onLoad((options) => {
   //     data.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
   //   })
   // }
+  addressStore.getCurrentAddress()
   data.addressInfo = addressStore.address
   data.addressId = addressStore.address.address_id
 

src/pages/order/components/OrderItem.vue

@@ -13,9 +13,43 @@
     </div>
 
 
-    <div v-if="orderItem.orderList">
-      <div v-for="(order, index) in orderItem.orderList" :key="index">
-        <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
+
+    <div @tap.stop="handleShowOrderDetail(orderItem)">
+      <div v-if="orderItem.orderList">
+        <div v-for="(order, index) in orderItem.orderList" :key="index">
+          <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
+            <div class="flex py-2 gap-3">
+              <div class="flex-1 flex gap-2">
+                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+
+                <div class="flex flex-col">
+                  <div class="line-clamp-2 text-[12px]">
+                    {{ orderProduct.cart_info.product.store_name }}
+                  </div>
+                  <div class="text-gray-500 text-[10px]">
+                    {{ orderProduct.cart_info.productAttr.sku }}
+                  </div>
+                </div>
+              </div>
+
+              <div class="flex flex-col justify-center items-center">
+                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+                <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
+              </div>
+
+            </div>
+            <div class="flex justify-end gap-2">
+              <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
+              <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
+
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+      <div v-else>
+        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
               <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
@@ -39,41 +73,11 @@
           <div class="flex justify-end gap-2">
             <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
             <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
-
           </div>
         </div>
       </div>
-
     </div>
 
-    <div v-else>
-      <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
-        <div class="flex py-2 gap-3">
-          <div class="flex-1 flex gap-2">
-            <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
-
-            <div class="flex flex-col">
-              <div class="line-clamp-2 text-[12px]">
-                {{ orderProduct.cart_info.product.store_name }}
-              </div>
-              <div class="text-gray-500 text-[10px]">
-                {{ orderProduct.cart_info.productAttr.sku }}
-              </div>
-            </div>
-          </div>
-
-          <div class="flex flex-col justify-center items-center">
-            <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
-            <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
-          </div>
-
-        </div>
-        <div class="flex justify-end gap-2">
-          <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
-          <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
-        </div>
-      </div>
-    </div>
   </div>
 
 
@@ -82,6 +86,7 @@
 import FPrice from "~/components/FPrice/FPrice.vue";
 import {OrderListModel} from "~/apis/model/order.model";
 import {cancelOrder} from "~/apis/order.api";
+import {encodeBase64} from "~/utils/http/helper";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -159,4 +164,11 @@ function handlePayment() {
     // url: `/pages/payment/index`
   })
 }
+
+function handleShowOrderDetail(order) {
+  console.log(order)
+  uni.navigateTo({
+    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+  })
+}
 </script>

src/pages/order/components/OtherOrderItem.vue

@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import FPrice from "~/components/FPrice/FPrice.vue";
+import dayjs from "dayjs";
+import {getProductDetail} from "~/apis/product";
+import {handleProductItemClick} from "~/utils/product-page";
+import {encodeBase64} from "~/utils/http/helper";
+const props = defineProps({
+  item: {
+    type: Object,
+    required: true
+  }
+})
+const sourceType = computed(() => {
+  switch (props.item.source) {
+    case '1': {
+      return '拼多多'
+    }
+    case '2': {
+      return '唯品会'
+    }
+    case '3': {
+      return '苏宁'
+    }
+    case '5': {
+      return '淘宝'
+    }
+    case '6': {
+      return '京东'
+    }
+    case '7': {
+      return 'App'
+    }
+  }
+})
+function navigateToDetail(params) {
+  let otherDetailUrl = `/pages/store/product/other`
+  return uni.navigateTo({
+    url: `${otherDetailUrl}?params=${params}`
+  })
+}
+function handleClick() {
+  // uni.navigateTo({
+  //   url: '/pages/'
+  // })
+  const product = props.item
+  // handleProductItemClick({
+  //   type: product.source,
+  //   id: product.goods_id,
+  //   featured: [product.goods_img]
+  // })
+  if (product.source === '6') {
+    navigateToDetail(encodeBase64({
+      platform: product.source,
+      id: product.goods_id
+    }))
+  }
+}
+
+
+</script>
+<template>
+  <div class="bg-white rounded p-2 flex flex-col gap-2">
+    <div class="flex justify-between items-center text-[12px] f-hairline-bottom py-2">
+      <div>订单号：{{ item.order_sn }}</div>
+      <div class="text-primary">{{ item.other_status_desc }}</div>
+    </div>
+
+    <div class="flex  gap-2">
+      <div class="flex">
+        <image :src="item.goods_img" mode="widthFix" class="w-16 h-16 rounded"></image>
+
+      </div>
+      <div class="flex items-center">
+        <div class="flex flex-col gap-1">
+          <div class="bg-primary text-[10px] rounded text-white px-1 w-fit">
+            {{ sourceType }}
+          </div>
+          <div class="text-[12px] line-clamp-2">
+            {{ item.goods_name }}
+          </div>
+        </div>
+        <div class="flex text-[11px] w-15 justify-end">{{ 'X' + item.goods_num }}</div>
+      </div>
+    </div>
+    <div class="flex justify-between text-[11px] items-center gap-2 f-hairline-bottom py-3">
+      <div class="flex">
+        {{ dayjs(item.create_time).format('YYYY-MM-DD')}}
+      </div>
+      <div class="flex justify-center items-center gap-2">
+        <div class="flex items-center">
+          补贴养老金：<FPrice :price="item.yanlao"></FPrice>
+        </div>
+        <div class="border border-solid border-1px border-gray-500 text-gray rounded px-1">{{ item.status_name }}</div>
+      </div>
+    </div>
+    <div class="flex justify-end items-center">
+      <nut-button plain type="primary" size="small" @click="handleClick">再次购买</nut-button>
+    </div>
+  </div>
+</template>

src/pages/order/index.vue

@@ -2,9 +2,10 @@
   <CXBBasePage>
     <nut-tabs v-model="state.tabvalue">
       <nut-tab-pane title="全部">
-        <div v-if="state.allOrderList.length > 0">
+        <div v-if="state.allOrderList.length > 0" class="flex flex-col gap-3">
           <div v-for="(orderItem, index) in state.allOrderList" :key="index">
-            <OrderItem :order-item="orderItem" />
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -13,7 +14,8 @@
       <nut-tab-pane title="待付款">
         <div v-if="state.obligationOrderList.length > 0">
           <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
-            <OrderItem :order-item="orderItem" />
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -21,7 +23,8 @@
       <nut-tab-pane title="待发货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" />
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -30,7 +33,8 @@
       <nut-tab-pane title="待收货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" />
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -39,7 +43,8 @@
       <nut-tab-pane title="待评价">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" />
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -60,6 +65,7 @@ import OrderItem from "~/pages/order/components/OrderItem.vue";
 import amapWx from "~/libs/amap-wx";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 
 const state = reactive({
   tabvalue: '0',
@@ -87,7 +93,7 @@ onLoad(options => {
 })
 function  	splitArray(list, sp) {
   if (typeof list != 'object') return [];
-  if (sp === undefined) sp = [];
+  if (sp == undefined) sp = [];
   for (var i = 0; i < list.length; i++) {
     sp.push(list[i]);
   }
@@ -102,6 +108,7 @@ function loadAllOrderList() {
     console.log(res)
     state.allOrderTotal = res.total
     state.allOrderList = res.list
+    console.log(res)
   })
 }
 watch(() => state.tabvalue, (val) => {

src/pages/store/product/detail.vue

@@ -76,6 +76,13 @@ function loadCartCount() {
   getCartCount().then(res => {
     // console.log(res)
     state.cartCount = res[0].count
+  }).catch(error => {
+    console.log(error)
+    if (error === '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index?key=4'
+      })
+    }
   })
 }
 // const skuData = computed(() => {
@@ -152,10 +159,13 @@ function handleCreateShopping() {
       }
     }
   }).catch(error => {
-    uni.showToast({
-      title: error,
-      icon: 'none'
+    uni.navigateTo({
+      url: '/pages/user/login/index'
     })
+    // uni.showToast({
+    //   title: error,
+    //   icon: 'none'
+    // })
   })
 }
 

src/pages/user/address/index.vue

@@ -79,6 +79,7 @@ export default {
       // from.value =
       getUserAddressList().then(res => {
         if (res) {
+          console.log(res)
           data.value = res.list
         }
       })

src/pages/user/index.vue

@@ -236,19 +236,19 @@ const userType = computed(() => {
                 class="w-1/3 flex flex-col justify-center items-center"
             >
               <div>{{ userStore.yanglao.all_yanglao }}</div>
-              <div class="text-sm">养老金</div>
+              <div class="text-xs">养老金</div>
             </div>
             <div
                 @tap="handleShowMyInvitation"
                 class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.member_brokerage_price }}</div>
-              <div class="text-sm">我的佣金</div>
+              <div class="text-xs">我的佣金</div>
             </div>
             <div
                 @tap="handleShowMyIntegral"
                 class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.score }}</div>
-              <div class="text-sm">我的积分</div>
+              <div class="text-xs">我的积分</div>
             </div>
           </div>
           <div
@@ -256,11 +256,11 @@ const userType = computed(() => {
               class="flex">
             <div class="w-1/2 flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.red }}</div>
-              <div class="text-sm">红积分提现</div>
+              <div class="text-xs">红积分提现</div>
             </div>
             <div class="w-1/2 flex flex-col  justify-center items-center">
               <div>{{ userStore.userInfo.team_number }}</div>
-              <div class="text-sm">团队人数</div>
+              <div class="text-xs">团队人数</div>
             </div>
           </div>
 
@@ -268,7 +268,7 @@ const userType = computed(() => {
 
       </div>
 
-      <div class="bg-white rounded px-3">
+      <div class="bg-white rounded px-3 text-sm">
         <div class="flex justify-between pt-4 mb-4">
           <div>我的订单</div>
           <div
@@ -286,7 +286,7 @@ const userType = computed(() => {
                    mode="widthFix"
                    class="w-8 h-8 "
             />
-            <div class="text-sm">{{ item.text }}</div>
+            <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>
 

src/utils/product-page.ts

@@ -199,7 +199,7 @@ export function handleProductItemClick(
         & VipProductModel
 ) {
 
-
+    console.log(item)
     function navigateToDetail(params) {
         let otherDetailUrl = `/pages/store/product/other`
         return uni.navigateTo({