Просмотр исходного кода

[首次登陆成长值,拼团待支付页面的跳转][修改]:[首次登陆成长值显示总值,拼团待支付页面的跳转路径修改]

tags/江西版6.1.0
meo 6 лет назад
Родитель
Сommit
1fb4c05280
9 измененных файлов: 35 добавлений и 29 удалений
  1. +0
    -3
      app.js
  2. +3
    -1
      pages/coupon/detail/index.js
  3. +3
    -3
      pages/coupon/detail/index.wxml
  4. +3
    -0
      pages/coupon/detail/index.wxss
  5. +0
    -9
      pages/main/index.js
  6. +1
    -1
      pages/spellGroup/mySpellGroup/index.js
  7. +3
    -3
      pages/spellGroup/mySpellGroup/index.wxml
  8. +3
    -0
      pages/spellGroup/mySpellGroup/index.wxss
  9. +19
    -9
      pages/spellGroup/spellGroup.js

+ 0
- 3
app.js Просмотреть файл

@@ -35,9 +35,6 @@ App({
data: usrdata data: usrdata
}) })
.then(res => { .then(res => {
console.log(res.data.token)
console.log("-------------------------------------------token---------------------------------------")

if (res.data && res.data.score) { if (res.data && res.data.score) {
if (res.data.score != 0) { if (res.data.score != 0) {
that.globalData.score = res.data.score; that.globalData.score = res.data.score;


+ 3
- 1
pages/coupon/detail/index.js Просмотреть файл

@@ -191,6 +191,7 @@ Page({
cUserId: this.data.cardData.cuserId, cUserId: this.data.cardData.cuserId,
updateDate: util.formatTime(Number(this.data.cardData.updateDate), "yyyy-MM-dd hh:mm:ss") updateDate: util.formatTime(Number(this.data.cardData.updateDate), "yyyy-MM-dd hh:mm:ss")
} }

this.setData({ this.setData({
receivedDisabled: true receivedDisabled: true
}) })
@@ -418,7 +419,8 @@ Page({
if (options && options.couponChannelId){ if (options && options.couponChannelId){
that.getDetail(options.couponChannelId, 'notendclock'); that.getDetail(options.couponChannelId, 'notendclock');
} }

console.log(options.cuserId)
console.log("---------------------------------options.cuserId---------------------------------------------------")
/** /**
* 转赠判断 * 转赠判断
*/ */


+ 3
- 3
pages/coupon/detail/index.wxml Просмотреть файл

@@ -3,18 +3,18 @@
<view class='coupons'> <view class='coupons'>
<view class="coupons-body"> <view class="coupons-body">
<view wx:if="{{coverPicture.length>0}}" class="banner"> <view wx:if="{{coverPicture.length>0}}" class="banner">
<swiper class="index-slide" bindchange="swiperChange" autoplay="true" circular="false" current="{{swiperCurrent}}">
<swiper class="index-slide" bindchange="swiperChange" indicator-dots="true" autoplay="true" circular="false" current="{{swiperCurrent}}">
<block wx:for="{{coverPicture}}" wx:key="unique"> <block wx:for="{{coverPicture}}" wx:key="unique">
<swiper-item> <swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" /> <image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
<view class="dots">
<!-- <view class="dots">
<block wx:for="{{coverPicture}}" wx:key="unique"> <block wx:for="{{coverPicture}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view> <view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block> </block>
</view>
</view> -->
</view> </view>


<view class='coupons_info' style='position:relative;z-index:9'> <view class='coupons_info' style='position:relative;z-index:9'>


+ 3
- 0
pages/coupon/detail/index.wxss Просмотреть файл

@@ -806,4 +806,7 @@ checkbox-group, radio-group {
margin-top: 40rpx; margin-top: 40rpx;
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
}
.wx-swiper-dots{
margin-bottom: 30rpx;
} }

+ 0
- 9
pages/main/index.js Просмотреть файл

@@ -270,12 +270,6 @@ Page({
credit: res.data.credit ? res.data.credit : 0, credit: res.data.credit ? res.data.credit : 0,
score: res.data.score score: res.data.score
}) })
if (res.data && res.data.score) {
if (res.data.score != 0) {
app.globalData.score = res.data.score;
}
}
if (res.data.nickName) { if (res.data.nickName) {
that.setData({ that.setData({
@@ -313,9 +307,6 @@ Page({
console.log(e.detail.val) console.log(e.detail.val)
console.log(e.detail.pageNum) console.log(e.detail.pageNum)
}, },
onBargain: function(e) {
console.log(e)
},
getWeapNote: function(couponChannelId, couponId, orderId) { getWeapNote: function(couponChannelId, couponId, orderId) {
var that = this; var that = this;
// 登录 // 登录


+ 1
- 1
pages/spellGroup/mySpellGroup/index.js Просмотреть файл

@@ -394,7 +394,7 @@ Page({
console.log(res.confirm) console.log(res.confirm)
if (res.confirm) { if (res.confirm) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/order/index/index?id=all',
url: `/pages/spellGroup/spellGroup?from=myspellList`,
}) })
} }
} }


+ 3
- 3
pages/spellGroup/mySpellGroup/index.wxml Просмотреть файл

@@ -1,18 +1,18 @@
<view class="content-box"> <view class="content-box">
<view class='content'> <view class='content'>
<view wx:if="{{coverPicture.length>0}}" class="banner"> <view wx:if="{{coverPicture.length>0}}" class="banner">
<swiper class="index-slide" bindchange="swiperChange" autoplay="true" circular="false" current="{{swiperCurrent}}">
<swiper class="index-slide" bindchange="swiperChange" indicator-dots="true" autoplay="true" circular="false" current="{{swiperCurrent}}">
<block wx:for="{{coverPicture}}" wx:key="unique"> <block wx:for="{{coverPicture}}" wx:key="unique">
<swiper-item> <swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" /> <image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
<view class="dots">
<!-- <view class="dots">
<block wx:for="{{coverPicture}}" wx:key="unique"> <block wx:for="{{coverPicture}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view> <view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block> </block>
</view>
</view> -->
</view> </view>
<view class='title'>{{data.title}}</view> <view class='title'>{{data.title}}</view>
<view class='text'> <view class='text'>


+ 3
- 0
pages/spellGroup/mySpellGroup/index.wxss Просмотреть файл

@@ -19,6 +19,9 @@
border-radius:48rpx; border-radius:48rpx;
margin-right:25rpx; margin-right:25rpx;
} }
.wx-swiper-dots{
margin-bottom: 30rpx;
}
button::after{ border: none; } button::after{ border: none; }
.goback image{ .goback image{
position:absolute; position:absolute;


+ 19
- 9
pages/spellGroup/spellGroup.js Просмотреть файл

@@ -42,15 +42,25 @@ Page({
}) })
if(options&&options.from=='myhtml'){ if(options&&options.from=='myhtml'){
that.getmyList(); that.getmyList();
}
else{
that.getList(1, "spellList");
that.setData({
flag: "spellList",
spellList: true,
myspellList: false,
lists: null
})
}else{
// 去支付
if (options && options.from == 'myspellList'){
that.getList(1, "myspellList");
that.setData({
flag: "myspellList",
spellList: false,
myspellList: true,
lists: null
})
}else{
that.getList(1, "spellList");
that.setData({
flag: "spellList",
spellList: true,
myspellList: false,
lists: null
})
}
} }
that.getUserInfo(); that.getUserInfo();
}, },


Загрузка…
Отмена
Сохранить