!91 2022-1-23 JiaMin

Merge pull request !91 from Admin/sit-jiamin-v2

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)
 }
 
 /**
@@ -58,10 +58,10 @@ export const getleckCourse = (name, offset) => {
 
 export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment, basePiont) => {
   var data = {
-    buyCount: buyCount,
+    buyCount:buyCount,
     memberId: memberId,
-    mobile: mobile,
+    mobile:mobile,
-    productCode: productCode,
+    productCode:productCode,
     productImg: productImg,
     productName: productName,
     productPrice: productPrice,
@@ -69,14 +69,14 @@ export const postCourseId = (productCode, buyCount, memberId, mobile, productImg
     leftAllotment: leftAllotment,
 	basePiont: basePiont
   }
-  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')
 }
 
 /**
@@ -91,6 +91,7 @@ export const monitorOrderNotify = (OrderNumber) => {
  * 删除购物车
  */
 export const deleteCart = ( productCode) => {
+	debugger;
   var data = {
     productCode
   }
@@ -100,7 +101,7 @@ export const deleteCart = ( productCode) => {
  * 购物车批量提交
  */
 export const mostAddClass = (id) => {
-  return fetch('/api/mostAddClass/', { id })
+  return fetch('/api/mostAddClass/', {id})
 }
 /**
  * 删除购物车
@@ -116,68 +117,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",
@@ -187,14 +188,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) => {
@@ -207,62 +208,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' )
 }
 
 
@@ -277,58 +278,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' )
 }
 
 
@@ -337,9 +338,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' )
 }
 
 
@@ -348,9 +349,9 @@ export const ordermaster = (stype) => {
   console.log(stype);
   var data = {
   
-    memberId: '223782'
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 //微信支付
@@ -358,9 +359,9 @@ export const payOrderWX = (stype) => {
   console.log(stype);
   var data = {
    
-    memberId: '223782'
+    memberId:'223782'
   }
-  return fetch('memberAccount', data, 'POST')
+  return fetch('memberAccount', data, 'POST' )
 }
 
 
@@ -369,9 +370,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' )
 }
 
 
@@ -379,25 +380,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' )
 }
 
 
@@ -409,10 +410,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' )
 }
 
 
@@ -420,156 +421,162 @@ 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' )
   }
-  return fetch('memberAddress?type=getAll', data, 'POST')
-}
 
-//可用的优惠券
+    //再次支付
-export const alldiscount = (memberId, channelSecurity, mobile) => {
+    export const repayOrde = (ordernumber) => {
-  var data = {
+      console.log(ordernumber);
-    memberId: memberId,
+      return fetch('repayOrderWX?orderNo='+ordernumber,'', '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' )
   }
-  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' )
 }
 
 
@@ -623,17 +630,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,119 +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 {
+    .rc-usermain{
-        font-size: 14px;
+    .online{
-        color: #444444;
+        margin-top: 0;
+    }
  
+    .rc {
+      display: flex;
+      align-items: center;
+      margin-left: 1rem;
+      span {
+        display: block;
+        margin-left: 32px;
+        font-weight: bold;
+        cursor: pointer;
       }
-      .rc-usermain{
+      span:first-child {
-      .online{
+        margin-left: 0;
-          margin-top: 0;
       }
+    }
+  }
 
-      .rc {
+  
+    .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;
-        margin-left: 1rem;
+        justify-content: center;
-        span {
+        color: #e1001a;
-          display: block;
+        text-align: center;
-          margin-left: 32px;
+        width: 30%;
-          font-weight: bold;
+        font-weight: bold;
-          cursor: pointer;
+        float: left;
+        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: 14px;
+        }
-            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;
-          }
-          .ts-standard-btn{
-                
-            width: 72px;
-            display: flex;
 height: 25px;
 background: #E2001A;
 border-radius: 100px;
@@ -121,164 +122,166 @@ 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;
+margin-top: 30px;
 }
-     .allmain{
+   .allmain{
     
-        .rs-dis{
+      .rs-dis{
-            display: flex;
+          display: flex;
-    flex-flow: wrap;
+  flex-flow: wrap;
-    justify-content: center;
+  justify-content: center;
-        }
+      }
+  
+  }
+
+  .active {
+      font-size: 14px;
+      color: #E2001A;
   
     }
+    .unactive {
+      font-size: 14px;
+      color: #444444;
   
-    .active {
+    }
-        font-size: 14px;
+    .rc-usermain{
-        color: #E2001A;
+    .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;
       
       }
-      .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;
         }
       }
-    }
+      .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: 16px;
-          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;
+          float: right;
-            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;
@@ -286,33 +289,35 @@ 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;
-          }
-        }
-    
-        
       }
   
       
+    }
+
+
 }

rc-busness/assets/css/usertion.less

@@ -127,6 +127,7 @@ margin-right: 20px;
           width: 96px;
           height: 96px;
           display: block;
+          object-fit: contain;
         }
       }
 
@@ -416,6 +417,7 @@ margin-right: 20px;
         img {
           width: 96px;
           height: 96px;
+          object-fit: contain;
           display: block;
         }
       }

rc-busness/pages/myorder/usertion.vue

@@ -7,23 +7,19 @@
           <em>{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}</em>
           <span>{{orderstatus}}</span>
         </div>
-        <div class="rc-border"></div>
+        <div class="delivery" v-if="isshow" >
-        <div  v-if="isshow">
-        <div class="delivery" v-for="(userdata,index) in delivery" :key="index" >
-            
           <div class="to-delivery">
-            <span>{{ userdata.state }}</span>
+            <span>{{ trackingstates}}</span>
-            <i>{{ userdata.time }}</i>
           </div>
           <div class="bo-delivery">
-            <span>{{ userdata.address }}</span>
+            <span>{{ logisticsCompany }}</span>
           </div>
            <div class="viewdetails">
              <span>查看详情</span>
                 <img :src="leftico" alt="" /> 
            </div>
         </div>
-</div>
+
         <div
           class="mypersonal"
           v-for="(datddress, index) in useraddress"
@@ -37,11 +33,14 @@
             <span>{{ datddress.provinceName }}{{datddress.cityName}}{{datddress.districtName}}{{datddress.detailAddress}}</span>
           </div>
         </div>
+
+
+
         <div >
         <div class="rc-center">
           <div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
             <div class="rc-image">
-             <img :src="item.catimage" alt="" /> 
+             <img src="../../static/images/default.jpg" alt="" />
             </div>
             <div class="rc-right">
               <div class="rc-usercenter">
@@ -52,7 +51,7 @@
               </div>
               <div class="rc-userbottom">
                 <span>数量:{{ item.pcs }}件</span>
-                <i>￥{{ item.ecPrice }}</i>
+                <i>￥{{ 10 }}</i>
                  <div class="rc-bottom">
             <span @click="userpay()">{{customer}}</span>
           </div>
@@ -126,7 +125,7 @@
                <em>￥{{usersalesAmount}}</em>
                </div>
                <div style="padding-bottom:40px">
-               <span @click="onceagain">再次购买</span>
+               <span @click="onceagain()">再次购买</span>
                </div>
           </div>
 
@@ -134,7 +133,7 @@
         </div>
       </div>
          <div class="rc-full-width rc-margin-y--md">
-               <i class="ts-standard-btn ts-standard-btn--two center" @click="onceagain">
+               <i class="ts-standard-btn ts-standard-btn--two center" @click="onceagain()">
                  {{payorsucess}}
                </i>
 
@@ -155,12 +154,14 @@ export default {
     return {
       goldmedal:[],
       userproductId:'',
+      logisticsDate:'',
       userphone:'',
       logisticsNumber:'',
       customer:'',//联系客服或者取消订单
       payorsucess:'', //立即支付或者再次购买，
       addressstype: null,
       addressUserName:'',
+      logisticsCompany:'',//物流公司
       orderstatus: '',
       goldastates:'',
       userisdelivery:'待收货',
@@ -172,6 +173,7 @@ export default {
       userdata:"",
        usermessage:null,
          userid: null,
+         trackingstates:'',//运输状态
       useralllist:[],
       delivery: [
       
@@ -240,6 +242,7 @@ userpay(){
      if(this.payorsucess=='立即支付'){
        console.log('----')
       this.getwei();
+
      }else{
        this.$router.push({
 				path: "/productdetails/producted",
@@ -259,13 +262,27 @@ userpay(){
 if(data){
   this.goldmedal=data;
   for(let i=0;i<this.goldmedal.length;i++){
-    // this.goldmedal[i].status=0
     this.goldastates=this.goldmedal[i].status;
     this.userproductId=this.goldmedal[i].orderDetailList[0].productId;
-    this.logisticsNumber=this.goldmedal[i].orderDetailList[0].logisticsNumber;
+    this.logisticsNumber=this.goldmedal[i].orderDetailList[0].logisticsNumber;  //物流单号
+     this.trackingstates=this.goldmedal[i].orderDetailList[0].status//运输状态
+
+     if( this.trackingstates==0){
+              this.trackingstates='运输中'
+     }else if(this.trackingstates==1){
+              this.trackingstates='已签收'
+     }
+      else if(this.trackingstates==2){
+              this.trackingstates='未发货'
+     }
+     console.log(this.goldmedal[i].orderDate);
+     this.logisticsDate=new Date(this.goldmedal[i].orderDate.toLocaleString())//时间戳
+     console.log(this.logisticsDate);
+     this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司
     this.orderNumber=this.goldmedal[i].orderNumber
     this.usersalesAmount=this.goldmedal[i].salesAmount;
     this.addressUserName=this.goldmedal[i].addressUserName;
+
   }
   console.log(this.goldmedal,this.userproductId,this.usersalesAmount);
 }
@@ -274,39 +291,30 @@ if(data){
 },
    //订单立即支付
     async getwei(user) {
-      let postData = [];
+      console.log(user);
-              let oneProduct = {
+       let userPayData = {
-          productName: item.productName,
+          userprice: this.usersalesAmount,
-          buyCount: item.buyCount,
+          userinformation:this.
-          productId: item.productCode,
+            addressUserName +
-          payAmount: item.productPrice,
-          memberId: item.memberId,
-          phoneNumber: item.mobile,
-          orderAddress: {
-            addressPhoneNumber: orderAddress[0].recipientPhone,
-            addressUserName: orderAddress[0].recipient,
-            addressProvinceName: orderAddress[0].provinceName,
-            addressCityName: orderAddress[0].cityName,
-            addressCountyName: orderAddress[0].districtName,
-            addressDetailInfo: orderAddress[0].detailAddress,
-          },
-        };
-    let res = await generateOrderWX(postData);
-           let userPayData = {
-          orderId: res.data,
-          userprice: this.usersalesAmount, //订单总价
-          userinformation:
-           this.addressUserName+   //姓名
             " " +
-           this.userphone, //电话
+           this.orderNumber,
           wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
         };
-             this.$router.push({
+          this.$router.push({
           path: "/personal/userpay",
           query: {
-            userPayData:JSON.stringify(userPayData),
+            userData:this.orderNumber,
+            stype:1,
+           userPayData: JSON.stringify(userPayData),
+
           },
         });
+        //      this.$router.push({
+        //   path: "/personal/userpay",
+        //   query: {
+           
+        //   },
+        // });
     },
         async editaddress(user) {
     //  user.data.id=844350;
@@ -337,6 +345,7 @@ console.log(this.userdata);
        this.userphone=this.usermessage.data.mobile;
        this.editaddress(this.userid);
     this.addressstype = this.$route.query.stype;
+
     this.orderNumber=this.$route.query.orderNumber;
     this.orderquantity(this.orderNumber)
     if(this.addressstype==2){

rc-busness/pages/personal/discount.vue

@@ -49,8 +49,8 @@
                   <em>{{item.validTo}}</em>
                 </div>
                    <nuxt-link :to="`/productdetails/productlist`">
-                <div  v-if="userload" class="ts-stand">
+                <div class="ts-standard-btn">
-                        
+                        立即使用
                 </div>
                 </nuxt-link>
               </div>

rc-busness/pages/personal/useraddress.vue

@@ -44,7 +44,7 @@
           </div>
           <div class="rc-usermain" >
             <div class="rc-image">
-              <img :src="item.catimage" alt="" />
+              <img src="../../static/images/default.jpg" alt="" />
             </div>
             <div class="rc-right" @click="usertiaozhuan(item)">
               <div class="rc-usercenter">
@@ -316,7 +316,6 @@ export default {
           this.pending.push(this.goldmedal[i].orderDetailList[0]);
         }
       }
-     
         for (var i = 0; i < this.useralllist.length; i++) {
         this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
         this.useralllist[i].status = this.goldmedal[i].status;
@@ -343,38 +342,22 @@ export default {
 
     //订单立即支付
        async getwei(item) {
+         console.log(item);
       let postData = [];
-        //   let oneProduct = {
+     let userPayData = {
-        //   productName: item.productName,
+          userprice: item.salesAmount,
-        //   buyCount: item.buyCount,
+           orderId:item.orderNumber,
-        //   productId: item.productCode,
+          userinformation:item.addressUserName +
-        //   payAmount: item.productPrice,
-        //   memberId: item.memberId,
-        //   phoneNumber: item.mobile,
-        //   orderAddress: {
-        //     addressPhoneNumber: orderAddress[0].recipientPhone,
-        //     addressUserName: orderAddress[0].recipient,
-        //     addressProvinceName: orderAddress[0].provinceName,
-        //     addressCityName: orderAddress[0].cityName,
-        //     addressCountyName: orderAddress[0].districtName,
-        //     addressDetailInfo: orderAddress[0].detailAddress,
-        //   },
-        // };
-        //  postData.push(oneProduct);
-    let res = await generateOrderWX(postData);
-           let userPayData = {
-          orderId: res.data,
-          userprice: item.salesAmount, //订单总价
-          userinformation:
-           item.addressUserName+   //姓名
             " " +
-           item.phoneNumber, //电话
+          item.phoneNumber,
           wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
         };
              this.$router.push({
           path: "/personal/userpay",
           query: {
-            userPayData:JSON.stringify(userPayData),
+            userData:item.orderNumber,
+            stype:1,
+             userPayData: JSON.stringify(userPayData),
           },
         });
     },

rc-busness/pages/personal/userpay.vue

@@ -87,7 +87,7 @@ import Myheader from "~/components/header.vue";
 import tabs from "@/components/tabs.vue";
 import vueQr from 'vue-qr'
 
-import { generateOrderAlipay, updateOrderWX, monitorOrderNotify } from "../../ajax/getData";
+import { generateOrderAlipay, updateOrderWX, monitorOrderNotify,repayOrde } from "../../ajax/getData";
 export default {
   data() {
     return {
@@ -111,15 +111,24 @@ export default {
       dialogFail: false,
       userPayData: {},
       qrtext:'',
+      userData:'',
     };
   },
   computed: {},
   mounted() {
-    this.userPayData = JSON.parse(this.$route.query.userPayData);
+    let stype=this.$route.query.stype;
-    //this.qrtext=this.userPayData.wxPay
+    console.log(stype)
-    this.qrtext=this.userPayData.wxPay;
+    if(stype==1){
-    this.payOrderWX()
+      this.userData = this.$route.query.userData;
-
+      this.repayOrde(this.userData);
+      this.userPayData = JSON.parse(this.$route.query.userPayData);
+      console.log(this.userPayData);
+    }else{
+      this.userPayData = JSON.parse(this.$route.query.userPayData);
+      console.log(this.userPayData);
+    }
+    this.qrtext=this.userPayData.wxPay
+    this.payOrderWX();
   },
   methods: {
     closeDialogSuccess() {
@@ -139,6 +148,16 @@ export default {
       // });
     },
 
+     async repayOrde(ordernumber) {
+        let res = await repayOrde(ordernumber);
+        console.log(ordernumber);
+        if (res) {
+           console.log(res)
+          this.qrtext=res.msg
+          console.log(this.qrtext);
+        }
+    },
+
     async selectGoods(item, index) {
       this.activeIndex = index;
       this.paytype = item.paytype;