@@ -352,11 +348,11 @@ page {
align-items: center;
padding: 10rpx 0;
}
-.wrapper {
- background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+.wrapper-box {
+ background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
background-repeat: no-repeat;
background-size: 100% 100%;
- height: 700rpx;
+ height: 506rpx;
width: 100%;
}
@@ -371,16 +367,16 @@ page {
}
}
.box1 {
- top: 750rpx;
+ top: 560rpx;
}
.box2 {
- top: 770rpx;
+ top: 580rpx;
}
.box3 {
- top: 790rpx;
+ top: 600rpx;
}
.box4 {
- top: 810rpx;
+ top: 620 rpx;
height: 200rpx;
}
.bargain-item {
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index b80f856..d553050 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -6,22 +6,7 @@
-
-
-
-
-
-
-
- {{item.goodsName}}
-
-
-
最低：￥{{item.purchasePrice | unitPrice}}
-
参与砍价
-
-
-
-
+
@@ -32,7 +17,9 @@
diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue
index eeedaad..bd0a728 100644
--- a/pages/promotion/lives.vue
+++ b/pages/promotion/lives.vue
@@ -229,7 +229,7 @@ export default {
let customParams = encodeURIComponent(
JSON.stringify({ path: "pages/index/index", pid: 1 })
); // 开发者在直播间页面路径上携带自定义参数，后续可以在分享卡片链接和跳转至商详页时获取，详见【获取自定义参数】、【直播间到商详页面携带参数】章节（上限600个字符，超过部分会被截断）
- this.$navigateTo({
+ uni.navigateTo({
url:
"plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" +
roomId +
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index c34799a..59ddfd6 100644
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -23,8 +23,8 @@
{{ item.goodsName }}
-
- {{ item.points }}积分
+
+ {{ item.points }}积分
¥{{ item.originalPrice | unitPrice }}
@@ -137,14 +137,14 @@ export default {
methods: {
// 跳转
navigateTo(url) {
- this.$navigateTo({
+ uni.navigateTo({
url,
});
},
toGoods(item) {
//跳转详情
- this.$navigateTo({
+ uni.navigateTo({
url: `/pages/promotion/point/detail?id=${item.id}`,
});
},
@@ -194,46 +194,12 @@ page {
height: 100%;
}
.tipsMkt {
- float: right;
color: #c0c4cc;
- font-size: 24rpx;
+ font-size: 24rpx !important;
text-decoration: line-through;
- margin-right: 20rpx;
+ margin-right: 20rpx !important;
}
-.header {
- background: $light-color;
- position: relative;
- color: #fff;
- display: flex;
- height: 80rpx;
- align-items: center;
- justify-content: center;
- font-size: 26rpx;
- font-size: 34rpx;
-
- .left,
- .right {
- position: absolute;
- width: max-content;
- height: max-content;
- top: 0;
- bottom: 0;
- margin: auto;
- }
-
- .left {
- float: left;
- top: 0;
- bottom: 0;
- left: 20rpx;
- }
-
- .right {
- float: right;
- right: 20rpx;
- }
-}
.index {
height: 100vh;
@@ -341,15 +307,19 @@ page {
overflow: hidden;
}
-.index-item-title-desc {
- font-size: 25rpx;
- color: #999999;
- margin-top: 10rpx;
-}
+
.index-item-price {
font-size: 28rpx;
- color: #ff5a10;
+ overflow: hidden;
+ color: $main-color;
padding: 20rpx 0 0 20rpx;
+ >.point{
+ >span{
+ font-size: 42rpx;
+ font-weight: bold;
+ margin-right:10rpx;
+ }
+ }
}
diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue
index 2f5a527..5d1566b 100644
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -1,7 +1,8 @@
-
-
-
+
+
+
@@ -14,10 +15,7 @@
-
- {{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
- {{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
-
+
@@ -39,7 +37,7 @@
getSeckillTimeGoods
} from "@/api/promotions.js";
import Foundation from "@/utils/Foundation.js";
- import goodsTemplate from '@/components/m-goods-list/seckill.vue'
+ import goodsTemplate from '@/components/m-goods-list/promotion.vue'
export default {
components: {
goodsTemplate
@@ -184,10 +182,15 @@
}
}
- .sale-head {
- image {
- width: 100%;
- height: 280rpx;
+ .header-wraper {
+ background: url('/static/bg.png');
+ height: 200rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ >image{
+ width: 300rpx;
+ height: 100rpx;
}
}
@@ -195,22 +198,8 @@
padding-top: 20rpx;
}
- .trailer {
- height: 100rpx;
- background: #ffffff;
- display: -webkit-box;
- display: -webkit-flex;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 22rpx;
- color: #666666;
- box-sizing: border-box;
- position: relative;
- z-index: 0;
- }
-
- .index-navs {
+ .index-navs {
+ background: #fff;
background-color: #f7f7f7;
display: -webkit-box;
display: -webkit-flex;
@@ -240,24 +229,26 @@
color: #bababa;
height: 115rpx;
line-height: 1em;
- position: relative;
+ position: relative;
+ font-size: 32rpx;
+ font-weight: bold;
&-active {
- background-image: url(/static/seckill/active.png);
- background-size: 100% 115rpx;
- background-repeat: no-repeat;
- color: #ffffff;
+ color: $main-color;
position: relative;
- z-index: 30;
-
+ z-index: 30;
.index-nav-desc {
- color: #ffffff;
+ color: #fff;
+ font-weight: bold;
+ background: $main-color;
+ padding: 6rpx 16rpx;
+ border-radius: 50px;
}
}
}
.index-nav-desc {
- margin-top: 8rpx;
+ margin-top: 8rpx;
font-size: 22rpx;
color: #bababa;
}
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 097c700..0842a42 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -343,7 +343,7 @@ export default {
* 跳转到店铺
*/
navigateToStore(val) {
- this.$navigateTo({
+ uni.navigateTo({
url: "/pages/product/shopPage?id=" + val.storeId,
});
},
@@ -352,7 +352,7 @@ export default {
* 跳转到优惠券
*/
navigateToConpon(val) {
- this.$navigateTo({
+ uni.navigateTo({
url: "/pages/cart/coupon/couponCenter?storeId=" + val.storeId,
});
},
@@ -361,7 +361,7 @@ export default {
* 跳转到商品
*/
navigateToGoods(val) {
- this.$navigateTo({
+ uni.navigateTo({
url:
"/pages/product/goods?id=" +
val.goodsSku.id +
@@ -437,7 +437,7 @@ export default {
* 跳转
*/
navigateTo(url) {
- this.$navigateTo({
+ uni.navigateTo({
url,
});
},
diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue
index 2eb7f92..4c7feeb 100644
--- a/pages/tabbar/category/category.vue
+++ b/pages/tabbar/category/category.vue
@@ -57,7 +57,7 @@ export default {
* 查询
*/
search() {
- this.$navigateTo({
+ uni.navigateTo({
url: "/pages/navigation/search/searchPage",
});
},
@@ -90,7 +90,7 @@ export default {
},
navigateToList(sid, tid) {
- this.$navigateTo({
+ uni.navigateTo({
url: `/pages/navigation/search/searchPage?category=${tid}`,
});
},
diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index 57e6acc..5bcc728 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -24,7 +24,9 @@
{{ item.title }}
-
￥{{ item.price | unitPrice }}
+
¥{{ formatPrice(item.price )[0] }} .{{
+ formatPrice(item.price )[1]
+ }}