更改线的粗细

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java

@@ -35,8 +35,8 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
 
     @Override
     public void addSusSus(Oper oper) {
-        mPresenter.userListFragment.addSusSus(oper);
         mPresenter.userInfoEditFragment.pop();
+        mPresenter.userListFragment.addSusSus(oper);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java

@@ -31,7 +31,6 @@ public class UserPresenter extends UserContract.Presenter {
 
     private void initOperLevel() {
         operLevel.put("员工", "1");
-        operLevel.put("主管", "2");
         operLevel.put("店长", "3");
         operLevel.put("老板", "9");
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java

@@ -91,7 +91,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                     mOper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
                     mOper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
                     mOper.setOperName(mViewBinding.userName.getText().toString());
-                    if (oper.getOperId() == null) {
+                    if (oper==null) {
                         mPresenter.addUser(mOper);
                     } else {
                         mOper.setOperId(oper.getOperId());

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListSearchFragment.java

@@ -50,20 +50,29 @@ public class UserListSearchFragment extends BaseFragment<UserPresenter, Fragment
         adapter.setEnableLoadMore(false);
         mViewBinding.vipSearch.requestFocus();
         mViewBinding.vipSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
-
-
             if (EditorInfo.IME_ACTION_SEARCH == i) {
                 if (textView.getText().toString().trim().length() == 0) {
                     ToastUtils.showShort("搜索条件不能");
-                    return true;
+                    return false;
                 }
                 mPresenter.getUserList(textView.getText().toString().trim());
             }
-
             return false;
         });
-        mViewBinding.ivBack.setOnClickListener(view -> {
-            pop();
+        mViewBinding.setOnClickListener(view -> {
+
+            switch (view.getId()){
+                case R.id.iv_back:
+                    pop();
+                    break;
+                case R.id.vipSearch_tv:
+                    if (mViewBinding.vipSearch.getText().toString().trim().length() == 0) {
+                        ToastUtils.showShort("搜索条件不能");
+                    }
+                    mPresenter.getUserList((mViewBinding.vipSearch.getText().toString().trim()));
+                    break;
+            }
+
         });
         onRefresh();
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java

@@ -57,11 +57,13 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
             mViewBinding.ruleBeginTime.setText(StringUtil.format(new Date(mMscard.getDateBegin())));
             mViewBinding.ruleEndTime.setText(StringUtil.format(new Date(mMscard.getDateEnd())));
             mViewBinding.rechargNo.setText(mMscard.getCruleGradeNo().toString());
+            mViewBinding.rechargNo.setEnabled(false);
             RadioButton radioButton = mViewBinding.ruleState.findViewWithTag(mMscard.getCruleStatus().toString());
             if (radioButton != null) {
                 radioButton.setChecked(true);
             }
         } else {
+            mViewBinding.rechargNo.setEnabled(true);
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
             mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
             ((RadioButton) mViewBinding.ruleState.getChildAt(1)).setChecked(true);
@@ -139,6 +141,8 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         }
         for (Mscard mscard : mscards) {
             if (mScards.contains(mscard.getCruleGradeNo().toString())) {
+                if (mMscard != null && mMscard.getCruleGradeNo().toString().equals(mscard.getCruleGradeNo().toString()))
+                    continue;
                 mScards.remove(mscard.getCruleGradeNo().toString());
             }
         }
@@ -175,9 +179,9 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
 
 
     /**
-     * 弹出选择会员P
+     * 弹出选择充值档位
      *
-     * @param mScards
+     * @param
      */
     private void ShowRechargeNo() {// 弹出选择器
         OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java

@@ -21,7 +21,7 @@ import com.xingdata.zzdpos.util.OnClickListener;
 import java.util.ArrayList;
 
 /**
- * 会员等级界面
+ * 会员充值优惠
  */
 public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter, FragmentRechargeRuleListBinding> {
     private RechargeRuleListAdapter adapter;
@@ -55,8 +55,6 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
         adapter.setEnableLoadMore(false);
-
-
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()) {
                 case R.id.addRule:
@@ -77,9 +75,12 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
         } else {
             mViewBinding.noRultBg.setVisibility(View.VISIBLE);
         }
-
         adapter.setNewData(mscardPager.getList());
         adapter.setEnableLoadMore(false);
         adapter.loadMoreComplete();
     }
+
+    public void setVipState(int vipState) {
+        this.vipState = vipState;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java

@@ -37,9 +37,9 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
         }
         //继续添加
         mViewBinding.vipAdd.setOnClickListener(view -> {
-            mPresenter.vipInfoEditFragment.setVip(null);
-            popTo(mPresenter.vipInfoEditFragment.getClass(),false);
-//            start(mPresenter.vipInfoEditFragment);
+//            mPresenter.vipInfoEditFragment.setVip(null);
+            popTo(new VipInfoEditFragment().getClass(),false);
+//            start(new VipInfoEditFragment());
         });
 
         //充值

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -37,7 +37,7 @@ import java.util.List;
 public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
     private VipListAdapter vipListAdapter;
     private List<Vip> vips = new ArrayList<>();
-    private int pageNumber = 0;
+    private int pageNumber = 1;
     private String strVipLevle;
     private int vipState = 0;//0 会员 1 充值
     private ScanFragment scanFragment = new ScanFragment();
@@ -152,7 +152,8 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             radioButton.getPaint().setFakeBoldText(true);
             radioButton.setTextSize(16);
             vipListAdapter.setEnableLoadMore(true);
-            mPresenter.getVipList(0, strVipLevle);
+            pageNumber = 1;
+            mPresenter.getVipList(pageNumber, strVipLevle);
         } else {
             radioButton.setTextSize(14);
             radioButton.getPaint().setFakeBoldText(false);
@@ -219,7 +220,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
     }
 
     public void onRefresh() {
-        pageNumber = 0;
+        pageNumber = 1;
         mPresenter.getVipList(pageNumber, strVipLevle);
         mPresenter.getVipNumber();
     }
@@ -228,17 +229,18 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
     public void getVipListSus(Pager<Vip> vipPager, int mPageNumber) {
         vipListAdapter.loadMoreComplete();
         mViewBinding.vipRefresh.setRefreshing(false);
-        if (mPageNumber == 0) {
-            vipListAdapter.getData().clear();
+        if (vipPager.getPageNumber()<=1) {
+            vipListAdapter.setNewData(vipPager.getList());
+        }else {
+            vipListAdapter.addData(vipPager.getList());
         }
         if (vipPager.isLastPage()) {
             vipListAdapter.setEnableLoadMore(false);
             vipListAdapter.notifyDataSetChanged();
-            pageNumber = 0;
+//            pageNumber = 0;
 //            ToastUtils.showShort("没有更多数据");
-//            return;
+            return;
         }
-        vipListAdapter.addData(vipPager.getList());
         pageNumber = vipPager.getPageNumber() + 1;
     }
 
@@ -275,7 +277,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
     }
 
     public void updateVipSus(Vip vip) {
-        pageNumber = 0;
+        pageNumber = 1;
         mPresenter.getVipLevel(pageNumber, 200);
         mPresenter.getVipNumber();
         if (mPresenter.vipInfoEditFragment.isHidden()) {

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java

@@ -101,8 +101,9 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
                 mPresenter.initSettle();
             }
         });
-
-
+        if (mscards==null){
+            mPresenter.getMscardList(mVip.getVipId());
+        }
     }
 
 
@@ -139,8 +140,10 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
             mViewBinding.payMoneyLayout.addView(radioButton);
         }
 
