添加魔法,添加商品卡片分类,会员bug

This commit is contained in:
77 2024-10-29 11:14:45 +08:00
parent df5dddb424
commit 09b02ede34
20 changed files with 2046 additions and 1085 deletions

View File

@ -0,0 +1,165 @@
export default {
"addressbook":"\ue80c",
"addfriends-fill": "\ue80a",
"addfriends": "\ue80b",
"backspace-fill": "\ue808",
"backspace": "\ue809",
"bankcard-fill": "\ue806",
"bankcard": "\ue807",
"camera-fill": "\ue804",
"camera": "\ue805",
"captcha-fill": "\ue802",
"captcha": "\ue803",
"cart-fill": "\ue800",
"cart": "\ue801",
"classify": "\ue7fe",
"classify-fill": "\ue7ff",
"comment-fill": "\ue7fc",
"comment": "\ue7fd",
"community-fill": "\ue7fa",
"community": "\ue7fb",
"coupon-fill": "\ue7f8",
"coupon": "\ue7f9",
"delete": "\ue7f6",
"delete-fill": "\ue7f7",
"edit": "\ue7f4",
"edit-fill": "\ue7f5",
"fabulous-fill": "\ue7f2",
"fabulous": "\ue7f3",
"find": "\ue7f0",
"find-fill": "\ue7f1",
"help-fill": "\ue7ee",
"help": "\ue7ef",
"home-fill": "\ue7ec",
"home": "\ue7ed",
"idcard-fill": "\ue7ea",
"idcard": "\ue7eb",
"info": "\ue7e8",
"info-fill": "\ue7e9",
"invite-fill": "\ue7e6",
"invite": "\ue7e7",
"kefu-fill": "\ue7e4",
"kefu": "\ue7e5",
"like-fill": "\ue7e2",
"like": "\ue7e3",
"location": "\ue7e0",
"location-fill": "\ue7e1",
"lock": "\ue7de",
"lock-fill": "\ue7df",
"mail-fill": "\ue7dc",
"mail": "\ue7dd",
"message": "\ue7da",
"message-fill": "\ue7db",
"mobile-fill": "\ue7d8",
"mobile": "\ue7d9",
"more": "\ue7d6",
"more-fill": "\ue7d7",
"my-fill": "\ue7d4",
"my": "\ue7d5",
"principal":"\ue80d",
"notice-fill": "\ue7d2",
"notice": "\ue7d3",
"order": "\ue7d0",
"order-fill": "\ue7d1",
"picture": "\ue7ce",
"picture-fill": "\ue7cf",
"setup-fill": "\ue7cc",
"setup": "\ue7cd",
"share": "\ue7ca",
"share-fill": "\ue7cb",
"shop": "\ue7c8",
"shop-fill": "\ue7c9",
"star-fill": "\ue7c5",
"star": "\ue7c6",
"starhalf": "\ue7c7",
"stepon-fill": "\ue7c3",
"stepon": "\ue7c4",
"wait-fill": "\ue7c1",
"wait": "\ue7c2",
"warning": "\ue7bf",
"warning-fill": "\ue7c0",
"plus": "\ue7bc",
"plussign-fill": "\ue7bd",
"plussign": "\ue7be",
"minus": "\ue7b9",
"minussign": "\ue7ba",
"minussign-fill": "\ue7bb",
"close": "\ue7b8",
"clear": "\ue7b6",
"clear-fill": "\ue7b7",
"checkbox-fill": "\ue7b5",
"checkround": "\ue7b4",
"checkbox": "\ue7b3",
"check": "\ue7b2",
"pulldown-fill": "\ue7ae",
"pullup": "\ue7af",
"pullup-fill": "\ue7b0",
"pulldown": "\ue7b1",
"roundright-fill": "\ue7ac",
"roundright": "\ue7ad",
"arrowright": "\ue7a9",
"arrowleft": "\ue7aa",
"arrowdown": "\ue7ab",
"left": "\ue7a6",
"up": "\ue7a7",
"right": "\ue7a8",
"back": "\ue7a3",
"top": "\ue7a4",
"dropdown": "\ue7a5",
"turningleft": "\ue79f",
"turningup": "\ue7a0",
"turningright": "\ue7a1",
"turningdown": "\ue7a2",
"refresh": "\ue79c",
"loading": "\ue79d",
"search": "\ue79e",
"rotate": "\ue79b",
"screen": "\ue79a",
"signin": "\ue799",
"calendar": "\ue798",
"scan": "\ue797",
"qrcode": "\ue796",
"wallet": "\ue795",
"telephone": "\ue794",
"visible": "\ue793",
"invisible": "\ue792",
"menu": "\ue78e",
"operate": "\ue78f",
"slide": "\ue790",
"list": "\ue791",
"nonetwork": "\ue78d",
"partake": "\ue78c",
"qa": "\ue78b",
"barchart": "\ue788",
"piechart": "\ue789",
"linechart": "\ue78a",
"at": "\ue787",
"face": "\ue77f",
"redpacket": "\ue780",
"suspend": "\ue781",
"link": "\ue782",
"keyboard": "\ue783",
"play": "\ue784",
"video": "\ue785",
"voice": "\ue786",
"sina": "\ue77a",
"browser": "\ue77b",
"moments": "\ue77c",
"qq": "\ue77d",
"wechat": "\ue77e",
"balance": "\ue779",
"bankcardpay": "\ue778",
"wxpay": "\ue777",
"alipay": "\ue776",
"payment":"\ue818",
"receive":"\ue817",
"sendout":"\ue816",
"evaluate":"\ue815",
"aftersale":"\ue814",
"warehouse":"\ue813",
"transport":"\ue812",
"delivery":"\ue811",
"switch":"\ue810",
"goods":"\ue80f",
"goods-fill":"\ue80e"
}

Binary file not shown.

View File

