Merge remote-tracking branch 'origin/release-201821-wangcz' into release-201821-wangcz

components/mobile/staffManagement/StaffAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="seek" @click="showChooseSex === false">
+  <div class="seek">
     <div class="com-mobile-header mobile-center-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>新增账户</p>
@@ -16,7 +16,7 @@
             <li><span>姓名：</span><input type="text" v-model="newUserName" placeholder="请输入用户名"></li>
             <li style="overflow: visible;"><span>性别：</span>
               <div class="sex-filter">
-                <div class="select-wrap" @click="openChoose">{{sex === 'M' ? '男' : '女'}}<i class="iconfont icon-arrow-down"></i></div>
+                <div class="select-wrap" @click.stop="openChoose">{{sex === 'M' ? '男' : '女'}}<i class="iconfont icon-arrow-down"></i></div>
                 <ul class="select-list" v-if="showChooseSex">
                   <li v-show="sex != 'M'" @click="chooseSex('M')">男</li>
                   <li v-show="sex != 'F'" @click="chooseSex('F')">女</li>
@@ -108,12 +108,20 @@
         return this.$store.state.option.user.data
       }
     },
+    mounted () {
+      this.$nextTick(() => {
+        window.addEventListener('click', () => {
+          console.log(1)
+          this.showChooseSex = false
+        }, false)
+      })
+    },
     methods: {
       setSwitchType (type) {
         this.switchType = type
       },
       openChoose () {
-        this.showChooseSex = true
+        this.showChooseSex = !this.showChooseSex
       },
       chooseSex (info) {
         this.sex = info

components/mobile/staffManagement/StaffList.vue

@@ -9,9 +9,9 @@
     <div class="mobile-fix-content mobile-centerfix-content" id="mobile-staff-center">
       <!--列表-->
       <div v-if="activeTab === 0">
-        <div class="staff-head">
+        <div class="staff-head" v-show="isAdmin">
           <span class="inline-block" :class="{'active': switchType === 'info'}" @click="setSwitchType('info')">员工信息</span>
-          <span v-show="isAdmin" class="inline-block" :class="{'active': switchType === 'Audit'}" @click="setSwitchType('Audit')">审核绑定</span>
+          <span class="inline-block" :class="{'active': switchType === 'Audit'}" @click="setSwitchType('Audit')">审核绑定</span>
         </div>
         <div class="staff-record" v-if="switchType === 'info'">
           <div class="search-content clearfix">
@@ -38,10 +38,8 @@
                 <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)" v-show="isAdmin" class="edit handle"><i class="iconfont icon-edit"></i><span>编辑</span></div>
-                <div v-show="!isAdmin" class="edit handle" @click="isOrAdmin = true"><i class="iconfont icon-edit"></i><span>编辑</span></div>
-                <div @click="openDelete(item)" v-show="isAdmin" class="delete handle"><i class="iconfont icon-lajitong"></i><span>删除</span></div>
-                <div v-show="!isAdmin" class="delete handle" @click="isOrAdmin = true"><i class="iconfont icon-lajitong"></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>
           </div>
@@ -105,16 +103,6 @@
         </div>
       </div>
     </div>
-    <!--是否是管理员弹框-->
-    <div class="deleteKuang" v-if="isOrAdmin">
-      <div class="kuangContent">
-        <div class="title">温馨提示</div>
-        <div class="titleinfo">您不是管理员，不行进行操作！</div>
-        <div class="K_btn">
-          <div class="answerBtn" @click="isOrAdmin = false">确定</div>
-        </div>
-      </div>
-    </div>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
   </div>
 </template>
@@ -144,8 +132,7 @@
         currentStaff: [],
         isValid: true,
         role: '全部角色',
-        showRole: false,
-        isOrAdmin: false
+        showRole: false
       }
     },
     components: {
@@ -173,7 +160,7 @@
       'staffData': {
         handler: function (val) {
           if (this.isChange) {
-            this.staffDataList = []
+            this.staffDataList = val.content
             this.isChange = false
           }
           this.staffDataList = [...this.staffDataList, ...val.content]
@@ -245,8 +232,16 @@
       },
       // 员工列表删除员工
       openDelete (item) {
-        this.currentObject = item
-        this.showDelete = true
+        if (this.isAdmin) {
+          if (item.userUU === this.userInfo.userUU) {
+            this.onRemind('自己不可修改自己')
+          } else {
+            this.currentObject = item
+            this.showDelete = true
+          }
+        } else {
+          this.onRemind('您不是管理员不可修改')
+        }
       },
       // 员工列表确认删除
       sureDelete () {
@@ -308,16 +303,25 @@
       },
       // 员工列表当前选中对象
       goEdit (item) {
-        let currentData = item
-        this.currentStaff = this.baseUtils.deepCopy(currentData)
-        this.activeTab = 1
-        for (let i = 0; i < this.currentStaff.roles.length; i++) {
-          for (let j = 0; j < this.rolesList.length; j++) {
-            //判断已绑定角色
-            if (this.currentStaff.roles[i].id === this.rolesList[j].id) {
-              this.rolesList[j].checked = true
+        console.log(this.userInfo)
+        if (this.isAdmin) {
+          if (item.userUU === this.userInfo.userUU) {
+            this.onRemind('自己不可修改自己')
+          } else {
+            let currentData = item
+            this.currentStaff = this.baseUtils.deepCopy(currentData)
+            this.activeTab = 1
+            for (let i = 0; i < this.currentStaff.roles.length; i++) {
+              for (let j = 0; j < this.rolesList.length; j++) {
+                //判断已绑定角色
+                if (this.currentStaff.roles[i].id === this.rolesList[j].id) {
+                  this.rolesList[j].checked = true
+                }
+              }
             }
           }
+        } else {
+          this.onRemind('您不是管理员不可修改')
         }
       },
       // 员工列表选择角色

components/store/home/RecommendPcb.vue

@@ -17,7 +17,7 @@
       <div  v-if="commodities.length>0">
         <div  v-if="commodities.length<=4">
           <ul class="recommend-list clearfix">
-            <li v-for="commodity in commodities.slice(0,4)" class="big">
+            <li v-for="commodity in commodities.slice(0,3)" class="big">
               <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
                 <div class="img">
                   <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>
@@ -54,7 +54,7 @@
           </div>
           <div class="swiper-slide" v-if="commodities.length>4">
             <ul class="recommend-list clearfix">
-              <li v-for="commodity in commodities.slice(4,7)" class="big">
+              <li v-for="commodity in commodities.slice(4,8)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
                   <div class="img">
                     <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>
@@ -71,7 +71,7 @@
           </div>
           <div class="swiper-slide" v-if="commodities.length>8">
             <ul class="recommend-list clearfix">
-              <li v-for="commodity in commodities.slice(8,11)" class="big">
+              <li v-for="commodity in commodities.slice(8,12)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
                   <div class="img">
                     <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>
@@ -88,7 +88,7 @@
           </div>
           <div class="swiper-slide" v-if="commodities.length>12">
             <ul class="recommend-list clearfix">
-              <li v-for="commodity in commodities.slice(12,15)" class="big">
+              <li v-for="commodity in commodities.slice(12,16)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
                   <div class="img">
                     <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>