fixbug:充值限制添加

config/index.js

@@ -26,7 +26,7 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/api": {
-        target: "http://192.168.31.127:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+        target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
         // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
@@ -34,7 +34,7 @@ module.exports = {
         // target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联
         // target: "http://139.9.185.131:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
         // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上
-        target: "https://www.decaisoft.com/preferential", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上
+        // target: "https://www.decaisoft.com/preferential", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上
         // target: 'http://124.71.99.140:8084/', //设置你调用的接口域名和端口号 别忘了加http 线上
         // target: 'http://124.71.99.140:8081/', //设置你调用的接口域名和端口号 别忘了加http 测试
         // target: 'https://www.decaisoft.com:8088/', //设置你调用的接口域名和端口号 别忘了加http 测试
@@ -47,7 +47,7 @@ module.exports = {
     },
     // Various Dev Server settingsss
     host: "192.168.31.193", // can be overwritten by process.env.HOST
-    host: "192.168.31.35", // can be overwritten by process.env.HOST
+    // host: "192.168.31.35", // can be overwritten by process.env.HOST
     port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/components/staffList/admin/index.vue

@@ -21,7 +21,7 @@
     </el-table>
     <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
       <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
-      <el-button size="mini" type="primary" plain @click="(staffLists.push({brandNumber:'',staffName:'',ratio:0}))">增加</el-button>
+      <el-button size="mini" type="primary" plain @click="handleadd">增加</el-button>
     </div>
   </div>
 </template>
@@ -39,6 +39,10 @@ export default {
     };
   },
   methods: {
+    handleadd(){
+      if(this.staffLists.length>=4) return this.$message({message: '最多只能添加四条',type: 'warning'});
+      this.staffLists.push({brandNumber:'',staffName:'',ratio:0})
+    },
     rowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },

src/components/staffList/manager/index.vue

@@ -27,7 +27,7 @@
     <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
       <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
       <el-button size="mini" type="primary" plain
-        @click="(staffLists.push({ brandNumber: '', staffName: '', ratio: 0 }))">增加
+        @click="handleadd">增加
       </el-button>
     </div>
   </div>
@@ -45,6 +45,10 @@ export default {
     };
   },
   methods: {
+    handleadd(){
+      if(this.staffLists.length>=4)return this.$message({message: '最多只能添加四条',type: 'warning'});
+      this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
+    },
     rowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },

src/components/staffList/staff/index.vue

@@ -26,7 +26,7 @@
     <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
       <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
       <el-button size="mini" type="primary" plain
-        @click="(staffLists.push({ brandNumber: '', staffName: '', ratio: 0 }))">增加
+        @click="handleadd">增加
       </el-button>
     </div>
   </div>
@@ -46,6 +46,10 @@ export default {
     };
   },
   methods: {
+    handleadd(){
+      if(this.staffLists.length>=4)return this.$message({message: '最多只能添加四条', type: 'warning'});
+      this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
+    },
     rowClassName({ row, rowIndex }) {
       row.index = rowIndex;
     },

src/home/components/top_right.vue

@@ -6,9 +6,9 @@
     <div class="nwwest-roll" id="nwwest-roll">
       <ul id="roll-ul" style="list-style:none;">
         <li v-for="(item,index) in activityList" ref="rollul" :class="{anim:animate==true}" :key="index" @click="openPromotion(item,promotionDialog=true)">
-          ＞＞＞ <div class="nwwest-roll-div"><span style="display: inline-block;" :title="item.promotionName">{{item.promotionName}} </span>
+          &gt;&gt;&gt; <div class="nwwest-roll-div"><span style="display: inline-block;" :title="item.promotionName">{{item.promotionName}} </span>
             <div style="display: inline-block;" class="text-red text-price">{{item.saleMoney}}</div>
-          </div> <span>＜＜＜</span>
+          </div> <span>&lt;&lt;&lt;</span>
         </li>
       </ul>
     </div>

src/layout/components/Emain.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="padding-top padding-left padding-right">
-      <transition name="el-fade-in-linear" mode="out-in">
+      <transition name="fade" mode="out-in">
         <keep-alive>
           <router-view />
         </keep-alive>
@@ -153,6 +153,12 @@ export default {
 };
 </script>
 <style scoped>
+.fade-enter-active, .fade-leave-active {
+  transition: all 0.6s;
+}
+.fade-enter, .fade-leave-to {
+    opacity: 0;
+}
 .tags {
   overflow: hidden;
   padding-left: 20px;

src/layout/components/asider.vue

@@ -656,6 +656,7 @@ export default {
               route: "/managers",
               index: "managers",
               number: "4001200",
+              id:"100010008",
             },
             {
               name: "管理层业绩",
@@ -663,6 +664,7 @@ export default {
               route: "/admins",
               index: "admins",
               number: "4001300",
+              id:"100010009",
             },
 
             {
@@ -671,6 +673,7 @@ export default {
               route: "/dept",
               index: "dept",
               number: "4001400",
+              id:"1000100010",
             },
             // {
             //   name: "员工工资",
@@ -998,7 +1001,6 @@ export default {
     },
   },
   created() {
-    console.log(this.$utils.getPermission(6001100))
     var that = this;
     let menuList = [...that.menuList];
     setTimeout(() => {