diff --git a/api/user.js b/api/user.js
index 0f8b76e..559afc0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -214,4 +214,17 @@ export function orderLogistics(data) {
 		method: "get",
 		data
 	});
+}
+/**
+ * 用户商品订单详情
+ * @param data
+ * @returns {Promise | Promise<unknown>}
+ */
+export function orderItemInfo(data) {
+
+	return request({
+		url: `${host}/market/goodsorder-info`,
+		method: "post",
+		data
+	});
 }
\ No newline at end of file
diff --git a/components/MzMap/index.vue b/components/MzMap/index.vue
index b6767f4..b9e499f 100644
--- a/components/MzMap/index.vue
+++ b/components/MzMap/index.vue
@@ -119,22 +119,27 @@ export default {
     },
     addMarkers(){
       let that = this;
-      const markers = []
+      let markers = []
 
       let positions = that.coordinates;
       positions.forEach((p, i) => {
+        let width = p.width;
+        let height = p.height;
+        let data = p;
+        delete data.width;
+        delete data.height;
         markers.push(
             Object.assign({}, {
               id:i,
               iconPath: p.iconPath?p.iconPath:that.mapIcon,
-              width: p.width?p.width:50,
-              height: p.height?p.height:50,
+              width: uni.$u.getPx(width?width:'50rpx'),
+              height: uni.$u.getPx(height?height:'50rpx'),
               joinCluster: false, // 指定了该参数才会参与聚合
 
-            }, p)
+            }, data)
         )
       })
-      console.log(markers)
+      console.log('markers',markers)
       that.mapContext.addMarkers({
         markers,
         clear: false,
diff --git a/pages.json b/pages.json
index d942aeb..4f8fa42 100644
--- a/pages.json
+++ b/pages.json
@@ -141,6 +141,11 @@
             "style" : {
                 "navigationBarTitleText" : "兑换详情"
             }
+        },{
+            "path" : "pages/Order/info",
+            "style" : {
+                "navigationBarTitleText" : "订单详情"
+            }
         }
     ],
     "globalStyle" : {
diff --git a/pages/Authentication/done.vue b/pages/Authentication/done.vue
index ab4acbd..0dcd658 100644
--- a/pages/Authentication/done.vue
+++ b/pages/Authentication/done.vue
@@ -191,8 +191,10 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
+        if(res.code === 200) {
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
       });
     }
   },
diff --git a/pages/Authentication/form.vue b/pages/Authentication/form.vue
index 9581a4e..fbe10d8 100644
--- a/pages/Authentication/form.vue
+++ b/pages/Authentication/form.vue
@@ -488,18 +488,20 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        this.userInfo = res.data;
-        this.userInfo = res.data;
-        this.model.userInfo.name = res.data.name;
-        this.model.userInfo.phone = res.data.phone;
-        this.model.userInfo.street = res.data.street;
-        this.model.userInfo.community = res.data.community;
-        this.model.userInfo.company = res.data.company;
-        this.model.userInfo.position_type = res.data.position;
-        this.model.userInfo.id_card = res.data.id_card;
-        console.log(this.model.userInfo);
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
+        if(res.code === 200) {
+          this.userInfo = res.data;
+          this.userInfo = res.data;
+          this.model.userInfo.name = res.data.name;
+          this.model.userInfo.phone = res.data.phone;
+          this.model.userInfo.street = res.data.street;
+          this.model.userInfo.community = res.data.community;
+          this.model.userInfo.company = res.data.company;
+          this.model.userInfo.position_type = res.data.position;
+          this.model.userInfo.id_card = res.data.id_card;
+          console.log(this.model.userInfo);
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
       });
     }
   },
