diff --git a/App.vue b/App.vue index 63ae44b1..c730b223 100644 --- a/App.vue +++ b/App.vue @@ -7,12 +7,12 @@ data: { // 基础配置 // 数据接口请求地址 - //request_url: 'http://shopxo.com/', - request_url:'https://new.shopxo.vip/', + request_url: 'http://shopxo.com/', + // request_url:'https://new.shopxo.vip/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - //static_url: 'http://shopxo.com/', - static_url:'https://new.shopxo.vip/', + static_url: 'http://shopxo.com/', + // static_url:'https://new.shopxo.vip/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/diy/custom.vue b/components/diy/custom.vue index 40457fa7..3c0bf9fd 100644 --- a/components/diy/custom.vue +++ b/components/diy/custom.vue @@ -68,7 +68,7 @@ export default { computed: { get_percentage_count() { return (num, container_size) => { - return this.percentage_count(num * this.scale, container_size); + return num * this.scale + 'px'; }; }, }, diff --git a/components/diy/modules/custom/model-text.vue b/components/diy/modules/custom/model-text.vue index d0f6ce48..6179aa6c 100644 --- a/components/diy/modules/custom/model-text.vue +++ b/components/diy/modules/custom/model-text.vue @@ -73,7 +73,7 @@ return text; }, get_text_style() { - let style = `font-size: ${this.form.text_size * 2}rpx;color: ${this.form.text_color}; text-align: ${this.form.text_location}; transform: rotate(${this.form.text_rotate}deg);text-decoration: ${this.form.text_option};${padding_computer(this.form.text_padding)};box-sizing: border-box;`; + let style = `font-size: ${this.form.text_size * 2}rpx;line-height: ${this.form.text_size * 2}rpx;color: ${this.form.text_color}; text-align: ${this.form.text_location}; transform: rotate(${this.form.text_rotate}deg);text-decoration: ${this.form.text_option};${padding_computer(this.form.text_padding)};box-sizing: border-box;`; if (this.form.text_weight == 'italic') { style += `font-style: italic`; } else if (this.form.text_weight == '500') {