fix: 修改编辑账号

7929408c · 无尘 · de81e8b0 · 7929408c · 7929408c · 7929408c
Commit 7929408c authored Nov 19, 2020 by 无尘
7 changed files
--- a/dist/css/chunk-33d4f666.364c6e9c.css
+++ b/dist/css/chunk-33d4f666.364c6e9c.css
-.w-363[data-v-68198b39]{width:363px}.selected div[data-v-68198b39]{color:#2f54eb}.w-363[data-v-27070f4e]{width:363px}.selected div[data-v-27070f4e]{color:#2f54eb}.show-select-num[data-v-27070f4e]{width:363px;height:32px;line-height:32px;padding:0 12px;font-size:14px;color:#303133;border-radius:2px;border:1px solid #c4c6cf}.m-b-20[data-v-00ab43a8]{margin-bottom:20px}.w-408[data-v-00ab43a8]{width:408px}
+.w-363[data-v-4c25dc22]{width:363px}.selected div[data-v-4c25dc22]{color:#2f54eb}.w-363[data-v-97564fa4]{width:363px}.selected div[data-v-97564fa4]{color:#2f54eb}.show-select-num[data-v-97564fa4]{width:363px;height:32px;line-height:32px;padding:0 12px;font-size:14px;color:#303133;border-radius:2px;border:1px solid #c4c6cf}.m-b-20[data-v-00ab43a8]{margin-bottom:20px}.w-408[data-v-00ab43a8]{width:408px}
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.48.css><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><title>好办</title><link href=css/chunk-126ea711.12980bcb.css rel=prefetch><link href=css/chunk-33d4f666.364c6e9c.css rel=prefetch><link href=css/chunk-428c66fe.145b1a9f.css rel=prefetch><link href=css/chunk-448cb576.d0755970.css rel=prefetch><link href=css/chunk-4566970e.f9174fd0.css rel=prefetch><link href=css/chunk-5661deeb.593f08e6.css rel=prefetch><link href=css/chunk-5ad5a8b8.b222f2ae.css rel=prefetch><link href=css/chunk-61a08028.f15a2aec.css rel=prefetch><link href=css/chunk-6b431e4e.5bc873e8.css rel=prefetch><link href=css/chunk-ce6e75c2.5c2cd5fc.css rel=prefetch><link href=css/chunk-e7c4557e.4f971e39.css rel=prefetch><link href=js/chunk-126ea711.1927465d.js rel=prefetch><link href=js/chunk-22af8244.30e36d46.js rel=prefetch><link href=js/chunk-33d4f666.9a62ce89.js rel=prefetch><link href=js/chunk-428c66fe.284310ec.js rel=prefetch><link href=js/chunk-448cb576.a6f1f4e7.js rel=prefetch><link href=js/chunk-4566970e.8f92af78.js rel=prefetch><link href=js/chunk-5661deeb.4f35af5f.js rel=prefetch><link href=js/chunk-5ad5a8b8.1bc9ef21.js rel=prefetch><link href=js/chunk-61a08028.bab21404.js rel=prefetch><link href=js/chunk-6b431e4e.0d30cc7b.js rel=prefetch><link href=js/chunk-ce6e75c2.9409f4b5.js rel=prefetch><link href=js/chunk-e0354b28.47793da0.js rel=prefetch><link href=js/chunk-e7c4557e.1b36022d.js rel=prefetch><link href=css/app.343858c9.css rel=preload as=style><link href=css/chunk-vendors.635bc84a.css rel=preload as=style><link href=js/app.4598ed68.js rel=preload as=script><link href=js/chunk-vendors.1cef5819.js rel=preload as=script><link href=css/chunk-vendors.635bc84a.css rel=stylesheet><link href=css/app.343858c9.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.46.js></script><script src=//web-1251519181.file.myqcloud.com/components/editor.1.1.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/user-info.1.0.3.js></script><script src=js/chunk-vendors.1cef5819.js></script><script src=js/app.4598ed68.js></script></body></html>
+<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.48.css><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><title>好办</title><link href=css/chunk-126ea711.12980bcb.css rel=prefetch><link href=css/chunk-207a15e8.cbc1c040.css rel=prefetch><link href=css/chunk-428c66fe.145b1a9f.css rel=prefetch><link href=css/chunk-448cb576.d0755970.css rel=prefetch><link href=css/chunk-4566970e.f9174fd0.css rel=prefetch><link href=css/chunk-5661deeb.593f08e6.css rel=prefetch><link href=css/chunk-5ad5a8b8.b222f2ae.css rel=prefetch><link href=css/chunk-61a08028.f15a2aec.css rel=prefetch><link href=css/chunk-6b431e4e.5bc873e8.css rel=prefetch><link href=css/chunk-ce6e75c2.5c2cd5fc.css rel=prefetch><link href=css/chunk-e7c4557e.4f971e39.css rel=prefetch><link href=js/chunk-126ea711.1927465d.js rel=prefetch><link href=js/chunk-207a15e8.34363f01.js rel=prefetch><link href=js/chunk-22af8244.30e36d46.js rel=prefetch><link href=js/chunk-428c66fe.284310ec.js rel=prefetch><link href=js/chunk-448cb576.a6f1f4e7.js rel=prefetch><link href=js/chunk-4566970e.8f92af78.js rel=prefetch><link href=js/chunk-5661deeb.4f35af5f.js rel=prefetch><link href=js/chunk-5ad5a8b8.1bc9ef21.js rel=prefetch><link href=js/chunk-61a08028.bab21404.js rel=prefetch><link href=js/chunk-6b431e4e.0d30cc7b.js rel=prefetch><link href=js/chunk-ce6e75c2.9409f4b5.js rel=prefetch><link href=js/chunk-e0354b28.47793da0.js rel=prefetch><link href=js/chunk-e7c4557e.1b36022d.js rel=prefetch><link href=css/app.343858c9.css rel=preload as=style><link href=css/chunk-vendors.635bc84a.css rel=preload as=style><link href=js/app.dd1a08f9.js rel=preload as=script><link href=js/chunk-vendors.1cef5819.js rel=preload as=script><link href=css/chunk-vendors.635bc84a.css rel=stylesheet><link href=css/app.343858c9.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.46.js></script><script src=//web-1251519181.file.myqcloud.com/components/editor.1.1.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/user-info.1.0.3.js></script><script src=js/chunk-vendors.1cef5819.js></script><script src=js/app.dd1a08f9.js></script></body></html>
\ No newline at end of file
--- a/dist/js/app.4598ed68.js
+++ b/dist/js/app.4598ed68.js
--- a/dist/js/chunk-207a15e8.34363f01.js
+++ b/dist/js/chunk-207a15e8.34363f01.js
--- a/dist/js/chunk-33d4f666.9a62ce89.js
+++ b/dist/js/chunk-33d4f666.9a62ce89.js
--- a/src/components/account/account-detail.vue
+++ b/src/components/account/account-detail.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2020-11-16 14:56:07
 * @LastEditors: 无尘
- * @LastEditTime: 2020-11-19 11:08:21
+ * @LastEditTime: 2020-11-19 11:10:14
 -->
 <!--
@@ -12,7 +12,7 @@
 import accountDetail from '@/components/account/account-detail.vue';
 -->
 <template>
-  <el-dialog title="试用账号详" :visible.sync="dialogVisible" width="680px" :before-close="handleClose" append-to-body>
+  <el-dialog title="试用账号详情" :visible.sync="dialogVisible" width="680px" :before-close="handleClose" append-to-body>
    <div class="">
      <el-table class="select-table" ref="" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%'}">
        <el-table-column label="试用人" show-overflow-tooltip>

--- a/src/components/account/edit-account.vue
+++ b/src/components/account/edit-account.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2020-11-13 14:24:53
 * @LastEditors: 无尘
- * @LastEditTime: 2020-11-19 10:58:17
+ * @LastEditTime: 2020-11-19 11:24:00
 -->
 <!--
 <edit-account :edit-row="editRow"></edit-account>
@@ -19,7 +19,7 @@ import editAccount from '@/components/account/edit-account.vue';
        </el-form-item>
        <el-form-item label="用户手机号" prop="selfPhoneNumber">
          <el-input class="w-363"  v-model="ruleForm.selfPhoneNumber" placeholder="请输入用户手机号" maxlength="20" show-word-limit></el-input>
-          <div v-if="!!editObj.selfPhoneNumber">
+          <div v-if="!!editObj.selfPhoneNumber && editObj.trialAccountId != ruleForm.trialAccountId">
            <span class="color-f5222d">发现手机号重复，重复手机号</span><el-button type="text" @click="tryEnd(editObj)">立即结束</el-button> <el-button type="text" @click="toShowDetail(editObj)">查看详情</el-button>
          </div>
        </el-form-item>