Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/model/Ticket.java

@@ -69,6 +69,8 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
 
     private Long ticketNo;
 
+    private String vipName;
+
     private Long vipId;
 
     private Long ticketExp;
@@ -91,6 +93,14 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
 
     private String mac;
 
+    public String getVipName() {
+        return vipName;
+    }
+
+    public void setVipName(String vipName) {
+        this.vipName = vipName;
+    }
+
     public Long getId() {
         return id;
     }

app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements BaseOrderPrint, BaseBean {
     private Long cardAmtPay;
     private Long cardAmtSend;
-    private String orderNo;
+    private String cardNo;
     private Long rechangeBefore;
     private Long rechangeAfter;
     private String vipName;
@@ -26,6 +26,14 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
     private String vipMobile;
     private Long createTime;
 
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
     public VipRechargeOrder(boolean isHeader, String header) {
         super(isHeader, header);
     }
@@ -78,9 +86,6 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
         this.rctraceNo = rctraceNo;
     }
 
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
 
     public String getVipMobile() {
         return vipMobile;
@@ -146,8 +151,8 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
 
     @Override
     public String getOrderNo() {
-        if (orderNo != null && orderNo.length() != 0) {
-            return orderNo;
+        if (cardNo != null && cardNo.length() != 0) {
+            return cardNo;
         }
         return rctraceNo;
     }

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

@@ -61,6 +61,7 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
 
     @Override
     public void delUserSus() {
+        mPresenter.userInfoFragment.pop();
         mPresenter.userListFragment.delUserSus();
     }
 }

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

@@ -25,7 +25,6 @@ public interface UserContract {
         void addSusSus(Oper oper);
         void updateUserSus(Oper oper);
         void delUserSus();
-
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -34,5 +33,6 @@ public interface UserContract {
         public abstract  void querySta();
         public abstract  void updateUser(Oper oper);
         public abstract  void delUser(Oper oper);
+        public abstract  void queryUser(String wd);
     }
 }
\ No newline at end of file

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

@@ -92,6 +92,15 @@ public class UserPresenter extends UserContract.Presenter {
         });
     }
 
+    @Override
+    public void queryUser(String wd) {
+        ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+            mView.queryOperSus(operPager);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
+    }
+
 
     public List<String> getOperLevelList() {
         ArrayList<String> operLevelList = new ArrayList<>();
@@ -99,6 +108,6 @@ public class UserPresenter extends UserContract.Presenter {
         while (iterator.hasNext()) {
             operLevelList.add(iterator.next().getKey());
         }
-        return operLevelList.subList(0,operLevelList.size()-1);
+        return operLevelList.subList(0, operLevelList.size() - 1);
     }
 }

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

@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -64,6 +65,13 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
                     mPresenter.userInfoEditFragment.setOper(null);
                     start(mPresenter.userInfoEditFragment);
                     break;
+                case R.id.userSearch:
+                    if(mViewBinding.userSearch.getText().toString().length()==0){
+                        ToastUtils.showShort("搜索条件不能为空");
+                        return;
+                    }
+                    mPresenter.queryUser(mViewBinding.userSearch.getText().toString());
+                    break;
             }
         });
         onRefresh();
@@ -102,4 +110,5 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
     public void delUserSus() {
         onRefresh();
     }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -99,6 +99,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
         viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket.getUpdateTime()));
         viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
+        viewTicketBinding.setVipName(ticket.getVipName());
 
     }
 
@@ -146,7 +147,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding.viewVipRecharge.getRoot());
         viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay() + vipRechargeOrder.getCardAmtSend(), true));
         viewVipRechargeBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(vipRechargeOrder.getCreateTime()));
-        viewVipRechargeBinding.setOrderNo(vipRechargeOrder.getOrderNo());
+        viewVipRechargeBinding.setCardNo(vipRechargeOrder.getCardNo());
         viewVipRechargeBinding.setVipName(vipRechargeOrder.getVipName());
         viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
         viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java

@@ -111,7 +111,7 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
 
                     for (int i = 0; i < fragments.size(); i++) {
                         if (month == 0) month = 12;
-                        mViewBinding.tabLayout.getTabAt(i).setText(month + "");
+                        mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
                         month--;
                     }
 
@@ -130,7 +130,7 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
             }, 1);
             for (int i = 0; i < fragments.size(); i++) {
                 if (month == 0) month = 12;
-                mViewBinding.tabLayout.getTabAt(i).setText(month + "");
+                mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
                 month--;
             }
         }

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

