浏览代码

修改问题

tangning 2 年之前
父节点
当前提交
5dc8c87867
共有 6 个文件被更改,包括 43 次插入28 次删除
  1. 3 3
      src/layout/basic/index.vue
  2. 10 10
      src/router/routes.ts
  3. 1 1
      src/views/detail/evaluate.vue
  4. 4 4
      src/views/detail/index.vue
  5. 24 9
      src/views/home/list.vue
  6. 1 1
      src/views/home/submit.vue

+ 3 - 3
src/layout/basic/index.vue

@@ -5,12 +5,12 @@
       <router-view v-if="$route.meta.keepAlive" :key="$route.path" />
     </keep-alive>
     <router-view v-if="!$route.meta.keepAlive" :key="$route.path" /> -->
-    <!-- <RouterView v-slot="{ Component }" v-if="$route.meta.keepAlive">
+    <RouterView v-slot="{ Component }" v-if="$route.meta.keepAlive">
       <keep-alive>
         <component :is="Component" :key="$route.path" />
       </keep-alive>
-    </RouterView> -->
-    <RouterView :key="$route.path" />
+    </RouterView>
+    <RouterView v-if="!$route.meta.keepAlive" :key="$route.path" />
   </div>
   <!-- <nut-tabbar unactive-color="#364636" active-color="#1989fa" @tab-switch="tabSwitch" bottom v-model:visible="activeTab">
     <nut-tabbar-item v-for="item in tabItem" :key="item.key" :tab-title="$t(`tabbar.${item.key}`)" :icon="item.icon" />

+ 10 - 10
src/router/routes.ts

