sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev

master
gongfuxiang 2024-10-21 19:19:24 +08:00
parent e40f2319db c26daf6ec2
commit 1bca78e9f3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
App.vue
View File

@ -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',

4
components/diy/tabs.vue
View File

@ -14,7 +14,7 @@
<script>
const app = getApp();
import { common_styles_computer, common_img_computer, padding_computer, margin_computer, radius_computer, background_computer } from '@/common/js/common/common.js';
import { common_styles_computer, common_img_computer, padding_computer, margin_computer, gradient_computer, background_computer } from '@/common/js/common/common.js';
import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
// 状态栏高度
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
@ -128,7 +128,7 @@
this.setData({
tabs_data: new_tabs_data,
style_container: this.propIsCommon ? common_styles_computer(new_style.common_style) + new_tabs_background : new_content.tabs_top_up == '1' ? radius_computer(new_style.common_style) : '', // 如果是选项卡轮播，不需要走默认样式
style_container: this.propIsCommon ? common_styles_computer(new_style.common_style) + new_tabs_background : new_content.tabs_top_up == '1' ? gradient_computer(new_style.common_style) + new_tabs_background : '', // 如果是选项卡轮播，不需要走默认样式
style_img_container: this.propIsCommon ? common_img_computer(new_style.common_style) : new_content.tabs_top_up == '1' ? background_computer(new_style.common_style) + common_img_computer(new_style.common_style) + margin_computer(this.propSpacingCommonStyle) + padding_computer(this.propSpacingCommonStyle) : 'padding-bottom:20rpx;', // 如果是选项卡轮播，不需要走默认样式
tabs_top_style: new_tabs_top_style,
// 判断是否置顶