Merge branch 'dev' of http://gogs.ywtinfo.com/chenjunkun/th_net_hospital_ali_mp into dev

antbuilder/industry/hospitalV2/components/personal-center-head/personalCenterHead.axml

@@ -41,10 +41,10 @@
               </view>
               <view
                 class="user-number"
-                a:if="{{ cardInfo.cardNum }}"
+                a:if="{{ cardInfo.hisPatientId }}"
               >
                 <text number-of-lines="1">
-                  No.{{ cardInfo.cardNum  }}
+                  No.{{ cardInfo.hisPatientId  }}
                 </text>
               </view>
             </view>
@@ -60,7 +60,7 @@
             <view
               class="login-btn"
               onTap="toPatientDetail"
-              a:if="{{ cardInfo.cardNum }}"
+              a:if="{{ cardInfo.hisPatientId }}"
             >
               <view class="login-btn-content">
                 <image

antbuilder/industry/hospitalV2/components/select-card/index.axml

@@ -7,7 +7,7 @@
     <view class="hospital-select-card">
       <view class="item-box" a:for="{{ defaultList }}">
         <view>
-          <view class="card-num">{{ item.cardNum }}</view>
+          <view class="card-num">{{ item.hisPatientId }}</view>
           <view class="card-balance" a:if="{{ balance }}">余额：￥{{ item.balance }}</view>
         </view>
         <view class="button" data-item="{{ item }}" onTap="onTap">选择</view>