From c31abfc08a9a1cc829279eaff00d052432c49f7b Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 13 Nov 2023 10:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/OrderConfirm/end.vue | 62 +++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index d4d917e..59159e8 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -48,14 +48,14 @@
                    <view class="radio-box row col" v-for="item in ['全部关闭','部分未关闭']" style="width:auto;align-items: center;" @click="applianceChange(item)">
                      <view class="box "
                            style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                            :style="{
                              borderColor:(model.appliance.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.appliance.option === item ? '#4EC2B7':'transparent')
                            }"
                      >
-                       <u-icon name="checkbox-mark" size="30rpx" :color="(model.appliance.option === item ? '#fff' : 'transparent')"></u-icon>
+                       <u-icon name="checkbox-mark" size="25rpx" :color="(model.appliance.option === item ? '#fff' : 'transparent')"></u-icon>
                      </view>
                      <view class="label ">
                        {{item}}
@@ -114,14 +114,14 @@
                    <view class="radio-box row col" v-for="item in ['未破坏','捣蛋破坏']" style="width:auto;align-items: center;" @click="beforeStatusChange(item)">
                      <view class="box "
                            style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                            :style="{
                              borderColor:(model.before_status.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.before_status.option === item ? '#4EC2B7':'transparent')
                            }"
                      >
-                       <u-icon name="checkbox-mark" size="30rpx" :color="(model.before_status.option === item ? '#fff' : 'transparent')"></u-icon>
+                       <u-icon name="checkbox-mark" size="25rpx" :color="(model.before_status.option === item ? '#fff' : 'transparent')"></u-icon>
                      </view>
                      <view class="label ">
                        {{item}}
@@ -226,14 +226,14 @@
                    <view class="radio-box row col" v-for="item in ['充足','少量','无']" style="width:auto;align-items: center;" @click="foodChange(item)">
                      <view class="box "
                            style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                            :style="{
                              borderColor:(model.food_status.food_option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.food_status.food_option === item ? '#4EC2B7':'transparent')
                            }"
                      >
-                       <u-icon name="checkbox-mark" size="30rpx" :color="(model.food_status.food_option === item ? '#fff' : 'transparent')"></u-icon>
+                       <u-icon name="checkbox-mark" size="25rpx" :color="(model.food_status.food_option === item ? '#fff' : 'transparent')"></u-icon>
                      </view>
                      <view class="label ">
                        {{item}}
@@ -258,14 +258,14 @@
                    <view class="radio-box row col" v-for="item in ['充足','少量','无']" style="width:auto;align-items: center;" @click="waterChange(item)">
                      <view class="box "
                            style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                            :style="{
                              borderColor:(model.food_status.water_option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.food_status.water_option === item ? '#4EC2B7':'transparent')
                            }"
                      >
-                       <u-icon name="checkbox-mark" size="30rpx" :color="(model.food_status.water_option === item ? '#fff' : 'transparent')"></u-icon>
+                       <u-icon name="checkbox-mark" size="25rpx" :color="(model.food_status.water_option === item ? '#fff' : 'transparent')"></u-icon>
                      </view>
                      <view class="label ">
                        {{item}}
@@ -1175,14 +1175,14 @@
                     <view class="radio-box row col" v-for="item in ['健康活泼','未近距离观察']" style="width:auto;align-items: center;" @click="healthChange(item)">
                       <view class="box "
                             style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                             :style="{
                              borderColor:(model.health === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.health === item ? '#4EC2B7':'transparent')
                            }"
                       >
-                        <u-icon name="checkbox-mark" size="30rpx" :color="(model.health === item ? '#fff' : 'transparent')"></u-icon>
+                        <u-icon name="checkbox-mark" size="25rpx" :color="(model.health === item ? '#fff' : 'transparent')"></u-icon>
                       </view>
                       <view class="label ">
                         {{item}}
@@ -1646,16 +1646,16 @@
                   <view class="radio-box row col" v-for="item in ['保持原始状态','更改原始状态']" style="width:auto;align-items: center;" @click="applianceInfoChange(item)">
                     <view class="box "
                           style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                           :style="{
                              borderColor:(model.appliance_info.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.appliance_info.option === item ? '#4EC2B7':'transparent')
                            }"
                     >
