代码提交

components/ReturnTop/index.vue

@@ -8,12 +8,9 @@
 <script setup>
 import { useScroll } from "@/hooks/useScroll";
 import { computed, onMounted, ref, toRefs, unref } from "vue";
-import UvIcon from "@/uni_modules/uv-icon/components/uv-icon/uv-icon.vue";
-import { useScreen } from "@/hooks/useScreen";
 import { useSystem } from "@/hooks/useSystem";
 import { CacheKey } from "@/utils/config";
 import { toTop } from "@/utils/images";
-
 const {scrollTop, scrollToTop} = useScroll()
 const {getSystemInfo} = useSystem();
 
@@ -28,11 +25,11 @@ const {getSystemInfo} = useSystem();
 const props = defineProps({
   top: {
     type: Number,
-    default:200
+    default:300
   },
   location: {
     type: Array,
-    default: () => ([20, 200])
+    default: () => ([20, 400])
   },
   size: {
     type: Number,
@@ -115,6 +112,7 @@ function handleTouchmove(e){
 
 function handleTouchend(e){
   timeout&&clearTimeout(timeout)
+  if(!isTouch.value) return handleClick()
   isTouch.value = false
   // 判断是否移动数据
   if(unref(touchLocation)[0]>0 || unref(touchLocation)[1]>0){
@@ -151,13 +149,13 @@ onMounted(async ()=>{
       class="return-top"
       :class="{touch:isTouch,click:animation}"
       :style="computedStyle"
-      @touchstart="handleTouchstart"
+      @touchstart.prevent="handleTouchstart"
       @touchmove.stop="handleTouchmove"
       @touchend="handleTouchend"
       @click="handleClick"
   >
     <slot>
-        <image class="top-icon" :src="toTop" />
+        <view class="top-icon" :style="{backgroundImage:`url(${toTop})`}" />
     </slot>
   </view>
 </template>
@@ -182,10 +180,13 @@ onMounted(async ()=>{
   }
 
   .top-icon{
+    user-select: none;
     width: 60%;
     height: 60%;
     border-radius: 50%;
     position: relative;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
 }
 

components/activity/activity.vue

@@ -19,7 +19,7 @@
           <view class="activity-header-more-info">{{ more }}</view>
           <img
               class="image"
-              src="https://b2c-pro-static-dev.zkthink.com/static/images/next.png"
+              :src="nextIcon"
               alt=""
           >
         </view>
@@ -33,7 +33,7 @@
 
 <script setup>
 import { ref } from 'vue';
-
+import { nextIcon } from "@/utils/images";
 const props = defineProps(["title", "subtitle", 'more'])
 
 const title = ref(props.title)

components/goods/goods.vue

@@ -29,7 +29,7 @@
         >
           <view class="goods-list-model-label">{{ data.attrInfo.sku }}</view>
           <view class="goods-list-model-action icon">
-            <image src="https://b2c-pro-static-dev.zkthink.com/static/images/down.png" />
+            <image :src="goodsArrowsIcon" />
           </view>
         </div>
       </view>
@@ -137,6 +137,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useRouter } from "@/hooks/useRouter";
+import { goodsArrowsIcon } from "@/utils/images";
 
 const props = defineProps(['data', 'min', 'groupNum', 'original', 'stock', 'primary', 'card', 'list', 'buyProgress', 'quantity', 'selectModel', 'model', 'purchase', 'link', 'fill', 'round','price'])
 

components/order/order.vue

@@ -70,21 +70,21 @@
           </view>
           <view class="order-actions-btns">
             <view
-                v-if="data._status._type == 0"
+                v-if="data._status._type === '0'"
                 class="order-actions-default"
                 @tap="showModal(0)"
             >
               取消订单
             </view>
             <view
-                v-if="data._status._type == 0"
+                v-if="data._status._type === '0'"
                 class="order-actions-primary"
                 @tap="handlePay"
             >
               立即付款
             </view>
             <view
-                v-if="['1','2','3','4'].includes(data._status._type)"
+                v-if="!['0','5','-1','-2'].includes(data._status._type)"
                 class="order-actions-default"
                 @tap="toSelectRefundGood"
             >
@@ -92,13 +92,13 @@
             </view>
             <view
                 class="order-actions-default"
-                v-if="data._status._type == 2"
+                v-if="data._status._type === '2'"
                 @tap="toOrderInfo"
             >
               查看物流
             </view>
             <view
-                v-if="data._status._type == 2"
+                v-if="data._status._type === '2'"
                 class="order-actions-primary"
                 @tap="showModal(2)"
             >
@@ -209,9 +209,7 @@ async function doTakeRequest(){
 function toSelectRefundGood(){
   push({url: '/pages/selectRefundGood/selectRefundGood'}, {
     data: {
-      orderId: data.value.orderId,
-      id: data.value.id,
-      status: data.value.status
+      id: data.value.id
     }
   })
 }