diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index ac026c6..f89230c 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -125,11 +125,19 @@
}
.lvv{
background: url('https://zysc.fjptzykj.com:3000/shangcheng/ed254fe4a03c16933e608f8adeb3e700a24ec4620064746a516c10da395b9395.png') !important;
- background-size: 100% 100%;
+ background-size: 100% 100% !important;
}
.bluev{
background: url('https://zysc.fjptzykj.com:3000/shangcheng/8728b7f2de5a0d2d8a74ef0c17a275f82b265a3d8d11993ec7c424c3ad454f0b.png') !important;
- background-size: 100% 100%;
+ background-size: 100% 100% !important;
+ }
+ .pinkv{
+ background: url('https://zysc.fjptzykj.com:3000/shangcheng/b44a3035cd4f676504a7003607bfb9aa457ffe1335c12d1e26dcffb45e3bfec8.png') !important;
+ background-size: 100% 100% !important;
+ }
+ .orangev{
+ background: url('https://zysc.fjptzykj.com:3000/shangcheng/ebc89def2a0cf1db1ce6b5aec26407e24e49c85dcf81a1d1c759afe414da033f.png') !important;
+ background-size: 100% 100% !important;
}
.list-content {
position: relative;
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 4b9bac5..d612203 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -330,6 +330,14 @@
background-color:rgba(253,157,17) !important;
color:white !important;
}
+ .pinkv{
+ background-color:black !important;
+ color:white !important;
+ }
+ .orangev{
+ background-color:rgba(253,157,17) !important;
+ color:white !important;
+ }
.detail-card {
background-color: #ffff;
margin: 14rpx 20rpx;
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 0bf5f34..df71929 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -306,6 +306,14 @@
background-color:rgba(253,157,17) !important;
color:white !important;
}
+ .pinkv{
+ background-color:#ff448f !important;
+ color:white !important;
+ }
+ .orangev{
+ background-color:#fe5c2d !important;
+ color:white !important;
+ }
.disabled-btn-box[disabled] {
background-color: transparent;
}
diff --git a/pages/index/components/second-one.vue b/pages/index/components/second-one.vue
index 86b7078..9fa97f0 100644
--- a/pages/index/components/second-one.vue
+++ b/pages/index/components/second-one.vue
@@ -1,8 +1,8 @@
-
+
-
+
{{ props.data[activeMenu].name }}
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index b32ad8a..f166f02 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -65,7 +65,7 @@
{
title: '待收货',
value: '3',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c2c90f1a7bee3d1d0e933b7ab7c5b186b4dbc0adf8748ceb4e69cabcbfab136f.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/cdd41605506b625510a90ce6d8194ad4b66be37ec5bdf6a56ddcf8d9206eff40.png',
path: '/pages/order/list',
type: 'noget',
count: 'deliveredCount',
@@ -73,7 +73,7 @@
{
title: '待评价',
value: '4',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/d392c395c9aa2fa0a6d250b4bad574909945f56cb480b7a05707c4f4e7e23b19.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c2c90f1a7bee3d1d0e933b7ab7c5b186b4dbc0adf8748ceb4e69cabcbfab136f.png',
path: '/pages/order/list',
type: 'nocomment',
count: 'uncommentedCount',
@@ -81,7 +81,7 @@
{
title: '退款/售后',
value: '0',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/cdd41605506b625510a90ce6d8194ad4b66be37ec5bdf6a56ddcf8d9206eff40.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/d392c395c9aa2fa0a6d250b4bad574909945f56cb480b7a05707c4f4e7e23b19.png',
path: '/pages/order/aftersale/list',
type: 'aftersale',
count: 'afterSaleCount',
@@ -107,7 +107,7 @@
{
title: '待收货',
value: '3',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/71e01ef9cfe2c54695169248f142dd28d37b56b61fc36622b98b415b70e7b495.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6c69c4f4b1887889a0d0a5ca34a26582a8ba4f0600ae2db3ea6c76a67fcdab59.png',
path: '/pages/order/list',
type: 'noget',
count: 'deliveredCount',
@@ -115,7 +115,7 @@
{
title: '待评价',
value: '4',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/3bcf948bf269e61d0fe709836b2d36f646bfc3adbc968efc9404e41e7be6f04d.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/71e01ef9cfe2c54695169248f142dd28d37b56b61fc36622b98b415b70e7b495.png',
path: '/pages/order/list',
type: 'nocomment',
count: 'uncommentedCount',
@@ -123,7 +123,93 @@
{
title: '退款/售后',
value: '0',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6c69c4f4b1887889a0d0a5ca34a26582a8ba4f0600ae2db3ea6c76a67fcdab59.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/3bcf948bf269e61d0fe709836b2d36f646bfc3adbc968efc9404e41e7be6f04d.png',
+ path: '/pages/order/aftersale/list',
+ type: 'aftersale',
+ count: 'afterSaleCount',
+ }
+ ]
+
+ } else if (state.themeType == 'pink') {
+ orderMap.value = [{
+ title: '待付款',
+ value: '1',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f8efe1b47be8b8059469ff33fc401c1c89330409acf9ce7f979528cc3aad3441.png',
+ path: '/pages/order/list',
+ type: 'unpaid',
+ count: 'unpaidCount',
+ },
+ {
+ title: '待发货',
+ value: '2',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/ca96eec5b194101a6aec6d4088c944339b4552e01b605a8fc99a15859579b31f.png',
+ path: '/pages/order/list',
+ type: 'take',
+ count: 'undeliveredCount',
+ },
+ {
+ title: '待收货',
+ value: '3',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/74d8e6ec206bc7f33f577babd3aee0991cd57d4f4fe386bc30af0f37d11133ca.png',
+ path: '/pages/order/list',
+ type: 'noget',
+ count: 'deliveredCount',
+ },
+ {
+ title: '待评价',
+ value: '4',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/ffa9d0bfb0e2efcc213b2ff69d8da9a27bce77a6120eb338195cb1fd089147e0.png',
+ path: '/pages/order/list',
+ type: 'nocomment',
+ count: 'uncommentedCount',
+ },
+ {
+ title: '退款/售后',
+ value: '0',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/5d35ebc74ddb39d70b8c8a03d53aff9023f6f6cafec1a7e0a59f93b2379517c6.png',
+ path: '/pages/order/aftersale/list',
+ type: 'aftersale',
+ count: 'afterSaleCount',
+ }
+ ]
+
+ } else if (state.themeType == 'orange') {
+ orderMap.value = [{
+ title: '待付款',
+ value: '1',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/0dd1d348022f3a4afc393e0ca1a903039feeb9931b18903790a12b3cb4d34c80.png',
+ path: '/pages/order/list',
+ type: 'unpaid',
+ count: 'unpaidCount',
+ },
+ {
+ title: '待发货',
+ value: '2',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f7916da551b40545227bca74dde309a24c6516ba292087a4aed717cac2e499e6.png',
+ path: '/pages/order/list',
+ type: 'take',
+ count: 'undeliveredCount',
+ },
+ {
+ title: '待收货',
+ value: '3',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6168b9bfe12ffda1805880f4da75546af803565a26ae034b2604f0280f818595.png',
+ path: '/pages/order/list',
+ type: 'noget',
+ count: 'deliveredCount',
+ },
+ {
+ title: '待评价',
+ value: '4',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/837009349108b9f5fee0c490d94c070367dae5312298ddf47421f4706ae884f1.png',
+ path: '/pages/order/list',
+ type: 'nocomment',
+ count: 'uncommentedCount',
+ },
+ {
+ title: '退款/售后',
+ value: '0',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c1ae501cf8081e1402d85de5de66a63733f79f87d5599eeba98504f3246a9ef7.png',
path: '/pages/order/aftersale/list',
type: 'aftersale',
count: 'afterSaleCount',
@@ -150,7 +236,7 @@
{
title: '待收货',
value: '3',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a6bc4ea6f95aaaec8b12ce20886d2dd7e1db7b547ba1c52f8b4bebb35f3e7cf3.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/686bf80ff876ed116df99552e5649e10ed5a9cddcc7b3cd5adc641ec022366cf.png',
path: '/pages/order/list',
type: 'noget',
count: 'deliveredCount',
@@ -158,7 +244,7 @@
{
title: '待评价',
value: '4',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4f14b9cc394e0791928257174fa1b62e05a535f5556f07218f058ffc6cefe80.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a6bc4ea6f95aaaec8b12ce20886d2dd7e1db7b547ba1c52f8b4bebb35f3e7cf3.png',
path: '/pages/order/list',
type: 'nocomment',
count: 'uncommentedCount',
@@ -166,7 +252,7 @@
{
title: '退款/售后',
value: '0',
- icon: 'https://zysc.fjptzykj.com:3000/shangcheng/686bf80ff876ed116df99552e5649e10ed5a9cddcc7b3cd5adc641ec022366cf.png',
+ icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4f14b9cc394e0791928257174fa1b62e05a535f5556f07218f058ffc6cefe80.png',
path: '/pages/order/aftersale/list',
type: 'aftersale',
count: 'afterSaleCount',
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index 1e0b437..40ce53e 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -1,41 +1,34 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- {{ property.name }}
-
-
+ {
+ 'pink' : state.themeType == 'pink' && state.currentPropertyArray[property.id] === value.id,
+ },
+ {
+ 'orange' : state.themeType == 'orange' && state.currentPropertyArray[property.id] === value.id,
+ },
+ ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+ {{ value.name }}
+
+
+
+
+ 购买数量
+
+
+
+
-
-
-
-
+
+
+
+
+ .label-text {
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+
+ .buy-num-box {
+ height: 100rpx;
+ }
+
+ .spec-btn {
+ height: 60rpx;
+ min-width: 100rpx;
+ padding: 0 30rpx;
+ background: #f4f4f4;
+ border-radius: 30rpx;
+ color: #434343;
+ font-size: 26rpx;
+ margin-right: 10rpx;
+ margin-bottom: 10rpx;
+ }
+
+ .disabled-btn {
+ font-weight: 400;
+ color: #c6c6c6;
+ background: #f8f8f8;
+ }
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/sheep/components/s-tabbar/s-tabbar.vue b/sheep/components/s-tabbar/s-tabbar.vue
index 2a20fbc..5222edf 100644
--- a/sheep/components/s-tabbar/s-tabbar.vue
+++ b/sheep/components/s-tabbar/s-tabbar.vue
@@ -92,6 +92,60 @@
}
];
+ } else if (state.themeType == 'pink') {
+ Citrn.value = [{
+ text: "首页",
+ url: "/pages/index/index",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/0af8fd1f7dd91b22ce8480a4f75591d237f3a359a9d991e4eb333eda96f755fe.png"
+ },
+ {
+ text: "分类",
+ url: "/pages/index/category?id=3",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/15548546af5bd5e13ff5c69c5acab5ab0d3d0333b63d583fd0470f3d48bf4e76.png"
+ },
+ {
+ text: "购物车",
+ url: "/pages/index/cart",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/27ed7f014ba28a6c257c84c2ad6e8c73335d8e9df2076db4aedff1c5d03c66ba.png"
+ },
+ {
+ text: "我的",
+ url: "/pages/index/user",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/059277d5bfe7b44ee74cece09fbe8515f5d021f20b2a9729590265cdf893f31a.png"
+ }
+ ];
+
+ } else if (state.themeType == 'orange') {
+ Citrn.value = [{
+ text: "首页",
+ url: "/pages/index/index",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/aab810be4dea52817656ac3ae17ed418561bc4b12b4e33116cb68abaf362311f.png"
+ },
+ {
+ text: "分类",
+ url: "/pages/index/category?id=3",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/c972bdc6808b37c9c88eac52bb8feb2bf787874a64b45a5ac3e41be60dee0994.png"
+ },
+ {
+ text: "购物车",
+ url: "/pages/index/cart",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/69febc6f7f2371180ae3e11c25bf46c046bdb1b80a14f0b5df3abbea060f47ac.png"
+ },
+ {
+ text: "我的",
+ url: "/pages/index/user",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
+ activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/de40b82a64b9554092cc7c35621ce1a438bbf234e9b43567790a7b9bc1b8f618.png"
+ }
+ ];
+
} else {
Citrn.value = [{
text: "首页",
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 5f54543..933dcd6 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,9 +1,11 @@
-
+
+
+
diff --git a/sheep/scss/index.scss b/sheep/scss/index.scss
index b240d35..613f467 100644
--- a/sheep/scss/index.scss
+++ b/sheep/scss/index.scss
@@ -33,4 +33,10 @@ page {
}
.blue{
background:rgba(28,165,233) !important;
+}
+.pink{
+ background:#ff448f !important;
+}
+.orange{
+ background:#fe5c2d !important;
}
\ No newline at end of file
diff --git a/sheep/ui/su-number-box/su-number-box.vue b/sheep/ui/su-number-box/su-number-box.vue
index 47b0604..838f20c 100644
--- a/sheep/ui/su-number-box/su-number-box.vue
+++ b/sheep/ui/su-number-box/su-number-box.vue
@@ -13,6 +13,8 @@
'seckill-btn': activity === 'seckill',
'lvv' : vsl == 'lv',
'bluev' : vsl == 'blue',
+ 'pinkv' : vsl == 'pink',
+ 'orangev' : vsl == 'orange',
}"
@click="_calcValue('minus')"
>
@@ -37,6 +39,8 @@
'seckill-btn': activity === 'seckill',
'lvv' : vsl == 'lv',
'bluev' : vsl == 'blue',
+ 'pinkv' : vsl == 'pink',
+ 'orangev' : vsl == 'orange',
}"
@click="_calcValue('plus')"
>
@@ -199,6 +203,12 @@
.lvv{
color:rgba(72,204,82) !important;
}
+ .pinkv{
+ color:#ff448f !important;
+ }
+ .orangev{
+ color:#fe5c2d !important;
+ }
.uni-numbox .uni-numbox--disabled {
color: #c0c0c0 !important;
/* #ifdef H5 */
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
index 619fd9d..72e9fdb 100644
--- a/sheep/ui/su-tabbar-item/su-tabbar-item.vue
+++ b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
@@ -196,6 +196,12 @@
.bluev{
color:rgba(28,165,233) !important;
}
+ .pinkv{
+ color: #ff448f !important;
+ }
+ .orangev{
+ color: #fe5c2d !important;
+ }
.tabbar-center-item {
height: 40px;
width: 40px;
diff --git a/static/images/seckilbg.png b/static/images/seckilbg.png
deleted file mode 100644
index a49174d..0000000
Binary files a/static/images/seckilbg.png and /dev/null differ