add cut support

@@ -9,10 +9,12 @@ import orderService from '../orderService'
 import {getImgUrl} from '../../../utils';
 import {getImgUrl} from '../../../utils';
 import router from '../../../router/index.js'
 import router from '../../../router/index.js'
 import { prePay } from '../../order/wxpay.js'
 import { prePay } from '../../order/wxpay.js'
-import Yas from '../../../utils/yas';
+import Yas from '../../../utils/yas'
 
 
 let yas;
 let yas;
 
 
+const ACTIVITY_TYPE = 18; // 砍价
+
 const api = new orderService();
 const api = new orderService();
 Page({
 Page({
 
 
@@ -29,7 +31,8 @@ Page({
     coupons: [],
     coupons: [],
     selectCouponCode: '',
     selectCouponCode: '',
     selectCouponAmount: '',
     selectCouponAmount: '',
-    selectingCoupon: false
+    selectingCoupon: false,
+    user_activity_id: ''  // 有值代表砍价
   },
   },
   onLoad: async function (option) {
   onLoad: async function (option) {
     yas = new Yas(this);
     yas = new Yas(this);
@@ -39,7 +42,8 @@ Page({
       storeId: option.store_id || 0,
       storeId: option.store_id || 0,
       skup: option.skup || '',
       skup: option.skup || '',
       product_id: option.product_id || '',
       product_id: option.product_id || '',
-      hasAddress: false
+      hasAddress: false,
+      user_activity_id: option.user_activity_id || ''
     })
     })
     await this.fetchData(option.is_store);
     await this.fetchData(option.is_store);
     if (!option.is_store) {
     if (!option.is_store) {
@@ -72,10 +76,19 @@ Page({
           coupon_code: code
           coupon_code: code
         }, () => wx.hideLoading());
         }, () => wx.hideLoading());
       } else {
       } else {
-        info = await api.orderCompute({
+        const params = {
           skup: this.data.skup,
           skup: this.data.skup,
           coupon_code: code
           coupon_code: code
-        }, () => wx.hideLoading());
+        };
+
+        if (this.data.user_activity_id) {
+          Object.assign(params, {
+            user_activity_id: this.data.user_activity_id,
+            activity_type: ACTIVITY_TYPE
+          });
+        }
+
+        info = await api.orderCompute(params, () => wx.hideLoading());
       }
       }
     } catch(e) {}
     } catch(e) {}
 
 
@@ -99,6 +112,14 @@ Page({
       skup: this.data.skup,
       skup: this.data.skup,
       store_id: this.data.storeId
       store_id: this.data.storeId
     }
     }
+
+    if (this.data.user_activity_id) {
+      Object.assign(params, {
+        user_activity_id: this.data.user_activity_id,
+        activity_type: ACTIVITY_TYPE
+      })
+    }
+
     let data;
     let data;
     if (isStore) {
     if (isStore) {
       data = await api.createOfflinePayment(params, () => wx.hideLoading())
       data = await api.createOfflinePayment(params, () => wx.hideLoading())
@@ -191,11 +212,19 @@ Page({
         let skup = this.data.skup
         let skup = this.data.skup
         let channelNo = '';
         let channelNo = '';
         let couponCode = this.data.selectCouponCode || '';
         let couponCode = this.data.selectCouponCode || '';
+        let extra = null;
+
+        if (this.data.user_activity_id) {
+          extra = {
+            user_activity_id: this.data.user_activity_id,
+            activity_type: ACTIVITY_TYPE
+          };
+        }
 
 
         // wx.showLoading({
         // wx.showLoading({
         //   title: '',
         //   title: '',
         // })
         // })
-        data = await api.buyerSubmit(skup, channelNo, addressId, couponCode, () => wx.hideLoading());
+        data = await api.buyerSubmit({skup, channelNo, addressId, couponCode, extra}, () => wx.hideLoading());
       }
       }
       if (data && data.orderCode) {
       if (data && data.orderCode) {
         let skup = this.data.skup
         let skup = this.data.skup

@@ -6,7 +6,8 @@
                 wx:else></storeAddress>
                 wx:else></storeAddress>
 
 
   <productCell productInfo="{{good}}" isStore="{{isStore === 1}}"></productCell>
   <productCell productInfo="{{good}}" isStore="{{isStore === 1}}"></productCell>
-  <couponCell bindselect="showSelectCoupon" amount="{{selectCouponAmount}}"></couponCell>
+  <!-- // 砍价没有优惠券 -->
+  <couponCell wx:if="{{!user_activity_id}}" bindselect="showSelectCoupon" amount="{{selectCouponAmount}}"></couponCell>
   <priceCell promotionFormulaList="{{promotionFormulaList}}" damagesDesc="{{damagesDesc}}" isStore="{{isStore === 1}}"></priceCell>
   <priceCell promotionFormulaList="{{promotionFormulaList}}" damagesDesc="{{damagesDesc}}" isStore="{{isStore === 1}}"></priceCell>
   <payDeliveryCell paymentWay="{{paymentWay}}" deliveryWay="{{deliveryWay}}"></payDeliveryCell>
   <payDeliveryCell paymentWay="{{paymentWay}}" deliveryWay="{{deliveryWay}}"></payDeliveryCell>
 </scroll-view>
 </scroll-view>

@@ -56,15 +56,15 @@ export default class orderService extends BaseService {
     })
     })
   }
   }
 
 
-  async buyerSubmit(skup, channelNo = '2919', addressId, couponCode, complete) {
+  async buyerSubmit({skup, channelNo = '2919', addressId, couponCode, complete, extra = {}} ) {
 
 
-    return await this.GET({
+    return await this.GET(Object.assign({
       method: BUYER_SUBMIT,
       method: BUYER_SUBMIT,
       skup,
       skup,
       channelNo,
       channelNo,
       addressId,
       addressId,
       coupon_code: couponCode || ''
       coupon_code: couponCode || ''
-    }, {
+    }, extra), {
       path: '/shopping',
       path: '/shopping',
       complete
       complete
     })
     })