Merge remote-tracking branch 'origin/feature-201825-wangcz' into feature-201825-wangcz

components/mobile/staffManagement/StaffList.vue

@@ -38,7 +38,7 @@
                 <div class="list-item"><span>角色：</span><span class="role" v-for="role in item.roles" v-text="role.desc ? role.desc.slice(0,2) : ''" v-bind:class="'bg' + role.color">普通</span></div>
               </div>
               <div class="list-footer">
-                <div @click="goEdit(item)" class="edit handle"><i class="iconfont icon-edit"></i><span>编辑</span></div>
+                <div @click="goEdit(item)" class="edit handle"><i class="iconfont icon-edit"></i><span>维护角色</span></div>
                 <div @click="openDelete(item)" class="delete handle"><i class="iconfont icon-lajitong"></i><span>删除</span></div>
               </div>
             </div>

components/provider/ToggleStore.vue

@@ -96,13 +96,14 @@ export default {
       return this.$store.state.provider.stores.originalCount.data
     },
     count () {
+      console.log(this.$store.state.option.counter.data)
       let allCount =  this.$store.state.option.counter.data ? this.$store.state.option.counter.data : []
       if (allCount) {
         allCount.forEach((value) => {
-          if (value.item === '供应商') {
+          if (value.detno === 2 && value.usedFor === 'mall_home_banner') {
             this.supplierArr.push(value.count)
           }
-          if (value.item === '品   牌') {
+          if (value.detno === 1 && value.usedFor === 'b2c_index') {
             this.brandArr.push(value.count)
           }
         })