order

www/protected/modules/o2o/controllers/OrderController.php

@@ -34,7 +34,7 @@ class  OrderController extends O2oBaseController{
         //活动暂用  start 判断用户是否购买过  test //583247cca84ea01d428b46a1 master//  58324b7e9f5160a4048b5758
         $doubleEleventId = '58324b7e9f5160a4048b5758';
         //$flag_book = 0;
-
+        /*
         if($products[0]['product_id'] == $doubleEleventId) {
 
             $criteria_user = new EMongoCriteria();
@@ -79,11 +79,11 @@ class  OrderController extends O2oBaseController{
                         $total += 1;
                     }
                 }
-            }*/
+            }
 
             //$flag_book = 1;
         }
-
+        */
         //end  //取出双十一活动暂用
 
 

www/vue/src/components/product.vue

@@ -47,6 +47,8 @@
         console.log(this.$route.query.productBox)
       },
       btnOrder: function (cb) {
+        config.orderInfo = ''
+
         config.formData = new FormData()
         const balance = 0
         console.log(balance)
@@ -60,22 +62,9 @@
         let extraJson = ''
         extraJson = JSON.stringify([{type: '整间日常清洁', price: '388'}])
         console.log(extraJson)
-        const channel = 'wx_pub'
         const addressId = this.$store.state.user.userInfo.shop_address[0].address_id
         const time = '2017-06-21 11:00'
-        console.log(channel)
-        console.log(config)
-        config.formData.append('balance', balance)
-        config.formData.append('products', productParamJson)
-        config.formData.append('precedence', 0)
-        config.formData.append('booking_time', time)
-        config.formData.append('order_channel', channel)
-        config.formData.append('user_id', config.userId)
-        config.formData.append('address_id', addressId)
-        config.formData.append('station', '57db39709f5160bb048b456a')
-        config.formData.append('counts', '1')
-        config.formData.append('extra', extraJson)
-        config.formData.append('order_channel', 'wx_pub')
+        config.orderInfo = JSON.stringify([{balance: balance}, {products: productParamJson}, {precedence: 0}, {booking_time: time}, {user_id: config.userId}, {address_id: addressId}, {station: '57db39709f5160bb048b456a'}, {counts: '1'}, {extra: extraJson}, {order_channel: 'wx_pub'}])
         this.PAYCHANGE()
         console.log(time)
       },

www/vue/src/config/api.js

@@ -43,20 +43,14 @@ export default ({
       console.log(e)
     })
   },
-  addOrder: function (cb) {
+  // 新增订单
+  addOrder: function () {
     axios.post('o2o/order/add', config.formData).then(function (res) {
       let data = res.data.data
-      // 支付成功
-      console.log('api.js' + 50)
-      console.log(res)
       if (data.status === 1) {
       } else {
         //  支付失败
-        let orderID = data.id
-        const payChannel = 'wx_pub'
-        config.formData.append('order_id', orderID)
-        config.formData.append('pay_channel', payChannel)
-        axios.post('o2o/order/pay', config.formData).then(function (res) {
+        axios.post('o2o/order/pay', config.orderInfo).then(function (res) {
           //  let tmp = {orderData: data, changeData: res.data}
           console.log(res.data)
           pingpp.createPayment(res.data.data, function (result, err) {

www/vue/src/config/config.js

@@ -4,6 +4,7 @@ let uri = location.href
 let test = true
 var userId = ''
 var formData = ''
+let orderInfo = ''
 if (uri.indexOf('common.yiguanjia.me') > -1) {
   test = false
 }
@@ -28,5 +29,6 @@ axios.defaults.baseURL = apiPath
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
 export default {
   userId: userId,
-  formData: formData
+  formData: formData,
+  orderInfo: orderInfo
 }