zhangjing/cardtest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[更新]

Browse Source
This commit is contained in:
zhangmanman
2021-08-13 13:30:35 +08:00
parent 540d76bdb8
commit 8f7cc986c2
46 changed files with 1582 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pages/rights/rights.js
View File

@@ -35,7 +35,8 @@ Page({
payWay :[
{value: 0, name: "微信支付"},
{value: 1, name: "沃钱包支付"}
]
],
orderType : '' //订单类型
},
/**
@@ -47,17 +48,19 @@ Page({
typeWeb : options.type,
getType : options.getType,
openid : options.openid || '',
parentId : options.parentid || ''
orderType : options.orderType
})
// 获取详情
this.rightsInfo();
console.log(getApp().globalData.shareObj)
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {},
onShow() {
// 获取详情
this.rightsInfo();
},
/**
* 详情
@@ -259,13 +262,24 @@ Page({
isdeliver: this.data.detail.def_get
})
}
let right_id = this.data.detail.right_id,
address_id = this.data.address.id,
is_deliver = this.data.isdeliver,
qty = this.data.num,
parent_id = this.data.parentId
newParent = '',
shareObj = getApp().globalData.shareObj
if(shareObj.type == 'shareStored' && shareObj.type == this.data.orderType){
newParent = shareObj.userId
}
if(shareObj.type == 'shareGoods' && shareObj.goodsId == right_id){
console.log(22222)
newParent = shareObj.userId
}
wx.$api.index.rightStore(right_id, address_id, is_deliver, qty, parent_id).then(res=>{
wx.$api.index.rightStore(right_id, address_id, is_deliver, qty, newParent).then(res=>{
if(res.data.canPay == false) {
wx.showToast({
title : '支付成功',
@@ -287,6 +301,24 @@ Page({
rightsTap: true
})
}else {
// 储值
if(shareObj.type == 'shareStored'){
getApp().globalData.shareObj = {
type : '',
goodsId : '',
userId : ''
}
}
// 商品
if(shareObj.type == 'shareGoods' && shareObj.goodsId == right_id){
getApp().globalData.shareObj = {
type : '',
goodsId : '',
userId : ''
}
}
// 跳转收银台
wx.navigateTo({
url: "/pages/cashier/cashier?trade_no=" + res.data.trade_no + "&amount=" + this.data.amount + "&is_deliver=" + is_deliver + "&pay_type=rightsPay"

75
pages/rights/rights.wxml
View File

@@ -61,11 +61,11 @@
{{detail.title}}
</view>
<view class="rightsGoods-price">
<view class="rightsGoods-number"><text>￥</text>{{detail.price}}</view>
<view class="rightsGoods-number"><text>￥</text>{{detail.amount}}</view>
<view class="rightsAdd">
<view class="rightsAdd-btn rightsAdd-remove {{num != 1 ? 'active' : ''}}" bindtap="goodsNumber" data-type="remove">-</view>
<input class="rightsAdd-input" data-num="{{num}}" value="{{num}}" type="number" maxlength='4'
bindblur="goodsNumberInput"></input>
bindblur="goodsNumberInput" disabled></input>
<view class="rightsAdd-btn rightsAdd-plus" bindtap="goodsNumber" data-type="plus">+</view>
</view>
</view>
@@ -78,34 +78,15 @@
<view class="rightsLabel-left">{{detail.attribute.form_type}}</view>
<view class="rightsLabel-right rightsLabel-red">-￥{{score}}</view>
</view>
<!-- <view class="rightsLabel uni-border-top">
<view class="rightsLabel-left">{{detail.attribute.form_pay}}</view>
<view class="rightsLabel-right rightsLabel-score">￥{{amount}}</view>
</view> -->
</view>
<!-- 规格 -->
<view class="rightsList" wx:if="{{detail.type == 'physical'}}">
<!-- <view class="rightsLabel">
<view class="rightsLabel-left">{{detail.attribute.form_price}}</view>
<view class="rightsLabel-right">￥{{moreAmount}}</view>
</view> -->
<view class="rightsLabel" wx:if="{{platIndex == 1}}">
<view class="rightsLabel-left">电子券</view>
<view class="rightsLabel-right">{{detail.qty}}张</view>
</view>
<!-- <view class="rightsLabel">
<view class="rightsLabel-left">需要兑换的积分</view>
<view class="rightsLabel-right">{{detail.score}}</view>
</view> -->
<!-- <view class="rightsLabel">
<view class="rightsLabel-left">卡余额抵扣</view>
<view class="rightsLabel-right">-￥0.00</view>
</view> -->
<!-- <view class="rightsLabel">
<view class="rightsLabel-left">总金额</view>
<view class="rightsLabel-right">￥{{detail.price}}</view>
</view> -->
<block wx:if="{{detail.type == 'physical'}}">
<view class="rightsLabel">
<view class="rightsLabel-left">提交方式</view>
@@ -130,9 +111,11 @@
</view>
</block>
<block wx:else>
<navigator class="rightsLabel-right" hover-class="none"
url="/pages/address_form/address_form?type=Add">
添加收货地址<image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
<navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
<view class="rightsLabel-address-text" style="line-height: 90rpx;">
添加收货地址
</view>
<image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
</navigator>
</block>
</view>
@@ -142,37 +125,7 @@
</view>
</block>
</view>
<!-- 支付方式 -->
<!-- <view class="rightsList">
<view class="rightsLabel">
<view class="rightsLabel-left">请选择支付方式</view>
<view class="rightsLabel-right rightsLabel-range">
<picker range="{{payWay}}" range-key="name" bindchange="payBind">
<view class="tabs-text">
{{payWay[payWayIndex].name}}
</view>
</picker>
<image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
</view>
</view>
<view class="rightsLabel-pay">
<view class="rightsLabel-left">支付方式</view>
<view class="rightsLabel-right">{{payWay[payWayIndex].name}}</view>
</view>
</view> -->
<!-- 自提商家 -->
<!-- <view class="detailsStore" wx:if="{{platIndex == 0}}">
<view class="detailsStore-top">
自提门店
</view>
<view class="detailsStore-see">
<text>查看提货点信息</text>
<image src="/static/icon/storeArrow.png"></image>
</view>
</view> -->
<!-- 购买须知 -->
<view class="notice">
<view class="noticeTitle" bindtap="noticeTap">
@@ -214,14 +167,6 @@
{{item.all_address}}
</view>
<view class="address-tool-icon">选择地址</view>
<!-- <view class="address-tool">
<view class="address-tool-btn" bindtap="addressEdit" data-id="">编辑地址</view>
<view class="address-tool-btn address-tool-btn-del">删除地址</view>
</view> -->
</view>
</scroll-view>
</view>
<!-- <view class="webBack {{webShow == true ? '' : 'active'}}">
获取失败，请重新获取
</view> -->
</view>

12
pages/rights/rights.wxss
View File

@@ -20,17 +20,6 @@ page {
overflow: hidden;
}
/* .contBack::after {
width: 100%;
height: 30rpx;
position: absolute;
left: 0;
bottom: 0;
z-index: 2;
content: '';
background-image: linear-gradient(transparent, rgba(0,0,0,.25));
} */
.classBack {
position: absolute;
left: 28%;
@@ -712,6 +701,7 @@ page {
padding: 0 10rpx;
box-sizing: border-box;
margin: 50rpx 0 20rpx;
height: 120rpx;
}
.welfareCont-list-img {