配送

hdApp/src/admin/work/components/workItem.vue

@@ -2,13 +2,13 @@
     <view  @click="pageTo({url:'/admin/work/detail',query: {id: item.id}})">
         <view class="order-top_box" style="position:relative;">
           <image style="width:130upx;position:absolute;top:110upx;right:25upx;border-radius:10upx;" @click.stop="previewImage(item.bigCover)" mode="widthFix" :src="item.cover"></image>
-          <view class="tit"> {{ item.name || "" }}</view>
+          <view class="tit">{{item.name}}</view>
           <view style="color:#666666;">{{ statusFormat(item.status) }}</view>
         </view>
         <view class="order-list_info">
             <view class="order-info_box">
-                <view>编号：</view>
-                <view>{{ item.workSn }}</view>
+                <view>序号：</view>
+                <view>{{ item.sn||'' }}</view>
             </view>
             <view class="order-info_box">
                 <view>单号：</view>
@@ -20,7 +20,7 @@
             </view>
             <view class="order-info_box">
                 <view>来源：</view>
-                <view></view>
+                <view>{{item.from==1?'门店':item.from==2?'商城':item.from==3?'朋友圈':item.from==4?'美团':item.from==5?'饿了么':'其它'}}</view>
             </view>
             <view class="order-info_box">
                 <view>数量：</view>

hdApp/src/components/app-delivery.vue

@@ -53,8 +53,8 @@
 
       <tui-list-cell class="line-cell" :hover="false" :arrow="true">
         <view class="tui-title">配送时间</view>
-        <picker mode="date" :value="form.reachTime" @change="selTimeFn" class="tui-input">
-          <view v-if="form.reachTime">{{ form.reachTime }}</view>
+        <picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
+          <view v-if="form.reachDate">{{ form.reachDate }}</view>
           <view class="tui-placeholder" v-else>请选择送达时间</view>
         </picker>
       </tui-list-cell>
@@ -65,16 +65,20 @@
         <button class="button-com" :class="[form.reachPeriod == 2 ? 'red' : 'default']" @click="timeTodaySelFn(2)" >晚上</button>
       </view>
 
+      <tui-list-cell class="line-cell" :hover="false">
+        <view class="tui-title">贺卡</view>
+        <button @tap="form.needCard = 1" class="admin-button-com mini-btn" :class="form.needCard == 1 ? 'blue' : 'default'">需要</button>
+        <button @tap="form.needCard = 0" class="admin-button-com mini-btn" style="margin-left:20upx;" :class="form.needCard == 0 ? 'blue' : 'default'">不需要</button>
+      </tui-list-cell>
+
+      <tui-list-cell class="line-cell" v-if="form.needCard == 1" :hover="false">
+        <view class="tui-title">贺卡内容</view>
+        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="bookName" placeholder="请填写" />
+      </tui-list-cell>    
+
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">订花人姓名</view>
-        <input
-          v-model="form.bookName"
-          placeholder-class="phcolor"
-		      placeholder-style="color:#ccc"
-          class="tui-input"
-          name="bookName"
-          placeholder="请填写姓名（选填）"
-        />
+        <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="bookName" placeholder="请填写姓名（选填）" />
       </tui-list-cell>
 
       <tui-list-cell class="line-cell" :hover="false">
@@ -158,7 +162,7 @@ export default {
         fullAddress: "", // 收花人完整地址，从腾讯地图接口获取
         bookName: '', // 订花人姓名
         bookMobile: "", // 订花人手机号
-        reachTime: 0, // 配送时间
+        reachDate: 0, // 配送时间
         reachPeriod: "0", // 配送时段，0上午1下午2晚上
         needCard: "1", // 是否要贺卡 0不要 1要
         cardInfo: "", // 贺卡信息
@@ -185,7 +189,7 @@ export default {
   },
   methods: {
     selTimeFn(e) {
-      this.form.reachTime = e.detail.value;
+      this.form.reachDate = e.detail.value;
     },
     // 选择地址
     selRegionFn() {