Merge branch 'develop' into 'test'

src/components/Dialog/UserDialog.vue

@@ -22,6 +22,7 @@
           :customerId="customerId"
           :visible="visible"
           :showMoney="showMoney"
+          :showCellphone="showCellphone"
           ref="userContent"
         >
           <button
@@ -65,6 +66,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showCellphone: {
+      type: Boolean,
+      default: false,
+    },
   },
   mixins: [Popup],
   // mounted() {

src/components/Dialog/UserDialogWrap.js

@@ -77,6 +77,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showCellphone: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

src/components/UserCard/UserCard.vue

@@ -73,7 +73,8 @@
               <span>{{getTypeLabel(customerType)}}</span>
             </div>
             <div class="UserInfo-Name-Col">
-              <span>{{$formatePhone(customerPhone)}}</span>
+              <span v-if="showCellphone">{{customerPhone}}</span>
+              <span v-else>{{$formatePhone(customerPhone)}}</span>
               <span>{{getSexLabel(customerSex)}}</span>
             </div>
           </div>
@@ -144,6 +145,10 @@ export default {
     showEdit: { type: Function, default: () => {} },
     showAccount: { type: Function, default: () => {} },
     toggleLock: { type: Function, default: () => {} },
+    showCellphone: {
+      type: Boolean,
+      default: false,
+    },
   },
   mixins: [getUserInfoLabelMixin],
   data() {

src/components/UserCard/UserInfo.vue

@@ -15,7 +15,8 @@
           <span>{{getTypeLabel(customerBaseInfo.customerType)}}</span>
         </div>
         <div class="UserInfo-Name-Col">
-          <span>{{$formatePhone(customerBaseInfo.customerPhone)}}</span>
+          <span v-if="showCellphone">{{customerBaseInfo.customerPhone}}</span>
+          <span v-else>{{$formatePhone(customerBaseInfo.customerPhone)}}</span>
           <span>{{getSexLabel(customerBaseInfo.customerSex)}}</span>
         </div>
       </div>
@@ -84,6 +85,12 @@ import UserBaseInfoMixin from '../../mixins/user/userBaseInfo.js';
 import getUserInfoLabelMixin from '@/mixins/user/getUserInfoLabel.js';
 
 export default {
+  props: {
+    showCellphone: {
+      type: Boolean,
+      default: false,
+    },
+  },
   mixins: [UserBaseInfoMixin, getUserInfoLabelMixin],
 };
 </script>

src/components/UserCard/UserWithContent.vue

@@ -6,6 +6,7 @@
         :customerId="customerId"
         :customerPhone="customerPhone"
         :showMoney="showMoney"
+        :showCellphone="showCellphone"
         :visible="visible"
         ref="UserInfo"
       />