Bläddra i källkod

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/湖南版5.1.4
刘晖 6 år sedan
förälder
incheckning
c73c24cf1b
3 ändrade filer med 5 tillägg och 2 borttagningar
  1. +1
    -0
      pages/main/index.js
  2. +1
    -1
      pages/main/index.wxml
  3. +3
    -1
      pages/main/index.wxss

+ 1
- 0
pages/main/index.js Visa fil

@@ -95,6 +95,7 @@ Page({
var st = setTimeout(function() { var st = setTimeout(function() {
wx.hideToast() wx.hideToast()
var size = that.setCanvasSize(); var size = that.setCanvasSize();
console.log(size)
var url = JSON.stringify({ var url = JSON.stringify({
END: "C", END: "C",
TYPE: "memberCode", TYPE: "memberCode",


+ 1
- 1
pages/main/index.wxml Visa fil

@@ -42,7 +42,7 @@
<view class='showQrcode' bindtap='hideQrcode' wx:if="{{showQrcode}}"> <view class='showQrcode' bindtap='hideQrcode' wx:if="{{showQrcode}}">
<view class="canvas-box"> <view class="canvas-box">
<text class='memberIds' wx:if="{{levelName!='无'}}">{{levelName}}</text> <text class='memberIds' wx:if="{{levelName!='无'}}">{{levelName}}</text>
<canvas canvas-id="mycanvas2" />
<canvas canvas-id="mycanvas2" id='mycanvas2' />
<button class='button' bindtap='mySpecial'>特享礼遇</button> <button class='button' bindtap='mySpecial'>特享礼遇</button>
</view> </view>


+ 3
- 1
pages/main/index.wxss Visa fil

@@ -12,6 +12,9 @@
line-height: 88rpx; line-height: 88rpx;
overflow: hidden; overflow: hidden;
} }
#mycanvas2{
height: 500rpx;
}
.red{ .red{
position:absolute; position:absolute;
width:13rpx; width:13rpx;
@@ -151,7 +154,6 @@ border-radius:16rpx;
font-size: 32rpx; font-size: 32rpx;
color: rgba(2, 192, 255, 1); color: rgba(2, 192, 255, 1);
overflow: hidden; overflow: hidden;
margin-top: 38rpx;
} }
.memberIds{ .memberIds{
padding-top: 30rpx; padding-top: 30rpx;


Laddar…
Avbryt
Spara