diff --git a/manifest.json b/manifest.json
index 913f312..60f1fac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 974edd5..de23967 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -301,32 +301,46 @@
                     placeholder-class='placeholder' />
                 </view>
               </view> -->
-              <view class="item">
+              <view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
                 <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;">
+                  <view style="font-size: 31rpx;flex: 1;">
                     {{merchantData.company_name}}
                   </view>
                 </view>
               </view>
-              <view class="item">
+              <view class="item" v-else>
+                <view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
+                  <text class="item-name" style="flex-shrink: 0;">持卡人:</text>
+                  <input style="font-size: 31rpx;" placeholder="请输入持卡人姓名" v-model="merchantData.company_name" @input="validateBtn"
+                    placeholder-class='placeholder' />
+                </view>
+              </view>
+              <view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
                 <view class="acea-row row-middle">
                   <text class="item-name">对公账号:</text>
-                  <input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" @input="validateBtn"
+                  <input style="font-size: 31rpx;" type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" @input="validateBtn"
+                    placeholder-class='placeholder' />
+                </view>
+              </view>
+              <view class="item" v-else>
+                <view class="acea-row row-middle">
+                  <text class="item-name">银行卡号:</text>
+                  <input style="font-size: 31rpx;" type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code" @input="validateBtn"
                     placeholder-class='placeholder' />
                 </view>
               </view>
               <view class="item">
                 <view class="acea-row row-middle">
                   <text class="item-name">开户银行:</text>
-                  <input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
+                  <input style="font-size: 31rpx;" type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
                     @input="validateBtn" placeholder-class='placeholder' />
                 </view>
               </view>
               <view class="item">
                 <view class="acea-row row-middle">
                   <text class="item-name">开户网点:</text>
-                  <input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn"
+                  <input style="font-size: 31rpx;" type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn"
                     placeholder-class='placeholder' />
                 </view>
               </view>
@@ -353,11 +367,12 @@
               </view> -->
               <view class="item">
                 <view class="acea-row row-middle">
-                  <text class="item-name">银行卡图片:</text>
+                  <text class="item-name">{{userInfoData.mer_info&&userInfoData.mer_info.is_company?"银行卡图片:":"开户凭证:"}}</text>
                 </view>
                 <view class="item-card">
                   <view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
-                    <image src="@/static/images/YHKZ.png" mode="aspectFit"></image>
+                    <image v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company" src="@/static/images/YHKZ.png" mode="aspectFit"></image>
+                    <image v-else src="@/static/images/KHPZ.png" mode="aspectFit"></image>
                   </view>
                   <view class="item-carda" @click='DelPic({type:3})' v-else>
                     <image :src="merchantData.bank_front" mode="aspectFit"></image>
@@ -886,10 +901,10 @@ import { Toast } from '../../libs/uniApi';
           value = that.merchantData;
 
         if (!value.company_name) return that.$util.Tips({
-          title: '请输入公司名称'
+          title: that.userInfoData.mer_info.is_company ? '请输入公司名称' : '请输入持卡人姓名'
         });
         if (!value.bank_code) return that.$util.Tips({
-          title: '请输入对公账号'
+          title: that.userInfoData.mer_info.is_company ? '请输入对公账号' : '请输入银行卡号'
         });
         if (!value.bank_username) return that.$util.Tips({
           title: '请输入开户银行'
@@ -898,13 +913,13 @@ import { Toast } from '../../libs/uniApi';
           title: '请输入开户网点'
         });
 
-        // if (value.bank_front.length == 0) return that.$util.Tips({
+        if (value.bank_front.length == 0) return that.$util.Tips({
+          title: that.userInfoData.mer_info.is_company ? '请上传银行卡正面图片' : '请上传开户凭证'
+        });
+
+        // if (value.bank_back.length == 0) return that.$util.Tips({
         //   title: '请上传一张或者多张图片'
         // });
-
-        if (value.bank_back.length == 0) return that.$util.Tips({
-          title: '请上传银行卡正面图片'
-        });
         // if (value.cardno_front.length == 0) return that.$util.Tips({
         //   title: '请上传一张或者多张图片'
         // });
@@ -1076,11 +1091,13 @@ import { Toast } from '../../libs/uniApi';
       getUserInfo() {
         getUserInfo().then(res => {
           // console.log(res);
+          res.data.mer_info.is_company?res.data.mer_info.is_company=1:res.data.mer_info.is_company=0
           this.userid = res.data.uid
-          this.userInfoData = res.data
+          this.userInfoData = res.data;
           this.$store.commit('SET_USERINFO', res.data);
           this.merchantData.phone = res.data.phone;
-          this.merchantData.company_name = res.data.mer_info.company_name;
+          if(res.data.mer_info.is_company==0) this.merchantData.company_name = "";
+          else this.merchantData.company_name = res.data.mer_info.company_name;
           if (res.data.service == null) {
             // console.log('123');
             this.isgShow = false
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index f5cbf82..ba6eea3 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -20,18 +20,18 @@
 			<view class='wrapper'>
 				<view :hidden='currentTab != 0' class='list'>
 					<form @submit="subCash" report-submit='true'>
-						<!-- <view class='item acea-row row-between-wrapper'>
-							<view class='name'>持卡人</view>
-							<view class='input'><input v-model="mode.real_name" placeholder='请输入持卡人姓名'
-									placeholder-class='placeholder' name="real_name"></input></view>
-						</view> -->
-            <view class='item acea-row row-between-wrapper'>
+            <view v-if="merInfo.is_company" class='item acea-row row-between-wrapper'>
             	<view class='name'>公司名称</view>
             	<view class='input'>
                 <text class='Bank'>{{mode.mer_name}}</text>
                 <text class='iconfont icon-qiepian38'></text>
               </view>
             </view>
+						<view v-else class='item acea-row row-between-wrapper'>
+							<view class='name'>持卡人</view>
+							<view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名'
+									placeholder-class='placeholder' name="mer_name"></input></view>
+						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>对公账号</view>
 							<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
@@ -251,6 +251,7 @@
 				array: [], //提现银行
 				minPrice: 0.00, //最低提现金额
 				userInfo: [],
+        merInfo: {}, //商户信息
 				isClone: false,
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
@@ -280,7 +281,10 @@
 		},
 		onLoad(options) {
 			this.merId = options.mer_id
-			this.source = options.source
+			this.source = options.source;
+      let data = this.$store.state.app.userInfo;
+      if(typeof data == 'string') data = JSON.parse(data);
+      this.merInfo = data.mer_info;
 			this.getApply()
 			if (this.isLogin) {
 				this.getUserInfo();
diff --git a/static/images/KHPZ.png b/static/images/KHPZ.png
new file mode 100644
index 0000000..47ff897
Binary files /dev/null and b/static/images/KHPZ.png differ
diff --git a/static/images/SFFF.png b/static/images/SFFF.png
index def3aaa..1c76451 100644
Binary files a/static/images/SFFF.png and b/static/images/SFFF.png differ
diff --git a/static/images/SFZZ.png b/static/images/SFZZ.png
index 1b15302..de03700 100644
Binary files a/static/images/SFZZ.png and b/static/images/SFZZ.png differ
diff --git a/static/images/YHKF.png b/static/images/YHKF.png
index e1ba19e..c08cb83 100644
Binary files a/static/images/YHKF.png and b/static/images/YHKF.png differ
diff --git a/static/images/YHKZ.png b/static/images/YHKZ.png
index f259cbf..cee3ec2 100644
Binary files a/static/images/YHKZ.png and b/static/images/YHKZ.png differ