no message

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -3,83 +3,132 @@
     <div v-show="step == 1">
       <div class="setting_title">开通账号</div>
       <el-divider></el-divider>
-      <div class="tips">说明：开通商户账号是指开通商城后台管理系统的总登录账号。</div>
-
+      <div class="tips"></div>
       <el-card shadow="never" class="my-card">
-        <el-form class="my-form" ref="step1Form" :model="step1Form" :rules="step1FormRules" label-width="140px"
-          label-position="right">
-          <el-form-item label="商户账号" prop="account">
-            <el-input v-model="step1Form.account" autocomplete="off" placeholder="请输入商户账号"></el-input>
-            <el-popover class="question" placement="right-start" title="账号设置" width="260" trigger="hover"
-              content="账号设置需按数字、字母组合设置至少12位账号">
-              <svg-icon icon-class="question" slot="reference" />
-            </el-popover>
-          </el-form-item>
-          <el-form-item label="账户昵称" prop="nickName">
-            <el-input v-model="step1Form.nickName" autocomplete="off" placeholder="请输入账户昵称"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序名称" prop="appName">
-            <el-input v-model="step1Form.appName" autocomplete="off" placeholder="请输入小程序名称"></el-input>
-          </el-form-item>
-          <el-form-item label="负责人" prop="chargePerson">
-            <el-input v-model="step1Form.chargePerson" autocomplete="off" placeholder="请输入负责人"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="step1Form.phone" autocomplete="off" placeholder="请输入联系电话"></el-input>
-          </el-form-item>
-          <el-form-item label="电子邮箱" prop="email">
-            <el-input v-model="step1Form.email" autocomplete="off" placeholder="请输入电子邮箱"></el-input>
-          </el-form-item>
-          <el-form-item label="地址" prop="address">
-            <div style="display:flex;">
-              <el-input placeholder="请选择地址" autocomplete="off" readonly style="margin-right: 20px;"
-                v-model="step1Form.address"></el-input>
-              <geographicalPosi :formData="step1Form" @selectPosi="selectAddress"></geographicalPosi>
-            </div>
-          </el-form-item>
-          <el-form-item label="登录密码" prop="newPassword">
-            <el-input v-model="step1Form.newPassword" ref="password1" autocomplete="off" placeholder="请输入登录密码"
-              :type="passwordType1"></el-input>
-            <span class="show-pwd" @click="showPwd(1)">
-              <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
-            </span>
-            <el-popover class="question" placement="right-start" title="密码设置" width="260" trigger="hover"
-              content="密码设置需按数字、字母组合设置至少12位密码">
-              <svg-icon icon-class="question" slot="reference" />
-            </el-popover>
-          </el-form-item>
-          <el-form-item label="确认密码" prop="confirmPassword">
-            <el-input v-model="step1Form.confirmPassword" ref="password2" autocomplete="off" placeholder="请再次输入密码"
-              :type="passwordType2"></el-input>
-            <span class="show-pwd" @click="showPwd(2)">
-              <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
-            </span>
-            <el-popover class="question" placement="right-start" title="密码设置" width="260" trigger="hover"
-              content="确认密码需要和登录密码保持一致">
-              <svg-icon icon-class="question" slot="reference" />
-            </el-popover>
-          </el-form-item>
-          <el-form-item label="到期时间" prop="expireTime">
-            <el-date-picker style="width: 100%;" v-model="step1Form.expireTime" type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="辅材配件权限" prop="moduleMaterialPart">
-            <el-switch v-model="step1Form.moduleMaterialPart" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
-          <el-form-item label="延保权限" prop="moduleYb">
-            <el-switch v-model="step1Form.moduleYb" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
-          <el-form-item label="工程维保权限" prop="moduleWb">
-            <el-switch v-model="step1Form.moduleWb" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
-          <el-form-item label="是否允许到店支付" prop="storePay">
-            <el-switch v-model="step1Form.storePay" active-color="#13ce66" inactive-color="#ff4949">
-            </el-switch>
-          </el-form-item>
+        <div slot="header" class="clearfix">
+          <span>商户信息  <span style="font-size: 12px;margin-left: 10px;">说明：开通商户账号是指开通商城后台管理系统的总登录账号。</span></span>
+        </div>
+        <el-form class="my-form" ref="step1Form" :model="step1Form" :rules="step1FormRules" label-width="140px" size="mini">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="商户账号" prop="account">
+                <el-input v-model="step1Form.account" autocomplete="off" placeholder="请输入商户账号"></el-input>
+                <el-popover class="question" placement="right-start" title="账号设置" width="260" trigger="hover"
+                  content="账号设置需按数字、字母组合设置至少12位账号">
+                  <svg-icon icon-class="question" slot="reference" />
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="账户昵称" prop="nickName">
+                <el-input v-model="step1Form.nickName" autocomplete="off" placeholder="请输入账户昵称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序名称" prop="appName">
+                <el-input v-model="step1Form.appName" autocomplete="off" placeholder="请输入小程序名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人" prop="chargePerson">
+                <el-input v-model="step1Form.chargePerson" autocomplete="off" placeholder="请输入负责人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="phone">
+                <el-input v-model="step1Form.phone" autocomplete="off" placeholder="请输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电子邮箱" prop="email">
+                <el-input v-model="step1Form.email" autocomplete="off" placeholder="请输入电子邮箱"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="地址" prop="address">
+                <div style="display:flex;">
+                  <el-input placeholder="请选择地址" autocomplete="off" readonly style="margin-right: 20px;"
+                    v-model="step1Form.address"></el-input>
+                  <geographicalPosi :formData="step1Form" @selectPosi="selectAddress"></geographicalPosi>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="登录密码" prop="newPassword">
+                <el-input v-model="step1Form.newPassword" ref="password1" autocomplete="off" placeholder="请输入登录密码"
+                  :type="passwordType1"></el-input>
+                <span class="show-pwd" @click="showPwd(1)">
+                  <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
+                </span>
+                <el-popover class="question" placement="right-start" title="密码设置" width="260" trigger="hover"
+                  content="密码设置需按数字、字母组合设置至少12位密码">
+                  <svg-icon icon-class="question" slot="reference" />
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="确认密码" prop="confirmPassword">
+                <el-input v-model="step1Form.confirmPassword" ref="password2" autocomplete="off" placeholder="请再次输入密码"
+                  :type="passwordType2"></el-input>
+                <span class="show-pwd" @click="showPwd(2)">
+                  <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
+                </span>
+                <el-popover class="question" placement="right-start" title="密码设置" width="260" trigger="hover"
+                  content="确认密码需要和登录密码保持一致">
+                  <svg-icon icon-class="question" slot="reference" />
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="到期时间" prop="expireTime">
+                <el-date-picker style="width: 100%;" v-model="step1Form.expireTime" type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅材配件权限" prop="moduleMaterialPart">
+                <el-switch v-model="step1Form.moduleMaterialPart" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="延保权限" prop="moduleYb">
+                <el-switch v-model="step1Form.moduleYb" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工程维保权限" prop="moduleWb">
+                <el-switch v-model="step1Form.moduleWb" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="商品出入库" prop="joinCode">
+                <el-switch v-model="step1Form.joinCode" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="租聘业务" prop="moduleZl">
+                <el-switch v-model="step1Form.moduleZl" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="二手商城" prop="moduleEs">
+                <el-switch v-model="step1Form.moduleEs" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否允许到店支付" prop="storePay">
+                <el-switch v-model="step1Form.storePay" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-card>
     </div>
