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

首页积分页面实施

Browse Source
This commit is contained in:
77 2024-10-14 19:12:22 +08:00
parent a18bd4f01a
commit dd75674ff3
20 changed files with 976 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pages.json
View File

@ -46,6 +46,19 @@
"group": "商城" "group": "商城"
} }
}, },
{
"path": "pages/reservation_record/reservation_record",
"style": {
"navigationBarTitleText": "预约记录",
"enablePullDownRefresh": true
},
"meta": {
"auth": false,
"sync": true,
"title": "预约记录",
"group": "商城"
}
},
{ {
"path": "pages/index/user", "path": "pages/index/user",
"style": { "style": {
@ -763,6 +776,9 @@
}, },
{ {
"pagePath": "pages/index/user" "pagePath": "pages/index/user"
},
{
"pagePath": "pages/index/category"
} }
] ]
} }

205
pages/app/sign.vue
View File

@ -1,6 +1,53 @@
<!-- 签到界面 --> <!-- 签到界面 -->
<template> <template>
<s-layout title="签到有礼"> <s-layout title="签到有礼">
<view class="new-bg">
<image class="new-qdyl"
src="https://zysc.fjptzykj.com:3000/shangcheng/56024e3b60810cc781cbed30ebfe4568a8b721dae5e15aab848f760574558843.png">
</image>
<view class="new-title">签到有礼</view>
<view class="new-left-title">
<view class="top">
我的积分
</view>
<view class="bottom">
26871
</view>
</view>
</view>
<view class="new-main">
<view class="sign-list">
<view class="new-top">
<view class="left">已连续签到<span class="number">2</span>天</view>
<view class="right">
签到
</view>
</view>
<view class="new-bottom">
<view class="new-list" v-for=" o in 6">
<view class="t">
第1天
</view>
<view class="c">
<image class="img" src="https://zysc.fjptzykj.com:3000/shangcheng/d1dd98b6a37ea9ea90c49898024d3669a54ee2a48f028b671609937b6b1250af.png"></image>
</view>
<view class="b">
10积分
</view>
</view>
</view>
</view>
<!-- 签到说明 -->
<view class="new-qdsm">
<view class="t">签到说明</view>
<view class="tt">1、已累计签到{{ state.signInfo.totalDay }}天</view>
<view class="tt">
2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分，一定要坚持签到哦~~~
</view>
</view>
</view>
<s-empty v-if="state.loading" icon="/static/data-empty.png" text="签到活动还未开始" /> <s-empty v-if="state.loading" icon="/static/data-empty.png" text="签到活动还未开始" />
<view v-if="state.loading" /> <view v-if="state.loading" />
<view class="sign-wrap" v-else-if="!state.loading"> <view class="sign-wrap" v-else-if="!state.loading">
@ -12,34 +59,26 @@
已连续签到 <text class="sign-num">{{ state.signInfo.continuousDay }}</text> 天 已连续签到 <text class="sign-num">{{ state.signInfo.continuousDay }}</text> 天
</view> </view>
</view> </view>
<view <view class="list acea-row row-between-wrapper" style="
class="list acea-row row-between-wrapper"
style="
padding: 0 30rpx; padding: 0 30rpx;
height: 240rpx; height: 240rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
" ">
>
<view class="item" v-for="(item, index) in state.signConfigList" :key="index"> <view class="item" v-for="(item, index) in state.signConfigList" :key="index">
<view <view :class="
:class="
(index === state.signConfigList.length ? 'reward' : '') + (index === state.signConfigList.length ? 'reward' : '') +
' ' + ' ' +
(state.signInfo.continuousDay >= item.day ? 'rewardTxt' : '') (state.signInfo.continuousDay >= item.day ? 'rewardTxt' : '')
" ">
>
第{{ item.day }}天 第{{ item.day }}天
</view> </view>
<view <view class="venus" :class="
class="venus"
:class="
(index + 1 === state.signConfigList.length ? 'reward' : '') + (index + 1 === state.signConfigList.length ? 'reward' : '') +
' ' + ' ' +
(state.signInfo.continuousDay >= item.day ? 'venusSelect' : '') (state.signInfo.continuousDay >= item.day ? 'venusSelect' : '')
" ">
>
</view> </view>
<view class="num" :class="state.signInfo.continuousDay >= item.day ? 'on' : ''"> <view class="num" :class="state.signInfo.continuousDay >= item.day ? 'on' : ''">
+ {{ item.point }} + {{ item.point }}
@ -50,11 +89,7 @@
<!-- 签到按钮 --> <!-- 签到按钮 -->
<view class="myDateTable"> <view class="myDateTable">
<view class="ss-flex ss-col-center ss-row-center sign-box ss-m-y-40"> <view class="ss-flex ss-col-center ss-row-center sign-box ss-m-y-40">
<button <button class="ss-reset-button sign-btn" v-if="!state.signInfo.todaySignIn" @tap="onSign">
class="ss-reset-button sign-btn"
v-if="!state.signInfo.todaySignIn"
@tap="onSign"
>
签到 签到
</button> </button>
<button class="ss-reset-button already-btn" v-else disabled> 已签到 </button> <button class="ss-reset-button already-btn" v-else disabled> 已签到 </button>
@ -98,8 +133,12 @@
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { onReady } from '@dcloudio/uni-app'; import {
import { reactive } from 'vue'; onReady
} from '@dcloudio/uni-app';
import {
reactive
} from 'vue';
import SignInApi from '@/sheep/api/member/signin'; import SignInApi from '@/sheep/api/member/signin';
const headerBg = sheep.$url.css('/static/img/shop/app/sign.png'); const headerBg = sheep.$url.css('/static/img/shop/app/sign.png');
@ -118,7 +157,10 @@
// 发起签到 // 发起签到
async function onSign() { async function onSign() {
const { code, data } = await SignInApi.createSignInRecord(); const {
code,
data
} = await SignInApi.createSignInRecord();
if (code !== 0) { if (code !== 0) {
return; return;
} }
@ -135,7 +177,10 @@
// 获得个人签到统计 // 获得个人签到统计
async function getSignInfo() { async function getSignInfo() {
const { code, data } = await SignInApi.getSignInRecordSummary(); const {
code,
data
} = await SignInApi.getSignInRecordSummary();
if (code !== 0) { if (code !== 0) {
return; return;
} }
@ -145,7 +190,10 @@
// 获取签到配置 // 获取签到配置
async function getSignConfigList() { async function getSignConfigList() {
const { code, data } = await SignInApi.getSignInConfigList(); const {
code,
data
} = await SignInApi.getSignInConfigList();
if (code !== 0) { if (code !== 0) {
return; return;
} }
@ -448,4 +496,113 @@
.on { .on {
background-color: #999 !important; background-color: #999 !important;
} }
.new-bg {
position: relative;
.new-qdyl {
width: 100%;
}
.new-title {
color: white;
font-size: 20px;
position: absolute;
top: 26px;
left: 50%;
transform: translateX(-50%);
}
.new-left-title {
position: absolute;
bottom: 69px;
left: 20px;
.top {
color: white;
}
.bottom {
color: white;
font-size: 38px;
font-weight: 700;
}
}
}
.new-main{
top:-57px;
position:relative;
.sign-list {
width: 80%;
margin: 0 auto;
padding: 20px;
background: white;
border-radius: 18px;
.new-top {
display:flex;
justify-content: space-between;
margin-bottom:10px;
.left {
color:rgba(35,24,21,1);
font-size:25px;
font-weight:700;
.number{
color:rgba(255,110,16);
margin: 0 5px;
}
}
.right {
padding:5px 10px;
color:white;
font-size:20px;
background:rgba(255,139,43);
width: 62px;
border-radius: 20px;
text-align: center;
}
}
.new-bottom {
display:flex;
flex-wrap:wrap;
.new-list {
padding:5px 5px;
background: rgba(255,247,239);
width:33%;
border-radius:12px;
.t {
width:100%;
color:black;
text-align:center;
}
.c {
width:100%;
margin:5px 0;
.img{
width:50px;
height:50px;
display:block;
margin:0 auto;
}
}
.b {
width:100%;
color:rgba(176,144,122);
text-align:center;
}
}
}
}
.new-qdsm {
.t {}
.tt {}
}
}
</style> </style>

8
pages/commission/components/commission-menu.vue
View File

@ -38,7 +38,7 @@
path: '/pages/commission/team', path: '/pages/commission/team',
}, },
{ {
img: 'https://zysc.fjptzykj.com:3000/shangcheng/ec41e4f5b45c087232aab8d088019a1e9d781b9bde0f54ddbb18e90230b83255.png', img: 'https://zysc.fjptzykj.com:3000/shangcheng/228c9cd847514f99ca1181b4d413c24e482ab46459a557e3b934facb32ab546d.png',
title: '佣金明细', title: '佣金明细',
path: '/pages/commission/wallet', path: '/pages/commission/wallet',
}, },
@ -60,18 +60,18 @@
// }, // },
// todo @芋艿：邀请海报需要登录后的个人数据 // todo @芋艿：邀请海报需要登录后的个人数据
{ {
img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', img: 'https://zysc.fjptzykj.com:3000/shangcheng/f238f60d6e45080cdbbd294c344d3e2fc3a30c34ccb9345e931b0c5aa9e90645.png',
title: '邀请海报', title: '邀请海报',
path: 'action:showShareModal', path: 'action:showShareModal',
}, },
// TODO @芋艿：缺少 icon // TODO @芋艿：缺少 icon
{ {
img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', img: 'https://zysc.fjptzykj.com:3000/shangcheng/d6bc7dbec1333e554a4781cbfae023e590a555dfca12784615023ae43bd2bf46.png',
title: '推广排行', title: '推广排行',
path: '/pages/commission/promoter', path: '/pages/commission/promoter',
}, },
{ {
img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', img: 'https://zysc.fjptzykj.com:3000/shangcheng/4332d64835bb4aedc05636950f7cd7dcbab085f0f72f42eee4d87799947a7108.png',
title: '佣金排行', title: '佣金排行',
path: '/pages/commission/commission-ranking', path: '/pages/commission/commission-ranking',
}, },

11
pages/goods/groupon.vue
View File

@ -75,7 +75,7 @@
</view> </view>
<!-- 功能卡片 --> <!-- 功能卡片 -->
<view class=" new-detail-card detail-cell-card detail-card ss-flex-col"> <view class="new-gonn new-detail-card detail-cell-card detail-card ss-flex-col">
<!-- 规格 --> <!-- 规格 -->
<detail-cell-sku :sku="state.selectedSkuPrice" @tap="state.showSelectSku = true" /> <detail-cell-sku :sku="state.selectedSkuPrice" @tap="state.showSelectSku = true" />
</view> </view>
@ -94,8 +94,6 @@
:grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy" :grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy"
@change="onSkuChange" @close="onSkuClose" /> @change="onSkuChange" @close="onSkuClose" />
</view> </view>
</view>
<view class="new-bottom"> <view class="new-bottom">
<!-- 评价 --> <!-- 评价 -->
<detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" /> <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
@ -115,7 +113,7 @@
state.activity.status === 0 && state.goodsInfo.stock !== 0 state.activity.status === 0 && state.goodsInfo.stock !== 0
? 'check-btn-box' ? 'check-btn-box'
: 'disabled-btn-box' : 'disabled-btn-box'
" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0 || state.activity.remainingPurchases == 0""> " :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0 || state.activity.remainingPurchases == 0">
<view class="btn-price">{{ <view class="btn-price">{{
fen2yuan(state.activity.price || state.goodsInfo.price) fen2yuan(state.activity.price || state.goodsInfo.price)
}}</view> }}</view>
@ -130,6 +128,8 @@
</detail-tabbar> </detail-tabbar>
</view> </view>
</view>
</block> </block>
</s-layout> </s-layout>
</template> </template>
@ -616,4 +616,7 @@
top: -31px; top: -31px;
// z-index: 2; // z-index: 2;
} }
.new-gonn{
margin-bottom: 10px;
}
</style> </style>

8
pages/goods/seckill.vue
View File

@ -32,7 +32,8 @@
<view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice"> <view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice">
<view class="origin-price-text"> <view class="origin-price-text">
{{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }} {{ state.selectedSku.marketPrice || state.goodsInfo.marketPrice }}
<!-- {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }} -->
</view> </view>
</view> </view>
</view> </view>
@ -86,7 +87,8 @@
v-if="state.goodsInfo.marketPrice" v-if="state.goodsInfo.marketPrice"
@tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"> @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
<view> <view>
<view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view> <!-- <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view> -->
<view class="btn-price">{{state.goodsInfo.marketPrice}}</view>
<view>原价购买</view> <view>原价购买</view>
</view> </view>
</button> </button>
@ -99,7 +101,7 @@
</button> </button>
<button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true" <button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true"
:class=" :class="
timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0 timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0 && activity.remainingPurchases != 0
? 'check-btn-box' ? 'check-btn-box'
: 'disabled-btn-box' : 'disabled-btn-box'
" :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED || activity.remainingPurchases == 0"> " :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED || activity.remainingPurchases == 0">

13
pages/index/user.vue
View File

@ -3,8 +3,7 @@
<s-layout title="个人中心" tabbar="/pages/index/user" navbar="normal" :bgStyle="template.page" <s-layout title="个人中心" tabbar="/pages/index/user" navbar="normal" :bgStyle="template.page"
:navbarStyle="template.navigationBar" onShareAppMessage> :navbarStyle="template.navigationBar" onShareAppMessage>
<image class="seckill" src="@/static/images/seckilbg.png"></image> <s-block class="" v-for="(item, index) in template.components" :key="index" :styles="item.id != 'UserCard' ? item.property.style: ''">
<s-block class="" v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
<s-block-item :type="item.id" :data="item.property" :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>
@ -42,22 +41,18 @@
</script> </script>
<style> <style>
.new-main{ .new-main {}
}
.seckill1 { .seckill1 {
position: absolute; position: absolute;
top: 117px; /* top: 117px; */
z-index: 22; z-index: 22;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 94%; width: 94%;
} }
.seckill {
width: 100%;
position: absolute;
}
view { view {
position: relative; position: relative;

4
pages/order/confirm.vue
View File

@ -51,7 +51,7 @@
class="score-img" class="score-img"
/> />
<text class="item-value ss-m-r-24"> <text class="item-value ss-m-r-24">
{{ state.orderInfo.usedPoint }} {{ state.orderInfo.usePoint }}
</text> </text>
</view> </view>
</view> </view>
@ -69,7 +69,7 @@
<text class="item-value ss-m-r-24"> <text class="item-value ss-m-r-24">
{{ {{
state.pointStatus || state.orderPayload.pointActivityId state.pointStatus || state.orderPayload.pointActivityId
? state.orderInfo.totalPoint - state.orderInfo.usedPoint ? state.orderInfo.totalPoint - state.orderInfo.usePoint
: state.orderInfo.totalPoint || 0 : state.orderInfo.totalPoint || 0
}} }}
</text> </text>

211
pages/reservation_record/reservation_record.vue Normal file
View File

@ -0,0 +1,211 @@
<template>
<s-layout title="预约记录" :bgStyle="{ color: '#fff' }">
<view class="container">
<!-- <view class="health_title">
<image class="health_title_img" ></image>
<view class="health-title-title">预约记录</view>
</view> -->
<view class="cards">
<view class="card" v-for="(item, index) in reservationList" :key="index">
<view class="card-content">
<text class="type" >预约类型：{{ item.typeName }}</text>
<!-- <text class="type" v-if="item.type===1">预约类型：教培预约</text> -->
<text class="time">预约时间：{{ item.reAddTime }}</text>
</view>
<view style="height: 1px; background-color: #e8e8e8;margin:7px 0px 7px 0px"></view>
<!-- <view class="card-contentinfo">
<text class="time">预约时间：{{ item.reAddTime }}</text>
</view> -->
<view>
<text class="address">医生：{{ item.technicianName }}</text><br><br>
<text class="address">医馆：{{ item.brandName }}</text><br><br>
<text class="address">医馆电话：{{ item.brandphone }}</text><br><br>
<div class="address-container">
<text class="address">医馆地址：{{ item.brandaddress }}</text><br><br>
</div>
<text class="address">备注：{{ item.remark }}</text><br><br>
</view>
<view>
<text class="status" style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;" v-if=" item.reStatus===0">待审核</text>
<text class="status" style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;" v-if=" item.reStatus===1">预约成功</text>
<text class="status" style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;" v-if=" item.reStatus===2">已完结</text><br><br>
</view>
</view>
</view>
</view>
</s-layout>
</template>
<script>
import request from '@/sheep/request';
import { computed } from 'vue';
import sheep from '@/sheep';
import {
baseUrl,
apiPath
} from '@/sheep/config';
export default {
data() {
return {
memberId:null,
reservationList: [],
page: 1,
limit: 10,
totalPages: 1,
};
},
created() {
this.memberId=computed(() => sheep.$store('user').userInfo).value.id
this.getList();
},
methods: {
getList() {
request({
url: `${baseUrl}${apiPath}/h5/reservation/list`,
method: 'GET',
params:{
userId:this.memberId,
},
custom: {
showLoading: false,
},
}).then((res) => {
this.reservationList = res.data.list
});
// uni.request({
// url: `${baseUrl}${apiPath}/h5/reservation/list`, // 接口地址
// data: {
// userId:this.memberId,
// },
// success: (res) => {
// console.log(res.data);
// this.reservationList = res.data.rows
// },
// fail: (error) => {
// console.log(error)
// }
// })
},
}
};
</script>
<style scoped>
.address-container {
display: flex;
align-items: center;
}
.container {
display: flex;
flex-direction: column;
/* align-items: center; */
background-color: #f5f5f5;
padding: 10px;
}
.header {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.title {
font-size: 24px;
font-weight: bold;
color: #333;
}
.cards {
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-around;
margin-top: 0px;
}
.card {
/* width: calc(50% - 10px); */
width: 100%;
background-color: #fff;
border-radius: 10px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
margin-bottom: 20px;
padding: 10px;
}
.card-content {
display: flex;
justify-content: space-between;
}
.card-contentinfo {
margin-top: 20px;
text-align: center;
/* display: flex;
justify-content: space-between; */
}
.card-image {
width: 50px;
height: 50px;
border-radius: 25px;
}
.technician {
margin-left: 20%;
}
.hospital,
.technician,
.type{
margin-left: 20px;
font-size: 15px;
color: #161616;
font-weight: bold;
}
.status {
font-size: 15px;
color: #666;
}
.address{
margin: 20px 0px 0px 20px ;
font-size: 15px;
color: #666;
}
.health-list {
background-color: #FFFFFF;
height: 100%;
width: 98%;
margin: 5PX;
padding-left: 15px;
padding-top: 10px;
/* padding: 10px; */
border-radius: 12px;
}
.health_title {
padding: 5px;
}
.health_title_img {
float: left;
width: 40px;
height: 40px;
}
.health-title-title {
float: none;
font-size: 18px;
font-weight: bold;
margin-top: 10px;
margin-left: 10px;
}
.time {
/* margin-top: 20px; */
font-size: 15px;
color: #5e5e5e;
}
</style>

48
pages/subscribe/subscribe.vue
View File

@ -22,7 +22,7 @@
<text class="clinic-select-label">医馆选择</text> <text class="clinic-select-label">医馆选择</text>
<picker mode="selector" :range="brandNameList" @change="onClinicChange"> <picker mode="selector" :range="brandNameList" @change="onClinicChange">
<view class="clinic-select-value"> <view class="clinic-select-value">
<text>{{ brandList.list[selectedClinicIndex].name}}</text> <text>{{ ll}}</text>
</view> </view>
</picker> </picker>
</view> </view>
@ -30,7 +30,7 @@
<text class="clinic-select-label">预约类型</text> <text class="clinic-select-label">预约类型</text>
<picker mode="selector" :range="typenameList" @change="ontype"> <picker mode="selector" :range="typenameList" @change="ontype">
<view class="clinic-select-value"> <view class="clinic-select-value">
<text>{{ typeList[selecttypeIndex].label}}</text> <text>{{ gg }}</text>
</view> </view>
</picker> </picker>
</view> </view>
@ -190,6 +190,8 @@
selecttypeIndex: 0, selecttypeIndex: 0,
techid: 0, techid: 0,
type: 0, type: 0,
ll:'请选择',
gg:'请选择'
}; };
}, },
created() { created() {
@ -210,14 +212,16 @@
this.brandName = this.brandList.list[selectedClinicIndex].name this.brandName = this.brandList.list[selectedClinicIndex].name
this.brandId = this.brandList.list[selectedClinicIndex].id this.brandId = this.brandList.list[selectedClinicIndex].id
console.log("dddddddddddd") console.log("dddddddddddd")
this.ll = this.brandList.list[selectedClinicIndex].name
this.technicianList(); this.technicianList();
}, },
ontype(event) { ontype(event) {
const selecttypeIndex = event.detail.value; const selecttypeIndex = event.detail.value;
this.selecttypeIndex = selecttypeIndex; this.selecttypeIndex = selecttypeIndex;
this.typename = this.typeList[selecttypeIndex].dictValue this.typename = this.typeList[selecttypeIndex].dictValue
this.type = this.typeList[selecttypeIndex].dictValue this.type = this.typeList[selecttypeIndex].value
console.log(this.selecttypeIndex) console.log(this.type,"this.type")
this.gg = this.typeList[selecttypeIndex].label
this.technicianList(); this.technicianList();
}, },
// 查询医馆列表 // 查询医馆列表
@ -435,7 +439,7 @@
this.memberId = computed(() => sheep.$store('user').userInfo).value.id this.memberId = computed(() => sheep.$store('user').userInfo).value.id
if (!this.memberId) { if (!this.memberId) {
if (sheep.$platform.name === 'WechatMiniProgram') { if (sheep.$platform.name === 'WechatMiniProgram') {
showAuthModal('wechatMiniLogin') // showAuthModal('wechatMiniLogin')
return; return;
} }
showAuthModal('accountLogin') showAuthModal('accountLogin')
@ -451,7 +455,7 @@
sheep.$helper.toast('请选择预约时间段') sheep.$helper.toast('请选择预约时间段')
} else if (this.memberId) { } else if (this.memberId) {
request({ request({
url: `${baseUrl}/app-api/h5/reservation`, url: `${baseUrl}/app-api/h5/reservation/add`,
method: 'post', method: 'post',
params: { params: {
type: this.type, type: this.type,
@ -481,39 +485,7 @@
} }
}); });
}); });
// uni.request({
// method: "post",
// url: `${baseUrl}/app-api/h5/reservation`,
// data: {
// type: this.type,
// brandId: this.brandId,
// technicianId: this.techid,
// reAddTime: this.addDate,
// hsstr: this.hsstr,
// userId: this.memberId,
// },
// success: (res) => {
// uni.showModal({
// title: '预约提示',
// content: '预约成功！',
// success: function(res) {
// if (res.confirm) {
// uni.switchTab({
// url: '/pages/index/user'
// });
// } else {
// uni.switchTab({
// url: '/pages/index/user'
// });
// }
// }
// });
// },
// fail: (error) => {
// console.log(error)
// }
// })
} }
} }

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

