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

components/mobile/staffManagement/StaffList.vue

@@ -34,7 +34,7 @@
                 <div class="list-item"><span>姓名：</span><span v-text="item.userName">张洪别</span></div>
                 <!--<div class="list-item"><span>性别：</span><span v-text="(item.userSex === 'F' || item.userSex === '女') ? '女' : (item.userSex === 'M' || item.userSex === '男') ? '男' : '-'">男</span></div>-->
                 <div class="list-item"><span>手机：</span><span v-text="item.userTel">12345678901</span></div>
-                <div class="list-item"><span>邮箱：</span><span v-text="item.userEmail">12345678901</span></div>
+                <div class="list-item"><span>邮箱：</span><span v-text="item.userEmail || '-'">12345678901</span></div>
                 <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">
@@ -58,7 +58,7 @@
                 <div class="list-item"><span>用户名：</span><span v-text="item.user.vipName"></span></div>
                 <!--<div class="list-item"><span>UU账号：</span><span v-text="item.user.userUU">100000721</span></div>-->
                 <div class="list-item"><span>手机：</span><span v-text="item.user.mobile">12345678901</span></div>
-                <div class="list-item"><span>邮箱：</span><span v-text="item.user.email">12345678901</span></div>
+                <div class="list-item"><span>邮箱：</span><span v-text="item.user.email || '-'">12345678901</span></div>
               </div>
               <div class="list-footer">
                 <div class="edit handle" @click="agreeEvent(item, '1')"><i class="iconfont icon-check-circle"></i><span>同意</span></div>