@@ -217,99 +266,91 @@
     <div v-show="step == 3">
       <div class="setting_title">微信配置</div>
       <el-divider></el-divider>
-      <!-- <div class="tips">说明：企微配置是指通过配置企业微信将企微用户和系统打通，实现企业微信用户信息同平台互通，聊天会话信息同步</div> -->
-      <div class="tips" style="margin-top: 20px">商户名称：{{ step1Form.nickName }}</div>
-
-      <el-form class="my-form2" ref="step3Form" :model="step3Form" :rules="step3FormRules" label-width="200px"
-        label-position="right">
-        <!-- <el-card shadow="never" class="my-card">
-          <div class="title">1.配置企业ID</div>
-          <div class="box">指引：进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【我的企业】，将企业ID分别复制并填写到下方输入框中</div>
-          <el-form-item label="企业ID" prop="enterpriseId">
-            <el-input v-model="step3Form.enterpriseId" autocomplete="off" placeholder="请输入企业ID"></el-input>
-          </el-form-item>
-        </el-card>
-
-        <el-card shadow="never" class="my-card">
-          <div class="title">2.配置通讯录密钥（Secret）</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【客户联系】-选择【客户】-展开右侧【API】。将外部联系人Secret复制并填写到下方输入框中。如果外部联系人Secret不更新，请将更新后的外部联系人Secret更新复制更新到下方输入框中。</div>
-          <el-form-item label="通讯录密钥（Secret）" prop="listSecret">
-            <el-input v-model="step3Form.listSecret" autocomplete="off" placeholder="请输入通讯录密钥（Secret）"></el-input>
-          </el-form-item>
-          <el-divider></el-divider>
-          <div class="title">配置通讯录同步密钥（Secret）</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【管理工具】-选择【通讯录同步】-获取通讯录同步Secret。将通讯录同步Secret复制并填写到下方输入框中。如果通讯录同步Secret不更新，请将更新后的通讯录同步Secret更新复制更新到下方输入框中。</div>
-          <el-form-item label="通讯录同步密钥（Secret）" prop="listSyncSecret">
-            <el-input v-model="step3Form.listSyncSecret" autocomplete="off" placeholder="请输入通讯录同步密钥（Secret）"></el-input>
-          </el-form-item>
-        </el-card>
-
-        <el-card shadow="never" class="my-card">
-          <div class="title">3.配置小程序</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【应用管理】-选择【应用】-选择【小程序】-获取小程序AgentiD、小程序Secret。将小程序AgentiD、小程序Secret复制并填写到下方输入框中。</div>
-          <el-form-item label="小程序（AgentiD）" prop="appAgentId">
-            <el-input v-model="step3Form.appAgentId" autocomplete="off" placeholder="请输入小程序（AgentiD）"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序（Secret）" prop="appSecret">
-            <el-input v-model="step3Form.appSecret" autocomplete="off" placeholder="请输入小程序（Secret）"></el-input>
-          </el-form-item>
-        </el-card> -->
-
-        <el-card shadow="never" class="my-card">
-          <div class="title" style="margin-bottom: 20px;">1.其他基础配置</div>
-          <el-form-item label="服务商appId" prop="appId">
-            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
-          </el-form-item>
-          <el-form-item label="服务商商户号" prop="merchantId">
-            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
-          </el-form-item>
-          <el-form-item label="服务商商户密钥" prop="merchantKey">
-            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序appid" prop="appletAppid">
-            <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序密钥" prop="appletSecret">
-            <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
-          </el-form-item>
-          <el-form-item label="子商户号Id" prop="childMerchantId">
-            <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
-          </el-form-item>
-          <el-form-item label="微信订阅模版" prop="templateId">
-            <el-input v-model="step3Form.templateId" autocomplete="off" placeholder="请输入微信订阅模版"></el-input>
-          </el-form-item>
-          <el-form-item label="公众号appid" prop="pubAppId">
-            <el-input v-model="step3Form.pubAppId" autocomplete="off" placeholder="请输入公众号appid"></el-input>
-          </el-form-item>
-          <el-form-item label="公众号密钥" prop="pubAppSecret">
-            <el-input v-model="step3Form.pubAppSecret" autocomplete="off" placeholder="请输入公众号密钥"></el-input>
-          </el-form-item>
-
-
-
-          <el-form-item label="改派通知" prop="pubTemplateId1">
-            <el-input v-model="step3Form.pubTemplateId1" autocomplete="off" placeholder="请输入工单派工，改派通知"></el-input>
-          </el-form-item>
-          <el-form-item label="发货通知" prop="pubTemplateId2">
-            <el-input v-model="step3Form.pubTemplateId2" autocomplete="off" placeholder="请输入商城订单支付成功提醒发货通知"></el-input>
-          </el-form-item>
-          <el-form-item label="维权订单提醒" prop="pubTemplateId3">
-            <el-input v-model="step3Form.pubTemplateId3" autocomplete="off" placeholder="请输入商城维权订单提醒"></el-input>
-          </el-form-item>
-          <el-form-item label="支付成功通知" prop="pubTemplateId4">
-            <el-input v-model="step3Form.pubTemplateId4" autocomplete="off" placeholder="请输入订单支付成功（含全部销售订单和延保）"></el-input>
-          </el-form-item>
-          <el-form-item label="维保费用申请" prop="pubTemplateId5">
-            <el-input v-model="step3Form.pubTemplateId5" autocomplete="off" placeholder="请输入维保的费用申请"></el-input>
-          </el-form-item>
-          <el-form-item label="安维费用发放通知" prop="pubTemplateId6">
-            <el-input v-model="step3Form.pubTemplateId6" autocomplete="off" placeholder="请输入安维费用发放通知"></el-input>
-          </el-form-item>
-
-
-
-        </el-card>
-      </el-form>
+      <!-- <div class="tips" style="margin-top: 20px">商户名称：{{ step1Form.nickName }}</div> -->
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>商户名称：{{ step1Form.nickName }}</span>
+        </div>
+        <el-form class="my-form2" ref="step3Form" :model="step3Form" :rules="step3FormRules" label-width="130px" size="mini">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="服务商appId" prop="appId">
+                <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="服务商商户号" prop="merchantId">
+                <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="服务商商户密钥" prop="merchantKey">
+                <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序appid" prop="appletAppid">
+                <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序密钥" prop="appletSecret">
+                <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="子商户号Id" prop="childMerchantId">
+                <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="微信订阅模版" prop="templateId">
+                <el-input v-model="step3Form.templateId" autocomplete="off" placeholder="请输入微信订阅模版"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公众号appid" prop="pubAppId">
+                <el-input v-model="step3Form.pubAppId" autocomplete="off" placeholder="请输入公众号appid"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公众号密钥" prop="pubAppSecret">
+                <el-input v-model="step3Form.pubAppSecret" autocomplete="off" placeholder="请输入公众号密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="改派通知" prop="pubTemplateId1">
+                <el-input v-model="step3Form.pubTemplateId1" autocomplete="off" placeholder="请输入工单派工，改派通知"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发货通知" prop="pubTemplateId2">
+                <el-input v-model="step3Form.pubTemplateId2" autocomplete="off" placeholder="请输入商城订单支付成功提醒发货通知"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="维权订单提醒" prop="pubTemplateId3">
+                <el-input v-model="step3Form.pubTemplateId3" autocomplete="off" placeholder="请输入商城维权订单提醒"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="支付成功通知" prop="pubTemplateId4">
+                <el-input v-model="step3Form.pubTemplateId4" autocomplete="off" placeholder="请输入订单支付成功（含全部销售订单和延保）"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="维保费用申请" prop="pubTemplateId5">
+                <el-input v-model="step3Form.pubTemplateId5" autocomplete="off" placeholder="请输入维保的费用申请"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="安维费用发放通知" prop="pubTemplateId6">
+                <el-input v-model="step3Form.pubTemplateId6" autocomplete="off" placeholder="请输入安维费用发放通知"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
     </div>
 
     <div class="page-footer">
