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

[订单拆分，周五福利添加配送方式]

Browse Source
This commit is contained in:
zhangjing
2021-06-03 15:41:05 +08:00
parent e4752f75b7
commit cf31e7c5d7
12 changed files with 331 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/interfaces/exchange.js
View File

@@ -1,21 +1,41 @@
import {req} from "../request" import {req} from "../request"
//兑换订单列表 //权益商品订单列表
const index = (type) => req({url: "orders/index", data: {type: type}}) const orders = (type) => req({url: "orders/index", data: {type: type}})
//兑换订单详情 //权益订单列表
const ordersCoupons = (type) => req({url: "orders/coupons", data: {type: type}})
//福利商品订单列表
const welfare = (type) => req({url: "welfares/orders", data: {type: type}})
//福利券订单列表
const welfareCoupons = (type) => req({url: "welfares/coupons", data: {type: type}})
//权益订单详情
const show = (orderid) => req({url: "orders/show?", data: {orderid: orderid}}) const show = (orderid) => req({url: "orders/show?", data: {orderid: orderid}})
//周五福利订单详情
const welfaresShow = (orderid) => req({url: "welfares/orders/show?", data: {orderid: orderid}})
//取消兑换订单 //取消兑换订单
const cancel = (orderid) => req({url: "orders/cancel?orderid=" + orderid , method: "POST"}) const cancel = (orderid) => req({url: "orders/cancel?orderid=" + orderid , method: "POST"})
//福利取消订单
const welfaresCancel = (orderid) => req({url: "welfares/orders/cancel?orderid=" + orderid , method: "POST"})
//兑换订单支付 //兑换订单支付
const payments = (orderid) => req({url: "payments/order?orderid=" + orderid}) const payments = (orderid) => req({url: "payments/order?orderid=" + orderid})
export default({ export default({
index, orders,
ordersCoupons,
welfare,
welfareCoupons,
show, show,
welfaresShow,
cancel, cancel,
welfaresCancel,
payments payments
}) })

2
api/interfaces/index.js
View File

@@ -65,7 +65,7 @@ const newCity = () => req({url: "ajax/all_right_citys"})
const newidxCity = (code) => req({url: "ajax/all_right_children", data: {code: code}}) const newidxCity = (code) => req({url: "ajax/all_right_children", data: {code: code}})
//周五福利-获取支付信息 //周五福利-获取支付信息
const fridayInfo = (orderId) => req({url: "welfare/order/" + orderId}) const fridayInfo = (werlfare_id, address_id, is_deliver) => req({url: "welfare/order/" + werlfare_id, data: {address_id: address_id || '', is_deliver: is_deliver}})
//周五福利-支付 //周五福利-支付
const fridayPay = (trade_no) => req({url: "payments/welfare/wechat",method: "POST", data: {trade_no: trade_no}}) const fridayPay = (trade_no) => req({url: "payments/welfare/wechat",method: "POST", data: {trade_no: trade_no}})

2
pages/login/login.js
View File

