diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8e341ee..ff8a065 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -261,38 +261,37 @@
     <view class="settlementAgreement" v-if="isFshow">
       <view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
         <!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
-        <view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:80rpx" @click="recuo">
-          <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
+        <view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:90rpx" @click="recuo">
+          <image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
         </view>
         <div class="title">{{detail.title}}</div>
         <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-        <view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
+        <view style="margin-bottom: 20rpx;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
         <view class="contenta">
           <jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-
         </view>
         <view class="setAgCountbtn">
-          <button class="setAgCountbtna" @click="refuse">
+          <view class="border"></view>
+          <!-- <button class="setAgCountbtna" @click="refuse">
             拒绝
-          </button>
-
-          <button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
+          </button> -->
+    
+          <button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
             <text v-if="num>0">请仔细阅读协议{{num}}S</text>
-            <text v-else>同意</text>
-
+            <text v-else>同意本协议</text>
           </button>
         </view>
+        <view ></view>
       </view>
     </view>
     <uni-popup ref="popup" type="bottom" @change="changePopup">
-
       <view class="userpage">
         <view class="userpage-icon" @click="close">
           <image src="@/static/images/close.png" mode=""></image>
         </view>
 
-        <form report-submit='true' style="height: 100%;">
-          <view class='merchantsSettled' :style="{'height':Fheight}">
+        <form report-submit='true'>
+          <view class='merchantsSettled' style="height:100vh;">
             <view class="title">填写信息</view>
             <view class='list'>
               <!-- <view class="item">
@@ -303,10 +302,11 @@
                 </view>
               </view> -->
               <view class="item">
-                <view class="acea-row row-middle">
-                  <text class="item-name">公司名称:</text>
-                  <input type="text" placeholder="请输入公司名称" disabled v-model="merchantData.company_name" @input="validateBtn"
-                    placeholder-class='placeholder' />
+                <view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
+                  <text class="item-name" style="flex-shrink: 0;">公司名称:</text>
+                  <view style="font-size: 32rpx;flex: 1;">
+                    {{merchantData.company_name}}
+                  </view>
                 </view>
               </view>
               <view class="item">
@@ -615,6 +615,16 @@ import { Toast } from '../../libs/uniApi';
         num: 10
       }
     },
