Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

6 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 h5/pages/driver/taskDetail.vue

@@ -41,11 +41,11 @@
         </template>

         <template v-else>

            <view class="line">

               <view class="label">合同编号</view>

               <view class="label">合同/单据编号</view>

               <view class="value">{{param.contractNum}}</view>

            </view>

            <view class="line">

               <view class="label">入库类型</view>

               <view class="label">作业类型</view>

               <view class="value">{{param.inType == 0 ? '整托盘' : '件烟'}}</view>

            </view>

            <view class="line">