diff --git a/pages/Authentication/index.vue b/pages/Authentication/index.vue
index 28156c4..3a1e921 100644
--- a/pages/Authentication/index.vue
+++ b/pages/Authentication/index.vue
@@ -173,9 +173,11 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        this.userInfo = res.data;
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
+        if(res.code === 200) {
+          this.userInfo = res.data;
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
         // this.modalShow = !this.userInfo?.phone
         //     || !this.userInfo?.name
         //     || !this.userInfo?.community
diff --git a/pages/Index/components/HomePage/index.vue b/pages/Index/components/HomePage/index.vue
index 63ca05e..7acdeab 100644
--- a/pages/Index/components/HomePage/index.vue
+++ b/pages/Index/components/HomePage/index.vue
@@ -65,7 +65,7 @@
           <u-text text="温馨提示：" color="#AFB5BE" size="24"></u-text>
         </view>
         <view class="bar col">
-          <u-notice-bar custom-style="padding:0;" speed="50" :text="'请丰行侠在本月25日之前进行暖新币兑换哟！'" icon="" color="#AFB5BE" font-size="24" bg-color="transparent"></u-notice-bar>
+          <u-notice-bar custom-style="padding:0;" speed="50" :text="tips" icon="" color="#AFB5BE" font-size="24" bg-color="transparent"></u-notice-bar>
         </view>
       </view>
     </view>
diff --git a/pages/Index/components/ShopPage/index.vue b/pages/Index/components/ShopPage/index.vue
index aecd01c..2c7be98 100644
--- a/pages/Index/components/ShopPage/index.vue
+++ b/pages/Index/components/ShopPage/index.vue
@@ -625,8 +625,8 @@ export default {
           data.push({
             latitude:parseFloat(coordinate[1]),
             longitude:parseFloat(coordinate[0]),
-            width:'44px',
-            height:'44px'
+            width:'88rpx',
+            height:'88rpx'
           });
           return item;
         });
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index f1fa1da..001a2f8 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -172,18 +172,18 @@
         </template>
       </u-cell>
 
-      <u-cell
-          :border="false"
-          :rightIconStyle="{fontSize:'28rpx'}"
-          :isLink="true"
-          title="我的关注"
-      >
-        <template #icon>
-          <view class="cell-icon" :style="{marginRight:'56rpx'}">
-            <u-image :src="staticImage.userFollow" :lazy-load="true" width="48" height="48" mode="widthFix"></u-image>
-          </view>
-        </template>
-      </u-cell>
+<!--      <u-cell-->
+<!--          :border="false"-->
+<!--          :rightIconStyle="{fontSize:'28rpx'}"-->
+<!--          :isLink="true"-->
+<!--          title="我的关注"-->
+<!--      >-->
+<!--        <template #icon>-->
+<!--          <view class="cell-icon" :style="{marginRight:'56rpx'}">-->
+<!--            <u-image :src="staticImage.userFollow" :lazy-load="true" width="48" height="48" mode="widthFix"></u-image>-->
+<!--          </view>-->
+<!--        </template>-->
+<!--      </u-cell>-->
 
     </u-cell-group>
     <u-gap height="8" bgColor="#F5F5F6"></u-gap>
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 0d8e7fc..cc7ebc1 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -162,8 +162,10 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
+        if(res.code === 200) {
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
       });
     }
     // store.
diff --git a/pages/Line/components/SubmitPage/index.vue b/pages/Line/components/SubmitPage/index.vue
index da7565a..7e0c983 100644
--- a/pages/Line/components/SubmitPage/index.vue
+++ b/pages/Line/components/SubmitPage/index.vue
@@ -121,7 +121,6 @@
               <view class="upload">
                 <u-upload
                     accept="video"
-                    capture="album"
                     width="160"
                     height="160"
                     :fileList="videoList"
@@ -227,6 +226,7 @@ import api from '@/utils/functions.js';
 import MzCard from "@/components/MzCard/index.vue";
 import {lineSubmit, lineType} from "@/api/line";
 import login from "@/pages/Login/index.vue";
