回退 'Pull Request !42 : 1-19 He'

rc-busness/ajax/getData.js

@@ -31,13 +31,13 @@ export const courselist = (offset, courseId, type, sort, selectScreen = []) => {
     courseId,
     selectScreenStr
   }
-  return fetch('/api/courselist', data)
+  return fetch( '/api/courselist', data)
 }
 /**
  * 获取课程详情
  */
 export const getDetail = (id) => {
-  fetch('/api/courseDetail/index/' + id)
+  fetch( '/api/courseDetail/index/' + id)
 }
 
 /**
@@ -56,40 +56,44 @@ export const getleckCourse = (name, offset) => {
  * 加入购物车
  */
 
-export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications) => {
+export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,productName,productPrice,specifications) => {
   var data = {
-    buyCount: buyCount,
+    buyCount:buyCount,
     memberId: memberId,
-    mobile: mobile,
-    productCode: productCode,
+    mobile:mobile,
+    productCode:productCode,
     productImg: productImg,
-    productName: productName,
-    productPrice: productPrice,
-    specifications: specifications
+    productName:productName,
+    productPrice:productPrice,
+    specifications:specifications
   }
-  return fetch('/insertCartProductInfo', data, 'POST')
+  return fetch('/insertCartProductInfo', data,'POST')
 }
 /**
  * 是否存在购物车
  */
