测试bug-ok

src/apis/order.api.ts

@@ -77,7 +77,7 @@ enum API {
  * 申请退款
  */
 export function refundApply(id: string, request: RefundApplyRequest) {
-    return defHttp.post({
+    return detailHttp.post({
         url: API.REFUND_APPLY + `/${id}`,
         data: {
             ...request

src/components/FNavBar/FNavBar.vue

@@ -4,6 +4,7 @@ import { useNavBar } from './use-nav-bar'
 
 const props = defineProps(navBarProps)
 const emit = defineEmits(navBarEmits)
+console.log('props',props);
 
 const {
   navBarRef,

src/pages/after-sales-order-list/index.vue

@@ -109,7 +109,7 @@ function loadAllOrderList() {
     page: 1,
     limit: 10
   }).then(res => {
-    // console.log(res)
+    console.log('更新列表',res)
     state.allOrderTotal = res.total
     state.allOrderList = res.list
     // console.log(res)

src/pages/home/components/header.vue

@@ -106,7 +106,7 @@ function handleShowMessage() {
 
 
     </div>
-    <div class="p-3">
+    <div class="">
       <FSearch />
 
     </div>

src/pages/order-confirm/index.vue

@@ -60,6 +60,7 @@ onLoad(async (options) => {
   //   })
   // }
   const res = await getUserAddressList()
+  console.log('我可是res啊',res)
   if (res.list && res.list.length > 0) {
     data.addressInfo = res.list[0]
     data.addressId = res.list[0].address_id
@@ -246,9 +247,12 @@ function reTotal() {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log(res)
+    console.log('我可是res啊',res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
+    console.log('data.cartOrder',data.cartOrder);
+    
+    
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
@@ -357,17 +361,18 @@ function reTotal() {
 
           </div>
           <div>
+            <!-- 优惠券数据 先写死 -->
             <FCell
                 v-if="item.mer_id != '148'"
                 title="优惠劵"
-                :value="item.order.coupon_price ? item.order.coupon_price : '暂无优惠券'"
+                :value="item.order.youhui_price!=0 ? item.order.youhui_price : '暂无优惠券'"
                 arrow
                 @click="gotoCoupon"
             ></FCell>
             <FCell
                 v-if="item.mer_id == '148'"
                 title="积分"
-                :value="userStore.userInfo.score ? userStore.userInfo.score : '暂无积分'"
+                :value="userStore.userInfo.score!='0' ? userStore.userInfo.score : '暂无积分'"
                 arrow
             ></FCell>
             <FCell

src/pages/order/components/OrderItem.vue

@@ -1,16 +1,17 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {OrderListModel} from "~/apis/model/order.model";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {encodeBase64} from "~/utils/http/helper";
-import {deleteAddress} from "~/apis/user";
+import { OrderListModel } from "~/apis/model/order.model";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { encodeBase64 } from "~/utils/http/helper";
+import { deleteAddress } from "~/apis/user";
 import {
   DyProductModel,
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
+import { DcProductModel } from "~/apis/model/dacang.model";
+import { error } from "console";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -93,6 +94,11 @@ function handleCancelOrder() {
 
     }, 300)
 
+  }).catch(error => {
+    // uni.showToast({
+    //   title: error,
+    //   icon: 'none'
+    // })
   })
 }
 
@@ -159,7 +165,7 @@ function handleComment(orderItem) {
 }
 
 function handleProductItemClick(
-    item
+  item
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -167,15 +173,17 @@ function handleProductItemClick(
   //     url: `${otherDetailUrl}?params=${params}`
   //   })
   // }
-  // console.log(item)
+  console.log('我是item', item)
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+    url: `/pages/store/product/detail?id=${(item.orderProduct[0])?.product_id}`
   })
 }
 
 
 function handeRefund(orderItem) {
+  console.log('申请售后', orderItem);
+
   uni.navigateTo({
     // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
     url: `/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
@@ -191,9 +199,7 @@ function handleShowObligationOrderDetail(orderItem) {
 
 <template>
   <div class="bg-white rounded p-3">
-    <div
-        @tap.stop="handleHeaderClick"
-        class="flex items-center justify-between f-hairline-bottom pb-3">
+    <div @tap.stop="handleHeaderClick" class="flex items-center justify-between f-hairline-bottom pb-3">
       <div class="flex items-center font-bold gap-2 text-sm justify-between">
         <div class="flex-1 flex items-center gap-2">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
@@ -237,18 +243,23 @@ function handleShowObligationOrderDetail(orderItem) {
 
             </div>
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 5">
-              <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+              <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+                <div class="text-black">取消订单</div>
+              </nut-button>
               <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
             </div>
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 0">
-              <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+              <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery">
+                <div class="text-black">提醒发货</div>
+              </nut-button>
               <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
             </div>
 
 
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 1">
-              <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
+              <nut-button size="small" plain type="default"
+                @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
               <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
 
               <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderProduct)">确认收货</nut-button>
@@ -256,7 +267,8 @@ function handleShowObligationOrderDetail(orderItem) {
             </div>
 
             <div class="flex justify-end gap-2" v-if="orderProduct.status == 2">
-              <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderProduct)">再次购买</nut-button>
+              <nut-button size="small" plain type="default"
+                @tap.stop="handleProductItemClick(orderProduct)">再次购买</nut-button>
               <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderProduct)">去评价</nut-button>
 
             </div>
@@ -265,8 +277,9 @@ function handleShowObligationOrderDetail(orderItem) {
 
       </div>
 
-      <div v-else  @tap.stop="handleShowOrderDetail(orderItem)">
-        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex" class="flex flex-col gap-3">
+      <div v-else @tap.stop="handleShowOrderDetail(orderItem)">
+        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex"
+          class="flex flex-col gap-3">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
               <div class="flex w-20">
@@ -284,7 +297,7 @@ function handleShowObligationOrderDetail(orderItem) {
             </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>-->
+              <!--              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
               <FPrice :price="orderProduct.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
@@ -294,12 +307,16 @@ function handleShowObligationOrderDetail(orderItem) {
         </div>
 
         <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
-          <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+          <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+            <div class="text-black">取消订单</div>
+          </nut-button>
           <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
         </div>
         <div class="flex justify-end gap-2" v-if="orderItem.status == 0">
-          <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+          <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery">
+            <div class="text-black">提醒发货</div>
+          </nut-button>
           <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
         </div>
 
@@ -316,10 +333,7 @@ function handleShowObligationOrderDetail(orderItem) {
           <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderItem)">去评价</nut-button>
 
         </div>
-      </div>
     </div>
-
   </div>
 
-
-</template>
+</div></template>

src/pages/order/components/OrderObligationItem.vue

@@ -87,7 +87,7 @@ function handleCancelOrder() {
       })
 
       uni.$emit('orderCancelFromList')
-
+      
     }, 300)
 
   })

src/pages/order/components/OtherOrderItem.vue

@@ -51,7 +51,7 @@ function handleClick() {
   //   id: product.goods_id,
   //   featured: [product.goods_img]
   // })
-  console.log(product)
+  console.log('woshi111',product)
   // if (product.source == '6') {
   const productId = props.item.source == '1' ? product.goods_sign : product.goods_id
   // console.log(productId)

src/pages/order/detail.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {encodePhone} from "~/utils";
-import {CDN_URL} from "~/config/app";
-import {useAddressStore} from "~/stores/addressStore";
+import { encodePhone } from "~/utils";
+import { CDN_URL } from "~/config/app";
+import { useAddressStore } from "~/stores/addressStore";
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {decodeBase64, encodeBase64} from "~/utils/http/helper";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { decodeBase64, encodeBase64 } from "~/utils/http/helper";
 
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 const addressStore = useAddressStore()
@@ -25,7 +25,7 @@ onLoad((options) => {
   // console.log(options.detail)
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
-  // detail.value = JSON.parse(decodeBase64(base64Json))
+    // detail.value = JSON.parse(decodeBase64(base64Json))
   }
   if (options.type) {
     state.type = options.type
@@ -64,6 +64,8 @@ onLoad((options) => {
 function handleCancelOrder() {
   console.log('取消订单操作')
   cancelOrder(detail.value.group_order_id).then(res => {
+    console.log('RES',res);
+    
     uni.showToast({
       title: '取消成功',
       icon: 'none'
@@ -73,11 +75,15 @@ function handleCancelOrder() {
       uni.navigateBack()
     }, 300)
 
-  }).catch(error => {
-
-    uni.navigateTo({
-      url: '/pages/user/login/index?key=30'
-    })
+  })
+  .catch(error => {
+    // uni.showToast({
+    //   title: error,
+    //   icon: 'none'
+    // })
+    // uni.navigateTo({
+    //   url: '/pages/user/login/index?key=30'
+    // })
   })
 }
 
@@ -86,7 +92,7 @@ function handlePayment() {
   // const { orderItem } = detail.value
   // console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.group_order_id}&OrderList=${JSON.stringify( detail.value)}`
+    url: '/pages/payment/index?' + `pay_price=${detail.value.pay_price}&order_id=${detail.value.group_order_id}&OrderList=${JSON.stringify(detail.value)}`
     // url: `/pages/payment/index`
   })
 }
@@ -181,14 +187,14 @@ const payType = computed(() => {
 })
 
 const getSymbol = (pay_type: string) => {
-    if (pay_type === '5') {
-      return '积分'
-    } else {
-      return '¥'
-    }
+  if (pay_type === '5') {
+    return '积分'
+  } else {
+    return '¥'
+  }
 }
 function handleProductItemClick(
-    item
+  item
 ) {
   console.log(item.product_id)
   // 大仓
@@ -200,167 +206,165 @@ function handleProductItemClick(
 
 </script>
 <template>
-    <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
-      <div
-          class="rounded bg-white p-3 flex">
-        <div class="flex flex-col flex-1 gap-2">
-          <div class="flex items-center gap-2">
-            <div class="flex text-sm text-gray-500 justify-between items-center w-full">
-              <div class="flex-1 flex items-center gap-2">
-                <div class="w-fit flex">
-                  <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
-                </div>
-                <div class="flex-1 flex">
-                  {{ detail.user_address }}
-                </div>
+  <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
+    <div class="rounded bg-white p-3 flex">
+      <div class="flex flex-col flex-1 gap-2">
+        <div class="flex items-center gap-2">
+          <div class="flex text-sm text-gray-500 justify-between items-center w-full">
+            <div class="flex-1 flex items-center gap-2">
+              <div class="w-fit flex">
+                <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="flex-1 flex">
+                {{ detail.user_address }}
               </div>
+            </div>
 
-              <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
+            <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
 
-            </div>
           </div>
-          <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
-          <div class="flex gap-2 items-center text-xs text-gray-500">
-            <div>
-              {{ detail.real_name }}
-            </div>
-            <div v-if="detail.user_phone">
-              {{ encodePhone(detail.user_phone) }}
-            </div>
+        </div>
+        <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
+        <div class="flex gap-2 items-center text-xs text-gray-500">
+          <div>
+            {{ detail.real_name }}
+          </div>
+          <div v-if="detail.user_phone">
+            {{ encodePhone(detail.user_phone) }}
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="bg-white rounded">
-        <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3" v-if="detail.merchant">
-          <image :src="detail.merchant.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
-          <div>{{ detail.merchant.mer_name }}</div>
-        </div>
+    <div class="bg-white rounded">
+      <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3" v-if="detail.merchant">
+        <image :src="detail.merchant.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
+        <div>{{ detail.merchant.mer_name }}</div>
+      </div>
 
-        <div v-for="(productItem, productIndex) in detail.orderProduct" :key="productIndex" class="p-3">
-          <div class="flex gap-2">
-            <div  @tap.stop="handleProductItemClick(productItem)">
-              <image :src="productItem.cart_info.product.image" mode="widthFix" class="rounded w-20 h-20"></image>
+      <div v-for="(productItem, productIndex) in detail.orderProduct" :key="productIndex" class="p-3">
+        <div class="flex gap-2">
+          <div @tap.stop="handleProductItemClick(productItem)">
+            <image :src="productItem.cart_info.product.image" mode="widthFix" class="rounded w-20 h-20"></image>
 
-            </div>
-            <div class="flex flex-col w-full">
-              <div class="flex flex-col text-sm ">
-                <div class="flex justify-between" @tap.stop="handleProductItemClick(productItem)">
-                  <div class="flex">
-                    {{ productItem.cart_info.product.store_name }}
-                  </div>
-                  <div class="flex">¥{{ productItem.product_price }}</div>
+          </div>
+          <div class="flex flex-col w-full">
+            <div class="flex flex-col text-sm ">
+              <div class="flex justify-between" @tap.stop="handleProductItemClick(productItem)">
+                <div class="flex">
+                  {{ productItem.cart_info.product.store_name }}
                 </div>
+                <div class="flex">¥{{ productItem.product_price }}</div>
+              </div>
 
 
-                <div class="text-[11px] text-gray-500 flex justify-between">
-                  <div class="">{{ productItem.cart_info.productAttr.sku }}</div>
-                  <div class="">共{{ productItem.product_num }}件</div>
-                </div>
-
+              <div class="text-[11px] text-gray-500 flex justify-between">
+                <div class="">{{ productItem.cart_info.productAttr.sku }}</div>
+                <div class="">共{{ productItem.product_num }}件</div>
               </div>
+
             </div>
           </div>
         </div>
+      </div>
 
 
-        <div class=" flex flex-col gap-3 p-3">
-          <div class="flex justify-end" v-if="detail.status == 1 || detail.status == 2 || detail.status == 3 || detail.status == 0">
-            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
-          </div>
-<!--          <div class="flex justify-end" v-if="detail.status == 0">-->
-<!--            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请退款</nut-button>-->
-<!--          </div>-->
+      <div class=" flex flex-col gap-3 p-3">
+        <div class="flex justify-end"
+          v-if="detail.status == 1 || detail.status == 2 || detail.status == 3 || detail.status == 0">
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
+        </div>
+        <!--          <div class="flex justify-end" v-if="detail.status == 0">-->
+        <!--            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请退款</nut-button>-->
+        <!--          </div>-->
 
-          <div class="flex justify-between">
-            <div>商品总额</div>
-            <div class="text-gray">{{getSymbol(detail.pay_type)}}{{ detail.total_price }}</div>
-          </div>
-          <div class="flex justify-between">
-            <div>优惠金额</div>
-            <div class="text-gray">{{getSymbol(detail.pay_type)}}{{ detail.coupon_price }}</div>
-          </div>
-          <div class="flex justify-between">
-            <div>运费</div>
-            <div class="text-gray">
-              {{getSymbol(detail.pay_type)}}{{ detail.pay_postage }}
-            </div>
+        <div class="flex justify-between">
+          <div>商品总额</div>
+          <div class="text-gray">{{ getSymbol(detail.pay_type) }}{{ detail.total_price }}</div>
+        </div>
+        <div class="flex justify-between">
+          <div>优惠金额</div>
+          <div class="text-gray">{{ getSymbol(detail.pay_type) }}{{ detail.coupon_price }}</div>
+        </div>
+        <div class="flex justify-between">
+          <div>运费</div>
+          <div class="text-gray">
+            {{ getSymbol(detail.pay_type) }}{{ detail.pay_postage }}
           </div>
-          <div class="flex justify-between">
+        </div>
+        <div class="flex justify-between">
 
-            <div>实付款</div>
-            <div class="text-gray">
-              <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" symbol="积分" v-if="detail.pay_type == 5"></FPrice>
-              <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" v-else></FPrice>
-            </div>
+          <div>实付款</div>
+          <div class="text-gray">
+            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" symbol="积分" v-if="detail.pay_type == 5">
+            </FPrice>
+            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" v-else></FPrice>
           </div>
+        </div>
 
-          <div class="h-0.2 bg-gray-100 my-2"></div>
+        <div class="h-0.2 bg-gray-100 my-2"></div>
 
-<!--          <div class="flex justify-between">-->
+        <!--          <div class="flex justify-between">-->
 
-<!--            <div>订单编号</div>-->
-<!--            <div class="text-gray">{{ detail.order_sn }}</div>-->
-<!--          </div>-->
-          <div class="flex justify-between">
-            <div>订单编号</div>
-            <div class="flex gap-2">
-              <div class="text-gray-400">{{ detail.order_sn }}</div>
-              <div @click="handleClipboard">复制</div>
-            </div>
+        <!--            <div>订单编号</div>-->
+        <!--            <div class="text-gray">{{ detail.order_sn }}</div>-->
+        <!--          </div>-->
+        <div class="flex justify-between">
+          <div>订单编号</div>
+          <div class="flex gap-2">
+            <div class="text-gray-400">{{ detail.order_sn }}</div>
+            <div @click="handleClipboard">复制</div>
           </div>
-          <div class="flex justify-between">
+        </div>
+        <div class="flex justify-between">
 
-            <div>支付方式</div>
+          <div>支付方式</div>
 
-            <div class="text-gray">{{ payType }}</div>
-<!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
-          </div>
+          <div class="text-gray">{{ payType }}</div>
+          <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
+        </div>
 
-          <div class="flex justify-between">
+        <div class="flex justify-between">
 
-            <div>下单时间</div>
-            <div class="text-gray">{{ detail.create_time }}</div>
-          </div>
+          <div>下单时间</div>
+          <div class="text-gray">{{ detail.create_time }}</div>
+        </div>
 
-          <div class="flex justify-between" v-if="detail.status != 5">
+        <div class="flex justify-between" v-if="detail.status != 5">
 
-            <div>支付时间</div>
-            <div class="text-gray">{{ detail.pay_time }}</div>
-            <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
-          </div>
+          <div>支付时间</div>
+          <div class="text-gray">{{ detail.pay_time }}</div>
+          <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
         </div>
-
       </div>
+
     </div>
+  </div>
 
-    <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
-      <div class="flex justify-end gap-2 p-3"
-           v-if="detail.status == 5 || detail.type == 5"
-      >
-        <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
-        <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+  <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 5 || detail.type == 5">
+      <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+        <div class="text-black">取消订单</div>
+      </nut-button>
+      <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
-      </div>
-      <div class="flex justify-end gap-2 p-3"
-           v-if="detail.status == 0 || detail.type == 0"
-      >
-        <nut-button size="small" type="primary" plain
-                    @tap.stop="handleRemindTheDelivery">提醒发货</nut-button>
+    </div>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 0 || detail.type == 0">
+      <nut-button size="small" type="primary" plain @tap.stop="handleRemindTheDelivery">提醒发货</nut-button>
 
-      </div>
-      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 1 || detail.type == 1">
-        <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics">查看物流</nut-button>
+    </div>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 1 || detail.type == 1">
+      <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics">查看物流</nut-button>
 
-        <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder">确认收货</nut-button>
+      <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder">确认收货</nut-button>
 
-      </div>
+    </div>
 
-      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 2 || detail.type == 2">
-        <nut-button size="small" plain type="primary" @tap.stop="handleComment">去评价</nut-button>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 2 || detail.type == 2">
+      <nut-button size="small" plain type="primary" @tap.stop="handleComment">去评价</nut-button>
 
-      </div>
     </div>
+  </div>
 </template>
 
 <route lang="yaml">

src/pages/order/obligation-detail.vue

@@ -42,9 +42,9 @@ function handleCancelOrder() {
 
   }).catch(error => {
 
-    uni.navigateTo({
-      url: '/pages/user/login/index?key=30'
-    })
+    // uni.navigateTo({
+    //   url: '/pages/user/login/index?key=30'
+    // })
   })
 }
 

src/pages/payment/index.vue

@@ -102,8 +102,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
-    // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({

src/pages/refund/drawback.vue

@@ -90,7 +90,10 @@ function handleSubmit() {
       if (res.confirm) {
         refundApply(state.orderId.toString(), formData).then(res => {
           // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
-          uni.showToast({
+          console.log('申请退款成功',res);
+          
+          if(res.status===200){
+             uni.showToast({
             title: '申请退款成功',
             icon: 'none'
           })
@@ -99,10 +102,26 @@ function handleSubmit() {
               url: `/pages/refund/index?from=${state.from}`
             })
           }, 300)
+          }else{
+            uni.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+          setTimeout(() => {
+            uni.navigateTo({
+              url: `/pages/refund/index?from=${state.from}`
+            })
+          }, 300)
+          }
+         
         })
 
       }
-    }
+    },
+    fail: function (error) {
+    // 模态框显示失败，可能是因为参数不合法等原因
+    console.log('模态框显示失败', error);
+  }
   })
   // if (state.orderId) {
   // }

src/pages/store/product/detail.vue

@@ -15,7 +15,7 @@ import {
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
 import { DcProductModel } from "~/apis/model/dacang.model";
-import { CDN_URL,CDM_URL } from "~/config/app";
+import { CDN_URL, CDM_URL } from "~/config/app";
 import dayjs from "dayjs";
 import { getShareId } from "~/apis/product";
 import { debounce } from "lodash-es";
@@ -64,7 +64,7 @@ const state = reactive({
   shareImage: '',
 })
 const detail: any = ref(null)
-const isTo= ref(3)
+const isTo = ref(3)
 let isShow = ref(false)
 onShow(() => {
   uni.showLoading({
@@ -84,8 +84,8 @@ onShow(() => {
 })
 //下架图片
 const outImg = computed(() => {
-  if(isShow){
-    return  CDM_URL+'/image/2023-11-24/20231124182002679.png'
+  if (isShow) {
+    return CDM_URL + '/image/2023-11-24/20231124182002679.png'
   }
 
 })
@@ -139,8 +139,8 @@ function loadProductDetail() {
     // console.log(res);
     if (res.status === 200) {
       detail.value = res.data
-      console.log('我是detail',detail.value);
-      
+      console.log('我是detail', detail.value);
+
       state.shareImage = detail.value.image
       if (res && res.mer_id && res.mer_id === '148') {
         if (detail.value && detail.value.price) {
@@ -299,12 +299,12 @@ function handleShowShopCart() {
   })
 }
 
-function onSelectedSku(item :any) {
+function onSelectedSku(item: any) {
   state.currentSku = item
 }
 
 function handleAddCart() {
-  isTo.value=1
+  isTo.value = 1
   state.isShowSku = true
   state.flag = 2
 
@@ -313,7 +313,7 @@ function handleAddCart() {
 
 function handleCreateShopping() {
   // console.log(state.flag)
-  console.log('我是detail数据',detail.value)
+  console.log('我是detail数据', detail.value)
   createShopping({
     product_id: detail.value.product_id,
     // product_attr_unique: JSON.stringify(state.currentSku),
@@ -321,18 +321,18 @@ function handleCreateShopping() {
     cart_num: state.cartNum,
     is_new: (state.flag === '1' || state.flag === '3') ? '1' : '0'
   }).then(res => {
-    console.log('resres',res)
-  
+    console.log('resres', res)
+
     if (res.cart_id) {
       // console.log(state.flag)
       if (state.flag == '1' || state.flag == '3') {
-        isTo.value=state.flag
+        isTo.value = state.flag
         console.log(isTo.value)
         uni.navigateTo({
           url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
         })
-      } else if(state.flag == '2') {
-        isTo.value=1
+      } else if (state.flag == '2') {
+        isTo.value = 1
         uni.$emit('cart-reload')
         loadProductDetail()
         uni.showToast({
@@ -344,27 +344,40 @@ function handleCreateShopping() {
       }
     }
   }).catch(error => {
-    if (error === '会员礼包不能加入购物车') {
-      return uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-    } else if (error === '库存不足') {
-      return uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-    }
-    else {
-      return uni.navigateTo({
-        url: '/pages/user/login/index'
-      })
-    }
+    // if (error === '会员礼包不能加入购物车') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // } else if (error === '库存不足') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // }
+    // else if(error==='您已是高级会员，分红满额后可再次购买~') {
+    //   uni.showToast({
+    //         title: error,
+    //         icon: 'none'
+    //       })
+
+    // }else{
+    //   console.log('我是error>>>',error);
+    //   uni.showToast({
+    //         title: error,
+    //         icon: 'none'
+    //       })
+    // }
+    console.log('我是error>>>', error);
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
 
   })
 }
 function handleBuyshow() {
-  console.log('我是detail数据',detail.value)
+  console.log('我是detail数据', detail.value)
   createShopping({
     product_id: detail.value.product_id,
     // product_attr_unique: JSON.stringify(state.currentSku),
@@ -372,31 +385,35 @@ function handleBuyshow() {
     cart_num: state.cartNum,
     is_new: (state.flag === '1' || state.flag === '3') ? '1' : '0'
   }).then(res => {
-    console.log('resres',res)
-  
+    console.log('resres', res)
+
     if (res.cart_id) {
       uni.navigateTo({
-          url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
-        })
-    }
-  }).catch(error => {
-    if (error === '会员礼包不能加入购物车') {
-      return uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-    } else if (error === '库存不足') {
-      return uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-    }
-    else {
-      return uni.navigateTo({
-        url: '/pages/user/login/index'
+        url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
       })
     }
-
+  }).catch(error => {
+    // if (error === '会员礼包不能加入购物车') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // } else if (error === '库存不足') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // }
+    // else {
+    //   return uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }
+    console.log('我是error>>>', error);
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 }
 function handleAddshow() {
@@ -414,37 +431,41 @@ function handleAddshow() {
     if (res.cart_id) {
       // console.log(state.flag)
       uni.$emit('cart-reload')
-        loadProductDetail()
-        uni.showToast({
-          title: '添加购物车成功',
-          icon: 'none'
-        })
-        loadCartCount()
-        state.isShowSku = false
-    }
-  }).catch(error => {
-    if (error === '会员礼包不能加入购物车') {
-      return uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-    } else if (error === '库存不足') {
-      return uni.showToast({
-        title: error,
+      loadProductDetail()
+      uni.showToast({
+        title: '添加购物车成功',
         icon: 'none'
       })
+      loadCartCount()
+      state.isShowSku = false
     }
-    else {
-      return uni.navigateTo({
-        url: '/pages/user/login/index'
-      })
-    }
-
+  }).catch(error => {
+    // if (error === '会员礼包不能加入购物车') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // } else if (error === '库存不足') {
+    //   return uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // }
+    // else {
+    //   return uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }
+    console.log('我是error>>>', error);
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 }
 // 规格显示双按钮
-function handleTwobtn(){
-  isTo.value=2
+function handleTwobtn() {
+  isTo.value = 2
   state.isShowSku = !state.isShowSku
 }
 
@@ -453,6 +474,8 @@ function handleTwobtn(){
  * @param flag //1表示立即购买;2表示加入购物车,3表示立即兑换
  */
 function handleOrderConfirm(flag: '1' | '2' | '3') {
+  console.log('我是》》》》》》', userStore.uid);
+
   debounce(() => {
     if (!userStore.uid) {
       return uni.showToast({
@@ -473,7 +496,7 @@ function handleOrderConfirm(flag: '1' | '2' | '3') {
   })
 
   state.flag = flag
-  isTo.value=flag
+  isTo.value = flag
   state.isShowSku = true
   // if (is148Merchant.value) {
   //   state.isNew = '1'
@@ -799,7 +822,7 @@ onPageScroll((page) => {
 
   </div>
   <!-- 商品下架 -->
-  <CXBBackTop :Scroll_X="Scroll_X" :isCss="2"  v-if="isShow" />
+  <CXBBackTop :Scroll_X="Scroll_X" :isCss="2" v-if="isShow" />
   <div class="relative w-screen " v-if="isShow">
     <div class="box-out">
       <div class="flex-box pb-3 px-3 ">
@@ -880,9 +903,8 @@ onPageScroll((page) => {
   </div>
 
   <CXBSkuPopup v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
-    @submit="handleCreateShopping" @count-change="handleCountChange" @subBuy="handleBuyshow"   @subAdd="handleAddshow"
-    :isTo="isTo"
-    />
+    @submit="handleCreateShopping" @count-change="handleCountChange" @subBuy="handleBuyshow" @subAdd="handleAddshow"
+    :isTo="isTo" />
   <!--  <nut-sku-->
   <!--      v-model:visible="state.isShowSku"-->
   <!--      :goods="state.goods"-->

src/pages/store/product/other.vue

@@ -29,7 +29,7 @@ import { debounce, merge } from "lodash-es";
 import { useDebounceFn } from '@vueuse/core';
 import dayjs from "dayjs";
 import { decodeBase64 } from "~/utils/http/helper";
-import { CDN_URL } from "~/config/app";
+import { CDN_URL,CDM_URL } from "~/config/app";
 import { getRecommendList } from "~/apis/merchant";
 import type { DcProductModel } from "~/apis/model/dacang.model";
 
@@ -484,6 +484,13 @@ function handleProductItemClick(
   })
 }
 
+const outImg = computed(() => {
+  if(isShow){
+    return  CDM_URL+'/image/2023-11-24/20231124182002679.png'
+  }
+
+})
+
 // 距离顶部距离
 let Scroll_X = ref(0)
 
@@ -566,7 +573,7 @@ onPageScroll((page) => {
       <div class="box-out">
         <div class="flex-box pb-3 px-3 ">
           <div class="img-div">
-            <image lazy-load src="../../../static/icon/商品下架不存在@3x.png" mode="widthFix" class=" top-0 right-0 sold-out ">
+            <image lazy-load :src="outImg" mode="widthFix" class=" top-0 right-0 sold-out ">
             </image>
           </div>
           <div class="out-conter">该商品下架不存在</div>

src/pages/user/login/index.vue

@@ -90,6 +90,8 @@ async function handleWexinLogin() {
                     })
                   }
                 } else {
+                  console.log(state.key);
+                  
                   switch (state.key) {
                     case '10': {
                       uni.switchTab({