Merge branch 'release-activity' of...

Merge branch 'release-activity' of https://git.yidian-inc.com:8021/bp/op-web-service into release-activity

src/pages/Activity/ActivityDetail/index.vue

@@ -10,27 +10,27 @@
     <div class="activityInfo-wrapper">
       <el-card class="activityInfo">
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.order_count }}</p>
+          <p class="infoItemText">{{ detailInfo.sumOrder }}</p>
           <p>订单数量</p>
         </div>
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.sold_goods_count }}</p>
+          <p class="infoItemText">{{ detailInfo.sumGoods }}</p>
           <p>已售商品数量</p>
         </div>
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.pay_amount_count }}</p>
+          <p class="infoItemText">{{ detailInfo.payAmount }}</p>
           <p>支付金额</p>
         </div>
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.discount_amount_count }}</p>
+          <p class="infoItemText">{{ detailInfo.sumCouponAmount }}</p>
           <p>优惠金额</p>
         </div>
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.refund_count }}</p>
+          <p class="infoItemText">{{ detailInfo.refundAmount }}</p>
           <p>退款</p>
         </div>
         <div class="infoItem">
-          <p class="infoItemText">{{ detailInfo.real_income_count }}</p>
+          <p class="infoItemText">{{ detailInfo.income }}</p>
           <p>实际收入</p>
         </div>
       </el-card>

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -465,6 +465,7 @@ export default {
     async commodity(type, val) {
       this.$refs.picUpload && this.$refs.picUpload.clearFiles && this.$refs.picUpload.clearFiles();
       this.picUrlList = [];
+      this.picStr = ''
 
       this.addCommodityPopup = true;
       this.commodityForm = {};

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -237,10 +237,10 @@ let checkphone = (rule, value, callback) => {
 export default {
   data() {
     return {
-      startDate: dayJs().format("YYYY-MM-DD HH:mm:ss"), //开始时间
+      startDate: dayJs().format("YYYY-MM-DDTHH:mm:ss"), //开始时间
       endDate: dayJs()
         .add(7, "day")
-        .format("YYYY-MM-DD HH:mm:ss"), // 结束时间
+        .format("YYYY-MM-DDTHH:mm:ss"), // 结束时间
       pickerOptions: {
         disabledDateStart(time) {
           let _now = Date.now();
@@ -407,7 +407,8 @@ export default {
     // 添加自提点
     async addPlace() {
       let params = Object.assign(this.form, {
-        take_place_id: this.id //搜索关键词
+        take_place_id: this.id, //搜索关键词
+        contact_name:this.form.contactor
       });
       try {
         this.pageLoading = true;

src/pages/Groupmeal/Distrib/index.vue

@@ -366,8 +366,10 @@ export default {
       var ENV;
       if (process.env.NODE_ENV == "development") {
         ENV = "http://bp-dev.ini.yidian-inc.com/";
-      } else {
+      } else if (process.env.NODE_ENV == "test") {
         ENV = "http://bp-test.ini.yidian-inc.com/";
+      } else {
+        ENV = "http://bp.ini.yidian-inc.com/";
       }
       url && window.open(ENV + url);
     },

src/service/Groupmeal/groupmeal.js

@@ -109,8 +109,10 @@ export function getOrderExportURL(eventId, type) {
   var ENV;
   if(process.env.NODE_ENV == "development"){
     ENV = "http://bp-dev.ini.yidian-inc.com/"
-  }else{
+  }else if(process.env.NODE_ENV == "test"){
     ENV = "http://bp-test.ini.yidian-inc.com/"
+  }else{
+    ENV = "http://bp.ini.yidian-inc.com/"
   }
   return `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
 }
@@ -185,8 +187,10 @@ export function newGetOrderExportURL(eventId, type) {
   var ENV;
   if(process.env.NODE_ENV == "development"){
     ENV = "http://bp-dev.ini.yidian-inc.com/"
-  }else{
+  }else if(process.env.NODE_ENV == "test"){
     ENV = "http://bp-test.ini.yidian-inc.com/"
+  }else{
+    ENV = "http://bp.ini.yidian-inc.com/"
   }
   return `${ENV}order/background/order_export?marketing_id=${eventId}&type=${type}`;
 }