@ -48,12 +48,10 @@
<s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" /> <s-coupon-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'">
<view class="addClass" v-for="(item, index) in state.model" @click="path(item.id)"> <view class="addClass" v-for="(item, index) in state.model" @click="path(item.id)">
<view class="image"> <view class="image">
<image <image :src="item.picUrl" alt="" />
:src="item.picUrl"
alt="" />
</view> </view>
<view class="text"> <view class="text">
<view class="top"> <view class="top">
@ -68,15 +66,12 @@
<!-- 用户组件：用户卡片 --> <!-- 用户组件：用户卡片 -->
<s-user-card v-if="type === 'UserCard'" /> <s-user-card v-if="type === 'UserCard'" />
<view v-if="type === 'UserOrder'" class="new-huiy" <view v-if="type === 'UserOrder'" class="new-huiy" @click="
@click="
sheep.$router.go('/pages/user/user_vip/index') sheep.$router.go('/pages/user/user_vip/index')
" ">
>
<view class="new-button">立即开通</view> <view class="new-button">立即开通</view>
<img class="seckill1" mode="aspectFit" <image class="seckill1" mode="aspectFit"
src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" />
/>
</view> </view>
<!-- 用户组件：用户订单 --> <!-- 用户组件：用户订单 -->
<s-order-card v-if="type === 'UserOrder'" :data="data" /> <s-order-card v-if="type === 'UserOrder'" :data="data" />
@ -89,14 +84,21 @@
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { ref, reactive, unref } from 'vue'; import {
ref,
reactive,
unref
} from 'vue';
import AddressApi from '@/sheep/api/member/address'; import AddressApi from '@/sheep/api/member/address';
const state = reactive({ const state = reactive({
model: [], model: [],
}); });
const ff = async (id) => { const ff = async (id) => {
let { code, data } = await AddressApi.textList(); let {
code,
data
} = await AddressApi.textList();
state.model = data; state.model = data;
} }
@ -125,35 +127,37 @@
url: `/pages/mulu/mulu?id=${id}` url: `/pages/mulu/mulu?id=${id}`
}); });
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
:deep(.uni-border-bottom){ :deep(.uni-border-bottom) {
height:0; height: 0;
} }
.new-huiy{
width:100%; .new-huiy {
height:100px; width: 100%;
.new-button{ height: 89px;
background:white; z-index: 9999999999999;
padding:4px 8px;
text-align:center; .new-button {
background: white;
padding: 4px 8px;
text-align: center;
position: absolute; position: absolute;
border-radius: 20px; border-radius: 20px;
right: 29px; right: 29px;
top: 37px; top: 37px;
font-size:14px; font-size: 14px;
color: rgba(148, 109, 45, 1); color: rgba(148, 109, 45, 1);
z-index: 33; z-index: 33;
} }
.seckill1{
.seckill1 {
height: 100px;
position: absolute; position: absolute;
top: -71px;
z-index: 22; z-index: 22;
/* left: 50%; */ left: 50%;
/* transform: translateX(-50%); */ transform: translateX(-50%);
width: 94%; width: 94%;
} }
} }
@ -161,12 +165,14 @@
.floxt { .floxt {
width: 100%; width: 100%;
.addClass { .addClass {
background:white; background: white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
margin:20rpx 0; margin: 20rpx 0;
// padding: 40rpx; // padding: 40rpx;
// padding-right: 0; // padding-right: 0;
// height: 200rpx; // height: 200rpx;
@ -174,8 +180,9 @@
width: 250rpx; width: 250rpx;
height: 156rpx; height: 156rpx;
margin-right: 18rpx; margin-right: 18rpx;
padding:20rpx 20rpx; padding: 20rpx 20rpx;
image{
image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@ -185,11 +192,12 @@
display: flex; display: flex;
width: 100%; width: 100%;
// text-align: center; // text-align: center;
padding:20rpx 20rpx; padding: 20rpx 20rpx;
flex:1; flex: 1;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.bottom{
.bottom {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
} }

2
sheep/components/s-goods-column/s-goods-column.vue
View File

@ -614,7 +614,7 @@
} }
.price-unit { .price-unit {
margin-right: -4px; margin-right: 0px;
} }
.sales-text { .sales-text {

4
sheep/components/s-groupon-block/s-groupon-block.vue
View File

@ -64,7 +64,7 @@
</view> </view>
</view> --> </view> -->
<view v-if="'threeCol' === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" <view v-if="'threeCol' === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap new-ll"
:style="[{ margin: '-' + data.space + 'rpx' }]"> :style="[{ margin: '-' + data.space + 'rpx' }]">
<!-- productList --> <!-- productList -->
<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[ <view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[
@ -225,7 +225,7 @@
.new-class { .new-class {
background: white; background: white;
border-radius: 8px; border-radius: 13px;
} }
:deep(.sm-goods-card) { :deep(.sm-goods-card) {

30
sheep/components/s-menu-grid/s-menu-grid.vue
View File

@ -1,18 +1,11 @@
<!-- 装修基础组件：宫格导航 --> <!-- 装修基础组件：宫格导航 -->
<template> <template>
<uni-grid :showBorder="Boolean(data.border)" :column="data.column"> <uni-grid :showBorder="Boolean(data.border)" :column="data.column">
<uni-grid-item <uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
v-for="(item, index) in data.list"
:key="index"
@tap="sheep.$router.go(item.url)"
>
<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center"> <view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
<view class="img-box"> <view class="img-box">
<view <view class="tag-box" v-if="item.badge.show"
class="tag-box" :style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
v-if="item.badge.show"
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
>
{{ item.badge.text }} {{ item.badge.text }}
</view> </view>
<image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image> <image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image>
@ -37,7 +30,7 @@
const props = defineProps({ const props = defineProps({
data: { data: {
type: Object, type: Object,
default() {}, default () {},
}, },
}); });
</script> </script>
@ -47,15 +40,18 @@
width: 45px; width: 45px;
height: 45px; height: 45px;
} }
.grid-item-box { .grid-item-box {
flex: 1; // flex: 1;
display: flex; // display: flex;
flex-direction: column; // flex-direction: column;
align-items: center; // align-items: center;
justify-content: center; // justify-content: center;
height: 100%; // height: 100%;
.img-box { .img-box {
position: relative; position: relative;
.tag-box { .tag-box {
position: absolute; position: absolute;
z-index: 2; z-index: 2;

3
sheep/components/s-notice-block/s-notice-block.vue
View File

@ -32,7 +32,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.notice-wrap { .notice-wrap {
.icon-img { .icon-img {
height: 56rpx; width: 80px !important;
height: 20px;
} }
} }
</style> </style>

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

@ -1,6 +1,6 @@
<!-- 装修用户组件：用户订单 --> <!-- 装修用户组件：用户订单 -->
<template> <template>
<view style="background:white;"> <view style="background:white;border-radius: 9px;">
<view class="title"> <view class="title">
<span>订单中心</span> <span>订单中心</span>
<view class="ff"> <view class="ff">

4
sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
View File

@ -34,12 +34,12 @@
￥{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }} ￥{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
</view> </view>
<!-- 秒杀价格标签 --> <!-- 秒杀价格标签 -->
<view class="tig ss-flex ss-col-center"> <!-- <view class="tig ss-flex ss-col-center">
<view class="tig-icon ss-flex ss-col-center ss-row-center"> <view class="tig-icon ss-flex ss-col-center ss-row-center">
<text class="cicon-alarm"></text> <text class="cicon-alarm"></text>
</view> </view>
<view class="tig-title">秒杀价</view> <view class="tig-title">秒杀价</view>
</view> </view> -->
<!-- 库存 --> <!-- 库存 -->
<view class="stock-text ss-m-l-20"> <view class="stock-text ss-m-l-20">
库存{{ state.selectedSku.stock || state.goodsInfo.stock }}件 库存{{ state.selectedSku.stock || state.goodsInfo.stock }}件

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

@ -1,6 +1,7 @@
<!-- 装修用户组件：用户卡片 --> <!-- 装修用户组件：用户卡片 -->
<template> <template>
<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;margin-top: 23px;"> <view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;">
<image class="seckill" src="@/static/images/seckilbg.png"></image>
<view class="ss-flex ss-col-center ss-row-between "> <view class="ss-flex ss-col-center ss-row-between ">
<view class="left-box ss-flex ss-col-center ss-m-l-36"> <view class="left-box ss-flex ss-col-center ss-m-l-36">
<view class="avatar-box ss-m-r-24"> <view class="avatar-box ss-m-r-24">
@ -179,4 +180,12 @@
color: #ffffff; color: #ffffff;
} }
} }
.seckill {
width: 100%;
position: absolute;
top:0;
left:0;
height:217px;
z-index:0;
}
</style> </style>

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

@ -1,6 +1,6 @@
<!-- 装修用户组件：用户资产 --> <!-- 装修用户组件：用户资产 -->
<template> <template>
<view class="ss-wallet-menu-wrap ss-flex ss-col-center" style="z-index: 9999;"> <view class="ss-wallet-menu-wrap ss-flex ss-col-center" style="z-index: 9999; margin-top: 17px;position: relative;">
<view <view
class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/money')" @tap="sheep.$router.go('/pages/user/wallet/money')"

BIN
static/images/seckilbg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 82 KiB