| @@ -77,12 +77,16 @@ page{ | |||||
| top: 0; | top: 0; | ||||
| } | } | ||||
| .frImg text{ | .frImg text{ | ||||
| transform: rotate(45deg); | |||||
| color: #FFFFFF; | |||||
| font-size: 18rpx; | |||||
| position: absolute; | |||||
| right: 0; | |||||
| top: 22rpx; | |||||
| height:78rpx; | |||||
| width:78rpx; | |||||
| transform:rotate(45deg); | |||||
| color:#FFFFFF; | |||||
| font-size:16rpx; | |||||
| position:absolute; | |||||
| text-align:center; | |||||
| line-height:53rpx; | |||||
| top:0; | |||||
| left:0; | |||||
| } | } | ||||
| .money{ | .money{ | ||||
| display: inline-block!important; | display: inline-block!important; | ||||
| @@ -1,4 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| var config = require("../../../config/config.js"); | var config = require("../../../config/config.js"); | ||||
| var app = getApp(); | var app = getApp(); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| @@ -20,9 +20,8 @@ | |||||
| <view class='coupons_info' style='position:relative;z-index:9'> | <view class='coupons_info' style='position:relative;z-index:9'> | ||||
| <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | ||||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <!-- <view class='gift'>分享有礼</view> --> | |||||
| <!-- <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> --> | |||||
| <image src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享</text> | |||||
| </view> | </view> | ||||
| <view> | <view> | ||||
| <view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined}}"> | <view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined}}"> | ||||
| @@ -78,19 +78,19 @@ button::after { | |||||
| position: absolute; | position: absolute; | ||||
| right: 28rpx; | right: 28rpx; | ||||
| top: 27rpx; | top: 27rpx; | ||||
| width: 108rpx; | |||||
| height: 180rpx; | |||||
| /* display: flex; | |||||
| flex-direction:column; */ | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| } | } | ||||
| .fenxiang image { | .fenxiang image { | ||||
| width:48rpx; | width:48rpx; | ||||
| height: 48rpx; | height: 48rpx; | ||||
| margin: 0 auto; | |||||
| } | } | ||||
| .gift{ | .gift{ | ||||
| color: #3C3C3C; | color: #3C3C3C; | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| margin: 0 auto; | |||||
| } | } | ||||
| .user-motto { | .user-motto { | ||||
| @@ -24,8 +24,8 @@ | |||||
| <text class='title' wx:if="{{data.title!=''}}">{{data.title}}</text> | <text class='title' wx:if="{{data.title!=''}}">{{data.title}}</text> | ||||
| </view> | </view> | ||||
| <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | ||||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享有礼</text> | |||||
| <image src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 一个商铺 --> | <!-- 一个商铺 --> | ||||
| @@ -274,9 +274,10 @@ page{ | |||||
| } | } | ||||
| .fenxiang { | .fenxiang { | ||||
| position: absolute; | position: absolute; | ||||
| right: 0; | |||||
| top: 0; | |||||
| width: 108rpx; | |||||
| right:28rpx; | |||||
| top: 27rpx; | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| } | } | ||||
| .merchant-activity{ | .merchant-activity{ | ||||
| padding: 0 4% 10rpx; | padding: 0 4% 10rpx; | ||||
| @@ -284,16 +285,12 @@ page{ | |||||
| .fenxiang image { | .fenxiang image { | ||||
| width: 48rpx; | width: 48rpx; | ||||
| height: 48rpx; | height: 48rpx; | ||||
| position: absolute; | |||||
| top: 16rpx; | |||||
| right: 14rpx; | |||||
| margin: 0 auro; | |||||
| } | } | ||||
| .gift{ | .gift{ | ||||
| color: #3C3C3C; | color: #3C3C3C; | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| position: absolute; | |||||
| right: 0; | |||||
| top: 65rpx; | |||||
| margin: 0 auro; | |||||
| } | } | ||||
| .user-motto { | .user-motto { | ||||
| width: 270rpx; | width: 270rpx; | ||||
| @@ -1,5 +1,6 @@ | |||||
| // pages/integralmall/payIntegcouponStatus/index.js | // pages/integralmall/payIntegcouponStatus/index.js | ||||
| // pages/spellGroup/mySpellGroup/index.js | // pages/spellGroup/mySpellGroup/index.js | ||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| var config = require("../../../config/config.js"); | var config = require("../../../config/config.js"); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
| @@ -10,6 +11,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| }, | }, | ||||
| @@ -3,5 +3,7 @@ | |||||
| "navigationBarTextStyle": "white", | "navigationBarTextStyle": "white", | ||||
| "navigationBarBackgroundColor": "#F13C42", | "navigationBarBackgroundColor": "#F13C42", | ||||
| "enablePullDownRefresh": true, | "enablePullDownRefresh": true, | ||||
| "usingComponents": {} | |||||
| "usingComponents": { | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class='pay-status'> | |||||
| <navbar home back text="积分换礼" background='#FFF' ></navbar> | |||||
| <view class='pay-status'style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class='tilte'>兑换成功</view> | <view class='tilte'>兑换成功</view> | ||||
| <view class='coupon'> | <view class='coupon'> | ||||
| <view class='c-left'> | <view class='c-left'> | ||||
| @@ -1,4 +1,7 @@ | |||||
| /* pages/integralmall/payIntegcouponStatus/index.wxss */ | /* pages/integralmall/payIntegcouponStatus/index.wxss */ | ||||
| page{ | |||||
| background: #F4F5F9; | |||||
| } | |||||
| .tilte{ | .tilte{ | ||||
| text-align: center; | text-align: center; | ||||
| height:50rpx; | height:50rpx; | ||||
| @@ -16,6 +19,7 @@ | |||||
| margin: 0 auto; | margin: 0 auto; | ||||
| box-shadow:0px 10rpx 27rpx 0rpx rgba(15,15,15,0.09); | box-shadow:0px 10rpx 27rpx 0rpx rgba(15,15,15,0.09); | ||||
| border-radius:20rpx; | border-radius:20rpx; | ||||
| background: #fff; | |||||
| } | } | ||||
| .c-left{ | .c-left{ | ||||
| width: 160rpx; | width: 160rpx; | ||||
| @@ -51,8 +55,7 @@ | |||||
| width:710rpx; | width:710rpx; | ||||
| height:94rpx; | height:94rpx; | ||||
| line-height: 94rpx; | line-height: 94rpx; | ||||
| background:rgba(82,160,253,1); | |||||
| box-shadow:0px 10rpx 22rpx 2rpx rgba(82,160,253,0.51); | |||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
| border-radius:10rpx; | border-radius:10rpx; | ||||
| color: #fff; | color: #fff; | ||||
| margin-top: 120rpx; | margin-top: 120rpx; | ||||
| @@ -61,8 +64,7 @@ | |||||
| width:710rpx; | width:710rpx; | ||||
| height:94rpx; | height:94rpx; | ||||
| line-height: 94rpx; | line-height: 94rpx; | ||||
| background:rgba(82,160,253,1); | |||||
| box-shadow:0px 10rpx 22rpx 2rpx rgba(82,160,253,0.51); | |||||
| background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); | |||||
| border-radius:10rpx; | border-radius:10rpx; | ||||
| color: #fff; | color: #fff; | ||||
| margin-top: 30rpx; | margin-top: 30rpx; | ||||
| @@ -1,4 +1,5 @@ | |||||
| // pages/spellDetail/index.js | // pages/spellDetail/index.js | ||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| var config = require("../../../config/config.js"); | var config = require("../../../config/config.js"); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
| @@ -9,6 +10,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| tuanzhang: imgurl.tuanzhang.url, | tuanzhang: imgurl.tuanzhang.url, | ||||
| spellBg: imgurl.spellBg.url, | spellBg: imgurl.spellBg.url, | ||||
| position: imgurl.position.url, | position: imgurl.position.url, | ||||
| @@ -2,5 +2,8 @@ | |||||
| "navigationBarTitleText": "积分换礼", | "navigationBarTitleText": "积分换礼", | ||||
| "navigationBarBackgroundColor": "#F13C42", | "navigationBarBackgroundColor": "#F13C42", | ||||
| "navigationBarTextStyle": "white", | "navigationBarTextStyle": "white", | ||||
| "enablePullDownRefresh": true | |||||
| "enablePullDownRefresh": true, | |||||
| "usingComponents": { | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| <!--pages/spellDetail/index.wxml--> | <!--pages/spellDetail/index.wxml--> | ||||
| <view class='container'> | |||||
| <navbar home back text="积分换礼" background='#FFF' ></navbar> | |||||
| <view class='container' style="padding-top:{{navigationBarHeight}}" > | |||||
| <!-- 拼团产品详情 --> | <!-- 拼团产品详情 --> | ||||
| <view class='detail'> | <view class='detail'> | ||||
| <view class='return-index' bindtap='gotoIndex'> | <view class='return-index' bindtap='gotoIndex'> | ||||
| @@ -2,8 +2,8 @@ | |||||
| page { | page { | ||||
| height: auto; | height: auto; | ||||
| overflow: auto; | overflow: auto; | ||||
| background: #f89132; | |||||
| background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); | |||||
| background: #F4F5F9; | |||||
| /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); */ | |||||
| background-size: cover; | background-size: cover; | ||||
| background-repeat: no-repeat; | background-repeat: no-repeat; | ||||
| } | } | ||||
| @@ -244,7 +244,7 @@ page { | |||||
| font-size:26rpx; | font-size:26rpx; | ||||
| font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
| font-weight:500; | font-weight:500; | ||||
| color:rgba(134,134,134,1); | |||||
| color:#FD782D; | |||||
| line-height:44rpx; | line-height:44rpx; | ||||
| } | } | ||||
| .detail-p-price{ | .detail-p-price{ | ||||
| @@ -252,7 +252,7 @@ page { | |||||
| font-size:26rpx; | font-size:26rpx; | ||||
| font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
| font-weight:500; | font-weight:500; | ||||
| color:rgba(51,51,51,1); | |||||
| color:#FD782D; | |||||
| } | } | ||||
| .detail-bottom{ | .detail-bottom{ | ||||
| border-top: 1rpx solid #F9F9F9; | border-top: 1rpx solid #F9F9F9; | ||||
| @@ -311,7 +311,7 @@ page { | |||||
| font-size:26rpx; | font-size:26rpx; | ||||
| font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
| font-weight:500; | font-weight:500; | ||||
| color:rgba(134,134,134,1); | |||||
| color:#FD782D; | |||||
| } | } | ||||
| .user-motto { | .user-motto { | ||||
| border: 0; | border: 0; | ||||
| @@ -330,7 +330,7 @@ page { | |||||
| border: 0; | border: 0; | ||||
| width:650rpx; | width:650rpx; | ||||
| height:85rpx; | height:85rpx; | ||||
| background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); | |||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
| border-radius:43rpx; | border-radius:43rpx; | ||||
| font-size:36rpx; | font-size:36rpx; | ||||
| font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
| @@ -338,7 +338,6 @@ page { | |||||
| color:rgba(254,254,254,1); | color:rgba(254,254,254,1); | ||||
| line-height: 85rpx; | line-height: 85rpx; | ||||
| margin-top: 100rpx; | margin-top: 100rpx; | ||||
| box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32); | |||||
| } | } | ||||
| .user-motto::after { | .user-motto::after { | ||||
| border: none; | border: none; | ||||
| @@ -10,7 +10,6 @@ let configUrls = extConfig.attr.configUrl; | |||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| fenxiang: imgurl.fenxiang.url, | fenxiang: imgurl.fenxiang.url, | ||||
| isshowposter: false,//是否显示分享弹框 | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| data: {}, | data: {}, | ||||
| status: 1, | status: 1, | ||||
| @@ -13,8 +13,8 @@ | |||||
| <view class='box'> | <view class='box'> | ||||
| <view class='act'> | <view class='act'> | ||||
| <view class='fenxiang' bindtap='showshare'> | <view class='fenxiang' bindtap='showshare'> | ||||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享有礼</text> | |||||
| <image src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享</text> | |||||
| </view> | </view> | ||||
| <text class='txt001'>{{data.title}}</text> | <text class='txt001'>{{data.title}}</text> | ||||
| <text class='txt002'>{{data.subTitle}}</text> | <text class='txt002'>{{data.subTitle}}</text> | ||||
| @@ -1136,20 +1136,22 @@ scroll-view { | |||||
| color: #666; | color: #666; | ||||
| } | } | ||||
| .fenxiang{ | |||||
| position: absolute; | |||||
| top: 3.2%; | |||||
| right: 27rpx; | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| } | |||||
| .fenxiang image { | .fenxiang image { | ||||
| width:48rpx; | width:48rpx; | ||||
| height: 48rpx; | height: 48rpx; | ||||
| position: absolute; | |||||
| top: 2.5%; | |||||
| right: 36rpx; | |||||
| margin: 0 auto; | |||||
| } | } | ||||
| .gift{ | .gift{ | ||||
| color: #3C3C3C; | color: #3C3C3C; | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| position: absolute; | |||||
| top: 65rpx; | |||||
| right: 24rpx; | |||||
| margin: 0 auto; | |||||
| } | } | ||||
| .modal { | .modal { | ||||
| width: 100%; | width: 100%; | ||||
| @@ -292,10 +292,14 @@ button::after{ border: none; } | |||||
| top: 0; | top: 0; | ||||
| } | } | ||||
| .frImg text{ | .frImg text{ | ||||
| transform: rotate(45deg); | |||||
| color: #FFFFFF; | |||||
| font-size: 18rpx; | |||||
| position: absolute; | |||||
| right: 0; | |||||
| top: 17rpx; | |||||
| height:78rpx; | |||||
| width:78rpx; | |||||
| transform:rotate(45deg); | |||||
| color:#FFFFFF; | |||||
| font-size:16rpx; | |||||
| position:absolute; | |||||
| text-align:center; | |||||
| line-height:53rpx; | |||||
| top:0; | |||||
| left:0; | |||||
| } | } | ||||