代码提交

pages/submitOrder/components/coupon-select.vue

@@ -37,7 +37,7 @@
     <Empty
         v-else
         padding="120rpx 0"
-        :icon-src="emptyIcon"
+        :icon-src="emptyCouponIcon"
     >
       暂无可用的优惠券
     </Empty>
@@ -56,8 +56,6 @@
 
 <script setup>
 import { ref, unref } from 'vue';
-import emptyIcon from '@/static/icon/empty/优惠券.png'
-
 import Empty from "@/components/Empty/index.vue"
 import { useInterface } from "@/hooks/useInterface";
 import { getCartCoupon } from "@/api/coupon";
@@ -65,7 +63,7 @@ import CouponItem from "@/pages/discountCoupon/components/CouponItem.vue";
 import Popup from '@/components/Popup/index.vue';
 import UvRadio from "@/uni_modules/uv-radio/components/uv-radio/uv-radio.vue";
 import UvRadioGroup from "@/uni_modules/uv-radio/components/uv-radio-group/uv-radio-group.vue";
-
+import { emptyCouponIcon } from "@/utils/images";
 const props = defineProps(["id", 'currentCouponId'])
 
 const emit = defineEmits(['submitCoupon', 'close'])

pages/submitOrder/index.data.js

@@ -5,8 +5,8 @@
  * @description：index.data
  * @update: 2023-11-07 18:16
  * */
-import wechatIcon from '@/static/icon/pay/weixin.png'
-import aliIcon from '@/static/icon/pay/zhifubao.png'
+import { wechatIcon } from "@/utils/images";
+import { aliIcon } from "@/utils/images";
 import { PayType } from "@/utils/paymentUtils";
 
 export const addressTabs = [

pages/submitOrder/submitOrder.vue

@@ -1,7 +1,7 @@
 <script setup>
 import UvNavbar from "@/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue";
 import { useRouter } from "@/hooks/useRouter";
-import { onLoad, onPageScroll } from "@dcloudio/uni-app";
+import { onLoad, onPageScroll, onShow } from "@dcloudio/uni-app";
 import { ref, unref } from "vue";
 import { useMainStore } from '@/store/store';
 import { storeToRefs } from "pinia";
@@ -159,7 +159,7 @@ async function doCreateServiceOrder() {
   }
 }
 
-useScroll()
+const {scrollTop} = useScroll()
 
 /**
  * 检查路由参数
@@ -176,18 +176,20 @@ onLoad(async options => {
   try {
     const params = getParams(options)
     await checkRouterParam(params)
-    await doGetSelectAddress()
     await doGetInitConfirmOrder()
   } catch (e) {
     console.error(e)
   }
 })
+onShow(async ()=>{
+  await doGetSelectAddress()
+})
 </script>
 
 <template>
   <view class="order-confirm">
     <!-- header -->
-    <Header>
+    <Header :scroll-top="scrollTop">
       提交订单
     </Header>
     <!-- 地址 -->
@@ -235,7 +237,7 @@ onLoad(async options => {
             </view>
             <image
                 class="arrow-icon"
-                src="@/static/images/next.png"
+                src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                 alt=""
             />
           </view>
@@ -247,7 +249,7 @@ onLoad(async options => {
             点击添加地址
             <image
                 class="arrow-icon"
-                src="@/static/images/next.png"
+                src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                 alt=""
             />
           </view>
@@ -313,8 +315,9 @@ onLoad(async options => {
             {{ row.prefix }}
             {{ orderDetail["priceGroup"][row.field]?.toFixed(2) }}
             <image
+                v-if="row.field=== 'couponPrice'"
                 class="arrow-icon"
-                src="@/static/images/next.png"
+                src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                 alt=""
             />
           </view>

pages/submitOrder/submitOrder_old.vue

@@ -41,7 +41,7 @@
             <view class="address-actions-edit">
               <img
                   class="image"
-                  src="@/static/images/next.png"
+                  src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                   alt=""
               >
             </view>
@@ -71,7 +71,7 @@
             <view class="address-actions-edit">
               <img
                   class="image"
-                  src="@/static/images/next.png"
+                  src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                   alt=""
               >
             </view>
@@ -101,7 +101,7 @@
               <view class="address-actions-edit">
                 <img
                 class="image"
-                  src="@/static/images/next.png"
+                  src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
                   alt=""
                 >
               </view>
@@ -150,7 +150,7 @@
                 <view class="simple-cell">
                   <view class="icon simple-cell-icon">
                     <img
-                      src="@/static/images/swiper.png"
+                      src="https://b2c-pro-static-dev.zkthink.com/static/images/swiper.png"
                       alt=""
                     >
                   </view>
@@ -171,7 +171,7 @@
                 <view class="simple-cell">
                   <view class="icon simple-cell-icon">
                     <img
-                      src="@/static/images/swiper.png"
+                      src="https://b2c-pro-static-dev.zkthink.com/static/images/swiper.png"
                       alt=""
                     >
                   </view>