diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less
index a6409569..14a3045a 100644
--- a/rc-busness/assets/css/usertion.less
+++ b/rc-busness/assets/css/usertion.less
@@ -7,6 +7,12 @@ ul li ol li em strong i {
padding: 0;
}
+.qrcode{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
.ts-button-container {
cursor: pointer;
display: flex;
diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue
index d2654be4..db4f167e 100644
--- a/rc-busness/pages/myorder/userrecord.vue
+++ b/rc-busness/pages/myorder/userrecord.vue
@@ -49,7 +49,7 @@
@@ -211,7 +211,7 @@ export default {
let data = await isexistCart(user.id);
for (var i = 0; i < data.length; i++) {
let item = data[i];
- data.startBuyCount = item.buyCount;
+ item.startBuyCount = item.buyCount;
}
this.cartData = data;
// this.goldmedal = data;
@@ -312,8 +312,9 @@ export default {
this.saveCartNumber(this.cartData[index])
},
/* 保存购物车数量 */
- async saveCartNumber(cartInfo){
+ async saveCartNumber(cartInfo,index){
if(!cartInfo.buyCount || cartInfo.buyCount <= 0){
+ this.cartData[index].buyCount = Number(cartInfo.startBuyCount);
return this.$messageToast('数量不正确','error');
}
if (cartInfo.buyCount >= cartInfo.leftAllotment) {
diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue
index e1df219a..b6642b11 100644
--- a/rc-busness/pages/myorder/usertion.vue
+++ b/rc-busness/pages/myorder/usertion.vue
@@ -113,7 +113,7 @@
-
+
@@ -157,7 +158,7 @@ import Vue from 'vue';
let vm = new Vue();
import formatConversion from '../../static/js/date';
import { userin, selectaddress, canceldanhao, generateOrderWX, repayOrde } from '../../ajax/getData';
-
+import vueQr from 'vue-qr';
import util from '@/ajax/util';
export default {
@@ -170,7 +171,7 @@ export default {
userproductId: '',
logisticsDate: '',
addressPhoneNumber: '',
-
+ qrtext: '', //支付二维码内容
logisticsNumber: '',
customer: '', //联系客服或者取消订单
payorsucess: '', //立即支付或者再次购买,
@@ -200,12 +201,12 @@ export default {
distribution: '快递',
catimage: require('../../assets/image/rc-left.png')
},
- crumbs : [
+ crumbs: [
{
path: '/personal/useraddress'
},
{
- title : '订单详情'
+ title: '订单详情'
}
]
};
@@ -253,7 +254,34 @@ export default {
}
},
//订单支付和再次购买
- onceagain(item) {
+ async onceagain(item) {
+ console.log(item);
+ let orderDetail = item.orderDetailList[0];
+ let { msg } = await generateOrderWX(
+ [
+ {
+ basePoint: item.basePoint,
+ productName: orderDetail.productName,
+ buyCount: orderDetail.pcs,
+ productCode: orderDetail.productCode,
+ payAmount: orderDetail.ecPrice,
+ memberId: this.userdata.id,
+ phoneNumber: item.phoneNumber,
+ orderAddress: {
+ addressPhoneNumber: item.addressPhoneNumber,
+ addressUserName: item.addressUserName,
+ addressProvinceName: item.addressProvinceName,
+ addressCityName: item.addressCityName,
+ addressCountyName: item.addressCountyName,
+ addressDetailInfo: item.addressDetailInfo
+ }
+ }
+ ],
+ 1
+ );
+
+ this.qrtext = msg;
+
this.paytypeWarning = this.util.checkPaytypeValidated(this.paytype);
this.showPaytypeWarning = !this.paytypeWarning.result;
if (this.paytypeWarning.result) {
@@ -396,8 +424,8 @@ export default {
this.payorsucess = '再次购买';
}
},
- resetData(){
- if(this.userdata && this.loginState){
+ resetData() {
+ if (this.userdata && this.loginState) {
this.editaddress(this.userid);
this.orderNumber = this.$route.query.orderNumber;
this.orderquantity(this.orderNumber);
@@ -419,19 +447,20 @@ export default {
components: {
Myheader,
MyFooter,
- tabs
+ tabs,
+ vueQr
},
- computed : {
+ computed: {
...mapState({
- userdata : state => state.user.userInfo,
- usermessage : state => state.user.userInfo,
- userid : state => state.user.userInfo.id,
- userphone : state => state.user.userInfo.mobile,
- loginState : state => state.login.loginState,
+ userdata: state => state.user.userInfo,
+ usermessage: state => state.user.userInfo,
+ userid: state => state.user.userInfo.id,
+ userphone: state => state.user.userInfo.mobile,
+ loginState: state => state.login.loginState
})
},
- watch : {
- userdata(){
+ watch: {
+ userdata() {
this.resetData();
}
}
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 96df8335..16ef29f0 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -274,7 +274,7 @@ export default {
let orderDetail = item.orderDetailList[0];
this.useralllist[y].payInfo = [
{
- basePoint: item.item,
+ basePoint: item.basePoint,
productName: orderDetail.productName,
buyCount: orderDetail.pcs,
productCode: orderDetail.productCode,
@@ -307,7 +307,6 @@ export default {
let filterArr = this.useralllist.filter(val => {
return val != undefined;
});
- console.log(this.useralllist,'2222');
this.useralllist = filterArr;
},
//订单立即支付
@@ -430,7 +429,7 @@ export default {
let orderDetail = item.orderDetailList[0];
this.useralllist[y].payInfo = [
{
- basePoint: item.item,
+ basePoint: item.basePoint,
productName: orderDetail.productName,
buyCount: orderDetail.pcs,
productCode: orderDetail.productCode,