diff --git a/assets/css/style.less b/assets/css/style.less
index ff21dad..4d7c31d 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -4454,7 +4454,7 @@ page {
}
.bargain .header .time {
- background-image: url('https://h5.yixiang.co/static/images/time.png');
+ //background-image: url('https://h5.yixiang.co/static/images/time.png');
background-repeat: no-repeat;
background-size: 100% 100%;
width: 4.4*100rpx;
@@ -4596,7 +4596,7 @@ page {
.bargain .wrapper .lock,
.bargain .bargainGang .lock,
.bargain .goodsDetails .lock {
- background-image: url('https://h5.yixiang.co/static/images/lock.png');
+ //background-image: url('https://h5.yixiang.co/static/images/lock.png');
background-repeat: no-repeat;
background-size: 100% 100%;
width: 5.48*100rpx;
diff --git a/components/Menu.vue b/components/Menu.vue
index 998b82d..e64690d 100644
--- a/components/Menu.vue
+++ b/components/Menu.vue
@@ -13,8 +13,8 @@
diff --git a/components/ShoproLiveCard.vue b/components/ShopLiveCard.vue
similarity index 88%
rename from components/ShoproLiveCard.vue
rename to components/ShopLiveCard.vue
index 5b869e5..1cc4236 100644
--- a/components/ShoproLiveCard.vue
+++ b/components/ShopLiveCard.vue
@@ -7,7 +7,7 @@
{{ liveStatus[detail.liveStatus].title }}
{{ detail.name }}
-
+
@@ -44,37 +44,37 @@
// #endif
let timer = null;
export default {
- name: 'shoproLiveCard',
+ name: 'shopLiveCard',
components: {},
data() {
return {
liveStatus: {
'101': {
- img: 'http://shopro.7wpp.com/imgs/live/live.png',
+ img: 'https://wx.yixiang.co/static/images/live.png',
title: '直播中'
},
'102': {
- img: 'http://shopro.7wpp.com/imgs/live/prevue.png',
+ img: 'https://wx.yixiang.co/static/images/prevue.png',
title: '未开始'
},
'103': {
- img: 'http://shopro.7wpp.com/imgs/live/playback.png',
+ img: 'https://wx.yixiang.co/static/images/playback.png',
title: '已结束'
},
'104': {
- img: 'http://shopro.7wpp.com/imgs/live/104.png',
+ img: 'https://wx.yixiang.co/static/images/104.png',
title: '禁播'
},
'105': {
- img: 'http://shopro.7wpp.com/imgs/live/105.png',
+ img: 'https://wx.yixiang.co/static/images/105.png',
title: '暂停中'
},
'106': {
- img: 'http://shopro.7wpp.com/imgs/live/106.png',
+ img: 'https://wx.yixiang.co/static/images/106.png',
title: '异常'
},
'107': {
- img: 'http://shopro.7wpp.com/imgs/live/past.png',
+ img: 'https://wx.yixiang.co/static/images/past.png',
title: '已过期'
}
}
diff --git a/components/sh-adv.vue b/components/sh-adv.vue
index 4cb599e..1b8bc14 100644
--- a/components/sh-adv.vue
+++ b/components/sh-adv.vue
@@ -83,19 +83,19 @@
return {
detail: {
"list": [{
- "image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png",
+ "image": "https:\/\/wx.yixiang.co\/static\/images\/index001.png",
"name": "",
"path": "/pages/user/coupon/GetCoupon/index",
"path_name": "优惠券",
"path_type": 1
}, {
- "image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/cddb5d90a4241f6235d16368534bc730.png",
+ "image": "https:\/\/wx.yixiang.co\/static\/images\/index002.png",
"name": "",
"path": "/pages/shop/GoodsList/index",
"path_name": "商品",
"path_type": 1
}, {
- "image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/e047d312fb5930de972ae288b9b3bae7.png",
+ "image": "https:\/\/wx.yixiang.co\/static\/images\/index003.png",
"name": "",
"path": "/pages/user/signIn/Integral/index",
"path_name": "积分",
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 8f17eff..bfc81e7 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -206,7 +206,7 @@
bargainSumCount: 0, //砍价成功人数
activeMsg: "",
// ssssss
- active: true,
+ active: false,
loading: false,
datatime: 0,
lookCount: 0, //查看人数
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index 4900543..bb629b1 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -35,15 +35,15 @@
-
+
-
+
-
+
diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue
index 1a3dfb3..8146a73 100644
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/home/components/Live.vue b/pages/home/components/Live.vue
index 1f71da4..2e8eec7 100644
--- a/pages/home/components/Live.vue
+++ b/pages/home/components/Live.vue
@@ -15,22 +15,15 @@
{{ liveStatus[live.liveStatus].title }}
{{ live.name }}
-
-