Skip to content

飞
飞鹤小程序
Commit 7f8ea103 authored by 王炽's avatar 王炽
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/sparkprojects/20250528_FHQ1 into dev

parents 7548b9ab 02a9f135
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 43 deletions
mock/brand.js
View file @ 7f8ea103
...@@ -53,8 +53,8 @@ export const brandObj = { ...@@ -53,8 +53,8 @@ export const brandObj = {
"title": "超凡 吸收", "title": "超凡 吸收",
"desc": "星飞帆经典 3段", "desc": "星飞帆经典 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-1", "contentImg": "0-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
...@@ -65,8 +65,8 @@ export const brandObj = { ...@@ -65,8 +65,8 @@ export const brandObj = {
"title": "顶配 脑育", "title": "顶配 脑育",
"desc": "星飞帆卓睿 3段", "desc": "星飞帆卓睿 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-2", "contentImg": "0-2",
"contentImgLen": 25, "contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
...@@ -77,8 +77,8 @@ export const brandObj = { ...@@ -77,8 +77,8 @@ export const brandObj = {
"title": "亲和 自护", "title": "亲和 自护",
"desc": "星飞帆卓耀 3段", "desc": "星飞帆卓耀 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-3", "contentImg": "0-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
...@@ -127,8 +127,8 @@ export const brandObj = { ...@@ -127,8 +127,8 @@ export const brandObj = {
"title": "超凡 吸收", "title": "超凡 吸收",
"desc": "星飞帆经典 3段", "desc": "星飞帆经典 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-1", "contentImg": "1-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
...@@ -139,8 +139,8 @@ export const brandObj = { ...@@ -139,8 +139,8 @@ export const brandObj = {
"title": "顶配 脑育", "title": "顶配 脑育",
"desc": "星飞帆卓睿 3段", "desc": "星飞帆卓睿 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-2", "contentImg": "1-2",
"contentImgLen": 25, "contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
...@@ -151,8 +151,8 @@ export const brandObj = { ...@@ -151,8 +151,8 @@ export const brandObj = {
"title": "亲和 自护", "title": "亲和 自护",
"desc": "星飞帆卓耀 3段", "desc": "星飞帆卓耀 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-3", "contentImg": "1-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
...@@ -163,8 +163,8 @@ export const brandObj = { ...@@ -163,8 +163,8 @@ export const brandObj = {
"title": "顶配 A 2", "title": "顶配 A 2",
"desc": "星飞帆卓睿A2奶源", "desc": "星飞帆卓睿A2奶源",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-4", "contentImg": "1-4",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源", "shareTitle": "星飞帆卓睿A2奶源",
...@@ -175,8 +175,8 @@ export const brandObj = { ...@@ -175,8 +175,8 @@ export const brandObj = {
"title": "活性 有机", "title": "活性 有机",
"desc": "臻稚卓蓓 3段", "desc": "臻稚卓蓓 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-5", "contentImg": "1-5",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段", "shareTitle": "臻稚卓蓓 3段",
...@@ -187,8 +187,8 @@ export const brandObj = { ...@@ -187,8 +187,8 @@ export const brandObj = {
"title": "高端 乳铁", "title": "高端 乳铁",
"desc": "臻爱倍护 3段", "desc": "臻爱倍护 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-6", "contentImg": "1-6",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "臻爱倍护 3段", "shareTitle": "臻爱倍护 3段",
......
mock/node_brand.js
View file @ 7f8ea103
const brandObj = { const brandObj = {
"channel":{ "channel":{
"finderUserName": "sphgexisAi0pRGm", "finderUserName": "sphgexisAi0pRGm",
"feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE" "feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE"
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
"title": "超凡 吸收", "title": "超凡 吸收",
"desc": "星飞帆经典 3段", "desc": "星飞帆经典 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-1", "contentImg": "0-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
"title": "顶配 脑育", "title": "顶配 脑育",
"desc": "星飞帆卓睿 3段", "desc": "星飞帆卓睿 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-2", "contentImg": "0-2",
"contentImgLen": 25, "contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
"title": "亲和 自护", "title": "亲和 自护",
"desc": "星飞帆卓耀 3段", "desc": "星飞帆卓耀 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "0-3", "contentImg": "0-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
"title": "超凡 吸收", "title": "超凡 吸收",
"desc": "星飞帆经典 3段", "desc": "星飞帆经典 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-1", "contentImg": "1-1",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆经典 3段", "shareTitle": "星飞帆经典 3段",
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
"title": "顶配 脑育", "title": "顶配 脑育",
"desc": "星飞帆卓睿 3段", "desc": "星飞帆卓睿 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-2", "contentImg": "1-2",
"contentImgLen": 25, "contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段", "shareTitle": "星飞帆卓睿 3段",
...@@ -151,8 +151,8 @@ ...@@ -151,8 +151,8 @@
"title": "亲和 自护", "title": "亲和 自护",
"desc": "星飞帆卓耀 3段", "desc": "星飞帆卓耀 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-3", "contentImg": "1-3",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段", "shareTitle": "星飞帆卓耀 3段",
...@@ -163,8 +163,8 @@ ...@@ -163,8 +163,8 @@
"title": "顶配 A 2", "title": "顶配 A 2",
"desc": "星飞帆卓睿A2奶源", "desc": "星飞帆卓睿A2奶源",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-4", "contentImg": "1-4",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源", "shareTitle": "星飞帆卓睿A2奶源",
...@@ -175,8 +175,8 @@ ...@@ -175,8 +175,8 @@
"title": "活性 有机", "title": "活性 有机",
"desc": "臻稚卓蓓 3段", "desc": "臻稚卓蓓 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-5", "contentImg": "1-5",
"contentImgLen": 28, "contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段", "shareTitle": "臻稚卓蓓 3段",
...@@ -187,8 +187,8 @@ ...@@ -187,8 +187,8 @@
"title": "高端 乳铁", "title": "高端 乳铁",
"desc": "臻爱倍护 3段", "desc": "臻爱倍护 3段",
"link": "www.baidu.com", "link": "www.baidu.com",
"productId": "1234567890", "productId": "",
"skuId": "1234567890", "skuId": "",
"contentImg": "1-6", "contentImg": "1-6",
"contentImgLen": 20, "contentImgLen": 20,
"shareTitle": "臻爱倍护 3段", "shareTitle": "臻爱倍护 3段",
......
pages/product/product.vue
View file @ 7f8ea103
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<image :key="index" v-for="(item, index) in imgList" mode="widthFix" class="productimg" :src="item.imgUrl"> <image :key="index" v-for="(item, index) in imgList" mode="widthFix" class="productimg" :src="item.imgUrl">
</image> </image>
<view class="btnbox"> <view class="btnbox">
<image @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image> <image v-if="productId&&skuId" @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image>
<button class="btnshare" open-type="share" style="background: none; border: none; padding: 0;"> <button class="btnshare" open-type="share" style="background: none; border: none; padding: 0;">
<image class="btnshare" :src="$baseUrl + 'brandpage/btnshare.png'"></image> <image class="btnshare" :src="$baseUrl + 'brandpage/btnshare.png'"></image>
</button> </button>
......
views/Brand.vue
View file @ 7f8ea103
...@@ -110,12 +110,12 @@ ...@@ -110,12 +110,12 @@
<rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc"> <rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc">
</rich-text> </rich-text>
<image class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image> <image @tap="previewImage($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
<image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload" <image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload"
:src="$baseUrl + 'homepage/btn_download.png'"></image> :src="$baseUrl + 'homepage/btn_download.png'"></image>
</view> </view>
<view v-else class="popup-content" style="height: 899rpx;"> <view v-else class="popup-content" style="height: 899rpx;">
<image class="xingmahui" :src="$baseUrl + 'brandpage/hexiaofei.png'"></image> <image @tap="previewImage($baseUrl + 'brandpage/hexiaofei.png')" class="xingmahui" :src="$baseUrl + 'brandpage/hexiaofei.png'"></image>
<image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image> <image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image>
</view> </view>
</uni-popup> </uni-popup>
...@@ -286,7 +286,13 @@ export default { ...@@ -286,7 +286,13 @@ export default {
console.log('跳转失败', err); console.log('跳转失败', err);
} }
}); });
} },
previewImage(url){
uni.previewImage({
urls: [url], // 预览当前图片
current: url // 当前显示的图片
});
},
} }
} }
</script> </script>
......
views/Home.vue
View file @ 7f8ea103
...@@ -119,12 +119,12 @@ ...@@ -119,12 +119,12 @@
<rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc"> <rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc">
</rich-text> </rich-text>
<image class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image> <image @tap="previewImage($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
<image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload" <image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload"
:src="$baseUrl + 'homepage/btn_download.png'"></image> :src="$baseUrl + 'homepage/btn_download.png'"></image>
</view> </view>
<view v-else class="popup-content" style="height: 977rpx;"> <view v-else class="popup-content" style="height: 977rpx;">
<image class="xingmahui" :src="$baseUrl + 'homepage/xingmahui.png'"></image> <image @tap="previewImage($baseUrl + 'homepage/xingmahui.png')" class="xingmahui" :src="$baseUrl + 'homepage/xingmahui.png'"></image>
<image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image> <image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image>
</view> </view>
</uni-popup> </uni-popup>
...@@ -261,6 +261,12 @@ export default { ...@@ -261,6 +261,12 @@ export default {
}); });
} }
}, },
previewImage(url){
uni.previewImage({
urls: [url], // 预览当前图片
current: url // 当前显示的图片
});
},
jumpLinkWithLogin(link) { jumpLinkWithLogin(link) {
if (this.homeStore.isLogin) { if (this.homeStore.isLogin) {
jump(link); jump(link);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment