android/charge.git

			@@ -24,7 +24,7 @@
			android:layout_marginTop="24dp"
			android:layout_marginEnd="16dp"
			android:layout_marginBottom="24dp"
			android:visibility="visible"
			android:visibility="gone"
			app:cardBackgroundColor="@android:color/white"
			app:cardCornerRadius="12dp"
			app:cardElevation="4dp"
			@@ -85,8 +85,8 @@
			android:layout_height="0dp"
			android:fillViewport="true"
			android:scrollbars="none"
			android:visibility="gone"
			app:layout_constraintBottom_toBottomOf="parent"
			android:visibility="visible"
			app:layout_constraintBottom_toTopOf="@+id/newCard_registBtn"
			app:layout_constraintTop_toBottomOf="@+id/titleBar">

			<LinearLayout
			@@ -236,7 +236,51 @@
			android:textColor="#333333"
			android:textSize="18sp"
			android:textStyle="bold" />
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="12dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">

			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="工本费："
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="@drawable/edit_text_bg_selector"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:paddingTop="8dp"
			android:paddingBottom="8dp">

			<EditText
			android:id="@+id/newCard_cardFee"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:background="@null"
			android:hint="请输入工本费(选填)"
			android:inputType="numberDecimal"
			android:textColor="#333333"
			android:textColorHint="#BBBBBB"
			android:textSize="@dimen/new_card_size" />

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="元"
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />
			</LinearLayout>
			</LinearLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			@@ -283,51 +327,7 @@
			</LinearLayout>
			</LinearLayout>

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="12dp"
			android:gravity="center_vertical"
			android:orientation="horizontal">

			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="工本费："
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="@drawable/edit_text_bg_selector"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:paddingTop="8dp"
			android:paddingBottom="8dp">

			<EditText
			android:id="@+id/newCard_cardFee"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:background="@null"
			android:hint="请输入工本费(选填)"
			android:inputType="numberDecimal"
			android:textColor="#333333"
			android:textColorHint="#BBBBBB"
			android:textSize="@dimen/new_card_size" />

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="元"
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />
			</LinearLayout>
			</LinearLayout>

			<LinearLayout
			android:layout_width="match_parent"
			@@ -397,18 +397,21 @@
			</RadioGroup>
			</LinearLayout>
			</androidx.cardview.widget.CardView>
			<TextView
			android:id="@+id/newCard_registBtn"
			android:layout_width="match_parent"
			android:layout_height="56dp"
			android:layout_marginTop="15dp"
			android:background="@color/bottom_color"
			android:visibility="visible"
			android:gravity="center"
			android:text="确认开卡"
			android:textColor="#FFFFFF"
			android:textSize="16sp" />
			</LinearLayout>
			</ScrollView>

			<TextView
			android:id="@+id/newCard_registBtn"
			android:layout_width="match_parent"
			android:layout_height="56dp"
			android:background="@color/bottom_color"
			android:gravity="center"
			android:text="确认开卡"
			android:textColor="#FFFFFF"
			android:textSize="16sp"
			android:visibility="visible"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent" />

			</androidx.constraintlayout.widget.ConstraintLayout>