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 2025-07-16 11:57:36 +08:00
parent 6cd4239c01 ed7e48d449
commit 029ec58270
18 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/diy/components/diy/article-list.vue
View File

@ -86,7 +86,7 @@
<script>
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, padding_computer, radius_computer, get_math, gradient_handle, background_computer, gradient_computer, margin_computer, box_shadow_computer, border_computer, old_margin, get_swiper_list } from '@/common/js/common/common.js';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);
export default {

2
pages/diy/components/diy/ask.vue
View File

@ -78,7 +78,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, gradient_computer, margin_computer, get_swiper_list } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
import imgOrIconOrText from '@/pages/diy/components/diy/modules/img-or-icon-or-text.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);

2
pages/diy/components/diy/binding.vue
View File

@ -160,7 +160,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, get_swiper_list, margin_computer } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
import imgOrIconOrText from '@/pages/diy/components/diy/modules/img-or-icon-or-text.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);

2
pages/diy/components/diy/blog-list.vue
View File

@ -86,7 +86,7 @@
<script>
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, padding_computer, radius_computer, get_math, gradient_handle, background_computer, gradient_computer, margin_computer, box_shadow_computer, border_computer, old_margin, get_swiper_list } from '@/common/js/common/common.js';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);
export default {

2
pages/diy/components/diy/goods-list.vue
View File

@ -185,7 +185,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, old_margin, margin_computer, get_swiper_list } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
import componentBadge from '@/components/badge/badge';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);

0
pages/diy/components/diy/modules/subscript/index.vue → pages/diy/components/diy/modules/subscript.vue
View File

2
pages/diy/components/diy/nav-group.vue
View File

@ -36,7 +36,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, radius_computer, padding_computer, get_indicator_style, get_indicator_location_style, old_padding } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
export default {
components: {
imageEmpty,

2
pages/diy/components/diy/realstore.vue
View File

@ -119,7 +119,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, get_swiper_list, margin_computer } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
import imgOrIconOrText from '@/pages/diy/components/diy/modules/img-or-icon-or-text.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);

2
pages/diy/components/diy/seckill.vue
View File

@ -185,7 +185,7 @@
const app = getApp();
import { background_computer, common_styles_computer, common_img_computer, gradient_computer, gradient_handle, padding_computer, radius_computer, isEmpty, margin_computer, box_shadow_computer, border_computer, old_margin, old_border_and_box_shadow, get_swiper_list } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);
export default {

2
pages/diy/components/diy/shop.vue
View File

@ -82,7 +82,7 @@
const app = getApp();
import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer, background_computer, border_computer, box_shadow_computer, get_swiper_list, margin_computer } from '@/common/js/common/common.js';
import imageEmpty from '@/pages/diy/components/diy/modules/image-empty.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript/index.vue';
import subscriptIndex from '@/pages/diy/components/diy/modules/subscript.vue';
import imgOrIconOrText from '@/pages/diy/components/diy/modules/img-or-icon-or-text.vue';
var system = app.globalData.get_system_info(null, null, true);
var sys_width = app.globalData.window_width_handle(system.windowWidth);

2
pages/form-input/components/form-input/date-group.vue
View File

@ -31,7 +31,7 @@
<script>
import { get_format_checks, isEmpty, time_stamp } from '@/common/js/common/common.js';
import myDatetime from '@/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue';
import myDatetime from '@/pages/form-input/components/form-input/modules/my-datetime.vue';
export default {
components: {
myDatetime

2
pages/form-input/components/form-input/date.vue
View File

@ -25,7 +25,7 @@
<script>
import { get_format_checks, isEmpty, time_stamp } from '@/common/js/common/common.js';
import myDatetime from '@/pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue';
import myDatetime from '@/pages/form-input/components/form-input/modules/my-datetime.vue';
export default {
components: {
myDatetime

0
pages/form-input/components/form-input/modules/component-show/index.vue → pages/form-input/components/form-input/form-input-base.vue
View File

6
pages/form-input/components/form-input/form-input.vue
View File

@ -9,7 +9,7 @@
<view v-if="is_show_heading_title == '1'" class="head-title flex-row bg-white" :style="heading_title_style + (overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;'))">{{ form_name }}</view>
<view class="data-list bg-white" :style="overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;height:' + overall_config.custom_height * 2 + 'rpx')">
<!-- form表单子组件显示 -->
<component-show ref="componentForm" :propValue="propValue" :propDataFormId="propDataFormId" @submitData="submit_data" />
<form-input-base ref="componentForm" :propValue="propValue" :propDataFormId="propDataFormId" @submitData="submit_data" />
</view>
</view>
<!-- 支付宝小程序 不支持同时上下左右滑动-->
@ -32,7 +32,7 @@
<script>
const app = getApp();
import { isEmpty } from '@/common/js/common/common.js';
import componentShow from '@/pages/form-input/components/form-input/modules/component-show/index.vue';
import formInputBase from '@/pages/form-input/components/form-input/modules/form-input-base.vue';
// 状态栏高度
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
// #ifdef MP-TOUTIAO
@ -41,7 +41,7 @@ bar_height = 0;
export default {
name: 'formInput',
components: {
componentShow
formInputBase
},
props: {
propValue: {

0
pages/form-input/components/form-input/modules/components-combination/index.vue → pages/form-input/components/form-input/modules/components-combination.vue
View File

0
pages/form-input/components/form-input/modules/my-datetime/my-datetime.vue → pages/form-input/components/form-input/modules/my-datetime.vue
View File

0
pages/form-input/components/form-input/modules/subform-component-show/index.vue → pages/form-input/components/form-input/modules/subform-component-show.vue
View File

4
pages/form-input/components/form-input/subform.vue
View File

@ -203,8 +203,8 @@
<script>
import { isEmpty, common_form_styles_computer } from '@/common/js/common/common.js';
import subformComponentShow from '@/pages/form-input/components/form-input/modules/subform-component-show/index.vue';
import componentsCombination from '@/pages/form-input/components/form-input/modules/components-combination/index.vue';
import subformComponentShow from '@/pages/form-input/components/form-input/modules/subform-component-show.vue';
import componentsCombination from '@/pages/form-input/components/form-input/modules/components-combination.vue';
export default {
components: {
subformComponentShow,