## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组,标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情,购物车等样式兼容问题
	11. 【修复】业务流程性的优化
This commit is contained in:
stivepeim
2021-01-19 10:16:45 +08:00
parent 4e42da0fc1
commit be34f57322
136 changed files with 19904 additions and 23329 deletions

View File

@@ -359,7 +359,6 @@
}
if (this.isLogin) {
console.log(that.bargainUid,'that.bargainUid')
if(that.bargainUid == 'undefined'){
that.bargainUid = that.$store.state.app.uid
}

View File

@@ -314,7 +314,9 @@
isState: true, //默认不显示
},
tagStyle: {
img: 'width:100%;'
img: 'width:100%;display:block;',
table: 'width:100%',
video: 'width:100%'
},
posters: false,
weixinStatus: false,
@@ -531,53 +533,6 @@
});
},
//#endif
// setTime: function() { //到期时间戳
// var that = this;
// var endTimeList = that.pink;
// that.pink.map(item => {
// item.time = {
// day: '00',
// hou: '00',
// min: '00',
// sec: '00'
// };
// });
// var countDownArr = [];
// var timeer = setInterval(function() {
// var newTime = new Date().getTime() / 1000;
// for (var i in endTimeList) {
// var endTime = endTimeList[i].stop_time;
// var obj = [];
// if (endTime - newTime > 0) {
// var time = endTime - newTime;
// var day = parseInt(time / (60 * 60 * 24));
// var hou = parseInt(time % (60 * 60 * 24) / 3600);
// var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
// var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
// hou = parseInt(hou) + parseInt(day * 24);
// obj = {
// day: that.timeFormat(day),
// hou: that.timeFormat(hou),
// min: that.timeFormat(min),
// sec: that.timeFormat(sec)
// }
// } else {
// obj = {
// day: '00',
// hou: '00',
// min: '00',
// sec: '00'
// }
// }
// endTimeList[i].time = obj;
// }
// that.pink = endTimeList
// }, 1000);
// that.timeer = timeer
// },
// timeFormat(param) { //小于10的格式化函数
// return param < 10 ? '0' + param : param;
// },
/**
* 默认选中属性
*
@@ -936,7 +891,7 @@
let storeName = that.storeInfo.title;
let price = that.storeInfo.price;
setTimeout(() => {
that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice, function(tempFilePath) {
that.posterImage = tempFilePath;
that.canvasStatus = true;
});

View File

@@ -425,13 +425,6 @@ export default {
that.isOpen = true;
},
goPay() {
// productId: that.storeInfo.productId,
// combinationId:parseFloat(that.id),
// cartNum: that.cart_num ? this.cart_num : this.attribute.productSelect.cart_num,
// productAttrUnique: productSelect !== undefined ? productSelect.id : '',
// isNew: true,
var that = this;
var data = {};
// that.attr.cartAttr = res;
@@ -441,7 +434,6 @@ export default {
data.productAttrUnique = that.attr.productSelect.unique;
data.combinationId = that.storeCombination.id;
data.isNew = true;
console.log(that.pinkId);
postCartAdd(data)
.then(res => {
uni.navigateTo({

View File

@@ -245,7 +245,9 @@
lock: false,
scrollTop: 0,
tagStyle: {
img: 'width:100%;'
img: 'width:100%;display:block;',
table: 'width:100%',
video: 'width:100%'
},
datatime: '',
navActive: 0,
@@ -581,50 +583,6 @@
this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
}
},
// ChangeCartNum: function(changeValue) {
// //changeValue:是否 加|减
// //获取当前变动属性
// let productSelect = this.productValue[this.attrValue];
// if (this.cart_num) {
// productSelect.cart_num = this.cart_num;
// this.attribute.productSelect.cart_num = this.cart_num;
// }
// //如果没有属性,赋值给商品默认库存
// if (productSelect === undefined && !this.attribute.productAttr.length)
// productSelect = this.attribute.productSelect;
// //无属性值即库存为0不存在加减
// if (productSelect === undefined) return;
// let stock = productSelect.stock || 0;
// let num = this.attribute.productSelect;
// let quota = productSelect.quota || 0;
// //设置默认数据
// if (productSelect.cart_num == undefined) productSelect.cart_num = 1;
// if (changeValue) {
// num.cart_num ++;
// if(quota >= stock){
// if (num.cart_num > stock) {
// this.$set(this.attribute.productSelect, "cart_num", stock);
// this.$set(this, "cart_num", stock);
// }
// }else{
// if (num.cart_num > quota) {
// this.$set(this.attribute.productSelect, "cart_num", quota);
// this.$set(this, "cart_num", quota);
// }
// }
// this.$set(this, "cart_num", num.cart_num);
// this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
// } else {
// num.cart_num--;
// if (num.cart_num < 1) {
// this.$set(this.attribute.productSelect, "cart_num", 1);
// this.$set(this, "cart_num", 1);
// }
// this.$set(this, "cart_num", num.cart_num);
// this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
// }
// },
attrVal(val) {
this.attribute.productAttr[val.indexw].index = this.attribute.productAttr[val.indexw].attrValues[val.indexn];
},
@@ -882,20 +840,13 @@
let storeName = that.storeInfo.storeName;
let price = that.storeInfo.price;
setTimeout(() => {
that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
that.posterImage = tempFilePath;
that.canvasStatus = true;
});
}, 200);
}
});
// let arrImages = [that.posterbackgd, that.imgTop, that.PromotionCode];
// let storeName = that.storeInfo.storeName;
// let price = that.storeInfo.price;
// that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
// that.posterImage = tempFilePath;
// that.canvasStatus = true;
// });
},
// 小程序二维码
getQrcode(){

View File

@@ -158,7 +158,6 @@
uni.getImageInfo({
src: arrImages[0],
success: function (image) {
console.log('啦啦', image)
context.drawImage(arrImages[0], 0, 0, 750, 1190);
context.setFontSize(36);
context.setTextAlign('center');
@@ -210,19 +209,15 @@
canvasId: 'firstCanvas',
fileType: 'jpg',
success: function(res) {
console.log('啦啦222', res)
// 在H5平台下tempFilePath 为 base64
uni.hideLoading();
//successFn && successFn(res.tempFilePath);
that.imagePath = res.tempFilePath;
console.log(that.imagePath)
that.canvasStatus = true;
}
})
})
},
fail: function(err) {
console.log(err)
uni.hideLoading();
that.$util.Tips({
title: '无法获取图片信息'