@ -0,0 +1,150 @@
<template>
<!-- #ifndef APP-NVUE -->
<text :style="{ color:getColor, fontSize: getSize, fontWeight: fontWeight}" class="fui-icon"
:class="[!getColor && !primary?'fui-icon__color':'',primary && (!color || color===true)?'fui-icon__active-color':'',disabled?'fui-icon__not-allowed':'',customPrefix && customPrefix!==true?customPrefix:'',customPrefix && customPrefix!==true?name:'']"
@click="handleClick">{{ icons[name] || '' }}</text>
<!-- #endif -->
<!-- #ifdef APP-NVUE -->
<text
:style="{ color: primary && (!color || color===true)?primaryColor:getColor, fontSize: getSize,lineHeight:getSize, fontWeight: fontWeight}"
class="fui-icon" :class="[customPrefix && customPrefix!==true?customPrefix:'']"
@click="handleClick">{{ customPrefix && customPrefix!==true?name:icons[name] }}</text>
<!-- #endif -->
</template>
<script>
import icons from './fui-icon.js';
// #ifdef APP-NVUE
var domModule = weex.requireModule('dom');
import fuiicons from './fui-icon.ttf'
domModule.addRule('fontFace', {
'fontFamily': 'fuiFont',
'src': "url('" + fuiicons + "')"
});
// #endif
export default {
name: "fui-icon",
emits: ['click'],
// #ifdef MP-WEIXIN
options: {
addGlobalClass: true
},
// #endif
props: {
name: {
type: String,
default: ''
},
size: {
type: [Number, String],
default: 0
},
//rpx | px
unit: {
type: String,
default: ''
},
color: {
type: String,
default: ''
},
//
fontWeight: {
type: [Number, String],
default: 'normal'
},
//
disabled: {
type: Boolean,
default: false
},
params: {
type: [Number, String],
default: 0
},
customPrefix: {
type: String,
default: ''
},
//color使
primary: {
type: Boolean,
default: false
}
},
computed: {
getSize() {
const size = (uni.$fui && uni.$fui.fuiIcon && uni.$fui.fuiIcon.size) || 64
const unit = (uni.$fui && uni.$fui.fuiIcon && uni.$fui.fuiIcon.unit) || 'rpx'
return (this.size || size) + (this.unit || unit)
},
primaryColor() {
const app = uni && uni.$fui && uni.$fui.color;
return (app && app.primary) || '#465CFF';
},
getColor() {
const app = uni && uni.$fui && uni.$fui.fuiIcon;
let color = this.color;
if (!color || (color && color === true)) {
color = (app && app.color)
}
// #ifdef APP-NVUE
if (!color || color === true) {
color = '#333333'
}
// #endif
return color;
}
},
data() {
return {
icons: icons
};
},
methods: {
handleClick() {
if (this.disabled) return;
this.$emit('click', {
params: this.params
});
}
}
}
</script>
<style scoped>
/* #ifndef APP-NVUE */
/* 头条小程序组件内不能引入字体,需要在父级页面引入字体文件*/
@font-face {
font-family: fuiFont;
src: url("./fui-icon.ttf") format("truetype");
}
/* #endif */
.fui-icon {
font-family: fuiFont;
text-decoration: none;
text-align: center;
/* #ifdef H5 */
cursor: pointer;
/* #endif */
}
/* #ifndef APP-NVUE */
.fui-icon__color {
color: var(--fui-color-section, #333333) !important;
}
.fui-icon__active-color {
color: var(--fui-color-primary, #465CFF) !important;
}
/* #endif */
.fui-icon__not-allowed {
/* #ifdef H5 */
cursor: not-allowed !important;
/* #endif */
}
</style>

View File

@ -0,0 +1,206 @@
<template>
<view class="fui-toast__wrap" :class="{'fui-toast__show':visible}" v-if="visible || !isNvue" ref="fui_toast_ani">
<view class="fui-toast__inner"
:style="{paddingTop:padding[0] || 0,paddingRight:padding[1] || 0,paddingBottom:padding[2] || padding[0] || 0,paddingLeft:padding[3] || padding[1] || 0,background:background,zIndex:zIndex}">
<slot></slot>
<view class="fui-toast__icon-box" v-if="src" :style="{width:width+'rpx',height:width+'rpx'}">
<image class="fui-toast__icon" :src="src" :style="{width:width+'rpx',height:width+'rpx'}">
</image>
</view>
<text class="fui-toast__text" :style="{fontSize:size+'rpx',color:color}" v-if="text">{{text}}</text>
</view>
</view>
</template>
<script>
// #ifdef APP-NVUE
const animation = uni.requireNativePlugin('animation');
// #endif
export default {
name: "fui-toast",
props: {
padding: {
type: Array,
default () {
return ['32rpx', '32rpx']
}
},
background: {
type: String,
default: 'rgba(0,0,0,.6)'
},
//rpx
width: {
type: [Number, String],
default: 64
},
size: {
type: [Number, String],
default: 30
},
color: {
type: String,
default: '#fff'
},
zIndex: {
type: Number,
default: 1001
}
},
data() {
let isNvue = false;
// #ifdef APP-NVUE
isNvue = true;
// #endif
return {
timer: null,
visible: false,
src: '',
text: '',
isNvue: isNvue
};
},
// #ifndef VUE3
beforeDestroy() {
clearTimeout(this.timer);
this.timer = null;
},
// #endif
// #ifdef VUE3
beforeUnmount() {
clearTimeout(this.timer);
this.timer = null;
},
// #endif
methods: {
// #ifdef APP-NVUE
_animation(type, duration = 2000) {
if (!this.$refs['fui_toast_ani']) return;
animation.transition(
this.$refs['fui_toast_ani'].ref, {
styles: {
opacity: type ? 1 : 0
},
duration: 300, //ms
timingFunction: 'ease-in-out',
needLayout: false,
delay: 0 //ms
},
() => {
if (!type) {
this.visible = false;
} else {
this.timer = setTimeout(() => {
this._animation(false)
clearTimeout(this.timer);
this.timer = null;
}, duration);
}
}
);
},
// #endif
show: function(options) {
clearTimeout(this.timer);
let {
duration = 2000,
src = '',
text = ''
} = options;
this.text = text;
this.src = src;
// #ifdef APP-NVUE
this.visible = true;
// #endif
this.$nextTick(() => {
setTimeout(() => {
// #ifdef APP-NVUE
this._animation(true, duration)
// #endif
// #ifndef APP-NVUE
this.visible = true;
this.timer = setTimeout(() => {
this.visible = false;
clearTimeout(this.timer);
this.timer = null;
}, duration);
// #endif
}, 50);
});
}
}
}
</script>
<style scoped>
.fui-toast__wrap {
position: fixed;
/* #ifdef APP-NVUE */
left: 64rpx;
right: 64rpx;
top: 0;
bottom: 0;
/* #endif */
/* #ifndef APP-NVUE */
left: 15%;
right: 15%;
top: 50%;
transform: translateY(-50%);
/* #endif */
background-color: rgba(0, 0, 0, 0);
z-index: 1002;
/* #ifndef APP-NVUE */
display: flex;
visibility: hidden;
/* #endif */
align-items: center;
justify-content: center;
/* #ifndef APP-NVUE */
transition-property: opacity, visibility;
transition-timing-function: ease-in-out;
transition-duration: 0.3s;
/* #endif */
opacity: 0;
}
.fui-toast__inner {
/* #ifndef APP-NVUE */
display: flex;
box-sizing: border-box;
/* #endif */
align-items: center;
justify-content: center;
flex-direction: column;
border-radius: 16rpx;
}
/* #ifndef APP-NVUE */
.fui-toast__show {
visibility: visible;
opacity: 1;
}
/* #endif */
.fui-toast__icon-box {
padding-bottom: 20rpx;
/* #ifndef APP-NVUE */
box-sizing: content-box;
flex-shrink: 0;
/* #endif */
}
/* #ifndef APP-NVUE */
.fui-toast__icon {
display: block;
flex-shrink: 0;
}
/* #endif */
.fui-toast__text {
font-weight: 400;
text-align: center;
/* #ifndef APP-NVUE */
word-break: break-all;
/* #endif */
}
</style>

View File

@ -1,105 +1,20 @@
{ {
"id": "shopro", "id": "fui-toast",
"name": "shopro", "name": "Toast 轻提示fui-toast",
"displayName": "芋道商城", "version": "v2.3.0",
"version": "2.1.0", "description": "FirstUI Toast 轻提示,一种轻量级反馈/提示,适合用于页面转场、数据交互的等场景中。",
"description": "芋道商城一套代码同时发行到iOS、Android、H5、微信小程序多个平台请使用手机扫码快速体验强大功能",
"scripts": {
"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": [ "keywords": [
"商城", "Toast",
"B2C", "轻提示",
"商城模板" "组件",
"FirstUI",
"Nvue"
], ],
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/sheepjs/shop/issues"
},
"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
"dcloudext": { "dcloudext": {
"category": [ "category": [
"前端页面模板", "前端组件",
"uni-app前端项目模板" "通用组件"
], ]
"sale": {
"regular": {
"price": "0.00"
}, },
"sourcecode": { "displayName": "Toast 轻提示fui-toast"
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": ""
},
"uni_modules": {
"dependencies": [],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "u",
"aliyun": "u"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "u"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "u",
"百度": "u",
"字节跳动": "u",
"QQ": "u",
"京东": "u"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "u",
"vue3": "y"
}
}
}
},
"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",
"weixin-js-sdk": "^1.6.0"
},
"devDependencies": {
"prettier": "^2.8.7",
"vconsole": "^3.15.0"
}
} }

View File

