diff --git a/pages/Order/detail.vue b/pages/Order/detail.vue
index cdf02c0..425c615 100644
--- a/pages/Order/detail.vue
+++ b/pages/Order/detail.vue
@@ -88,7 +88,6 @@
               border="none"
               :custom-style="{paddingRight:'28rpx'}"
               v-model="model.order.bank_card"
-              :disabled="true"
           ></u-input>
         </u-form-item>
         <u-form-item
@@ -104,7 +103,6 @@
               border="none"
               :custom-style="{paddingRight:'28rpx'}"
               v-model="model.order.bank_name"
-              :disabled="true"
           ></u-input>
         </u-form-item>
         <u-form-item
diff --git a/pages/Room/index.vue b/pages/Room/index.vue
index 81a0e98..8b6ba6f 100644
--- a/pages/Room/index.vue
+++ b/pages/Room/index.vue
@@ -143,7 +143,7 @@
         <u-icon name="phone-fill" size="32" color="#000" custom-style="margin-right:10rpx;"></u-icon>
         <u-text size="32" color="#020B18" text="电话联系" @click="callPhone"></u-text>
       </view>
-      <view class="button exchange" v-if="(detail.is_vacant === 2)">
+      <view class="button exchange" v-if="(detail.is_vacant !== 2)">
         <u-text size="32" color="#020B18" text="暖新币兑换" @click="navTo('/pages/Order/detail?type=create&id='+detail.id+'&rent='+detail.price,true)"></u-text>
       </view>
     </view>
diff --git a/pages/User/edit.vue b/pages/User/edit.vue
index f870d05..fec8d89 100644
--- a/pages/User/edit.vue
+++ b/pages/User/edit.vue
@@ -95,19 +95,48 @@
 
           <u-form-item
               :custom-style="{
-                  padding:'34rpx 0'
+                  padding:'34rpx 0',
+                  position:'relative'
               }"
               label="公司全称"
               prop="userInfo.company"
               borderBottom
 
           >
+            <view class="" v-if="tipShow && tips.length > 0" style="
+              background-color:#fff;
+              border:2rpx solid #dedede;
+              border-radius: 20rpx;
+              position: absolute;
+              top:110%;
+              z-index: 10;
+              padding:0 20rpx;
+            ">
+              <view
+                  v-for="(item,index) in tips"
+                  class=""
+                  style="
+                    border-bottom:2rpx solid #dedede;
+                    padding:20rpx 0;
+                    min-width:150rpx;
+                  "
+                  @click="selectTip(item)">
+                <u-text :text="item" size="28"></u-text>
+              </view>
+              <view style="padding:20rpx 0;display:flex;justify-content: flex-end;text-align: right;" @click="tipShow = false;">
+                <u-button text="关闭提示" size="mini" custom-style="background-color:#FF9545;"></u-button>
+              </view>
+            </view>
             <u-input
                 fontSize="28"
                 placeholder="请输入"
                 v-model="model.userInfo.company"
                 border="none"
-            ></u-input>
+                @change="filterTip"
+                @focus="filterTip"
+            >
+            </u-input>
+
           </u-form-item>
           <u-form-item
               :custom-style="{
@@ -202,6 +231,9 @@ export default {
   },
   data() {
     return {
+      companyTip:[],
+      tipShow:false,
+      tips:[],
       model: {
         userInfo: {
           name:'',
@@ -327,9 +359,25 @@ export default {
   mounted() {
     this.initForm();
     this.getPickerData();
-
+    this.getTips();
   },
   methods: {
+    selectTip(item){
+      this.model.userInfo.company = item;
+      this.tipShow = false;
+    },
+    getTips(){
+      systemConfig({
+        type:'company'
+      }).then(res => {
+        this.companyTip = res.data;
+      });
+      [].filter(res => res.indexOf(this.model.userInfo.company))
+    },
+    filterTip(){
+      this.tips = this.companyTip.filter(res => (res.indexOf(this.model.userInfo.company)!==-1))
+      this.tipShow = true;
+    },
     initForm(){
       if(uni.getStorageSync('user')){
         this.model.userInfo = uni.getStorageSync('user');
diff --git a/pages/User/order.vue b/pages/User/order.vue
index 9dca1e4..e314d66 100644
--- a/pages/User/order.vue
+++ b/pages/User/order.vue
@@ -86,7 +86,7 @@
 
         <view class="button-group row col">
           <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>
+            <u-button @click="navTo('/pages/Order/info?id='+item.id)" 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>