+import {userExtends} from "@/api/user";
 
 
 export default {
@@ -554,6 +554,15 @@ export default {
       uni.redirectTo({
         url:'/pages/Line/user'
       })
+    },
+    getUserExtend() {
+      userExtends().then((res) => {
+        if(res.code === 200){
+          this.model.line.phone = res.data.phone;
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
+      });
     }
   },
   onPageScroll(res) {
@@ -569,6 +578,7 @@ export default {
         api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
   },
   mounted() {
+    this.getUserExtend();
     this.getLineType();
   },
   updated() {
diff --git a/pages/Line/user.vue b/pages/Line/user.vue
index b4cfcac..c220e92 100644
--- a/pages/Line/user.vue
+++ b/pages/Line/user.vue
@@ -91,9 +91,9 @@
         list: [{
           name: '全部事件',
         },{
-          name: '待结案',
+          name: '待办结',
         },{
-          name: '已结案',
+          name: '已办结',
         },],
         tabCheck:'submit',
 				show: false,
diff --git a/pages/Order/components/done.scss b/pages/Order/components/done.scss
index bfd9ccb..e49ed4b 100644
--- a/pages/Order/components/done.scss
+++ b/pages/Order/components/done.scss
@@ -8,6 +8,7 @@
   .done-container{
     position: relative;
     bottom:15%;
+    justify-content: center;
   }
   .image,.title,.button{
     justify-content: center;
@@ -16,6 +17,11 @@
     margin-bottom:26rpx;
   }
   .title{
+    margin-bottom:30rpx;
+  }
+  .desc{
+    text-indent: 56rpx;
     margin-bottom:88rpx;
+    padding:0 100rpx;
   }
 }
\ No newline at end of file
diff --git a/pages/Order/components/info.scss b/pages/Order/components/info.scss
new file mode 100644
index 0000000..4f847fe
--- /dev/null
+++ b/pages/Order/components/info.scss
@@ -0,0 +1,112 @@
+.wallpaper-container{
+  background:{
+    color:#F5F5F6;
+  }
+  height:100vh;
+  width:100%;
+  position: fixed;
+  top:0;
+  left:0;
+  z-index: -1;
+}
+.wallpaper-body{
+  padding:16rpx 26rpx;
+  .order-item-info-container{
+    margin-bottom:40rpx;
+    padding:40rpx;
+    background:{
+      color:#fff;
+    }
+    border-radius: 10rpx;
+    .icon-label{
+      &.address{
+        margin-right:72rpx;
+      }
+    }
+    .title{
+      margin-bottom:12rpx;
+    }
+    .title-container{
+      height:100%;
+      align-content: space-between;
+    }
+    .item-info{
+      justify-content: space-between;
+      .item-title{
+        max-width:300rpx;
+        &.info-price{
+          justify-content: flex-end;
+        }
+        .price-number{
+          align-content: flex-end;
+          .label{
+            display: flex;
+            align-content: flex-end;
+          }
+        }
+      }
+    }
+    .cell{
+      padding-top:20rpx;
+      padding-bottom:20rpx;
+      .cell-item{
+        margin-bottom:24rpx;
+        justify-content: space-between;
+      }
+      &.price-info{
+        border-bottom:1px solid #d6d7d9;
+      }
+
+    }
+  }
+  .tip{
+    justify-content: space-between;
+    align-items: center;
+    .left{
+      .import-tip{
+        .icon{
+          margin-right:10rpx;
+        }
+      }
+    }
+  }
+}
+.foot-phone{
+  padding-top:60rpx;
+  justify-content: center;
+  .foot-phone-container{
+    .label,.phone{
+      margin-bottom:10rpx;
+    }
+  }
+}
+.phone-button{
+  display: flex;
+  justify-content: center;
+  width:auto;
+  .phone{
+    text-align: center;
+    flex: 0 0 64rpx;
+    border-radius: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    //width:56rpx;
+    height:64rpx;
+    //border-radius:50%;
+    background:{
+      color:#FF9545;
+    }
+  }
+}
+::v-deep .u-cell__body{
+  padding:26rpx 0 !important;
+  width:100%;
+}
+::v-deep .u-cell__left-icon-wrap{
+  margin-bottom:auto;
+}
+::v-deep .u-cell__body__content{
+  align-items: stretch !important;
+}
\ No newline at end of file
diff --git a/pages/Order/confirm.vue b/pages/Order/confirm.vue
index 012cab4..e67485c 100644
--- a/pages/Order/confirm.vue
+++ b/pages/Order/confirm.vue
@@ -35,7 +35,7 @@
             <u-text text="请选择收货地址" color="#020B18" size="32"></u-text>
           </view>
           <view class="desc" v-if="address?.address">
-            <u-text :text="address.address" color="#AFB5BE" size="28"></u-text>
+            <u-text :text="address.area + address.address" color="#AFB5BE" size="28"></u-text>
           </view>
         </view>
 
diff --git a/pages/Order/detail.vue b/pages/Order/detail.vue
index 76e0e6b..12442aa 100644
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@@ -132,7 +132,7 @@
               uploadIcon="plus"
               @afterRead="afterFileRead1"
               @delete="deleteFile1"
-              :deletable="(type === 'create')"
+              :deletable="(type === 'create' || type === 'edit')"
               :maxCount="1"
           ></u-upload>
         </u-form-item>
@@ -155,7 +155,7 @@
                   @afterRead="afterFileRead2"
                   @delete="deleteFile2"
                   :disabled="(type !== 'create')"
-                  :deletable="(type === 'create')"
+                  :deletable="(type === 'create' || type === 'edit')"
                   :maxCount="((type === 'create')?5:fileList2.length)"
               ></u-upload>
             </view>
@@ -164,7 +164,7 @@
       </u-form>
     </u-col>
   </u-row>
-  <view class="foot-button border-box" v-if="type === 'create'">
+  <view class="foot-button border-box" v-if="(type === 'create' || type === 'edit')">
     <u-button
         type="primary"
         text="我要兑换"
@@ -325,7 +325,7 @@ export default {
             };
             this.fileList1 = [];
             this.fileList2 = [];
-            this.navTo('/pages/Order/done?id=');
+            this.navTo('/pages/Order/done?type=room');
           }else{
             uni.$u.toast(res.msg)
           }
@@ -399,18 +399,20 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
-        this.modalShow = !res.data?.phone
-            || !res.data?.name
-            || !res.data?.community
-            || !res.data?.street
-            || !res.data?.company
-            || !res.data?.position
-            || !res.data?.id_card;
-        this.model.order.name = res.data.name;
-        this.model.order.id_card = res.data.id_card;
-        this.model.order.phone = res.data.phone;
+            if(res.code === 200) {
+              uni.setStorageSync('user', res.data);
+              this.$store.commit('userInfo', res.data);
+              this.modalShow = !res.data?.phone
+                  || !res.data?.name
+                  || !res.data?.community
+                  || !res.data?.street
+                  || !res.data?.company
+                  || !res.data?.position
+                  || !res.data?.id_card;
+              this.model.order.name = res.data.name;
+              this.model.order.id_card = res.data.id_card;
+              this.model.order.phone = res.data.phone;
+            }
       });
     },
     navTo(url) {
diff --git a/pages/Order/done.vue b/pages/Order/done.vue
index 0d60012..e713c57 100644
--- a/pages/Order/done.vue
+++ b/pages/Order/done.vue
@@ -17,15 +17,21 @@
         <u-image mode="aspectFill" class="img" :src="staticImage.orderDone" height="250" width="250"></u-image>
       </view>
       <view class="title col-12 row">
-        <u-text text="支付成功！" color="#020B18" size="36" mode="name" lineHeight="50" align="center"></u-text>
+        <u-text :text="content" color="#020B18" size="36" mode="name" lineHeight="50" align="center"></u-text>
+      </view>
+      <view class="desc col-12 row" v-if="(type === 'room')">
+        <u-text :text="desc" color="#AFB5BE" size="28" mode="name" lineHeight="50" align="center"></u-text>
       </view>
       <view class="button col-12 row">
-        <u-button
-            @click="goHome"
-            type="primary"
-            text="返回首页"
-            shape="circle"
-            :custom-style="{
+
+        <view class="button-group">
+          <view class="button" style="margin-bottom: 20rpx;" v-if="(type === 'room')">
+            <u-button
+                @click="navTo('/pages/User/order')"
+                type="primary"
+                text="我的订单"
+                shape="circle"
+                :custom-style="{
               color:'#020B18',
               backgroundColor:'#FF9545',
               border:'none',
@@ -34,26 +40,63 @@
               height:'80rpx',
               width:'360rpx'
             }"
