Merge branch 'feature/4月-菜单和权限' into dev

src/components/layout/components/user-info.vue

@@ -4,7 +4,7 @@
       <img v-if="userInfo.headImg" :src="userInfo.headImg" alt="" class="logo-img" />
       <img v-else src="../images/user-default.png" alt="" class="logo-img" />
       <span class="realname-box">
-        <span class="realname">{{ userInfo.staffName }}</span>
+        <span class="realname">{{ userInfo.clerkName }}</span>
         <i class="el-icon-arrow-down user-info-arrow"></i>
       </span>
     </span>

src/components/set/secret-set.vue

@@ -92,7 +92,7 @@ export default {
      */
     getBrandData() {
       const that = this;
-      postRequest('/haoban-manage3-web/wx-enterprise-list', {})
+      postRequest('/haoban-manage3-web/wx-enterprise-list', { filteRight: 1 })
         .then(res => {
           let resData = res.data;
           if (resData.errorCode == 1) {

src/views/enterprise/enterpriseSet.vue

@@ -98,14 +98,14 @@
               <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">代开发应用secret：</span>
             </el-tooltip>
           </span>
-          <el-input class="m-l-10 w-399" maxlength="200" v-model="application.secretVal"></el-input>
+          <el-input class="m-l-10 w-399" maxlength="200" :value="application.secretVal" disabled></el-input>
           <span v-if="haobanObj.updateTime" class="m-l-20 font-12 color-909399">最后一次授权：{{ application.updateTime | formatTimeStamp }}</span>
         </div>
         <div class="m-b-20 secret-cell" v-show="paymentObj.secretVal">
           <span class="inline-block w-127">
             <span class="font-14 color-606266">企微支付secret：</span>
           </span>
-          <el-input class="m-l-10 w-399" maxlength="200" v-model="paymentObj.secretVal"></el-input>
+          <el-input class="m-l-10 w-399" maxlength="200" :value="paymentObj.secretVal" disabled></el-input>
         </div>
         <div class="secret-cell m-b-20">
           <el-tooltip class="item" effect="dark" content="企业微信中【应用管理】关联的会员小程序secret，请复制后更新至此处。首次使用好办请输入。" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">会员小程序secret：</span></el-tooltip>