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

revert: 所有代码与custom/common分支同

Browse Source
This commit is contained in:
ZF Sun
2026-01-05 15:56:49 +08:00
parent 8ef6975ee1
commit 60a0e5133e
219 changed files with 14860 additions and 15585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,9 +293,6 @@ export default {
default: false
}
},
components: {
loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
},
mixins: [DiyMinx],
data() {
return {

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

@@ -161,13 +161,14 @@ let menuButtonInfo = {};
menuButtonInfo = uni.getMenuButtonBoundingClientRect();
// #endif
import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
import DiyMinx from './minx.js'
var contentWrapHeight, query, cartPosition;
// 商品分类
export default {
components: {
nsGoodsSkuCategory: () => import('@/components/ns-goods-sku/ns-goods-sku-category.vue'),
components: {
nsGoodsSkuCategory
},
name: 'diy-category',
props: {
@@ -462,7 +463,7 @@ export default {
cart_ids: this.cartIds.toString()
},
success: () => {
this.$util.redirectTo('/pages_order/base/payment');
this.$util.redirectTo('/pages_order/payment');
this.isSub = false;
}
});

3
components-diy/diy-coupon.vue
View File

@@ -303,9 +303,6 @@ export default {
}
}
},
components: {
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

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

@@ -1,4 +1,4 @@
<template>
<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'">
@@ -38,13 +38,15 @@
</template>
<script>
import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
import nsLogin from '@/components/ns-login/ns-login.vue'
import DiyMinx from './minx.js'
// 自定义数字展示
export default {
name: 'diy-digit',
components: {
uvCountTo: () => import('@/components/uv-count-to/uv-count-to.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
uvCountTo,
nsLogin
},
props: {
value: {

7
components-diy/diy-goods-brand.vue
View File

@@ -19,6 +19,9 @@
<script>
// 商品品牌
import uniGrid from '@/components/uni-grid/uni-grid.vue';
import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
import DiyMinx from './minx.js'
// 自定义商品品牌展示
export default {
@@ -29,8 +32,8 @@ export default {
}
},
components: {
uniGrid: () => import('@/components/uni-grid/uni-grid.vue'),
uniGridItem: () => import('@/components/uni-grid-item/uni-grid-item.vue'),
uniGrid,
uniGridItem
},
data() {
return {

5
components-diy/diy-goods-list.vue
View File

@@ -253,13 +253,14 @@
</template>
<script>
import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
import DiyMinx from './minx.js'
// 自定义商品列表展示
export default {
name: 'diy-goods-list',
components: {
nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
components: {
nsGoodsSkuIndex
},
props: {
value: {

3
components-diy/diy-graphic-nav.vue
View File

@@ -103,9 +103,6 @@ export default {
type: Object
}
},
components: {
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

65
components-diy/diy-group.vue
View File

@@ -251,11 +251,6 @@
<diy-icon :value="item"></diy-icon>
</template>
<template v-if="item.componentName == 'Group'">
<!-- 组件组 -->
<diy-group :diyData="item"></diy-group>
</template>
<!-- 自定义扩展组件 -->
<diy-comp-extend :value="item"></diy-comp-extend>
</view>
@@ -266,24 +261,20 @@
// 组件组展示
import DiyMinx from './minx.js'
export default {
name: 'DiyGroup',
mixins: [DiyMinx],
components: {},
props: {
diyData: {
type: Object,
default: () => ({})
type: Object
},
scrollTop: {
type: [String, Number],
default: '0'
},
haveTopCategory: {
type: Boolean,
default: false
type: Boolean
},
followOfficialAccount: {
type: Object,
default: () => ({})
type: Object
},
},
mixins: [DiyMinx],
@@ -293,28 +284,25 @@ export default {
};
},
created() {
this.diyGlobalData = JSON.parse(JSON.stringify(this.diyData || {}));
this.diyGlobalData = JSON.parse(JSON.stringify(this.diyData));
},
computed: {
topNavColor() {
var color = '';
if (this.diyData.global && this.diyData.global.topNavBg) {
if (this.diyData.global.topNavBg) {
color = 'transparent';
if (this.scrollTop > 20 && this.diyData.global.topNavColor) {
if (this.scrollTop > 20) {
color = this.diyData.global.topNavColor;
} else {
color = 'transparent';
}
} else if (this.diyData.global && this.diyData.global.topNavColor) {
} else {
color = this.diyData.global.topNavColor;
}
return color;
},
// 修改属性样式
setPagestyle() {
if (!this.diyGlobalData || !this.diyGlobalData.value || !Array.isArray(this.diyGlobalData.value)) {
return [];
}
this.diyGlobalData.value.forEach((item, index) => {
item.pageStyle = '';
// 给每个组件增加位置属性，用于定位，搜索、分类导航等定位
@@ -326,12 +314,12 @@ export default {
return false;
}
item.pageStyle += 'background-color:' + (item.pageBgColor || '') + ';';
item.pageStyle += 'background-color:' + item.pageBgColor + ';';
if (item.margin) {
item.pageStyle += 'padding-top:' + (item.margin.top || 0) * 2 + 'rpx' + ';';
item.pageStyle += 'padding-bottom:' + (item.margin.bottom || 0) * 2 + 'rpx' + ';';
item.pageStyle += 'padding-right:' + (item.margin.both || 0) * 2 + 'rpx' + ';';
item.pageStyle += 'padding-left:' + (item.margin.both || 0) * 2 + 'rpx' + ';';
item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
}
});
@@ -339,35 +327,20 @@ export default {
},
// 过滤组件的渲染
diyDataArray() {
let data = [];
let showModuleData = [];
// 安全获取store中的模块显示数据
try {
if (this.$store && this.$store.state && this.$store.state.diyGroupShowModule) {
showModuleData = JSON.parse(this.$store.state.diyGroupShowModule);
// 确保showModuleData是数组
if (!Array.isArray(showModuleData)) {
showModuleData = [];
}
}
} catch (e) {
showModuleData = [];
}
let data = [],
showModuleData = this.$store.state.diyGroupShowModule ? JSON.parse(this.$store.state
.diyGroupShowModule) : '';
const diyDataArr = this.setPagestyle;
if (showModuleData.length) {
if (showModuleData.includes('null')) return [];
let diyDataArr = this.setPagestyle;
diyDataArr.forEach((item, index) => {
if (item && item.componentName && showModuleData.includes(item.componentName)) {
if (showModuleData.includes(item.componentName)) {
data.push(item);
}
});
} else {
data = diyDataArr;
}
} else data = this.setPagestyle;
return data;
}
},

3
components-diy/diy-image-nav.vue
View File

@@ -38,12 +38,13 @@
</template>
<script>
import nsLogin from '@/components/ns-login/ns-login.vue'
import DiyMinx from './minx.js'
export default {
name: 'diy-image-nav',
components: {
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
nsLogin
},
props: {
value: {

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

@@ -169,6 +169,8 @@
</template>
<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',
@@ -189,9 +191,8 @@ export default {
},
mixins: [DiyMinx],
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
nsLoading,
MescrollUni
},
data() {
return {

1
components-diy/diy-map.vue
View File

@@ -32,7 +32,6 @@ export default {
},
created() {
},
mixins: [DiyMinx],
watch: {
// 组件刷新监听

7
components-diy/diy-member-info.vue
View File

@@ -242,7 +242,8 @@ let menuButtonInfo = {};
// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
menuButtonInfo = uni.getMenuButtonBoundingClientRect();
// #endif
// 自定义会员中心——会员信息展示
import nsContact from '@/components/ns-contact/ns-contact.vue';
import DiyMinx from './minx.js'
export default {
name: 'diy-member-info',
@@ -259,9 +260,7 @@ export default {
},
mixins: [DiyMinx],
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
nsContact
},
data() {
return {

12
components-diy/diy-member-my-order.vue
View File

@@ -2,7 +2,7 @@
<view data-component-name="diy-member-my-order" class="common-wrap" :style="warpCss">
<view class="order-wrap">
<view class="status-wrap">
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitpay')"
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitpay')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -21,7 +21,7 @@
</view>
<view class="title">{{ $lang('waitpay') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitsend')"
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitsend')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -40,7 +40,7 @@
</view>
<view class="title">{{ $lang('waitsend') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitconfirm')"
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitconfirm')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -59,7 +59,7 @@
</view>
<view class="title">{{ $lang('waitconfirm') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitrate')"
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitrate')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -110,10 +110,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

6
components-diy/diy-merch-list.vue
View File

@@ -51,16 +51,12 @@
// 文章
import DiyMinx from './minx.js'
export default {
name: 'diy-merch-list',
name: 'diy-article',
props: {
value: {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {
list: [

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

@@ -63,10 +63,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {
loading: true,

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

@@ -62,10 +62,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

4
components-diy/diy-payment-qrcode.vue
View File

@@ -48,10 +48,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {};

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

@@ -175,10 +175,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

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

@@ -211,10 +211,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

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

@@ -119,10 +119,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {
loading: true,

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

@@ -34,10 +34,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {};
},

6
components-diy/diy-rich-text.vue
View File

@@ -6,7 +6,7 @@
<script>
// 富文本
import htmlParser from '@/common/js/html-parser.js';
import htmlParser from '@/common/js/html-parser';
import DiyMinx from './minx.js'
export default {
name: 'diy-rich-text',
@@ -15,10 +15,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {
html: ''

2
components-diy/diy-rubik-cube.vue
View File

@@ -80,7 +80,7 @@
<script>
// 魔方、橱窗
import htmlParser from '@/common/js/html-parser.js';
import htmlParser from '@/common/js/html-parser';
import DiyMinx from './minx.js'
export default {
name: 'diy-rubik-cube',

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

@@ -85,10 +85,6 @@ export default {
type: Object
},
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
data() {
return {
searchText: '',

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

@@ -242,10 +242,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

4
components-diy/diy-store-label.vue
View File

@@ -38,10 +38,6 @@ export default {
type: Object
}
},
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
},
mixins: [DiyMinx],
data() {
return {

3
components-diy/diy-video-list.vue
View File

@@ -62,11 +62,12 @@
</template>
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'
import DiyMinx from './minx.js'
export default {
name: 'diy-video-list',
components: {
uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
uniPopup
},
props: {
value: {