Uniapp/lucky_shop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(代码合并): 代码从Custom/common分支合并

Browse Source
This commit is contained in:
ZF Sun
2026-01-04 09:40:09 +08:00
parent 26f8537d24
commit 4da852944e
145 changed files with 13781 additions and 11628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components-diy/diy-bottom-nav.vue
View File

@@ -59,7 +59,7 @@
</template>
<script>
import { adaptSubpackageUrl } from '@/common/js/util.js'
import { adaptSubpackageUrl, checkTabBarActive } from '@/common/js/util.js'
import DiyMinx from './minx.js'
// 底部导航栏
export default {
@@ -154,7 +154,7 @@ export default {
return true;
}
return false;
return checkTabBarActive(linkUrl, currentPageRoute);
}
}
};

4
components-diy/diy-category-item.vue
View File

@@ -100,7 +100,7 @@
parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
</block>
<block v-else>
<text class="unit price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
<text class="unit price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
</block>
</view>
<view class="member-price-tag"
@@ -192,7 +192,7 @@
parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
</block>
<block v-else>
<text class="unit price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
<text class="unit price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
</block>
</view>

5
components-diy/diy-category.vue
View File

@@ -610,10 +610,10 @@ export default {
view {
color: #222222;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
white-space: break-word;
overflow: hidden;
text-align: center;
font-size: 10px;
}
&.border-top {
@@ -630,6 +630,7 @@ export default {
view {
color: #333;
font-weight: bold;
font-size: $font-size-base;
}
&::before {

4
components-diy/diy-digit.vue
View File

@@ -1,5 +1,5 @@
<template>
<view :style="componentStyle">
<template>
<view :style="componentStyle" data-component-name="diy-digit">
<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
:scroll-x="value.showStyle == 'singleSlide'">
<view class="uni-scroll-view-content">

4
components-diy/diy-index-page.vue
View File

@@ -170,6 +170,7 @@
<script>
import nsLoading from '@/components/ns-loading/ns-loading.vue';
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
import DiyMinx from './minx.js'
export default {
name: 'diy-index-page',
@@ -190,7 +191,8 @@ export default {
},
mixins: [DiyMinx],
components: {
nsLoading
nsLoading,
MescrollUni
},
data() {
return {

2
components-diy/diy-listmenu.vue
View File

@@ -1,5 +1,5 @@
<template>
<view data-component-name="diy-picture" class="diy-picture" :style="style">
<view data-component-name="diy-listmenu" class="diy-listmenu" :style="style">
<view class="fui-cell-group">
<!-- <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->

2
components-diy/diy-text.vue
View File

@@ -324,7 +324,7 @@ export default {
await this.__$emitEvent({
eventName: 'text-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
if (!awaitedResult) return;
$util.diyRedirectTo(link);
this.$util.diyRedirectTo(link);
}
})
}