Skip to content

7
7-Eleven
Commit ceeac3ae by 高淑倩
Options

modify: imgUrl

parent 17f411a7
Showing with 41 additions and 23 deletions
src/component/bottom/bottom.js
...@@ -75,8 +75,8 @@ Component({ ...@@ -75,8 +75,8 @@ Component({
} else if (link.type == 3) { } else if (link.type == 3) {
// 预览 // 预览
wx.previewImage({ wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接 current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表 urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
}) })
} else if (link.type == 4) { } else if (link.type == 4) {
wxService.router(`${currentClickType}`) wxService.router(`${currentClickType}`)
......
src/component/imageSwiper/imageSwiper.js
...@@ -15,7 +15,11 @@ Component({ ...@@ -15,7 +15,11 @@ Component({
value: [], value: [],
}, },
}, },
attached() { }, attached() {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
...@@ -26,7 +30,8 @@ Component({ ...@@ -26,7 +30,8 @@ Component({
circular: true, circular: true,
interval: 5000, interval: 5000,
duration: 1000, duration: 1000,
isAuthorization: false // false 不显示 true 显示 isAuthorization: false, // false 不显示 true 显示
baseImgUrl: ''
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
...@@ -61,8 +66,8 @@ Component({ ...@@ -61,8 +66,8 @@ Component({
} else if (link.type == 3) { } else if (link.type == 3) {
// 预览 // 预览
wx.previewImage({ wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接 current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表 urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
}) })
} else if (link.type == 4) { } else if (link.type == 4) {
wxService.router(`${currentClickType}`) wxService.router(`${currentClickType}`)
......
src/component/imageSwiper/imageSwiper.wxml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
> >
<block wx:for="{{imageData}}" wx:key="{{item}}"> <block wx:for="{{imageData}}" wx:key="{{item}}">
<swiper-item class="swiper-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> </swiper-item>
</block> </block>
</swiper> </swiper>
......
src/component/personCenter/personCenter.js
...@@ -54,11 +54,13 @@ Component({ ...@@ -54,11 +54,13 @@ Component({
baseUrl: '#02bb70', baseUrl: '#02bb70',
isAuthorization: false, isAuthorization: false,
_token: '', _token: '',
currentMobile: '' currentMobile: '',
baseImgUrl: ''
}, },
attached () { attached () {
this.setData({ this.setData({
personCenter: this.data.personData personCenter: this.data.personData,
baseImgUrl: app.globalData.imageUrl
}) })
const { cardMember } = this.data const { cardMember } = this.data
......
src/component/personCenter/personCenter.wxml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
</view>--> </view>-->
<view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr"> <view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<!-- <text class="un-active-btn">升级7-Eleven会员2.0版本</text>--> <!-- <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>
<!--<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('+ 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-info' wx:if='{{currentMobile}}'>
<view class="user-avatar"> <view class="user-avatar">
<open-data type="userAvatarUrl"></open-data> <open-data type="userAvatarUrl"></open-data>
......
src/component/picNav/picNav.js
...@@ -15,7 +15,11 @@ Component({ ...@@ -15,7 +15,11 @@ Component({
value: [], value: [],
}, },
}, },
attached() { }, attached() {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
...@@ -24,7 +28,8 @@ Component({ ...@@ -24,7 +28,8 @@ Component({
imageheight: 0,//缩放后的高 imageheight: 0,//缩放后的高
isAuthorization: false, isAuthorization: false,
isAuthorizationActiveText: '', isAuthorizationActiveText: '',
isAuthorizationType: 2 isAuthorizationType: 2,
baseImgUrl: ''
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
...@@ -78,8 +83,8 @@ Component({ ...@@ -78,8 +83,8 @@ Component({
} else if (link.type == 3) { } else if (link.type == 3) {
// 预览 // 预览
wx.previewImage({ wx.previewImage({
current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接 current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`] // 需要预览的图片http链接列表 urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
}) })
} else if (link.type == 4) { } else if (link.type == 4) {
wxService.router(`${currentClickType}`) wxService.router(`${currentClickType}`)
......
src/component/picNav/picNav.wxml
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<!--<view class="pic-nav"> <!--<view class="pic-nav">
<block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item"> <block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item">
<view class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;"> <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> </view>
</block> </block>
</view> </view>
<authorization-modal isAuthorization='{{isAuthorization}}'/> <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}}"/> <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({ ...@@ -15,12 +15,16 @@ Component({
value: [], value: [],
}, },
}, },
attached () {}, attached () {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
baseImgUrl: ''
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
...@@ -29,8 +33,8 @@ Component({ ...@@ -29,8 +33,8 @@ Component({
preview(e) { preview(e) {
const {url,currentUrl} = e.currentTarget.dataset const {url,currentUrl} = e.currentTarget.dataset
wx.previewImage({ wx.previewImage({
current: `http://testimg3.bigaka.com/${currentUrl}`, // 当前显示图片的http链接 current: `${app.globalData.imageUrl}/${currentUrl}`, // 当前显示图片的http链接
urls: [`http://testimg3.bigaka.com/${url}`] // 需要预览的图片http链接列表 urls: [`${app.globalData.imageUrl}/${url}`] // 需要预览的图片http链接列表
}) })
} }
} }
......
src/component/picNavServe/picNavServe.wxml
<!--component/picNav/picNav.wxml--> <!--component/picNav/picNav.wxml-->
<view class="pic-nav"> <view class="pic-nav">
<block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item" class="pic-content"> <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> </block>
</view> </view>
src/config/index.js
...@@ -16,7 +16,8 @@ const prodCtx = 'https://crm-b.bigaka.com/api' // 发生产时解开此注释 ...@@ -16,7 +16,8 @@ const prodCtx = 'https://crm-b.bigaka.com/api' // 发生产时解开此注释
const devImgCtx = 'http://testimg3.bigaka.com' // 开发环境图片地址 const devImgCtx = 'http://testimg3.bigaka.com' // 开发环境图片地址
const testImgCtx = 'http://testimg3.bigaka.com' // 测试环境图片地址 const testImgCtx = 'http://testimg3.bigaka.com' // 测试环境图片地址
const preImgCtx = '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 = { const config = {
dev: devCtx, 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