tplus-member 3.26.15 → 3.27.4

package/dist/views/MemberStoreNew.less

@@ -1,231 +1,231 @@
-
-.memberContainer1[role='dialog'] {
-    z-index: 1002 !important;
-}
-.memberContainer1 {
-    .ant-modal {
-       height: 574px !important;
-       width : 800px !important;
-       .ant-modal-header {
-            border-bottom: 1px solid #E6E6EB !important;
-            height: 54px;
-            line-height: 54px;
-        }
-    }
-    .ant-modal-body {
-        height: 514px !important;
-        overflow:hidden !important;
-    }
-
-    .ant-modal-footer {
-        display: none;
-    }
-
-    .ant-modal-title {
-        font-size: 16px !important;
-        line-height: 54px;
-        padding: 4px 0 0 10px;
-    }
-
-    .ant-modal-close {
-        color: rgba(0, 0, 0, 0.45);
-    }
-
-    .memberstore {
-        .memberstore-head {
-            display        : flex;
-            justify-content: flex-start;
-            align-items    : center;
-            width          : 100%;
-            height         : 88px;
-            margin-left: 38px;
-
-            .imageContainer {
-                font-family   : PingFang-SC-Regular;
-                display: flex;
-                align-items: center;
-                width: 200px;
-                img {
-                    display      : inline-block;
-                    width        : 69px;
-                    height       : 69px;
-                    border-radius: 50%;
-                }
-
-                .imageContainer-message {
-                    width       : 150px;
-                    text-align  : left;
-
-                    .divText{
-                        font-size     : 13px;
-                        color         : #000000;
-                        letter-spacing: 0;
-                        text-align    : left;
-                        white-space   : nowrap;
-                        text-overflow : ellipsis;
-                        overflow      : hidden;
-                        word-break    : break-all;
-                        height        : 16px;
-                        line-height   : 16px;
-                        padding: 0 2px;
-                    }
-
-                    .divBlank {
-                        height: 16px;
-                    }
-                }
-            }
-
-            .message {
-                text-align  : left;
-                position    : relative;
-                width       : 180px;
-                height      : 56px;
-                box-sizing  : border-box;
-                padding-left: 20px;
-                padding-top : 10px;
-
-                span:last-child {
-                    font-family: PingFang-SC-Regular;
-                    font-size  : 12px;
-                    color      : #666666;
-                    line-height: 12px;
-                }
-
-                span:first-child {
-                    font-family: PingFang-SC-Semibold;
-                    font-size  : 16px;
-                    color      : #FF595E;
-                    line-height: 12px;
-                }
-
-                &:before {
-                    content   : '';
-                    position  : absolute;
-                    top       : 13px;
-                    left      : 0px;
-                    width     : 1px;
-                    height    : 25px;
-                    background: #C8C8CD;
-                }
-            }
-        }
-
-        .line {
-            height          : 8px;
-            width           : 100%;
-            background-color: #F4F4F4;
-        }
-
-        .form {
-            height: 351px;
-            padding: 16px 10px;
-            .ant-form-item{
-                margin-bottom: 6px;
-            }
-            .ant-form-item-control-input-content {
-                display    : flex;
-                min-height: 34px;
-                // margin    : 0 !important;
-                // height: 32px;
-
-                .one {
-                    width        : 120px;
-                    font-size    : 14px;
-                    color        : #000000;
-                    text-align   : right;
-                    padding-right: 20px;
-                }
-
-                .two {
-                    font-size    : 14px;
-                    color        : #000000;
-                    width: 300px;
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                }
-            }
-            .storageAmount {
-                padding-top: 10px;
-                .one {
-                    width: 134px !important;
-                }
-                .two {
-                    width: 100% !important;
-                    // padding: 0 10px;
-                    .checkPresentDetails {
-                        height: 24px;
-                        font-size: 14px;
-                        font-family: 'PingFangSC-Medium';
-                        cursor: pointer;
-                    }
-                    .content {
-                        width: 256px;
-                        margin-top: 10px;
-                        margin-bottom: 10px;
-                    }
-                }
-            }
-            .gift {
-                .giftDetail {
-                    border: 1px solid #C8C8CD;
-                    padding: 8px 8px 0 8px;
-                    font-size: 14px;
-                    border-radius: 2px;
-                    width: 776px;
-                    height: 54px;
-                    overflow-x: scroll;
-                }
-            }
-        }
-
-        .line2 {
-            height          : 1px;
-            width           : 100%;
-            background-color: #E6E6EB;
-        }
-        .footer {
-            height     : 66px !important;
-            line-height: 50px;
-            padding: 10px 16px;
-            display: flex;
-            align-items: center;
-            justify-content: flex-end;
-            margin-top: 6px;
-        }
-    }
-}
-.presentModalWraper[role="dialog"]{
-    z-index: 1010 !important;
-}
-.presentModalWraper {
-    .ant-modal-header {
-        font-size: 18px;
-        border-bottom: 1px solid #E6E6EB !important;
-    }
-    .ant-modal-body {
-        height: 288px !important;
-    }
-    .ant-modal-footer {
-        border-top: 1px solid #E6E6EB !important;
-    }
-}
-
-.detailAmount {
-    display: flex;
-    flex-wrap: wrap;
-    max-height: 100px;
-    overflow-y: scroll;
-    span {
-        width: 150px;
-        height: 32px;
-        display: inline-block;
-        text-align: center;
-        vertical-align:middle;
-        border: 1px solid #C8C8CD;
-        margin: 10px 7px 7px 0;
-        line-height:32px;
-        font-size: 16px;
-    }
+
+.memberContainer1[role='dialog'] {
+    z-index: 1002 !important;
+}
+.memberContainer1 {
+    .ant-modal {
+       height: 574px !important;
+       width : 800px !important;
+       .ant-modal-header {
+            border-bottom: 1px solid #E6E6EB !important;
+            height: 54px;
+            line-height: 54px;
+        }
+    }
+    .ant-modal-body {
+        height: 514px !important;
+        overflow:hidden !important;
+    }
+
+    .ant-modal-footer {
+        display: none;
+    }
+
+    .ant-modal-title {
+        font-size: 16px !important;
+        line-height: 54px;
+        padding: 4px 0 0 10px;
+    }
+
+    .ant-modal-close {
+        color: rgba(0, 0, 0, 0.45);
+    }
+
+    .memberstore {
+        .memberstore-head {
+            display        : flex;
+            justify-content: flex-start;
+            align-items    : center;
+            width          : 100%;
+            height         : 88px;
+            margin-left: 38px;
+
+            .imageContainer {
+                font-family   : PingFang-SC-Regular;
+                display: flex;
+                align-items: center;
+                width: 200px;
+                img {
+                    display      : inline-block;
+                    width        : 69px;
+                    height       : 69px;
+                    border-radius: 50%;
+                }
+
+                .imageContainer-message {
+                    width       : 100px;
+                    text-align  : left;
+
+                    .divText{
+                        font-size     : 13px;
+                        color         : #000000;
+                        letter-spacing: 0;
+                        text-align    : left;
+                        white-space   : nowrap;
+                        text-overflow : ellipsis;
+                        overflow      : hidden;
+                        word-break    : break-all;
+                        height        : 16px;
+                        line-height   : 16px;
+                        padding: 0 2px;
+                    }
+
+                    .divBlank {
+                        height: 16px;
+                    }
+                }
+            }
+
+            .message {
+                text-align  : left;
+                position    : relative;
+                width       : 180px;
+                height      : 56px;
+                box-sizing  : border-box;
+                padding-left: 20px;
+                padding-top : 10px;
+
+                span:last-child {
+                    font-family: PingFang-SC-Regular;
+                    font-size  : 12px;
+                    color      : #666666;
+                    line-height: 12px;
+                }
+
+                span:first-child {
+                    font-family: PingFang-SC-Semibold;
+                    font-size  : 16px;
+                    color      : #FF595E;
+                    line-height: 12px;
+                }
+
+                &:before {
+                    content   : '';
+                    position  : absolute;
+                    top       : 13px;
+                    left      : 0px;
+                    width     : 1px;
+                    height    : 25px;
+                    background: #C8C8CD;
+                }
+            }
+        }
+
+        .line {
+            height          : 8px;
+            width           : 100%;
+            background-color: #F4F4F4;
+        }
+
+        .form {
+            height: 351px;
+            padding: 16px 10px;
+            .ant-form-item{
+                margin-bottom: 6px;
+            }
+            .ant-form-item-control-input-content {
+                display    : flex;
+                min-height: 34px;
+                // margin    : 0 !important;
+                // height: 32px;
+
+                .one {
+                    width        : 120px;
+                    font-size    : 14px;
+                    color        : #000000;
+                    text-align   : right;
+                    padding-right: 20px;
+                }
+
+                .two {
+                    font-size    : 14px;
+                    color        : #000000;
+                    width: 300px;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+            }
+            .storageAmount {
+                padding-top: 10px;
+                .one {
+                    width: 134px !important;
+                }
+                .two {
+                    width: 100% !important;
+                    // padding: 0 10px;
+                    .checkPresentDetails {
+                        height: 24px;
+                        font-size: 14px;
+                        font-family: 'PingFangSC-Medium';
+                        cursor: pointer;
+                    }
+                    .content {
+                        width: 256px;
+                        margin-top: 10px;
+                        margin-bottom: 10px;
+                    }
+                }
+            }
+            .gift {
+                .giftDetail {
+                    border: 1px solid #C8C8CD;
+                    padding: 8px 8px 0 8px;
+                    font-size: 14px;
+                    border-radius: 2px;
+                    width: 776px;
+                    height: 54px;
+                    overflow-x: scroll;
+                }
+            }
+        }
+
+        .line2 {
+            height          : 1px;
+            width           : 100%;
+            background-color: #E6E6EB;
+        }
+        .footer {
+            height     : 66px !important;
+            line-height: 50px;
+            padding: 10px 16px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            margin-top: 6px;
+        }
+    }
+}
+.presentModalWraper[role="dialog"]{
+    z-index: 1010 !important;
+}
+.presentModalWraper {
+    .ant-modal-header {
+        font-size: 18px;
+        border-bottom: 1px solid #E6E6EB !important;
+    }
+    .ant-modal-body {
+        height: 288px !important;
+    }
+    .ant-modal-footer {
+        border-top: 1px solid #E6E6EB !important;
+    }
+}
+
+.detailAmount {
+    display: flex;
+    flex-wrap: wrap;
+    max-height: 100px;
+    overflow-y: scroll;
+    span {
+        width: 150px;
+        height: 32px;
+        display: inline-block;
+        text-align: center;
+        vertical-align:middle;
+        border: 1px solid #C8C8CD;
+        margin: 10px 7px 7px 0;
+        line-height:32px;
+        font-size: 16px;
+    }
 }

package/dist/views/MemberStoreNewView.js

@@ -281,23 +281,20 @@ var MemberStoreNewView = (0, _mutantsMicrofx.observer)(_class = function (_Compo
                 StorageDetails = _ref10.StorageDetails;
 
             var _ref11 = storageAmountSpecData || {},
-                storageAmountSpecList = _ref11.storageAmountSpecList;
+                storageAmountSpecList = _ref11.storageAmountSpecList,
+                isCustomStorage = _ref11.isCustomStorage;
 
             // const { storageAmountSpecList } = storageAmountSpecData;
 
 
             var _ref12 = Member || {},
                 Name = _ref12.Name,
-                MemberMobile = _ref12.MemberMobile,
+                Mobilephone = _ref12.Mobilephone,
+                CardCode = _ref12.CardCode,
                 ImageFile = _ref12.ImageFile,
-                _ref12$BalanceStorage = _ref12.BalanceStorage,
-                BalanceStorage = _ref12$BalanceStorage === undefined ? 0 : _ref12$BalanceStorage,
-                _ref12$PresentAmount = _ref12.PresentAmount,
-                PresentAmount = _ref12$PresentAmount === undefined ? 0 : _ref12$PresentAmount,
-                CardTypeEnum = _ref12.CardTypeEnum,
-                StorageCardNo = _ref12.StorageCardNo,
-                IsSale = _ref12.IsSale,
-                IsCustomStorage = _ref12.IsCustomStorage;
+                BalanceIntegral = _ref12.BalanceIntegral,
+                BalanceStorage = _ref12.BalanceStorage,
+                TotalBalanceAmount = _ref12.TotalBalanceAmount;
 
             var salesman = Member ? JSON.getCellValue(Member, "Person.Name") : '';
             var thisPresentAmount = StorageDetails ? JSON.getCellValue(StorageDetails[0], "ThisPresentAmount") : '';
@@ -339,7 +336,7 @@ var MemberStoreNewView = (0, _mutantsMicrofx.observer)(_class = function (_Compo
                         _react2.default.createElement(
                             'div',
                             { className: 'imageContainer' },
-                            CardTypeEnum === 'BALANCE_CARD' && _react2.default.createElement('img', { src: ImageFile || photo }),
+                            _react2.default.createElement('img', { src: ImageFile || photo }),
                             _react2.default.createElement(
                                 'div',
                                 { className: 'imageContainer-message' },
@@ -352,7 +349,7 @@ var MemberStoreNewView = (0, _mutantsMicrofx.observer)(_class = function (_Compo
                                 _react2.default.createElement(
                                     'div',
                                     { className: 'divText' },
-                                    MemberMobile || StorageCardNo
+                                    Mobilephone || CardCode
                                 )
                             )
                         ),
@@ -370,6 +367,21 @@ var MemberStoreNewView = (0, _mutantsMicrofx.observer)(_class = function (_Compo
                                 null,
                                 '\u4F59\u989D'
                             )
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: 'message' },
+                            _react2.default.createElement(
+                                'span',
+                                null,
+                                (0, _utils.formatPrecision)(BalanceIntegral)
+                            ),
+                            _react2.default.createElement('br', null),
+                            _react2.default.createElement(
+                                'span',
+                                null,
+                                '\u79EF\u5206'
+                            )
                         )
                     ),
                     _react2.default.createElement('div', { className: 'line' }),
@@ -455,7 +467,7 @@ var MemberStoreNewView = (0, _mutantsMicrofx.observer)(_class = function (_Compo
                                         );
                                     })
                                 ),
-                                (CardTypeEnum === 'BALANCE_CARD' || IsSale === 'SOLD' && IsCustomStorage || BalanceStorage + PresentAmount === 0 && IsCustomStorage) && _react2.default.createElement(_tplusComponentsTouch.NumKeyboard, {
+                                isCustomStorage && _react2.default.createElement(_tplusComponentsTouch.NumKeyboard, {
                                     className: 'content',
                                     type: 'text',
                                     bordered: true,