@@ -456,21 +497,6 @@ export default {
         pubTemplateId6:'',
       },
       step3FormRules: {
-        enterpriseId: [
-          // { required: true, message: '请输入企业ID', trigger: 'blur' }
-        ],
-        listSecret: [
-          // { required: true, message: '请输入通讯录密钥（Secret）', trigger: 'blur' }
-        ],
-        listSyncSecret: [
-          // { required: true, message: '请输入通讯录同步密钥（Secret）', trigger: 'blur' }
-        ],
-        appAgentId: [
-          // { required: true, message: '请输入小程序（AgentiD）', trigger: 'blur' }
-        ],
-        appSecret: [
-          // { required: true, message: '请输入小程序（Secret）', trigger: 'blur' }
-        ],
       },
       formLoading: false,
     }
@@ -679,7 +705,7 @@ export default {
 }
 
 .my-form {
-  width: 450px;
+  width: 100%;
   margin: 0 auto;
 }
 
@@ -703,7 +729,7 @@ export default {
 
 .my-form2 {
   ::v-deep input {
-    width: 400px;
+    // width: 400px;
   }
 }
 

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -10,61 +10,111 @@
     </el-tabs>
 
     <div v-show="step == 'first'">
-      <el-form class="my-form" ref="step1Form" :model="step1Form" label-width="130px" label-position="right">
-        <el-form-item label="商户账号" prop="account">
-          <el-input v-model="step1Form.account" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="账户昵称" prop="nickName">
-          <el-input v-model="step1Form.nickName" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="小程序名称" prop="appName">
-          <el-input v-model="step1Form.appName" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="负责人" prop="chargePerson">
-          <el-input v-model="step1Form.chargePerson" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="step1Form.phone" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="电子邮箱" prop="email">
-          <el-input v-model="step1Form.email" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="step1Form.address" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="登录密码" prop="password">
-          <el-input v-model="step1Form.password" type="password" disabled></el-input>
-          <el-button class="reset" @click="handleReset()">重置密码</el-button>
-        </el-form-item>
-        <el-form-item label="到期时间" prop="companyExpireTime">
-          <el-date-picker v-model="step1Form.companyExpireTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择日期时间">
-          </el-date-picker>
-          <el-button type="primary" @click="saveTime()">保存</el-button>
-        </el-form-item>
-		<el-form-item label="打印单名称" prop="billTitle">
-		  <el-input v-model="step1Form.billTitle" placeholder="请输入"></el-input>
-		</el-form-item>
-        <el-form-item label="辅材配件权限" prop="moduleMaterialPart">
-          <el-switch v-model="step1Form.moduleMaterialPart" active-color="#13ce66" inactive-color="#ff4949">
-          </el-switch>
-        </el-form-item>
-        <el-form-item label="延保权限" prop="moduleYb">
-          <el-switch v-model="step1Form.moduleYb" active-color="#13ce66" inactive-color="#ff4949">
-          </el-switch>
-        </el-form-item>
-        <el-form-item label="工程维保权限" prop="moduleWb">
-          <el-switch v-model="step1Form.moduleWb" active-color="#13ce66" inactive-color="#ff4949">
-          </el-switch>
-        </el-form-item>
-        <el-form-item label="是否允许到店支付" prop="storePay">
-          <el-switch v-model="step1Form.storePay" active-color="#13ce66" inactive-color="#ff4949">
-          </el-switch>
-        </el-form-item>
-        <!-- <el-form-item class="tr">
-          <el-button type="primary" @click="submitStep1Form">保存</el-button>
-        </el-form-item> -->
-      </el-form>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>商户信息</span>
+        </div>
+        <el-form class="my-form" ref="step1Form" :model="step1Form" label-width="130px" label-position="right" size="mini">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="商户账号" prop="account">
+                <el-input v-model="step1Form.account" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="账户昵称" prop="nickName">
+                <el-input v-model="step1Form.nickName" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序名称" prop="appName">
+                <el-input v-model="step1Form.appName" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人" prop="chargePerson">
+                <el-input v-model="step1Form.chargePerson" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="phone">
+                <el-input v-model="step1Form.phone" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电子邮箱" prop="email">
+                <el-input v-model="step1Form.email" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="地址" prop="address">
+                <el-input v-model="step1Form.address" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="登录密码" prop="password">
+                <el-input v-model="step1Form.password" type="password" disabled></el-input>
+                <el-button class="reset" @click="handleReset()">重置密码</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="打印单名称" prop="billTitle">
+                <el-input v-model="step1Form.billTitle" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="到期时间" prop="companyExpireTime">
+                <el-date-picker v-model="step1Form.companyExpireTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期时间">
+                </el-date-picker>
+                <el-button type="primary" @click="saveTime()">保存</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅材配件权限" prop="moduleMaterialPart">
+                <el-switch v-model="step1Form.moduleMaterialPart" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="延保权限" prop="moduleYb">
+                <el-switch v-model="step1Form.moduleYb" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工程维保权限" prop="moduleWb">
+                <el-switch v-model="step1Form.moduleWb" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="商品出入库" prop="joinCode">
+                <el-switch v-model="step1Form.joinCode" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="租聘业务" prop="moduleZl">
+                <el-switch v-model="step1Form.moduleZl" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="二手商城" prop="moduleEs">
+                <el-switch v-model="step1Form.moduleEs" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否允许到店支付" prop="storePay">
+                <el-switch v-model="step1Form.storePay" active-color="#13ce66" inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
     </div>
 
     <div v-show="step == 'second'">
@@ -154,98 +204,90 @@
     </div>
 
     <div v-show="step == 'third'">
-      <!-- <div class="tips">说明：企微配置是指通过配置企业微信将企微用户和系统打通，实现企业微信用户信息同平台互通，聊天会话信息同步</div> -->
-
-      <el-form class="my-form2" ref="step3Form" :model="step3Form" :rules="step3FormRules" label-width="200px"
-        label-position="right">
-        <!-- <el-card shadow="never" class="my-card">
-          <div class="title">1.配置企业ID</div>
-          <div class="box">指引：进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【我的企业】，将企业ID分别复制并填写到下方输入框中</div>
-          <el-form-item label="企业ID" prop="enterpriseId">
-            <el-input v-model="step3Form.enterpriseId" autocomplete="off" placeholder="请输入企业ID"></el-input>
-          </el-form-item>
-        </el-card>
-
-        <el-card shadow="never" class="my-card">
-          <div class="title">2.配置通讯录密钥（Secret）</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【客户联系】-选择【客户】-展开右侧【API】。将外部联系人Secret复制并填写到下方输入框中。如果外部联系人Secret不更新，请将更新后的外部联系人Secret更新复制更新到下方输入框中。</div>
-          <el-form-item label="通讯录密钥（Secret）" prop="listSecret">
-            <el-input v-model="step3Form.listSecret" autocomplete="off" placeholder="请输入通讯录密钥（Secret）"></el-input>
-          </el-form-item>
-          <el-divider></el-divider>
-          <div class="title">配置通讯录同步密钥（Secret）</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【管理工具】-选择【通讯录同步】-获取通讯录同步Secret。将通讯录同步Secret复制并填写到下方输入框中。如果通讯录同步Secret不更新，请将更新后的通讯录同步Secret更新复制更新到下方输入框中。</div>
-          <el-form-item label="通讯录同步密钥（Secret）" prop="listSyncSecret">
-            <el-input v-model="step3Form.listSyncSecret" autocomplete="off" placeholder="请输入通讯录同步密钥（Secret）"></el-input>
-          </el-form-item>
-        </el-card>
-
-        <el-card shadow="never" class="my-card">
-          <div class="title">3.配置小程序</div>
-          <div class="box">进入<el-link type="primary" :underline="false" href="https://element.eleme.io" target="_blank">企业微信</el-link>打开【应用管理】-选择【应用】-选择【小程序】-获取小程序AgentiD、小程序Secret。将小程序AgentiD、小程序Secret复制并填写到下方输入框中。</div>
-          <el-form-item label="小程序（AgentiD）" prop="appAgentId">
-            <el-input v-model="step3Form.appAgentId" autocomplete="off" placeholder="请输入小程序（AgentiD）"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序（Secret）" prop="appSecret">
-            <el-input v-model="step3Form.appSecret" autocomplete="off" placeholder="请输入小程序（Secret）"></el-input>
-          </el-form-item>
-        </el-card> -->
-
-        <el-card shadow="never" class="my-card">
-          <div class="title" style="margin-bottom: 20px;">1.其他基础配置</div>
-          <el-form-item label="服务商appId" prop="appId">
-            <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
-          </el-form-item>
-          <el-form-item label="服务商商户号" prop="merchantId">
-            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
-          </el-form-item>
-          <el-form-item label="服务商商户密钥" prop="merchantKey">
-            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序appid" prop="appletAppid">
-            <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
-          </el-form-item>
-          <el-form-item label="小程序密钥" prop="appletSecret">
-            <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
-          </el-form-item>
-          <el-form-item label="子商户号Id" prop="childMerchantId">
-            <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
-          </el-form-item>
-          <el-form-item label="微信订阅模版" prop="templateId">
-            <el-input v-model="step3Form.templateId" autocomplete="off" placeholder="请输入微信订阅模版"></el-input>
-          </el-form-item>
-
-
-
-          <el-form-item label="公众号appid" prop="pubAppId">
-            <el-input v-model="step3Form.pubAppId" autocomplete="off" placeholder="请输入公众号appid"></el-input>
-          </el-form-item>
-          <el-form-item label="公众号密钥" prop="pubAppSecret">
-            <el-input v-model="step3Form.pubAppSecret" autocomplete="off" placeholder="请输入公众号密钥"></el-input>
-          </el-form-item>
-
-          <el-form-item label="改派通知" prop="pubTemplateId1">
-            <el-input v-model="step3Form.pubTemplateId1" autocomplete="off" placeholder="请输入工单派工，改派通知"></el-input>
-          </el-form-item>
-          <el-form-item label="发货通知" prop="pubTemplateId2">
-            <el-input v-model="step3Form.pubTemplateId2" autocomplete="off" placeholder="请输入商城订单支付成功提醒发货通知"></el-input>
-          </el-form-item>
-          <el-form-item label="维权订单提醒" prop="pubTemplateId3">
-            <el-input v-model="step3Form.pubTemplateId3" autocomplete="off" placeholder="请输入商城维权订单提醒"></el-input>
-          </el-form-item>
-          <el-form-item label="支付成功通知" prop="pubTemplateId4">
-            <el-input v-model="step3Form.pubTemplateId4" autocomplete="off" placeholder="请输入订单支付成功（含全部销售订单和延保）"></el-input>
-          </el-form-item>
-          <el-form-item label="维保费用申请" prop="pubTemplateId5">
-            <el-input v-model="step3Form.pubTemplateId5" autocomplete="off" placeholder="请输入维保的费用申请"></el-input>
-          </el-form-item>
-          <el-form-item label="安维费用发放通知" prop="pubTemplateId6">
-            <el-input v-model="step3Form.pubTemplateId6" autocomplete="off" placeholder="请输入安维费用发放通知"></el-input>
-          </el-form-item>
-
-
-        </el-card>
-      </el-form>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>微信配置信息</span>
+        </div>
+        <el-form class="my-form2" ref="step3Form" :model="step3Form" :rules="step3FormRules" label-width="130px" size="mini">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="服务商appId" prop="appId">
+                <el-input v-model="step3Form.appId" autocomplete="off" placeholder="请输入服务商appId"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="服务商商户号" prop="merchantId">
+                <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入服务商商户号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="服务商商户密钥" prop="merchantKey">
+                <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入服务商商户密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序appid" prop="appletAppid">
+                <el-input v-model="step3Form.appletAppid" autocomplete="off" placeholder="请输入小程序appid"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="小程序密钥" prop="appletSecret">
+                <el-input v-model="step3Form.appletSecret" autocomplete="off" placeholder="请输入小程序密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="子商户号Id" prop="childMerchantId">
+                <el-input v-model="step3Form.childMerchantId" autocomplete="off" placeholder="请输入子商户号Id"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="微信订阅模版" prop="templateId">
+                <el-input v-model="step3Form.templateId" autocomplete="off" placeholder="请输入微信订阅模版"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公众号appid" prop="pubAppId">
+                <el-input v-model="step3Form.pubAppId" autocomplete="off" placeholder="请输入公众号appid"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="公众号密钥" prop="pubAppSecret">
+                <el-input v-model="step3Form.pubAppSecret" autocomplete="off" placeholder="请输入公众号密钥"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="改派通知" prop="pubTemplateId1">
+                <el-input v-model="step3Form.pubTemplateId1" autocomplete="off" placeholder="请输入工单派工，改派通知"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发货通知" prop="pubTemplateId2">
+                <el-input v-model="step3Form.pubTemplateId2" autocomplete="off" placeholder="请输入商城订单支付成功提醒发货通知"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="维权订单提醒" prop="pubTemplateId3">
+                <el-input v-model="step3Form.pubTemplateId3" autocomplete="off" placeholder="请输入商城维权订单提醒"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="支付成功通知" prop="pubTemplateId4">
+                <el-input v-model="step3Form.pubTemplateId4" autocomplete="off" placeholder="请输入订单支付成功（含全部销售订单和延保）"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="维保费用申请" prop="pubTemplateId5">
+                <el-input v-model="step3Form.pubTemplateId5" autocomplete="off" placeholder="请输入维保的费用申请"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="安维费用发放通知" prop="pubTemplateId6">
+                <el-input v-model="step3Form.pubTemplateId6" autocomplete="off" placeholder="请输入安维费用发放通知"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
     </div>
 
     <div v-show="step == 'four'">
@@ -429,6 +471,9 @@ export default {
 				billTitle: '',
         moduleYb: '',
         moduleWb: '',
+        joinCode:'',
+        moduleZl:'',
+        moduleEs:'',
         storePay: '',
       },
 
@@ -487,21 +532,7 @@ export default {
         pubTemplateId6:'',
       },
       step3FormRules: {
-        enterpriseId: [
-          // { required: true, message: '请输入企业ID', trigger: 'blur' }
-        ],
-        listSecret: [
-          // { required: true, message: '请输入通讯录密钥（Secret）', trigger: 'blur' }
-        ],
-        listSyncSecret: [
-          // { required: true, message: '请输入通讯录同步密钥（Secret）', trigger: 'blur' }
-        ],
-        appAgentId: [
-          // { required: true, message: '请输入小程序（AgentiD）', trigger: 'blur' }
-        ],
-        appSecret: [
-          // { required: true, message: '请输入小程序（Secret）', trigger: 'blur' }
-        ],
+       
       },
       step4Form: {
         dayNum: '',
@@ -564,6 +595,9 @@ export default {
 				this.step1Form.billTitle = res.data.billTitle
         this.step1Form.moduleYb = res.data.moduleYb
         this.step1Form.moduleWb = res.data.moduleWb
+        this.step1Form.joinCode = res.data.joinCode
+        this.step1Form.moduleZl = res.data.moduleZl
+        this.step1Form.moduleEs = res.data.moduleEs
         this.step1Form.storePay = res.data.storePay
 
         this.img1_url = res.data.minLogo1;
@@ -706,6 +740,9 @@ export default {
 				billTitle: this.step1Form.billTitle,
         moduleYb: this.step1Form.moduleYb,
         moduleWb: this.step1Form.moduleWb,
+        joinCode: this.step1Form.joinCode,
+        moduleZl: this.step1Form.moduleZl,
+        moduleEs: this.step1Form.moduleEs,
         storePay: this.step1Form.storePay,
       }
       editAccount(params).then(res => {
@@ -868,7 +905,7 @@ export default {
 }
 
 .my-form {
-  width: 450px;
+  width: 100%;
   margin-top: 20px;
 }
 
@@ -898,7 +935,7 @@ export default {
 
 .my-form2 {
   ::v-deep input {
-    width: 400px;
+    // width: 400px;
   }
 }