-        ></u-button>
+
+            ></u-button>
+          </view>
+          <view class="button" style="margin-bottom: 20rpx;" v-else>
+            <u-button
+                @click="navTo('/pages/Order/info?id='+order_item_id)"
+                type="primary"
+                text="订单详情"
+                shape="circle"
+                :custom-style="{
+              color:'#020B18',
+              backgroundColor:'#FF9545',
+              border:'none',
+              fontSize:'36',
+              fontWeight:'400',
+              height:'80rpx',
+              width:'360rpx'
+            }"
+            ></u-button>
+          </view>
+          <view class="button">
+            <u-button
+                @click="goHome"
+                text="返回首页"
+                shape="circle"
+                plain
+                :custom-style="{
+                    backgroundColor:'transparent',
+                    border:'2rpx solid #999',
+                    fontSize:'36',
+                    fontWeight:'400',
+                    height:'80rpx',
+                    width:'360rpx'
+                  }"
+            ></u-button>
+          </view>
+
+        </view>
       </view>
     </view>
   </view>
-<!--  <view class="foot-button border-box">-->
-<!--    <u-button-->
-<!--        type="primary"-->
-<!--        text="确认兑换"-->
-<!--        shape="circle"-->
-<!--        :custom-style="{-->
-<!--              color:'#020B18',-->
-<!--              backgroundColor:'#FF9545',-->
-<!--              border:'none',-->
-<!--              fontSize:'36',-->
-<!--              fontWeight:'400',-->
-<!--              height:'80rpx'-->
-<!--            }"-->
-<!--        @click="submit"-->
-<!--    ></u-button>-->
-<!--  </view>-->
+  <!--  <view class="foot-button border-box">-->
+  <!--    <u-button-->
+  <!--        type="primary"-->
+  <!--        text="确认兑换"-->
+  <!--        shape="circle"-->
+  <!--        :custom-style="{-->
+  <!--              color:'#020B18',-->
+  <!--              backgroundColor:'#FF9545',-->
+  <!--              border:'none',-->
+  <!--              fontSize:'36',-->
+  <!--              fontWeight:'400',-->
+  <!--              height:'80rpx'-->
+  <!--            }"-->
+  <!--        @click="submit"-->
+  <!--    ></u-button>-->
+  <!--  </view>-->
 </template>
 
 <script>
