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-15 10:45:50 +08:00
parent 4e0595c902 a23e90cb15
commit 27660a5c6f
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
<template>
<view class="flex-col gap-5">
<checkbox-group @change="data_change" class="flex-row gap-10 flex-wrap">
<label v-for="item in option_list" :key="item.value" class="flex-row align-c">
<label v-for="item in option_list" :key="item.value" class="flex-row align-c margin-right-xxl">
<view>
<checkbox :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" class="flex-row align-c" />
<checkbox :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" class="flex-row align-c" style="transform:scale(0.7)" />
</view>
<view :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name }}</view>
</label>

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

@ -1,6 +1,6 @@
<template>
<view class="pr oh wh-auto ht-auto">
<scroll-view :scroll-top="scrollTop" :scroll-y="true" :scroll-x="overall_config.type_value == 'default' || z_index_id !== '' ? false : true" :class="overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1' ? 'scroll-box' : 'ht'" lower-threshold="60" scroll-with-animation>
<view :class="(overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1' ? 'scroll-box wh-auto' : 'ht wh-auto') + ' scroll-y ' + (overall_config.type_value == 'default' || z_index_id !== '' ? '' : ' scroll-x ')">
<view :style="content_style + (overall_config.type_value == 'default' ? '' : ('width:' + overall_config.custom_width * 2 + 'rpx;'))">
<template v-if="!isEmpty(img_url)">
<image :src="img_url" mode="aspectFit" />
@ -33,7 +33,10 @@
@subformDataChange="subform_data_change"
/>
</view>
</scroll-view>
</view>
<!-- 支付宝小程序 不支持同时上下左右滑动-->
<!-- <scroll-view :scroll-top="scrollTop" :scroll-y="true" :scroll-x="overall_config.type_value == 'default' || z_index_id !== '' ? false : true" :class="overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1' ? 'scroll-box wh-auto' : 'ht wh-auto'" enable-flex lower-threshold="60" scroll-with-animation> -->
<!-- </scroll-view> -->
<view v-if="overall_config.is_show_save_draft == '1' || overall_config.is_show_submit == '1'" class="bottom-fixed" :style="bottom_fixed_style">
<view class="bottom-line-exclude">
<view class="form-footer flex-row align-c">
@ -596,4 +599,10 @@ export default {
padding: 32rpx;
border-radius: 10rpx;
}
.scroll-y {
overflow-y: auto;
}
.scroll-x {
overflow-x: auto;
}
</style>

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

@ -1,8 +1,8 @@
<template>
<radio-group @change="data_change" class="flex-row gap-10 flex-wrap">
<label v-for="item in option_list" :key="item.value" class="flex-row align-c">
<label v-for="item in option_list" :key="item.value" class="flex-row align-c margin-right-xxl">
<view>
<radio :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" />
<radio :value="item.value" :checked="!isEmpty(form_value) && form_value.includes(item.value)" style="transform:scale(0.7)"/>
</view>
<view :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name }}</view>
</label>

2
pages/form-input/components/form-input/select-multi.vue
View File

@ -34,7 +34,7 @@
<view :class="'flex-col gap-10 mt-10 ' + ( com_data.is_add_option == '1' ? 'popup-add-list' : 'popup-list')">
<checkbox-group @change="data_all_change" class="flex-col gap-10">
<label class="popup-checkbox flex-row align-c">
<checkbox value="all" :checked="select_value == 'all'" class="flex-row align-c" />
<checkbox value="all" :checked="select_value == 'all'" class="flex-row align-c" style="transform:scale(0.8)" />
<view :style="color_style + 'padding-left:0rpx;padding-right:0rpx;'">全选</view>
</label>
</checkbox-group>

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

@ -34,7 +34,7 @@
<radio-group @change="data_change" class="flex-col gap-10">
<label v-for="item in new_option_list" class="popup-radio flex-row align-c" :key="item.value">
<view>
<radio :value="item.value" :checked="!isEmpty(form_value) && form_value == item.value" />
<radio :value="item.value" :checked="!isEmpty(form_value) && form_value == item.value" style="transform:scale(0.8)" />
</view>
<view :style="is_multicolour == '1' ? 'background:' + item.color + ';color:' + (item.is_other == '1' ? '#141E31' : '#fff') + ';border-radius:8rpx;' + color_style : color_style + 'padding-left:0rpx;padding-right:0rpx;'">{{ item.name }}</view>
</label>

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

@ -783,6 +783,8 @@
font-size: 24rpx;
background: #fff;
border: 2rpx solid #ccc;
padding: 0 28rpx;
border-radius: 10rpx;
}
.direction-style {
background: #fff;