@@ -49,7 +49,6 @@ Page({
wx.getUserProfile({ wx.getUserProfile({
desc : "获取你的昵称、头像、地区及性别", desc : "获取你的昵称、头像、地区及性别",
success : e => { success : e => {
console.log(e)
if(e.errMsg == "getUserProfile:ok"){ if(e.errMsg == "getUserProfile:ok"){
this.setData({ this.setData({
isLogin : true, isLogin : true,
@@ -60,7 +59,6 @@ Page({
// 检查用户登录Code是否过期 // 检查用户登录Code是否过期
wx.checkSession({ wx.checkSession({
success: res=>{ success: res=>{
console.log(res)
this.userLogin() this.userLogin()
}, },
fail: err=>{ fail: err=>{

15
pages/order/order.js
View File

@@ -5,6 +5,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
orderType : '', //订单来源
stateType : 'all', //状态 stateType : 'all', //状态
counts : '', //数量 counts : '', //数量
orderArr : [], //列表 orderArr : [], //列表
@@ -22,6 +23,7 @@ Page({
*/ */
onLoad (options) { onLoad (options) {
this.setData({ this.setData({
orderType: options.orderType,
stateType: options.stateType stateType: options.stateType
}) })
}, },
@@ -35,7 +37,12 @@ Page({
* 商品活动订单 * 商品活动订单
*/ */
orderInfo(page) { orderInfo(page) {
wx.$api.exchange.index(this.data.stateType, page).then(res=>{ let url = ''
if(this.data.orderType == 'welfare') url = wx.$api.exchange.welfare
if(this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfareCoupons
if(this.data.orderType == 'rights') url = wx.$api.exchange.orders
if(this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.ordersCoupons
url(this.data.stateType, page).then(res=>{
let listArr = this.data.orderArr, let listArr = this.data.orderArr,
newData = [] newData = []
if(page == 1 || page == undefined) listArr = [] if(page == 1 || page == undefined) listArr = []
@@ -79,7 +86,11 @@ Page({
content : '确认取消吗？', content : '确认取消吗？',
success : res=> { success : res=> {
if (res.confirm) { if (res.confirm) {
wx.$api.exchange.cancel(orderId).then(res=>{ let url = ''
if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfaresCancel
if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.cancel
url(orderId).then(res=>{
// 获取商品活动订单 // 获取商品活动订单
this.orderInfo() this.orderInfo()

45
pages/order/order.wxml
View File

@@ -8,17 +8,21 @@
<!-- <view class="state-tips" wx:if="{{counts.init != 0}}">{{counts.init}}</view> --> <!-- <view class="state-tips" wx:if="{{counts.init != 0}}">{{counts.init}}</view> -->
</view> </view>
<view class="order-tab-item {{stateType == 'paid' ? 'active':''}}" data-state="paid" bindtap="orderTab"> <view class="order-tab-item {{stateType == 'paid' ? 'active':''}}" data-state="paid" bindtap="orderTab">
待发货 {{orderType == 'welfare' || orderType == 'rights' ? '待发货' : '已支付'}}
<!-- <view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view> --> <!-- <view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view> -->
</view> </view>
<!-- <view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab"> <!-- <view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab">
待签收 待签收
<view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view> <view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view>
</view> --> </view> -->
<view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab"> <view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab" wx:if="{{orderType == 'welfare' || orderType == 'rights'}}">
已发货 已发货
<!-- <view class="state-tips" wx:if="{{counts.send != 0}}">{{counts.send}}</view> --> <!-- <view class="state-tips" wx:if="{{counts.send != 0}}">{{counts.send}}</view> -->
</view> </view>
<view class="order-tab-item {{stateType == 'completed' ? 'active':''}}" data-state="completed" bindtap="orderTab" wx:else>
已完成
<!-- <view class="state-tips" wx:if="{{counts.send != 0}}">{{counts.send}}</view> -->
</view>
</view> </view>
<!-- 列表 --> <!-- 列表 -->
@@ -29,29 +33,38 @@
</view> --> </view> -->
<view class="uni-border-down order-store"> <view class="uni-border-down order-store">
<view class="order-store-title nowrap">{{item.orderid}}</view> <view class="order-store-title nowrap">{{item.orderid}}</view>
<view class="order-store-stateText red" wx:if="{{item.state_text == '未支付'}}">{{item.state_text}}</view> <view class="order-store-stateText red" wx:if="{{item.state_text == '未支付' || item.status_text == '未支付'}}">
<view class="order-store-stateText green" wx:elif="{{item.state_text == '已支付'}}">{{item.state_text}}</view> {{item.state_text ||item.status_text}}
<view class="order-store-stateText" wx:else>{{item.state_text}}</view> </view>
<view class="order-store-stateText green" wx:elif="{{item.state_text == '已支付' || item.status_text == '已支付'}}">
{{item.state_text || item.status_text}}
</view>
<view class="order-store-stateText" wx:else>{{item.state_text || item.status_text}}</view>
</view> </view>
<view class="order-goods"> <view class="order-goods">
<image class="order-goods-cover" src="{{item.items.cover}}" mode="aspectFill"></image> <image class="order-goods-cover" src="{{item.items.cover || item.source.right.cover}}" mode="aspectFill"></image>
<view class="order-goods-content"> <view class="order-goods-content">
<view class="order-goods-content-name nowrap">{{item.items.title}}</view> <view class="order-goods-content-name nowrap">{{item.items.title || item.source.right.title}}</view>
<view class="orderVirtual {{item.items.type != 'virtual' ? '' : 'active'}}"> <view class="orderVirtual" wx:if="{{orderType == 'welfare' || orderType == 'welfareGoods'}}">
{{item.type_text}}
</view>
<view class="orderVirtual {{item.items.type != 'virtual' ? '' : 'active'}}" wx:else>
<block wx:if="{{item.items.type == 'virtual'}}">红包电子券</block> <block wx:if="{{item.items.type == 'virtual'}}">红包电子券</block>
<block wx:else>实物券</block> <block wx:else>实物券</block>
</view> </view>
<view class="order-goods-content-price nowrap"> <view class="order-goods-content-price nowrap">
<text>￥{{item.items.price}}</text> × {{item.items.qty}} <text>￥{{item.items.price || item.source.welfare.price}}</text> × {{item.items.qty ? item.items.qty : '1'}}
</view> </view>
</view> </view>
</view> </view>
<view class="uni-border-top order-btns"> <view class="uni-border-top order-btns">
<navigator class="order-btn" url="/pages/orderData/orderData?id={{item.orderid}}">订单详情</navigator> <navigator class="order-btn" url="/pages/orderData/orderData?id={{item.orderid}}&orderType={{orderType}}">订单详情</navigator>
<view class="order-btn" bindtap="orderDelete" data-id="{{item.orderid}}" wx:if="{{item.canCancel == true}}"> <view class="order-btn" bindtap="orderDelete" data-id="{{item.orderid}}" wx:if="{{item.canCancel == true || item.can.cancel == true}}">
取消订单</view> 取消订单
<view class="order-btn order-btn-back" bindtap="submitPay" data-id="{{item.orderid}}" </view>
wx:if="{{item.canPay == true}}">立即支付</view> <view class="order-btn order-btn-back" bindtap="submitPay" data-id="{{item.orderid}}" wx:if="{{item.canPay == true || item.can.pay == true}}">
立即支付
</view>
<!-- <view class="order-btn order-btn-back" bindtap="" data-id="{{item.orderid}}" wx:if="{{item.canSign == true}}">待签收</view> --> <!-- <view class="order-btn order-btn-back" bindtap="" data-id="{{item.orderid}}" wx:if="{{item.canSign == true}}">待签收</view> -->
</view> </view>
</view> </view>
@@ -82,13 +95,13 @@
</view> </view>
<radio class="radio" value="1" checked></radio> <radio class="radio" value="1" checked></radio>
</view> </view>
<view class="payContList-label"> <!-- <view class="payContList-label">
<view class="payContList-label-name"> <view class="payContList-label-name">
<image class="payContList-label-img" src="/static/img/wqb.jpg"></image> <image class="payContList-label-img" src="/static/img/wqb.jpg"></image>
沃钱包支付 沃钱包支付
</view> </view>
<radio class="radio" value="2"></radio> <radio class="radio" value="2"></radio>
</view> </view> -->
</radio-group> </radio-group>
<button class="payWayBtn" bindtap="orderPay">确认</button> <button class="payWayBtn" bindtap="orderPay">确认</button>
</view> </view>

39
pages/orderData/orderData.js
View File

@@ -13,7 +13,9 @@ Page({
*/ */
data: { data: {
statusHeight : app.globalData.statusBarHeight, statusHeight : app.globalData.statusBarHeight,
order : '' //订单详情 orderId : '', //订单id
order : '', //订单详情
orderType : '' //订单来源
}, },
/** /**
@@ -21,14 +23,21 @@ Page({
*/ */
onLoad (options) { onLoad (options) {
// 获取商品活动订单详情 // 获取商品活动订单详情
this.orderInfo(options.id); this.setData({
orderType : options.orderType,
orderId : options.id
})
this.orderInfo();
}, },
/** /**
* 商品活动订单详情 * 商品活动订单详情
*/ */
orderInfo(id) { orderInfo() {
wx.$api.exchange.show(id).then(res=>{ let url = ''
if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfaresShow
if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.show
url(this.data.orderId).then(res=>{
this.setData({ this.setData({
order : res.data order : res.data
}) })
@@ -45,10 +54,28 @@ Page({
content : '确认取消吗？', content : '确认取消吗？',
success : res=> { success : res=> {
if (res.confirm) { if (res.confirm) {
wx.$api.exchange.cancel(orderId).then(res=>{ let url = ''
if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfaresCancel
if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.cancel
url(orderId).then(res=>{
if(this.data.orderType == 'rightsCoupons') {
wx.reLaunch({ wx.reLaunch({
url: '/pages/order/order' url: '/pages/order/order?orderType=rightsCoupons'
}) })
} else if(this.data.orderType == 'rights') {
wx.reLaunch({
url: '/pages/order/order?orderType=rights'
})
} else if(this.data.orderType == 'welfare') {
wx.reLaunch({
url: '/pages/order/order?orderType=welfare'
})
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=welfareGoods'
})
}
wx.showToast({ wx.showToast({
title: res.data, title: res.data,

18
pages/orderData/orderData.wxml
View File

@@ -1,6 +1,6 @@
<!-- 订单状态 --> <!-- 订单状态 -->
<view class="order-statl"> <view class="order-statl">
{{order.state_text}} {{order.state_text || order.status_text}}
<block wx:if="{{order.state == 'UNPAY'}}"> <block wx:if="{{order.state == 'UNPAY'}}">
<image src="/static/icon/order_icon_00.png" class="order-statl-icon"></image> <image src="/static/icon/order_icon_00.png" class="order-statl-icon"></image>
</block> </block>
@@ -25,11 +25,11 @@
<view class="order-goods"> <view class="order-goods">
<view class="goods-goods-li"> <view class="goods-goods-li">
<image class="goods-img" src="{{order.items.cover}}" mode="aspectFill"></image> <image class="goods-img" src="{{order.items.cover || order.source.right.cover}}" mode="aspectFill"></image>
<view class="goods-body"> <view class="goods-body">
<view class="goods-name nowrap">{{order.items.title}}</view> <view class="goods-name nowrap">{{order.items.title || order.source.right.title}}</view>
<view class="goods-price nowrap">￥{{order.items.price}} <view class="goods-price nowrap">￥{{order.items.price || order.source.welfare.price}}
<text class="goods-qty">×{{order.items.qty}}</text> <text class="goods-qty">×{{order.items.qty ? order.items.qty : '1'}}</text>
</view> </view>
</view> </view>
</view> </view>
@@ -38,7 +38,7 @@
<view class="order-total"> <view class="order-total">
<view class="order-total-li order-type"> <view class="order-total-li order-type">
权益类型 权益类型
<text>{{order.type_text}}</text> <text>{{order.type_text || order.type_text}}</text>
</view> </view>
<view class="order-total-li"> <view class="order-total-li">
订单号 订单号
@@ -52,12 +52,12 @@
<view class="order-total"> <view class="order-total">
<view class="order-total-li"> <view class="order-total-li">
实际支付 实际支付
<text class="redCor">￥{{order.amount}}</text> <text class="redCor">￥{{order.amount || order.source.welfare.price}}</text>
</view> </view>
</view> </view>
<view class="order-data-footer {{statusHeight > 30 ? 'iphoneX':''}}"> <view class="order-data-footer {{statusHeight > 30 ? 'iphoneX':''}}">
<view class="order-btn" bindtap="orderRun">返回订单</view> <view class="order-btn" bindtap="orderRun">返回订单</view>
<view class="order-btn" bindtap="orderDelete" data-id="{{order.orderid}}" wx:if="{{order.canCancel}}">取消订单</view> <view class="order-btn" bindtap="orderDelete" data-id="{{order.orderid}}" wx:if="{{order.canCancel || order.can.cancel}}">取消订单</view>
<view class="order-btn order-btn-back" bindtap="orderPay" wx:if="{{order.canPay}}" data-id="{{order.orderid}}">立即支付</view> <view class="order-btn order-btn-back" bindtap="orderPay" wx:if="{{order.canPay || order.can.pay}}" data-id="{{order.orderid}}">立即支付</view>
</view> </view>

47
pages/rights/rights.js
View File

@@ -20,7 +20,7 @@ Page({
addressShow : false, //收货地址显示 addressShow : false, //收货地址显示
getType : '', //是否显示自提 getType : '', //是否显示自提
platIndex : 0, //选择提交方式下标 platIndex : 0, //选择提交方式下标
isdeliver : '', isdeliver : -1,
platformCp : [], //选择提交数组 platformCp : [], //选择提交数组
pointMoreShow: false, pointMoreShow: false,
from : '', from : '',
@@ -32,8 +32,8 @@ Page({
disabled : false, disabled : false,
payWayIndex : 0, payWayIndex : 0,
payWay :[ payWay :[
{value: 0, name: "微信支付"}, {value: 0, name: "微信支付"}
{value: 1, name: "沃钱包支付"} // {value: 1, name: "沃钱包支付"}
] ]
}, },
@@ -70,6 +70,15 @@ Page({
return { ...obj[val], ...{key: val} } return { ...obj[val], ...{key: val} }
}) })
if(this.data.isdeliver == -1){
if(res.data.detail.type == 'physical') {
this.setData({
isdeliver : res.data.detail.def_get
})
}
if(res.data.detail.type == 'virtual') this.setData({isdeliver : 1})
}
this.setData({ this.setData({
address : res.data.address, address : res.data.address,
allAddress : res.data.all_address, allAddress : res.data.all_address,
@@ -277,9 +286,15 @@ Page({
duration: 2000 duration: 2000
}) })
setTimeout(()=>{ setTimeout(()=>{
if(this.data.isdeliver == 1) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/order/order' url: '/pages/order/order?orderType=rightsCoupons'
}) })
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=rights'
})
}
},3000) },3000)
this.setData({ this.setData({
rightsTap: true rightsTap: true
@@ -302,16 +317,34 @@ Page({
icon : 'success' icon : 'success'
}) })
setTimeout(()=>{ setTimeout(()=>{
if(this.data.isdeliver == 1) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/coupon/coupon?type=couponPublic' url: '/pages/order/order?orderType=rightsCoupons'
}) })
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=rights'
})
}
// wx.reLaunch({
// url: '/pages/coupon/coupon?type=couponPublic'
// })
},3000) },3000)
} }
}, },
fail : res=>{ fail : res=>{
if(this.data.isdeliver == 1) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/order/order?stateType=unpay' url: '/pages/order/order?orderType=rightsCoupons&stateType=unpay'
}) })
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=rights&stateType=unpay'
})
}
// wx.reLaunch({
// url: '/pages/order/order?stateType=unpay'
// })
} }
}) })
}) })
@@ -343,7 +376,7 @@ Page({
}, },
/** /**
* 新增收货地址 * 重要提示显示
*/ */
pointMoreTap() { pointMoreTap() {
this.setData({ this.setData({

16
pages/user/user.wxml
View File

@@ -137,29 +137,29 @@
</view> </view>
<text>活动订单</text> <text>活动订单</text>
</view> --> </view> -->
<view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?stateType=all"> <view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?orderType=welfareGoods">
<view class="userOrder-icon"> <view class="userOrder-icon">
<image src="/static/img/userOrder_00.png"></image> <image src="/static/img/userOrder_00.png"></image>
</view> </view>
<text>所有订单</text> <text>福利券订单</text>
</view> </view>
<view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?stateType=unpay"> <view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?orderType=welfare">
<view class="userOrder-icon"> <view class="userOrder-icon">
<image src="/static/img/userOrder_01.png"></image> <image src="/static/img/userOrder_01.png"></image>
</view> </view>
<text>待支付</text> <text>福利商品订单</text>
</view> </view>
<view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?stateType=paid"> <view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?orderType=rightsCoupons">
<view class="userOrder-icon"> <view class="userOrder-icon">
<image src="/static/img/userOrder_02.png"></image> <image src="/static/img/userOrder_02.png"></image>
</view> </view>
<text>待发货</text> <text>权益订单</text>
</view> </view>
<view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?stateType=delivered"> <view class="userOrder-label" bindtap="userNav" data-url="/pages/order/order?orderType=rights">
<view class="userOrder-icon"> <view class="userOrder-icon">
<image src="/static/img/userOrder_03.png"></image> <image src="/static/img/userOrder_03.png"></image>
</view> </view>
<text>已发货</text> <text>权益商品订单</text>
</view> </view>
<!-- <view class="userOrder-label" bindtap="userNav" data-url="/pages/rights/rights?type=web&rightsId=39"> <!-- <view class="userOrder-label" bindtap="userNav" data-url="/pages/rights/rights?type=web&rightsId=39">
<view class="userOrder-icon"> <view class="userOrder-icon">

112
pages/welfare/welfare.js
View File

@@ -4,14 +4,21 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
address : '', //默认收货地址
allAddress : '', //收货地址列表
addressShow : false, //收货地址显示
noticeShow : false, //须知显示状态 noticeShow : false, //须知显示状态
pointMoreShow : false, //重要提示显示状态 pointMoreShow : false, //重要提示显示状态
isdeliver : -1,
groupId : '', //权益id groupId : '', //权益id
contData : '', //全局内容 contData : '', //全局内容
rightData : '', //权益详情 rightData : '', //权益详情
content : '', //内容介绍 content : '', //内容介绍
notification : '', //重要提示 notification : '', //重要提示
remark : '', //使用须知 remark : '', //使用须知
platformCp : [], //选择提交数组
platIndex : 0, //选择提交方式下标
}, },
/** /**
@@ -36,11 +43,31 @@ Page({
*/ */
rightsInfo() { rightsInfo() {
wx.$api.index.welfares(this.data.groupId).then(res=>{ wx.$api.index.welfares(this.data.groupId).then(res=>{
let obj = res.data.detail.right.express
let defGet = res.data.detail.right.def_get
let arr = new Array
arr = Object.keys(obj).map(val=>{
return { ...obj[val], ...{key: val} }
})
if(this.data.isdeliver == -1){
if(res.data.detail.right.type == 'physical') {
this.setData({ this.setData({
contData : res.data, isdeliver : res.data.detail.right.def_get
rightData : res.data.right, })
remark : res.data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"'), }
content : res.data.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"') if(res.data.detail.right.type == 'virtual') this.setData({isdeliver : 1})
}
this.setData({
address : res.data.address,
allAddress : res.data.all_address,
contData : res.data.detail,
platformCp : arr,
rightData : res.data.detail.right,
remark : res.data.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"'),
content : res.data.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
}) })
}).catch(err=>{ }).catch(err=>{
if(!err.login){ if(!err.login){
@@ -88,12 +115,69 @@ Page({
}) })
}, },
/**
* 选择提交方式
*/
platBind(e) {
this.setData({
platIndex : e.detail.value,
isdeliver : this.data.platformCp[e.detail.value].value
})
// 获取详情
this.rightsInfo()
},
/**
* 收货地址收起
*/
addressTap() {
this.setData({
addressShow : !this.data.addressShow
})
},
/**
* 选择收货地址
*/
selectAddress(e){
let new_addressId = e.currentTarget.dataset.id,
addressId = this.data.address.id
if (new_addressId != addressId) {
this.setData({
address : e.currentTarget.dataset.index,
addressShow : false
})
}else{
this.setData({
addressShow : false
})
}
// 获取详情
this.rightsInfo()
},
/**
* 新增收货地址
*/
addSelect() {
wx.navigateTo({
url: '/pages/address/address?type=selectAddress'
})
this.setData({
addressShow : false
})
},
/** /**
* 支付提交 * 支付提交
*/ */
submitOrder() { submitOrder() {
let welfareId = this.data.contData.welfare_id let welfareId = this.data.contData.welfare_id,
wx.$api.index.fridayInfo(welfareId).then(res=>{ address_id = this.data.address.id,
is_deliver = this.data.isdeliver
wx.$api.index.fridayInfo(welfareId, address_id, is_deliver).then(res=>{
wx.$api.index.fridayPay(res.data.trade_no).then(res=>{ wx.$api.index.fridayPay(res.data.trade_no).then(res=>{
let payInfo = JSON.parse(res.data) let payInfo = JSON.parse(res.data)
wx.requestPayment({ wx.requestPayment({
@@ -109,16 +193,28 @@ Page({
icon : 'success' icon : 'success'
}) })
setTimeout(()=>{ setTimeout(()=>{
if(this.data.isdeliver == 1) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/coupon/coupon?type=couponPublic' url: '/pages/order/order?orderType=welfareGoods'
}) })
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=welfare'
})
}
},3000) },3000)
} }
}, },
fail : res=>{ fail : res=>{
if(this.data.isdeliver == 1) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/order/order?stateType=unpay' url: '/pages/order/order?orderType=welfareGoods&stateType=unpay'
}) })
} else {
wx.reLaunch({
url: '/pages/order/order?orderType=welfare&stateType=unpay'
})
}
} }
}) })
}) })

50
pages/welfare/welfare.wxml
View File

@@ -51,6 +51,34 @@
<view class="rightsLabel-left">{{contData.attribute.form_type}}</view> <view class="rightsLabel-left">{{contData.attribute.form_type}}</view>
<view class="rightsLabel-right rightsLabel-red">￥{{contData.score}}</view> <view class="rightsLabel-right rightsLabel-red">￥{{contData.score}}</view>
</view> </view>
<block wx:if="{{rightData.type == 'physical'}}">
<view class="rightsLabel">
<view class="rightsLabel-left">请选择提交方式</view>
<view class="rightsLabel-right rightsLabel-range">
<picker range="{{platformCp}}" range-key="name" bindchange="platBind">
<view class="tabs-text">
{{platformCp[platIndex].name}}
</view>
</picker>
<image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
</view>
</view>
<view class="rightsLabel rightsLabel-address" wx:if="{{platformCp[platIndex].name == '快递'}}">
<view class="rightsLabel-left">收货地址</view>
<block wx:if="{{address != ''}}">
<view class="rightsLabel-right" bindtap="addressTap">
<text class="nowrap">{{address.all_address}}</text>
<image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
</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>
</block>
</view>
</block>
</view> </view>
<!-- 应付总金额 --> <!-- 应付总金额 -->
@@ -86,3 +114,25 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 选择收货地址 -->
<view class="addressBack {{addressShow ? 'active':''}}" bindtap="addressTap"></view>
<view class="addressCont {{addressShow ? 'active':''}}">
<view class="addressCont-title uni-border-bottom">
<view class="addressCont-left">请选择收货地址</view>
<view class="addressCont-right" bindtap="addSelect">新增收货地址</view>
</view>
<scroll-view class="header-classify" scroll-y="true">
<view class="addressCont-list uni-border-bottom" wx:for="{{allAddress}}" wx:key="allAddress"
bindtap="selectAddress" data-id="{{item.id}}" data-index="{{item}}">
<view class="addressCont-top">
<view class="addressCont-name">{{item.name}}</view>
<view class="addressCont-tel">{{item.mobile}}</view>
</view>
<view class="addressCont-text">
{{item.all_address}}
</view>
<view class="address-tool-icon">选择地址</view>
</view>
</scroll-view>
</view>