Commit 815a3980 by 姜雷

Merge branch 'develop' into test

parents 0f4cb39b e5493ffb
...@@ -97,9 +97,11 @@ Component({ ...@@ -97,9 +97,11 @@ Component({
let item = newVal.find(item => item.name === val); let item = newVal.find(item => item.name === val);
if (item) { if (item) {
let name = item.name; let name = item.name;
if (item && item.name.length < 4) { while (name.length < 4) {
name += '\xa0\xa0\xa0'; name += '\xa0';
} }
name = name.replace(/\xa0/g, '\xa0\xa0\xa0');
console.log(name, name.length);
return name + ' ' + formatPrice(item.count); return name + ' ' + formatPrice(item.count);
} else { } else {
return ''; return '';
......
...@@ -203,7 +203,7 @@ Page({ ...@@ -203,7 +203,7 @@ Page({
console.log(res); console.log(res);
if (res.data) { if (res.data) {
const keyMap = { const keyMap = {
aimi: '艾米', aimi: '艾米',
bean: '消费豆', bean: '消费豆',
discount: '优惠金额', discount: '优惠金额',
online: '线上支付', online: '线上支付',
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
}, },
"miniprogramRoot": "miniprogram/", "miniprogramRoot": "miniprogram/",
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.5.0", "libVersion": "2.8.3",
"projectname": "wx-manage-shell", "projectname": "wx-manage-shell",
"scripts": { "scripts": {
"beforeCompile": "npm run tsc", "beforeCompile": "npm run tsc",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment