1.一装多卸去掉车辆输入。

2.货源详情修改。

app/src/main/java/com/quansu/heifengwuliu/activity/SourceDetailsActivity.kt

@@ -17,27 +17,33 @@ import com.quansu.heifengwuliu.vmodel.SourceDetailsVModel
  *on 2020/9/15
  */
 class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetailsBinding>() {
+    var type=""//0运单详情 1 货源详情
+    override fun __before() {
+        super.__before()
+        var type=intent?.extras?.getString("type", "0")
 
+    }
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
 
         var info_id=intent?.extras?.getString("info_id", "")
-        var type=intent?.extras?.getString("type", "0")//1需要弹出支付的框
+
         if(!TextUtils.isEmpty(info_id)) {
             vm.getInfo(info_id!!)
         }
-        if(type.equals("0")){
+
+        if(type=="1"){//todo：暂时
             binding.butComeback.visibility= View.GONE
         }
-
         vm.info.observe(this, Observer {
             //观察
             initViewPager(vm.info.value!!)
-            if(type.equals("1")){
-                vm.showPayDialog(info_id!!,binding.ll)
+            if(vm.info.value!!.order.is_pay=="0") {//未支付
+                vm.showPayDialog(info_id!!, binding.ll)
             }
 
+
         })
 
 
@@ -63,7 +69,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
 
 
     override fun title(): String? {
-        return "货源详情"
+        return if(type=="1") "货源详情" else "运单详情"
     }
 
     override fun vmClass(): Class<SourceDetailsVModel> {

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -212,7 +212,7 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
             toast("请阅读并同意《平台运输协议》")
             return
         }
-        var carnums=binding.etCarNums.text.toString()
+        var carnums="1"//默认一辆车
         if(TextUtils.isEmpty(carnums)){
             toast("请输入所需车辆数量")
             return

app/src/main/java/com/quansu/heifengwuliu/model/DataInfoBean.kt

@@ -7,6 +7,7 @@ import com.ysnows.base.inter.IModel
  *Created by shihuiyun
  *on 2020/9/14
  * 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
+ * is_pay:0未支付 1已支付
  */
 data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<String>,
                         var car_type: List<CarTypeBean>, var order: OrderBean,var default_send:DefaultSdendBean,

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

@@ -376,35 +376,9 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center">
-
-                    <EditText
-                        android:id="@+id/et_car_nums"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:gravity="center"
-                        android:hint="请输入所需车辆数目"
-                        android:textColor="#101010"
-                        android:text="1"
-                        android:textColorHint="#BBBBBB"
-                        android:textSize="@dimen/sp_15"></EditText>
-
-                    <ImageView
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:src="@drawable/need_numbers" />
-                </LinearLayout>
-
                 <TextView
                     android:id="@+id/tv_publish"
-                    android:layout_width="150dp"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#5D76F4"
                     android:gravity="center"