更改提交

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,32 +56,32 @@ export const getleckCourse = (name, offset) => {
  * 加入购物车
  */
 
-export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment) => {
+export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,productName,productPrice,specifications) => {
   var data = {
-    buyCount: buyCount,
+    buyCount:buyCount,
     memberId: memberId,
-    mobile: mobile,
+    mobile:mobile,
-    productCode: productCode,
+    productCode:productCode,
     productImg: productImg,
-    productName: productName,
+    productName:productName,
-    productPrice: productPrice,
+    productPrice:productPrice,
-    specifications: specifications,
+    specifications:specifications
-    leftAllotment: leftAllotment
   }
-  return fetch('/insertCartProductInfo', data, 'POST')
+  return fetch('/insertCartProductInfo', data,'POST')
 }
 /**
  * 是否存在购物车
  */
-export const isexistCart = (id, pet, address) => {
+ export const isexistCart = (id, pet,address) => {
-  var data = {}
+  var data = {  }
-  return fetch('getCartProductInfo?memberId=' + id, data, 'POST')
+  return fetch('getCartProductInfo?memberId='+id,data,'POST')
 }
 
 /**
  * 删除购物车
  */
 export const deleteCart = ( productCode) => {
+	debugger;
   var data = {
     productCode
   }
@@ -91,7 +91,7 @@ export const deleteCart = ( productCode) => {
  * 购物车批量提交
  */
 export const mostAddClass = (id) => {
-  return fetch('/api/mostAddClass/', { id })
+  return fetch('/api/mostAddClass/', {id})
 }
 /**
  * 删除购物车
@@ -107,68 +107,68 @@ 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,
+    msgNum:msgNum,
-    tamp: tamp,
+    tamp:tamp,
-    hash: hash
+    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: '',
+    id:'',
-    mobile: mobile,
+    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,
+    mobile:mobile,
-    memberName: '',
+    memberName:'',
-    realName: '',
+    realName:'',
-    gender: '',
+    gender:'',
-    email: '',
+    email:'',
-    openId: '',
+    openId:'',
-    unionId: '',
+    unionId:'',
-    birthday: '',
+    birthday:'',
-    provinceId: '',
+    provinceId:'',
-    cityId: '',
+    cityId:'',
-    districtId: '',
+    districtId:'',
-    storeCode: '',
+    storeCode:'',
-    remark: '',
+    remark:'',
-    memberMark: '',
+    memberMark:'',
   
-    remark: ''
+    remark:''
   }
-  return fetch('member?type=add', data, 'POST')
+  return fetch('member?type=add', data, 'POST' )
 }
-//查询标品全部信息
+   //查询标品全部信息
 // export const userquery = (mobile, pet,address) => {
 //   var data = {
 //     channelId:"15",
@@ -178,14 +178,14 @@ export const useredit = (mobile, pet, address) => {
 //   return fetch('h5/brand/query', data, 'POST' )
 // }
 //点击商品全部信息
-export const userquery = (stype,) => {
+export const userquery = (stype, ) => {
 
   console.log(stype);
   var data = {
-    goodsName: stype
+    goodsName:stype
 
   }
-  return fetch('goods?petType=' + stype, data, 'POST')
+  return fetch('goods?petType='+stype, data, 'POST' )
 }
 //处方信息
 export const userque = (goodsName, curPage,curRow) => {
@@ -198,62 +198,62 @@ export const userque = (goodsName, curPage,curRow) => {
 	queryTail = '?goodsName='+goodsName;
   var data = {
   }
-  return fetch('goods' + queryTail, data, 'POST')
+  return fetch('goods'+queryTail, data, 'POST' )
 }
 
 
 
 //标品全部信息
-export const biaomessage = (stype, name, curPage, curRow) => {
+export const biaomessage = (stype,name,curPage,curRow) => {
-  if (!curPage)
+	if(!curPage)
-    curPage = 1;
+		curPage=1;
-  if (!curRow)
+	if(!curRow)
-    curRow = 10;
+		curRow=10;
-  let queryTail = '&page=' + curPage + '&rows=' + curRow;
+	let queryTail='&page='+curPage+'&rows='+curRow;
-  if (stype.length > 1) {
+	if(stype.length>1){
-    let list = {};
+		let list={};
-    stype.map(item => {
+		stype.map(item=>{
-      console.log(item);
+			console.log(item);
-      list = item
+			list=item
-    })
+		})
-    var str = "?";
+		var str = "?";
-    for (var key in list) {
+		for(var key in list){
-      str = str + key + "=" + list[key] + "&";
+			str = str + key + "=" + list[key] + "&";
-    }
+		}
-    stype = str.substr(0, str.length - 1);
+		stype = str.substr(0,str.length-1);
-    return fetch('product/query' + stype + queryTail, '', 'POST')
+		return fetch('product/query'+stype+queryTail, '', 'POST' )
-  } else {
+	}else{
-    return fetch('product/query?petType=' + stype + queryTail, '', 'POST')
+		return fetch('product/query?petType='+stype+queryTail, '', 'POST' )
-  }
+	}
 }
 
-export const searchchanpin = (stype, usertype, curPage, curRow) => {
+export const searchchanpin = (stype,usertype,curPage,curRow) => {
 
-  console.log(stype, usertype);
+  console.log(stype,usertype);
   
-  if (!curPage)
+  if(!curPage)
-    curPage = 1;
+		curPage=1;
-  if (!curRow)
+	if(!curRow)
-    curRow = 10;
+		curRow=10;
-  let queryTail = '&page=' + curPage + '&rows=' + curRow;
+	let queryTail='&page='+curPage+'&rows='+curRow;
   console.log(stype);
-  let list = {};
+  let list={};
-  stype.map(item => {
+  stype.map(item=>{
     console.log(item);
-    list = item
+    list=item
   }) 
   var str = "&";
-  for (var key in list) {
+            for(var key in list){
 
-    str = str + key + "=" + list[key] + "&";
+                str = str + key + "=" + list[key] + "&";
-  }
+            }
-  str = str.substr(0, str.length - 1);
+            str = str.substr(0,str.length-1);
   var data = {
-    page: 1,
+    page:1,
-    row: 10
+    row:10
   }
   
-  return fetch('product/query?petType=' + usertype + str + queryTail, data, 'POST')
+  return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' )
 }
 
 
@@ -268,58 +268,58 @@ export const searchchanpin = (stype, usertype, curPage, curRow) => {
 
 
 //查询订单
-export const userindent = (phoneNumber, orderNumber,) => {
+export const userindent = (phoneNumber,orderNumber,) => {
   var data = { 
-    phoneNumber: phoneNumber,
+    phoneNumber:phoneNumber,
-    orderNumber: orderNumber,
+    orderNumber:orderNumber,
   }
-  return fetch('orderMaster/?type=query', data, 'POST')
+  return fetch('orderMaster/?type=query', data, 'POST' )
 }
 //查询订单详情
 export const userin = (orderNumber,) => {
   var data = { 
-    orderNumber: orderNumber,
+    orderNumber:orderNumber,
   }
-  return fetch('orderMaster/?type=query', data, 'POST')
+  return fetch('orderMaster/?type=query', data, 'POST' )
 }
 
 
 
 //取消订单
-export const canceldanhao = (phoneNumber, orderNumber) => {
+export const canceldanhao = (phoneNumber,orderNumber) => {
   var data = {
-    phoneNumber: phoneNumber,
+    phoneNumber:phoneNumber,
-    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,
+    name:stype,
-    page: 1,
+    page:1,
-    row: 10
+    row:10
   }
-  return fetch('product/query', data, 'POST')
+  return fetch('product/query', data, 'POST' )
 }
 
-export const biaome = (usertype, stype, curPage, rows) => {
+export const biaome = (usertype,stype,curPage,rows) => {
-  if (!curPage)
+  if(!curPage)
-    curPage = 1;
+		curPage=1;
-  if (!rows)
+    if(!rows)
-    rows = 10;
+		rows=10;
-  let queryTail = '&page=' + curPage + '&rows=' + rows;
+    let queryTail='&page='+curPage+'&rows='+rows;
-  let username = '&name=' + stype
+    let username='&name='+stype
   console.log(stype);
   var data = {
-    name: stype,
+    name:stype,
-    rows: 10,
+    rows:10,
-    page: 1,
+    page:1,
   }
-  return fetch('product/query?petType=' + usertype + username + queryTail, data, 'POST')
+  return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' )
 }
 
 
@@ -328,9 +328,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' )
 }
 
 
@@ -339,9 +339,9 @@ export const ordermaster = (stype) => {
   console.log(stype);
   var data = {
   
-    memberId: '223782'
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 //微信支付
@@ -349,9 +349,9 @@ export const payOrderWX = (stype) => {
   console.log(stype);
   var data = {
    
-    memberId: '223782'
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 
@@ -360,9 +360,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' )
 }
 
 
@@ -370,25 +370,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,
+    petType:1,
-    pet_type: 0
+    pet_type:0
 
   }
-  return fetch('h5/product/query', data, 'POST')
+  return fetch('h5/product/query', data, 'POST' )
 }
 
 
@@ -400,10 +400,10 @@ export const oncequery = (productCode) => {
 
   var data = {
   
-    productCode: productCode
+    productCode:productCode
 
   }
-  return fetch("goodsByProductCode?productCode=" + productCode, data, 'POST')
+  return fetch( "goodsByProductCode?productCode="+productCode, data, 'POST' )
 }
 
 
@@ -411,30 +411,60 @@ 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) => {
+  export const inserdiscount = (mobile,couponId) => {
-  var data = {
+    var data = {
-    mobile: mobile,
+      mobile:mobile,
-    couponId: couponId
+      couponId:couponId
+    }
+    return fetch('coupon?type=fetch', data, 'POST' )
   }
-  return fetch('coupon?type=fetch', data, 'POST')
-}
 
 
-//优惠券的查询
+    //优惠券的查询
-export const getdiscount = (memberId, channelSecurity, mobile) => {
+    export const getdiscount = (memberId,channelSecurity,mobile) => {
-  var data = {
+      var data = {
-    memberId: memberId,
+        memberId:memberId,
-    mobile: mobile
+        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' )
   }
 
     //再次支付
@@ -450,128 +480,93 @@ export const getdiscount = (memberId, channelSecurity, mobile) => {
     }
     
 
-//可用的优惠券
+      //用户领取优惠券
-export const alldiscount = (memberId, channelSecurity, mobile) => {
+      export const getConfig = (memberId,couponId) => {
-  var data = {
+        var data = {
-    memberId: memberId,
+          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')
-}
 
 
-//用户领取的优惠券
+  //地址的添加                  //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码
-export const getdraw = (mobile, states) => {
+  export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => {
-  var data = {
+    
-    mobile: mobile,
+    var data = {
-    status: states
+      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', memberId, '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) => {
+    export const editupdate = (userid,) => {
-  var data = [{
+      // var data = {
-
+      //   memberId:userid,
-
+      //   id:id,
-  }]
+      //   isDefault:isDefault,
-  return fetch('generateOrderWX', list, 'POST')
+      // }
-}
+      return fetch('memberAddress?type=update', userid, '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 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', memberId, 'POST')
-}
-
-//删除
-export const editdelete = (memberId, ids) => {
-  var data = {
-    memberId: memberId,
-    ids: ids,
-  }
-  return fetch('memberAddress?type=delete', data, 'POST')
-}
-
-//地址的编辑
-export const editupdate = (userid,) => {
-  // var data = {
-  //   memberId:userid,
-  //   id:id,
-  //   isDefault:isDefault,
-  // }
-  return fetch('memberAddress?type=update', userid, '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' )
 }
 
 
@@ -625,17 +620,14 @@ export const getOrderList = (user, status) => {
 
 
 
-//购物车操作
+    //购物车操作
-export const memberAddress = (type, data) => {
+    export const memberAddress = (type,data) => {
-  return fetch('memberAddress?type=' + type, data, 'POST')
+      return fetch('memberAddress?type='+type, data, 'POST' )
-}
+    }
 
-//微信支付二维码
-export const updateOrderWX = (data) => {
-  return fetch('updateOrderWX', data, 'POST')
-}
     
-//支付宝支付二维码
+    //支付宝支付二维码
-export const generateOrderAlipay = (data) => {
+    export const generateOrderAlipay = (data) => {
-  return fetch('generateOrderAlipay', data, 'POST')
+      return fetch('generateOrderAlipay', data, 'POST' )
-}
+    }
+    

rc-busness/assets/css/discount.less

@@ -1,286 +1,120 @@
 @media screen and (max-width:768px){
-    .allmain{
+  .allmain{
    
   
+  }
+  .active {
+      font-size: 14px;
+      color: #E2001A;
+  
     }
-    .active {
+    .unactive {
-        font-size: 14px;
+      font-size: 14px;
-        color: #E2001A;
+      color: #444444;
   
-      }
-      .unactive {
-        font-size: 14px;
-        color: #444444;
-    
-      }
-      .rc-usermain{
-      .online{
-          margin-top: 0;
-      }
-   
-      .rc {
-        display: flex;
-        align-items: center;
-        margin-left: 1rem;
-        span {
-          display: block;
-          margin-left: 32px;
-          font-weight: bold;
-          cursor: pointer;
-        }
-        span:first-child {
-          margin-left: 0;
-        }
-      }
     }
-
+    .rc-usermain{
-    
+    .online{
-      .rc-discount {
-        margin-left: 20px;
-        display: flex;
-        margin-top: 16px;
-        width: 335px;
-        background: #ffffff;
-        position: relative;
-        img {
-          display: block;
-          width: 100%;
-          height: 100%;
-        }
-        .rc-contair {
-          position: absolute;
-          left: 0;
-          top: 0;
-          width: 100%;
-          height: 100%;
-          z-index: 8;
-        }
-        .rc-left {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          color: #e1001a;
-          text-align: center;
-          width: 30%;
-          font-weight: bold;
-          float: left;
-          height: 100%;
-          i {
-            font-style: normal;
-            font-size: 12px;
-          }
-          span {
-            font-size: 26px;
-          }
-          strong {
-            font-style: normal;
-            font-size: 12px;
-            display: block;
-          }
-        }
-        .rc-right {
-          display: flex;
-          flex-direction: column;
-          height: 100%;
-          i {
-            font-style: normal;
-            font-size: 14px;
-            color: #e1001a;
-          }
-          .rc-userfont {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            color: #999999;
-            font-size: 12px;
-            strong{
-                display: block;
-                margin-top: 8px;
-            }
-          }
-       
-          em {
-            font-style: normal;
-          }
-          .ts-stand{
-            display: flex;
-            align-items: center;
-            justify-content: end;
-            padding-right: 17px;
-            margin-bottom: 8px;
-          }
-          .ts-standard-btn{
-                
-            width: 72px;
-            display: flex;
-            height: 25px;
-              background: #E2001A;
-                border-radius: 100px;
-align-items: center;
-font-size: 12px;
-float: right;
-margin-right: 27px;
-justify-content: center;
-margin-top: 8px;
-
-        }
-        span{
         margin-top: 0;
-        }
-        margin-top: 17px;
-    padding-left: 36px;
-        }
-        .rc-footer {
-          display: flex;
-          align-items:flex-end;
-          span {
-            width: 72px;
-            height: 25px;
-            background: #e2001a;
-            text-align: center;
-            line-height: 25px;
-            font-size: 12px;
-            color: #ffffff;
-            margin-bottom: 8px;
-            border-radius: 100px;
-            margin-right: 30px;
-          }
-        }
-    
-        
-      }
-
-}
-@media screen and (min-width: 769px){
-.online{
-  margin-top: 30px;
-}
-     .allmain{
-      
-        .rs-dis{
-            display: flex;
-    flex-flow: wrap;
-    justify-content: center;
-        }
-    
     }
  
-    .active {
+    .rc {
-        font-size: 14px;
+      display: flex;
-        color: #E2001A;
+      align-items: center;
-    
+      margin-left: 1rem;
+      span {
+        display: block;
+        margin-left: 32px;
+        font-weight: bold;
+        cursor: pointer;
       }
-      .unactive {
+      span:first-child {
-        font-size: 14px;
+        margin-left: 0;
-        color: #444444;
-    
-      }
-      .rc-usermain{
-      .online{
-          margin-top: 0;
       }
+    }
+  }
 
-      .rc {
+  
-        height: 96px;
+    .rc-discount {
+      margin-left: 20px;
+      display: flex;
+      margin-top: 16px;
+      width: 335px;
+      background: #ffffff;
+      position: relative;
+      img {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
+      .rc-contair {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+      }
+      .rc-left {
         display: flex;
+        flex-direction: column;
         align-items: center;
         justify-content: center;
-        span {
+        color: #e1001a;
-          display: block;
+        text-align: center;
-          margin-left: 40px;
+        width: 30%;
-          font-size: 16px;
+        font-weight: bold;
-          font-weight: bold;
+        float: left;
-          cursor: pointer;
+        height: 100%;
-        
+        i {
+          font-style: normal;
+          font-size: 12px;
         }
-        span:first-child {
+        span {
-          margin-left: 0;
+          font-size: 26px;
+        }
+        strong {
+          font-style: normal;
+          font-size: 12px;
+          display: block;
+          margin-left: 10px;
         }
       }
-    }
+      .rc-right {
-
-    
-      .rc-discount {
-        margin-left: 20px;
         display: flex;
-        margin-top: 16px;
+        flex-direction: column;
-        width: 335px;
+        height: 100%;
-        background: #ffffff;
+        i {
-        position: relative;
+          font-style: normal;
-        img {
+          font-size: 14px;
-          display: block;
-          width: 100%;
-          height: 100%;
-        }
-        .rc-contair {
-          position: absolute;
-          left: 0;
-          top: 0;
-          width: 100%;
-          height: 100%;
-          z-index: 8;
-        }
-        .rc-left {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
           color: #e1001a;
-          text-align: center;
+        }
-          width: 30%;
+        .rc-userfont {
-          font-weight: bold;
+          overflow: hidden;
-          float: left;
+          text-overflow: ellipsis;
-          height: 100%;
+          white-space: nowrap;
-          i {
+          color: #999999;
-            font-style: normal;
+          font-size: 12px;
-            font-size: 12px;
+          strong{
-          }
+              display: block;
-          span {
+              margin-top: 8px;
-            font-size: 26px;
-          }
-          strong {
-            font-style: normal;
-            font-size: 12px;
-            display: block;
           }
         }
-        .rc-right {
+     
+        em {
+          font-style: normal;
+        }
+        .ts-stand{
           display: flex;
-          flex-direction: column;
+          align-items: center;
-          height: 100%;
+          justify-content: end;
-          i {
+          padding-right: 17px;
-            font-style: normal;
+          margin-bottom: 8px;
-            font-size: 16px;
+        }
-            color: #e1001a;
+        .ts-standard-btn{
-          }
-          .rc-userfont {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            color: #999999;
-            font-size: 12px;
-            strong{
-                display: block;
-                margin-top: 8px;
-            }
-          }
               
-          em {
+          width: 72px;
-            font-style: normal;
+          display: flex;
-          }
-          .ts-stand{
-            display: flex;
-            align-items: center;
-            justify-content: end;
-            padding-right: 17px;
-            margin-bottom: 8px;
-            float: right;
-          }
-          .ts-standard-btn{
-                
-            width: 72px;
-            display: flex;
 height: 25px;
 background: #E2001A;
 border-radius: 100px;
@@ -288,33 +122,202 @@ align-items: center;
 font-size: 12px;
 justify-content: center;
 margin-top: 8px;
+float: right;
+margin-right: 28px;
 
+      }
+      span{
+      margin-top: 0;
+      }
+      margin-top: 17px;
+  padding-left: 36px;
+      }
+      .rc-footer {
+        display: flex;
+        align-items:flex-end;
+        span {
+          width: 72px;
+          height: 25px;
+          background: #e2001a;
+          text-align: center;
+          line-height: 25px;
+          font-size: 12px;
+          color: #ffffff;
+          margin-bottom: 8px;
+          border-radius: 100px;
+          margin-right: 30px;
         }
-        span{
-        margin-top: 0;
-        }
-        margin-top: 17px;
-    padding-left: 36px;
-        }
-        .rc-footer {
-          display: flex;
-          align-items:flex-end;
-          span {
-            width: 72px;
-            height: 25px;
-            background: #e2001a;
-            text-align: center;
-            line-height: 25px;
-            font-size: 12px;
-            color: #ffffff;
-            margin-bottom: 8px;
-            border-radius: 100px;
-            margin-right: 30px;
-          }
-        }
-    
-        
       }
   
       
+    }
+
+}
+@media screen and (min-width: 769px){
+.online{
+margin-top: 30px;
+}
+   .allmain{
+    
+      .rs-dis{
+          display: flex;
+  flex-flow: wrap;
+  justify-content: center;
+      }
+  
+  }
+
+  .active {
+      font-size: 14px;
+      color: #E2001A;
+  
+    }
+    .unactive {
+      font-size: 14px;
+      color: #444444;
+  
+    }
+    .rc-usermain{
+    .online{
+        margin-top: 0;
+    }
+ 
+    .rc {
+      height: 96px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      span {
+        display: block;
+        margin-left: 40px;
+        font-size: 16px;
+        font-weight: bold;
+        cursor: pointer;
+      
+      }
+      span:first-child {
+        margin-left: 0;
+      }
+    }
+  }
+
+  
+    .rc-discount {
+      margin-left: 20px;
+      display: flex;
+      margin-top: 16px;
+      width: 335px;
+      background: #ffffff;
+      position: relative;
+      img {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
+      .rc-contair {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+      }
+      .rc-left {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        color: #e1001a;
+        text-align: center;
+        width: 30%;
+        font-weight: bold;
+        float: left;
+        height: 100%;
+        i {
+          font-style: normal;
+          font-size: 12px;
+        }
+        span {
+          font-size: 26px;
+        }
+        strong {
+          font-style: normal;
+          font-size: 12px;
+          display: block;
+        }
+      }
+      .rc-right {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        i {
+          font-style: normal;
+          font-size: 16px;
+          color: #e1001a;
+        }
+        .rc-userfont {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          color: #999999;
+          font-size: 12px;
+          strong{
+              display: block;
+              margin-top: 8px;
+          }
+        }
+     
+        em {
+          font-style: normal;
+        }
+        .ts-stand{
+          display: flex;
+          align-items: center;
+          justify-content: end;
+          padding-right: 17px;
+          margin-bottom: 8px;
+          float: right;
+        }
+        .ts-standard-btn{
+              
+          width: 72px;
+          display: flex;
+height: 25px;
+background: #E2001A;
+border-radius: 100px;
+align-items: center;
+font-size: 12px;
+justify-content: center;
+margin-top: 8px;
+float: right;
+margin-right: 28px;
+
+      }
+      span{
+      margin-top: 0;
+      }
+      margin-top: 17px;
+  padding-left: 36px;
+      }
+      .rc-footer {
+        display: flex;
+        align-items:flex-end;
+        span {
+          width: 72px;
+          height: 25px;
+          background: #e2001a;
+          text-align: center;
+          line-height: 25px;
+          font-size: 12px;
+          color: #ffffff;
+          margin-bottom: 8px;
+          border-radius: 100px;
+          margin-right: 30px;
+        }
+      }
+  
+      
+    }
+
+
 }

rc-busness/pages/personal/discount.vue

@@ -1,9 +1,12 @@
 <template>
-  <div>
+  <div class="allmain">
-    <Myheader></Myheader>
+   
-    <div class="rc-main">
+  <Myheader></Myheader>
+     <!-- <tabs></tabs> -->
+     <div class="rc-top"></div>
       <div class="rc-usermain">
-        <div class="rc-header">
+    
+        <div class="rc rc-column">
           <span
             v-for="(item, index) in discountlist"
             :key="index"
@@ -14,6 +17,8 @@
           </span>
           <!-- <span @click="tanchu()">弹出</span> -->
         </div>
+         <div class="online bold"></div>
+
         <div class="rs-dis">
           <div
             class="rc-discount"
@@ -22,23 +27,24 @@
           >
             <img :src="userimage" alt="" />
             <div class="rc-contair">
-              <div class="rc-left" ref="userleft" id="userleft">
+              <div class="rc-left" ref="userleft" id="userleft" :style='usercolor'>
                 <div>
-                  <i>￥</i><span>{{ item.couponAmount }}</span>
+                  <i>￥</i><span>{{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
               </div>
               <div class="rc-right">
-                <i>
+                <i  :style='usercolor'>
-                  {{ item.couponDesc }}
+                  {{ item.couponName }}
                 </i>
-                <div class="rc-main" id="rc-main">
+                <div class="rc-userfont">
-                  <span>有效期{{item.validFrom}}至</span>
+                    <strong>有效期</strong>
-                  <em>{{ item.validTo }}</em>
+                  <span>{{item.validFrom}}至</span>
+                  <em>{{item.validTo}}</em>
                 </div>
-                   <nuxt-link :to="`/`">
+                   <nuxt-link :to="`/productdetails/productlist`">
-                <div class="rc-footer" v-if="userload">
+                <div class="ts-standard-btn">
-                  <span @click="usertiao()">立即使用</span>
+                        立即支付
                 </div>
                 </nuxt-link>
               </div>
@@ -48,19 +54,23 @@
           </div>
         </div>
       </div>
-    </div>
   </div>
 </template>
 
 
 <script>
  import {allConfig,getdraw} from "../../ajax/getData";
+//  import tabs from "@/components/tabs.vue";
 export default {
+  //    middleware: 'metaTitle',
+  //   // middleware: 'metaTitle',
+  // meta: {title: '优惠券'},
   data() {
     return {
       userload: true,
       pastdue: false,
       unused: false,
+      usercolor:{color:'#e1001a'},
       usermessage:[],
       userstates:0,
       userimage: require("../../assets/image/unused.png"),
@@ -73,71 +83,6 @@ export default {
           starttime: "2021.11.29-2022.01.28",
           catimage: require("../../assets/image/unused.png"),
         },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-          catimage: require("../../assets/image/unused.png"),
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-          catimage: require("../../assets/image/unused.png"),
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
-        {
-          price: "30",
-          pricestype: "新客优惠券",
-          special: "全场每满299-30",
-          period: "有效期",
-          starttime: "2021.11.29-2022.01.28",
-        },
       ],
       discountlist: [
         {
@@ -186,6 +131,10 @@ export default {
       if(data){
        console.log(data);
        this.newlist=data.data;
+       this.newlist.forEach(element=>{
+          element.validFrom=element.validFrom.slice(0,10)
+          element.validTo=element.validTo.slice(0,10)
+       })
        console.log(this.newlist);
       }
             
@@ -197,13 +146,17 @@ export default {
         this.pastdue = true;
         this.userimage = require("../../assets/image/hasused.png");
         this.userstates=1
+        console.log(this.$refs.userleft);
+        this.usercolor={color:'white'}
+
+ 
         this.userdraw(this.usermessage.data.mobile,1)
       }
       if (this.activeIndex == 0) {
         this.userload = true;
         this.pastdue = false;
         this.userdraw(this.usermessage.data.mobile,0)
-
+             this.usercolor={color:'#e1001a'}
         this.userstates=0
         this.userimage = require("../../assets/image/unused.png");
       }
@@ -212,18 +165,16 @@ export default {
         this.pastdue = true;
         this.userdraw(this.usermessage.data.mobile,2)
         this.userstates=2
+            this.usercolor={color:'white'}
         this.userimage = require("../../assets/image/expired.png");
       }
       console.log(index);
     },
 
     usertiao(){
-           this.$router.push({
+     this.$router.push({ name: "productdetails-productlist",
-        path: "/",
+					
-        query: {
+					})
-          stype: 1,
-        },
-      });
     },
 
 
@@ -235,6 +186,18 @@ export default {
     // }
     // dis_livchat(option);
     // }
+  },
+
+   directives: {
+    'color': {
+      bind: function(el, binding){
+        el.style.color = binding.value
+      },
+      inserted: function(el){
+
+      }
+    },
+
   },
   mounted() {
    if(this.usermessage!=='' ||this.usermessage.data!==undefined){
@@ -253,260 +216,6 @@ import Myheader from "~/components/header.vue";
 
 <style lang="less" scoped>
 // 手机端
-@media screen and(min-width: 320px) and(max-width:768px) {
+@import url("../../assets/css/global.less");
-  .active {
+@import url("../../assets/css/discount.less");
-    font-size: 14px;
-    color: #e2001a;
-
-  }
-  .unactive {
-    font-size: 14px;
-    color: #444444;
-
-  }
-  .rc-header {
-    height: 64px;
-    display: flex;
-    align-items: center;
-    margin-left: 23px;
-    span {
-      display: block;
-      margin-left: 32px;
-    
-    }
-    span:first-child {
-      margin-left: 0;
-    }
-  }
-
-  .rc-discount {
-    margin-left: 23px;
-    display: flex;
-    margin-top: 16px;
-    width: 335px;
-    background: #ffffff;
-    position: relative;
-    height: 120px;
-    img {
-      display: block;
-      width: 100%;
-      height: 100%;
-    }
-    .rc-contair {
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: 100%;
-    }
-    .rc-left {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      color: #e1001a;
-      padding-right: 21px;
-      width: 30%;
-      float: left;
-      height: 100%;
-      i {
-        font-style: normal;
-        font-size: 12px;
-      }
-      span {
-        font-size: 26px;
-      }
-      strong {
-        font-style: normal;
-        font-size: 12px;
-        display: block;
-        margin-top: 8px;
-      }
-    }
-    .rc-right {
-      display: flex;
-      flex-direction: column;
-      margin-left: 36px;
-      justify-content: center;
-      height: 100%;
-      i {
-        font-style: normal;
-        font-size: 14px;
-        color: #e1001a;
-      }
-      .rc-main {
-        color: #999999;
-        font-size: 12px;
-      }
-      span {
-        display: block;
-        margin-top: 8px;
-      }
-      em {
-        font-style: normal;
-      }
-    }
-    .rc-footer {
-      display: flex;
-     justify-content: flex-end;
-      span {
-        width: 72px;
-        height: 25px;
-        background: #e2001a;
-        text-align: center;
-        line-height: 25px;
-        font-size: 12px;
-        color: #ffffff;
-        margin-bottom: 8px;
-        border-radius: 100px;
-        margin-right: 30px;
-      }
-    }
-
-    
-  }
-}
-// //    /* 最小768px最大1920 *pc端/
-@media screen and (min-width: 768px) and (max-width: 1920px) {
-  .rc-main {
-    width: 100%;
-    .rc-usermain {
-      width: 92%;
-      margin: 0 auto;
-    }
-  }
-  .active {
-    font-size: 16px;
-    color: #e2001a;
-    cursor: pointer;
-  }
-  .unactive {
-    font-size: 16px;
-    color: #444444;
-    cursor: pointer;
-  }
-  .rc-header {
-    height: 64px;
-    display: flex;
-    align-items: center;
-    margin-left: 23px;
-    justify-content: center;
-    span {
-      display: block;
-      margin-left: 32px;
-    }
-    span:first-child {
-      margin-left: 0;
-    }
-  }
-  .rs-dis {
-    margin-top: 70px;
-  }
-  .rc-discount {
-    margin-left: 50px;
-    display: flex;
-    margin-top: 40px;
-    width: 335px;
-    background: #ffffff;
-    position: relative;
-    height: 120px;
-    float: left;
-    img {
-      display: block;
-      width: 100%;
-      height: 100%;
-    }
-    .rc-contair {
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: 100%;
-    }
-    .rc-left {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      color: #e1001a;
-      padding-right: 21px;
-      width: 30%;
-      float: left;
-      height: 100%;
-      i {
-        font-style: normal;
-        font-size: 12px;
-      }
-      span {
-        font-size: 26px;
-      }
-      strong {
-        font-style: normal;
-        font-size: 12px;
-        display: block;
-        margin-top: 8px;
-      }
-    }
-    .rc-right {
-      display: flex;
-      flex-direction: column;
-      margin-left: 36px;
-      justify-content: center;
-      height: 100%;
-      i {
-        font-style: normal;
-        font-size: 16px;
-        color: #e1001a;
-      }
-      .rc-main {
-        color: #999999;
-        font-size: 12px;
-      }
-      span {
-        display: block;
-        margin-top: 8px;
-      }
-      em {
-        font-style: normal;  
-      }
-    }
-    .rc-footer {
-      display: flex;
-      justify-content: flex-end;
-      margin-right: 10px;
-      span {
-        width: 72px;
-        height: 25px;
-        background: #e2001a;
-        text-align: center;
-        line-height: 25px;
-        font-size: 12px;
-        color: #ffffff;
-        margin-bottom: 8px;
-        border-radius: 100px;
-        margin-right: 30px;
-      }
-    }
- 
-    .rc-userright {
-      display: flex;
-      align-items: center;
-      width: 78px;
-      justify-content: center;
-      height: 78px;
-      border: 2px solid #999999;
-      border-radius: 50%;
-      span {
-        width: 60px;
-        height: 60px;
-        border: 1px solid #999999;
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        text-align: center;
-        justify-content: center;
-      }
-    }
-  }
-}
 </style>

rc-busness/pages/personal/userpay.vue

@@ -117,18 +117,16 @@ export default {
   mounted() {
          let stype=this.$route.query.stype;
          console.log(stype)
-     
       if(stype==1){
            this.userData = this.$route.query.userData;
             this.repayOrde(this.userData);
             this.userPayData = JSON.parse(this.$route.query.userPayData);
             console.log(this.userPayData);
-            this.qrtext=this.userPayData.wxPay
       }else{
        this.userPayData = JSON.parse(this.$route.query.userPayData);
+       console.log(this.userPayData);
       }
     this.qrtext=this.userPayData.wxPay
-          console.log(this.userData);
     
   },
   methods: {
@@ -148,8 +146,12 @@ export default {
      async repayOrde(ordernumber) {
         let res = await repayOrde(ordernumber);
         console.log(ordernumber);
+  
         if (res) {
-          this.qrtext=res.data
+           console.log(res)
+          this.qrtext=res.msg
+          debugger
+          console.log(this.qrtext);
         }
     },