@@ -17,7 +17,7 @@ const routes = [
         component: () => import('/@/views/detail/index.vue'),
         meta: {
           title: ' .list',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -25,7 +25,7 @@ const routes = [
         component: () => import('/@/views/detail/evaluate.vue'),
         meta: {
           title: '评价',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -33,7 +33,7 @@ const routes = [
         component: () => import('/@/views/detail/payment.vue'),
         meta: {
           title: '支付',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -41,7 +41,7 @@ const routes = [
         component: () => import('/@/views/detail/repair.vue'),
         meta: {
           title: '维修',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -49,7 +49,7 @@ const routes = [
         component: () => import('/@/views/detail/evaluate.vue'),
         meta: {
           title: '评价',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -57,14 +57,14 @@ const routes = [
         component: () => import('/@/views/detail/invoice.vue'),
         meta: {
           title: '申请开票',
-          keepAlive: true,
+          keepAlive: false,
         },
       },{
         path: 'list',
         component: () => import('/@/views/list/index.vue'),
         meta: {
           title: 'tabbar.list',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -72,7 +72,7 @@ const routes = [
         component: () => import('/@/views/member/index.vue'),
         meta: {
           title: 'tabbar.member',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
       {
@@ -80,7 +80,7 @@ const routes = [
         component: () => import('/@/views/demo/index.vue'),
         meta: {
           title: 'tabbar.demo',
-          keepAlive: true,
+          keepAlive: false,
         },
       },
     ],
@@ -91,7 +91,7 @@ const routes = [
     component: () => import('/@/views/login/index.vue'),
     meta: {
       title: '',
-      keepAlive: true,
+      keepAlive: false,
     },
   },
 ];

+ 1 - 1
src/views/detail/evaluate.vue

@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="but">
-      <van-button type="primary" @click="handlComment" block>提交</van-button>
+      <van-button type="primary" color="#00B3EC" @click="handlComment" block>提交</van-button>
     </div>
   </div>
 </template>

+ 4 - 4
src/views/detail/index.vue

@@ -5,10 +5,10 @@
       <div class="item_content_top">
         <div class="stepList_title">维修单号 {{id}}</div>
         <!-- <van-button class="top_but" type="primary" size="small">去支付</van-button> -->
-        <van-button v-if="detailData.repairerVo?.status == 3" size="small" @click="goRoute(`/repair/${id}`)" type="primary" >待确认</van-button>
-        <van-button v-if="detailData.repairerVo?.status == 9" size="small" @click="goRoute(`/payment/${id}`)" type="primary" >支付</van-button>
-        <van-button v-if="detailData.repairerVo?.status == 13" size="small" @click="goRoute(`/evaluate/${id}`)" type="primary" >评价</van-button>
-        <van-button v-if="detailData.repairerVo?.status == 10" size="small" @click="goRoute(`/invoice/${id}`)" type="primary" >申请开票</van-button>
+        <van-button v-if="detailData.repairerVo?.status == 3" size="small" @click="goRoute(`/repair/${id}`)" color="#00B3EC" type="primary" >待确认</van-button>
+        <van-button v-if="detailData.repairerVo?.status == 9" size="small" @click="goRoute(`/payment/${id}`)" color="#00B3EC" type="primary" >支付</van-button>
+        <van-button v-if="detailData.repairerVo?.status == 13" size="small" @click="goRoute(`/evaluate/${id}`)" color="#00B3EC" type="primary" >评价</van-button>
+        <van-button v-if="detailData.repairerVo?.status == 10" size="small" @click="goRoute(`/invoice/${id}`)" color="#00B3EC" type="primary" >申请开票</van-button>
       </div>
       <transition-group name="van-fade">
         <!-- <div v-show="stepShow">Slide Right</div> -->

+ 24 - 9
src/views/home/list.vue

@@ -5,12 +5,15 @@
       <div class="item" v-for="item in list" :key="item" @click="goRoute(`detail/${item.repairId}`)">
         <div class="item_top padddiv">
           <div class="orderSn">工单号: <span>{{item.repairId}}</span></div>
-          <div class="state">{{status[item.status]}}</div>
+          <div class="state" style="color:#00B3EC">{{status[item.status]}}</div>
         </div>
         <div class="content padddiv">
           <div class="camera">
-            <img src="../../assets/image/tips/kj.png" />
-            <span>{{ myData.cameraType[item.cameraType] }}  {{ item.cameraSnCode }}</span>
+            <span>
+              <img src="../../assets/image/tips/kj.png" />
+              {{ myData.cameraType[item.cameraType] }}
+            </span>
+            <span>  {{ item.cameraSnCode }}</span>
           </div>
           <div class="camera_text">{{item.faultMsg}} </div>
         </div>
@@ -18,10 +21,10 @@
           <div class="time">报修日期 {{ dayjs(item.createTime).format('YYYY-MM-DD') }}</div>
           <div class="butList">
             <!-- <van-button @click.stop="goRoute(`payment/${item}`)" hairline size="small" type="primary" >支付</van-button> -->
-            <van-button v-if="item.status == 3" @click.stop="goRoute(`payment/${item.repairId}`)" plain hairline size="small">待确认</van-button>
-            <van-button v-if="item.status == 9" @click.stop="goRoute(`repair/${item.repairId}`)" plain hairline size="small">支付</van-button>
-            <van-button v-if="item.status == 13" @click.stop="goRoute(`evaluate/${item.repairId}`)" plain hairline size="small">评价</van-button>
-            <van-button v-if="item.status == 10" @click.stop="goRoute(`invoice/${item.repairId}`)" plain hairline size="small">申请开票</van-button>
+            <van-button v-if="item.status == 3" @click.stop="goRoute(`payment/${item.repairId}`)" color="#00B3EC" plain hairline size="small">待确认</van-button>
+            <van-button v-if="item.status == 9" @click.stop="goRoute(`repair/${item.repairId}`)" color="#00B3EC" hairline size="small">支付</van-button>
+            <van-button v-if="item.status == 13" @click.stop="goRoute(`evaluate/${item.repairId}`)" color="#00B3EC" plain hairline size="small">评价</van-button>
+            <van-button v-if="item.status == 10" @click.stop="goRoute(`invoice/${item.repairId}`)" color="#00B3EC" hairline size="small">申请开票</van-button>
           </div>
         </div>
       </div>
@@ -109,6 +112,7 @@ const goRoute = (path) => {
   .item {
     margin: 10px 0;
     background-color: #fff;
+    font-size: 14px;
     .padddiv {
       padding: 0 16px;
     }
@@ -127,6 +131,10 @@ const goRoute = (path) => {
     .content {
       .camera {
         margin: 12px 0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 46px;
         img{
           position: relative;
           top: 6px;
@@ -134,14 +142,15 @@ const goRoute = (path) => {
         }
       }
       .camera_text {
-        margin-bottom: 20px;
+        margin-bottom: 24px;
       }
     }
     .item_buttom {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      height: 60px;
+      height: 80px;
+      border-top: 1px solid #E7E7E7;
 
       .butList {
         .van-button {
@@ -149,6 +158,12 @@ const goRoute = (path) => {
           margin-left: 15px;
         }
       }
+      .time{
+        font-size: 12px;
+        font-family: PingFang SC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999;
+      }
     }
   }
 }

+ 1 - 1
src/views/home/submit.vue

@@ -132,7 +132,7 @@
       />
     </van-cell-group>
     <div style="margin: 16px">
-      <van-button round block type="primary" native-type="submit"> 提交 </van-button>
+      <van-button round block color="#00B3EC" type="primary" native-type="submit"> 提交 </van-button>
     </div>
   </van-form>
 </template>