diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 11fa289..09d0332 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -50,7 +50,7 @@
 							<view class="order-card-right" @click="navTo('/pages/OrderDetail/index?id='+item.id)" style="max-width: 65%;box-sizing: border-box;">
 								<view class="order-card-title">
 <!--                  {{item.addr}}-->
-                  <u-text :text="item.addr"
+                  <u-text :text="item.name"
                           color="#131313"
                           size="32"
                           :lines="1"
diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index df70caa..d4d917e 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -44,12 +44,30 @@
                    </view>
                    <!--                  <u-text size="30" text="门窗、灯、空调、水电等情况"></u-text>-->
                  </view>
-                 <u-radio-group size="40" v-model="model.appliance.option">
-                   <u-radio name="全部关闭" label="全部关闭" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="部分未关闭" label="部分未关闭" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                 </u-radio-group>
+                 <view class="radio row" style="padding-bottom:30rpx;">
+                   <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;
+                            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>
+                     </view>
+                     <view class="label ">
+                       {{item}}
+                     </view>
+                   </view>
+                 </view>
+<!--                 <u-radio-group size="40" @change="applianceChange" v-model="model.appliance.option">-->
+<!--                   <u-radio name="全部关闭" label="全部关闭" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="部分未关闭" label="部分未关闭" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                 </u-radio-group>-->
                  <uv-upload
                      accept="media"
                      width="160rpx"
@@ -92,12 +110,30 @@
                    </view>
                    <!--                  <u-text size="30" text="入户前萌宠家居情况"></u-text>-->
                  </view>
-                 <u-radio-group v-model="model.before_status.option" size="40">
-                   <u-radio name="未破坏" label="未破坏" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="捣蛋破坏" label="捣蛋破坏" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                 </u-radio-group>
+                 <view class="radio row" style="padding-bottom:30rpx;">
+                   <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;
+                            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>
+                     </view>
+                     <view class="label ">
+                       {{item}}
+                     </view>
+                   </view>
+                 </view>
+<!--                 <u-radio-group v-model="model.before_status.option" size="40" @change="beforeStatusChange">-->
+<!--                   <u-radio name="未破坏" label="未破坏" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="捣蛋破坏" label="捣蛋破坏" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                 </u-radio-group>-->
                  <uv-upload
                      accept="media"
                      width="160rpx"
@@ -186,27 +222,64 @@
                    <u-text size="24" color="#999" text="萌宠粮"></u-text>
                  </view>
 
-                 <u-radio-group v-model="model.food_status.food_option" size="40">
-                   <u-radio name="充足" label="充足" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="少量" label="少量" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="无" label="无" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                 </u-radio-group>
+                 <view class="radio row" style="padding-bottom:30rpx;">
+                   <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;
+                            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>
+                     </view>
+                     <view class="label ">
+                       {{item}}
+                     </view>
+                   </view>
+                 </view>
+
+<!--                 <u-radio-group v-model="model.food_status.food_option" @change="foodChange" size="40">-->
+<!--                   <u-radio name="充足" label="充足" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="少量" label="少量" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="无" label="无" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                 </u-radio-group>-->
 
                  <view class="form-label">
                    <u-text size="24" color="#999" text="萌宠水"></u-text>
                  </view>
 
-                 <u-radio-group v-model="model.food_status.water_option" size="40">
-                   <u-radio name="充足" label="充足" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="少量" label="少量" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                   <u-radio name="无" label="无" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                 </u-radio-group>
+                 <view class="radio row" style="padding-bottom:30rpx;">
+                   <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;
+                            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>
+                     </view>
+                     <view class="label ">
+                       {{item}}
+                     </view>
+                   </view>
+                 </view>
+<!--                 <u-radio-group v-model="model.food_status.water_option" @change="waterChange" size="40">-->
+<!--                   <u-radio name="充足" label="充足" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="少量" label="少量" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                   <u-radio name="无" label="无" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                            custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                 </u-radio-group>-->
                  <uv-upload
                      accept="media"
                      width="160rpx"
@@ -1098,12 +1171,30 @@
                     </view>
                     <!--                  <u-text size="30" text="健康情况"></u-text>-->
                   </view>
-                  <u-radio-group v-model="model.health" size="40">
-                    <u-radio name="健康活泼" label="健康活泼" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                             custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                    <u-radio name="未近距离观察" label="未近距离观察" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                             custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                  </u-radio-group>
+                  <view class="radio row" style="padding-bottom:30rpx;">
+                    <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;
+                            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>
+                      </view>
+                      <view class="label ">
+                        {{item}}
+                      </view>
+                    </view>
+                  </view>
+<!--                  <u-radio-group v-model="model.health" @change="healthChange" size="40">-->
+<!--                    <u-radio name="健康活泼" label="健康活泼" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                             custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                    <u-radio name="未近距离观察" label="未近距离观察" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                             custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                  </u-radio-group>-->
                 </mz-card>
               </u-form-item>
               <u-form-item
@@ -1550,12 +1641,31 @@
             </view>
 <!--                  <u-text size="30" text="门窗、灯、空调、水电等状态"></u-text>-->
                 </view>
-                <u-radio-group v-model="model.appliance_info.option" size="40">
-                  <u-radio name="保持原始状态" label="保持原始状态" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                  <u-radio name="更改原始状态" label="更改原始状态" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                </u-radio-group>
+
+                <view class="radio row" style="padding-bottom:30rpx;">
+                  <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;
+                            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>
+                    </view>
+                    <view class="label ">
+                      {{item}}
+                    </view>
+                  </view>
+                </view>
+<!--                <u-radio-group v-model="model.appliance_info.option" @change="applianceInfoChange" size="40">-->
+<!--                  <u-radio name="保持原始状态" label="保持原始状态" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                  <u-radio name="更改原始状态" label="更改原始状态" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                </u-radio-group>-->
                 <uv-upload
                     accept="media"
                     width="160rpx"
