|
|
@@ -52,7 +52,7 @@
|
|
|
<image src='../static/images/line.png'></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-if="Number(orderInfoVo.secondType)<5 && Number(orderInfoVo.secondType)!==2&&Number(orderInfoVo.type)!=2" class="allAddress">
|
|
|
+ <view v-if="isAddress" class="allAddress">
|
|
|
<view class='address acea-row row-between-wrapper' @tap='onAddress'>
|
|
|
<view class='addressCon' v-if="addressInfo.realName">
|
|
|
<view class='name'>{{addressInfo.realName}}
|
|
|
@@ -99,17 +99,17 @@
|
|
|
<view class='item acea-row row-between-wrapper'>
|
|
|
<view>配送方式</view>
|
|
|
<view v-if="item.deliveryMethodMer.length===3 && item.takeTheirSwitch" class='discount acea-row row-middle'>
|
|
|
- <text @tap="openShowBox(item,index)">{{item.shippingType === 1 ? '商家配送' : item.shippingType === 2 ? '到店自提' : '骑手配送'}}</text>
|
|
|
+ <text @tap="openShowBox(item,index)">{{item.shippingType === 1 ? '配送' : item.shippingType === 2 ? '自提' : '骑手配送'}}</text>
|
|
|
|
|
|
<text @tap="openShowBox(item,index)" class='iconfont icon-jiantou'></text>
|
|
|
</view>
|
|
|
<view v-else class='discount'>
|
|
|
- {{item.shippingType === 1 ? '商家配送' : item.shippingType === 2 ? '到店自提' : '骑手配送'}}
|
|
|
+ {{item.shippingType === 1 ? '配送' : item.shippingType === 2 ? '自提' : '骑手配送'}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-if="item.shippingType == 2 && item.takeTheirSwitch" class="store-address acea-row">
|
|
|
<view>
|
|
|
- <view class="name phone">{{item.phone}}</view>
|
|
|
+ <view class="name phone">{{orderType == 'secondHand' ? item.sellerName : ''}}{{item.phone}}</view>
|
|
|
<view class="name w-480px">{{item.addressDetail}}</view>
|
|
|
</view>
|
|
|
<view class="map" @click="goMap(item)">
|
|
|
@@ -133,7 +133,7 @@
|
|
|
<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免运费</view>
|
|
|
<view v-else class='money'>￥{{item.freightFee}}</view>
|
|
|
</view>
|
|
|
- <view v-show="item.svipDiscountPrice != 0&&orderInfoVo.type!=2" class='item acea-row row-between-wrapper'>
|
|
|
+ <view v-show="item.svipDiscountPrice != 0&&orderInfoVo.type!=2 && !orderType" class='item acea-row row-between-wrapper'>
|
|
|
<view>会员优惠</view>
|
|
|
<view class='money'>-￥{{item.svipDiscountPrice}}</view>
|
|
|
</view>
|
|
|
@@ -167,7 +167,7 @@
|
|
|
<view>运费：</view>
|
|
|
<view class='money'>+￥{{orderInfoVo.freightFee}}</view>
|
|
|
</view>
|
|
|
- <view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2" class='item acea-row row-between-wrapper'>
|
|
|
+ <view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2 && !orderType" class='item acea-row row-between-wrapper'>
|
|
|
<view>会员优惠</view>
|
|
|
<view class='money'>-￥{{orderInfoVo.svipDiscountPrice}}</view>
|
|
|
</view>
|
|
|
@@ -210,7 +210,7 @@
|
|
|
<PointsPrice v-if="orderInfoVo.secondType === ProductTypeEnum.Integral" :pointsPrice="orderInfoVo"
|
|
|
:pointsGoodsStyle="hotPointsStyle"></PointsPrice>
|
|
|
<!-- 其他价格 -->
|
|
|
- <text v-else class='price_color'>￥{{orderInfoVo.payFee || 0}}</text>
|
|
|
+ <text v-else class='price_color'>￥{{orderInfoVo.payFee || orderInfoVo.proTotalFee || 0}}</text>
|
|
|
</view>
|
|
|
<view class='settlement' style='z-index:100' @tap="SubOrder">
|
|
|
{{secondType === ProductTypeEnum.Integral?"确认兑换":"立即下单"}}
|
|
|
@@ -291,6 +291,11 @@
|
|
|
loadPreOrderApi
|
|
|
} from '@/api/order.js';
|
|
|
import {
|
|
|
+ loadPreSecondHandOrderApi,
|
|
|
+ secondHandTakeTheirApi,
|
|
|
+ secondHandOrderCreate
|
|
|
+ } from '@/api/secondHand.js';
|
|
|
+ import {
|
|
|
getAddressDetail,
|
|
|
getAddressDefault
|
|
|
} from '@/api/user.js';
|
|
|
@@ -355,7 +360,7 @@
|
|
|
// 是否可以使用优惠券、积分抵扣。 基础订单/云盘订单，卡密,虚拟，可以使用优惠券、积分抵扣
|
|
|
isProductType() {
|
|
|
return this.type === ProductMarketingTypeEnum.Normal && this.secondType !== this.ProductTypeEnum
|
|
|
- .Integral && this.secondType !== this.ProductTypeEnum.Video
|
|
|
+ .Integral && this.secondType !== this.ProductTypeEnum.Video && this.orderType !== 'secondHand'
|
|
|
},
|
|
|
...mapGetters(['productType', 'isLogin'])
|
|
|
},
|
|
|
@@ -463,6 +468,7 @@
|
|
|
addressList: [], //地址列表数据
|
|
|
orderProNum: 0,
|
|
|
orderNo: '', //预下单订单号
|
|
|
+ orderType: '',
|
|
|
theme: app.globalData.theme,
|
|
|
addressChangeId: 0,
|
|
|
isShowBox: false,
|
|
|
@@ -482,7 +488,8 @@
|
|
|
orderForm: [], //系统表单配置的数据
|
|
|
orderExtend: {}, //提交接口表单的数据
|
|
|
productId: '',
|
|
|
- groupActivityId: ''
|
|
|
+ groupActivityId: '',
|
|
|
+ isAddress: false
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -497,10 +504,12 @@
|
|
|
},
|
|
|
onLoad(options) {
|
|
|
this.orderNo = options.orderNo || 0;
|
|
|
+ this.orderType = options.orderType || '';
|
|
|
+ console.log(options)
|
|
|
this.addressChangeId = parseInt(options.addressId) || 0;
|
|
|
this.is_address = options.is_address ? true : false;
|
|
|
if (this.isLogin) {
|
|
|
- this.getloadPreOrder();
|
|
|
+ this.orderType == 'secondHand' ? this.getSecondHandPreOrder() : this.getloadPreOrder()
|
|
|
} else {
|
|
|
toLogin();
|
|
|
}
|
|
|
@@ -599,12 +608,14 @@
|
|
|
this.isShowBox = false;
|
|
|
},
|
|
|
getTakeTheir(id) {
|
|
|
- takeTheirApi(id).then(res => {
|
|
|
+ let api = this.orderType == 'secondHand' ? secondHandTakeTheirApi : takeTheirApi
|
|
|
+ api(id).then(res => {
|
|
|
this.merchangtInfo = res.data; //商户信息
|
|
|
this.$set(this.merchantOrderVoList[this.activeIndex], 'addressDetail', res.data.addressDetail);
|
|
|
this.$set(this.merchantOrderVoList[this.activeIndex], 'phone', res.data.phone);
|
|
|
this.$set(this.merchantOrderVoList[this.activeIndex], 'latitude', res.data.latitude);
|
|
|
this.$set(this.merchantOrderVoList[this.activeIndex], 'longitude', res.data.longitude);
|
|
|
+ console.log(this.merchantOrderVoList[this.activeIndex])
|
|
|
}).catch(err => {
|
|
|
return this.$util.Tips({
|
|
|
title: err
|
|
|
@@ -649,6 +660,55 @@
|
|
|
boxClose() {
|
|
|
this.isShowBox = false
|
|
|
},
|
|
|
+ // 二手交易订单详情
|
|
|
+ getSecondHandPreOrder() {
|
|
|
+ loadPreSecondHandOrderApi(this.orderNo).then(res => {
|
|
|
+ let orderInfoVo = res.data;
|
|
|
+ orderInfoVo.secondType = 0;
|
|
|
+ orderInfoVo.type = 0;
|
|
|
+ this.orderInfoVo = {
|
|
|
+ ...orderInfoVo,
|
|
|
+ systemFormValue: orderInfoVo.systemFormValue ? this.$util.objToArr(JSON.parse(
|
|
|
+ orderInfoVo.systemFormValue)) : []
|
|
|
+ };
|
|
|
+
|
|
|
+ console.log(this.orderInfoVo, '11111111111111111111111')
|
|
|
+ this.isAddress = Number(this.orderInfoVo.secondType) < 5 && Number(this.orderInfoVo.secondType) !== 2 && Number(
|
|
|
+ this.orderInfoVo.type) != 2;
|
|
|
+
|
|
|
+ orderInfoVo.merchantInfoList.map(item => {
|
|
|
+ if (item.shippingType == 2) this.isAddress = false;
|
|
|
+ this.orderMerchantRequestList.push({
|
|
|
+ shippingType: item.shippingType,
|
|
|
+ merId: item.merId,
|
|
|
+ remark: '',
|
|
|
+ userCouponId: item.userCouponId
|
|
|
+ })
|
|
|
+ if (item.shippingType === 2) this.getTakeTheir(item.orderInfoList[0].productId)
|
|
|
+ item.addressDetail = this.merchangtInfo.addressDetail;
|
|
|
+ item.phone = this.merchangtInfo.phone;
|
|
|
+ item.latitude = this.merchangtInfo.latitude;
|
|
|
+ item.longitude = this.merchangtInfo.longitude;
|
|
|
+ });
|
|
|
+ this.merchantOrderVoList = orderInfoVo.merchantInfoList; //商户端数据
|
|
|
+ this.type = orderInfoVo.type; //订单类型
|
|
|
+ this.secondType = orderInfoVo.secondType; //订单二级类型:0-普通订单，1-积分订单，2-虚拟订单，4-视频号订单，5-云盘订单，6-卡密订单
|
|
|
+ this.orderProNum = orderInfoVo.orderProNum;
|
|
|
+ // if (orderInfoVo.addressId && this.addressChangeId === 0) {
|
|
|
+ // this.addressId = orderInfoVo.addressId;
|
|
|
+ // } else {
|
|
|
+ // this.addressId = this.addressChangeId;
|
|
|
+ // if (orderInfoVo.addressId != this.addressChangeId && this.addressChangeId > 0)
|
|
|
+ // this.computedPrice();
|
|
|
+ // }
|
|
|
+ this.getaddressInfo();
|
|
|
+ }).catch(err => {
|
|
|
+ // console.log(err)
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/goods/order_list/index'
|
|
|
+ });
|
|
|
+ })
|
|
|
+ },
|
|
|
// 订单详情
|
|
|
getloadPreOrder: function() {
|
|
|
loadPreOrderApi(this.orderNo).then(res => {
|
|
|
@@ -667,11 +727,14 @@
|
|
|
};
|
|
|
|
|
|
console.log(this.orderInfoVo, '0000000000000000000000000000000')
|
|
|
+ this.isAddress = Number(this.orderInfoVo.secondType) < 5 && Number(this.orderInfoVo.secondType) !== 2 && Number(
|
|
|
+ this.orderInfoVo.type) != 2;
|
|
|
this.merchantOrderVoList = orderInfoVo.merchantInfoList; //商户端数据
|
|
|
this.platCouponFee = orderInfoVo.platCouponFee; //平台优惠券总金额
|
|
|
this.platUserCouponId = orderInfoVo.platUserCouponId;
|
|
|
this.merCouponFee = orderInfoVo.merCouponFee; //店铺优惠券总金额
|
|
|
orderInfoVo.merchantInfoList.map(item => {
|
|
|
+ if (item.shippingType == 2) this.isAddress = false;
|
|
|
this.orderMerchantRequestList.push({
|
|
|
shippingType: item.shippingType,
|
|
|
merId: item.merId,
|
|
|
@@ -697,6 +760,7 @@
|
|
|
}
|
|
|
this.getaddressInfo();
|
|
|
}).catch(err => {
|
|
|
+ // console.log(err)
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/goods/order_list/index'
|
|
|
});
|
|
|
@@ -847,7 +911,8 @@
|
|
|
// #endif
|
|
|
},
|
|
|
onCreate(data) {
|
|
|
- orderCreate(data).then(res => {
|
|
|
+ const api = this.orderType == 'secondHand' ? secondHandOrderCreate : orderCreate;
|
|
|
+ api(data).then(res => {
|
|
|
if (res.data.groupBuyIsFull == 1) {
|
|
|
uni.hideLoading();
|
|
|
return this.$refs.sh_popup.open('center')
|
|
|
@@ -857,7 +922,7 @@
|
|
|
this.changeOrderPay(res.data.orderNo, 'yue', 'yue', 'integral', 'integral', '0')
|
|
|
} else {
|
|
|
// 其他商品走正常流程，去支付收银台页面
|
|
|
- this.getToPayment(this.secondType, res.data)
|
|
|
+ this.getToPayment(this.secondType, res.data, this.orderType)
|
|
|
}
|
|
|
|
|
|
uni.hideLoading();
|
|
|
@@ -873,114 +938,145 @@
|
|
|
let that = this,
|
|
|
data = {};
|
|
|
let flag = false;
|
|
|
- that.orderMerchantRequestList.map(function(v) {
|
|
|
- if (v.shippingType === 1 && !that.addressId && that.orderInfoVo.secondType !== 2) {
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- });
|
|
|
- if (flag) {
|
|
|
- that.$util.Tips({
|
|
|
- title: '请选择收货地址'
|
|
|
+ if (this.orderType == 'secondHand') {
|
|
|
+ console.log(this.addressInfo)
|
|
|
+ that.orderMerchantRequestList.map(function(v) {
|
|
|
+ if (v.shippingType === 1 && !that.addressInfo.id) {
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
});
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (flag) {
|
|
|
+ that.$util.Tips({
|
|
|
+ title: '请选择收货地址'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- let systemFormValue = Array.from(this.orderInfoVo.systemFormValue)
|
|
|
- let systemFormData = []
|
|
|
- for (var i = 0; i < systemFormValue.length; i++) {
|
|
|
- let curdata = systemFormValue[i]
|
|
|
- if (['radios'].indexOf(curdata.name) == -1 && (curdata.titleShow.val || (['uploadPicture',
|
|
|
- 'dateranges'
|
|
|
- ].indexOf(curdata.name) == -1 && curdata.value && curdata.value.trim()))) {
|
|
|
- if ((curdata.name === 'texts' && curdata.valConfig.tabVal == 0) || ['dates', 'times',
|
|
|
- 'selects', 'citys', 'checkboxs'
|
|
|
- ].indexOf(curdata.name) != -1) {
|
|
|
- if (!curdata.value || (curdata.value && !curdata.value.trim())) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请填写${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ data = {
|
|
|
+ addressId: this.merchantOrderVoList[this.activeIndex].shippingType == 1 ? this.addressInfo.id : null,
|
|
|
+ orderMerchantRequestList: [
|
|
|
+ {
|
|
|
+ remark: "",
|
|
|
+ sellerId: this.merchantOrderVoList[this.activeIndex].sellerId,
|
|
|
+ shippingType: this.merchantOrderVoList[this.activeIndex].shippingType
|
|
|
}
|
|
|
+ ],
|
|
|
+ preOrderNo: this.orderNo
|
|
|
+ }
|
|
|
+ uni.showLoading({
|
|
|
+ title: '订单提交中'
|
|
|
+ });
|
|
|
+ that.payment(data);
|
|
|
+ } else {
|
|
|
+ that.orderMerchantRequestList.map(function(v) {
|
|
|
+ if (v.shippingType === 1 && !that.addressId && that.orderInfoVo.secondType !== 2) {
|
|
|
+ flag = true;
|
|
|
}
|
|
|
- if (curdata.name === 'timeranges') {
|
|
|
- if (!curdata.value) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请选择${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ });
|
|
|
+ if (flag) {
|
|
|
+ that.$util.Tips({
|
|
|
+ title: '请选择收货地址'
|
|
|
+ });
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ let systemFormValue = Array.from(this.orderInfoVo.systemFormValue)
|
|
|
+ let systemFormData = []
|
|
|
+ for (var i = 0; i < systemFormValue.length; i++) {
|
|
|
+ let curdata = systemFormValue[i]
|
|
|
+ if (['radios'].indexOf(curdata.name) == -1 && (curdata.titleShow.val || (['uploadPicture',
|
|
|
+ 'dateranges'
|
|
|
+ ].indexOf(curdata.name) == -1 && curdata.value && curdata.value.trim()))) {
|
|
|
+ if ((curdata.name === 'texts' && curdata.valConfig.tabVal == 0) || ['dates', 'times',
|
|
|
+ 'selects', 'citys', 'checkboxs'
|
|
|
+ ].indexOf(curdata.name) != -1) {
|
|
|
+ if (!curdata.value || (curdata.value && !curdata.value.trim())) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请填写${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'dateranges') {
|
|
|
- if (!curdata.value.length) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请选择${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'timeranges') {
|
|
|
+ if (!curdata.value) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请选择${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'texts' && curdata.valConfig.tabVal == 4) {
|
|
|
- if (curdata.value <= 0) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请填写大于0的${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'dateranges') {
|
|
|
+ if (!curdata.value.length) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请选择${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'texts' && curdata.valConfig.tabVal == 3) {
|
|
|
- if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(curdata.value)) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'texts' && curdata.valConfig.tabVal == 4) {
|
|
|
+ if (curdata.value <= 0) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请填写大于0的${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'texts' && curdata.valConfig.tabVal == 1) {
|
|
|
- if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(curdata.value)) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'texts' && curdata.valConfig.tabVal == 3) {
|
|
|
+ if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(curdata.value)) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'texts' && curdata.valConfig.tabVal == 2) {
|
|
|
- if (!
|
|
|
- /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/i
|
|
|
- .test(curdata.value)) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'texts' && curdata.valConfig.tabVal == 1) {
|
|
|
+ if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(curdata.value)) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (curdata.name === 'uploadPicture') {
|
|
|
- if (!curdata.value.length) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: `请上传${curdata.titleConfig.val}`
|
|
|
- });
|
|
|
+ if (curdata.name === 'texts' && curdata.valConfig.tabVal == 2) {
|
|
|
+ if (!
|
|
|
+ /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/i
|
|
|
+ .test(curdata.value)) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请填写正确的${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (curdata.name === 'uploadPicture') {
|
|
|
+ if (!curdata.value.length) {
|
|
|
+ return that.$util.Tips({
|
|
|
+ title: `请上传${curdata.titleConfig.val}`
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ this.orderExtend[curdata.key] = curdata.value
|
|
|
+ systemFormData.push({
|
|
|
+ title: curdata.titleConfig.val,
|
|
|
+ value: curdata.value,
|
|
|
+ })
|
|
|
}
|
|
|
- this.orderExtend[curdata.key] = curdata.value
|
|
|
- systemFormData.push({
|
|
|
- title: curdata.titleConfig.val,
|
|
|
- value: curdata.value,
|
|
|
- })
|
|
|
+ data = {
|
|
|
+ addressId: that.addressId,
|
|
|
+ orderMerchantRequestList: that.orderMerchantRequestList,
|
|
|
+ isUseIntegral: that.isUseIntegral,
|
|
|
+ preOrderNo: that.orderNo,
|
|
|
+ platUserCouponId: this.platUserCouponId,
|
|
|
+ systemFormId: this.orderInfoVo.systemFormId,
|
|
|
+ orderExtend: JSON.stringify(systemFormData)
|
|
|
+
|
|
|
+ };
|
|
|
+ uni.showLoading({
|
|
|
+ title: '订单提交中'
|
|
|
+ });
|
|
|
+ that.payment(data);
|
|
|
+ //// #ifdef MP
|
|
|
+ // openPaySubscribe().then(() => {
|
|
|
+ // that.payment(data);
|
|
|
+ // });
|
|
|
+ // // #endif
|
|
|
+ // // #ifndef MP
|
|
|
+ // that.payment(data);
|
|
|
+ // // #endif
|
|
|
}
|
|
|
- data = {
|
|
|
- addressId: that.addressId,
|
|
|
- orderMerchantRequestList: that.orderMerchantRequestList,
|
|
|
- isUseIntegral: that.isUseIntegral,
|
|
|
- preOrderNo: that.orderNo,
|
|
|
- platUserCouponId: this.platUserCouponId,
|
|
|
- systemFormId: this.orderInfoVo.systemFormId,
|
|
|
- orderExtend: JSON.stringify(systemFormData)
|
|
|
-
|
|
|
- };
|
|
|
- uni.showLoading({
|
|
|
- title: '订单提交中'
|
|
|
- });
|
|
|
- that.payment(data);
|
|
|
- //// #ifdef MP
|
|
|
- // openPaySubscribe().then(() => {
|
|
|
- // that.payment(data);
|
|
|
- // });
|
|
|
- // // #endif
|
|
|
- // // #ifndef MP
|
|
|
- // that.payment(data);
|
|
|
- // // #endif
|
|
|
})
|
|
|
}
|
|
|
}
|
ZZ