@@ -66,7 +109,9 @@ export default {
   components: {},
   data() {
     return {
-      title: '支付成功',
+      title: '兑换成功',
+      content: '',
+      desc: '',
       size: {
         height: 0
       },
@@ -75,11 +120,21 @@ export default {
         bg: imghost + '/BG.png',
         orderDone: imghost + '/order-done.png',
 
-      }
+      },
+      type: '',
+      order_item_id: undefined,
     }
   },
   onLoad(option) {
     // this.getDetail(option.id)
+    this.type = option.type ? option.type : 'item';
+    if (this.type === 'item') {
+      this.order_item_id = option.id;
+      this.content = '兑换成功！';
+    } else {
+      this.content = '审核中';
+      this.desc = '请前往兑换中心查看审核进度，审核通过后请每月指定时间（请留意小程序首页消息提醒）前往社区领取暖新币兑换金额。';
+    }
   },
   onReady() {
     let that = this;
@@ -102,6 +157,11 @@ export default {
     });
   },
   methods: {
+    navTo(url) {
+      uni.navigateTo({
+        url: url
+      })
+    },
     getDetail(id) {
       roomDetail({
         house_id: id
@@ -110,7 +170,7 @@ export default {
         this.detail = res.data;
       });
     },
-    goHome(){
+    goHome() {
       wx.reLaunch({
         url: '/pages/Index/index'
       });
diff --git a/pages/Order/exchange.vue b/pages/Order/exchange.vue
index a409f97..de5f8aa 100644
--- a/pages/Order/exchange.vue
+++ b/pages/Order/exchange.vue
@@ -234,18 +234,20 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
-        this.modalShow = !res.data?.phone
-            || !res.data?.name
-            || !res.data?.community
-            || !res.data?.street
-            || !res.data?.company
-            || !res.data?.position
-            || !res.data?.id_card;
-        this.model.order.name = res.data.name;
-        this.model.order.id_card = res.data.id_card;
-        this.model.order.phone = res.data.phone;
+            if(res.code === 200) {
+              uni.setStorageSync('user', res.data);
+              this.$store.commit('userInfo', res.data);
+              this.modalShow = !res.data?.phone
+                  || !res.data?.name
+                  || !res.data?.community
+                  || !res.data?.street
+                  || !res.data?.company
+                  || !res.data?.position
+                  || !res.data?.id_card;
+              this.model.order.name = res.data.name;
+              this.model.order.id_card = res.data.id_card;
+              this.model.order.phone = res.data.phone;
+            }
       });
     },
     navTo(url) {
diff --git a/pages/Order/info.vue b/pages/Order/info.vue
new file mode 100644
index 0000000..d78d419
--- /dev/null
+++ b/pages/Order/info.vue
@@ -0,0 +1,232 @@
+<template>
+  <view class="body-background"></view>
+  <u-navbar
+      :title="title"
+      :auto-back="true"
+      left-icon-size="40rpx"
+      :safe-area-inset-top="true"
+      :placeholder="true"
+      bgColor="#ffffff"
+  ></u-navbar>
+<view class="wallpaper-container"></view>
+<view class="wallpaper-body">
+  <view class="order-item-info-container">
+    <u-cell-group :border="false">
+      <view class="info-label">
+        <u-text text="配送信息" color="#FF9545" size="32"></u-text>
+      </view>
+      <u-cell border custom-style="align-items:flex-start;margin-bottom:20rpx;">
+        <template #icon>
+          <view class="icon-label row col address">
+            <u-text text="收货地址" color="#020B18" size="32"></u-text>
+          </view>
+        </template>
+        <template #title>
+          <view class="title">
+            <u-text :text="detail.take_address" color="#020B18" size="28"></u-text>
+          </view>
+        </template>
+        <template #label>
+          <view class="label row">
+            <view class="name" style="margin-right:36rpx;">
+              <u-text :text="detail.take_name" color="#666666" size="28"></u-text>
+            </view>
+            <view class="phone">
+              <u-text :text="detail.take_phone" color="#666666" size="28"></u-text>
+            </view>
+          </view>
+        </template>
+      </u-cell>
+      <view class="info-label">
+        <u-text text="商品信息" color="#FF9545" size="32"></u-text>
+      </view>
+      <u-cell border custom-style="align-items:flex-start;">
+        <template #icon>
+          <view class="icon-label row col item-info-icon" style="margin-right:12rpx;">
+            <u-image :src="detail.goods_cover" width="176" height="176" mode="widthFix" radius="24"></u-image>
+          </view>
+        </template>
+        <template #title>
+          <view class="title-container row">
+            <view class="item-info row">
+              <view class="item-title">
+                <u-text :text="detail.goods_name" color="#020B18" size="28"></u-text>
+              </view>
+              <view class="item-title info-price">
+                <view class="price-number row">
+                  <view class="price">
+                    <u-text :text="detail.coin_number" color="#FF9545" size="32" bold></u-text>
+                  </view>
+                  <view class="label">
+                    <u-text text="币" color="#020B18" size="26"></u-text>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view class="label-group row">
+              <view class="label row">
+                <view class="content">
+                  <u-text text="规格:" color="#666666" size="26"></u-text>
+                </view>
+                <view class="value">
+                  <u-text :text="detail.goods_spec" color="#666666" size="26"></u-text>
+                </view>
+              </view>
+              <view class="label row">
+                <view class="content">
+                  <u-text text="数量:" color="#666666" size="26"></u-text>
+                </view>
+                <view class="value">
+                  <u-text :text="detail.goods_number+'件'" color="#666666" size="26"></u-text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </template>
+      </u-cell>
+      <view class="cell price-info">
+<!--        <view class="cell-item row">-->
+<!--          <view class="label">-->
+<!--            <u-text text="运费" color="#020B18" size="30"></u-text>-->
+<!--          </view>-->
+<!--          <view class="value">-->
+<!--            <u-text text="0" mode="price" color="#020B18" size="32"></u-text>-->
+<!--          </view>-->
+<!--        </view>-->
+        <view class="cell-item row">
+          <view class="label">
+            <u-text text="支付方式" color="#020B18" size="30"></u-text>
+          </view>
+          <view class="value">
+            <u-text text="全暖新币兑换" color="#020B18" size="32"></u-text>
+          </view>
+        </view>
+        <view class="cell-item row">
+          <view class="label">
+            <u-text text="实付暖新币" color="#020B18" size="30"></u-text>
+          </view>
+          <view class="value">
+            <u-text :text="detail.coin_number+'币'" color="#FF9545" size="32"></u-text>
+          </view>
+        </view>
+      </view>
+      <view class="cell pay-info">
+        <view class="cell-item row">
+          <view class="label">
+            <u-text text="订单编号" color="#020B18" size="30"></u-text>
+          </view>
+          <view class="value" @click="copyContent(detail.no)">
+            <u-text :text="detail.no" color="#999999" size="30"></u-text>
+          </view>
+        </view>
+        <view class="cell-item row">
+          <view class="label">
+            <u-text text="创建时间" color="#020B18" size="30"></u-text>
+          </view>
+          <view class="value">
+            <u-text :text="detail.create_time" color="#999999" size="30"></u-text>
+          </view>
+        </view>
+        <view class="cell-item row">
+          <view class="label">
+            <u-text text="兑换时间" color="#020B18" size="30"></u-text>
+          </view>
+          <view class="value">
+            <u-text :text="detail.create_time" color="#999999" size="30"></u-text>
+          </view>
+        </view>
+      </view>
+    </u-cell-group>
+  </view>
+  <view class="tip row">
+    <view class="left">
+      <view class="import-tip row">
+        <view class="icon row col">
+          <u-icon name="info-circle" color="#FF9545" size="32"></u-icon>
+        </view>
+        <view class="title">
+          <u-text text="重要提示" color="#666666" size="28"></u-text>
+        </view>
+      </view>
+    </view>
+    <view class="right">
+      <u-text text="退换货请联系客服" color="#666666" size="28"></u-text>
+    </view>
+  </view>
+</view>
+  <view class="foot-phone row">
+    <view class="foot-phone-container">
+      <view class="label">
+        <u-text text="售后联系电话" color="#666666" size="28" align="center"></u-text>
+      </view>
+      <view class="phone">
+        <u-text :text="detail.tel" color="#666666" size="28" align="center"></u-text>
+      </view>
+      <view class="phone-button" @click="callPhone(detail.tel)">
+        <view class="button phone  col">
+          <u-icon name="phone-fill" size="40" color="#fff"></u-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import {orderItemInfo} from "@/api/user";
+
+export default {
+  data() {
+    return {
+      title: '订单详情',
+      detail: {
+        goods_name:'',
+        no:'',
+        goods_cover:'',
+        goods_spec:'',
+        goods_number:'',
+        coin_number:'',
+        take_name:'',
+        take_phone:'',
+        take_address:'',
+        create_time:'',
+        send_time:'',
+        tel:'',
+      },
+    }
+  },
+  onLoad(option) {
+    this.getDetail(option.id)
+  },
+  methods: {
+    navTo(url) {
+      uni.navigateTo({
+        url: url
+      })
+    },
+    getDetail(id) {
+      orderItemInfo({
+        goods_order_id : id
+      }).then(res => {
+        this.detail = res.data;
+      });
+    },
+    callPhone(phone){
+      uni.makePhoneCall({
+        phoneNumber: phone?.toString()
+      });
+    },
+    copyContent(content){
+      uni.setClipboardData({
+        data: content,
+        success: function () {
+          //调用方法成功
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+@import './components/info.scss';
+</style>
\ No newline at end of file
diff --git a/pages/Service/index.vue b/pages/Service/index.vue
index 65c5228..2b56796 100644
--- a/pages/Service/index.vue
+++ b/pages/Service/index.vue
@@ -137,7 +137,7 @@
                 <view class="icon" style="margin-right:20rpx;">
                   <u-image mode="widthFix" width="32" height="32" :src="staticImage.listPosition"></u-image>
                 </view>
-                <view class="value col ">
+                <view class="value col " @click="callLocal(item.lat,item.lng)">
                   <u-text :text="item.address" color="#AFB5BE" size="28" custom-style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; "></u-text>
                 </view>
               </view>
@@ -360,8 +360,8 @@ export default {
                latitude:parseFloat(item.lat),
                longitude:parseFloat(item.lng),
                iconPath:(item.category === 1)?this.mapIcon1:this.mapIcon2,
-               width:'24px',
-               height:'24px'
+               // width:'48rpx',
+               // height:'48rpx'
              });
               return item;
             });
@@ -383,8 +383,8 @@ export default {
               latitude:parseFloat(item.lat),
               longitude:parseFloat(item.lng),
               iconPath:(item.category === 1)?this.mapIcon1:this.mapIcon2,
-              width:'24px',
-              height:'24px'
+              // width:'48rpx',
+              // height:'48rpx'
             });
             return item;
           });
@@ -494,6 +494,15 @@ export default {
         name:this.mapData.name,
       })
     },
