Skip to content

7
7-Eleven
Commit a02b9623 by 赵雅纹
Options

Merge branch 'dev_7.0.1' into feature-zyw

parents 455f39e6 d509e51d
Showing with 54 additions and 46 deletions
src/component/bottom/bottom.js
......@@ -75,8 +75,8 @@ Component({
} else if (link.type == 3) {
// 预览
wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表
current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
})
} else if (link.type == 4) {
wxService.router(`${currentClickType}`)
......
src/component/imageSwiper/imageSwiper.js
......@@ -15,7 +15,11 @@ Component({
value: [],
},
},
attached() { },
attached() {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/**
* 组件的初始数据
*/
......@@ -26,7 +30,8 @@ Component({
circular: true,
interval: 5000,
duration: 1000,
isAuthorization: false // false 不显示 true 显示
isAuthorization: false, // false 不显示 true 显示
baseImgUrl: ''
},
/**
* 组件的方法列表
......@@ -61,8 +66,8 @@ Component({
} else if (link.type == 3) {
// 预览
wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表
current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
})
} else if (link.type == 4) {
wxService.router(`${currentClickType}`)
......
src/component/imageSwiper/imageSwiper.wxml
......@@ -9,7 +9,7 @@
>
<block wx:for="{{imageData}}" wx:key="{{item}}">
<swiper-item class="swiper-item">
<image src="http://testimg3.bigaka.com{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindtap='preview' class="slide-image" />
<image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindtap='preview' class="slide-image" />
</swiper-item>
</block>
</swiper>
......
src/component/personCenter/personCenter.js
......@@ -54,11 +54,13 @@ Component({
baseUrl: '#02bb70',
isAuthorization: false,
_token: '',
currentMobile: ''
currentMobile: '',
baseImgUrl: ''
},
attached () {
this.setData({
personCenter: this.data.personData
personCenter: this.data.personData,
baseImgUrl: app.globalData.imageUrl
})
const { cardMember } = this.data
......
src/component/personCenter/personCenter.wxml
......@@ -4,10 +4,10 @@
</view>-->
<view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<!-- <text class="un-active-btn">升级7-Eleven会员2.0版本</text>-->
<image src="http://testimg3.bigaka.com{{personCenter.noactiveBackgroundImageUrl}}" class="no-active-img" mode="widthFix"></image>
<image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{personCenter.noactiveBackgroundImageUrl}}" class="no-active-img" mode="widthFix"></image>
</view>
<!--<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">-->
<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url(http://testimg3.bigaka.com'+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}">
<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ baseImgUrl +''+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}">
<view class='user-info' wx:if='{{currentMobile}}'>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
......
src/component/picNav/picNav.js
......@@ -15,7 +15,11 @@ Component({
value: [],
},
},
attached() { },
attached() {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/**
* 组件的初始数据
*/
......@@ -24,7 +28,8 @@ Component({
imageheight: 0,//缩放后的高
isAuthorization: false,
isAuthorizationActiveText: '',
isAuthorizationType: 2
isAuthorizationType: 2,
baseImgUrl: ''
},
/**
* 组件的方法列表
......@@ -59,16 +64,6 @@ Component({
})
return false
}
// else if(userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
// // userInfo 存在 手机号存在 未激活 跳转激活领卡页面
// this.setData({
// isAuthorizationActiveText:'新激活领卡',
// isAuthorization: true
// },()=> {
// wxService.openCard()
// return false
// })
// }
if (link.type == 2) {
// 触发父组件更新页面
......@@ -78,32 +73,32 @@ Component({
} else if (link.type == 3) {
// 预览
wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表
current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
})
} else if (link.type == 4) {
wxService.router(`${currentClickType}`)
} else if (link.type == 5) {
// if(userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
// this.setData({
// isAuthorizationActiveText:'新激活领卡',
// isAuthorizationType: 3,
// isAuthorization: true
// })
// } else {
// wxService.openCard()
// }
console.log('currentClickType', currentClickType)
if (currentClickType == 1) {
// wxService.openCardList()
wxService.openCard()
} else if (currentClickType == 2) {
wxService.openCard()
if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
// 手机号存在 但未激活 跳转激活领卡页面 老用户
this.setData({
isAuthorizationActiveText: '新激活领卡',
isAuthorization: true,
isAuthorizationType: 3
}, () => {
return false
})
}
}
}
},
activeTocard(e){
if(e.detail){
activeTocard(e) {
if (e.detail) {
wxService.openCard()
}
}
......
src/component/picNav/picNav.wxml
......@@ -2,11 +2,11 @@
<!--<view class="pic-nav">
<block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item">
<view class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;">
<image style="width: {{imagewidth}}px;height: {{imageheight}}px;" src="http://testimg3.bigaka.com{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview' />
<image style="width: {{imagewidth}}px;height: {{imageheight}}px;" wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview' />
</view>
</block>
</view>
<authorization-modal isAuthorization='{{isAuthorization}}'/>
-->
<view class="pic-nav"><view wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item" class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;"><image class="pic-img" style="width: {{imagewidth}}px;height: {{imageheight}}px;" src="http://testimg3.bigaka.com{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview'/></view></view>
<view class="pic-nav"><view wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item" class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;"><image wx:if="{{baseImgUrl}}" class="pic-img" style="width: {{imagewidth}}px;height: {{imageheight}}px;" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview'/></view></view>
<authorization-modal isAuthorization='{{isAuthorization}}' bind:activeTocard="activeTocard" isAuthorizationType="{{isAuthorizationType}}" isAuthorizationActiveText="{{isAuthorizationActiveText}}"/>
\ No newline at end of file
src/component/picNavServe/picNavServe.js
......@@ -15,12 +15,16 @@ Component({
value: [],
},
},
attached () {},
attached () {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/**
* 组件的初始数据
*/
data: {
baseImgUrl: ''
},
/**
* 组件的方法列表
......@@ -29,8 +33,8 @@ Component({
preview(e) {
const {url,currentUrl} = e.currentTarget.dataset
wx.previewImage({
current: `http://testimg3.bigaka.com/${currentUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${url}`] // 需要预览的图片http链接列表
current: `${app.globalData.imageUrl}/${currentUrl}`, // 当前显示图片的http链接
urls: [`${app.globalData.imageUrl}/${url}`] // 需要预览的图片http链接列表
})
}
}
......
src/component/picNavServe/picNavServe.wxml
<!--component/picNav/picNav.wxml-->
<view class="pic-nav">
<block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item" class="pic-content">
<view class="pic-item"><image class="pic-img" src="http://testimg3.bigaka.com{{item.imageUrl}}" data-current-url="{{item.imageUrl}}" data-url="{{item.link.url}}" bindtap='preview' mode="scaleToFill"/></view>
<view class="pic-item"><image wx:if="{{baseImgUrl}}" class="pic-img" src="{{baseImgUrl}}{{item.imageUrl}}" data-current-url="{{item.imageUrl}}" data-url="{{item.link.url}}" bindtap='preview' mode="scaleToFill"/></view>
</block>
</view>
src/config/index.js
......@@ -16,7 +16,8 @@ const prodCtx = 'https://crm-b.bigaka.com/api' // 发生产时解开此注释
const devImgCtx = 'http://testimg3.bigaka.com' // 开发环境图片地址
const testImgCtx = 'http://testimg3.bigaka.com' // 测试环境图片地址
const preImgCtx = 'http://testimg3.bigaka.com' // 预生产环境图片地址
const prodImgCtx = 'https://img3.bigaka.com' // 生产环境图片地址
const prodImgCtx = 'http://testimg3.bigaka.com' // 预生产环境图片地址
// const prodImgCtx = 'https://img3.bigaka.com' // 生产环境图片地址
const config = {
dev: devCtx,
......
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