diff --git a/pages.json b/pages.json
index fdc3184..d87cd70 100644
--- a/pages.json
+++ b/pages.json
@@ -46,6 +46,19 @@
"group": "商城"
}
},
+ {
+ "path": "pages/reservation_record/reservation_record",
+ "style": {
+ "navigationBarTitleText": "预约记录",
+ "enablePullDownRefresh": true
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "预约记录",
+ "group": "商城"
+ }
+ },
{
"path": "pages/index/user",
"style": {
@@ -763,6 +776,9 @@
},
{
"pagePath": "pages/index/user"
+ },
+ {
+ "pagePath": "pages/index/category"
}
]
}
diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index 30301cf..6268882 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -1,451 +1,608 @@
-
-
-
-
-
-
-
- 签到日历
-
- 已连续签到 {{ state.signInfo.continuousDay }} 天
-
-
-
+
+
+
+ 签到有礼
+
+
+ 我的积分
+
+
+ 26871
+
+
+
+
+
+
+ 已连续签到2天
+
+ 签到
+
+
+
+
+
+ 第1天
+
+
+
+
+
+ 10积分
+
+
+
+
+
+
+
+ 签到说明
+ 1、已累计签到{{ state.signInfo.totalDay }}天
+
+ 2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分,一定要坚持签到哦~~~
+
+
+
+
+
+
+
+
+
+
+ 签到日历
+
+ 已连续签到 {{ state.signInfo.continuousDay }} 天
+
+
+
-
-
+
+
- 第{{ item.day }}天
-
-
+ 第{{ item.day }}天
+
+
-
-
- + {{ item.point }}
-
-
-
+ ">
+
+
+ + {{ item.point }}
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
- 签到说明
- 1、已累计签到{{ state.signInfo.totalDay }}天
-
- 2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分,一定要坚持签到哦~~~
-
-
-
+
+
+ 签到说明
+ 1、已累计签到{{ state.signInfo.totalDay }}天
+
+ 2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分,一定要坚持签到哦~~~
+
+
+
-
-
-
-
-
-
- {{ state.signResult.point }} 积分
- {{ state.signResult.experience }} 经验
-
-
- 已连续打卡 {{ state.signResult.day }} 天
-
-
-
- 签到成功
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ state.signResult.point }} 积分
+ {{ state.signResult.experience }} 经验
+
+
+ 已连续打卡 {{ state.signResult.day }} 天
+
+
+
+ 签到成功
+
+
+
+
+
+
+
+ .on {
+ 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 {}
+ }
+ }
+
+
\ No newline at end of file
diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue
index 592cb74..1f2777f 100644
--- a/pages/commission/components/commission-menu.vue
+++ b/pages/commission/components/commission-menu.vue
@@ -38,7 +38,7 @@
path: '/pages/commission/team',
},
{
- img: 'https://zysc.fjptzykj.com:3000/shangcheng/ec41e4f5b45c087232aab8d088019a1e9d781b9bde0f54ddbb18e90230b83255.png',
+ img: 'https://zysc.fjptzykj.com:3000/shangcheng/228c9cd847514f99ca1181b4d413c24e482ab46459a557e3b934facb32ab546d.png',
title: '佣金明细',
path: '/pages/commission/wallet',
},
@@ -60,18 +60,18 @@
// },
// todo @芋艿:邀请海报需要登录后的个人数据
{
- img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png',
+ img: 'https://zysc.fjptzykj.com:3000/shangcheng/f238f60d6e45080cdbbd294c344d3e2fc3a30c34ccb9345e931b0c5aa9e90645.png',
title: '邀请海报',
path: 'action:showShareModal',
},
// TODO @芋艿:缺少 icon
{
- img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png',
+ img: 'https://zysc.fjptzykj.com:3000/shangcheng/d6bc7dbec1333e554a4781cbfae023e590a555dfca12784615023ae43bd2bf46.png',
title: '推广排行',
path: '/pages/commission/promoter',
},
{
- img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png',
+ img: 'https://zysc.fjptzykj.com:3000/shangcheng/4332d64835bb4aedc05636950f7cd7dcbab085f0f72f42eee4d87799947a7108.png',
title: '佣金排行',
path: '/pages/commission/commission-ranking',
},
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 93a7441..66d3423 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -75,7 +75,7 @@
-
+
@@ -94,42 +94,42 @@
:grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy"
@change="onSkuChange" @close="onSkuClose" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -616,4 +616,7 @@
top: -31px;
// z-index: 2;
}
+ .new-gonn{
+ margin-bottom: 10px;
+ }
\ No newline at end of file
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index be78f9d..233a65c 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -32,7 +32,8 @@
- {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
+ {{ state.selectedSku.marketPrice || state.goodsInfo.marketPrice }}
+
@@ -86,7 +87,8 @@
v-if="state.goodsInfo.marketPrice"
@tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
- {{ fen2yuan(state.goodsInfo.marketPrice) }}
+
+ {{state.goodsInfo.marketPrice}}
原价购买
@@ -99,7 +101,7 @@