+    callLocal(lat,lng){
+      const latitude=parseFloat(lat);
+      const longitude=parseFloat(lng);
+      uni.openLocation({
+        latitude:latitude,
+        longitude:longitude,
+        name:this.mapData.name,
+      })
+    },
     callPhone(phone){
       uni.makePhoneCall({
         phoneNumber: phone?.toString()
diff --git a/pages/User/edit.vue b/pages/User/edit.vue
index 6ce3ad9..8d08952 100644
--- a/pages/User/edit.vue
+++ b/pages/User/edit.vue
@@ -392,9 +392,11 @@ export default {
     },
     getUserExtend() {
       userExtends().then((res) => {
-        this.userInfo = res.data;
-        uni.setStorageSync('user', res.data);
-        this.$store.commit('userInfo', res.data);
+        if(res.code === 200) {
+          this.userInfo = res.data;
+          uni.setStorageSync('user', res.data);
+          this.$store.commit('userInfo', res.data);
+        }
       });
     }
   },
diff --git a/pages/User/order.vue b/pages/User/order.vue
index 43aabd4..9dca1e4 100644
--- a/pages/User/order.vue
+++ b/pages/User/order.vue
@@ -80,14 +80,14 @@
         <view class="phone-button" @click="callPhone(item.take_phone)">
           <view class="button phone  col">
             <u-icon name="phone-fill" size="32" color="#000" custom-style="margin-right:10rpx;"></u-icon>
-            <u-text size="32" color="#020B18" text="联系客服"></u-text>
+            <u-text size="32" color="#020B18" text="售后"></u-text>
           </view>
         </view>
 
         <view class="button-group row col">
-<!--          <view class="button">-->
-<!--            <u-button text="查看详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>-->
-<!--          </view>-->
+          <view class="button">
+            <u-button @click="navTo('/pages/Order/info')" text="查看详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
+          </view>
           <view class="button">
             <u-button @click="openLogistics(item)" text="查看物流" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
           </view>
@@ -124,13 +124,20 @@
 
         </view>
         <view class="button-group row col">
-          <view class="button">
+          <view class="button" v-if="item.status !== 3">
             <u-button
                 @click="navTo('/pages/Order/detail?id='+item.id+'&type=detail')"
                 text="租房详情"
                 shape="circle"
                 custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
           </view>
+          <view class="button" v-else>
+            <u-button
+                @click="navTo('/pages/Order/detail?id='+item.id+'&type=edit')"
+                text="重新审核"
+                shape="circle"
+                custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
+          </view>
           <view class="button">
             <u-button
                 @click="navTo('/pages/Order/exchange?id='+item.id+'&type=detail')"