merge

src/views/sales/Offline.vue

@@ -68,8 +68,11 @@
           {{ record.channel == 'express' ?'快递':'自提' }}
         </div>
         <div slot="express" slot-scope="text, record">
+          <div v-if="record.channel === 'express'">
             {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
           </div>
+          <div v-else>发货时间：{{ record.deliver_at }}</div>
+        </div>
       </s-table>
     </a-card>
   </page-header-wrapper>

src/views/sales/widgets/AddOffline.vue

@@ -107,11 +107,11 @@
           'deliver_at',
           {
             rules: [
-              { required: true, message: `请选择自提时间!` },
+              { required: false, message: `请选择发货时间!` },
             ]
           }
         ]"
-        :placeholder="`请选择自提时间!`"
+        :placeholder="`请选择发货时间!`"
         style="width: 100%" />
     </a-form-item>
   </a-form>