Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/public/install/crmeb.sql

@@ -33531,8 +33531,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1),
 (430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1),
 (431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1),
-(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1),
-(433, 'network_security', 'text', 'input', 26, '', 1, '', 100, 0, '\"\"', '网安备案', '公安部门登记的备案信息，显示在pc底部', 0, 1);
+(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1);
 
 -- --------------------------------------------------------
 

template/admin/src/i18n/lang/zh-cn.js

@@ -73,7 +73,7 @@ export default {
     dropdown3: '404',
     dropdown4: '401',
     dropdown5: '退出登录',
-    dropdown6: '代码仓库',
+    dropdown6: '个人中心',
     searchPlaceholder: '菜单搜索：支持中文、路由路径',
     newTitle: '通知',
     newBtn: '全部已读',

template/admin/src/layout/component/columnsAside.vue

@@ -209,6 +209,8 @@ export default {
   height: 100%;
   background: var(--prev-bg-columnsMenuBar);
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  border-right: 1px solid var(--prev-border-color-lighter);
+
   ul {
     position: relative;
     li {

template/admin/src/layout/navBars/breadcrumb/index.vue

@@ -79,6 +79,6 @@ export default {
   padding-right: 15px;
   overflow: hidden;
   background: var(--prev-bg-topBar);
-  //   border-bottom: 1px solid var(--prev-border-color-lighter);
+  border-bottom: 1px solid var(--prev-border-color-lighter);
 }
 </style>

template/admin/src/layout/navBars/breadcrumb/setings.vue

@@ -196,7 +196,7 @@
             <el-switch v-model="getThemeConfig.isTagsview" :width="35" @change="setLocalThemeConfig"></el-switch>
           </div>
         </div>
-        <div class="layout-breadcrumb-seting-bar-flex mt15">
+        <div class="layout-breadcrumb-seting-bar-flex mt15" v-if="getThemeConfig.isTagsview">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
             <el-switch v-model="getThemeConfig.isTagsviewIcon" :width="35" @change="setLocalThemeConfig"></el-switch>
@@ -233,10 +233,10 @@
 
         <!-- 其它设置 -->
         <el-divider :content-position="contentPosotion">{{ $t('message.layout.fiveTitle') }}</el-divider>
-        <div class="layout-breadcrumb-seting-bar-flex mt15">
+        <div class="layout-breadcrumb-seting-bar-flex mt15" v-if="getThemeConfig.isTagsview">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-select
+            <!-- <el-select
               v-model="getThemeConfig.tagsStyle"
               placeholder="请选择"
               size="mini"
@@ -246,16 +246,21 @@
               <el-option label="风格1" value="tags-style-one"></el-option>
               <el-option label="风格2" value="tags-style-four"></el-option>
               <el-option label="风格3" value="tags-style-five"></el-option>
-            </el-select>
+            </el-select> -->
+            <el-radio-group v-model="getThemeConfig.tagsStyle" size="mini" @change="setLocalThemeConfig">
+              <el-radio-button label="tags-style-one">卡片</el-radio-button>
+              <el-radio-button label="tags-style-four">灵动</el-radio-button>
+              <el-radio-button label="tags-style-five">圆滑</el-radio-button>
+            </el-radio-group>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
             <el-radio-group v-model="getThemeConfig.animation" size="mini" @change="setLocalThemeConfig">
-              <el-radio-button label="slide-right">右滑</el-radio-button>
               <el-radio-button label="slide-left">左滑</el-radio-button>
               <el-radio-button label="opacitys">透明</el-radio-button>
+              <el-radio-button label="slide-right">右滑</el-radio-button>
             </el-radio-group>
           </div>
         </div>

template/admin/src/layout/navBars/breadcrumb/user.vue

@@ -26,9 +26,7 @@
     <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
       <i class="el-icon-search" :title="$t('message.user.title2')"></i>
     </div>
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-      <i class="el-icon-star-off" :title="$t('message.user.title3')"></i>
-    </div>
+
     <div class="layout-navbars-breadcrumb-user-icon">
       <el-popover
         placement="bottom"
@@ -58,14 +56,18 @@
         <i class="el-icon-arrow-down el-icon--right"></i>
       </span>
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item :command="homePath">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-        <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
-        <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-        <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
-        <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item :command="homePath">{{ $t('message.user.dropdown1') }}</el-dropdown-item> -->
+        <el-dropdown-item command="user">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
+        <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
         <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
+    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
+      <i class="el-icon-setting" :title="$t('message.user.title3')"></i>
+    </div>
     <Search ref="searchRef" />
   </div>
 </template>
@@ -225,7 +227,8 @@ export default {
             })
             .catch(() => {});
         }, 150);
-      } else if (path === 'wareHouse') {
+      } else if (path === 'user') {
+        this.$router.push({ name: 'systemUser' });
       } else {
         this.$router.push(path);
       }

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -252,8 +252,7 @@ export default {
           this.closeCurrentTagsView(path);
           break;
         case 2:
-          this.$router.push({ path, query: currentTag.query });
-          this.closeOtherTagsView(path);
+          this.closeOtherTagsView(path, currentTag.query);
           break;
         case 3:
           this.closeAllTagsView(path);
@@ -284,20 +283,22 @@ export default {
       //   this.addBrowserSetSession(this.tagNavList);
     },
     // 3、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
-    closeOtherTagsView(path) {
+    closeOtherTagsView(path, query) {
       let tagsViewList = [];
       this.tagsViewRoutesList.map((v) => {
-        if (v.meta.isAffix && !v.meta.isHide) tagsViewList.push({ ...v });
-        if ((v.path = path)) tagsViewList.push({ ...v });
+        if ((v.meta && v.meta.isAffix) || v.path === path) tagsViewList.push({ ...v });
       });
+      console.log(tagsViewList, this.tagsViewRoutesList, path);
       this.addBrowserSetSession(tagsViewList);
+      this.$router.push({ path, query });
+
       // this.addTagsView(path);
     },
     // 4、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
     closeAllTagsView(path) {
       let tagsViewList = [];
       this.tagsViewRoutesList.map((v) => {
-        if (v.meta.isAffix && !v.meta.isHide) {
+        if (v.meta.isAffix) {
           tagsViewList.push({ ...v });
           if (tagsViewList.some((v) => v.path === path)) this.$router.push({ path, query: this.$route.query });
           else this.$router.push({ path: v.path, query: this.$route.query });
@@ -326,6 +327,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+/deep/ .el-scrollbar__bar.is-horizontal {
+  height: 0;
+}
 .layout-navbars-tagsview {
   flex: 1;
   background-color: var(--prev-bg-white);
@@ -370,9 +374,9 @@ export default {
         background: var(--prev-tag-active-color);
         z-index: -1;
         opacity: 0;
-        transform: scale3d(0.7, 1, 1);
-        transition: transform 0.3s, opacity 0.3s;
-        transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
+        // transform: scale3d(0.7, 1, 1);
+        // transition: transform 0.3s, opacity 0.3s;
+        // transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
       }
       &:hover {
         color: var(--prev-color-primary-light-9);
@@ -444,6 +448,7 @@ export default {
       border: none !important;
       position: relative;
       border-radius: 3px !important;
+
       .layout-icon-active {
         display: none;
       }

template/admin/src/pages/setting/devisePage/index.vue

@@ -55,8 +55,6 @@ export default {
     if (Number(this.$route.query.type) === 1) {
       this.iframeUrl = `${moveLink}/pages/index/index?mdType=iframeWindow`;
     } else {
-      // this.iframeUrl = `https://v4.wuht.net/pages/index/index?type=iframeWindow`;
-
       this.iframeUrl = `${location.origin}/pages/index/index?mdType=iframeWindow`;
     }
     diyGetInfo(parseInt(pageId)).then((datas) => {

template/admin/src/pages/system/codeGeneration/components/TableForm.vue

@@ -17,7 +17,11 @@
           <Input :disabled="disabledInput(index)" v-model="tableField[index].field"></Input>
         </template>
         <template slot-scope="{ row, index }" slot="field_type">
-          <Select v-model="tableField[index].field_type" @on-change="changeItemField($event, index)">
+          <Select
+            v-model="tableField[index].field_type"
+            :disabled="disabledInput(index)"
+            @on-change="changeItemField($event, index)"
+          >
             <Option v-for="item in columnTypeList" :value="item" :key="item">{{ item }}</Option>
           </Select>
         </template>

template/admin/src/pages/system/codeGeneration/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <Button type="primary" @click="groupAdd()" class="mr20">代码生成</Button>
+      <Button type="primary" @click="groupAdd()" class="mr20">添加功能</Button>
       <!-- <Button type="success" @click="buildCode()" class="mr20">重新发布</Button> -->
       <Table
         :columns="columns1"