-export const isexistCart = (id) => {
+ export const isexistCart = (id, pet,address) => {
   var data = {
-   
+    memberId: id,
   }
-  return fetch('getCartProductInfo', data, 'POST')
+  return fetch('getCartProductInfo?memberId='+id,data,'POST')
 }
 
 /**
  * 删除购物车
  */
 export const deleteCart = (memberId, productCode) => {
-  return fetch('cancelCartProductInfo?memberId=' + memberId, productCode, 'POST')
+  var data = {
+    memberId: memberId,
+    productCode:productCode
+  }
+  return fetch('cancelCartProductInfo',data,'POST')
 }
 /**
  * 购物车批量提交
  */
 export const mostAddClass = (id) => {
-  return fetch('/api/mostAddClass/', { id })
+  return fetch('/api/mostAddClass/', {id})
 }
 /**
  * 删除购物车
@@ -105,47 +109,47 @@ export const mostAddClass = (id) => {
 /**
  * 发送验证码
  */
-export const sendMsg = (mobile, pet, address) => {
+ export const sendMsg = (mobile, pet,address) => {
   var data = {
-    phoneNumber: mobile,
+    phoneNumber:mobile,
   }
-  return fetch('sendMsg', data, 'POST')
+  return fetch('sendMsg', data, 'POST' )
 }
 
 /**
  * 发送验证码数据
  */
-export const vadatnmsg = (msgNum, hash, tamp) => {
+ export const vadatnmsg = (msgNum,hash,tamp) => {
   var data = {
-    msgNum: msgNum,
-    tamp: tamp,
-    hash: hash
+    msgNum:msgNum,
+    tamp:tamp,
+    hash:hash
   }
-  return fetch('validateNum', data, 'POST')
+  return fetch('validateNum', data, 'POST' )
 }
 
 /**
  * 筛选标签
  */
-export const userstype = (stype, pet, address) => {
+ export const userstype = (stype, pet,address) => {
   var data = {
-    petType: 0,
+    petType:0,
   }
-  return fetch('productSearchTag/query?petType=' + 0, data, 'POST')
+  return fetch('productSearchTag/query?petType=' + 0, data, 'POST' )
 }
 /**
  * 登录
  */
-export const userLongin = (mobile, pet, address) => {
+export const userLongin = (mobile, pet,address) => {
   var data = {
-    id: '',
-    mobile: mobile,
+    id:'',
+    mobile:mobile,
   }
-  return fetch('member?type=get', data, 'POST')
+  return fetch('member?type=get', data, 'POST' )
 }
 
-//注册
-export const useredit = (mobile, pet, address) => {
+  //注册
+export const useredit = (mobile, pet,address) => {
   var data = {
     mobile:mobile,
     memberName:'',
@@ -180,10 +184,10 @@ export const userquery = (stype) => {
 
   console.log(stype);
   var data = {
-    goodsName: stype
+    goodsName:stype
 
   }
-  return fetch('goods?goodsName=' + stype, data, 'POST')
+  return fetch('goods?goodsName='+stype, data, 'POST' )
 }
 //商品全部信息
 export const userque = (stype) => {
@@ -191,7 +195,7 @@ export const userque = (stype) => {
   console.log(stype);
   var data = {
   }
-  return fetch('goods', data, 'POST')
+  return fetch('goods', data, 'POST' )
 }
 
 
@@ -230,14 +234,20 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
 		curRow=10;
 	let queryTail='&page='+curPage+'&rows='+curRow;
   console.log(stype);
-  let list = {};
-  stype.map(item => {
+  let list={};
+  stype.map(item=>{
     console.log(item);
     list=item
   }) 
   var str = "&";
             for(var key in list){
-    str = str + key + "=" + list[key] + "&";
+
+                str = str + key + "=" + list[key] + "&";
+            }
+            str = str.substr(0,str.length-1);
+  var data = {
+    page:1,
+    row:10
   }
   
   return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' )
@@ -255,19 +265,19 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
 
 
 //查询订单
-export const userindent = (phoneNumber, orderNumber,) => {
-  var data = {
-    phoneNumber: '18112621098',
-    orderNumber: orderNumber,
+export const userindent = (phoneNumber,orderNumber,) => {
+  var data = { 
+    phoneNumber:'18112621098',
+    orderNumber:orderNumber,
   }
-  return fetch('orderMaster/?type=query', data, 'POST')
+  return fetch('orderMaster/?type=query', data, 'POST' )
 }
 //查询订单详情
 export const userin = (orderNumber,) => {
-  var data = {
-    orderNumber: orderNumber,
+  var data = { 
+    orderNumber:orderNumber,
   }
-  return fetch('orderMaster/?type=query', data, 'POST')
+  return fetch('orderMaster/?type=query', data, 'POST' )
 }
 
 
@@ -275,21 +285,21 @@ export const userin = (orderNumber,) => {
 //取消订单
 export const canceldanhao = (orderNumber) => {
   var data = {
-
-    orderNumber: orderNumber,
+   
+    orderNumber:orderNumber,
   }
-  return fetch('cancelOrder/', data, 'POST')
+  return fetch('cancelOrder/', data, 'POST' )
 }
 
 
 export const biaomessa = (stype) => {
   console.log(stype);
   var data = {
-    name: stype,
-    page: 1,
-    row: 10
+    name:stype,
+    page:1,
+    row:10
   }
-  return fetch('product/query', data, 'POST')
+  return fetch('product/query', data, 'POST' )
 }
 
 export const biaome = (usertype,stype,curPage,rows) => {
@@ -301,9 +311,9 @@ export const biaome = (usertype,stype,curPage,rows) => {
     let username='&name='+stype
   console.log(stype);
   var data = {
-    name: stype,
-    rows: 10,
-    page: 1,
+    name:stype,
+    rows:10,
+    page:1,
   }
   return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' )
 }
@@ -314,9 +324,9 @@ export const biaome = (usertype,stype,curPage,rows) => {
 export const memberAccount = (stype) => {
   console.log(stype);
   var data = {
-    memberId: stype
+    memberId:stype
   }
-  return fetch('memberAccount?type=history', data, 'POST')
+  return fetch('memberAccount?type=history', data, 'POST' )
 }
 
 
@@ -324,20 +334,20 @@ export const memberAccount = (stype) => {
 export const ordermaster = (stype) => {
   console.log(stype);
   var data = {
-
-    memberId: '223782'
+  
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 //微信支付
 export const payOrderWX = (stype) => {
   console.log(stype);
   var data = {
-
-    memberId: '223782'
+   
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 
@@ -346,9 +356,9 @@ export const payOrderWX = (stype) => {
 export const insercar = (stype) => {
   console.log(stype);
   var data = {
-    petType: stype
+    petType:stype
   }
-  return fetch('product/insertCartProductInfo', data, 'POST')
+  return fetch('product/insertCartProductInfo', data, 'POST' )
 }
 
 
@@ -356,25 +366,25 @@ export const insercar = (stype) => {
 
 
 //查询猫狗商品信息
-export const catquery = (productCode, type) => {
+export const catquery = (productCode,type) => {
   console.log(productCode);
   var data = {
-
-    petType: 0
+   
+    petType:0
 
   }
-  return fetch('h5/product/query', data, 'POST')
+  return fetch('h5/product/query', data, 'POST' )
 }
 //查询猫狗商品信息
-export const dogquery = (productCode, type) => {
+export const dogquery = (productCode,type) => {
   console.log(productCode);
   var data = {
-
-    petType: 1,
-    pet_type: 0
+  
+    petType:1,
+    pet_type:0
 
   }
-  return fetch('h5/product/query', data, 'POST')
+  return fetch('h5/product/query', data, 'POST' )
 }
 
 
@@ -385,11 +395,11 @@ export const dogquery = (productCode, type) => {
 export const oncequery = (productCode) => {
 
   var data = {
-
-    productCode: productCode
+  
+    productCode:productCode
 
   }
-  return fetch("goodsByProductCode?productCode=" + productCode, data, 'POST')
+  return fetch( "goodsByProductCode?productCode="+productCode, data, 'POST' )
 }
 
 
@@ -397,173 +407,163 @@ export const oncequery = (productCode) => {
 export const goodsmessage = (productCode) => {
 
   var data = {
-    productCode: productCode
+    productCode:productCode
 
   }
-  return fetch("productMaster/query?productCode=" + productCode, data, 'POST')
+  return fetch( "productMaster/query?productCode="+productCode, data, 'POST' )
 }
 
 
 
 
-//优惠券的插入
-export const inserdiscount = (mobile, couponId) => {
-  var data = {
-    mobile: mobile,
-    couponId: couponId
+  //优惠券的插入
+  export const inserdiscount = (mobile,couponId) => {
+    var data = {
+      mobile:mobile,
+      couponId:couponId
+    }
+    return fetch('coupon?type=fetch', data, 'POST' )
   }
-  return fetch('coupon?type=fetch', data, 'POST')
-}
 
 
-//优惠券的查询
-export const getdiscount = (memberId, channelSecurity, mobile) => {
-  var data = {
-    memberId: memberId,
-    mobile: mobile
+    //优惠券的查询
+    export const getdiscount = (memberId,channelSecurity,mobile) => {
+      var data = {
+        memberId:memberId,
+        mobile:mobile
+      }
+      return fetch('memberAddress?type=getAll', data, 'POST' )
+    }
+
+       //可用的优惠券
+       export const alldiscount = (memberId,channelSecurity,mobile) => {
+        var data = {
+          memberId:memberId,
+        }
+        return fetch('couponConfig?type=getAll', data, 'POST' )
+      }
+
+
+        //用户领取的优惠券
+        export const getdraw = (mobile,states) => {
+          var data = {
+            mobile:mobile,
+            status:states
+          }
+          return fetch('coupon?type=getAll', data, 'POST' )
+        }
+
+
+  //微信支付
+  export const generateOrderWX = (list) => {
+    var data = [{
+      
+
+      }]
+    return fetch('generateOrderWX', list, 'POST' )
   }
-  return fetch('memberAddress?type=getAll', data, 'POST')
-}
+  //用户所有的优惠券
+    export const allConfig = (memberId,channelSecurity,mobile) => {
+      var data = {
+      }
+      return fetch('couponConfig?type=getAll', data, 'POST' )
+    }
+    
 
-//可用的优惠券
-export const alldiscount = (memberId, channelSecurity, mobile) => {
-  var data = {
-    memberId: memberId,
+      //用户领取优惠券
+      export const getConfig = (memberId,couponId) => {
+        var data = {
+          memberId:memberId,
+          couponId:couponId,
+        }
+        return fetch('coupon?type=fetch', data, 'POST' )
+      }
+
+      
+      //用户下的优惠券
+      export const userConfig = (memberId,couponId) => {
+        var data = {
+          memberId:memberId,
+          couponId:couponId,
+        }
+        return fetch('coupon?type=fetch', data, 'POST' )
+      }
+
+
+
+
+    //用户订单的查询
+    // export const customerorders = (memberId,channelSecurity,mobile) => {
+    //   var data = {
+    //     productName:'幼猫全价粮',
+    //     buyCount:'2',
+    //     productId:'210352',
+    //     payAmount:'517',
+    //     memberId:'844350',
+    //     phoneNumber:'18112621098',
+    //   }
+    //   return fetch('generateOrderWX', data, 'POST' )
+    // }
+
+  
+  //地址的查询
+  export const selectaddress = (memberId, pet,address) => {
+    var data = {
+      memberId:memberId,
+    }
+    return fetch('memberAddress?type=getAll', data, 'POST' )
   }
-  return fetch('couponConfig?type=getAll', data, 'POST')
-}
 
 
-//用户领取的优惠券
-export const getdraw = (mobile, states) => {
-  var data = {
-    mobile: mobile,
-    status: states
+  //地址的添加                  //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码
+  export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => {
+    var data = {
+      memberId:844350,
+      provinceId:25,
+      cityId:36,
+      districtId:418,
+      detailAddress:'古美路1455弄46号302',
+      recipient:'蒋缘缘2',
+      recipientPhone:'13671516167',
+      zipCode:'214423',
+      default:false,
+    }
+    return fetch('memberAddress?type=add', data, 'POST' )
   }
-  return fetch('coupon?type=getAll', data, 'POST')
-}
 
+      //删除
+      export const editdelete = (memberId,ids) => {
+        var data = {
+          memberId:memberId,
+          ids:ids,
+        }
+        return fetch('memberAddress?type=delete', data, 'POST' )
+      }
 
-//微信支付
-export const generateOrderWX = (list) => {
-  return fetch('generateOrderWX', list, 'POST')
-}
-//微信支付返回
-export const updateOrderWX = (data) => {
-  return fetch('updateOrderWX', data, 'POST')
-}
-//支付宝支付
-export const generateOrderAlipay = (list) => {
-  return fetch('generateOrderAlipay', list, 'POST')
-}
-
-//用户所有的优惠券
-export const allConfig = (memberId, channelSecurity, mobile) => {
-  var data = {
-  }
-  return fetch('couponConfig?type=getAll', data, 'POST')
-}
-
-
-//用户领取优惠券
-export const getConfig = (memberId, couponId) => {
-  var data = {
-    memberId: memberId,
-    couponId: couponId,
-  }
-  return fetch('coupon?type=fetch', data, 'POST')
-}
-
-
-//用户下的优惠券
-export const userConfig = (memberId, couponId) => {
-  var data = {
-    memberId: memberId,
-    couponId: couponId,
-  }
-  return fetch('coupon?type=fetch', data, 'POST')
-}
-
-
-
-
-//用户订单的查询
-// export const customerorders = (memberId,channelSecurity,mobile) => {
-//   var data = {
-//     productName:'幼猫全价粮',
-//     buyCount:'2',
-//     productId:'210352',
-//     payAmount:'517',
-//     memberId:'844350',
-//     phoneNumber:'18112621098',
-//   }
-//   return fetch('generateOrderWX', data, 'POST' )
-// }
-
-//地址的查询
-export const memberAddress = (type, data) => {
-  return fetch('memberAddress?type=' + type, data, 'POST')
-}
-
-
-//地址的查询
-export const selectaddress = (memberId, pet, address) => {
-  var data = {
-    memberId: memberId,
-  }
-  return fetch('memberAddress?type=getAll', data, 'POST')
-}
-
-
-//地址的添加                  //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码
-export const editaddress = (memberId, detailAddress, recipient, tel, provinceId, cityId, districtId) => {
-  var data = {
-    memberId: 844350,
-    provinceId: 25,
-    cityId: 36,
-    districtId: 418,
-    detailAddress: '古美路1455弄46号302',
-    recipient: '蒋缘缘2',
-    recipientPhone: '13671516167',
-    zipCode: '214423',
-    default: false,
-  }
-  return fetch('memberAddress?type=add', data, 'POST')
-}
-
-//删除
-export const editdelete = (memberId, ids) => {
-  var data = {
-    memberId: memberId,
-    ids: ids,
-  }
-  return fetch('memberAddress?type=delete', data, 'POST')
-}
-
-//地址的编辑
-export const editupdate = (mobile, pet, address) => {
-  var data = {
-
-    memberId: '3242',
-    id: '620111',
-    provinceId: '',
-    cityId: '',
-    districtId: '',
-    detailAddress: '江西省萍乡市',
-    recipient: '刘佳敏',
-    recipientPhone: '13407998521',
-    zipCode: '',
-    isDefault: '',
-  }
-  return fetch('memberAddress?type=update', data, 'POST')
-}
+    //地址的编辑
+    export const editupdate = (mobile, pet,address) => {
+      var data = {
+  
+        memberId:'3242',
+        id:'620111',
+        provinceId:'',
+        cityId:'',
+        districtId:'',
+        detailAddress:'江西省萍乡市',
+        recipient:'刘佳敏',
+        recipientPhone:'13407998521',
+        zipCode:'',
+        isDefault:'',
+      }
+      return fetch('memberAddress?type=update', data, 'POST' )
+    }
 
 //修改密码
-export const userchange = (id, pet, address) => {
+export const userchange = (id, pet,address) => {
   var data = {
-    id: id,
+    id:id,
   }
-  return fetch('member?type=update', data, 'POST')
+  return fetch('member?type=update', data, 'POST' )
 }