diff --git a/epdc-resident-mp-yushan/pages/mine/mine.wxss b/epdc-resident-mp-yushan/pages/mine/mine.wxss
index 4296f5e..f27f9b5 100644
--- a/epdc-resident-mp-yushan/pages/mine/mine.wxss
+++ b/epdc-resident-mp-yushan/pages/mine/mine.wxss
@@ -454,8 +454,9 @@ page {
   box-shadow: 0px 7px 21px 0px rgba(223, 223, 223, 0.31);
   display: flex;
   align-items: center;
-  justify-content: space-around;
+  justify-content: space-between;
   z-index: 100;
+  padding: 0 30rpx;
 }
 
 .bright-status-bac {
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxml b/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxml
index bd0a262..c9ddb59 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxml
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxml
@@ -15,7 +15,9 @@
         <view class="center-title">行程上报</view>
         <view class="center-content">上报近期的行程信息，群防群控，共同抗击疫情。</view>
       </view>
-      <view class="right">></view>
+      <view class="right">
+        <image src="../../../../images/mine/right.png" class="back-icon" />
+      </view>
     </view>
     <view class="box-item" bind:tap="toVaccines">
       <view class="left">
@@ -25,7 +27,9 @@
         <view class="center-title">接种查询</view>
         <view class="center-content">查询疫苗接种情况信息，共同抗疫，人人有责</view>
       </view>
-      <view class="right">></view>
+      <view class="right">
+        <image src="../../../../images/mine/right.png" class="back-icon" />
+      </view>
     </view>
   </view>
 </view>
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxss b/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxss
index dbc41c0..6983e8d 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxss
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/epidemicControl/epidemicControl.wxss
@@ -73,7 +73,7 @@ page {
   border-radius: 14rpx;
   display: flex;
   align-items: center;
-  padding: 0 43rpx 29rpx;
+  padding: 0 43rpx 0rpx;
 }
 
 .left {
@@ -100,8 +100,4 @@ page {
 .center-content {
   font-size: 28rpx;
   color: #999999;
-}
-
-.right {
-  color: #999999;
 }
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxml b/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxml
index eb5fec4..37613a3 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxml
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxml
@@ -19,7 +19,9 @@
       </view> -->
       </view>
     </view>
-    <view class="right-icon">></view>
+    <view class="right-icon">
+      <image src="../../../../images/mine/right.png"  />
+    </view>
   </view>
 </view>
 <load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}" bg-f="bg-f"></load-more>
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxss b/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxss
index 438e3c3..44f7bd7 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxss
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/moreList/moreList.wxss
@@ -13,7 +13,7 @@ page {
   height: 188rpx;
   background: #fff;
   margin-bottom: 7rpx;
-  padding: 30rpx 37rpx 0 31rpx;
+  padding: 0rpx 37rpx 0 31rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -45,7 +45,7 @@ page {
   width: 26rpx;
   height: 32rpx;
   margin-right: 10rpx;
-  vertical-align: middle;
+  /* vertical-align: middle; */
 }
 
 .time {
@@ -70,9 +70,7 @@ page {
   color: #666666;
 }
 
-.right-icon {
+.right-icon image {
   width: 16rpx;
   height: 23rpx;
-  font-size: 28rpx;
-  color: #a3a3a3;
 }
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
index 06ea8fa..689fe6e 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
@@ -69,6 +69,7 @@ Page({
       value: 'id',
       label: 'shortName',
     },
+    newOptions: [],
     pid: 0,
   },
   onLoad: function (options) {
@@ -116,19 +117,22 @@ Page({
           return
         }
         // 如果不是第一层级,要往下加children
-        let options1 = this.data.options1
-        let arr = this.recursionMethod(options1, this.data.pid, res.data)
+        let arr = this.recursionMethod(
+          this.data.options1,
+          this.data.pid,
+          res.data
+        )
         this.setData({
           options1: arr,
         })
+        console.log('options1---', this.data.options1)
       }
     })
   },
   recursionMethod(arr, pid, children) {
     arr.forEach((item) => {
-      console.log('item.children', item.children)
       if (item.children) {
-        console.log('掉children')
+        console.log('掉children', item.children, this.data.pid, children)
         this.recursionMethod(item.children, this.data.pid, children)
       } else {
         if (item.id === pid) {
@@ -137,32 +141,7 @@ Page({
           wx.hideLoading()
         }
       }
-      // if (item.id === pid) {
-      //   console.log('值相等')
-      //   item.children = children
-      //   wx.hideLoading()
-      // }
-      // else {
-      //   item.children = [
-      //     {
-      //       label: '11',
-      //       value: '1111',
-      //       id: '11111111111111111',
-      //     },
-      //   ]
-      // }
-
-      // if (item.children) {
-      //   console.log('掉children')
-      //   this.recursionMethod(item.children, this.data.pid, children)
-      // }
-      // if (item.id === pid) {
-      //   console.log('值相等')
-      //   item.children = children
-      //   wx.hideLoading()
-      // }
     })
-    console.log('options1---', this.data.options1)
     return arr
   },
   // 动态加载级联选择器
@@ -268,7 +247,7 @@ Page({
       this.showToast('来自地区不能为空')
       return
     }
-    if (this.data.localTimeValue.length === 0) {
+    if (this.data.localTime.length === 0) {
       this.showToast('来到本地时间不能为空')
       return
     }
@@ -292,29 +271,39 @@ Page({
       backDate: this.data.backTime,
       note: this.data.actContent.trim(''),
     }
-    saveTripInfo(params)
-      .then((res) => {
-        if (res.code == 0 && res.msg == 'success') {
-          this.showToast('提交成功')
-          setTimeout(() => {
-            this.setData({
-              lock: false,
+    wx.showModal({
+      title: '提示',
+      content: '是否要上报行程',
+      success(res) {
+        if (res.confirm) {
+          saveTripInfo(params)
+            .then((res) => {
+              if (res.code == 0 && res.msg == 'success') {
+                this.showToast('提交成功')
+                setTimeout(() => {
+                  this.setData({
+                    lock: false,
+                  })
+                  wx.switchTab({
+                    url: '/pages/index/index',
+                  })
+                }, 1000)
+              } else {
+                this.setData({
+                  lock: false,
+                })
+              }
             })
-            wx.switchTab({
-              url: '/pages/index/index',
+            .catch((err) => {
+              this.setData({
+                lock: false,
+              })
             })
-          }, 1000)
-        } else {
-          this.setData({
-            lock: false,
-          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
         }
-      })
-      .catch((err) => {
-        this.setData({
-          lock: false,
-        })
-      })
+      },
+    })
   },
   onInputValue(e) {
     let code = e.currentTarget.dataset.code
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.wxml b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.wxml
index 1cf2684..8389a3e 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.wxml
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.wxml
@@ -39,9 +39,9 @@
       <view class="item-select" bind:tap="onOpenNowAddress">
         <!-- <image src="../../images/right-sword.png" class="arrow" /> -->
       </view>
-      <!-- defaultFieldNames='{{defaultFieldNames}}' -->
+      <!-- defaultFieldNames='{{defaultFieldNames}}' bind:close="onCloseNowAddress" -->
       <block wx:if="{{visibleNowAddress}}">
-        <wux-cascader visible="{{ visibleNowAddress }}" title="所在地区" controlled value="{{ nowAddressValue }}" options="{{ options1 }}" bind:close="onCloseNowAddress" bind:change="onChangeAdress" bind:load="onLoadOptions" />
+        <wux-cascader visible="{{ visibleNowAddress }}" title="所在地区" controlled value="{{ nowAddressValue }}" options="{{ options1 }}" bind:change="onChangeAdress" bind:load="onLoadOptions" />
       </block>
     </view>
     <view class="data-form-item" style="margin-bottom:10rpx">
@@ -63,7 +63,8 @@
         </view>
       </view>
       <block wx:if="{{visibleComeFromAddress}}">
-        <wux-cascader visible="{{ visibleComeFromAddress }}" controlled value="{{ comeFromAddressValue }}" options="{{ options1 }}" bind:close="onCloseComeFromAddress" bind:change="onChangeComeFromAddress" bind:load="onLoadComeAddress" />
+        <!-- bind:close="onCloseComeFromAddress" -->
+        <wux-cascader visible="{{ visibleComeFromAddress }}" controlled value="{{ comeFromAddressValue }}" options="{{ options1 }}" bind:change="onChangeComeFromAddress" bind:load="onLoadComeAddress" />
       </block>
     </view>
     <view class="data-form-item">
@@ -88,7 +89,7 @@
     </view>
     <view class="data-form">
       <view class="textarea-item">
-        <textarea class="textarea" placeholder-class="placeholder" placeholder="请输入备注信息" maxlength="100" value="{{actContent}}" bindinput="onInputValue" data-code="actContent"></textarea>
+        <textarea class="textarea" placeholder-class="placeholder" placeholder="请输入备注信息" maxlength="100" value="{{actContent}}" bindinput="onInputValue" data-code="actContent" maxlength='200'></textarea>
       </view>
     </view>
   </view>