Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/order/detail.vue

@@ -13,6 +13,17 @@
         </view>
       </view>
 
+      <view class="module-com order-msg" v-if="!$util.isEmpty(orderInfo.remark)">
+        <view class="module-det">
+          <view class="order-msg-blo">
+            <view class="msg-list">
+              <view class="label">备注：</view>
+              <view class="value" style="color:red;font-weight:bold;">{{orderInfo.remark}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
       <view class="module-com order-msg" v-if="!$util.isEmpty(orderInfo.receiveMobile)">
         <view class="module-tit">
           收花人信息
@@ -51,10 +62,6 @@
               <view class="label">寄语：</view>
               <view class="value">{{ orderInfo.cardInfo || '-' }}</view>
             </view>
-            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.remark)">
-              <view class="label">备注：</view>
-              <view class="value" style="color:red;">{{orderInfo.remark}}</view>
-            </view>
             <view class="msg-list">
               <view class="label">订花人电话：</view>
               <view class="value" @click="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</view>

hdApp/src/admin/order/workOrder.vue

@@ -38,6 +38,13 @@
             </picker>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">来源</view>
+            <button @tap="form.fromType = 3" class="admin-button-com mini-btn" :class="form.fromType == 3 ? 'blue' : 'default'">微信</button>
+            <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
+            <button @tap="form.fromType = 1" class="admin-button-com mini-btn" :class="form.fromType == 1 ? 'blue' : 'default'">门店</button>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">单价</view>
             <input type="digit" @focus="goodsPrice=''" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
@@ -89,6 +96,7 @@ export default {
       headers:{token:''},
       selectJobType: "addOrder",
       form: {
+        fromType:'3',
         hasPay:1,
         payWay:0,
         sendCost:'',
@@ -96,7 +104,6 @@ export default {
         name:"花束",
         cover:[],
         num:1,
-        remark:'',
         flowerNum:''
       },
       goodsPrice:'',

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

@@ -16,7 +16,7 @@
             </view>
             <view class="order-info_box">
                 <view>来源：</view>
-                <view>{{item.from==1?'门店':item.from==2?'商城':item.from==3?'朋友圈':item.from==4?'美团':item.from==5?'饿了么':'其它'}}</view>
+                <view>{{item.fromType==1?'门店':item.fromType==2?'商城':item.fromType==3?'微信':item.fromType==4?'美团':item.fromType==5?'饿了么':'其它'}}</view>
             </view>
             <view class="order-info_box">
                 <view>数量：</view>

hdPad/src/pages/home/components/workList.vue

@@ -12,7 +12,7 @@
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
                         <view class="current-item-title">
-                            <text>{{item.staffName}} {{item.name}}</text>
+                            <text>{{item.fromType==4 ? '美团' : item.fromType==2 ? '商城' : item.staffName}} {{item.name}}</text>
                         </view>
                         <image class="flower-image" :src="item.cover"></image>
                         <text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>