瀏覽代碼

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

tags/江西版6.1.0
meo 6 年之前
父節點
當前提交
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
})
.then(res => {
console.log(res.data.token)
console.log("-------------------------------------------token---------------------------------------")

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


+ 3
- 1
pages/coupon/detail/index.js 查看文件

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

this.setData({
receivedDisabled: true
})
@@ -418,7 +419,8 @@ Page({
if (options && options.couponChannelId){
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-body">
<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">
<swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
</swiper-item>
</block>
</swiper>
<view class="dots">
<!-- <view class="dots">
<block wx:for="{{coverPicture}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block>
</view>
</view> -->
</view>

<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;
width: 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,
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) {
that.setData({
@@ -313,9 +307,6 @@ Page({
console.log(e.detail.val)
console.log(e.detail.pageNum)
},
onBargain: function(e) {
console.log(e)
},
getWeapNote: function(couponChannelId, couponId, orderId) {
var that = this;
// 登录


+ 1
- 1
pages/spellGroup/mySpellGroup/index.js 查看文件

@@ -394,7 +394,7 @@ Page({
console.log(res.confirm)
if (res.confirm) {
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'>
<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">
<swiper-item>
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" />
</swiper-item>
</block>
</swiper>
<view class="dots">
<!-- <view class="dots">
<block wx:for="{{coverPicture}}" wx:key="unique">
<view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
</block>
</view>
</view> -->
</view>
<view class='title'>{{data.title}}</view>
<view class='text'>


+ 3
- 0
pages/spellGroup/mySpellGroup/index.wxss 查看文件

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


+ 19
- 9
pages/spellGroup/spellGroup.js 查看文件

@@ -42,15 +42,25 @@ Page({
})
if(options&&options.from=='myhtml'){
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();
},


Loading…
取消
儲存