bug修复

src/router/index.js

@@ -169,6 +169,11 @@ let router = new Router({
             component: () => import('../views/join'),
             // meta: { title: '个人中心' }
         },
+        {
+            path: '/success',
+            component: () => import('../views/join/success'),
+            // meta: { title: '个人中心' }
+        },
         {
             path: '*',
             redirect: '/404'
@@ -180,7 +185,7 @@ router.beforeEach(function(to, from, next) {
     // 根据路由元信息设置文档标题
     window.document.title = to.meta.title || '中台';
     //使用钩子函数对路由进行权限跳转
-    if (!sessionStorage.getItem('token') && to.path !== '/login' && to.path !== '/join') {
+    if (!sessionStorage.getItem('token') && to.path !== '/login' && to.path !== '/join' && to.path !== '/success') {
         next('/login');
     } else {
         next();

src/setting.js

@@ -10,8 +10,8 @@ let host = `${location.origin}:9000/`
 if (isDev) {
     jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
     // host = 'http://39.108.250.202:9000/'
-    host = 'http://192.168.31.151:9000/'// 榕
+    // host = 'http://192.168.31.151:9000/'// 榕
-    // host = 'http://192.168.31.137:9000/'// 赓
+    host = 'http://192.168.31.137:9000/'// 赓
 } else if (isPro) {
     jumpPath = "http://www.huorantech.cn/judgmentPoint/";
 }

src/utils/api.js

@@ -269,5 +269,6 @@ export default {
     partnerAccountList: `nakadai/partnerAccount/partnerAccountList`,
     savePartnerAccount: `nakadai/partnerAccount/savePartnerAccount`,
     generateInvitationCode: `nakadai/partnerAccount/generateInvitationCode`,
-    generationQrCode: `nakadai/partnerAccount/generationQrCode `,
+    generationQrCode: `nakadai/partnerAccount/generationQrCode`,
+    queryUserInfoByPhone: `nakadai/partner-team/queryUserInfoByPhone`,
 };

src/views/join/index.vue

@@ -11,14 +11,14 @@
       </div>
       <div class="inner">
         <el-form class="form" ref="form" :model="form" :rules="rules">
+          <el-form-item prop="phone">
+              <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11" @change="phoneChange"></el-input>
+          </el-form-item>
           <el-form-item prop="userName">
-              <el-input v-model.trim="form.userName" placeholder="请输入姓名"></el-input>
+              <el-input v-model.trim="form.userName" placeholder="请输入姓名" :disabled="repeat"></el-input>
           </el-form-item>
           <el-form-item prop="account">
-              <el-input v-model.trim="form.account" placeholder="请输入账号"></el-input>
+              <el-input v-model.trim="form.account" placeholder="请输入账号" :disabled="repeat"></el-input>
-          </el-form-item>
-          <el-form-item prop="phone">
-              <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11"></el-input>
           </el-form-item>
           <el-form-item prop="code">
               <div class="ver-code">
@@ -44,7 +44,7 @@ export default {
             form: {
               id: this.$route.query.accountId,
               partnerClassificationId: this.$route.query.id,
-              isTeam: 0,
+              isTeam: this.$route.query.isTeam, // 移动端创建的为成员(0)，pc创建的为团队(1)
               account: '',
               phone: '',
               code: '',
@@ -64,6 +64,7 @@ export default {
                 { required: true, message: "请输入验证码", trigger: 'blur' }
               ]
             },
+            repeat: false, // 是否有已存在用户，有的话禁填用户名和账号
             phoneDisabled: false,
             phoneTimer: null,
             phoneOpener: '',
@@ -122,6 +123,25 @@ export default {
           }
         }).catch(res => {})
       },
+      // 手机号输入完后，带出信息
+      phoneChange() {
+        // 添加成员才需要
+        if (!this.form.isTeam) {
+          const { form } = this
+          this.$get(this.api.queryUserInfoByPhone, {
+            phone: form.phone
+          }).then(({ info }) => {
+            // 返回了信息，则赋值，并禁止输入
+            if (info) {
+              this.repeat = true
+              form.account = info.account
+              form.userName = info.userName
+            } else {
+              this.repeat = false
+            }
+          }).catch(res => {})
+        }
+      },
       // 提交
       submit() {
         this.$refs.form.validate((valid) => {
@@ -132,13 +152,9 @@ export default {
             if (this.emailRepeat) return util.warningMsg("该邮箱已存在")
             const { form } = this
             form.uniqueIdentification = Date.now()
-            form.isTeam = this.isMobile ? 0 : 1 // 移动端创建的为成员(0)，pc创建的为团队(1)
             this.submiting = true
             this.$post(this.api.savePartnerAccount, form).then(res => {
-              util.successMsg('加入成功！')
+              this.$router.push('/success')
-              setTimeout(() => {
-                location.reload()
-              }, 1000)
             }).catch(res => {
               this.submiting = false
             })

src/views/join/success.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="wrap">
+    <div class="inner">
+      <div class="icon">
+        <i class="el-icon-success icon"></i>
+        <p class="tips">加入成功</p>
+      </div>
+      <p class="text">你已加入城市合伙人计划</p>
+      <p class="text">请保存并用微信扫以下二维码打开城市合伙人小程序</p>
+      <img class="qrcode" src="@/assets/img/mini-code1.png" alt="">
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+          
+        };
+    },
+    mounted() {
+      
+    },
+    methods: {
+      
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-color: #f3f6fa;
+}
+.inner {
+  width: 436px;
+  padding: 50px 0;
+  text-align: center;
+  border-radius: 6px;
+  background-color: #fff;
+  border-radius: 10px;
+  overflow: hidden;
+  .icon {
+    font-size: 40px;
+    color: #007eff;
+  }
+  .tips {
+    margin: 10px 0;
+    font-size: 20px;
+  }
+  .text {
+    margin-bottom: 15px;
+    font-size: 14px;
+  }
+  .qrcode {
+    width: 200px;
+  }
+}
+@media (max-width: 720px) {
+  .inner {
+    width: 90%;
+  }
+}
+</style>

src/views/parner/staff.vue

@@ -256,7 +256,11 @@ export default {
           list.map(e => {
             e.ids = ids ? [...ids, e.id] : [e.id]
             if (e.children.length) {
-              handleLeaf(e.children, e.ids)
+              if (e.isTeam) {
+                delete e.children
+              } else {
+                handleLeaf(e.children, e.ids)
+              }
             } else {
               delete e.children
             }
@@ -428,7 +432,7 @@ export default {
             this.expireTime = `${date.getFullYear()}-${util.preZero(date.getMonth() + 1)}-${util.preZero(date.getDate())} ${util.preZero(date.getHours())}:${util.preZero(date.getMinutes())}:${util.preZero(date.getMinutes())}`
             this.parnerVisible = true
             const cur = this.$refs.orgTree.getCurrentKey()
-            const link = `${location.origin}${Setting.isDev || Setting.isPro ? '' : '/nakadai'}/#/join?accountId=${accountId}&id=${cur || ''}`
+            const link = `${location.origin}${Setting.isDev || Setting.isPro ? '' : '/nakadai'}/#/join?accountId=${accountId}&id=${cur || ''}&isTeam=1`
 
             // 生成二维码
             this.link = link

src/views/system/manageLog.vue

@@ -42,8 +42,10 @@
                                 </span>
                             </div>
                             <div>
-                              <span class="withdraw" v-if="item.withdraw && !item.revoke">已撤回</span>
+                              <template v-if="!i">
-                              <el-button v-if="item.revoke" style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button>
+                                <span class="withdraw" v-if="item.withdraw && !item.revoke">已撤回</span>
+                                <el-button v-if="item.revoke" style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button>
+                              </template>
                               <el-switch v-model="item.open" :active-value="0" :inactive-value="1" @change="switchOff($event, item)" v-auth="'/system:日志更新:管理:开启日志'"></el-switch>
                             </div>
                             

src/views/system/staff.vue

@@ -672,7 +672,6 @@ export default {
               })
             } else {
               form.uniqueIdentification = new Date().getTime()
-              form.userAvatars = this.$store.state.avatar
               this.$post(this.api.saveStaff, form).then(res => {
                 util.successMsg("新增成功！")
                 this.staffVisible = false