jufubao-takeorder 1.0.2-beta4 → 1.0.2-beta6

package/src/components/JfbTakeorderOrderList/cusAttr/content.js

@@ -5,16 +5,16 @@ import { customVal, dataVal } from "@/utils/AttrTools";
 export default (data, gValue, gColor, oldData = {}) => {
   return [
     {
-      label: '订单类型:',
+      label: '订单状态:',
       ele: 'xd-select-list',
-      valueKey: 'orderType',
-      value: data['orderType'] || '',
+      valueKey: 'orderTab',
+      value: data['orderTab'] || '',
       groupKey: 'content',
       multiple: false,
       className: 'input80',
       list: [
-        { label: '报价中', value: 'quoted' },
-        { label: '待上报', value: 'unquoted' },
+        { label: '报价中', value: 'quoting' },
+        { label: '待上报', value: 'wait_report' },
       ],
       inline: false,
     },

package/src/components/JfbTakeorderVoiceSwitch/Api.js

@@ -6,51 +6,32 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Voice
-    mapFnName: 'getVoiceByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getUserConfig',
+    title: '获取用户配置',
+    path: '/takeorder/v1/user-config',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Voice
-    mapFnName: 'updateVoiceFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Voice
-    mapFnName: 'removeVoiceFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'openNewNotify',
+    title: '是否开启新订单通知音频',
+    path: '/takeorder/v1/user-config/is-open-new-order-notify-audio',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      is_open: ['是否开启', 'String', '必填'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Voice
-    mapFnName: 'addVoiceFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'openWinNotify',
+    title: '是否开启中标通知音频',
+    path: '/takeorder/v1/user-config/is-open-win-order-audio',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      is_open: ['是否开启', 'String', '必填'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbTakeorderVoiceSwitch/JfbTakeorderVoiceSwitch.vue

@@ -2,141 +2,190 @@
   <view
     class="jfb-takeorder-voice-switch"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-takeorder-voice-switch__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-takeorder-voice-switch__edit-icon" @click.stop="delEdit">
-        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+        <xd-font-icon
+          icon="iconshanchu-01"
+          color="#fff"
+          size="30"
+        ></xd-font-icon>
       </view>
     </view>
     <!-- #endif -->
     <view class="jfb-takeorder-voice-switch__body">
       <view class="jfb-takeorder-voice-switch__body-item">
         <view>新订单提示音</view>
-        <switch @change="switchNewChange" :checked="newOrder" :color="mainColor" style="transform:scale(0.5)"/>
+        <switch
+          @change="switchNewChange"
+          :checked="newOrder"
+          :color="mainColor"
+          style="transform: scale(0.5)"
+        />
       </view>
       <view class="jfb-takeorder-voice-switch__body-item">
         <view>中标提示音</view>
-        <switch @change="switchBingoChange" :checked="bingo" :color="mainColor" style="transform:scale(0.5)"/>
+        <switch
+          @change="switchBingoChange"
+          :checked="bingo"
+          :color="mainColor"
+          style="transform: scale(0.5)"
+        />
       </view>
-      <view class="jfb-takeorder-voice-switch__body-notice">没有声音？尝试<text :style="{color:mainColor}">点击触发</text></view>
+      <view class="jfb-takeorder-voice-switch__body-notice"
+        >没有声音？尝试<text :style="{ color: mainColor }">点击触发</text></view
+      >
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbTakeorderVoiceSwitchMixin from "./JfbTakeorderVoiceSwitchMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbTakeorderVoiceSwitch",
-    components: {
-      XdFontIcon
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbTakeorderVoiceSwitchMixin from "./JfbTakeorderVoiceSwitchMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbTakeorderVoiceSwitch",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbTakeorderVoiceSwitchMixin],
+  data() {
+    return {
+      bingo: false,
+      newOrder: false,
+    };
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbTakeorderVoiceSwitchMixin
-    ],
-    data() {
-      return {
-        bingo: false,
-        newOrder: false,
-      }
+  },
+  created() {
+    this.init(this.container);
+
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      // 获取用户配置
+      this.getUserConfig();
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+    /**
+     * 获取用户配置
+     */
+    getUserConfig() {
+      jfbRootExec("getUserConfig", {
+        vm: this,
+        data: {},
+      })
+        .then((res) => {
+          // 回显配置
+          this.newOrder = res.is_open_new_order_notify_audio === "Y";
+          this.bingo = res.is_open_win_order_audio === "Y";
+        })
+        .catch((error) => {
+          this.$xdLog.catch(error);
+        });
     },
-    created() {
-      this.init(this.container);
-
-      //todo
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {},
+    switchNewChange(e) {
+      const isOpen = e.detail.value;
+      this.newOrder = isOpen;
+      // 调用接口更新新订单提示音配置
+      jfbRootExec("openNewNotify", {
+        vm: this,
+        data: {
+          is_open: isOpen ? "Y" : "N",
+        },
+      })
+        .then((res) => {
+          // 接口调用成功
+        })
+        .catch((error) => {
+          // 接口调用失败，回滚状态
+          this.newOrder = !isOpen;
+          this.$xdLog.catch(error);
+        });
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      switchNewChange(e) {
-        this.newOrder = e.detail.value
-      },
-      switchBingoChange(e) {
-        this.bingo = e.detail.value
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
-
+    switchBingoChange(e) {
+      const isOpen = e.detail.value;
+      this.bingo = isOpen;
+      // 调用接口更新中标提示音配置
+      jfbRootExec("openWinNotify", {
+        vm: this,
+        data: {
+          is_open: isOpen ? "Y" : "N",
+        },
+      })
+        .then((res) => {
+          // 接口调用成功
+        })
+        .catch((error) => {
+          // 接口调用失败，回滚状态
+          this.bingo = !isOpen;
+          this.$xdLog.catch(error);
+        });
+    },
+    onJfbScroll(options) {
+      console.log("event.onJfbScroll", options);
+    },
+    onJfbReachBottom(options) {
+      console.log("event.onJfbReachBottom", options);
+    },
+    onJfbShow(options) {
+      console.log("event.onJfbShow", options);
+    },
+    onJfbHide(options) {
+      console.log("event.onJfbHide", options);
+    },
+    onJfbBack(options) {
+      console.log("event.onJfbBack", options);
+    },
+    onJfbUpdate(...data) {
+      console.log("event.onJfbUpdate", data);
+    },
+    onJfbCustomEvent(options) {
+      console.log("event.onJfbReachBottom", options);
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbTakeorderVoiceSwitchLess.less";
+@import "./JfbTakeorderVoiceSwitchLess.less";
 
-  .jfb-takeorder-voice-switch {
-    &__body{
-      &-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 26rpx 32rpx;
-        background: #fff;
-        margin: 16rpx;
-        border-radius: 20rpx;
-        color: #666666;
-        font-size: 28rpx;
-      }
-      &-notice {
-        font-size: 24rpx;
-        margin-left: 32rpx;
-        color: #666;
-      }
+.jfb-takeorder-voice-switch {
+  &__body {
+    &-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 26rpx 32rpx;
+      background: #fff;
+      margin: 16rpx;
+      border-radius: 20rpx;
+      color: #666666;
+      font-size: 28rpx;
+    }
+    &-notice {
+      font-size: 24rpx;
+      margin-left: 32rpx;
+      color: #666;
     }
   }
+}
 </style>

package/src/components/JfbTakeorderVoiceSwitch/Mock.js

@@ -1,13 +1,5 @@
 'use strict';
 
-module.exports = {
-  
-  getVoiceByIdFilmSquate:{},
-  
-  updateVoiceFilmPaiqiDate:{},
-  
-  removeVoiceFilmAddress:{},
-  
-  addVoiceFilmcart:{},
-  
+module.exports = {  
+  getUserConfig: { "is_open_new_order_notify_audio": "N", "is_open_win_order_audio": "N", "request_id": "b5d506434c8ef2d0" },
 }

package/src/components/JfbTakeorderFilterOrderList/components/order.vue

@@ -1,277 +0,0 @@
-<template>
-  <view class="order-wrap">
-    <view  v-if="isNeedCutDown" :style="{ background: mainColor }" class="order-time">
-      <XdFontIcon
-        style="margin: 0 24rpx 0 36rpx"
-        icon="iconshijian-01"
-        size="30"
-      ></XdFontIcon>
-      剩余报价时间：<text v-if="item.remainingTime > 0">{{
-        formatCountdown(item.remainingTime)
-      }}</text
-      >，参与报价<text style="color: #ffeb3b">{{ item.people }}</text
-      >人</view
-    >
-    <view class="order-title">
-      <view class="order-title-left">
-        <view>{{ item.shop_name }}</view>
-        <text>｜</text>
-        <view>{{ item.brand_name }}</view>
-      </view>
-      <view class="order-title-right">{{ item.city }}</view>
-    </view>
-    <view
-      v-for="(Pitem, Pindex) in item.products"
-      :key="Pindex"
-      class="order-product"
-    >
-      <image :src="Pitem.product_thumb"></image>
-      <view class="order-product-info">
-        <view class="order-product-info-name">{{ Pitem.product_name }}</view>
-        <view class="order-product-info-sku"
-          >规格：{{ Pitem.product_sku }}</view
-        >
-        <view class="order-product-info-price">
-          <view class="order-product-info-price-left"
-            ><text>¥ </text>{{ Pitem.minPrice }}<text class="range">～</text
-            ><text>¥ </text>{{ Pitem.maxPrice }}</view
-          >
-          <view class="order-product-info-price-right"
-            ><XdFontIcon
-              icon="icondanchuangguanbi_xian"
-              color="#999"
-              size="14"
-            ></XdFontIcon
-            ><view>{{ Pitem.num }}</view></view
-          >
-        </view>
-      </view>
-    </view>
-    <view class="order-price">
-      <view class="order-price-left">
-        <view class="order-price-left-market"
-          >市场原价：¥{{ item.market_price }}（仅供参考）</view
-        >
-        <view class="order-price-left-settle"
-          >结算价格：<view
-            ><text>¥ </text>{{ item.minPrice }}<text class="range">～</text
-            ><text>¥ </text>{{ item.maxPrice }}</view
-          ></view
-        >
-      </view>
-      <view>
-        <XdButton @click="handleClick" type="primary" size="small"
-          >报价</XdButton
-        >
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import XdButton from "@/components/XdButton/XdButton";
-
-export default {
-  name: "order",
-  components: {
-    XdFontIcon,
-    XdButton,
-  },
-  data() {
-    return {
-      isUpdating: false,
-      countdownTimer: null,
-    };
-  },
-  props: {
-    mainColor: {
-      type: String,
-      default: "",
-    },
-    item: {
-      type: Object,
-      default: () => {},
-    },
-    isNeedCutDown: {
-      type: Boolean,
-      default: true,
-    }
-  },
-  computed: {},
-  watch: {
-    // 当父组件更新了 order.status 时，停止倒计时
-    'item.status'(newVal) {
-      if (newVal !== 'pending') {
-        this.clearCountdownTimer();
-        this.isUpdating = false; // 重置更新状态
-      }
-    },
-    // 当父组件更新了 order.remainingTime 时（例如页面重新显示时的校准），重启倒计时
-    'item.remainingTime'(newVal) {
-        if (this.item.status === 'pending' && newVal > 0) {
-            this.startCountdown();
-        }
-    }
-  },
-  created() {
-    // 组件创建时，如果是待支付状态，就启动倒计时
-    if (this.item.remainingTime > 0&&this.isNeedCutDown) {
-      this.startCountdown();
-    }
-  },
-  destroyed() {
-    // 组件销毁时，清理定时器
-    this.clearCountdownTimer();
-  },
-  methods: {
-    formatCountdown(seconds) {
-      const mins = Math.floor(seconds / 60);
-      const secs = seconds % 60;
-      return `${mins.toString().padStart(2, "0")}:${secs
-        .toString()
-        .padStart(2, "0")}`;
-    },
-    // 数字补零（小于10补前导零）
-    padZero(num) {
-      return num < 10 ? `0${num}` : num;
-    },
-    startCountdown() {
-      this.clearCountdownTimer();
-      this.countdownTimer = setInterval(() => {
-        // 这里我们不直接修改 props，而是在倒计时结束时通知父组件
-        if (this.item.remainingTime <= 1) {
-          // 当倒计时即将结束时
-          this.clearCountdownTimer();
-          this.isUpdating = true; // 显示“更新中”状态
-          this.$emit("expire", this.item.id); // 通知父组件：我过期了！
-        } else {
-          // 为了UI流畅，可以在这里更新本地倒计时显示，但最终数据以父组件为准
-          // 注意：这是一个小技巧，避免每秒都向父组件发送事件
-          this.$set(this.item, "remainingTime", this.item.remainingTime - 1);
-        }
-      }, 1000);
-    },
-    clearCountdownTimer() {
-      if (this.countdownTimer) {
-        clearInterval(this.countdownTimer);
-        this.countdownTimer = null;
-      }
-    },
-    handleClick() {
-      this.$emit("btnEvent", this.item);
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.order {
-  &-wrap {
-    background: #fff;
-    color: #333;
-    margin: 16rpx;
-    border-radius: 20rpx;
-  }
-  &-time {
-    color: #fff;
-    font-size: 24rpx;
-    padding: 20rpx 0;
-    border-radius: 20rpx 20rpx 0 0;
-    display: flex;
-    align-items: center;
-  }
-  &-title {
-    display: flex;
-    justify-content: space-between;
-    padding: 24rpx 32rpx;
-    border-bottom: 1px solid #f4f4f4;
-    &-left {
-      display: flex;
-      align-items: center;
-    }
-    &-right {
-      font-weight: 500;
-    }
-  }
-  &-product {
-    display: flex;
-    padding: 16rpx 32rpx;
-    border-bottom: 1px solid #f4f4f4;
-    & > image {
-      width: 180rpx;
-      height: 180rpx;
-      flex-shrink: 0;
-      border: 10rpx;
-    }
-    &-info {
-      margin-left: 24rpx;
-      &-name {
-        .uni-max-cut(2,80);
-        margin-bottom: 10rpx;
-      }
-      &-sku {
-        font-size: 24rpx;
-        color: #999;
-      }
-      &-price {
-        margin-top: 10rpx;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        &-left {
-          color: #ff2c18;
-          font-size: 32rpx;
-          font-weight: 500;
-          & > text {
-            font-size: 24rpx;
-            margin-right: 10rpx;
-          }
-          .range {
-            margin: 0 10rpx;
-          }
-        }
-        &-right {
-          color: #999;
-          display: flex;
-          align-items: baseline;
-          & > view {
-            margin-left: 10rpx;
-          }
-        }
-      }
-    }
-  }
-  &-price {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 24rpx 32rpx;
-    border-radius: 0 0 20rpx 20rpx;
-    &-left {
-      &-market {
-        font-size: 24rpx;
-        color: #999;
-        margin-bottom: 10rpx;
-      }
-      &-settle {
-        font-size: 24rpx;
-        display: flex;
-        align-items: center;
-        & > view {
-          color: #ff2c18;
-          font-size: 32rpx;
-          font-weight: 500;
-          & > text {
-            font-size: 24rpx;
-            margin-right: 10rpx;
-          }
-          .range {
-            margin: 0 10rpx;
-          }
-        }
-      }
-    }
-  }
-}
-</style>