@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
             super.getItemOffsets(outRect, view, parent, state);
-            outRect.top = mDividerHight;
+            outRect.top = mDividerHight + 1;
         }
 
         @Override
@@ -99,7 +99,7 @@ public class RecyclerViewUtil {
         public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
 
             final int childCount = parent.getChildCount();
-            for (int i = 0; i < childCount; i++) {
+            for (int i = 0; i < childCount - 1; i++) {
                 final View child = parent.getChildAt(i);
                 RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
 
@@ -109,8 +109,8 @@ public class RecyclerViewUtil {
                 int bottom = 0;
 
 
-                bottom = child.getTop() - params.topMargin;
-                top = bottom - mDividerHight;
+                top = child.getTop() - params.topMargin;
+                bottom = top + mDividerHight;
                 //画分割线
                 mDividerDarwable.setBounds(left, top, right, bottom);
                 mDividerDarwable.draw(c);

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout 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"
@@ -12,22 +12,18 @@
             android:id="@+id/ly_title"
             layout="@layout/title_order" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai" />
 
         <FrameLayout
             android:id="@+id/fragment_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
+            android:layout_below="@id/ly_title">
         </FrameLayout>
-
-    </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_below="@id/ly_title"
+            android:background="@color/gray_huanggai" />
+    </RelativeLayout>
 
 </layout>
\ No newline at end of file

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

@@ -64,10 +64,10 @@
                 style="@style/button_passive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/settle_print_receipt"
                 android:textSize="@dimen/all_text_size"
-                android:gravity="center"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_return"
@@ -79,9 +79,9 @@
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"
-                android:gravity="center"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_print"
@@ -90,6 +90,11 @@
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"
                 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" />
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -53,7 +53,7 @@
             android:id="@+id/ll_empty"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@color/white_caocao"
+            android:background="@color/gray_zhouyu"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone"

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

@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:background="@color/white_caocao"
-            app:tabIndicatorHeight="0dp"
             app:tabMinWidth="100dp"
             app:tabMode="scrollable"
             app:tabSelectedTextColor="#ff7a61"

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

@@ -15,7 +15,7 @@
             android:id="@+id/srl_product"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@id/ll_title">
+           >
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_other_selcet"

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

@@ -525,40 +525,32 @@
 
         </android.support.v7.widget.RecyclerView>
 
-        <LinearLayout
+        <android.support.constraint.ConstraintLayout
             android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_statistics_bottom_height"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
             android:background="@color/white_caocao"
-            android:elevation="@dimen/view_line_L2"
-            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent">
 
-            <Button
+            <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
-                android:stateListAnimator="@null"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:text="取消"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/btn_confirm"
+                app:layout_constraintRight_toLeftOf="@id/btn_ok"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <Button
+            <TextView
                 android:id="@+id/btn_ok"
                 style="@style/button_positive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
-                android:stateListAnimator="@null"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:text="定货提交"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -566,7 +558,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-        </LinearLayout>
+        </android.support.constraint.ConstraintLayout>
 
         <View
             android:layout_width="match_parent"

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

@@ -58,9 +58,9 @@
                     android:orientation="horizontal">
 
                     <View
-                        android:layout_width="@dimen/all_line_width"
+                        android:layout_width="1dp"
                         android:layout_height="match_parent"
-                        android:background="@color/blue"></View>
+                        android:background="@mipmap/line"></View>
 
                     <TextView
                         android:id="@+id/tv_getsms"

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

@@ -32,6 +32,7 @@
                 android:id="@+id/userSearch"
                 android:gravity="center"
                 android:text="搜索"
+                android:onClick="@{onClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 

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

@@ -5,7 +5,7 @@
 
         <variable
             name="onClickListener"
-            type="android.view.View.OnClickListener" />
+            type="android.view.View.OnClickListener"/>
     </data>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,33 +16,34 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:background="@color/white"
             android:orientation="horizontal">
 
             <include
                 android:id="@+id/title_search"
                 layout="@layout/title_search"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
+                android:layout_height="match_parent"
+                android:layout_weight="1"/>
 
             <ImageView
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
-                android:background="@mipmap/swipe_card_bg" />
+                android:background="@mipmap/swipe_card_bg"/>
 
             <ImageView
                 android:id="@+id/onScan"
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
                 android:background="@mipmap/scan_bg"
-                android:onClick="@{onClickListener}" />
+                android:onClick="@{onClickListener}"/>
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_margin="@dimen/view_line_L5"
-            android:background="@color/line1" />
+            android:background="@color/line1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -58,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="本店会员" />
+                android:text="本店会员"/>
 
             <TextView
                 android:id="@+id/vip_count_add_today_title"
@@ -67,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="今日新增" />
+                android:text="今日新增"/>
         </LinearLayout>
 
         <LinearLayout
@@ -84,7 +85,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
 
             <TextView
                 android:id="@+id/vip_count_add_today"
@@ -94,7 +95,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -118,7 +119,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_margin="5dp"
-                    android:background="@mipmap/add_bg" />
+                    android:background="@mipmap/add_bg"/>
 
                 <TextView
                     style="@style/default_blacktext_bigstyle"
@@ -126,7 +127,7 @@
                     android:layout_height="wrap_content"
                     android:text="添加会员"
                     android:textColor="@color/deep_red"
-                    android:textSize="22sp" />
+                    android:textSize="22sp"/>
             </LinearLayout>
         </LinearLayout>
 
@@ -134,7 +135,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_margin="@dimen/view_line_L5"
-            android:background="@color/line1" />
+            android:background="@color/line1"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -169,7 +170,7 @@
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/vipRecyclerView"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+                        android:layout_height="match_parent"/>
                 </android.support.v4.widget.SwipeRefreshLayout>
             </LinearLayout>
         </LinearLayout>

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

@@ -10,6 +10,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray"
         android:paddingBottom="@dimen/all_padding">
 

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

@@ -8,6 +8,7 @@
         android:layout_height="wrap_content"
         android:background="@color/white_caocao"
         android:gravity="center"
+        android:foreground="?attr/selectableItemBackground"
         android:orientation="vertical">
 
         <ImageView

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

@@ -40,6 +40,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray">
 
 

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

@@ -12,6 +12,7 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:foreground="?attr/selectableItemBackground"
         android:background="@drawable/singleline_white_gray"
         android:padding="@dimen/all_padding">
 
@@ -29,6 +30,7 @@
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:layout_marginStart="@dimen/all_padding_left_right"
             android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
 
@@ -61,6 +63,7 @@
             android:padding="@dimen/dp_4"
             android:text="规格"
             android:textSize="@dimen/all_text_size_small"
+            android:layout_marginEnd="@dimen/all_padding_left_right"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
@@ -94,6 +97,7 @@
             android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dialog_cart_item_button_height"
+            android:layout_marginEnd="@dimen/all_padding"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
@@ -103,7 +107,7 @@
                 android:id="@+id/btn_down"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginEnd="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:src="@mipmap/but_reduce" />
@@ -127,7 +131,7 @@
                 android:id="@+id/btn_up"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:src="@mipmap/but_add"
@@ -158,27 +162,27 @@
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
 
-        <TextView
-            android:id="@+id/tv_traffic_hint"
-            style="@style/other_select_smallstyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_margin_big"
-            android:text="在途："
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/tv_stock"
-            app:layout_constraintStart_toEndOf="@id/tv_stock"
-            app:layout_constraintTop_toTopOf="@id/tv_stock" />
-
-        <TextView
-            android:id="@+id/tv_traffic"
-            style="@style/other_select_smallstyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="0个"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"
-            app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />
+        <!--<TextView-->
+            <!--android:id="@+id/tv_traffic_hint"-->
+            <!--style="@style/other_select_smallstyle"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_marginStart="@dimen/all_margin_big"-->
+            <!--android:text="在途："-->
+            <!--android:textStyle="bold"-->
+            <!--app:layout_constraintBottom_toBottomOf="@id/tv_stock"-->
+            <!--app:layout_constraintStart_toEndOf="@id/tv_stock"-->
+            <!--app:layout_constraintTop_toTopOf="@id/tv_stock" />-->
+
+        <!--<TextView-->
+            <!--android:id="@+id/tv_traffic"-->
+            <!--style="@style/other_select_smallstyle"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="0个"-->
+            <!--android:textStyle="bold"-->
+            <!--app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"-->
+            <!--app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />-->
 
         <TextView
             android:id="@+id/tv_price_hint"

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

@@ -17,7 +17,7 @@
             android:maxLines="2"
             android:textColor="@color/black_baozheng"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="5"
+            app:layout_constraintHorizontal_weight="4"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/tv_count"
             app:layout_constraintTop_toTopOf="parent" />

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout>
 
-    <LinearLayout
+    <LinearLayout 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="wrap_content"
         android:orientation="vertical">
@@ -26,7 +26,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5"
+                android:layout_weight="4"
                 android:gravity="start"
                 android:text="@string/cart_product_name"
                 android:textColor="@color/black_baozheng"

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

@@ -15,6 +15,9 @@
             name="orderNo"
             type="String" />
 
+        <variable
+            name="vipName"
+            type="String" />
 
     </data>
 
@@ -95,92 +98,81 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
-                            android:paddingBottom="@dimen/all_padding"
-                            android:paddingEnd="@dimen/dp_4"
-                            android:paddingStart="@dimen/dp_4"
-                            android:paddingTop="@dimen/dp_4"
-                            android:weightSum="10">
-
-                            <LinearLayout
-
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="7"
-                                android:orientation="vertical">
+                            android:weightSum="3">
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
+                                android:layout_weight="1"
                                 android:singleLine="true"
-                                    android:text="@string/ticket_detail_date"
+                                android:text="会员名："
                                 android:textSize="@dimen/all_text_size_low" />
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
+                                android:layout_weight="2"
+                                android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@string/ticket_detail_no"
-                                    android:textSize="@dimen/all_text_size_low" />
-
-
+                                android:text="@{vipName}"
+                                android:textColor="@color/black_likui" />
                         </LinearLayout>
 
                         <LinearLayout
                             android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_weight="3"
-                                android:gravity="right"
-                                android:orientation="vertical"
-                                android:weightSum="2">
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:weightSum="3">
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="0dp"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                    android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@{date}"
-                                    android:textColor="@color/black_likui" />
+                                android:text="使用时间："
+                                android:textSize="@dimen/all_text_size_low" />
 
                             <TextView
                                 style="@style/textView_body_small"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2"
                                 android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                    android:text="@{orderNo}"
+                                android:text="@{date}"
                                 android:textColor="@color/black_likui" />
-
-
-                            </LinearLayout>
-
                         </LinearLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/view_line_L1"
-                            android:background="@color/gray_zhouyu" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/view_line_L1"
-                            android:background="@color/gray_zhouyu" />
-
                         <LinearLayout
-                            android:id="@+id/ll_goods_list"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/all_padding"
-                            android:orientation="vertical"
-                            android:padding="@dimen/dp_4"
-                            android:visibility="gone">
+                            android:orientation="horizontal"
+                            android:weightSum="3">
 
+                            <TextView
+                                style="@style/textView_body_small"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:singleLine="true"
+                                android:text="销售单号："
+                                android:textSize="@dimen/all_text_size_low" />
+
+                            <TextView
+                                style="@style/textView_body_small"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2"
+                                android:gravity="right|center_vertical"
+                                android:singleLine="true"
+                                android:text="@{orderNo}"
+                                android:textColor="@color/black_likui" />
                         </LinearLayout>
 
+
                     </LinearLayout>
 
 

app/src/main/res/values/colors.xml

@@ -127,7 +127,7 @@
 
     <color name="gray_zhouyu">#f6f6f6</color>
     <color name="gray_huanggai">#afb9c3</color>
-    <color name="gray_kongming">#e6e6e6</color>
+    <color name="gray_kongming">#dddddd</color>
 
     <color name="white_caocao">#ffffff</color>
 

app/src/main/res/values/dimens.xml

@@ -109,7 +109,7 @@
     <dimen name="et_width">270dp</dimen>
     <dimen name="et_height">44dp</dimen>
     <dimen name="et_textsize">16sp</dimen>
-    <dimen name="et_padding">12dp</dimen>
+    <dimen name="et_padding">10dp</dimen>
     <dimen name="et_margin_logo">44dp</dimen>
     <dimen name="et_margin_edittext">20dp</dimen>
     <dimen name="drop_down_margin_right_et">20dp</dimen>
@@ -215,8 +215,7 @@
     <!--统计条目-->
     <dimen name="item_statistics_height">72dp</dimen>
     <dimen name="layout_statistics_bottom_height">56dp</dimen>
-    <dimen name="layout_statistics_bottom_button_height">35dp</dimen>
-    <dimen name="layout_statistics_bottom_button_width">105dp</dimen>
+
 
     <!--新标准-->
     <dimen name="headline">20dp</dimen>

app/src/main/res/values/strings.xml

@@ -672,6 +672,7 @@
     <!--商品详情POS-->
     <string name="oder_detail_date">交易时间:</string>
     <string name="oder_detail_no">订单号:</string>
+    <string name="oder_detail_card_no">卡号:</string>
     <string name="oder_detail_oper">收银员:</string>
     <string name="oder_detail_payType">收款方式:</string>
     <string name="oder_detail_goodsNum">商品总数:</string>