@ -46,6 +46,19 @@
"group": "商城" "group": "商城"
} }
}, },
{
"path": "pages/subscribe/success_tolse",
"style": {
"navigationBarTitleText": "预约成功",
"enablePullDownRefresh": true
},
"meta": {
"auth": false,
"sync": true,
"title": "预约成功",
"group": "商城"
}
},
{ {
"path": "pages/reservation_record/reservation_record", "path": "pages/reservation_record/reservation_record",
"style": { "style": {
@ -366,6 +379,18 @@
"group": "用户中心" "group": "用户中心"
} }
}, },
{
"path": "user_vip/agreement",
"style": {
"navigationBarTitleText": "会员协议"
},
"meta": {
"auth": true,
"sync": true,
"title": "会员协议",
"group": "用户中心"
}
},
{ {
"path": "user_vip/index", "path": "user_vip/index",
"style": { "style": {

View File

@ -8,15 +8,8 @@
></view> --> ></view> -->
<!-- 时间段轮播图 --> <!-- 时间段轮播图 -->
<view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0"> <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
<swiper <swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
indicator-dots="true" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
autoplay="true"
:circular="true"
interval="3000"
duration="1500"
indicator-color="rgba(255,255,255,0.6)"
indicator-active-color="#fff"
>
<block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index"> <block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
<swiper-item class="borRadius14"> <swiper-item class="borRadius14">
<image :src="picUrl" class="slide-image borRadius14" lazy-load /> <image :src="picUrl" class="slide-image borRadius14" lazy-load />
@ -29,24 +22,12 @@
<!-- 左侧图标 --> <!-- 左侧图标 -->
<view class="time-icon"> <view class="time-icon">
<!-- TODO 芋艿图片统一维护 --> <!-- TODO 芋艿图片统一维护 -->
<image <image class="ss-w-100 ss-h-100" src="http://mall.yudao.iocoder.cn/static/images/priceTag.png" />
class="ss-w-100 ss-h-100"
src="http://mall.yudao.iocoder.cn/static/images/priceTag.png"
/>
</view> </view>
<scroll-view <scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
class="time-list" <view v-for="(config, index) in timeConfigList" :key="index"
:scroll-into-view="activeTimeElId" :class="['item', { active: activeTimeIndex === index }]" :id="`timeItem${index}`"
scroll-x @tap="handleChangeTimeConfig(index,config.id)">
scroll-with-animation
>
<view
v-for="(config, index) in timeConfigList"
:key="index"
:class="['item', { active: activeTimeIndex === index }]"
:id="`timeItem${index}`"
@tap="handleChangeTimeConfig(index,config.id)"
>
<!-- 活动起始时间 --> <!-- 活动起始时间 -->
<view class="time">{{ config.startTime }}</view> <view class="time">{{ config.startTime }}</view>
<!-- 活动状态 --> <!-- 活动状态 -->
@ -78,37 +59,25 @@
</view> --> </view> -->
<!-- 活动列表 --> <!-- 活动列表 -->
<scroll-view <scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
class="scroll-box" :scroll-with-animation="false" :enable-back-to-top="true">
:style="{ height: pageHeight + 'rpx' }"
scroll-y="true"
:scroll-with-animation="false"
:enable-back-to-top="true"
>
<view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id"> <view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id">
<s-goods-column <s-goods-column size="lg" :data="{ ...activity, price: activity.seckillPrice }"
size="lg" :goodsFields="goodsFields" :seckillTag="true"
:data="{ ...activity, price: activity.seckillPrice }" @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })">
:goodsFields="goodsFields"
:seckillTag="true"
@click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
>
<!-- 抢购进度 --> <!-- 抢购进度 -->
<template #activity> <template #activity>
<view class="limit" <view class="limit">限量
>限量 <text class="ss-m-l-5">{{ activity.stock }} {{ activity.unitName }}</text>
<text class="ss-m-l-5">{{ activity.stock }} {{ activity.unitName }}</text></view </view>
>
<su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate /> <su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
</template> </template>
<!-- 抢购按钮 --> <!-- 抢购按钮 -->
<template #cart> <template #cart>
<button <button :class="[
:class="[
'ss-reset-button cart-btn', 'ss-reset-button cart-btn',
{ disabled: activeTimeConfig.status === TimeStatusEnum.END }, { disabled: activeTimeConfig.status === TimeStatusEnum.END },
]" ]">
>
<span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span> <span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span>
<span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span> <span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span>
<span v-else>已结束</span> <span v-else>已结束</span>
@ -116,29 +85,39 @@
</template> </template>
</s-goods-column> </s-goods-column>
</view> </view>
<uni-load-more <uni-load-more v-if="activityTotal > 0" :status="loadStatus" :content-text="{
v-if="activityTotal > 0"
:status="loadStatus"
:content-text="{
contentdown: '上拉加载更多', contentdown: '上拉加载更多',
}" }" @tap="loadMore" />
@tap="loadMore"
/>
</scroll-view> </scroll-view>
</view> </view>
</s-layout> </s-layout>
</template> </template>
<script setup> <script setup>
import { reactive, computed, ref, nextTick } from 'vue'; import {
import { onLoad, onReachBottom } from '@dcloudio/uni-app'; reactive,
computed,
ref,
nextTick
} from 'vue';
import {
onLoad,
onReachBottom
} from '@dcloudio/uni-app';
import sheep from '@/sheep'; import sheep from '@/sheep';
import { useDurationTime } from '@/sheep/hooks/useGoods'; import {
useDurationTime
} from '@/sheep/hooks/useGoods';
import SeckillApi from '@/sheep/api/promotion/seckill'; import SeckillApi from '@/sheep/api/promotion/seckill';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { TimeStatusEnum } from '@/sheep/util/const'; import {
TimeStatusEnum
} from '@/sheep/util/const';
// //
const { safeAreaInsets, safeArea } = sheep.$platform.device; const {
safeAreaInsets,
safeArea
} = sheep.$platform.device;
const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
const pageHeight = const pageHeight =
(safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350; (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
@ -146,10 +125,18 @@
// //
const goodsFields = { const goodsFields = {
name: { show: true }, name: {
introduction: { show: true }, show: true
price: { show: true }, },
marketPrice: { show: true }, introduction: {
show: true
},
price: {
show: true
},
marketPrice: {
show: true
},
}; };
//#region //#region
@ -157,7 +144,9 @@
const timeConfigList = ref([]); const timeConfigList = ref([]);
// //
const getSeckillConfigList = async () => { const getSeckillConfigList = async () => {
const { data } = await SeckillApi.getSeckillConfigList(); const {
data
} = await SeckillApi.getSeckillConfigList();
const now = dayjs(); const now = dayjs();
const today = now.format('YYYY-MM-DD'); const today = now.format('YYYY-MM-DD');
// //
@ -174,7 +163,7 @@
} }
}); });
timeConfigList.value = data; timeConfigList.value = data;
console.log(timeConfigList.value[0]?.id,"timeConfigList.value[0]?.id"); console.log(timeConfigList.value[0]?.id, "timeConfigList.value[0]?.id");
// //
handleChangeTimeConfig(activeTimeIndex.value, timeConfigList.value[0]?.id); handleChangeTimeConfig(activeTimeIndex.value, timeConfigList.value[0]?.id);
// //
@ -192,7 +181,7 @@
const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); // const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); //
const handleChangeTimeConfig = (index, config) => { const handleChangeTimeConfig = (index, config) => {
activeTimeIndex.value = index; activeTimeIndex.value = index;
console.log(config,'config') console.log(config, 'config')
// //
activityPageParams.pageNo = 1; activityPageParams.pageNo = 1;
activityList.value = []; activityList.value = [];
@ -222,8 +211,10 @@
const loadStatus = ref(''); // const loadStatus = ref(''); //
async function getActivityList(id) { async function getActivityList(id) {
loadStatus.value = 'loading'; loadStatus.value = 'loading';
activityPageParams.configId= id; activityPageParams.configId = id;
const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams); const {
data
} = await SeckillApi.getSeckillActivityPage(activityPageParams);
data.list.forEach((activity) => { data.list.forEach((activity) => {
// //
activity.percent = parseInt( activity.percent = parseInt(
@ -269,6 +260,7 @@
margin: 0 auto 0 auto; margin: 0 auto 0 auto;
border-radius: 14rpx; border-radius: 14rpx;
overflow: hidden; overflow: hidden;
swiper { swiper {
height: 330rpx !important; height: 330rpx !important;
border-radius: 14rpx; border-radius: 14rpx;
@ -280,6 +272,7 @@
height: 100%; height: 100%;
border-radius: 14rpx; border-radius: 14rpx;
overflow: hidden; overflow: hidden;
img { img {
border-radius: 14rpx; border-radius: 14rpx;
} }
@ -291,10 +284,12 @@
width: 75rpx; width: 75rpx;
height: 70rpx; height: 70rpx;
} }
// //
.time-list { .time-list {
width: 596rpx; width: 596rpx;
white-space: nowrap; white-space: nowrap;
// //
.item { .item {
display: inline-block; display: inline-block;
@ -304,17 +299,20 @@
box-sizing: border-box; box-sizing: border-box;
margin-right: 30rpx; margin-right: 30rpx;
width: 130rpx; width: 130rpx;
// //
.time { .time {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
color: #333; color: #333;
} }
// //
&.active { &.active {
.time { .time {
color: var(--ui-BG-Main); color: var(--ui-BG-Main);
} }
// //
.status { .status {
height: 30rpx; height: 30rpx;
@ -335,6 +333,7 @@
margin: 0 20rpx 0 20rpx; margin: 0 20rpx 0 20rpx;
// background: #fff; // background: #fff;
border-radius: 20rpx 20rpx 0 0; border-radius: 20rpx 20rpx 0 0;
.content-header { .content-header {
width: 100%; width: 100%;
border-radius: 20rpx 20rpx 0 0; border-radius: 20rpx 20rpx 0 0;
@ -346,6 +345,7 @@
height: 64rpx; height: 64rpx;
background: rgba($color: #fff, $alpha: 0.66); background: rgba($color: #fff, $alpha: 0.66);
border-radius: 32px; border-radius: 32px;
// //
.countdown-title { .countdown-title {
font-size: 28rpx; font-size: 28rpx;
@ -353,10 +353,12 @@
color: #333333; color: #333333;
line-height: 28rpx; line-height: 28rpx;
} }
// //
.countdown-time { .countdown-time {
font-size: 28rpx; font-size: 28rpx;
color: rgba(#ed3c30, 0.23); color: rgba(#ed3c30, 0.23);
// //
.countdown-h { .countdown-h {
font-size: 24rpx; font-size: 24rpx;
@ -368,6 +370,7 @@
background: rgba(#ed3c30, 0.23); background: rgba(#ed3c30, 0.23);
border-radius: 6rpx; border-radius: 6rpx;
} }
// //
.countdown-num { .countdown-num {
font-size: 24rpx; font-size: 24rpx;
@ -382,12 +385,15 @@
} }
} }
} }
// //
.scroll-box { .scroll-box {
height: 900rpx; height: 900rpx;
// //
.goods-box { .goods-box {
position: relative; position: relative;
// //
.cart-btn { .cart-btn {
position: absolute; position: absolute;
@ -407,6 +413,7 @@
color: #fff; color: #fff;
} }
} }
// //
.limit { .limit {
font-size: 22rpx; font-size: 22rpx;

View File

@ -32,7 +32,7 @@
> >
<image <image
class="item-icon" class="item-icon"
src="/static/images/service.png" src="https://zysc.fjptzykj.com:3000/shangcheng/2f8b9d197059eb62e9dc212392a42fb481275b31f2af9c35033070ea15b71167.png"
mode="aspectFit" mode="aspectFit"
/> />
<view class="item-title">客服</view> <view class="item-title">客服</view>

View File

@ -5,49 +5,38 @@
<view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]"> <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
<!-- 商品分类 --> <!-- 商品分类 -->
<scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]"> <scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
<view <view class="menu-item ss-flex" v-for="(item, index) in state.categoryList" :key="item.id"
class="menu-item ss-flex" :class="[{ 'menu-item-active': index === state.activeMenu }]" @tap="onMenu(index)">
v-for="(item, index) in state.categoryList"
:key="item.id"
:class="[{ 'menu-item-active': index === state.activeMenu }]"
@tap="onMenu(index)"
>
<view class="menu-title ss-line-1"> <view class="menu-title ss-line-1">
{{ item.name }} {{ item.name }}
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<!-- 商品分类 --> <!-- 商品分类 -->
<scroll-view <scroll-view class="goods-list-box" scroll-y :style="[{ height: pageHeight + 'px' }]"
class="goods-list-box" v-if="state.categoryList?.length">
scroll-y
:style="[{ height: pageHeight + 'px' }]" <view class="top_class">
v-if="state.categoryList?.length" <scroll-view scroll-x class="scroll">
> <view class="list on" v-for="(item, index) in 6" :key="index">sss</view>
<!-- <image <view class="list" style="width:0;"> </view> <!-- 为了不让标按钮覆盖按钮 -->
v-if="state.categoryList[state.activeMenu].picUrl"
class="banner-img" </scroll-view>
:src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)" <view class="rit">
mode="widthFix" <image src="https://zysc.fjptzykj.com:3000/shangcheng/475ffa1c11d2bdb4997efb0ba4dfab0b971630ca9e140fa90686c7206db53c82.png" class="img"></image>
/> --> </view>
</view>
<!-- <image v-if="state.categoryList[state.activeMenu].picUrl" class="banner-img" :src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)" mode="widthFix"/> -->
<first-one v-if="state.style === 'first_one'" :pagination="state.pagination" /> <first-one v-if="state.style === 'first_one'" :pagination="state.pagination" />
<first-two v-if="state.style === 'first_two'" :pagination="state.pagination" /> <first-two v-if="state.style === 'first_two'" :pagination="state.pagination" />
<second-one <second-one v-if="state.style === 'second_one'" :data="state.categoryList"
v-if="state.style === 'second_one'" :activeMenu="state.activeMenu" />
:data="state.categoryList" <uni-load-more v-if="
:activeMenu="state.activeMenu"
/>
<uni-load-more
v-if="
(state.style === 'first_one' || state.style === 'first_two') && (state.style === 'first_one' || state.style === 'first_two') &&
state.pagination.total > 0 state.pagination.total > 0
" " :status="state.loadStatus" :content-text="{
:status="state.loadStatus"
:content-text="{
contentdown: '点击查看更多', contentdown: '点击查看更多',
}" }" @tap="loadMore" />
@tap="loadMore"
/>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
@ -61,10 +50,18 @@
import sheep from '@/sheep'; import sheep from '@/sheep';
import CategoryApi from '@/sheep/api/product/category'; import CategoryApi from '@/sheep/api/product/category';
import SpuApi from '@/sheep/api/product/spu'; import SpuApi from '@/sheep/api/product/spu';
import { onLoad, onReachBottom } from '@dcloudio/uni-app'; import {
import { computed, reactive } from 'vue'; onLoad,
onReachBottom
} from '@dcloudio/uni-app';
import {
computed,
reactive
} from 'vue';
import _ from 'lodash'; import _ from 'lodash';
import { handleTree } from '@/sheep/util'; import {
handleTree
} from '@/sheep/util';
const state = reactive({ const state = reactive({
style: 'second_one', // first_one - , first_two - , second_one style: 'second_one', // first_one - , first_two - , second_one
@ -81,12 +78,17 @@
loadStatus: '', loadStatus: '',
}); });
const { safeArea } = sheep.$platform.device; const {
safeArea
} = sheep.$platform.device;
const pageHeight = computed(() => safeArea.height - 44 - 50); const pageHeight = computed(() => safeArea.height - 44 - 50);
// //
async function getList() { async function getList() {
const { code, data } = await CategoryApi.getCategoryList(); const {
code,
data
} = await CategoryApi.getCategoryList();
if (code !== 0) { if (code !== 0) {
return; return;
} }
@ -161,7 +163,7 @@
.menu-title { .menu-title {
line-height: 32rpx; line-height: 32rpx;
font-size: 23rpx; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #333; color: #333;
margin-left: 28rpx; margin-left: 28rpx;
@ -172,11 +174,9 @@
content: ''; content: '';
width: 64rpx; width: 64rpx;
height: 12rpx; height: 12rpx;
background: linear-gradient( background: linear-gradient(90deg,
90deg,
var(--ui-BG-Main-gradient), var(--ui-BG-Main-gradient),
var(--ui-BG-Main-light) var(--ui-BG-Main-light)) !important;
) !important;
position: absolute; position: absolute;
left: -64rpx; left: -64rpx;
bottom: 0; bottom: 0;
@ -187,6 +187,7 @@
&.menu-item-active { &.menu-item-active {
background-color: #fff; background-color: #fff;
// border-radius: 20rpx 0 0 20rpx; // border-radius: 20rpx 0 0 20rpx;
&::before { &::before {
content: ''; content: '';
@ -196,7 +197,7 @@
width: 2px; width: 2px;
height: 100%; height: 100%;
// background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0); // background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
background: rgba(236,72,29); background: rgba(236, 72, 29);
} }
&::after { &::after {
@ -211,7 +212,7 @@
.menu-title { .menu-title {
font-weight: 600; font-weight: 600;
color:rgba(236,72,29); color: rgba(236, 72, 29);
// &::before { // &::before {
// left: 0; // left: 0;
// } // }
@ -224,6 +225,41 @@
background-color: #fff; background-color: #fff;
width: calc(100vw - 100px); width: calc(100vw - 100px);
padding: 10px; padding: 10px;
.top_class{
position:relative;
.scroll{
white-space: nowrap;
margin-bottom: 10px;
.list{
padding:3px 15px;
background:rgba(248,248,248);
color:rgba(179,179,179);
display: inline-block;
border-radius: 13px;
margin-right:10px;
&.on{
background:rgba(255,235,234);
color:rgba(223,47,41);
}
}
}
.rit{
position:absolute;
right:0;
top:0;
width:40px;
height:100%;
background-color: white;
display: flex;
align-items: center;
text-align: center;
justify-content: center;
.img{
width:15px;
height:15px;
}
}
}
} }
.banner-img { .banner-img {

View File

@ -2,35 +2,27 @@
<template> <template>
<view v-if="template"> <view v-if="template">
<s-layout <s-layout title="首页" navbar="normal" tools="search" tabbar="/pages/index/index" :bgStyle="template.page"
title="首页" :navbarStyle="template.navigationBar" onShareAppMessage @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
navbar="normal" headerBtns='headerBtns' backgroundColor="rgba(248,83,42)" opacityBgUi='ll' :navBg="true">
tools="search"
tabbar="/pages/index/index"
:bgStyle="template.page"
:navbarStyle="template.navigationBar"
onShareAppMessage
@search="(e) => { console.log(e,'eeeeeeeeeeee') }"
headerBtns='headerBtns'
backgroundColor="rgba(248,83,42)"
opacityBgUi='ll'
:navBg="true"
>
<view class="new-bg"></view> <view class="new-bg"></view>
<s-block
v-for="(item, index) in template.components" <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
:key="index" <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" :fl="true" />
:styles="item.property.style"
>
<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
</s-block> </s-block>
</s-layout> </s-layout>
</view> </view>
</template> </template>
<script setup> <script setup>
import { computed } from 'vue'; import {
import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app'; computed
} from 'vue';
import {
onLoad,
onPageScroll,
onPullDownRefresh
} from '@dcloudio/uni-app';
import sheep from '@/sheep'; import sheep from '@/sheep';
import $share from '@/sheep/platform/share'; import $share from '@/sheep/platform/share';
// tabBar // tabBar
@ -88,7 +80,7 @@
// //
onPullDownRefresh(() => { onPullDownRefresh(() => {
sheep.$store('app').init(); sheep.$store('app').init();
setTimeout(function () { setTimeout(function() {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 800); }, 800);
}); });
@ -97,10 +89,12 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.new-bg{ .new-bg {
background:rgba(248,83,42); background: rgba(248, 83, 42);
width:100%; width: 100%;
height:50px; height: 50px;
position: absolute; position: absolute;
} }
</style> </style>

View File

@ -59,11 +59,11 @@
<!-- TODO 芋艿订阅 --> <!-- TODO 芋艿订阅 -->
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class="subscribe-box ss-flex ss-m-t-44"> <!-- <view class="subscribe-box ss-flex ss-m-t-44">
<image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" /> <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
<view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view> <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
<view class="subscribe-start" @tap="subscribeMessage">立即订阅</view> <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
</view> </view> -->
<!-- #endif --> <!-- #endif -->
</view> </view>
</s-layout> </s-layout>

View File

@ -11,7 +11,7 @@
<text class="address">预约姓名<text class="title">{{ item.name }}</text></text> <text class="address">预约姓名<text class="title">{{ item.name }}</text></text>
<text class="address">预约电话<text class="title">{{ item.phone }}</text></text> <text class="address">预约电话<text class="title">{{ item.phone }}</text></text>
<text class="address">预约时间<text <text class="address">预约时间<text
class="title">{{ item.days }}</text></text> class="title">{{ item.timeQuantum }}</text></text>
<text class="address">项目名称<text class="title">{{ item.projectName }}</text> </text> <text class="address">项目名称<text class="title">{{ item.projectName }}</text> </text>
<text class="address">项目套餐<text class="title">{{ item.technicianName }}</text> </text> <text class="address">项目套餐<text class="title">{{ item.technicianName }}</text> </text>
<!-- <div class="address-container"> <!-- <div class="address-container">

View File

@ -110,7 +110,7 @@
立即预约 立即预约
</view> </view>
</view> </view>
<fui-toast ref="toast"></fui-toast>
</s-layout> </s-layout>
</template> </template>
@ -174,6 +174,8 @@
ll: '请选择', ll: '请选择',
ll2: '请选择', ll2: '请选择',
ll3: '请选择', ll3: '请选择',
ll5: '请选择', //
ll6: '请选择', //
gg: '请选择', gg: '请选择',
dateIndex: '', // dateIndex: '', //
name: '', name: '',
@ -211,6 +213,16 @@
}, },
onClinicChange2(event) { onClinicChange2(event) {
this.brandId3 = ''
this.brandId4 = ''
this.brandId5 = ''
this.name = ''
this.phone = ''
this.ll3 = '请选择'
this.brandNameList3 = []
this.dateList = []
this.brandList3 = []
const selectedClinicIndex = event.detail.value; const selectedClinicIndex = event.detail.value;
this.selectedClinicIndex2 = selectedClinicIndex; this.selectedClinicIndex2 = selectedClinicIndex;
this.ll2 = this.brandList2[selectedClinicIndex].name this.ll2 = this.brandList2[selectedClinicIndex].name
@ -301,8 +313,6 @@
if (res) { if (res) {
} }
console.log(this.brandList3, "------brandList3---------");
console.log(res, "------brandList3---------");
this.brandList3 = res.data this.brandList3 = res.data
for (var i = 0; i < this.brandList3.length; i++) { for (var i = 0; i < this.brandList3.length; i++) {
this.brandNameList3.push(this.brandList3[i].name) this.brandNameList3.push(this.brandList3[i].name)
@ -359,8 +369,29 @@
}, },
}).then((res) => { }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
sheep.$helper.toast('提交成功');
sheep.$router.go('/pages/index/user')
sheep.$router.go('/pages/subscribe/success_tolse', {
brandId: this.ll, //
projectId: this.ll2, //
technicianId: this.ll3, //
projectdayId: this.ll5, //
timeId: this.ll6, //
name: this.name, //
phone: this.phone //
})
// let options = {}
//
// options.text = '';
//
// options.src = "https://zysc.fjptzykj.com:3000/shangcheng/44252dee36b3ba686967c33e911b15c565f5ccc4c7b2a9f56e43418da949b7c2.png";
// this.$refs.toast.show(options)
// setTimeout(()=>{
// sheep.$router.go('/pages/index/user')
// },1000)
} }
}); });
@ -372,24 +403,24 @@
delete(val) {}, delete(val) {},
// //
selectDate(index) { selectDate(index) {
console.log(this.brandList3, "brandList3")
if (this.brandId3 == '') { if (this.brandId3 == '') {
sheep.$helper.toast('请先选择套餐') sheep.$helper.toast('请先选择套餐')
return; return;
} }
this.dateIndex = index; this.dateIndex = index;
this.brandId4 = this.dateList[index].id; this.brandId4 = this.dateList[index].id;
this.ll5 = this.dateList[index].days;
this.brandlists4(); this.brandlists4();
}, },
selecthsstr(index, status) { selecthsstr(index, status) {
console.log(this.brandList4[index].timeQuantum, "查看时段")
if (status == 0) { if (status == 0) {
this.brandId5 = ''; this.brandId5 = '';
console.log('this.brandId5', this.brandId5);
sheep.$helper.toast('该时间段已约满') sheep.$helper.toast('该时间段已约满')
return; return;
} }
this.brandId5 = this.brandList4[index].id; this.brandId5 = this.brandList4[index].id;
console.log('this.brandId5', this.brandId5); this.ll6 = this.brandList4[index].timeQuantum;
} }
}, },
}; };

View File

@ -0,0 +1,177 @@
<template>
<s-layout title="预约成功" :bgStyle="{ color: '#fff' }">
<view class="main">
<view class="main-t">
<view class="img-t">
<image
src="https://zysc.fjptzykj.com:3000/shangcheng/ab5eb1046be1b2d98fbab61cd1925301725b7a6d2d263fc22ea1a788e39df38d.png"
class="img"></image>
</view>
<view class="img-b">
预约成功
</view>
</view>
<view class="main-b">
<view class="list">
<view class="name">姓名</view>
<view class="name-value">{{ item.name }}</view>
</view>
<view class="list">
<view class="name">电话</view>
<view class="name-value">{{ item.phone }}</view>
</view>
<view class="list">
<view class="name">预约门店</view>
<view class="name-value">{{item.brandId}}</view>
</view>
<view class="list">
<view class="name">项目套餐</view>
<view class="name-value">{{item.projectId}} {{ item.technicianId }}</view>
</view>
<view class="list">
<view class="name">预约时间</view>
<view class="name-value">{{ item.projectdayId }} {{item.timeId}}</view>
</view>
</view>
</view>
<view class="btn" @click="sheep.$router.go('/pages/index/user')">
确认
</view>
</s-layout>
</template>
<script>
import {
ref,
computed,
onMounted
} from 'vue';
import {
onLoad
} from '@dcloudio/uni-app';
import request from '@/sheep/request';
import {
baseUrl,
apiPath
} from '@/sheep/config';
import sheep from '@/sheep';
export default {
setup() {
// 使 ref
const memberId = ref(null);
const reservationList = ref([]);
const page = ref(1);
const limit = ref(10);
const totalPages = ref(1);
const item = ref({});
// 使 computed
const userInfo = computed(() => sheep.$store('user').userInfo);
memberId.value = userInfo.value.id;
// 使 onMounted
onMounted(() => {
getList();
});
onLoad((options) => {
if (options) {
item.value = options;
console.log(item.value,"-------------------")
}
});
//
function getList() {
request({
url: `${baseUrl}${apiPath}/h5/reservation/reservationInfo`,
method: 'GET',
custom: {
showLoading: false,
},
}).then((res) => {
reservationList.value = res.data;
});
}
//
return {
memberId,
reservationList,
page,
limit,
totalPages,
getList,
sheep,
item
};
},
};
</script>
<style scope lang="scss">
.main {
background: white;
margin: 15px 15px;
border-radius: 12px;
padding-bottom: 10px;
.main-t {
.img-t {
padding-bottom: 20px;
.img {
width: 143px;
height: 106px;
display: block;
margin: 10px auto;
padding-top: 25px;
}
}
.img-b {
text-align: center;
font-size: 24px;
font-weight: 700;
width: 90%;
margin: 0 auto;
border-bottom: 1px solid rgba(233, 233, 233);
padding-bottom: 15px;
}
}
.main-b {
margin: 10px auto;
width: 90%;
margin-top: 40px;
.list {
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
margin:10px 0;
.name {
font-size: 17px;
color: rgba(101, 101, 101);
}
.name-value {
font-size: 17px;
}
}
}
}
.btn {
position: absolute;
bottom: 60px;
left: 50%;
transform: translateX(-50%);
border-radius: 16px;
background: rgba(0, 149, 248);
text-align: center;
color: white;
width: 89%;
padding: 10px 0;
}
</style>

View File

@ -0,0 +1,45 @@
<!-- 会员信息 -->
<template>
<s-layout navbar="normal" title="会员协议">
<view class="main" v-html="data">
</view>
</s-layout>
</template>
<script setup>
import {
computed,
reactive,
onBeforeMount,
onMounted,
ref
} from 'vue';
import request from '@/sheep/request';
import {
baseUrl,
apiPath
} from '@/sheep/config';
import sheep from '@/sheep';
const data = ref([]);
request({
url: `${baseUrl}${apiPath}/member/paid-member-agree/get`,
method: 'GET',
params: {
},
custom: {
showLoading: false,
},
}).then((res) => {
data.value = res.data.content
});
// 使 onMounted
onMounted(() => {
});
</script>
<style lang="scss" scoped>
.main{
width: 93%;
margin:10px auto;
}
</style>

View File

@ -17,7 +17,7 @@
</view> </view>
<view class="c" v-if="!userInfo.activate">您与众悦e家商场的第101天</view> <view class="c" v-if="!userInfo.activate">您与众悦e家商场的第101天</view>
<view class="b" v-if="!userInfo.activate">开通即享会员权益</view> <view class="b" v-if="!userInfo.activate">开通即享会员权益</view>
<view class="b" v-if="userInfo.activate">SVIP会员 {{userInfo.cardExpirationTime}} 到期</view> <view class="b" v-if="userInfo.activate">SVIP会员 {{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }} 到期</view>
</view> </view>
</view> </view>
<view class="r" v-if="!userInfo.activate"> <view class="r" v-if="!userInfo.activate">
@ -60,7 +60,7 @@
<!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> --> <!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> -->
<text class="t1" v-if="!userInfo.activate">开通会员</text> <text class="t1" v-if="!userInfo.activate">开通会员</text>
<text class="t2" v-if="userInfo.activate">有效期至</text> <text class="t2" v-if="userInfo.activate">有效期至</text>
<text class="t3" v-if="userInfo.activate">{{userInfo.cardExpirationTime}}</text> <text class="t3" v-if="userInfo.activate">{{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }}</text>
</view> </view>
<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120"> <scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
<view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red" <view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red"
@ -74,7 +74,7 @@
</view> </view>
<view class="vip-text"> <view class="vip-text">
购买即视为同意<text class="ts">会员用户协议</text> 购买即视为同意<text class="ts" @click="sheep.$router.redirect('/pages/user/user_vip/agreement')">会员用户协议</text>
</view> </view>
<!-- <view class="vip-btn" @click="beclick()" v-if="!userInfo.activate"> <!-- <view class="vip-btn" @click="beclick()" v-if="!userInfo.activate">
立即试用 立即试用
@ -115,7 +115,6 @@
showLoading: false, showLoading: false,
}, },
}).then((res) => { }).then((res) => {
console.log(res, "sss")
vipList.value = res.data; vipList.value = res.data;
}); });
} }
@ -128,12 +127,14 @@
function vipFun(index, name) { function vipFun(index, name) {
valVip.value = index valVip.value = index
data.cardName = name data.cardName = name
console.log(index, name, "name")
} }
// beclick // beclick
function beclick() { function beclick() {
console.log(data.cardName, "nameVip.value") if( data.cardName == '' ) {
sheep.$helper.toast('请选择')
return;
};
request({ request({
url: `${baseUrl}${apiPath}/pay/member/create`, url: `${baseUrl}${apiPath}/pay/member/create`,
method: 'post', method: 'post',
@ -142,11 +143,10 @@
showLoading: false, showLoading: false,
}, },
}).then((res) => { }).then((res) => {
console.log(res, "-----------试用---------------")
if (res.code == 0) { if (res.code == 0) {
if (data.cardName == "试用") { if (data.cardName == "试用") {
sheep.$helper.toast('试用开通成功'); sheep.$helper.toast('试用开通成功');
sheep.$router.go('/pages/index/user') // sheep.$router.go('/pages/index/user')
} else { } else {
sheep.$router.go('/pages/pay/index', { sheep.$router.go('/pages/pay/index', {
id: res.data.payOrderId, id: res.data.payOrderId,
@ -173,7 +173,6 @@
showLoading: false, showLoading: false,
}, },
}).then((res) => { }).then((res) => {
console.log(res, "sss")
vipList2.value = res.data; vipList2.value = res.data;
}); });
} }

View File

@ -33,11 +33,11 @@
<view class="new-point"> <view class="new-point">
<view class="l"> <view class="l">
<view class="b">{{state.pointData.addUp}}</view> <view class="b">{{state.pointData?.addUp}}</view>
<view class="c">累计积分</view> <view class="c">累计积分</view>
</view> </view>
<view class="l"> <view class="l">
<view class="b">{{state.pointData.reduce}}</view> <view class="b">{{state.pointData?.reduce}}</view>
<view class="c">累计消费</view> <view class="c">累计消费</view>
</view> </view>
<view class="l"> <view class="l">

View File

@ -31,7 +31,7 @@
<s-hotzone-block v-if="type === 'HotZone'" :data="data" :styles="styles" /> <s-hotzone-block v-if="type === 'HotZone'" :data="data" :styles="styles" />
<!-- 商品组件商品卡片 --> <!-- 商品组件商品卡片 -->
<s-goods-card v-if="type === 'ProductCard'" :data="data" :styles="styles" /> <s-goods-card v-if="type === 'ProductCard'" :data="data" :styles="styles" :fl="fl" />
<!-- 商品组件商品栏 --> <!-- 商品组件商品栏 -->
<s-goods-shelves v-if="type === 'ProductList'" :data="data" :styles="styles" /> <s-goods-shelves v-if="type === 'ProductList'" :data="data" :styles="styles" />
@ -45,6 +45,8 @@
<s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" /> <s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
<!-- 营销组件优惠券 --> <!-- 营销组件优惠券 -->
<s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" /> <s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
<!-- 营销组件魔方 -->
<s-mof-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
<!-- 营销组件文章 --> <!-- 营销组件文章 -->
<!-- <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" /> --> <!-- <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" /> -->
<view class="floxt" v-if="type === 'PromotionArticle'"> <view class="floxt" v-if="type === 'PromotionArticle'">
@ -121,6 +123,10 @@
type: Object, type: Object,
default () {}, default () {},
}, },
fl: {
type: Boolean,
default: false,
}
}); });
function path(id) { function path(id) {

View File

@ -2,29 +2,25 @@
<template> <template>
<!-- 商品卡片 --> <!-- 商品卡片 -->
<view> <view>
<view class="new-fenlei" v-if="fl">
<view class="list on">
<view class="t">首页新品</view>
<view class="b">最新出炉</view>
</view>
<view class="list" v-for="(item, index) in 3" :key="index">
<view class="t">首页新品</view>
<view class="b">最新出炉</view>
</view>
</view>
<!-- 布局1. 单列大图上图下内容--> <!-- 布局1. 单列大图上图下内容-->
<view <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length" class="goods-sl-box">
v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length"
class="goods-sl-box" <view class="goods-box" v-for="item in state.goodsList" :key="item.id"
> :style="[{ marginBottom: data.space * 2 + 'rpx' }]">
<view <s-goods-column class="" size="sl" :goodsFields="data.fields" :tagStyle="data.badge" :data="item"
class="goods-box" :titleColor="data.fields.name?.color" :subTitleColor="data.fields.introduction.color"
v-for="item in state.goodsList" :topRadius="data.borderRadiusTop" :bottomRadius="data.borderRadiusBottom"
:key="item.id" @click="sheep.$router.go('/pages/goods/index', { id: item.id })">
:style="[{ marginBottom: data.space * 2 + 'rpx' }]"
>
<s-goods-column
class=""
size="sl"
:goodsFields="data.fields"
:tagStyle="data.badge"
:data="item"
:titleColor="data.fields.name?.color"
:subTitleColor="data.fields.introduction.color"
:topRadius="data.borderRadiusTop"
:bottomRadius="data.borderRadiusBottom"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
>
<!-- 购买按钮 --> <!-- 购买按钮 -->
<template v-slot:cart> <template v-slot:cart>
<button class="ss-reset-button cart-btn" :style="[buyStyle]"> <button class="ss-reset-button cart-btn" :style="[buyStyle]">
@ -36,31 +32,17 @@
</view> </view>
<!-- 布局2. 双列每一列上图下内容--> <!-- 布局2. 双列每一列上图下内容-->
<view <view v-if="layoutType === LayoutTypeEnum.TWO_COL && state.goodsList.length"
v-if="layoutType === LayoutTypeEnum.TWO_COL && state.goodsList.length" class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top">
class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
>
<view class="goods-list-box"> <view class="goods-list-box">
<view <view class="left-list" :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
class="left-list" v-for="item in state.leftGoodsList" :key="item.id">
:style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]" <s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
v-for="item in state.leftGoodsList" :data="item" :titleColor="data.fields.name?.color"
:key="item.id" :subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
> :bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
<s-goods-column
class="goods-md-box"
size="md"
:goodsFields="data.fields"
:tagStyle="data.badge"
:data="item"
:titleColor="data.fields.name?.color"
:subTitleColor="data.fields.introduction.color"
:topRadius="data.borderRadiusTop"
:bottomRadius="data.borderRadiusBottom"
:titleWidth="330 - marginLeft - marginRight"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })" @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
@getHeight="calculateGoodsColumn($event, 'left')" @getHeight="calculateGoodsColumn($event, 'left')">
>
<!-- 购买按钮 --> <!-- 购买按钮 -->
<template v-slot:cart> <template v-slot:cart>
<button class="ss-reset-button cart-btn" :style="[buyStyle]"> <button class="ss-reset-button cart-btn" :style="[buyStyle]">
@ -71,26 +53,14 @@
</view> </view>
</view> </view>
<view class="goods-list-box"> <view class="goods-list-box">
<view <view class="right-list" :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
class="right-list" v-for="item in state.rightGoodsList" :key="item.id">
:style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]" <s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
v-for="item in state.rightGoodsList" :data="item" :titleColor="data.fields.name?.color"
:key="item.id" :subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
> :bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
<s-goods-column
class="goods-md-box"
size="md"
:goodsFields="data.fields"
:tagStyle="data.badge"
:data="item"
:titleColor="data.fields.name?.color"
:subTitleColor="data.fields.introduction.color"
:topRadius="data.borderRadiusTop"
:bottomRadius="data.borderRadiusBottom"
:titleWidth="330 - marginLeft - marginRight"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })" @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
@getHeight="calculateGoodsColumn($event, 'right')" @getHeight="calculateGoodsColumn($event, 'right')">
>
<!-- 购买按钮 --> <!-- 购买按钮 -->
<template v-slot:cart> <template v-slot:cart>
<button class="ss-reset-button cart-btn" :style="[buyStyle]"> <button class="ss-reset-button cart-btn" :style="[buyStyle]">
@ -103,28 +73,14 @@
</view> </view>
<!-- 布局3. 单列小图左图右内容 --> <!-- 布局3. 单列小图左图右内容 -->
<view <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" class="goods-lg-box">
v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" <view class="goods-box" :style="[{ marginBottom: data.space + 'px' }]" v-for="item in state.goodsList"
class="goods-lg-box" :key="item.id">
> <s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :data="item"
<view :tagStyle="data.badge" :titleColor="data.fields.name?.color"
class="goods-box" :subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
:style="[{ marginBottom: data.space + 'px' }]"
v-for="item in state.goodsList"
:key="item.id"
>
<s-goods-column
class="goods-card"
size="lg"
:goodsFields="data.fields"
:data="item"
:tagStyle="data.badge"
:titleColor="data.fields.name?.color"
:subTitleColor="data.fields.introduction.color"
:topRadius="data.borderRadiusTop"
:bottomRadius="data.borderRadiusBottom" :bottomRadius="data.borderRadiusBottom"
@tap="sheep.$router.go('/pages/goods/index', { id: item.id })" @tap="sheep.$router.go('/pages/goods/index', { id: item.id })">
>
<!-- 购买按钮 --> <!-- 购买按钮 -->
<template v-slot:cart> <template v-slot:cart>
<button class="ss-reset-button cart-btn" :style="[buyStyle]"> <button class="ss-reset-button cart-btn" :style="[buyStyle]">
@ -141,7 +97,11 @@
/** /**
* 商品卡片 * 商品卡片
*/ */
import { computed, reactive, onMounted } from 'vue'; import {
computed,
reactive,
onMounted
} from 'vue';
import sheep from '@/sheep'; import sheep from '@/sheep';
import SpuApi from '@/sheep/api/product/spu'; import SpuApi from '@/sheep/api/product/spu';
@ -163,16 +123,27 @@
const props = defineProps({ const props = defineProps({
data: { data: {
type: Object, type: Object,
default() {}, default () {},
}, },
styles: { styles: {
type: Object, type: Object,
default() {}, default () {},
},
fl: {
type: Boolean,
default: false,
}, },
}); });
const { layoutType, btnBuy, spuIds } = props.data ?? {}; const {
const { marginLeft, marginRight } = props.styles ?? {}; layoutType,
btnBuy,
spuIds
} = props.data ?? {};
const {
marginLeft,
marginRight
} = props.styles ?? {};
// //
const buyStyle = computed(() => { const buyStyle = computed(() => {
@ -229,7 +200,9 @@
* @return {Promise<undefined>} 商品列表 * @return {Promise<undefined>} 商品列表
*/ */
async function getGoodsListByIds(ids) { async function getGoodsListByIds(ids) {
const { data } = await SpuApi.getSpuListByIds(ids); const {
data
} = await SpuApi.getSpuListByIds(ids);
return data; return data;
} }
@ -246,6 +219,39 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.new-fenlei {
width: 100%;
display: flex;
margin:10px 0;
.list {
width: 24%;
&.on{
.t {
color: rgba(255, 102, 7);
}
.b {
background: rgba(255, 102, 7);
color:white;
}
}
.t {
text-align: center;
}
.b {
// background: rgba(255, 102, 7);
text-align: center;
color: rgba(153,153,153);
border-radius: 15px;
width: 63%;
margin: 0 auto;
font-size: 11px;
margin-top:5px;
}
}
}
.goods-md-wrap { .goods-md-wrap {
width: 100%; width: 100%;
} }
@ -253,11 +259,13 @@
.goods-list-box { .goods-list-box {
width: 50%; width: 50%;
box-sizing: border-box; box-sizing: border-box;
.left-list { .left-list {
&:nth-last-child(1) { &:nth-last-child(1) {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }
.right-list { .right-list {
&:nth-last-child(1) { &:nth-last-child(1) {
margin-bottom: 0 !important; margin-bottom: 0 !important;

View File

@ -0,0 +1,197 @@
<!-- 全局 - 快捷入口 -->
<template>
<view class='new_czbk'>
<view class="t">
<text class="left-font">超值爆款</text>
<view class="sub">美好生活由此开始</view>
</view>
<view class="new-list">
<view class="item" v-for="(item , index) in 4" :key="index">
<view class="nei">
<view class="l">
<view class="t">今日推荐</view>
<view class="c">店主诚意推荐品质商品</view>
<view class="b">
GO!
<image
src="https://zysc.fjptzykj.com:3000/shangcheng/0790eb9a90d70762e7663d2bf3d04d7427947b535dda1e98712e08d1628b52a0.png"
class="img" />
</view>
</view>
<view class="r">
<image
src="https://zysc.fjptzykj.com:3000/shangcheng/034b7091b1194d9c2853d7c17a0c1e59f0c6cdfebfcf8f7a732002e2784ead35.png"
class="img"></image>
</view>
</view>
</view>
<view style="clear:both;"></view>
</view>
</view>
</template>
<script setup>
import {
reactive,
computed
} from 'vue';
import sheep from '@/sheep';
import {
showMenuTools,
closeMenuTools
} from '@/sheep/hooks/useModal';
const show = computed(() => sheep.$store('modal').menu);
function onClick(item) {
closeMenuTools();
if (item.url) sheep.$router.go(item.url);
}
const list = [{
url: '/pages/index/index',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4e03230b5cb9b2bf789b67df43125af1b3cef9c2abf4d8bca8f6fa5ded16a20.png',
title: '首页',
},
{
url: '/pages/index/search',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/96a288f2a0043c8defaa37e922828b3092ba785e1c191bf18f20dbd462261f7a.png',
title: '搜索',
},
{
url: '/pages/index/user',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/227699332b8ae736e220852e60215072eb2805478dab4909e085f89aeb3604cf.png',
title: '个人中心',
},
{
url: '/pages/index/cart',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a45981116198a65db5f28ffd070f0078cfa66ac932a0136bf45ba7e8f401a1d0.png',
title: '购物车',
},
{
url: '/pages/user/goods-log',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/7e5ecfb841f2d89b778e1070ef867c17ccda48a5fea14a149f8eb1ce6aa26a87.png',
title: '浏览记录',
},
{
url: '/pages/user/goods-collect',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/9f83f4dc3cbf8b1e8e747f8dd79a260feaf65fa9ef3f2e2224015779f85119a1.png',
title: '我的收藏',
},
{
url: '/pages/chat/index',
icon: 'https://zysc.fjptzykj.com:3000/shangcheng/739f3165045b1552b71176297dab45eda2e192b976e25b1a458a8781a61b7557.png',
title: '客服',
},
];
</script>
<style lang="scss" scoped>
.new_czbk {
width: 92%;
background: rgba(255, 229, 227);
border-radius: 20px;
margin: 0 auto;
padding: 20px 10px;
margin-top: 10px;
.t {
display: flex;
align-items: center;
.left-font {
color: rgba(252, 60, 62);
font-size: 22px;
font-weight: 700;
}
.sub {
background: rgba(248, 79, 43);
color: white;
border-radius: 20px 0px 20px 0px;
padding: 0 13px;
margin-left: 10px;
}
}
.new-list {
width: 100%;
margin-top: 20px;
.item {
float: left;
width: 47.5%;
padding: 5px;
.nei {
background: white;
border-radius: 10px;
padding: 15px 10px;
display: flex;
.l {
width: 51%;
.t {}
.c {
color: rgba(153, 153, 153);
font-size: 13px;
margin: 10px 0;
}
.b {
display: flex;
align-items: center;
justify-content: space-around;
background: #329cff;
margin: 0 3px;
border-radius: 15px;
color: white;
font-weight: 700;
padding: 0px 9px;
font-style: oblique;
.img {
width: 20px;
height: 20px;
}
}
}
.r {
width: 49%;
.img {
width: 100%;
height: 100%;
}
}
}
}
}
}
@media (max-width: 435px) {
.new_czbk {
.new-list {
.item {
width: 47%;
}
}
}
}
@media (max-width: 379px) {
.new_czbk {
.new-list {
.item {
width: 46%;
}
}
}
}
</style>