Browse Source

Merge branch 'develop-medou' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini into develop-medou

* 'develop-medou' of http://gogs.1hhd.com/1hjz-3N/1hjz-mini:
  no message
  no message
  no message
feature/v1.1.0
lfs3 7 years ago
parent
commit
458ba0b038
5 changed files with 5 additions and 10 deletions
  1. 3
      pages/activity_list/activity_list.js
  2. 2
      pages/activity_list/activity_list.wxml
  3. 6
      pages/index/index.wxml
  4. 2
      pages/mcenter/mcenter.wxml
  5. 2
      pages/pay_result/pay_result.js

3
pages/activity_list/activity_list.js

@ -38,7 +38,6 @@ Page({
'sessionId': wx.getStorageSync('sessionId')
},
success: function (res) {
console.log(res);
wx.hideLoading();
if (res.data.code == 0 && res.data.response.length > 0) {
var lists = that.data.repos;
@ -116,10 +115,8 @@ Page({
},
itemClick: function (event) {
var activityNo = event.currentTarget.dataset.activityno;
var groupNo = event.currentTarget.dataset.groupno;
console.log("groupNo:" + groupNo);
wx.navigateTo({
url: '../activity_detail/activity_detail?activityNo=' + activityNo + '&groupNo=' + groupNo
})

2
pages/activity_list/activity_list.wxml

@ -1,7 +1,7 @@
<!--pages/activity_list/activity_list.wxml-->
<view wx:if="{{repos.length > 0}}">
<view wx:for="{{repos}}" wx:key="">
<view wx:for="{{repos}}" wx:key="activityNo">
<view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active" bindtap="itemClick" data-activityNo="{{item.activityNo}}" data-groupNo="{{item.groupNo}}">

6
pages/index/index.wxml

@ -12,7 +12,7 @@
<view class='top-right'></view>
</view>
<swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
<block wx:for="{{imgUrls}}">
<block wx:for="{{imgUrls}}" wx:key="imgUrl">
<swiper-item>
<image src="{{item.imgUrl}}" class="slide-image" mode='widthFill' />
</swiper-item>
@ -20,12 +20,12 @@
</swiper>
<view class='menu'>
<view class='list'>
<view wx:for-items="{{menu_list}}" wx:if="{{index < 4}}" class="view">
<view wx:for-items="{{menu_list}}" wx:if="{{index < 4}}" class="view" wx:key="name">
<button class='{{item.className}}'>{{item.name}}</button>
</view>
</view>
</view>
<view wx:for-items="{{activityList}}">
<view wx:for-items="{{activityList}}" wx:key="goodsNo">
<view class='activity_list_view' bindtap='loading' data-item='{{item.goodsNo}}'>
<view class='view'>
<image src='{{item.showUrl}}' class='image'></image>

2
pages/mcenter/mcenter.wxml

@ -17,7 +17,7 @@
<button class='loginBtn' bindtap='goLogin'>登录/注册</button>
</view>
</view>
<view wx:for-items="{{items}}">
<view wx:for-items="{{items}}" wx:key="page">
<view class='box top{{item.top}}' bindtap='go{{item.page}}'>
<image class="icon" src="{{item.img}}" mode='aspectFit'/>
<text class='text'>{{item.title}}</text>

2
pages/pay_result/pay_result.js

@ -24,7 +24,6 @@ Page({
onLoad: function (options) {
this.data.groupNo = options.groupNo;
console.log('options>' + this.data.groupNo);
wx.getSystemInfo({
success: (res) => {
this.setData({
@ -122,7 +121,6 @@ Page({
// 如果是分享按钮被点击, 不处理关闭
const { index } = detail;
if (index === 0) {
return
} else if (index == 1) {
this.showMomentImage();

Loading…
Cancel
Save