浏览代码

bug修复

chenjj 3 月之前
父节点
当前提交
0ab6714cad
共有 3 个文件被更改,包括 38 次插入23 次删除
  1. 1 3
      pages/classify.vue
  2. 1 1
      pages/common/orderList/index.vue
  3. 36 19
      pages/common/orderList/userItem.vue

+ 1 - 3
pages/classify.vue

@@ -15,7 +15,7 @@
       >
       </up-tabs>
       <view class="list">
-        <List :data="data" v-if="data && data.length > 0" @refresh="getList" ref="listRef" :total="pages.total"/>
+        <List :data="data" v-if="data && data.length > 0 " @refresh="getList" ref="listRef" :total="pages.total"/>
         <view v-else>
           <NoneView value="您还没有相关订单" />
         </view>
@@ -194,14 +194,12 @@ function onChange(tabItem) {
   data.value = [];
   getList()
 }
-
 onMounted(() => {
   const token  = getToken();
   if(token){
     const {
       order_status,
     } = useDict('order_status', 'lrr_service_status')
-
     provide('order_status', order_status) //订单/服务状态
   }
 

+ 1 - 1
pages/common/orderList/index.vue

@@ -6,7 +6,6 @@
                     <ListItem :data="item" v-if="userType === 2"/>
                     <UserItem :data="item" v-else/>
                 </view>
-                <!-- <up-loadmore :line="true" status="nomore"></up-loadmore> -->
 
                 <up-loadmore style="margin-top: 40rpx;" :status="loadmoreInfo.status"
 				:loadmoreText="loadmoreInfo.loadingText" :loadingText="loadmoreInfo.loadmoreText"
@@ -16,6 +15,7 @@
 </template>
 
 <script setup>
+
 import ListItem from './listItem.vue';
 import UserItem from './userItem.vue';
 import { ref } from 'vue';

+ 36 - 19
pages/common/orderList/userItem.vue

@@ -22,8 +22,9 @@
           服务描述:{{ data.businessDescribe }}
         </view>
         <view class="item-status-box">
-          <image src="/static/img/矩形 413@1x.png" class="item-status-img"></image>
-          <dict-tag :options="order_status" :value="String(data.orderStatus)" class="item-status" />
+          <!-- <image src="/static/img/矩形 413@1x.png" class="item-status-img"></image> -->
+          <!-- class="item-status" -->
+          <dict-tag :options="order_status" :value="String(data.orderStatus)"  />
         </view>
       </view>
       <view class="item-box">
@@ -213,28 +214,44 @@ const handlClick = (item) => {
     }
 
     .item-status-box {
-      .item-status-img {
-        width: 130rpx;
-        height: 47rpx;
-        position: absolute;
-        top: 0rpx;
-        left: -135rpx;
-
-      }
+      background: linear-gradient(90deg, #FED593 0%, #FDC58C 100%);
+      // width: 130rpx;
+      height: 47rpx;
+      position: absolute;
+      left: -130rpx;
+      top: 2rpx;
+      border-top-left-radius: 16rpx;
+      border-bottom-right-radius: 16rpx;
 
-      .item-status {
-        width: 100rpx;
-        height: 46rpx;
-        font-family: PingFang SC;
-        font-size: 24rpx;
+      font-size: 24rpx;
         font-weight: 500;
         line-height: 44rpx;
         letter-spacing: normal;
         color: #843816;
-        position: absolute;
-        left: -116rpx;
-        top: 2rpx;
-      }
+        padding: 0 21rpx;
+
+      // .item-status-img {
+      //   width: 130rpx;
+      //   height: 47rpx;
+      //   position: absolute;
+      //   top: 0rpx;
+      //   left: -135rpx;
+
+      // }
+
+      // .item-status {
+      //   width: 100rpx;
+      //   height: 46rpx;
+      //   font-family: PingFang SC;
+      //   font-size: 24rpx;
+      //   font-weight: 500;
+      //   line-height: 44rpx;
+      //   letter-spacing: normal;
+      //   color: #843816;
+      //   position: absolute;
+      //   left: -116rpx;
+      //   top: 2rpx;
+      // }
     }
   }