Merge remote-tracking branch 'origin/develop' into develop

src/permission.js

@@ -154,6 +154,20 @@ function buildRootRoute(route) {
       }
     )
   }
+  if (code == 'merchant') {
+    let children = route.children;
+    route.children.push(
+      {
+        'code': "merchant_detail",
+        'moduleName': "商户详情",
+        'type': 2,
+        'url': '/merchant_detail',
+        'children': children,
+        'hidden': true
+      }
+    )
+    item.alwaysShow = false;
+  }
   if (code == 'msg') {
     let children = route.children;
     route.children = [];

src/views/merchant/create_account.vue

@@ -6,9 +6,9 @@
       <div class="tips">说明：开通商户账号是指开通商城后台管理系统的总登录账号。</div>
 
       <el-card shadow="never" class="my-card">
-        <el-form class="my-form" ref="step1Form" :model="step1Form" :rules="step1FormRules" label-width="100px" label-position="right">
+        <el-form class="my-form" ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="120px" label-position="right">
           <el-form-item label="商户账号" prop="account">
-            <el-input v-model="step1Form.account" autocomplete="off" placeholder="请输入商户账号"></el-input>
+            <el-input v-model="mainForm.account" autocomplete="off" placeholder="请输入商户账号"></el-input>
             <el-popover
               class="question"
               placement="right-start"
@@ -20,25 +20,28 @@
             </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-input v-model="mainForm.nickName" 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-input v-model="mainForm.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-input v-model="mainForm.phone" autocomplete="off" placeholder="请输入联系电话"></el-input>
+          </el-form-item>
+          <el-form-item label="金蝶主体账号" prop="kingdeeId">
+            <el-input v-model="mainForm.kingdeeId" autocomplete="off" placeholder="请输入金蝶主体账号"></el-input>
+          </el-form-item>
+          <el-form-item label="金蝶主体名称" prop="kingdeeName">
+            <el-input v-model="mainForm.kingdeeName" 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-input v-model="mainForm.email" autocomplete="off" placeholder="请输入电子邮箱"></el-input>
           </el-form-item>
           <el-form-item label="地址" prop="address">
-            <el-input v-model="step1Form.address" autocomplete="off" placeholder="请输入地址"></el-input>
+            <el-input v-model="mainForm.address" placeholder="请输入地址"></el-input>
           </el-form-item>
           <el-form-item label="登录密码" prop="newPassword">
-            <el-input v-model="step1Form.newPassword" ref="password1" autocomplete="off" placeholder="请输入登录密码" :type="passwordType1"></el-input>
+            <el-input v-model="mainForm.newPassword" ref="password1" auto-complete="new-password" placeholder="请输入登录密码" :type="passwordType1"></el-input>
             <span class="show-pwd" @click="showPwd(1)">
               <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
             </span>
@@ -53,7 +56,7 @@
             </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>
+            <el-input v-model="mainForm.confirmPassword" ref="password2" auto-complete="confirm-password" placeholder="请再次输入密码" :type="passwordType2"></el-input>
             <span class="show-pwd" @click="showPwd(2)">
               <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
             </span>
@@ -112,8 +115,8 @@ export default {
       } else if (/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value) == false) {
         callback(new Error('密码必须包含数字和字母'));
       } else {
-        if (this.step1Form.confirmPassword !== '') {
-          this.$refs.step1Form.validateField('confirmPassword');
+        if (this.mainForm.confirmPassword !== '') {
+          this.$refs.mainForm.validateField('confirmPassword');
         }
         callback();
       }
@@ -121,7 +124,7 @@ export default {
     var validatePass4 = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请再次输入密码'));
-      } else if (value !== this.step1Form.newPassword) {
+      } else if (value !== this.mainForm.newPassword) {
         callback(new Error('两次输入密码不一致'));
       } else {
         callback();
@@ -131,18 +134,20 @@ export default {
       baseURL: process.env.VUE_APP_BASE_API,
       myHeaders: {'x-token': getToken()},
       step: 1,
-      step1Form: {
+      mainForm: {
         account: '', // 账号
         nickName: '', // 用户名
         appName: '', // 小程序名称
         chargePerson: '', // 负责人
         phone: '', // 联系电话
+        kingdeeId: '',
+        kingdeeName: '',
         email: '', // 电子邮箱
         address: '', // 地址
         newPassword: '', // 登录密码
         confirmPassword: '', // 确认密码
       },
-      step1FormRules: {
+      mainFormRules: {
         account: [
           { required: true, validator: validateAccount, trigger: 'blur' }
         ],
@@ -158,6 +163,12 @@ export default {
         phone: [
           { required: true, message: '请输入联系电话', trigger: 'blur' }
         ],
+        kingdeeId: [
+          { required: true, message: '请输入金蝶主体账号', trigger: 'blur' }
+        ],
+        kingdeeName: [
+          { required: true, message: '请输入金蝶主体密码', trigger: 'blur' }
+        ],
         newPassword: [
           { required: true, validator: validatePass3, trigger: 'blur' }
         ],
@@ -213,7 +224,7 @@ export default {
 
     // 点击 提交表单
     clickSubmitForm() {
-      this.$refs.step1Form.validate((valid) => {
+      this.$refs.mainForm.validate((valid) => {
         if (valid) {
           this.submitForm();
         }
@@ -224,20 +235,23 @@ export default {
     submitForm() {
       this.formLoading = true;
       let params = {
-        type: 1,
-        userName: this.step1Form.account,
-        nickName: this.step1Form.nickName,
-        minAppName: this.step1Form.appName,
-        linkName: this.step1Form.chargePerson,
-        linkPhone: this.step1Form.phone,
-        email: this.step1Form.email,
-        address: this.step1Form.address,
-        password: this.step1Form.confirmPassword,
+        adminCompanyName: this.mainForm.nickName,
+        useOrgNumber: this.mainForm.kingdeeId,
+        useOrgName: this.mainForm.kingdeeName,
+        adminUser: {
+          userName: this.mainForm.account,
+          adminCompanyName: this.mainForm.nickName,
+          linkName: this.mainForm.chargePerson,
+          linkPhone: this.mainForm.phone,
+          email: this.mainForm.email,
+          address: this.mainForm.address,
+          password: this.mainForm.confirmPassword,
+        },
       }
       addAccount(params).then(res => {
         this.$successMsg('开通成功');
         setTimeout(() => {
-          this.goBack();
+          this.$refs.mainForm.resetFields();
         }, 1500)
       }).finally(res => {
         this.formLoading = false;
@@ -287,91 +301,4 @@ export default {
     cursor: pointer;
     user-select: none;
   }
-  .my-form2 {
-    ::v-deep input {
-      width: 400px;
-    }
-  }
-  .tips {
-    margin-top: 10px;
-    span {
-      display: inline-block;
-      width: 300px;
-      text-align: center;
-      line-height: 32px;
-      background: #ffefef;
-      font-size: 14px;
-      color: #f66460;
-    }
-  }
-  .images {
-    display: flex;
-    flex-wrap: wrap;
-    .main-img {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      width: 120px;
-      margin-right: 20px;
-      .img {
-        border: 1px dashed #eaeaea;
-        border-radius: 5px;
-        overflow: hidden;
-        position: relative;
-        .el-image {
-          display: block;
-        }
-        .mask {
-          position: absolute;
-          left: 0;
-          top: 0;
-          width: 120px;
-          height: 120px;
-          background: rgba($color: #000000, $alpha: 0.3);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          i {
-            font-size: 20px;
-            color: #ffffff;
-            cursor: pointer;
-            margin: 0 8px;
-          }
-        }
-      }
-      .text {
-        font-size: 14px;
-        color: #666666;
-      }
-    }
-    .add {
-      width: 120px;
-      height: 120px;
-      border: 1px dashed #eaeaea;
-      border-radius: 5px;
-      cursor: pointer;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      i {
-        font-size: 30px;
-        color: #999;
-      }
-    }
-    .tmp-img {
-      position: relative;
-      .tmp {
-        position: absolute;
-        left: 0;
-        top: 0;
-        line-height: 20px;
-        padding: 0 8px;
-        background: #f66460;
-        border-radius: 0 0 10px 0;
-        font-size: 12px;
-        color: #ffffff;
-      }
-    }
-  }
 </style>

src/views/merchant/merchant_detail.vue

@@ -1,195 +1,41 @@
 <template>
   <div class="app-container">
-
-    <el-tabs v-model="step">
-      <el-tab-pane label="商户信息" name="first"></el-tab-pane>
-      <el-tab-pane label="商城配置信息" name="second"></el-tab-pane>
-      <el-tab-pane label="企微配置信息" name="third"></el-tab-pane>
-    </el-tabs>
-
-    <div v-show="step == 'first'">
-      <el-form class="my-form" ref="step1Form" :model="step1Form" label-width="100px" label-position="right">
+    <div>
+      <el-form class="my-form" ref="mainForm" :model="mainForm" label-width="100px" label-position="right">
         <el-form-item label="商户账号" prop="account">
-          <el-input v-model="step1Form.account" disabled></el-input>
+          <el-input v-model="mainForm.account" disabled></el-input>
         </el-form-item>
         <el-form-item label="账户昵称" prop="nickName">
-          <el-input v-model="step1Form.nickName" disabled></el-input>
+          <el-input v-model="mainForm.nickName" disabled></el-input>
         </el-form-item>
         <el-form-item label="小程序名称" prop="appName">
-          <el-input v-model="step1Form.appName" disabled></el-input>
+          <el-input v-model="mainForm.appName" disabled></el-input>
         </el-form-item>
         <el-form-item label="负责人" prop="chargePerson">
-          <el-input v-model="step1Form.chargePerson" disabled></el-input>
+          <el-input v-model="mainForm.chargePerson" disabled></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="step1Form.phone" disabled></el-input>
+          <el-input v-model="mainForm.phone" disabled></el-input>
         </el-form-item>
         <el-form-item label="电子邮箱" prop="email">
-          <el-input v-model="step1Form.email" disabled></el-input>
+          <el-input v-model="mainForm.email" disabled></el-input>
         </el-form-item>
         <el-form-item label="地址" prop="address">
-          <el-input v-model="step1Form.address" disabled></el-input>
+          <el-input v-model="mainForm.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-input v-model="mainForm.password" type="password" disabled></el-input>
           <el-button class="reset" @click="handleReset()">重置密码</el-button>
         </el-form-item>
         <!-- <el-form-item class="tr">
-          <el-button type="primary" @click="submitStep1Form">保存</el-button>
+          <el-button type="primary" @click="submitmainForm">保存</el-button>
         </el-form-item> -->
       </el-form>
     </div>
 
-    <div v-show="step == 'second'">
-      <el-form label-width="100px" label-position="right">
-        <el-upload
-          class="avatar-uploader"
-          :action="baseURL + 'common/upload'"
-          :headers="myHeaders"
-          :show-file-list="false"
-          :on-success="uploadSuccess"
-          :before-upload="beforeUpload">
-        </el-upload>
-        <el-form-item label="主logo" prop="imgUrl">
-          <div class="images">
-            <div class="main-img">
-              <div class="img" v-if="img1_url" @mouseover="img1_hover = true;" @mouseout="img1_hover = false;">
-                <el-image ref="img1" :src="img1_url" :preview-src-list="[img1_url]" style="width: 120px; height: 120px" fit="contain"></el-image>
-                <div class="mask" v-show="img1_hover">
-                  <i class="el-icon-zoom-in" @click="previewImage('img1')"></i>
-                  <i class="el-icon-upload2" @click="uploadImage('img1')"></i>
-                </div>
-              </div>
-              <div class="add" v-else @click="uploadImage('img1')">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-              </div>
-            </div>
-            <div class="tmp-img">
-              <el-image :src="require('@/assets/template/template_1.png')" :preview-src-list="[require('@/assets/template/template_1.png')]" style="width: 120px; height: 120px; display: block" fit="contain"></el-image>
-              <div class="tmp">示例图</div>
-            </div>
-          </div>
-          <div class="tips">
-            <span>建议尺寸：400*400</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="通用logo" prop="imgUrl">
-          <div class="images">
-            <div class="main-img">
-              <div class="img" v-if="img2_url" @mouseover="img2_hover = true;" @mouseout="img2_hover = false;">
-                <el-image ref="img2" :src="img2_url" :preview-src-list="[img2_url]" style="width: 120px; height: 120px" fit="contain"></el-image>
-                <div class="mask" v-show="img2_hover">
-                  <i class="el-icon-zoom-in" @click="previewImage('img2')"></i>
-                  <i class="el-icon-upload2" @click="uploadImage('img2')"></i>
-                </div>
-              </div>
-              <div class="add" v-else @click="uploadImage('img2')">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-              </div>
-            </div>
-            <div class="tmp-img">
-              <el-image :src="require('@/assets/template/template_2.png')" :preview-src-list="[require('@/assets/template/template_2.png')]" style="width: 120px; height: 120px; display: block" fit="contain"></el-image>
-              <div class="tmp">示例图</div>
-            </div>
-          </div>
-          <div class="tips">
-            <span>建议尺寸：280*60</span>
-          </div>
-        </el-form-item>
-        <el-form-item label="头像logo" prop="imgUrl">
-          <div class="images">
-            <div class="main-img">
-              <div class="img" v-if="img3_url" @mouseover="img3_hover = true;" @mouseout="img3_hover = false;">
-                <el-image ref="img3" :src="img3_url" :preview-src-list="[img3_url]" style="width: 120px; height: 120px" fit="contain"></el-image>
-                <div class="mask" v-show="img3_hover">
-                  <i class="el-icon-zoom-in" @click="previewImage('img3')"></i>
-                  <i class="el-icon-upload2" @click="uploadImage('img3')"></i>
-                </div>
-              </div>
-              <div class="add" v-else @click="uploadImage('img3')">
-                <i class="el-icon-plus avatar-uploader-icon"></i>
-              </div>
-            </div>
-            <div class="tmp-img">
-              <el-image :src="require('@/assets/template/template_3.png')" :preview-src-list="[require('@/assets/template/template_3.png')]" style="width: 120px; height: 120px; display: block" fit="contain"></el-image>
-              <div class="tmp">示例图</div>
-            </div>
-          </div>
-          <div class="tips">
-            <span>建议尺寸：400*400</span>
-          </div>
-        </el-form-item>
-      </el-form>
-    </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;">4.其他基础配置</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="商户号Id" prop="merchantId">
-            <el-input v-model="step3Form.merchantId" autocomplete="off" placeholder="请输入商户号Id"></el-input>
-          </el-form-item>
-          <el-form-item label="商户号Key" prop="merchantKey">
-            <el-input v-model="step3Form.merchantKey" autocomplete="off" placeholder="请输入商户号Key"></el-input>
-          </el-form-item>
-          <el-form-item label="子appId" prop="childAppId">
-            <el-input v-model="step3Form.childAppId" autocomplete="off" placeholder="请输入子appId"></el-input>
-          </el-form-item>
-          <el-form-item label="子密钥" prop="childKey">
-            <el-input v-model="step3Form.childKey" 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-card>
-      </el-form>
-    </div>
-
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="submitStep2Form" :loading="formLoading" v-if="step == 'second'">{{ formLoading ? '保存中 ...' : '保 存' }}</el-button>
-        <el-button type="primary" @click="submitStep3Form" :loading="formLoading" v-if="step == 'third'">{{ formLoading ? '保存中 ...' : '保 存' }}</el-button>
+        <el-button type="primary" @click="submitMainForm" :loading="formLoading">{{ formLoading ? '保存中 ...' : '保 存' }}</el-button>
         <el-popconfirm
           title="确定关闭吗？"
           @onConfirm="goBack"
@@ -260,7 +106,7 @@ export default {
       id: null,
       companyWechatId: null,
       step: 'first',
-      step1Form: {
+      mainForm: {
         account: '', // 账号
         nickName: '', // 用户名
         appName: '', // 小程序名称
@@ -275,14 +121,7 @@ export default {
       passwordType1: 'password',
       passwordType2: 'password',
 
-      uploadImageType: null,
-      img1_url: '',
-      img1_hover: false,
-      img2_url: '',
-      img2_hover: false,
-      img3_url: '',
-      img3_hover: false,
-
+      
       resetFormVisible: false,
       resetForm: {
         newPassword: '', // 新密码
@@ -297,38 +136,6 @@ export default {
         ],
       },
 
-      step3Form: {
-        enterpriseId: '',
-        listSecret: '',
-        listSyncSecret: '',
-        appAgentId: '',
-        appSecret: '',
-        appId: '',
-        merchantId: '',
-        merchantKey: '',
-        childAppId: '',
-        childKey: '',
-        childMerchantId: '',
-        templateId: '',
-      },
-      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,
     }
   },
@@ -344,17 +151,9 @@ export default {
     },
   },
   created() {
-    const { id, type } = this.$route.query;
+    const { id } = this.$route.query;
     this.id = id;
     this.getDetail();
-
-    if(type === 1) {
-      this.step = 'first';
-    }else if(type === 2) {
-      this.step = 'second';
-    }else if(type === 3) {
-      this.step = 'third';
-    }
   },
   methods: {
     goBack() {
@@ -364,32 +163,14 @@ export default {
     // 获取详情
     getDetail() {
       getDetail({adminUserId: this.id}).then(res => {
-        this.step1Form.account = res.data.userName;
-        this.step1Form.nickName = res.data.nickName;
-        this.step1Form.appName = res.data.minAppName;
-        this.step1Form.chargePerson = res.data.linkName;
-        this.step1Form.phone = res.data.linkPhone;
-        this.step1Form.email = res.data.email;
-        this.step1Form.address = res.data.address;
-        this.step1Form.password = '************';
-
-        this.img1_url = res.data.minLogo1;
-        this.img2_url = res.data.minLogo2;
-        this.img3_url = res.data.minLogo3;
-
-        this.step3Form.enterpriseId = res.data.corpId;
-        this.step3Form.listSecret = res.data.secret2;
-        this.step3Form.listSyncSecret = res.data.secret3;
-        this.step3Form.appAgentId = res.data.agentId1;
-        this.step3Form.appSecret = res.data.secret1;
-        this.step3Form.appId = res.data.appId;
-        this.step3Form.merchantId = res.data.mchId;
-        this.step3Form.merchantKey = res.data.mchKey;
-        this.step3Form.childAppId = res.data.subAppId;
-        this.step3Form.childKey = res.data.subSecret;
-        this.step3Form.childMerchantId = res.data.subMchId;
-        this.step3Form.templateId = res.data.template;
-        this.companyWechatId = res.data.companyWechatId;
+        this.mainForm.account = res.data.userName;
+        this.mainForm.nickName = res.data.nickName;
+        this.mainForm.appName = res.data.minAppName;
+        this.mainForm.chargePerson = res.data.linkName;
+        this.mainForm.phone = res.data.linkPhone;
+        this.mainForm.email = res.data.email;
+        this.mainForm.address = res.data.address;
+        this.mainForm.password = '************';
       })
     },
 
@@ -448,78 +229,25 @@ export default {
       }
     },
 
-    uploadImage(type) {
-      this.uploadImageType = type;
-      document.querySelector('.avatar-uploader input').click();
-    },
-
-    // 上传图片
-    uploadSuccess(res, file) {
-      this[this.uploadImageType + '_url'] = res.data.url;
-    },
-
-    beforeUpload(file) {
-      const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
-      const whiteList = ['jpg', 'jpeg', 'png'];
-      if (whiteList.indexOf(fileSuffix) === -1) {
-        this.$errorMsg('只支持上传jpg/jpeg/png文件!');
-        return false;
-      }
-    },
-
-    // 预览图片
-    previewImage(type) {
-      this.$refs[type].showViewer = true;
-    },
-
-
-    submitStep2Form() {
-      if(!this.img1_url) {
-        return this.$errorMsg('请上传主logo');
-      }
-      if(!this.img2_url) {
-        return this.$errorMsg('请上传通用logo');
-      }
-      if(!this.img3_url) {
-        return this.$errorMsg('请上传头像logo');
-      }
-      this.formLoading = true;
-      let params = {
-        adminUserId: this.id,
-        minLogo1: this.img1_url,
-        minLogo2: this.img2_url,
-        minLogo3: this.img3_url,
-        companyWechatId: this.companyWechatId
-      }
-      editAccount(params).then(res => {
-        this.$successMsg('保存成功');
-        setTimeout(() => {
-          this.goBack();
-        }, 1500)
-      }).finally(res => {
-        this.formLoading = false;
-      })
-    },
-
-    submitStep3Form() {
-      this.$refs.step3Form.validate((valid) => {
+    submitMainForm() {
+      this.$refs.mainForm.validate((valid) => {
         if (valid) {
           this.formLoading = true;
 
           let params = {
             adminUserId: this.id,
-            corpId: this.step3Form.enterpriseId,
-            secret2: this.step3Form.listSecret,
-            secret3: this.step3Form.listSyncSecret,
-            agentId1: this.step3Form.appAgentId,
-            secret1: this.step3Form.appSecret,
-            appId: this.step3Form.appId,
-            mchId: this.step3Form.merchantId,
-            mchKey: this.step3Form.merchantKey,
-            subAppId: this.step3Form.childAppId,
-            subSecret: this.step3Form.childKey,
-            subMchId: this.step3Form.childMerchantId,
-            template: this.step3Form.templateId,
+            corpId: this.mainForm.enterpriseId,
+            secret2: this.mainForm.listSecret,
+            secret3: this.mainForm.listSyncSecret,
+            agentId1: this.mainForm.appAgentId,
+            secret1: this.mainForm.appSecret,
+            appId: this.mainForm.appId,
+            mchId: this.mainForm.merchantId,
+            mchKey: this.mainForm.merchantKey,
+            subAppId: this.mainForm.childAppId,
+            subSecret: this.mainForm.childKey,
+            subMchId: this.mainForm.childMerchantId,
+            template: this.mainForm.templateId,
             companyWechatId: this.companyWechatId
           }
           editAccount(params).then(res => {

src/views/merchant/merchant_list.vue

@@ -0,0 +1,244 @@
+<template>
+  <div class="app-container">
+    <!-- 筛选条件 -->
+    <div class="screen-container">
+      <div class="top clearfix">
+        <div class="title fl">条件筛选</div>
+      </div>
+      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="商户账号" prop="account">
+              <el-input v-model="screenForm.account" placeholder="请输入商户账号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="商户昵称" prop="nickname">
+              <el-input v-model="screenForm.nickname" placeholder="请输入商户昵称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="screenForm.phone" placeholder="请输入联系电话"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="电子邮箱" prop="email">
+              <el-input v-model="screenForm.email" placeholder="请输入电子邮箱"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="状态" prop="state">
+              <el-select v-model="screenForm.status" placeholder="全部">
+                <el-option label="全部" value=""></el-option>
+                <el-option :label="item.label" :value="item.value" v-for="(item, index) in select_status" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-form-item label="">
+              <el-button size="small" @click="resetScreenForm">清空</el-button>
+              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="mymain-container">
+      <div class="btn-group clearfix">
+        <div class="fl">
+          <el-button size="small" type="primary" @click="toCreate()">开通账号</el-button>
+        </div>
+        <div class="fr">
+          <el-button size="small" type="primary" icon="el-icon-download" @click="handleExport">导出数据</el-button>
+        </div>
+      </div>
+      <div class="table">
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="center" label="操作" width="120" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" @click="toDetail(scope.row.adminCompanyId)">详情</el-button>
+              <template v-if="checkBtnRole('status')">
+                <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定冻结吗？" @onConfirm="changeStatus(scope.row.adminCompanyId, 0)" >
+                  <el-button slot="reference" type="text">冻结</el-button>
+                </el-popconfirm>
+                <el-popconfirm v-else style="margin-left: 10px;" title="确定恢复吗？" @onConfirm="changeStatus(scope.row.adminCompanyId, 1)" >
+                  <el-button slot="reference" type="text">恢复</el-button>
+                </el-popconfirm>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="商户账号" prop="userName" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-button type="text" @click="toAccountList(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="商户昵称" prop="adminCompanyName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="负责人" prop="linkName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="角色" prop="roleName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="联系电话" prop="linkPhone" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="金蝶主体账号" prop="useOrgNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="金蝶主体名称" prop="useOrgName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="电子邮箱" prop="email" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="地址" prop="address" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="状态" class-name="status-col">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.status ? 'success':'danger'">{{ scope.row.status ? '正常':'冻结' }}</el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="pagination clearfix">
+      <div class="fr">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { COMMON_SELECT } from '@/utils/select_data'
+import {getList, changeAccountStatus} from "@/api/merchant";
+import {downloadFiles} from '@/utils/util'
+
+export default {
+  data() {
+    return {
+      isOpen: false, // 是否展开条件筛选
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: null, // 列表数据
+      listLoading: false, // 列表加载loading
+      screenForm: { // 筛选表单数据
+        account: '',
+        nickname: '',
+        phone: '',
+        email: '',
+        status: '',
+      },
+      select_status: [ // 筛选字段 - 状态
+        { label: '正常', value: true },
+        { label: '冻结', value: false }
+      ],
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 查询按钮权限
+    checkBtnRole(value) {
+      // let btnRole = this.$route.meta.roles;
+      // if(!btnRole) {return true}
+      // let index = btnRole.indexOf(value);
+      // return index >= 0;
+      return true
+    },
+
+    // 查询列表
+    getList() {
+      this.listLoading = true;
+
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        userName: this.screenForm.account,
+        nickName: this.screenForm.nickName,
+        linkPhone: this.screenForm.phone,
+        email: this.screenForm.email,
+        status: this.screenForm.status,
+      };
+      getList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      })
+    },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getList();
+    },
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getList();
+    },
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getList();
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getList();
+    },
+
+    // 去开通账号
+    toCreate() {
+      this.$router.push({
+        path: '/merchant/create_account',
+        query: {}
+      })
+    },
+
+    toAccountList() {
+      this.$router.push({
+        path: '/setting/account',
+        query: {
+          type: 1
+        }
+      })
+    },
+
+    toDetail(id) {
+      this.$router.push({
+        path: '/merchant/merchant_detail',
+        query: {
+          id
+        }
+      })
+    },
+
+    // 操作 - 更改状态(type: 禁用0，启用1)
+    changeStatus(id, type) {
+      type = type ? true : false
+      changeAccountStatus({adminCompanyId: id, status: type}).then(res => {
+        this.getList();
+        this.$successMsg();
+      })
+    },
+
+    // 导出
+    handleExport() {
+      let screenData = {
+        userName: this.screenForm.account,
+        nickName: this.screenForm.nickName,
+        linkPhone: this.screenForm.phone,
+        email: this.screenForm.email,
+        status: this.screenForm.status,
+      };
+      downloadFiles('admin/user/mch/export', screenData);
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>