## 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

@@ -29,9 +29,9 @@
</view>
<view class='introduce'>{{storeInfo.storeName}}</view>
<view class='label acea-row row-between-wrapper'>
<view>原价:{{storeInfo.otPrice}}</view>
<view>库存:{{storeInfo.stock}}{{storeInfo.unitName}}</view>
<view>销量:{{Number(storeInfo.sales) + Number(storeInfo.ficti) || 0}}{{storeInfo.unitName}}</view>
<view>原价:{{storeInfo.otPrice || 0}}</view>
<view>库存:{{storeInfo.stock || 0}}{{storeInfo.unitName || ''}}</view>
<view>销量:{{Math.floor(storeInfo.sales) + Math.floor(storeInfo.ficti) || 0}}{{storeInfo.unitName || ''}}</view>
</view>
<!-- <view class='coupon acea-row row-between-wrapper' v-if="storeInfo.give_integral > 0">
<view class='hide line1 acea-row'>
@@ -148,7 +148,7 @@
<navigator open-type='switchTab' class="animated item" :class="animated==true?'bounceIn':''" url='/pages/order_addcart/order_addcart'
hover-class="none">
<view class='iconfont icon-gouwuche1'>
<text class='num bg-color'>{{CartCount || 0}}</text>
<text v-if="Math.floor(CartCount)>0" class='num bg-color'>{{CartCount}}</text>
</view>
<view>购物车</view>
</navigator>
@@ -340,7 +340,9 @@
lock: false,
scrollTop: 0,
tagStyle: {
img: 'width:100%;'
img: 'width:100%;display:block;',
table: 'width:100%',
video: 'width:100%'
},
sliderImage: [],
qrcodeSize: 600,
@@ -419,7 +421,6 @@
// #endif
methods: {
getChat(uid){
console.log(this.uid)
window.yzf && window.yzf.init({
sign: '37ef9b97872756ce2a1596ec4fe9b66b0b4cbeec7b36239a65924fa6cbd5c29ac6b013c274511b2eee929e72312baeeeb97aae86',
token: '', //非必填
@@ -786,7 +787,6 @@
*/
DefaultSelect: function() {
let productAttr = this.attr.productAttr;
let value = [];
let value = [];
for (let key in this.productValue) {
if (this.productValue[key].stock > 0) {
@@ -1040,7 +1040,6 @@
}
},
// 授权关闭
authColse: function(e) {
authColse: function(e) {
this.isShowAuth = e
},
@@ -1116,16 +1115,18 @@
getQrcode(data).then(res=>{
//that.PromotionCode = res.data.code;
base64src(res.data.code, res => {
that.PromotionCode = res;
that.PromotionCode = res;
});
});
}).catch(err => {
that.$util.Tips({
title: err
});
});
},
// 生成二维码;
make(uid) {
let that = this;
let href = location.href;
href = href.indexOf("?") === -1 ? href + "?spread=" + uid : href + "&spread=" + uid;
href = href.indexOf("?") === -1 ? href + "?spread=" + uid : href + "&spread=" + uid;
uQRCode.make({
canvasId: 'qrcode',
@@ -1180,45 +1181,6 @@
},
/**
* 生成海报
*/
// goPoster: function() {
// debugger
// let that = this;
// that.posters = false;
// that.$set(that, 'canvasStatus', true);
// let arr2 = [that.posterbackgd, that.storeImage, that.PromotionCode];
// // // #ifndef H5
// if (that.isDown)
// return that.$util.Tips({
// title: '正在下载海报,请稍后再试!'
// });
// // // #endif
// uni.getImageInfo({
// src: that.PromotionCode,
// fail: function(res) {
// console.log(res)
// // #ifdef H5
// return that.$util.Tips({
// title: res
// });
// // #endif
// // #ifdef MP
// return that.$util.Tips({
// title: '小程序二维码需要发布正式版后才能获取到'
// });
// // #endif
// },
// success(res) {
// console.log('成功',res)
// //生成推广海报
// that.$util.PosterCanvas(arr2, that.storeInfo.storeName, that.storeInfo.price, function(tempFilePath) {
// that.imagePath = tempFilePath;
// that.canvasStatus = true;
// });
// }
// });
*/
goPoster: function() {
let that = this;
@@ -1232,14 +1194,13 @@
let arrImages = [that.posterbackgd, arrImagesUrlTop, that.PromotionCode];
let storeName = that.storeInfo.storeName;
let price = that.storeInfo.price;
setTimeout(() => {
setTimeout(() => {
that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
that.imagePath = tempFilePath;
that.canvasStatus = true;
});
}, 200);
}
});
}
});
},
/*

View File

File diff suppressed because one or more lines are too long

View File

@@ -1,81 +0,0 @@
<template>
<view>
<view v-if="canvasStatus">
<view class="mask"></view>
<image :src='imagePath' class="canvas"></image>
</view>
<view v-else>
<canvas style="width:750rpx;height:1190rpx;position: fixed;z-index: -5;" canvas-id="firstCanvas"></canvas>
<canvas style="position:fixed;z-index: -5;opacity: 0;" canvas-id="qrcode" :style="{width: `${qrcodeSize}px`, height: `${qrcodeSize}px`}"/>
</view>
<div @click='clickgg'>点击</div>
</view>
</template>
<script>
import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
import {
HTTP_REQUEST_URL
} from '@/config/app.js';
export default {
data(){
return{
imagePath:'',
canvasStatus:false,
qrcodeText: HTTP_REQUEST_URL,
qrcodeSize: 129,
PromotionCode:''
}
},
onReady: function (e) {
this.make();
},
methods: {
// 生成二维码;
make() {
let that = this;
uQRCode.make({
canvasId: 'qrcode',
text: this.qrcodeText,
size: this.qrcodeSize,
margin: 10,
success: res => {
that.PromotionCode = res;
},
complete: () => {
},
fail:res=>{
that.$util.Tips({
title: '海报二维码生成失败!'
});
}
})
},
clickgg(){
let that = this;
// ../../static/images/barg002.png
let arrImages = ['../../static/images/posterbackgd.png','../../static/images/explosion.png',that.PromotionCode];
let storeName = '1十大歌手大好时光的电视广上世纪法国设计风格加工费设计规范技术规范设计规范手机话费csdsdsdsd9';
let price = '20';
that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
console.log('klklkl');
that.imagePath = tempFilePath;
that.canvasStatus = true;
});
}
}
}
</script>
<style>
.canvas{
position: fixed;
width: 512rpx;
height: 864rpx;
top:50%;
left:50%;
margin-left: -256rpx;
margin-top: -432rpx;
z-index: 999;
}
</style>