Bladeren bron

no message

linwenxin 1 jaar geleden
bovenliggende
commit
cfcf36730d

+ 7 - 7
package-lock.json

@@ -4420,11 +4420,11 @@
           "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ=="
         },
         "postcss": {
-          "version": "8.4.31",
-          "resolved": "http://121.41.110.30:4873/postcss/-/postcss-8.4.31.tgz",
-          "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+          "version": "8.4.32",
+          "resolved": "http://121.41.110.30:4873/postcss/-/postcss-8.4.32.tgz",
+          "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
           "requires": {
-            "nanoid": "^3.3.6",
+            "nanoid": "^3.3.7",
             "picocolors": "^1.0.0",
             "source-map-js": "^1.0.2"
           }
@@ -4711,9 +4711,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.10.15",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.10.15.tgz",
-      "integrity": "sha512-VSVMDwbfQcjqpgGHPFKujLp3Z9PpexLqKg6BEnLMiCcf1nrGTZS+5Q87ZkcJcvfwytZx8cT2Hbvyyl5f4Pufcw==",
+      "version": "2.10.16",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.10.16.tgz",
+      "integrity": "sha512-K3tf3XeyNJ8fzJH3Lvs4PGSC7K/CUHgimxduPs3kPUcjQx9g6A6DzQhEMrvIZIkMb9SvT9Zl+1GhjhzIhu3DMw==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.10.15",
+    "@zjlib/element-plugins": "^2.10.16",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

+ 2 - 2
src/layout/components/AppMain.vue

@@ -2,9 +2,9 @@
   <section class="app-main" :style="{ paddingTop: show ? '140px' : '80px' }">
     <div class="app-main-view">
       <keep-alive>
-        <router-view v-if="$route.meta.status" :key="$route.name" />
+        <router-view v-if="$route.meta.isCache == 1" :key="$route.name" />
       </keep-alive>
-      <router-view v-if="!$route.meta.status" :key="$route.name"/>
+      <router-view v-if="$route.meta.isCache != 1" :key="$route.name"/>
       <zj-watermark color="rgba(200,200,200,.3)" position="absolute" :str="str" zIndex="99" />
     </div>
   </section>

+ 6 - 5
src/permission.js

@@ -86,8 +86,8 @@ router.afterEach(() => {
   NProgress.done()
 })
 
-function buildRoute(route, parentUrl = '', bool=true) {
-  const { url, moduleName, icon, moduleId, code, type, hidden, fullUrl, status } = route
+function buildRoute(route, parentUrl = '', bool = true) {
+  const { url, moduleName, icon, moduleId, code, type, hidden, fullUrl, status, isCache } = route
   var item = {}
   item.path = ~[3, 4].indexOf(type) ? fullUrl : parentUrl + url
   item.name = ~[3].indexOf(type) ? fullUrl : code
@@ -98,7 +98,8 @@ function buildRoute(route, parentUrl = '', bool=true) {
     title: moduleName,
     icon: icon,
     moduleId,
-    status : status
+    status: status,
+    isCache: isCache
   }
   item.hidden = hidden
   if (route.children && route.children.length) {
@@ -120,7 +121,7 @@ function buildRoute(route, parentUrl = '', bool=true) {
       item.meta.roles = roles
       item.meta.roleItems = roleItems
       if (!pages.find(ite => ite.path === item.path)) {
-        item.path = `${item.path}${bool?'':''}`
+        item.path = `${item.path}${bool ? '' : ''}`
         pages.push(item)
       }
     } else if (type == 1) {
@@ -137,7 +138,7 @@ function buildRoute(route, parentUrl = '', bool=true) {
       try {
         item.component = _import(`${fullUrl}/index`)
         if (!pages.find(ite => ite.path === item.path)) {
-          item.path = `${item.path}${bool?'':''}`
+          item.path = `${item.path}${bool ? '' : ''}`
           pages.push(item)
         }
       } catch (e) {

+ 38 - 8
src/views/setting/menu/index.vue

@@ -30,6 +30,11 @@
               <span>{{ ['显示', '不显示'][[true, false].indexOf(scope.row.status)] || '' }}</span>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="isCache" label="状态">
+            <template slot-scope="scope">
+              <span>{{ ['缓存', '不缓存'][[1,0].indexOf(scope.row.isCache)] || '' }}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="sortNum" label="排序" />
           <el-table-column align="right" label="操作" width="150" fixed="right">
             <template slot-scope="scope">
@@ -67,7 +72,7 @@
         :model="addParentForm"
         :rules="addParentFormRules"
         label-position="left"
-        label-width="80px"
+        label-width="140px"
       >
         <el-form-item label="类型" prop="type">
           <el-radio-group v-model="addParentForm.type">
@@ -107,6 +112,15 @@
             inactive-color="#ff4949"
           />
         </el-form-item>
+        <el-form-item label="是否缓存页面" prop="isCache">
+          <el-switch
+            v-model="addParentForm.isCache"
+            :active-value="1"
+            :inactive-value="0"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelAddParentForm">取 消</el-button>
@@ -127,7 +141,7 @@
         :model="addChildForm"
         :rules="addChildFormRules"
         label-position="left"
-        label-width="80px"
+        label-width="140px"
       >
         <el-form-item label="类型" prop="type">
           <el-radio-group v-model="addChildForm.type">
@@ -177,6 +191,15 @@
             inactive-color="#ff4949"
           />
         </el-form-item>
+        <el-form-item label="是否缓存页面" prop="isCache">
+          <el-switch
+            v-model="addChildForm.isCache"
+            :active-value="1"
+            :inactive-value="0"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelAddChildForm">取 消</el-button>
@@ -190,7 +213,7 @@
       width="40%"
       :close-on-click-modal="false"
     >
-      <el-form ref="formData" :model="formData" :rules="formDataRules" label-position="left" label-width="100px">
+      <el-form ref="formData" :model="formData" :rules="formDataRules" label-position="left" label-width="140px">
         <el-form-item label="code" prop="code">
           <el-input v-model="formData.code" placeholder="请输入类型" clearable></el-input>
         </el-form-item>
@@ -264,7 +287,8 @@ export default {
         icon: '',
         sort: 0,
         type: 1,
-        status: true
+        status: true,
+        isCache: 1
       },
       addParentFormRules: {
         type: [{ required: true, message: '请选择类型', trigger: 'change' }],
@@ -285,7 +309,8 @@ export default {
         icon: '',
         sort: 0,
         type: 1,
-        status: true
+        status: true,
+        isCache:1
       },
       addChildFormRules: {
         type: [{ required: true, message: '请选择类型', trigger: 'change' }],
@@ -391,6 +416,7 @@ export default {
             sort: res.data.sortNum,
             type: res.data.type,
             status: res.data.status,
+            isCache: res.data.isCache,
             childList: res.data.childList
           }
         })
@@ -417,7 +443,8 @@ export default {
             sortNum: this.addParentForm.sort,
             parentId: 0,
             type: this.addParentForm.type,
-            status: this.addParentForm.status
+            status: this.addParentForm.status,
+            isCache: this.addParentForm.isCache,
           }
           if (this.addParentFormType == 'edit') {
             params.moduleId = this.editParentId
@@ -460,6 +487,7 @@ export default {
             sort: res.data.sortNum,
             type: res.data.type,
             status: res.data.status,
+            isCache: res.data.isCache,
             childList: res.data.childList
           }
           this.tableData = res.data.childList
@@ -540,7 +568,8 @@ export default {
               icon: this.addChildForm.icon,
               sortNum: this.addChildForm.sort,
               type: this.addChildForm.type,
-              status: this.addChildForm.status
+              status: this.addChildForm.status,
+              isCache: this.addChildForm.isCache,
             }
             editMenu(params).then(res => {
               this.cancelAddChildForm()
@@ -557,7 +586,8 @@ export default {
               icon: this.addChildForm.icon,
               sortNum: this.addChildForm.sort,
               type: this.addChildForm.type,
-              status: this.addChildForm.status
+              status: this.addChildForm.status,
+              isCache: this.addChildForm.isCache,
             }
             addMenu(params).then(res => {
               this.cancelAddChildForm()

+ 648 - 0
src/views/setting/organizationManagement/settledManagement/index.vue

@@ -0,0 +1,648 @@
+<template>
+  <div class="app-container">
+    <div v-show="step == 1">
+      <div class="setting_title">开通账号</div>
+      <el-divider></el-divider>
+      <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-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">
+            <el-input v-model="step1Form.address" autocomplete="off" 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>
+            <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>
+      </el-card>
+    </div>
+
+    <div v-show="step == 2">
+      <div class="setting_title">商城配置</div>
+      <el-divider></el-divider>
+      <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 == 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;">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 @click="changeStep(0)" v-show="step > 1">上一步</el-button>
+        <el-button @click="changeStep(1)" v-show="step < 3">下一步</el-button>
+        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
+        <el-popconfirm
+          title="确定关闭吗?"
+          @onConfirm="goBack"
+          style="margin-left: 10px;"
+        >
+          <el-button slot="reference">关 闭</el-button>
+        </el-popconfirm>
+      </div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { addAccount } from "@/api/merchant";
+
+export default {
+  data() {
+    var validateAccount = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入商户账号'));
+      } else if (value.length < 12) {
+        callback(new Error('账号长度至少12位'));
+      } else if (/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value) == false) {
+        callback(new Error('账号必须包含数字和字母'));
+      } else {
+        callback();
+      }
+    };
+    var validatePass3 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入登录密码'));
+      } else if (value.length < 12) {
+        callback(new Error('密码长度至少12位'));
+      } 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');
+        }
+        callback();
+      }
+    };
+    var validatePass4 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.step1Form.newPassword) {
+        callback(new Error('两次输入密码不一致'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      baseURL: process.env.VUE_APP_BASE_API,
+      myHeaders: {'x-token': getToken()},
+      step: 1,
+      step1Form: {
+        account: '', // 账号
+        nickName: '', // 用户名
+        appName: '', // 小程序名称
+        chargePerson: '', // 负责人
+        phone: '', // 联系电话
+        email: '', // 电子邮箱
+        address: '', // 地址
+        newPassword: '', // 登录密码
+        confirmPassword: '', // 确认密码
+      },
+      step1FormRules: {
+        account: [
+          { required: true, validator: validateAccount, trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: '请输入用户名', trigger: 'blur' }
+        ],
+        appName: [
+          { required: true, message: '请输入用户名', trigger: 'blur' }
+        ],
+        chargePerson: [
+          { required: true, message: '请输入负责人', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        newPassword: [
+          { required: true, validator: validatePass3, trigger: 'blur' }
+        ],
+        confirmPassword: [
+          { required: true, validator: validatePass4, trigger: 'blur' }
+        ],
+      },
+      passwordType1: 'password',
+      passwordType2: 'password',
+
+      uploadImageType: null,
+      img1_url: '',
+      img1_hover: false,
+      img2_url: '',
+      img2_hover: false,
+      img3_url: '',
+      img3_hover: false,
+
+      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,
+    }
+  },
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened
+      }
+    },
+  },
+  methods: {
+    goBack() {
+      this.$router.go(-1);
+    },
+
+    // 显示隐藏密码
+    showPwd(num) {
+      if(num == 1) {
+        if (this.passwordType1 === 'password') {
+          this.passwordType1 = ''
+        } else {
+          this.passwordType1 = 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password1.focus()
+        })
+      }
+      if(num == 2) {
+        if (this.passwordType2 === 'password') {
+          this.passwordType2 = ''
+        } else {
+          this.passwordType2 = 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password2.focus()
+        })
+      }
+    },
+
+    // 下一步
+    nextStep() {
+      this.$refs.step1Form.validate((valid) => {
+        if (valid) {
+          this.step = 2;
+        }
+      })
+    },
+
+    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;
+    },
+
+    // 切换步骤
+    changeStep(type) {
+      if(type == 1) {
+        this.step ++;
+      }else {
+        this.step --;
+      }
+    },
+
+    // 点击 提交表单
+    clickSubmitForm() {
+      // 验证第一步
+      this.$refs.step1Form.validate((valid) => {
+        if (valid) {
+          // 验证第二步
+          if(this.img1_url && this.img2_url && this.img3_url) {
+            // 验证第三步
+            this.$refs.step3Form.validate((valid) => {
+              if (valid) {
+                this.submitForm();
+              }else {
+                this.step = 3;
+              }
+            })
+          }else {
+            this.$errorMsg('请完善商城配置');
+            this.step = 2;
+          }
+        }else {
+          this.step = 1;
+        }
+      })
+    },
+
+    // 提交表单
+    submitForm() {
+      this.$refs.step3Form.validate((valid) => {
+        if (valid) {
+          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,
+
+            minLogo1: this.img1_url,
+            minLogo2: this.img2_url,
+            minLogo3: this.img3_url,
+
+            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,
+          }
+          addAccount(params).then(res => {
+            this.$successMsg('开通成功');
+            setTimeout(() => {
+              this.goBack();
+            }, 1500)
+          }).finally(res => {
+            this.formLoading = false;
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .setting_title {
+    padding-left: 0;
+  }
+  .tips {
+    font-size: 14px;
+  }
+  .my-card {
+    margin-top: 20px;
+    .box {
+      background: rgb(235, 240, 249);
+      padding: 10px;
+      font-size: 14px;
+      margin: 20px 0;
+      line-height: 18px;
+      ::v-deep .el-link {
+        vertical-align: unset;
+      }
+    }
+  }
+  .my-form {
+    width: 450px;
+    margin: 0 auto;
+  }
+  .show-pwd {
+    position: absolute;
+    right: 15px;
+    top: 0;
+    font-size: 16px;
+    cursor: pointer;
+    user-select: none;
+  }
+  .question {
+    position: absolute;
+    right: -30px;
+    top: 0;
+    font-size: 20px;
+    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>

+ 672 - 0
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -0,0 +1,672 @@
+<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">
+        <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 class="tr">
+          <el-button type="primary" @click="submitStep1Form">保存</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-popconfirm
+          title="确定关闭吗?"
+          @onConfirm="goBack"
+          style="margin-left: 10px;"
+        >
+          <el-button slot="reference">关 闭</el-button>
+        </el-popconfirm>
+      </div>
+    </div>
+    
+    <!-- 重置密码 -->
+    <el-dialog title="重置密码" :visible.sync="resetFormVisible" :show-close="false" width="40%" :close-on-click-modal="false">
+      <el-form ref="resetForm" :model="resetForm" :rules="resetFormRules" label-position="left" label-width="100px">
+        <el-form-item label="输入新密码" prop="newPassword">
+          <el-input v-model="resetForm.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-form-item>
+        <el-form-item label="确认密码" prop="confirmPassword">
+          <el-input v-model="resetForm.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-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelResetForm">取 消</el-button>
+        <el-button type="primary" @click="submitResetForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { getDetail, resetPassword, editAccount } from "@/api/merchant";
+
+export default {
+  data() {
+    var validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入登录密码'));
+      } else if (value.length < 12) {
+        callback(new Error('密码长度至少12位'));
+      } else if (/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value) == false) {
+        callback(new Error('密码必须包含数字和字母'));
+      } else {
+        if (this.resetForm.confirmPassword !== '') {
+          this.$refs.resetForm.validateField('confirmPassword');
+        }
+        callback();
+      }
+    };
+    var validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.resetForm.newPassword) {
+        callback(new Error('两次输入密码不一致'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      baseURL: process.env.VUE_APP_BASE_API,
+      myHeaders: {'x-token': getToken()},
+      id: null,
+      companyWechatId: null,
+      step: 'first',
+      step1Form: {
+        account: '', // 账号
+        nickName: '', // 用户名
+        appName: '', // 小程序名称
+        chargePerson: '', // 负责人
+        phone: '', // 联系电话
+        email: '', // 电子邮箱
+        address: '', // 地址
+        newPassword: '', // 新密码
+        confirmPassword: '', // 确认密码
+      },
+
+      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: '', // 新密码
+        confirmPassword: '', // 确认密码
+      },
+      resetFormRules: {
+        newPassword: [
+          { required: true, validator: validatePass, trigger: 'blur' }
+        ],
+        confirmPassword: [
+          { required: true, validator: validatePass2, trigger: 'blur' }
+        ],
+      },
+
+      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,
+    }
+  },
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened
+      }
+    },
+  },
+  created() {
+    const { id, type } = 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() {
+      this.$router.go(-1);
+    },
+
+    // 获取详情
+    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;
+      })
+    },
+
+    // 重置密码
+    handleReset(id) {
+      this.resetId = id;
+      this.resetFormVisible = true;
+    },
+
+    // 取消重置密码
+    cancelResetForm(){
+      this.resetFormVisible = false;
+      this.passwordType1 = 'password';
+      this.passwordType2 = 'password';
+      this.$refs.resetForm.resetFields();
+    },
+
+    // 提交重置密码
+    submitResetForm() {
+      this.$refs.resetForm.validate((valid) => {
+        if (valid) {
+          let params = {
+            password: this.resetForm.newPassword,
+            adminUserId: this.id
+          }
+          resetPassword(params).then(res => {
+            this.cancelResetForm();
+            this.getDetail();
+            this.$successMsg();
+          })
+        }
+      })
+    },
+
+    // 显示隐藏密码
+    showPwd(num) {
+      if(num == 1) {
+        if (this.passwordType1 === 'password') {
+          this.passwordType1 = ''
+        } else {
+          this.passwordType1 = 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password1.focus()
+        })
+      }
+      if(num == 2) {
+        if (this.passwordType2 === 'password') {
+          this.passwordType2 = ''
+        } else {
+          this.passwordType2 = 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password2.focus()
+        })
+      }
+    },
+
+    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) => {
+        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,
+            companyWechatId: this.companyWechatId
+          }
+          editAccount(params).then(res => {
+            this.$successMsg('保存成功');
+            setTimeout(() => {
+              this.goBack();
+            }, 1500)
+          }).finally(res => {
+            this.formLoading = false;
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .setting_title {
+    padding-left: 0;
+  }
+  .tips {
+    font-size: 14px;
+  }
+  .my-card {
+    margin-top: 20px;
+    .box {
+      background: rgb(235, 240, 249);
+      padding: 10px;
+      font-size: 14px;
+      margin: 20px 0;
+      line-height: 18px;
+      ::v-deep .el-link {
+        vertical-align: unset;
+      }
+    }
+  }
+  .my-form {
+    width: 450px;
+    margin-top: 20px;
+  }
+  .show-pwd {
+    position: absolute;
+    right: 15px;
+    top: 0;
+    font-size: 16px;
+    cursor: pointer;
+    user-select: none;
+  }
+  .question {
+    position: absolute;
+    right: -30px;
+    top: 0;
+    font-size: 20px;
+    cursor: pointer;
+    user-select: none;
+  }
+  .reset {
+    position: absolute;
+    right: -110px;
+    top: 0;
+  }
+  .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>

+ 233 - 0
src/views/setting/organizationManagement/tenantManagement/index.vue

@@ -0,0 +1,233 @@
+<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="230" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" @click="toDetail(scope.row.adminUserId, 1)">详情</el-button>
+              <el-button type="text" @click="toDetail(scope.row.adminUserId, 2)">商城配置</el-button>
+              <el-button type="text" @click="toDetail(scope.row.adminUserId, 3)">企微配置</el-button>
+              <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定冻结吗?" @onConfirm="changeStatus(scope.row.adminUserId, 0)" >
+                <el-button slot="reference" type="text">冻结</el-button>
+              </el-popconfirm>
+              <el-popconfirm v-else style="margin-left: 10px;" title="确定恢复吗?" @onConfirm="changeStatus(scope.row.adminUserId, 1)" >
+                <el-button slot="reference" type="text">恢复</el-button>
+              </el-popconfirm>
+            </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="companyName" 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="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: {
+    // 查询列表
+    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({
+        name:"settledManagement",
+        query: {}
+      })
+    },
+
+    toAccountList() {
+      this.$router.push({
+        name:"account",
+        query: {
+          type: 1
+        }
+      })
+    },
+
+    toDetail(id, type) {
+      this.$router.push({
+        name:"tenantDetails",
+        query: {
+          id, type
+        }
+      })
+    },
+
+    // 操作 - 更改状态(type: 禁用0,启用1)
+    changeStatus(id, type) {
+      type = type ? true : false
+      changeAccountStatus({adminUserId: 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>