1

pages/order/addOrder.vue

@@ -66,9 +66,9 @@
                 :class="{ 'sku-content__item-active': form.schedule_list_skus.find(i => i.sku_id === item.id) }"
                 v-for="item in mySkus"
                 :key="item.id"
-                @click="form.schedule_list_skus = [{ sku_id: item.id }]">
+                @click="skuPick(item)">
             <view style="font-weight: 600;">{{ item.name }}</view>
-            <view style="transform: scale(.8,.8)">{{ item.worth }}工时</view>
+            <view style="transform: scale(.8,.8)">{{ productType === 2 ? item.time_lenth + '分钟' : item.worth + '工时' }}</view>
           </view>
         </view>
       </view>
@@ -126,6 +126,7 @@
 
 <script>
 import { getAgeByIdcard } from "@/common/util";
+import {isNum} from "@/uview-ui/components/u-avatar-cropper/weCropper";
 
 export default {
   data() {
@@ -181,9 +182,29 @@ export default {
         second: false,
         timestamp: true
       }
+    },
+
+    productType () {
+      //1为价值 2为时长
+      return this.getOrder().product?.demand
     }
   },
   methods: {
+    skuPick (item) {
+      if (this.productType === 1) {
+        this.form.schedule_list_skus = [{ sku_id: item.id }]
+      } else {
+        const findSku = this.form.schedule_list_skus.find(i => i.sku_id === item.id)
+        if (findSku) {
+          this.form.schedule_list_skus.splice(this.form.schedule_list_skus.indexOf(findSku),1)
+        } else {
+          this.form.schedule_list_skus.push({
+            sku_id: item.id
+          })
+        }
+      }
+    },
+
     getOrder () {
       if (this.vuex_selected_customer.orders.length === 1) {
         return this.vuex_selected_customer.orders[0]

pages/order/order.vue

@@ -32,7 +32,7 @@
                   </view>
                 </view>
 
-                <view class="time">
+                <view class="time" v-if="nowOrder(item.orders) && nowOrder(item.orders).product && (nowOrder(item.orders).product.demand === 1)">
                   <span style="padding: 0 6rpx;">{{ Number(item.total_worth).toFixed(2) }}/{{ Number(item.all_worth).toFixed(2) }}</span>
                   <span style="zoom: .7;">工时</span>
                 </view>
@@ -82,7 +82,7 @@ export default {
   },
   methods: {
     toAddOrder (item) {
-      if (((Number(item.all_worth)) - Number(item.total_worth)) <= 0) {
+      if ((((Number(item.all_worth)) - Number(item.total_worth)) <= 0) && (this.nowOrder(item) && this.nowOrder(item).product && this.nowOrder(item).product.demand === 1)) {
         this.isShowModal = true;
         return
       }
@@ -110,6 +110,20 @@ export default {
       return function (item) {
         return (Number(item.all_worth)) - Number(item.total_worth)
       }
+    },
+    nowOrder () {
+      return function (orders) {
+        if (orders.length === 1) {
+          return orders[0]
+        } else if (orders.length > 1) {
+          return orders.find(i => {
+            let now = this.$moment().valueOf()
+            return (this.$moment(i.start_date).valueOf() <= now) && (this.$moment(i.end_date).valueOf() >= now)
+          })
+        } else {
+          return {}
+        }
+      }
     }
   },
   onShow() {