+    watch: {
+      isFshow(n, o){
+        if(n) {
+          uni.hideTabBar();
+        }
+        else {
+          uni.showTabBar();
+        }
+      }
+    },
     onPullDownRefresh() {
       
       this.getGoods(true).then(()=>{
@@ -659,6 +669,7 @@ import { Toast } from '../../libs/uniApi';
       },
       //关闭弹窗
       close() {
+        this.isFshow = false;
         this.$refs.popup.close()
         this.num = 15
       },
@@ -766,6 +777,7 @@ import { Toast } from '../../libs/uniApi';
 
           intentionbus(that.merchantData).then(res => {
             if (res.status == 200) {
+              this.isFshow = false;
               this.$refs.popup.close()
               that.$util.Tips({
                 title: '提交成功'
@@ -780,6 +792,7 @@ import { Toast } from '../../libs/uniApi';
           }).catch(res => {
             that.validate = true;
             this.num = 15
+            this.isFshow = false;
             this.$refs.popup.close()
             that.$util.Tips({
               title: res
@@ -804,7 +817,6 @@ import { Toast } from '../../libs/uniApi';
       //同意
       agree() {
         this.$refs.popup.open()
-        this.isFshow = false
       },
       //拒绝
       refuse() {
@@ -1333,8 +1345,6 @@ import { Toast } from '../../libs/uniApi';
 
   .userpage {
     width: 100%;
-
-
     background-color: #fff;
     position: relative;
   }
@@ -1420,11 +1430,11 @@ import { Toast } from '../../libs/uniApi';
   }
 
   .userpage-icon {
-    width: 60rpx;
-    height: 60rpx;
+    width: 90rpx;
+    height: 90rpx;
     position: absolute;
-    top: 85rpx;
-    right: 60rpx;
+    top: 90rpx;
+    right: 30rpx;
 
     image {
       width: 100%;
@@ -1434,11 +1444,12 @@ import { Toast } from '../../libs/uniApi';
 
   .item-name {
     width: 190rpx;
+    font-size: 32rpx;
   }
 
   .merchantsSettled {
     height: 100%;
-    padding-top: 100rpx;
+    padding-top: 130rpx;
 
   }
 
@@ -1510,13 +1521,13 @@ import { Toast } from '../../libs/uniApi';
 
     .item-title {
       color: #666666;
-      font-size: 28rpx;
+      font-size: 32rpx;
       display: block;
     }
 
     .item-desc {
       color: #B2B2B2;
-      font-size: 22rpx;
+      font-size: 32rpx;
       display: block;
       margin-top: 9rpx;
       line-height: 36rpx;
@@ -1581,7 +1592,7 @@ import { Toast } from '../../libs/uniApi';
     height: 130rpx;
     margin: 24rpx 22rpx 0 0;
     position: relative;
-    font-size: 11px;
+    font-size: 32rpx;
     color: #bbb;
 
     &:nth-child(4n) {
@@ -1633,7 +1644,7 @@ import { Toast } from '../../libs/uniApi';
     border-radius: 25px;
     text-align: center;
     line-height: 86rpx;
-    font-size: 15px;
+    font-size: 32rpx;
     color: #fff;
     background: #E3E3E3;
     margin-top: 25px;
@@ -1648,8 +1659,8 @@ import { Toast } from '../../libs/uniApi';
 
 
   .settlementAgreement {
-    width: 100%;
-    height: 100%;
+    width: 100vw;
+    height: 100vh;
     position: fixed;
     top: 0;
     left: 0;
@@ -1659,17 +1670,18 @@ import { Toast } from '../../libs/uniApi';
 
   .settlementAgreement .setAgCount {
     background: #fff;
-    width: 656rpx;
+    width: 694rpx;
     // height: 458px;
     position: absolute;
     top: 50%;
     left: 50%;
 
-    padding: 52rpx;
+    padding: 28rpx;
     -webkit-transform: translate(-50%, -50%);
     -moz-transform: translate(-50%, -50%);
     transform: translate(-50%, -50%);
     overflow: hidden;
+    
 
     .content {
       height: 900rpx;
@@ -1709,7 +1721,7 @@ import { Toast } from '../../libs/uniApi';
     line-height: 22px;
     text-align: justify;
     text-justify: distribute-all-lines;
-    height: 68%;
+    height: 76%;
 
     overflow-y: scroll;
 
@@ -1719,7 +1731,8 @@ import { Toast } from '../../libs/uniApi';
   .setAgCountbtn {
     display: flex;
     justify-content: space-around;
-    padding-bottom: 120rpx;
+    padding-bottom: 30rpx;
+    position: relative;
 
     .setAgCountbtna {
       margin-top: 40rpx;
@@ -1769,6 +1782,23 @@ import { Toast } from '../../libs/uniApi';
       color: #fff;
 
     }
+    
+    .border{
+      position: absolute;
+      top: 0;
+      left: -28rpx;
+      width: 100vw;
+      height: 100%;
+      border-radius: 40rpx 40rpx 0 0;
+      box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
+    }
+    
+    .btn{
+      width: 694rpx;
+      font-weight: bold;
+      font-size: 34rpx;
+    }
+    
   }
 
 
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index e8d1673..9c4f529 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -148,15 +148,15 @@
 			</view>
 			<view class="item_cell flex_a_c">
 				<view class="sub_title flex_a_c">商户名称：</view>
-				<input class="com_input" type="text" disabled v-model="mer_name">
+				<view class="com_input">{{mer_name}}</view>
 			</view>
 			<view class="item_cell flex_a_c">
 				<view class="sub_title flex_a_c">商户分类：</view>
-				<input class="com_input" type="text" disabled v-model="category_name">
+				<view class="com_input">{{category_name}}</view>
 			</view>
 			<view class="item_cell flex_a_c">
 				<view class="sub_title flex_a_c">客服电话：</view>
-				<input class="com_input" type="number" disabled v-model="servicePhone">
+				<view class="com_input">{{servicePhone}}</view>
 			</view>
       
 			<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
@@ -726,12 +726,17 @@
 
 	.sub_title {
 		font-size: 31.58rpx;
+    flex-shrink: 0;
 	}
 
 	.item_cell {
 		padding: 31.58rpx 0;
 		border-bottom: 1px solid #F7F7F7;
-
+    
+    .com_input{
+      flex: 1;
+    }
+    
 		.ziti {
 			margin-right: 21.05rpx;
 		}
diff --git a/static/images/close.png b/static/images/close.png
index 2bb7c86..9e5f027 100644
Binary files a/static/images/close.png and b/static/images/close.png differ