-                      <u-icon name="checkbox-mark" size="30rpx" :color="(model.appliance_info.option === item ? '#fff' : 'transparent')"></u-icon>
+                      <u-icon name="checkbox-mark" size="25rpx" :color="(model.appliance_info.option === item ? '#fff' : 'transparent')"></u-icon>
                     </view>
-                    <view class="label ">
+                    <view class="label " style="font-size:26rpx;">
                       {{item}}
                     </view>
                   </view>
@@ -1757,16 +1757,16 @@
                   <view class="radio-box row col" v-for="item in ['已反锁','已关门未反锁']" style="width:auto;align-items: center;" @click="closeChange(item)">
                     <view class="box "
                           style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                           :style="{
                              borderColor:(model.close.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.close.option === item ? '#4EC2B7':'transparent')
                            }"
                     >
-                      <u-icon name="checkbox-mark" size="30rpx" :color="(model.close.option === item ? '#fff' : 'transparent')"></u-icon>
+                      <u-icon name="checkbox-mark" size="25rpx" :color="(model.close.option === item ? '#fff' : 'transparent')"></u-icon>
                     </view>
-                    <view class="label ">
+                    <view class="label " style="font-size:26rpx;">
                       {{item}}
                     </view>
                   </view>
@@ -1806,16 +1806,16 @@
                   <view class="radio-box row col" v-for="item in ['已反锁','已关门未反锁']" style="width:auto;align-items: center;" @click="closeMimaChange(item)">
                     <view class="box "
                           style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                           :style="{
                              borderColor:(model.close_mima.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.close_mima.option === item ? '#4EC2B7':'transparent')
                            }"
                     >
-                      <u-icon name="checkbox-mark" size="30rpx" :color="(model.close_mima.option === item ? '#fff' : 'transparent')"></u-icon>
+                      <u-icon name="checkbox-mark" size="25rpx" :color="(model.close_mima.option === item ? '#fff' : 'transparent')"></u-icon>
                     </view>
-                    <view class="label ">
+                    <view class="label " style="font-size:26rpx;">
                       {{item}}
                     </view>
                   </view>
@@ -1873,16 +1873,16 @@
                   <view class="radio-box row col" v-for="item in ['钥匙已密封带走保管','放在宠主指定位置']" style="width:auto;align-items: center;" @click="keyChange(item)">
                     <view class="box "
                           style="display:flex;justify-content:center;align-items:center;
-                           width:40rpx;height:40rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
+                           width:35rpx;height:35rpx;border-radius: 50%;border:2rpx solid;background-color:#4EC2B7;
                             margin-right:15rpx;"
                           :style="{
                              borderColor:(model.key.option === item ? 'transparent':'#c8c9cc'),
                              backgroundColor:(model.key.option === item ? '#4EC2B7':'transparent')
                            }"
                     >
-                      <u-icon name="checkbox-mark" size="30rpx" :color="(model.key.option === item ? '#fff' : 'transparent')"></u-icon>
+                      <u-icon name="checkbox-mark" size="25rpx" :color="(model.key.option === item ? '#fff' : 'transparent')"></u-icon>
                     </view>
-                    <view class="label ">
+                    <view class="label " style="font-size:26rpx;">
                       {{item}}
                     </view>
                   </view>
@@ -2096,7 +2096,7 @@ export default {
       if(this.model.before_status.option === e){
         this.model.before_status.option = '';
       }else{
-        this.model.appliance.option = e;
+        this.model.before_status.option = e;
       }
     },
     foodChange(e){
@@ -2122,9 +2122,9 @@ export default {
     },
     healthChange(e){
       if(this.model.health.option === e){
-        this.model.health.option = '';
+        this.model.health = '';
       }else{
-        this.model.health.option = e;
+        this.model.health = e;
       }
     },
     applianceInfoChange(e){
@@ -2161,6 +2161,7 @@ export default {
       }else{
         this.collapseChecked = name;
       }
+      this.goTop();
     },
     getServiceTable(id){
       let that = this;
@@ -2360,6 +2361,17 @@ export default {
         }
       })
     },
+    goTop(){
+        uni.pageScrollTo({
+          scrollTop: 0,
+          success:(res)=>{
+            console.log('res',res)
+          },
+          fail:(err) => {
+            console.log('err',err)
+          }
+        });
+    }
   },
   onPageScroll(res) {
     if (res.scrollTop <= 20) {