Commit 7ff0b8d1 by 高淑倩

modify: 积分商城图片

parent 9ac21fb5
...@@ -9,6 +9,7 @@ const envInfo = require('config/index').envInfo ...@@ -9,6 +9,7 @@ const envInfo = require('config/index').envInfo
App({ App({
onLaunch: function (e) { onLaunch: function (e) {
// this.checkFullSucreen() // this.checkFullSucreen()
// "navigationStyle": "custom"
try { try {
let res = wx.getSystemInfoSync(); let res = wx.getSystemInfoSync();
config.pixelRate = res.windowWidth / 750; config.pixelRate = res.windowWidth / 750;
...@@ -32,7 +33,6 @@ App({ ...@@ -32,7 +33,6 @@ App({
console.log(e); console.log(e);
} }
}, },
onShow: function (options = {}) { onShow: function (options = {}) {
console.log('app-onshow', options) console.log('app-onshow', options)
......
const PROJECT_ENV = 'dev' // 生产 prod, 测试 dev, 预生产 pre const PROJECT_ENV = 'pre' // 生产 prod, 测试 dev, 预生产 pre
const needMock = '' // const needMock = '' //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<view class='coupon-list' wx:for="{{integralCouponList}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}"> <view class='coupon-list' wx:for="{{integralCouponList}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}">
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image> <image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
<view class='coupon-img'> <view class='coupon-img'>
<image src='/assets/imgs/qr-code.png'></image> <image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}'></image>
<image wx:else src='/assets/imgs/qr-code.png'></image>
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.title}}</view> <view class='coupon-name fs-28'>{{item.title}}</view>
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<view class='coupon-list'> <view class='coupon-list'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' /> <image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'> <view class='coupon-img'>
<image src='/assets/imgs/qr-code.png' /> <image wx:if="{{integralMallDetail.thumbnail}}" src='{{integralMallDetail.thumbnail}}'></image>
<image wx:else src='/assets/imgs/qr-code.png'></image>
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view> <view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view>
...@@ -12,15 +13,16 @@ ...@@ -12,15 +13,16 @@
</view> </view>
<view class='coupon-code fs-24' bindtap='exchange'>立即兑换</view> <view class='coupon-code fs-24' bindtap='exchange'>立即兑换</view>
</view> </view>
<view class='integral-detail'> <view class='integral-detail' wx:if="{{integralMallDetail.desc}}">
<view class='integral-list'> <image src='{{integralMallDetail.desc}}' mode="scaleToFill" style="width: 100%;"></image>
<!-- <view class='integral-list'>
<view class='integral-title'>优惠详情</view> <view class='integral-title'>优惠详情</view>
<view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view> <view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view>
</view> </view>
<view class='integral-list'> <view class='integral-list'>
<view class='integral-title'>有效期</view> <view class='integral-title'>有效期</view>
<view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view> <view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view>
</view> </view>-->
</view> </view>
<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button> <button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
</view> </view>
......
{ {
"disableScroll": true,
"navigationBarTitleText": "广东7-Eleven会员专区", "navigationBarTitleText": "广东7-Eleven会员专区",
"usingComponents": { "usingComponents": {
"image-swiper": "/component/imageSwiper/imageSwiper", "image-swiper": "/component/imageSwiper/imageSwiper",
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem"> <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<!--{{pItem.type}}--> <!--{{pItem.type}}-->
<!-- 轮播 --> <!-- 轮播 -->
<view class="images-tab pd1530" wx:if="{{pItem.type == 1}}"> <view class="images-tab pd1530" wx:if="{{pItem.type == 1}}">
<image-swiper image-data="{{pItem.rotationchart.images}}" /> <image-swiper image-data="{{pItem.rotationchart.images}}" />
...@@ -26,64 +25,5 @@ ...@@ -26,64 +25,5 @@
<text class='footer-text' style="color:{{pItem.bottom.fontColor}}">{{pItem.bottom.title}}</text> <text class='footer-text' style="color:{{pItem.bottom.fontColor}}">{{pItem.bottom.title}}</text>
</view> </view>
</view> </view>
<!--<image-swiper />
<view class="activation-content {{true ? 'user-content' : ''}}">
<image class='activation-bg' src='/assets/imgs/user-bg.png'></image>
<button type="primary" plain='false' wx:if='{{false}}'>激活立享会员特权</button>
<view class='user-info' wx:if='{{true}}'>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
</view>
<view class='user-name-content'>
<view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
<navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none">
<image class='icon-edit' src='/assets/imgs/icon-edit.png'></image>
</navigator>
</view>
<view class='user-id'>34765736454</view>
</view>
<view class='qr-code pr'>
<image src='/assets/imgs/qr-code.png'></image>
</view>
</view>
</view>
<view class='df tc'>
<view class='df-1 point'>
<view class='point-number'>100</view>
<view class='point-desc'>积分</view>
</view>
<view class='df-1 point'>
<view class='point-number'>2</view>
<view class='point-desc'>优惠券</view>
</view>
</view>
<view class='main-content'>
<view class='top-content'>
<view class='top-left-img'>
<image src='/assets/imgs/user-bg.png'></image>
</view>
<view class='top-right-img'>
<view>
<image src='/assets/imgs/user-bg.png'></image>
</view>
<view>
<image src='/assets/imgs/user-bg.png'></image>
</view>
</view>
</view>
<view class='bottom-content'>
<image src='/assets/imgs/user-bg.png'></image>
<image src='/assets/imgs/user-bg.png'></image>
</view>
</view>
<view class='footer-content'>
<image class='arrow-left' src='/assets/imgs/arrow-left.png'></image>
<text class='footer-text'>往左滑更有料</text>
</view>
-->
</block> </block>
</view> </view>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.6.6", "libVersion": "2.6.6",
"appid": "wxc3b64b09b1d3dfc2", "appid": "wx358b56af62edbde1",
"tempappid_wx": "wxc3b64b09b1d3dfc2", "tempappid_wx": "wxc3b64b09b1d3dfc2",
"tempappid_711": "wx358b56af62edbde1", "tempappid_711": "wx358b56af62edbde1",
"projectname": "7-Eleven", "projectname": "7-Eleven",
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 3, "current": 6,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"id": 6, "id": 6,
"name": "积分兑换详情页", "name": "积分兑换详情页",
"pathName": "pages/integralMallDetail/integralMallDetail", "pathName": "pages/integralMallDetail/integralMallDetail",
"query": "id=579702812007600128" "query": "id=585585301259423744"
}, },
{ {
"id": 7, "id": 7,
......
...@@ -235,8 +235,8 @@ function getUserInfoByBtn(userInfo) { ...@@ -235,8 +235,8 @@ function getUserInfoByBtn(userInfo) {
return wxService.post(`/member/minaLogin`, { return wxService.post(`/member/minaLogin`, {
code: res[1].code, code: res[1].code,
wechatInfo: res[0], wechatInfo: res[0],
// brandId: 2005, brandId: 2005,
brandId: 1001, // brandId: 1001,
}) })
}, (err) => { }, (err) => {
return Promise.reject(err) return Promise.reject(err)
......
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