Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/api/order.js

@@ -61,6 +61,7 @@ export function repaymentApi(data) {
     data,
   });
 }
+
 // 查询各类订单状态
 export function sgyOrderGetStatus(data) {
   return request({
@@ -69,3 +70,12 @@ export function sgyOrderGetStatus(data) {
     data,
   });
 }
+
+// 申请退款applyForARefund
+export function applyForARefundApi(data) {
+  return request({
+    url: '/sgyrdd/sgyOrder/afterSales/apply',
+    method: 'POST',
+    data,
+  });
+}

src/pages/index/foodClassification.vue

@@ -142,11 +142,8 @@ onLoad((option) => {
   pics.value = pic;
   query(parentId);
   prodSpecialFn();
-});
-onMounted(() => {
   getLocationFn().then((res) => {
-    const { lat, lon } = res;
-    getMerchantList(lat, lon);
+    getMerchantList();
   });
 });
 // distance参数来源
@@ -313,6 +310,8 @@ function getLocationFn() {
       type: 'wgs84',
       isHighAccuracy: true,
       success: function (res) {
+        params.value.lat = res.latitude;
+        params.value.lon = res.longitude;
         // 经纬度
         resolve({ lat: res.latitude, lon: res.longitude });
       },

src/pages/order/order.vue

@@ -221,7 +221,6 @@ const getList = async () => {
     res.data.records.forEach((item) => {
       // 待付款倒计时计算
       if (item.status === 'not_pay') {
-        console.log(item.status);
         item.countDown = calculateCountdown(item.createTime);
       }
     });

src/pages/order/refund.vue

 <template>
   <view class="container">
     <Header title="售后/退款"></Header>
-    <view class="content">
+    <view class="content" v-if="orderDetail">
       <view class="content-box">
         <view class="content-item">
-          <text class="title">单号:1111111111</text>
+          <text class="title">单号:{{ orderDetail.orderStore.orderNumber.slice(6) }}</text>
         </view>
         <view class="content-item">
           <view class="item-top">
-            <image class="item-img" mode="aspectFill" src="/static/ticket/logo.png"></image>
+            <image
+              class="item-img"
+              mode="aspectFill"
+              :src="fileDomain + orderDetail.orderItems[0].pic"
+            ></image>
             <view class="item-info">
-              <text>血糯米</text>
-              <text>￥0.01</text>
+              <text>{{ orderDetail.orderItems[0].prodName }}</text>
+              <text>￥{{ orderDetail.orderItems[0].price }}</text>
             </view>
           </view>
           <view class="item-buttom" style="padding-top: 60rpx">
             <text>共</text>
-            <text class="num">1</text>
+            <text class="num">{{ orderDetail.orderItems[0].prodCount }}</text>
             <text>件商品 实付款</text>
             <text class="icon">￥</text>
-            <text class="price">0.01</text>
+            <text class="price">{{ orderDetail.orderStore.actualTotal }}</text>
           </view>
         </view>
         <view class="content-item">
           <view class="item-buttom">
-            <text>2024-08-02 10:12:16</text>
+            <text>{{ orderDetail.orderStore.createTime }}</text>
           </view>
         </view>
         <view class="content-between">
           <text>退款金额</text>
-          <text class="price">￥0.01</text>
+          <text class="price">￥{{ orderDetail.orderStore.actualTotal }}</text>
         </view>
         <view class="content-between">
           <text>相关图片</text>
@@ -91,11 +95,26 @@
 
 <script setup>
 import Header from '@/pages/order/components/Header/index.vue';
+import { applyForARefundApi, getOrderDetail } from '@/api/order';
+const fileDomain = import.meta.env.VITE_APP_IMG_URL;
+
+const orderNumber = ref('');
+onLoad((options) => {
+  orderNumber.value = options.orderNumber;
+  getDetail();
+});
+
+/**
+ * 获取订单详情
+ */
+const orderDetail = ref();
+const getDetail = async () => {
+  const res = await getOrderDetail({ orderNumber: orderNumber.value });
+  orderDetail.value = res.data;
+};
 
 const fileList = ref([]);
-
 const action = ref('');
-
 function handleChange({ fileList: files }) {
   console.log(files);
   fileList.value = files;

src/pages/order/ticketCode.vue

 <template>
   <view class="container">
     <Header title="查看券码"></Header>
-    <view class="content">
+    <view class="content" v-if="orderDetail">
       <!-- 使用状态 -->
       <view class="status">
-        <view class="status-text">{{ orderDetail.shopName }}</view>
-        <view class="detail">有效期：{{ orderDetail.receiverTime }}</view>
+        <view class="status-text">{{ orderDetail.orderItems[0].prodName }}</view>
+        <view class="detail">有效期：{{ orderDetail.orderStore.receiverTime }}</view>
       </view>
 
       <!-- 券码信息 -->
       <view class="info">
         <view class="box">
           <text class="title">{{ orderDetail.orderItems[0].prodName }}</text>
-          <text class="code">{{ orderDetail.orderNumber }}</text>
+          <text class="code">{{ orderDetail.orderStore.orderNumber }}</text>
         </view>
         <view class="rectangle-with-semicircles"></view>
         <view class="qrcode line">
@@ -44,15 +44,18 @@ const orderDetail = ref();
 function getOrderDetailFn(orderNumber) {
   getOrderDetail({ orderNumber }).then((res) => {
     orderDetail.value = res.data;
-    const outTradeNo = res.data.orderNumber;
+    const outTradeNo = res.data.orderStore.orderNumber;
     const indexOfDash = outTradeNo.indexOf('-');
     if (indexOfDash !== -1) {
-      res.data.orderNumber = outTradeNo.substring(indexOfDash + 1);
+      res.data.orderStore.orderNumber = outTradeNo.substring(indexOfDash + 1);
     } else {
       console.log(`订单编号 ${outTradeNo} 中没有找到 "-" 符号。`);
     }
-    if (orderDetail.value.status === '2' || orderDetail.value.status === '3') {
-      codeDetail(orderDetail.value.orderNumber);
+    if (
+      orderDetail.value.orderStore.status === '2' ||
+      orderDetail.value.orderStore.status === '3'
+    ) {
+      codeDetail(orderDetail.value.orderStore.orderNumber);
     }
   });
 }

src/pages/shop/confirmOrder.vue

@@ -186,7 +186,7 @@ onShow(() => {
   if (outTradeNos.value) {
     // 查询订单状态决定是否支付
     getOrderDetail({ orderNumber: outTradeNos.value }).then((res) => {
-      switch (res.data.baseOrder.substatus) {
+      switch (res.data.baseOrder.subStatus) {
         case '1':
           xma.showToast({
             title: '支付失败',

src/pages/shop/paymentSuccessful.vue

@@ -31,26 +31,33 @@
 import Header from '@/pages/order/components/Header/index.vue';
 import { getOrderDetail, getShopDetail, getProdDetail } from '@/api/order';
 import QRCode from 'qrcode';
+const myOutTradeNos = ref('');
 /**
  * 获取订单详情
  */
 const orderDetail = ref();
 onLoad((options) => {
   const { outTradeNos } = options;
-  getOrderDetailFn('NEONO-2024080509591318964');
+  myOutTradeNos.value = outTradeNos;
+  getOrderDetailFn(outTradeNos);
 });
 function getOrderDetailFn(orderNumber) {
   getOrderDetail({ orderNumber }).then((res) => {
-    orderDetail.value = res.data;
-    const outTradeNo = res.data.orderNumber;
+    orderDetail.value = res.data.baseOrder;
+    orderDetail.value.orderItems = res.data.orderItems;
+    orderDetail.value.orderStore = res.data.orderStore;
+    const outTradeNo = res.data.baseOrder.orderNumber;
     const indexOfDash = outTradeNo.indexOf('-');
     if (indexOfDash !== -1) {
-      res.data.orderNumber = outTradeNo.substring(indexOfDash + 1);
+      res.data.baseOrder.orderNumber = outTradeNo.substring(indexOfDash + 1);
     } else {
       console.log(`订单编号 ${outTradeNo} 中没有找到 "-" 符号。`);
     }
-    if (orderDetail.value.status === '2' || orderDetail.value.status === '3') {
-      codeDetail(orderDetail.value.orderNumber);
+    if (
+      orderDetail.value.orderStore.status === '2' ||
+      orderDetail.value.orderStore.status === '3'
+    ) {
+      codeDetail(orderNumber);
     }
     getProductDetail(orderDetail.value.orderItems[0].prodId);
     getShopMailDetail(orderDetail.value.shopId);

src/pages/shop/shop.vue

@@ -615,6 +615,10 @@ const giveTheThumbs = (item, index) => {
  * 查看全部评论
  */
 const viewAll = () => {
+  xma.showLoading({
+    title: '加载中...',
+    mask: false,
+  });
   getEvaluationPage({
     current: 1,
     size: commentTotal.value,
@@ -624,6 +628,7 @@ const viewAll = () => {
       commentList.value = res.data.records.map((item) => {
         item.avatar = addImgUrlPrefix(imgUrl, item.avatar);
         item.images = addImgUrlPrefixToImages(imgUrl, item.images);
+        xma.hideLoading();
         return item;
       });
     }