-        if (mViewBinding.payMoneyLayout.getChildCount() != 0) {
+        if (mscards.size() != 0) {
             mViewBinding.payMoneyLayout.setVisibility(View.VISIBLE);
+        }else {
+            mViewBinding.payMoneyLayout.setVisibility(View.GONE);
         }
 
         String hintStr = "自定义金额";

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipSearchFragment.java

@@ -7,21 +7,16 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
-import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
 import com.xingdata.zzdpos.databinding.FragmentVipSerchBinding;
-import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
 import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.util.OnClickListener;
-
-import java.util.List;
 
 
 /**
@@ -55,35 +50,32 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
         mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
             if (baseFragment instanceof VipInfoFragment) {
                 ((VipInfoFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
-            }else if (baseFragment instanceof VipRechargeFragment){
+            } else if (baseFragment instanceof VipRechargeFragment) {
                 ((VipRechargeFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
             }
             startWithPop(baseFragment);
         });
-        mViewBinding.setOnClickListener(new OnClickListener() {
-            @Override
-            protected void myOnClickListener(View v) {
-                switch (v.getId()) {
-                    case R.id.btn_back: {
-                        pop();
-                    }
-                    case R.id.search_ImageButton:
-                        mPresenter.searchVip(mViewBinding.etSearch.getText().toString());
-
-
-                        break;
-                    default: {
+        mViewBinding.setOnClickListener(view -> {
+            switch (view.getId()){
+                case R.id.btn_back:
 
+                    pop();
+                    break;
+                case R.id.search_ImageButton:
+                    if (mViewBinding.etSearch.getText().toString().length()==0){
+                        ToastUtils.showShort("搜索条件不能为空");
+                        return;
                     }
+                    mPresenter.searchVip(mViewBinding.etSearch.getText().toString());
                     break;
-                }
             }
         });
-//        mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
-//            KeyboardUtils.hideSoftInput(textView);
-//            mPresenter.searchVip(textView.getText().toString());
-//            return false;
-//        });
+
+        mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
+            KeyboardUtils.hideSoftInput(textView);
+            mPresenter.searchVip(textView.getText().toString());
+            return false;
+        });
 
     }
 

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -58,7 +58,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "5536bef2";
+        return "test01";
     }
 
     /**

app/src/main/res/layout/activity_statistics_detail.xml

@@ -3,11 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                 android:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:background="@color/gray_zhouyu"
-        >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <include
             android:id="@+id/ic_title"
@@ -29,25 +26,25 @@
                 android:id="@+id/view_order_detail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_order_detail"/>
+                android:layout="@layout/view_order_detail" />
 
             <ViewStub
                 android:id="@+id/view_vip_recharge"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_vip_recharge"/>
+                android:layout="@layout/view_vip_recharge" />
 
             <ViewStub
                 android:id="@+id/view_ticket"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_ticket"/>
+                android:layout="@layout/view_ticket" />
 
             <ViewStub
                 android:id="@+id/view_cs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_inventory_detail"/>
+                android:layout="@layout/view_inventory_detail" />
         </FrameLayout>
 
         <android.support.constraint.ConstraintLayout
@@ -74,7 +71,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_return"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop"/>
+                tools:targetApi="lollipop" />
 
             <Button
                 android:id="@+id/btn_return"
@@ -90,13 +87,13 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"
-                tools:targetApi="lollipop"/>
+                tools:targetApi="lollipop" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/view_line_L050"
                 android:background="@color/gray_huanggai"
-                app:layout_constraintTop_toTopOf="parent"/>
+                app:layout_constraintTop_toTopOf="parent" />
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_recharge_rule_edit.xml

@@ -56,10 +56,10 @@
                     <TextView
                         android:id="@+id/rule_name"
                         style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="90dp"
+                        android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
-                        android:text="活动名称" />
+                        android:text="活动名称：" />
 
                     <EditText
                         style="@style/dialog_edit"
@@ -79,10 +79,10 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="90dp"
+                        android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
-                        android:text="充值档位" />
+                        android:text="充值档位：" />
 
                     <TextView
                         android:id="@+id/recharg_No"
@@ -105,11 +105,11 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="90dp"
+                        android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:maxLength="11"
-                        android:text="启用状态" />
+                        android:text="启用状态：" />
 
                     <RadioGroup
                         android:id="@+id/rule_state"
@@ -173,7 +173,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:text="充值每满" />
+                android:text="充值每满：" />
 
             <EditText
                 android:id="@+id/recharg_amt"
@@ -207,7 +207,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:text="送" />
+                android:text="送：" />
 
             <EditText
                 android:id="@+id/send_amt"
@@ -241,7 +241,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:text="开始日期" />
+                android:text="开始日期：" />
 
             <TextView
                 android:id="@+id/rule_begin_time"
@@ -265,7 +265,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:text="结束日期" />
+                android:text="结束日期：" />
 
             <TextView
                 android:id="@+id/rule_end_time"

app/src/main/res/layout/fragment_recharge_rule_list.xml

@@ -91,7 +91,7 @@
                     style="@style/textView_body_small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="还没有会员等级，请添加会员等级~"
+                    android:text="还没有充值优惠，请添加充值优惠~"
                     android:textColor="@color/gray_huanggai"
                     android:textSize="22sp" />
             </LinearLayout>

app/src/main/res/layout/fragment_user_info.xml

@@ -39,7 +39,7 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_16_sp_style"
-                        android:text="姓名" />
+                        android:text="姓名：" />
 
                     <TextView
                         android:id="@+id/user_name"
@@ -61,7 +61,7 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_16_sp_style"
-                        android:text="帐号" />
+                        android:text="帐号：" />
 
                     <TextView
                         android:id="@+id/user_phone"
@@ -90,7 +90,7 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:text="级别" />
+                android:text="级别：" />
 
             <TextView
                 android:id="@+id/user_Level"

app/src/main/res/layout/fragment_user_info_edit.xml

@@ -40,10 +40,10 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="70dp"
+                        android:layout_width="72dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
-                        android:text="姓名" />
+                        android:text="姓名：" />
 
                     <EditText
                         android:id="@+id/user_name"
@@ -65,11 +65,11 @@
 
                     <TextView
                         style="@style/default_blacktext_margin_smallstyle"
-                        android:layout_width="70dp"
+                        android:layout_width="72dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:maxLength="11"
-                        android:text="帐号" />
+                        android:text="帐号：" />
 
                     <EditText
                         android:id="@+id/user_phone"
@@ -104,9 +104,9 @@
 
             <TextView
                 style="@style/default_blacktext_margin_smallstyle"
-                android:layout_width="70dp"
+                android:layout_width="72dp"
                 android:layout_height="wrap_content"
-                android:text="级别" />
+                android:text="级别：" />
 
             <TextView
                 android:id="@+id/user_Level"

app/src/main/res/layout/fragment_user_list.xml

@@ -39,14 +39,6 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
-            <TextView
-                android:id="@+id/userSearch"
-                style="@style/textView_body_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:onClick="@{onClickListener}"
-                android:text="搜索" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_user_search_list.xml

@@ -24,6 +24,7 @@
                 android:id="@+id/iv_back"
                 android:layout_width="wrap_content"
                 android:padding="@dimen/all_margin"
+                android:onClick="@{onClickListener}"
                 android:layout_height="wrap_content"
                 android:background="@mipmap/go_back" />
 
@@ -37,6 +38,15 @@
                 android:inputType="text"
                 android:labelFor="@+id/et_search" />
 
+            <TextView
+                android:id="@+id/vipSearch_tv"
+                style="@style/textView_body_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:onClick="@{onClickListener}"
+                android:text="搜索" />
+
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_vip_info.xml

@@ -184,8 +184,8 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:layout_width="70dp"
-                android:text="级别" />
+                android:layout_width="72dp"
+                android:text="级别：" />
 
             <TextView
                 android:id="@+id/vipLevel"
@@ -206,8 +206,8 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:layout_width="70dp"
-                android:text="性别" />
+                android:layout_width="72dp"
+                android:text="性别：" />
 
             <TextView
                 android:id="@+id/vipSex"
@@ -228,8 +228,8 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:layout_width="70dp"
-                android:text="生日" />
+                android:layout_width="72dp"
+                android:text="生日：" />
 
             <TextView
                 android:id="@+id/vip_birthday"
@@ -250,8 +250,8 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:layout_width="70dp"
-                android:text="地区" />
+                android:layout_width="72dp"
+                android:text="地区：" />
         </LinearLayout>
 
         <include layout="@layout/line_layout_margin" />
@@ -266,7 +266,7 @@
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
                 android:layout_width="wrap_content"
-                android:text="详细地址" />
+                android:text="详细地址：" />
         </LinearLayout>
 
         <include layout="@layout/line_layout" />

app/src/main/res/layout/fragment_vip_info_edit.xml

@@ -47,7 +47,7 @@
                     <TextView
                         style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="70dp"
-                        android:text="姓名" />
+                        android:text="姓名：" />
 
                     <EditText
                         android:id="@+id/vip_name"
@@ -78,7 +78,7 @@
                         style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="70dp"
                         android:maxLength="11"
-                        android:text="手机号" />
+                        android:text="手机：" />
 
                     <EditText
                         android:id="@+id/vip_phone"
@@ -122,31 +122,29 @@
             <TextView
                 style="@style/default_blacktext_nopadding_smallstyle"
                 android:layout_width="70dp"
-                android:text="性别" />
+                android:text="性别：" />
 
             <RadioGroup
                 android:id="@+id/vip_sex"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:layout_marginRight="100dp"
+                android:layout_gravity="center"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <RadioButton
-                    android:layout_width="match_parent"
+                    android:layout_width="50dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/all_margin_left"
-                    android:layout_weight="1"
                     android:background="@drawable/selector_checkbox_bg"
                     android:button="@null"
                     android:tag="1"
                     android:text="男" />
 
                 <RadioButton
-                    android:layout_width="match_parent"
+                    android:layout_width="50dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_marginLeft="45dp"
                     android:background="@drawable/selector_checkbox_bg"
                     android:button="@null"
                     android:tag="0"
@@ -173,7 +171,7 @@
             <TextView
                 style="@style/default_blacktext_nopadding_smallstyle"
                 android:layout_width="70dp"
-                android:text="级别" />
+                android:text="级别：" />
 
             <TextView
                 android:id="@+id/vip_discounts"
@@ -185,6 +183,7 @@
                 android:gravity="center_vertical"
                 android:onClick="@{onClickListener}" />
         </LinearLayout>
+
         <include layout="@layout/line_layout"></include>
 
         <LinearLayout
@@ -196,18 +195,26 @@
 
             <TextView
                 style="@style/default_blacktext_margin_16_sp_style"
-                android:layout_width="70dp"
+                android:layout_width="72dp"
                 android:layout_marginLeft="13dp"
-                android:text="生日" />
-
-            <TextView
+                android:text="年龄：" />
+
+            <!--<TextView-->
+                <!--android:id="@+id/vip_birthday"-->
+                <!--style="@style/default_blacktext_nopadding_smallstyle"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_marginLeft="21dp"-->
+                <!--android:hint="请选择"-->
+                <!--android:onClick="@{onClickListener}"-->
+                <!--android:textSize="@dimen/all_body_size" />-->
+            <EditText
                 android:id="@+id/vip_birthday"
-                style="@style/default_blacktext_nopadding_smallstyle"
+                style="@style/all_edittext_14sp_style"
                 android:layout_width="match_parent"
-                android:layout_marginLeft="21dp"
-                android:hint="请选择"
-                android:onClick="@{onClickListener}"
-                android:textSize="@dimen/all_body_size" />
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="请输入年龄" />
         </LinearLayout>
 
         <include layout="@layout/line_layout"></include>

app/src/main/res/layout/fragment_vip_level_edit.xml

@@ -21,7 +21,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_margin="@dimen/all_margin_left"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -62,7 +62,7 @@
                         style="@style/default_blacktext_nopadding_smallstyle"
                         android:layout_width="90dp"
                         android:layout_height="wrap_content"
-                        android:text="等级名称" />
+                        android:text="等级名称：" />
 
                     <EditText
                         android:id="@+id/level_name"
@@ -93,7 +93,7 @@
                         android:layout_width="90dp"
                         android:layout_height="wrap_content"
                         android:maxLength="11"
-                        android:text="折扣设置" />
+                        android:text="折扣设置：" />
 
                     <EditText
                         android:id="@+id/level_discont"
@@ -117,7 +117,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_margin="@dimen/all_margin_left"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -141,7 +141,7 @@
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_margin_left"
-                android:text="最近" />
+                android:text="最近：" />
 
             <EditText
                 android:id="@+id/update_day"
@@ -182,7 +182,7 @@
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
 
-                android:text="消费金额" />
+                android:text="消费金额：" />
 
             <EditText
                 android:id="@+id/update_money"

app/src/main/res/layout/fragment_vip_list.xml

@@ -46,9 +46,7 @@
                 android:visibility="gone" />
         </LinearLayout>
 
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/all_margin_left"></View>
+
 
         <include layout="@layout/line_layout" />
 
@@ -146,13 +144,6 @@
                     android:textSize="22sp" />
             </LinearLayout>
         </LinearLayout>
-
-        <include layout="@layout/line_layout" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_margin_left"></View>
-
         <include layout="@layout/line_layout" />
 
         <LinearLayout

app/src/main/res/layout/fragment_vip_recharge.xml

@@ -95,7 +95,6 @@
                     android:layout_height="50dp"
                     android:layout_marginBottom="@dimen/all_margin"
                     android:gravity="center_vertical"
-                    android:visibility="gone"
                     android:onCheckedChanged="@{onCheckedChangeListener}"
                     android:orientation="horizontal"></RadioGroup>
 

app/src/main/res/layout/fragment_vip_serch.xml

@@ -11,8 +11,8 @@
             type="boolean" />
 
         <variable
-            name="OnClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
+            name="onClickListener"
+            type="android.view.View.OnClickListener" />
 
         <variable
             name="titleMode"
@@ -25,64 +25,41 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:layout_gravity="bottom"
-            android:background="@color/gray_huanggai" />
-
-        <android.support.constraint.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@color/white_caocao">
+            android:background="@drawable/up_down_line_white_bottom"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/btn_back"
-                android:layout_width="@dimen/title_height"
-                android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:contentDescription="@string/all_go_back"
-                android:gravity="center"
-                android:onClick="@{OnClickListener}"
-                android:padding="@dimen/all_margin"
-                android:src="@mipmap/back_black"
-                app:layout_constraintLeft_toLeftOf="parent" />
-
-            <LinearLayout
+                android:onClick="@{onClickListener}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/go_back"
+                android:padding="@dimen/all_margin" />
+
+            <EditText
+                android:id="@+id/et_search"
+                style="@style/searchBarEditor"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/all_margin"
-                app:layout_constraintBottom_toTopOf="parent"
-                app:layout_constraintLeft_toRightOf="@id/btn_back"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="parent">
-
-
-                <EditText
-                    android:id="@+id/et_search"
-                    style="@style/searchBarEditor"
-                    android:hint="请输入手会员手机号"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_weight="1"
-                    android:textColor="@color/black_likui"
-                    android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size_small" />
-
-                <TextView
-                    android:id="@+id/search_ImageButton"
-                    style="@style/textView_body"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:onClick="@{OnClickListener}"
-                    android:text="搜索" />
-
-            </LinearLayout>
-
-
-            <include layout="@layout/line_layout" />
-        </android.support.constraint.ConstraintLayout>
+                android:layout_weight="1"
+                android:hint="请输入手机或者会员名称"
+                android:imeOptions="actionSearch"
+                android:inputType="text"
+                android:labelFor="@+id/et_search" />
+
+            <TextView
+                android:id="@+id/search_ImageButton"
+                style="@style/textView_body_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:onClick="@{onClickListener}"
+                android:text="搜索" />
 
+        </LinearLayout>
         <include layout="@layout/line_layout" />
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rl_vip"

app/src/main/res/layout/item_vip_expense_item.xml

@@ -4,14 +4,10 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/all_margin"
-            android:layout_marginRight="@dimen/all_margin_left"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout_margin_right"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,18 +31,20 @@
 
                 <TextView
                     android:id="@+id/expense_type"
-                    style="@style/default_blacktext_bigstyle"
+                    style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="会员充值" />
 
                 <TextView
                     android:id="@+id/expense_time"
-                    style="@style/default_blacktext_smallstyle"
+                    style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
                     android:text="08-09 10:10"
-                    android:textColor="@color/black_likui" />
+                    android:textColor="@color/black_likui"
+                    android:textSize="@dimen/all_text_size_small_small" />
             </LinearLayout>
 
             <LinearLayout
@@ -59,18 +57,21 @@
 
                 <TextView
                     android:id="@+id/expense_money"
-                    style="@style/default_blacktext_bigstyle"
+                    style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="0" />
+                    android:text="0"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/expense_shop"
-                    style="@style/default_blacktext_smallstyle"
+                    style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
                     android:text="门店"
-                    android:textColor="@color/black_likui" />
+                    android:textColor="@color/black_likui"
+                    android:textSize="@dimen/all_text_size_small_small" />
             </LinearLayout>
         </LinearLayout>
 

app/src/main/res/layout/title_pop.xml

@@ -10,7 +10,6 @@
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_marginLeft="@dimen/all_margin_left"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"