吴亚瑞 / basicEnglish · 提交

转到一个项目

作者 牛承志
提交 956f20206ed30e3d48dec3676daf14068ffcdebf 1 个父辈 cfc9c673

8.26niu

内嵌 并排对比
正在显示 12 个修改的文件 包含 58 行增加 和 24 行删除
1 <view class="top"> 1 <view class="top">
2 - <image src="{{schoolData.image}}"></image> 2 + <image src="{{schoolData.image}}" mode="widthFix"></image>
3 </view> 3 </view>
4 <view class="nav"> 4 <view class="nav">
5 <view class="nav-1"> 5 <view class="nav-1">
1 .top image { 1 .top image {
2 width: 100%; 2 width: 100%;
3 } 3 }
4 - 4 +.top{
  5 + height: 400rpx;
  6 + overflow: hidden;
  7 +}
5 .nav { 8 .nav {
6 position: relative; 9 position: relative;
7 text-align: center; 10 text-align: center;
8 } 11 }
9 -  
10 -.nav-1 image { 12 +.nav-1{
11 position: absolute; 13 position: absolute;
  14 + width: 168rpx;
  15 + height: 168rpx;
  16 + overflow: hidden;
  17 + border-radius: 50%;
12 left: 44rpx; 18 left: 44rpx;
13 top: -84rpx; 19 top: -84rpx;
14 } 20 }
15 .nav-1 image { 21 .nav-1 image {
16 width: 168rpx; 22 width: 168rpx;
17 - height: 168rpx;  
18 - border-radius: 50%;  
19 } 23 }
20 24
21 .anniu { 25 .anniu {
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 16
17 .top image { 17 .top image {
18 width: 100%; 18 width: 100%;
  19 + height:468rpx;
19 border-radius: 24rpx 24rpx 0 0; 20 border-radius: 24rpx 24rpx 0 0;
20 } 21 }
21 22
@@ -8,12 +8,12 @@ @@ -8,12 +8,12 @@
8 <view class="moon"> 8 <view class="moon">
9 <view class="mony" wx:for="{{shoppingData}}" wx:key='key' > 9 <view class="mony" wx:for="{{shoppingData}}" wx:key='key' >
10 <view> 10 <view>
11 - <image src="{{item.image}}"></image> 11 + <image src="{{item.image}}" mode="aspectFill"></image>
12 </view> 12 </view>
13 <view class="mon-1"> 13 <view class="mon-1">
14 <text>{{item.title}}</text> 14 <text>{{item.title}}</text>
15 <view class="mon-2"> 15 <view class="mon-2">
16 - <view class="mon-4"><image src="/img/ic_jifen@2x.png"></image> 16 + <view class="mon-4"><image src="/img/ic_jifen@2x.png" mode=""></image>
17 <view>{{item.number}}</view> 17 <view>{{item.number}}</view>
18 </view> 18 </view>
19 <view class="mon-3" bindtap="duihuan" data-id="{{item}}">兑换</view> 19 <view class="mon-3" bindtap="duihuan" data-id="{{item}}">兑换</view>
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 <image src="/img/ic_date.png" catchtap="goCalend"></image> 3 <image src="/img/ic_date.png" catchtap="goCalend"></image>
4 </view> 4 </view>
5 </view> 5 </view>
6 -<!--今日任务 --> 6 +<view style="min-height:calc(100vh - 360rpx);">
  7 + <!--今日任务 -->
7 <view class="cast" style="background:rgba(113,116,132,1);" bindtap="gotoday" data-type="today" data-clock="{{raskData.Today.type}}" 8 <view class="cast" style="background:rgba(113,116,132,1);" bindtap="gotoday" data-type="today" data-clock="{{raskData.Today.type}}"
8 data-id="{{raskData.Today.today_id}}" wx:if="{{raskData.Today}}"> 9 data-id="{{raskData.Today.today_id}}" wx:if="{{raskData.Today}}">
9 <view class="cast-1">今日任务 10 <view class="cast-1">今日任务
@@ -46,6 +47,7 @@ @@ -46,6 +47,7 @@
46 </view> --> 47 </view> -->
47 </view> 48 </view>
48 <view class="kong" wx:if="{{!raskData.Today&&!raskData.Match&&!raskData.Evaluation}}">今日没有任务哦！</view> 49 <view class="kong" wx:if="{{!raskData.Today&&!raskData.Match&&!raskData.Evaluation}}">今日没有任务哦！</view>
  50 +</view>
49 51
50 <!-- --> 52 <!-- -->
51 <view class="footer"> 53 <view class="footer">
@@ -52,15 +52,17 @@ @@ -52,15 +52,17 @@
52 } 52 }
53 53
54 .footer { 54 .footer {
55 - position: absolute;  
56 - bottom: 3%;  
57 - left: 50%; 55 + /* position: fixed;
  56 + bottom: 40rpx;
  57 + left: 50%; */
58 font-size: 28rpx; 58 font-size: 28rpx;
59 color: rgba(139, 139, 141, 1); 59 color: rgba(139, 139, 141, 1);
60 - margin-left: -60rpx; 60 + /* margin-left: -60rpx; */
61 display: flex; 61 display: flex;
62 justify-content: center; 62 justify-content: center;
63 align-items: center; 63 align-items: center;
  64 + margin-top: 60rpx;
  65 + margin-bottom: 60rpx;
64 } 66 }
65 67
66 .footer image { 68 .footer image {
@@ -74,7 +76,7 @@ @@ -74,7 +76,7 @@
74 width: 80rpx !important; 76 width: 80rpx !important;
75 height: 80rpx; 77 height: 80rpx;
76 padding: 0; 78 padding: 0;
77 - margin-left: 20rpx; 79 + margin: 0 !important;
78 } 80 }
79 81
80 .kong { 82 .kong {
@@ -144,15 +144,12 @@ Page({ @@ -144,15 +144,12 @@ Page({
144 bind_choose(e) { 144 bind_choose(e) {
145 let Index = e.currentTarget.dataset.index 145 let Index = e.currentTarget.dataset.index
146 let answer = e.currentTarget.dataset.answer 146 let answer = e.currentTarget.dataset.answer
147 - console.log(answer, '222')  
148 - console.log(e, '222')  
149 this.setData({ 147 this.setData({
150 nav: Index 148 nav: Index
151 }) 149 })
152 150
153 let listindex = this.data.curent 151 let listindex = this.data.curent
154 let list = this.data.clockData.List 152 let list = this.data.clockData.List
155 - console.log(list)  
156 153
157 list.forEach((item, index) => { 154 list.forEach((item, index) => {
158 console.log(item) 155 console.log(item)
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <view class="top-1" bindtap="getmy"> 8 <view class="top-1" bindtap="getmy">
9 <view> 9 <view>
10 <view style="display: flex;justify-content: center;width: 184rpx;height: 184rpx;overflow: hidden;border-radius: 50%;"> 10 <view style="display: flex;justify-content: center;width: 184rpx;height: 184rpx;overflow: hidden;border-radius: 50%;">
11 - <image src="{{token ? meData.avatar : '../../img/ic_head@2x.png'}}" mode="widthFix"></image> 11 + <image src="{{token ? meData.avatar : '../../img/ic_head@2x.png'}}" mode="aspectFill"></image>
12 </view> 12 </view>
13 <view style="display: flex;justify-content: center;"> 13 <view style="display: flex;justify-content: center;">
14 <view class="bigtitle">{{meData.nickname}}</view> 14 <view class="bigtitle">{{meData.nickname}}</view>
@@ -63,6 +63,16 @@ Page({ @@ -63,6 +63,16 @@ Page({
63 } 63 }
64 64
65 }, 65 },
  66 + // 预览
  67 + preview(event) {
  68 +
  69 + let currentUrl = event.currentTarget.dataset.src
  70 + let currentUrlList = event.currentTarget.dataset.list
  71 + wx.previewImage({
  72 + current: currentUrl, // 当前显示图片的http链接
  73 + urls: currentUrlList, // 需要预览的图片http链接列表
  74 + })
  75 + },
66 76
67 onReady: function () { 77 onReady: function () {
68 78
@@ -21,8 +21,9 @@ @@ -21,8 +21,9 @@
21 <image src="/img/ic_voice40@2x.png" bindtap="goAudio" data-audio="{{MessageCon.audio_file}}"></image> 21 <image src="/img/ic_voice40@2x.png" bindtap="goAudio" data-audio="{{MessageCon.audio_file}}"></image>
22 </view> 22 </view>
23 </view> 23 </view>
24 - <view class="boxd-end">  
25 - <image src="{{MessageCon.image}}"></image> 24 + <view class="boxd-end" data-src="{{MessageCon.image}}"
  25 + data-list="{{MessageCon.image}}" bindtap="preview">
  26 + <image src="{{MessageCon.image}}" mode="widthFix"></image>
26 </view> 27 </view>
27 28
28 </view> 29 </view>
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 }, 5 },
6 "setting": { 6 "setting": {
7 "urlCheck": false, 7 "urlCheck": false,
8 - "es6": false,  
9 - "enhance": true, 8 + "es6": true,
  9 + "enhance": false,
10 "postcss": true, 10 "postcss": true,
11 "preloadBackgroundData": false, 11 "preloadBackgroundData": false,
12 "minified": true, 12 "minified": true,
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 "disablePlugins": [], 29 "disablePlugins": [],
30 "outputPath": "" 30 "outputPath": ""
31 }, 31 },
32 - "enableEngineNative": false, 32 + "bundle": false,
33 "useIsolateContext": true, 33 "useIsolateContext": true,
34 "useCompilerModule": true, 34 "useCompilerModule": true,
35 "userConfirmedUseCompilerModuleSwitch": false, 35 "userConfirmedUseCompilerModuleSwitch": false,
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 }, 46 },
47 "scripts": {}, 47 "scripts": {},
48 "isGameTourist": false, 48 "isGameTourist": false,
49 - "appid": "wxb717767cdf314ea2", 49 + "appid": "wxc65ea6b2677a6703",
50 "simulatorType": "wechat", 50 "simulatorType": "wechat",
51 "simulatorPluginLibVersion": {}, 51 "simulatorPluginLibVersion": {},
52 "condition": { 52 "condition": {
@@ -59,6 +59,23 @@ @@ -59,6 +59,23 @@
59 "pathName": "pages/eight/eight", 59 "pathName": "pages/eight/eight",
60 "query": "", 60 "query": "",
61 "scene": null 61 "scene": null
  62 + },
  63 + {
  64 + "name": "pages/task/task",
  65 + "pathName": "pages/task/task",
  66 + "query": "",
  67 + "scene": null
  68 + },
  69 + {
  70 + "name": "pages/index/index",
  71 + "pathName": "pages/index/index",
  72 + "query": "",
  73 + "scene": null
  74 + },
  75 + {
  76 + "name": "pages/mission/mission",
  77 + "pathName": "pages/mission/mission",
  78 + "scene": null
62 } 79 }
63 ] 80 ]
64 } 81 }