root/zyejMAll-mobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Branch_ccc' (#3) from Branch_ccc into master

Browse Source 
Reviewed-on: #3
This commit is contained in:
root 2024-09-20 13:49:08 +08:00
commit e4a71cc971
31 changed files with 654 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -8,7 +8,6 @@
"prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
"build:prod": "vue-cli-service build --mode prod",
"build:dev": "vue-cli-service build --mode dev"
},
"repository": "https://github.com/sheepjs/shop.git",
"keywords": [
@ -93,6 +92,7 @@
"dependencies": {
"dayjs": "^1.11.7",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"luch-request": "^3.0.8",
"pinia": "^2.0.33",
"pinia-plugin-persist-uni": "^1.2.0",

36
pages.json
View File

@ -73,6 +73,42 @@
},
{
"path": "pages/index/page",
"style": {
"navigationBarTitleText": "1"
},
"meta": {
"auth": false,
"sync": true,
"title": "自定义页面",
"group": "商城"
}
},
{
"path": "pages/index/page2",
"style": {
"navigationBarTitleText": "2"
},
"meta": {
"auth": false,
"sync": true,
"title": "自定义页面二",
"group": "商城二"
}
},
{
"path": "pages/index/page3",
"style": {
"navigationBarTitleText": ""
},
"meta": {
"auth": false,
"sync": true,
"title": "自定义页面",
"group": "商城"
}
},
{
"path": "pages/index/page4",
"style": {
"navigationBarTitleText": ""
},

8
pages/goods/components/detail/detail-tabbar.vue
View File

@ -11,7 +11,7 @@
<block v-if="modelValue.favorite">
<image
class="item-icon"
:src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
src="@/static/images/collect_1.gif"
mode="aspectFit"
/>
<view class="item-title">已收藏</view>
@ -19,7 +19,7 @@
<block v-else>
<image
class="item-icon"
:src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
src="@/static/images/collect_0.png"
mode="aspectFit"
/>
<view class="item-title">收藏</view>
@ -32,7 +32,7 @@
>
<image
class="item-icon"
:src="sheep.$url.static('/static/img/shop/goods/message.png')"
src="/static/images/service.png"
mode="aspectFit"
/>
<view class="item-title">客服</view>
@ -44,7 +44,7 @@
>
<image
class="item-icon"
:src="sheep.$url.static('/static/img/shop/goods/share.png')"
src="@/static/images/share.png"
mode="aspectFit"
/>
<view class="item-title">分享</view>

8
pages/goods/groupon.vue
View File

@ -156,7 +156,7 @@
import CombinationApi from '@/sheep/api/promotion/combination';
import SpuApi from '@/sheep/api/product/spu';
const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png');
const headerBg = '@/static/images/seckill-header.png';
const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
@ -293,7 +293,7 @@
// height: 320rpx;
background-size: 100% 100%;
border-radius: 10rpx;
background-image: v-bind(headerBg);
background-image: url('@/static/images/seckill-header.png');
background-repeat: no-repeat;
.price-box {
@ -417,7 +417,7 @@
font-size: 24rpx;
font-weight: 600;
margin-left: -36rpx;
background-image: v-bind(btnBg);
background-image: url('@/static/images/groupon-btn.png');
background-repeat: no-repeat;
background-size: 100% 100%;
color: #ffffff;
@ -430,7 +430,7 @@
font-size: 24rpx;
font-weight: 600;
margin-left: -36rpx;
background-image: v-bind(disabledBtnBg);
background-image: url('@/static/images/activity-btn-disabled.png');
background-repeat: no-repeat;
background-size: 100% 100%;
color: #999999;

1
pages/index/page.vue
View File

@ -3,6 +3,7 @@
<s-layout
:title="state.name"
navbar="custom"
tabbar="/pages/index/page"
:bgStyle="state.page"
:navbarStyle="state.navigationBar"
onShareAppMessage

52
pages/index/page2.vue Normal file
View File

@ -0,0 +1,52 @@
<!-- 自定义页面：支持装修 -->
<template>
<s-layout
:title="state.name"
navbar="custom"
tabbar="/pages/index/page2"
:bgStyle="state.page"
:navbarStyle="state.navigationBar"
onShareAppMessage
showLeftButton
>
<s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
</s-block>
</s-layout>
</template>
<script setup>
import { reactive } from 'vue';
import { onLoad, onPageScroll } from '@dcloudio/uni-app';
import DiyApi from '@/sheep/api/promotion/diy';
const state = reactive({
name: '',
components: [],
navigationBar: {},
page: {},
});
onLoad(async (options) => {
let id = options.id;
// #ifdef MP
// 小程序预览自定义页面
if (options.scene) {
const sceneParams = decodeURIComponent(options.scene).split('=');
id = sceneParams[1];
}
// #endif
const { code, data } = await DiyApi.getDiyPage(id);
if (code === 0) {
state.name = data.name;
state.components = data.property?.components;
state.navigationBar = data.property?.navigationBar;
state.page = data.property?.page;
}
});
onPageScroll(() => {});
</script>
<style></style>

52
pages/index/page3.vue Normal file
View File

@ -0,0 +1,52 @@
<!-- 自定义页面：支持装修 -->
<template>
<s-layout
:title="state.name"
navbar="custom"
tabbar="/pages/index/page3"
:bgStyle="state.page"
:navbarStyle="state.navigationBar"
onShareAppMessage
showLeftButton
>
<s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
</s-block>
</s-layout>
</template>
<script setup>
import { reactive } from 'vue';
import { onLoad, onPageScroll } from '@dcloudio/uni-app';
import DiyApi from '@/sheep/api/promotion/diy';
const state = reactive({
name: '',
components: [],
navigationBar: {},
page: {},
});
onLoad(async (options) => {
let id = options.id;
// #ifdef MP
// 小程序预览自定义页面
if (options.scene) {
const sceneParams = decodeURIComponent(options.scene).split('=');
id = sceneParams[1];
}
// #endif
const { code, data } = await DiyApi.getDiyPage(id);
if (code === 0) {
state.name = data.name;
state.components = data.property?.components;
state.navigationBar = data.property?.navigationBar;
state.page = data.property?.page;
}
});
onPageScroll(() => {});
</script>
<style></style>

52
pages/index/page4.vue Normal file
View File

@ -0,0 +1,52 @@
<!-- 自定义页面：支持装修 -->
<template>
<s-layout
:title="state.name"
navbar="custom"
tabbar="/pages/index/page4"
:bgStyle="state.page"
:navbarStyle="state.navigationBar"
onShareAppMessage
showLeftButton
>
<s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
</s-block>
</s-layout>
</template>
<script setup>
import { reactive } from 'vue';
import { onLoad, onPageScroll } from '@dcloudio/uni-app';
import DiyApi from '@/sheep/api/promotion/diy';
const state = reactive({
name: '',
components: [],
navigationBar: {},
page: {},
});
onLoad(async (options) => {
let id = options.id;
// #ifdef MP
// 小程序预览自定义页面
if (options.scene) {
const sceneParams = decodeURIComponent(options.scene).split('=');
id = sceneParams[1];
}
// #endif
const { code, data } = await DiyApi.getDiyPage(id);
if (code === 0) {
state.name = data.name;
state.components = data.property?.components;
state.navigationBar = data.property?.navigationBar;
state.page = data.property?.page;
}
});
onPageScroll(() => {});
</script>
<style></style>

15
pages/index/user.vue
View File

@ -1,13 +1,14 @@
<!-- 个人中心：支持装修 -->
<template>
<s-layout
title="我的"
title=" "
tabbar="/pages/index/user"
navbar="custom"
navbar="normal"
:bgStyle="template.page"
:navbarStyle="template.navigationBar"
onShareAppMessage
>
<image class="seckill" src="@/static/images/seckill-bg.png"></image>
<s-block
v-for="(item, index) in template.components"
:key="index"
@ -43,4 +44,12 @@
onPageScroll(() => {});
</script>
<style></style>
<style>
.seckill{
width:100%;
position:absolute;
}
view{
position: relative;
}
</style>

1
sheep/components/s-block-item/s-block-item.vue
View File

@ -1,5 +1,6 @@
<template>
<view>
<!-- 基础组件：搜索框 -->
<s-search-block v-if="type === 'SearchBar'" :data="data" :styles="styles" :navbar="false" />
<!-- 基础组件：公告栏 -->

92
sheep/components/s-menu-button/s-menu-button.vue
View File

@ -1,61 +1,36 @@
<!-- 装修基础组件：菜单导航（金刚区） -->
<template>
<view>
<view class="title">
我的服务
</view>
<!-- 包裹层 -->
<view
class="ui-swiper"
:class="[props.mode, props.bg, props.ui]"
:style="[{ height: swiperHeight + (menuList.length > 1 ? 50 : 0) + 'rpx' }]"
>
<view class="ui-swiper" :class="[props.mode, props.bg, props.ui]"
:style="[{ height: swiperHeight + (menuList.length > 1 ? 50 : 0) + 'rpx' }]">
<!-- 轮播 -->
<swiper
:circular="props.circular"
:current="state.cur"
:autoplay="props.autoplay"
:interval="props.interval"
:duration="props.duration"
:style="[{ height: swiperHeight + 'rpx' }]"
@change="swiperChange"
>
<swiper-item
v-for="(arr, index) in menuList"
:key="index"
:class="{ cur: state.cur == index }"
>
<swiper :circular="props.circular" :current="state.cur" :autoplay="props.autoplay"
:interval="props.interval" :duration="props.duration" :style="[{ height: swiperHeight + 'rpx' }]"
@change="swiperChange">
<swiper-item v-for="(arr, index) in menuList" :key="index" :class="{ cur: state.cur == index }">
<!-- 宫格 -->
<view class="grid-wrap">
<view
v-for="(item, index) in arr"
:key="index"
<view v-for="(item, index) in arr" :key="index"
class="grid-item ss-flex ss-flex-col ss-col-center ss-row-center"
:style="[{ width: `${100 * (1 / data.column)}%`, height: '200rpx' }]"
hover-class="ss-hover-btn"
@tap="sheep.$router.go(item.url)"
>
hover-class="ss-hover-btn" @tap="sheep.$router.go(item.url)">
<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
<view
v-if="item.badge.show"
class="tag-box"
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
>
<view v-if="item.badge.show" class="tag-box"
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
{{ item.badge.text }}
</view>
<image
v-if="item.iconUrl"
class="menu-icon"
:style="[
<image v-if="item.iconUrl" class="menu-icon" :style="[
{
width: props.iconSize + 'rpx',
height: props.iconSize + 'rpx',
},
]"
:src="sheep.$url.cdn(item.iconUrl)"
mode="aspectFill"
></image>
<view
v-if="data.layout === 'iconText'"
class="menu-title"
:style="[{ color: item.titleColor }]"
>
]" :src="sheep.$url.cdn(item.iconUrl)" mode="aspectFill"></image>
<view v-if="data.layout === 'iconText'" class="menu-title"
:style="[{ color: item.titleColor }]">
{{ item.title }}
</view>
</view>
@ -66,12 +41,8 @@
<!-- 指示点 -->
<template v-if="menuList.length > 1">
<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle != 'tag'">
<view
class="line-box"
v-for="(item, index) in menuList.length"
:key="index"
:class="[state.cur == index ? 'cur' : '', props.dotCur]"
></view>
<view class="line-box" v-for="(item, index) in menuList.length" :key="index"
:class="[state.cur == index ? 'cur' : '', props.dotCur]"></view>
</view>
<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle == 'tag'">
<view class="ui-tag radius" :class="[props.dotCur]" style="pointer-events: none">
@ -80,6 +51,7 @@
</view>
</template>
</view>
</view>
</template>
<script setup>
@ -111,7 +83,10 @@
*
*/
import { reactive, computed } from 'vue';
import {
reactive,
computed
} from 'vue';
import sheep from '@/sheep';
// 数据
@ -124,11 +99,11 @@
const props = defineProps({
data: {
type: Object,
default() {},
default () {},
},
styles: {
type: Object,
default() {},
default () {},
},
circular: {
type: Boolean,
@ -237,6 +212,15 @@
</script>
<style lang="scss" scoped>
.title {
padding: 10px 20px;
height: 20px;
line-height: 20px;
font-size: 16px;
font-weight: 600;
border-bottom: 1px solid #dcdcdc;
}
.grid-wrap {
width: 100%;
display: flex;
@ -246,6 +230,7 @@
flex-wrap: wrap;
align-items: center;
}
.menu-box {
position: relative;
z-index: 1;
@ -334,8 +319,7 @@
opacity: 1;
}
&.cur::after {
}
&.cur::after {}
}
&.line {

53
sheep/components/s-order-card/s-order-card.vue
View File

@ -1,34 +1,42 @@
<!-- 装修用户组件：用户订单 -->
<template>
<view>
<view class="title">
订单中心
</view>
<view class="ss-order-menu-wrap ss-flex ss-col-center">
<view
class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
v-for="item in orderMap"
:key="item.title"
@tap="sheep.$router.go(item.path, { type: item.value })"
>
<uni-badge
class="uni-badge-left-margin"
:text="numData.orderCount[item.count]"
absolute="rightTop"
size="small"
>
<image class="item-icon" :src="sheep.$url.static(item.icon)" mode="aspectFit" />
<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" v-for="(item, index) in orderMap"
:key="item.title" @tap="sheep.$router.go(item.path, { type: item.value })">
<uni-badge class="uni-badge-left-margin" :text="numData.orderCount[item.count]" absolute="rightTop"
size="small">
<image v-if="index == 0" class="item-icon" :src="imag0" mode="aspectFit" />
<image v-if="index == 1" class="item-icon" :src="imag1" mode="aspectFit" />
<image v-if="index == 2" class="item-icon" :src="imag2" mode="aspectFit" />
<image v-if="index == 3" class="item-icon" :src="imag3" mode="aspectFit" />
<image v-if="index == 4" class="item-icon" :src="imag4" mode="aspectFit" />
</uni-badge>
<view class="menu-title ss-m-t-28">{{ item.title }}</view>
</view>
</view>
</view>
</template>
<script setup>
import imag0 from '@/static/images/no_0.png'
import imag1 from '@/static/images/no_take.png'
import imag2 from '@/static/images/no_comment.png'
import imag3 from '@/static/images/order.png'
import imag4 from '@/static/images/order.png'
/**
* 装修组件 - 订单菜单组
*/
import sheep from '@/sheep';
import { computed } from 'vue';
import {
computed
} from 'vue';
const orderMap = [
{
const orderMap = [{
title: '待付款',
value: '1',
icon: '/static/img/shop/order/no_pay.png',
@ -72,20 +80,32 @@
</script>
<style lang="scss" scoped>
.title {
padding: 10px 20px;
height: 20px;
line-height: 20px;
font-size: 16px;
font-weight: 600;
border-bottom: 1px solid #dcdcdc;
}
.ss-order-menu-wrap {
.menu-item {
height: 160rpx;
position: relative;
z-index: 10;
.menu-title {
font-size: 24rpx;
line-height: 24rpx;
color: #333333;
}
.item-icon {
width: 44rpx;
height: 44rpx;
}
.num-icon {
position: absolute;
right: 18rpx;
@ -98,6 +118,7 @@
color: #fefefe;
display: flex;
align-items: center;
.num {
font-size: 24rpx;
transform: scale(0.8);

4
sheep/components/s-share-modal/s-share-modal.vue
View File

@ -36,7 +36,7 @@
>
<image
class="share-img"
:src="sheep.$url.static('/static/img/shop/share/share_poster.png')"
src="@/static/images/share_poster.png"
mode=""
/>
<text class="share-title">生成海报</text>
@ -50,7 +50,7 @@
>
<image
class="share-img"
:src="sheep.$url.static('/static/img/shop/share/share_link.png')"
src="@/static/images/share_link.png"
mode=""
/>
<text class="share-title">复制链接</text>

6
sheep/components/s-user-card/s-user-card.vue
View File

@ -9,7 +9,7 @@
:src="
isLogin
? sheep.$url.cdn(userInfo.avatar)
: sheep.$url.static('/static/img/shop/default_avatar.png')
: defaultAvatar
"
mode="aspectFill"
@tap="sheep.$router.go('/pages/user/info')"
@ -43,6 +43,8 @@
</template>
<script setup>
// 使用 import
import defaultAvatar from '@/static/images/default_avatar.png';
/**
* 用户卡片
*
@ -120,7 +122,7 @@
.nick-name {
font-size: 34rpx;
font-weight: 400;
color: #333333;
color: white;
line-height: normal;
}

3
sheep/components/s-wallet-card/s-wallet-card.vue
View File

@ -41,7 +41,7 @@
>
<image
class="item-icon"
:src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')"
:src="walleticon"
mode="aspectFit"
/>
<view class="menu-title ss-m-t-30">我的钱包</view>
@ -50,6 +50,7 @@
</template>
<script setup>
import walleticon from '@/static/images/wallet_icon.png'
/**
* 装修组件 - 订单菜单组
*/

BIN
static/images/activity-btn-disabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/images/collect_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/collect_1.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
static/images/default_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
static/images/groupon-btn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
static/images/no_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/images/no_comment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 726 B

BIN
static/images/no_take.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/order.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
static/images/seckill-bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
static/images/seckill-header.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
static/images/service.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 845 B

BIN
static/images/share.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/share_link.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
static/images/share_poster.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
static/images/wallet_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 816 B