圣诞快乐

# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调,短信API更新,首页用户访问量,系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
337031187
2020-12-23 15:56:45 +08:00
parent 61c394c7ba
commit 451f8a765e
768 changed files with 40200 additions and 46123 deletions

View File

@@ -216,6 +216,7 @@
<script>
import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
import { base64src } from '@/utils/base64src.js'
// import yzf_chat from '@/plugin/chat/yzf_chat.js'
import store from '@/store';
import {
@@ -556,7 +557,7 @@
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
that.$set(that.sharePacket, 'isState', that.sharePacket.priceName != 0 ? false : true);
that.$set(that.sharePacket, 'isState', that.sharePacket.priceName != '0' ? false : true);
store.commit('SETUID', res.data.uid);
// that.$set(that, 'uid', res.data.uid);
// #ifdef H5
@@ -668,7 +669,7 @@
that.$set(that, 'description', storeInfo.content);
that.$set(that.attr, 'productAttr', res.data.productAttr);
that.$set(that, 'productValue', res.data.productValue);
that.$set(that.sharePacket, 'priceName', res.data.priceName);
that.$set(that.sharePacket, 'priceName', res.data.priceName);
that.$set(that, 'systemStore', storeInfo.systemStore);
that.$set(that, 'good_list', goodArray);
that.$set(that, 'activityH5', res.data.storeInfo.activityAllH5 ? res.data.storeInfo.activityAllH5 : []);
@@ -681,6 +682,7 @@
}
that.$set(that, 'navList', navList);
// #ifdef H5
that.$set(that, 'storeImage', that.storeInfo.image);
that.getImageBase64(res.data.storeInfo.image);
if (that.isLogin) {
that.getCartCount();
@@ -697,11 +699,13 @@
})
setTimeout(function() {
that.infoScroll();
}, 500);
// #ifdef MP
that.imgTop = res.data.storeInfo.image
// #endif
// #ifndef H5
that.downloadFilestoreImage();
// #endif
that.DefaultSelect();
that.DefaultSelect();
}).catch(err => {
//状态异常返回上级页面
@@ -1106,10 +1110,14 @@
let that = this;
let data = {
pid: that.uid,
id: that.id,
id: that.id,
path: 'pages/goods_details/index'
}
getQrcode(data).then(res=>{
getQrcode(data).then(res=>{
//that.PromotionCode = res.data.code;
base64src(res.data.code, res => {
that.PromotionCode = res;
console.log('第一张',that.PromotionCode)
});
})
},
@@ -1139,21 +1147,99 @@
getImageBase64:function(images){
let that = this;
imageBase64({url:images}).then(res=>{
that.imgTop = res.data.code
//this.storeImage = res.data.code;
})
},
/**
* 获取产品分销二维码
* @param function successFn 下载完成回调
*
*/
downloadFilePromotionCode: function(successFn) {
let that = this;
getProductCode(that.id)
.then(res => {
uni.downloadFile({
url: that.setDomain(res.data.code),
success: function(res) {
that.$set(that, 'isDown', false);
if (typeof successFn == 'function') successFn && successFn(res.tempFilePath);
else that.$set(that, 'PromotionCode', res.tempFilePath);
},
fail: function() {
that.$set(that, 'isDown', false);
that.$set(that, 'PromotionCode', '');
}
});
})
.catch(err => {
that.$set(that, 'isDown', false);
that.$set(that, 'PromotionCode', '');
});
},
/**
* 生成海报
*/
// 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;
that.posters = false;
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.imagePath = tempFilePath;
that.canvasStatus = true;
let that = this;
that.posters = false;
let arrImagesUrl = '';
let arrImagesUrlTop = '';
uni.downloadFile({
url: that.imgTop, //仅为示例,并非真实的资源
success: (res) => {
arrImagesUrlTop = res.tempFilePath;
let arrImages = [that.posterbackgd, arrImagesUrlTop, that.PromotionCode];
let storeName = that.storeInfo.storeName;
let price = that.storeInfo.price;
setTimeout(() => {
that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
that.imagePath = tempFilePath;
that.canvasStatus = true;
});
}, 200);
}
});
},
/*