Merge branch 'feature/hl-2月迭代' into dev

src/views/setting/editDeliver.vue

@@ -457,6 +457,7 @@ export default {
     //   let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
     //   this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
     // }
+    this.getErpGoodsFlag();
   },
   methods: {
     // 添加时间段
@@ -829,6 +830,18 @@ export default {
         name: 'deliverSet',
       });
     },
+    // 检测是否开启 erp商品兑换接口
+    getErpGoodsFlag () {
+      request.get('/api-integral-mall/get-config').then(res => {
+        if (res.data.errorCode === 0) {
+          const result = res.data.result || {};
+          this.$store.commit('mutations_erpGoodsFlag', result.goodsStockSync || 0);
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+
   },
 };
 </script>