@@ -1643,12 +1753,30 @@
                 <view class="form-label">
                   <u-text size="24" color="#999" text="普通锁"></u-text>
                 </view>
-                <u-radio-group v-model="model.close.option" size="40">
-                  <u-radio name="已反锁" label="已反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                  <u-radio name="已关门未反锁" label="已关门未反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                </u-radio-group>
+                <view class="radio row" style="padding-bottom:30rpx;">
+                  <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;
+                            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>
+                    </view>
+                    <view class="label ">
+                      {{item}}
+                    </view>
+                  </view>
+                </view>
+<!--                <u-radio-group v-model="model.close.option" @change="closeChange" size="40">-->
+<!--                  <u-radio name="已反锁" label="已反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                  <u-radio name="已关门未反锁" label="已关门未反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                </u-radio-group>-->
                 <uv-upload
                     accept="media"
                     width="160rpx"
@@ -1674,12 +1802,30 @@
                 <view class="form-label">
                   <u-text size="24" color="#999" text="密码锁"></u-text>
                 </view>
-                <u-radio-group v-model="model.close_mima.option" size="40">
-                  <u-radio name="已反锁" label="已反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                  <u-radio name="已关门未反锁" label="已关门未反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                </u-radio-group>
+                <view class="radio row" style="padding-bottom:30rpx;">
+                  <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;
+                            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>
+                    </view>
+                    <view class="label ">
+                      {{item}}
+                    </view>
+                  </view>
+                </view>
+<!--                <u-radio-group v-model="model.close_mima.option" @change="closeMimaChange" size="40">-->
+<!--                  <u-radio name="已反锁" label="已反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                  <u-radio name="已关门未反锁" label="已关门未反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                </u-radio-group>-->
                 <uv-upload
                     accept="media"
                     width="160rpx"
@@ -1689,8 +1835,8 @@
                     multiple
                     :maxCount="10"
                     uploadIcon="plus"
-                    @delete="(res) => {uploadDel(res,'close')}"
-                    @afterRead="(res) => {uploadPut(res,'close')}"
+                    @delete="(res) => {uploadDel(res,'close_mima')}"
+                    @afterRead="(res) => {uploadPut(res,'close_mima')}"
                 ></uv-upload>
                 <u-textarea
                     v-model="model.close_mima.remark"
@@ -1722,14 +1868,33 @@
             </view>
 <!--                  <u-text size="30" text="房门钥匙"></u-text>-->
                 </view>
-                <u-radio-group v-model="model.key.option" size="40">
-                  <u-radio name="钥匙已密封带走保管" label="钥匙已密封带走保管" labelSize="28" icon-size="28"
-                           active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                  <u-radio name="放在宠主指定位置" label="放在宠主指定位置" labelSize="28" icon-size="28"
-                           active-color="#4EC2B7"
-                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
-                </u-radio-group>
+
+                <view class="radio row" style="padding-bottom:30rpx;">
+                  <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;
+                            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>
+                    </view>
+                    <view class="label ">
+                      {{item}}
+                    </view>
+                  </view>
+                </view>
+<!--                <u-radio-group v-model="model.key.option" @change="keyChange" size="40">-->
+<!--                  <u-radio name="钥匙已密封带走保管" label="钥匙已密封带走保管" labelSize="28" icon-size="28"-->
+<!--                           active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                  <u-radio name="放在宠主指定位置" label="放在宠主指定位置" labelSize="28" icon-size="28"-->
+<!--                           active-color="#4EC2B7"-->
+<!--                           custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>-->
+<!--                </u-radio-group>-->
                 <uv-upload
                     accept="media"
                     width="160rpx"
@@ -1927,6 +2092,69 @@ export default {
     },
   },
   methods: {
+    beforeStatusChange(e){
+      if(this.model.before_status.option === e){
+        this.model.before_status.option = '';
+      }else{
+        this.model.appliance.option = e;
+      }
+    },
+    foodChange(e){
+      if(this.model.food_status.food_option === e){
+          this.model.food_status.food_option = '';
+      }else{
+        this.model.food_status.food_option = e;
+      }
+    },
+    waterChange(e){
+      if(this.model.food_status.water_option === e){
+        this.model.food_status.water_option = '';
+      }else{
+        this.model.food_status.water_option = e;
+      }
+    },
+    applianceChange(e){
+      if(this.model.appliance.option === e){
+        this.model.appliance.option = '';
+      }else{
+        this.model.appliance.option = e;
+      }
+    },
+    healthChange(e){
+      if(this.model.health.option === e){
+        this.model.health.option = '';
+      }else{
+        this.model.health.option = e;
+      }
+    },
+    applianceInfoChange(e){
+      if(this.model.appliance_info.option === e){
+        this.model.appliance_info.option = '';
+      }else{
+        this.model.appliance_info.option = e;
+      }
+    },
+    closeChange(e){
+      if(this.model.close.option === e){
+        this.model.close.option = '';
+      }else{
+        this.model.close.option = e;
+      }
+    },
+    closeMimaChange(e){
+      if(this.model.close_mima.option === e){
+        this.model.close_mima.option = '';
+      }else{
+        this.model.close_mima.option = e;
+      }
+    },
+    keyChange(e){
+      if(this.model.key.option === e){
+        this.model.key.option = '';
+      }else{
+        this.model.key.option = e;
+      }
+    },
     changeCollapse(name){
       if(this.collapseChecked === name){
         this.collapseChecked = '';