diff --git a/pages/activity/DargainGoodsDetails/index.vue b/pages/activity/DargainGoodsDetails/index.vue
index 25817da..516f8d1 100644
--- a/pages/activity/DargainGoodsDetails/index.vue
+++ b/pages/activity/DargainGoodsDetails/index.vue
@@ -72,7 +72,11 @@
商品展示
-
+
+
+
+
@@ -104,6 +108,14 @@
+
+
+
+
+ {{entryInfo.entryInfo}}
+
+
+
@@ -111,6 +123,7 @@
import ProductConSwiper from '@/components/ProductConSwiper';
import CountDown from '@/components/CountDown';
import { getBargainDetail } from '@/api/activity';
+ import { getEntry } from '@/api/store'
import { handleQrCode } from '@/utils/index'
export default {
components: {
@@ -129,6 +142,12 @@
imgUrls: [],
styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
+ entryInfo: {},
+ showEntry: false,
+ tagStyle: {
+ a: 'color:#0A59F7;text-decoration:underline;',
+ img: 'padding:0;margin:0;font-size:0;display:block;'
+ }
};
},
onLoad() {
@@ -191,7 +210,23 @@
path: "/pages/activity/DargainDetails/index",
query: { id: this.bargainId, partake: 0 }
});
- }
+ },
+ linktap(e) {
+ // console.log('description', e.innerText);
+ if (e.innerText == this.entryInfo.entryName) {
+ this.showEntry = true;
+ return;
+ }
+ getEntry({
+ name: e.innerText
+ }).then(res => {
+ this.entryInfo = res.data;
+ this.showEntry = true;
+ })
+ },
+ closeEntry() {
+ this.showEntry = false;
+ },
}
}
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index 49799c8..bb1f420 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -188,8 +188,11 @@
商品展示
-
-
+
+
+
+
@@ -257,6 +260,14 @@
+
+
+
+
+ {{entryInfo.entryInfo}}
+
+
+
@@ -272,7 +283,7 @@ import UserEvaluation from '@/components/UserEvaluation'
import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import { getCombinationDetail } from '@/api/activity'
-import { postCartAdd } from '@/api/store'
+import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'GroupDetails'
@@ -330,6 +341,12 @@ export default {
},
cartNum: 1,
userCollect: false,
+ entryInfo: {},
+ showEntry: false,
+ tagStyle: {
+ a: 'color:#0A59F7;text-decoration:underline;',
+ img: 'padding:0;margin:0;font-size:0;display:block;'
+ }
}
},
computed: {},
@@ -600,6 +617,22 @@ export default {
this.attr.cartAttr = true
this.isOpen = true
},
+ linktap(e) {
+ // console.log('description', e.innerText);
+ if (e.innerText == this.entryInfo.entryName) {
+ this.showEntry = true;
+ return;
+ }
+ getEntry({
+ name: e.innerText
+ }).then(res => {
+ this.entryInfo = res.data;
+ this.showEntry = true;
+ })
+ },
+ closeEntry() {
+ this.showEntry = false;
+ },
},
}
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index e7835f4..5f199ce 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -118,7 +118,11 @@
商品展示
-
+
+
+
+
@@ -189,7 +193,16 @@
-->
-
+
+
+
+
+
+ {{entryInfo.entryInfo}}
+
+
+
+
@@ -207,7 +220,7 @@ import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import UserEvaluation from '@/components/UserEvaluation';
import { getSeckillDetail } from '@/api/activity'
-import { postCartAdd } from '@/api/store'
+import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'SeckillDetails'
@@ -254,6 +267,12 @@ export default {
userCollect: false,
styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
+ entryInfo: {},
+ showEntry: false,
+ tagStyle: {
+ a: 'color:#0A59F7;text-decoration:underline;',
+ img: 'padding:0;margin:0;font-size:0;display:block;'
+ }
}
},
onShow: function() {
@@ -526,6 +545,22 @@ export default {
})
}
},
+ linktap(e) {
+ // console.log('description', e.innerText);
+ if (e.innerText == this.entryInfo.entryName) {
+ this.showEntry = true;
+ return;
+ }
+ getEntry({
+ name: e.innerText
+ }).then(res => {
+ this.entryInfo = res.data;
+ this.showEntry = true;
+ })
+ },
+ closeEntry() {
+ this.showEntry = false;
+ },
},
}
diff --git a/pages/expert/index.vue b/pages/expert/index.vue
index db0b216..3eaf101 100644
--- a/pages/expert/index.vue
+++ b/pages/expert/index.vue
@@ -25,7 +25,7 @@
{{item.expertUnit}}
- {{item.expertInfo}}
+ {{item.expertInfo}}
向ta留言咨询
@@ -109,6 +109,7 @@
// box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
}
.text-box {
+ padding-top: 10rpx;
width: 362rpx;
height: 304rpx;
@@ -141,7 +142,7 @@
}
.info {
padding-left: 4rpx;
- height: 126rpx;
+ height: 132rpx;
overflow: hidden;
font-family: PingFang SC;
line-height: 26rpx;
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 9784730..9b4b7bb 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -7,7 +7,7 @@
-
+
搜索
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index ec312fa..ca50ed3 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -350,7 +350,8 @@ export default {
}
.search {
input {
- width: 376rpx;
+ width: 90%;
+ // width: 376rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
diff --git a/static/images/no-more.png b/static/images/no-more.png
index 5301665..b0c324f 100644
Binary files a/static/images/no-more.png and b/static/images/no-more.png differ