Skip to content

7
7-Eleven
Commit a846a314 by 赵雅纹
Options

Merge branch 'feature-zyw-sc' into 'dev_7.1.0' 

Feature zyw sc

See merge request !79
parents bd97eefd d999c866
Showing with 42 additions and 139 deletions
src/pages/myShare/myShare.js
......@@ -10,108 +10,12 @@ wxService.page({
*/
data: {
categoryList:[], //分类
imageData: [
{
name: '大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼',
heart_num: '1',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '2',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '3',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '4',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '5',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '6',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '7',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img4.imgtn.bdimg.com/it/u=2748975304,2710656664&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '8',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img2.imgtn.bdimg.com/it/u=1561660534,130168102&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}
],
baseImgUrl: app.globalData.imageUrl,
listData: [{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}, {
desc: "string",
imageUrl: "/group3/M00/00/08/Cv6CBF0BqvyADM4iAABJQ-gxAy4311.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/08/Cv6CBF0BqvyADM4iAABJQ-gxAy4311.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}],
pageNum: 1,
pageSize: 10,
invalidPageNo: 1,
totalPages: 0,
totalElements: 0,
invalidTotalElements: 0,
couponList: [],
invalidCouponList: [],
invalidTotalPages: 0,
invalidTotalElements: 0,
currentTab: 0,
noMoreCoupon: false,
noMoreCouponInvalid: false,
contentList:[]
},
......@@ -130,13 +34,14 @@ wxService.page({
/**
* 生命周期函数--监听页面加载
*/
onLoad() { },
onLoad() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
this.getCategoryList()
},
// 获取分类
......
src/pages/productDetail/productDetail.js
......@@ -18,38 +18,8 @@ wxService.page({
baseImgUrl: app.globalData.imageUrl,
swiperCurrent: 0,
selectSkuName:'',
imageData: [{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}, {
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}],
openPlusStatus:0,
memberLevel:0
},
......@@ -85,6 +55,7 @@ wxService.page({
*/
onShow: function () {
this.getProInfo()
this.getOpenStatus()
},
//获取商品详情
......@@ -105,6 +76,34 @@ wxService.page({
})
},
// 获取会员等级开关
getMemberLevel(){
wxService.get(`/merchant/brandSwitchSetting/getOpenStatus?brandId=1001&businessType=2`).then(res => {
const { result, data } = res.data
if (result == 0) {
this.setData({
memberLevel: result
})
}
}).finally(() => {
wx.hideLoading()
})
},
// 获取plus会员开关
getOpenStatus(){
wxService.get(`/merchant/brandSwitchSetting/getOpenStatus?brandId=1001&businessType=3`).then(res => {
const { result, data } = res.data
if (result == 0) {
this.setData({
openPlusStatus:result
})
}
}).finally(() => {
wx.hideLoading()
})
},
/**
* 生命周期函数--监听页面卸载
*/
......
src/pages/productDetail/productDetail.wxml
......@@ -25,7 +25,7 @@
<view class="product-detail-wrap">
<view class="product-price">
<view class="price-wrap">
<view class="price-icon">会员专享价</view>
<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
<text class="price">￥618</text>
<text class="cost-price">￥888</text>
</view>
......@@ -40,13 +40,13 @@
<view class="product-desc">
{{productInfo.productStatusDesc}}
</view>
<view class="member-price">
<view class="member-price" wx:if="{{openPlusStatus}}">
<view class="member-price-info">
<image class="member-price-icon" src="/assets/imgs/7_1_0/plus.png"></image>
<text class="before-reduce-price">￥558,</text>
<text class="reduce-price">本次立减￥60</text>
</view>
<view class="open">
<view class="open" >
<text class="open-text">立即开通</text>
<image class="big-arrow" src="/assets/imgs/big-arrow-right.png"></image>
</view>
......
src/pages/wantToBuyDetail/wantToBuyDetail.wxml
<view class='page-want-buy'>
<!--bindchange="swiperTab"-->
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}"/>
<view class="buy-desc">
<view>{{contentInfo.describe}}</view>
......@@ -20,7 +17,9 @@
</view>
<view class="buy-product-wrap">
<view class="buy-product-content">
<view class="buy-list" wx:for="{{proList}}" wx:key="{{index}}">
<block wx:for="{{proList}}" wx:key="{{index}}">
<navigator hover-class="none" url="/pages/productDetail/productDetail?productId={{item.productId}}">
<view class="buy-list" >
<view class="prod-img">
<image src="{{item.indexUrl}}"></image>
</view>
......@@ -34,9 +33,9 @@
</view>
</view>
</view>
</navigator>
</block>
</view>
</view>
</view>
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