@@ -72,7 +72,10 @@ | |||
"pages/activityCalendar/activityCalendar", | |||
"pages/complaint/complaint", | |||
"pages/questionnaire/questionnaire", | |||
"pages/questionnaire/questionnaireLsit/questionnaireLsit" | |||
"pages/questionnaire/questionnaireLsit/questionnaireLsit", | |||
"pages/site/site", | |||
"pages/siteUser/siteUser", | |||
"pages/siteAdd/siteAdd" | |||
], | |||
"subpackages": [ | |||
{ | |||
@@ -6,7 +6,7 @@ var config = { | |||
url: configUrls, | |||
wsurl: sockUrls, | |||
api: { | |||
/* | |||
/* | |||
*记录微信订阅 | |||
*/ | |||
activityDey:"/wxActivity/listStatus",//活动日历日期 | |||
@@ -359,6 +359,14 @@ var config = { | |||
ifFengMap:'/fengniaomap/getConfig', | |||
//分享小程序二维码 | |||
getQrcodeFx:"/user/userinfoQrCode", | |||
//添加收货地址 | |||
collectSite:"/userBasicInfoAddress/saveOrUpdate", | |||
//收货地址列表 | |||
siteList: "/userBasicInfoAddress/list", | |||
//查询收货地址 | |||
siteCheck: "/userBasicInfoAddress/findById", | |||
//删除收获地址 | |||
siteDel: "/userBasicInfoAddress/del", | |||
}, | |||
weapp: { | |||
AppId: weappId | |||
@@ -905,7 +905,8 @@ Page({ | |||
generalAppId:res.data.appId, | |||
generalPayPath: res.data.payPath, | |||
generalExtraData: res.data.extraData, | |||
extraDataFlag: JSON.stringify(res.data.extraData) | |||
extraDataFlag: JSON.stringify(res.data.extraData), | |||
}); | |||
console.log( that.data.extraDataFlag,"123456789") | |||
} | |||
@@ -50,6 +50,14 @@ | |||
<text class="fl">备注:</text> | |||
<text class='fr time' >{{remark}}</text> | |||
</view> | |||
<view class="clearfix" wx:if="{{stopFees.sysNotice!=''&&stopFees.sysNotice}}"> | |||
<text class="fl" style="color:red">系统提示:</text> | |||
<text class='fr' style="color:red">{{stopFees.sysNotice}}</text> | |||
</view> | |||
<!-- <view > | |||
系统提示: | |||
</view> --> | |||
<!-- 停车费用大于0 etcp --> | |||
<view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&parkVendor==1}}"> | |||
<navigator bindfail="bindfail" path="{{payPath}}" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{etcpAppId}}" extra-data='{{extraData}}' version="{{carMiniVersion}}"> | |||
@@ -130,6 +130,12 @@ | |||
<view class="particulars_go">></view> | |||
</view> | |||
</navigator> | |||
<navigator url="/pages/site/site" open-type="navigate"> | |||
<view class="particulars_list"> | |||
<view class="particulars_name">个人信息</view> | |||
<view class="particulars_go">></view> | |||
</view> | |||
</navigator> | |||
<navigator url="/pages/complaint/complaint" open-type="navigate"> | |||
<view class="particulars_list"> | |||
<view class="particulars_name">投诉建议</view> | |||
@@ -202,7 +202,7 @@ Page({ | |||
.then(res => { | |||
console.log(res) | |||
wx.navigateTo({ | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.orderNumber}` | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.mainOrderId}` | |||
}) | |||
}) | |||
.catch(err => { | |||
@@ -213,11 +213,14 @@ Page({ | |||
}) | |||
}, | |||
inviteFriend: function (e) { | |||
let data = e.currentTarget.dataset.data | |||
console.log(data) | |||
/** | |||
* 添加标识 | |||
*/ | |||
wx.navigateTo({ | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${e.currentTarget.dataset.id}` | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${data.id}&composeOrderType=${data.composeOrderType}` | |||
}) | |||
}, | |||
barginAgain: function (e) { | |||
@@ -45,11 +45,11 @@ | |||
<text class="txt03">原价{{item.price/100}}</text> | |||
<text class="txt04 mr" wx:if="{{item.orderStatus == 7}}">已砍价到底价:{{item.salePrice/100}}元</text> | |||
</view> | |||
<view class='again' wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}" hover-class="none" hover-stop-propagation="false" data-id="{{item.id}}" bindtap="inviteFriend"> | |||
<view class='again' wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}" hover-class="none" hover-stop-propagation="false" data-data="{{item}}" bindtap="inviteFriend"> | |||
<view class="botton1">邀请好友</view> | |||
</view> | |||
<view class='again' wx:if="{{item.orderStatus == 7}}" data-id="{{item.id}}" bindtap="inviteFriend"> | |||
<view class='again' wx:if="{{item.orderStatus == 7}}" data-data="{{item}}" bindtap="inviteFriend"> | |||
<view class="botton2" hover-class="none" hover-stop-propagation="false">立即付款</view> | |||
<!-- <image class="icon" src="{{bargainsuccess}}" lazy-load="true"/> --> | |||
</view> | |||
@@ -45,14 +45,18 @@ Page({ | |||
}).then(res => { | |||
let that = this; | |||
if (options.orderId || options.orderId && options.from == 'discount') { | |||
console.log(options, "options") | |||
if (options.from) { | |||
that.setData({ | |||
orderId: options.orderId, | |||
composeOrderType: options.composeOrderType, | |||
from: "discount" | |||
}) | |||
} else { | |||
that.setData({ | |||
orderId: options.orderId | |||
orderId: options.orderId, | |||
composeOrderType: options.composeOrderType, | |||
}) | |||
} | |||
app.globalData.wmorder = options.orderId | |||
@@ -277,7 +281,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -562,7 +566,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: that.data.composeOrderType | |||
} | |||
}) | |||
.then(res => { | |||
@@ -778,9 +783,10 @@ Page({ | |||
onShareAppMessage: function(options) { | |||
app.globalData.previewFlag = true | |||
var that = this; | |||
var shareObj = { | |||
console.log(`/pages/index/index?orderId=${that.data.orderId}&from=${"discount"}&composeOrderType=${that.data.composeOrderType}`) | |||
var shareObj = { | |||
title: that.data.nickName + '邀请您帮砍' + that.data.data.title, | |||
path: `/pages/index/index?orderId=${that.data.data.id}&from=${"discount"}`, | |||
path: `/pages/index/index?orderId=${that.data.orderId}&from=${"discount"}&composeOrderType=${that.data.composeOrderType}`, | |||
success: function(res) { | |||
if (res.errMsg == 'shareAppMessage:ok') {} | |||
}, | |||
@@ -790,11 +796,12 @@ Page({ | |||
}; | |||
// 来自页面内的按钮的转发 | |||
if (options.from == 'button') { | |||
var orderId = options.target.dataset.orderid; | |||
shareObj.path = `/pages/index/index?orderId=${orderId}&from=${"discount"}`; | |||
// var orderId = options.target.dataset.orderid; | |||
shareObj.path = `/pages/index/index?orderId=${that.data.orderId}&from=${"discount"}&composeOrderType=${that.data.composeOrderType}`; | |||
} | |||
console.log(shareObj) | |||
// 返回shareObj | |||
return shareObj; | |||
// return shareObj; | |||
}, | |||
}) | |||
@@ -75,7 +75,7 @@ | |||
<text>{{data.price/100}}元</text> | |||
<text>立即购买</text> | |||
</button> --> | |||
<button class='share user-motto' data-orderId='{{data.id}}' id="shareBtn" open-type="share" hover-class="other-button-hover">邀请好友砍价</button> | |||
<button class='share user-motto' data-orderId='{{data.mainOrderId}}' id="shareBtn" open-type="share" hover-class="other-button-hover">邀请好友砍价</button> | |||
</view> | |||
</form> | |||
<view style='display:{{display}}' wx:if="{{data.orderStatus == 7&&discountStatus == 1}}" class="btns01 clearfix" hover-class="none" hover-stop-propagation="false"> | |||
@@ -278,7 +278,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -440,7 +440,7 @@ Page({ | |||
}) | |||
.then(res => { | |||
if (typeof (res) != "undefined") { | |||
let orderId = "" + res.data.id; | |||
let orderId = "" + res.data.mainOrderId; | |||
that.setData({ | |||
orderId: orderId | |||
}); | |||
@@ -378,7 +378,7 @@ Page({ | |||
queueData: null, | |||
showbutton: true, | |||
formId: formId | |||
}) | |||
}) | |||
Http.get({ | |||
url: config.api.getQuestion, | |||
data: { | |||
@@ -712,7 +712,7 @@ Page({ | |||
/** | |||
* 支付订单更新 | |||
*/ | |||
payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => { | |||
payOrderUpdate: (orderId, payOrderId, status, reason, type, _this, composeOrderType) => { | |||
console.log("*-----------------") | |||
let that = this; | |||
// 支付成功 | |||
@@ -720,7 +720,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -732,13 +732,13 @@ Page({ | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${ | |||
orderId | |||
}&cardIf=true&contentType=${_this.data.contentType}` | |||
}&cardIf=true&contentType=${_this.data.contentType}&composeOrderType=${composeOrderType}` | |||
}); | |||
} else if (type == 'free') { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${ | |||
orderId | |||
}&contentType=${_this.data.contentType}` | |||
}&contentType=${_this.data.contentType}&composeOrderType=${composeOrderType}` | |||
}); | |||
} | |||
}) | |||
@@ -746,7 +746,7 @@ Page({ | |||
console.log(err); | |||
if (!type) { | |||
setTimeout(function() { | |||
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this); | |||
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType); | |||
}, 2000) | |||
} | |||
}) | |||
@@ -925,11 +925,13 @@ Page({ | |||
} | |||
}) | |||
.then(res => { | |||
console.log(res,"res123") | |||
if (discount != 'discount') { | |||
if (typeof(res) != "undefined") { | |||
let orderId = "" + res.data.id; | |||
let orderId = "" + res.data.mainOrderId; | |||
that.setData({ | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: res.data.composeOrderType | |||
}); | |||
if (res.data.payment > 0) { | |||
// 支付金额不为0 | |||
@@ -939,7 +941,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: res.data.composeOrderType | |||
} | |||
}) | |||
.then(res => { | |||
@@ -955,7 +958,7 @@ Page({ | |||
wx.showLoading({ | |||
title: '订单正在处理中...', | |||
}) | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that); | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that, that.data.composeOrderType); | |||
if (res.errMsg == "requestPayment:ok") { | |||
/** | |||
* 用户支付成功以后跳转到券包列表 | |||
@@ -978,7 +981,7 @@ Page({ | |||
/** | |||
* 支付失败,需要更新订单的状态 | |||
*/ | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', 'fail', that); | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', 'fail', that, that.data.composeOrderType); | |||
that.setData({ | |||
showbutton: false | |||
}) | |||
@@ -999,7 +1002,7 @@ Page({ | |||
}) | |||
} else { | |||
// 免费券 | |||
that.payOrderUpdate(orderId, "0", 1, '', 'free', that); | |||
that.payOrderUpdate(orderId, "0", 1, '', 'free', that, that.data.composeOrderType); | |||
if (that.data.cardType == 100) { | |||
wx.setStorage({ | |||
key: 'couponNum2', | |||
@@ -1016,7 +1019,7 @@ Page({ | |||
} else { | |||
if (res) { | |||
wx.navigateTo({ | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.id}`, | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.mainOrderId}&composeOrderType=${res.data.composeOrderType}`, | |||
}) | |||
} | |||
} | |||
@@ -1078,7 +1081,7 @@ Page({ | |||
success: function(res) { | |||
if (res.confirm) { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}&contentType=${that.data.contentType}`, | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}&contentType=${that.data.contentType}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
} | |||
@@ -16,6 +16,8 @@ Page({ | |||
dateEnd:'', | |||
flag: 1, | |||
flagsex: 0, | |||
height:"", | |||
weight:"", | |||
items: [ | |||
{ name: 1, value: '男', checked: false }, | |||
{ name: 2, value: '女', checked: false }, | |||
@@ -63,12 +65,13 @@ Page({ | |||
}, | |||
fail: function (error) { | |||
console.log(error) | |||
}, | |||
}, | |||
complete: function (data) { | |||
} | |||
}) | |||
}, | |||
formSubmit: function (e) { | |||
console.log(e.detail,"formSubmit") | |||
let that = this; | |||
// console.log(that.data.childArr) | |||
/** | |||
@@ -122,7 +125,9 @@ Page({ | |||
address: address, | |||
name: username, | |||
birthdate: birthdate, | |||
childrenList: tmeparr | |||
childrenList: tmeparr, | |||
height: e.detail.value.height, | |||
weight: e.detail.value.weight, | |||
} | |||
}) | |||
.then(res => { | |||
@@ -205,6 +210,16 @@ Page({ | |||
.then(res => {res.data | |||
console.log(res); | |||
if(res.code == 200){ | |||
if (res.data.weight){ | |||
this.setData({ | |||
weight: res.data.weight | |||
}) | |||
} | |||
if (res.data.height) { | |||
this.setData({ | |||
height: res.data.height | |||
}) | |||
} | |||
if (res.data.childrenList){ | |||
let tmpeArr = res.data.childrenList | |||
@@ -14,6 +14,16 @@ | |||
</picker> | |||
<image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | |||
</view> | |||
<view class='section'> | |||
<text>身高</text> | |||
<input wx:if="{{height}}" name="height" type="text" placeholder='请填写身高单位cm' /> | |||
<input wx:if="{{!height}}" name="height" type="text" placeholder='请填写身高单位cm' /> | |||
</view> | |||
<view class='section'> | |||
<text>体重</text> | |||
<input wx:if="{{weight}}" name="weight" type="text" placeholder='请填写身高单位cm' /> | |||
<input wx:if="{{!weight}}" name="weight" type="text" placeholder='请填写体重单位gk' /> | |||
</view> | |||
<view class="section section_gap"> | |||
<text>性别</text> | |||
<radio-group class="radio-group" bindchange="radioChange"> | |||
@@ -22,6 +32,8 @@ | |||
</radio> | |||
</radio-group> | |||
</view> | |||
<view class='address sec' bindtap='address'> | |||
<text>住址</text> | |||
<view class='names' wx:if="{{address}}">{{address}}</view> | |||
@@ -235,7 +235,7 @@ Page({ | |||
// 参与砍价 | |||
else if (options && options.orderId) { | |||
wx.redirectTo({ | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`, | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}&composeOrderType=${options.composeOrderType}`, | |||
}) | |||
} | |||
// 我的 | |||
@@ -200,7 +200,7 @@ Page({ | |||
.then(res => { | |||
console.log(res) | |||
if (typeof (res) != "undefined") { | |||
let orderId = "" + res.data.id; | |||
let orderId = "" + res.data.mainOrderId; | |||
that.setData({ | |||
orderId: orderId | |||
}); | |||
@@ -232,7 +232,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -264,7 +264,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -282,7 +282,7 @@ Page({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.id, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.orderGroupId, _this) | |||
_this.goToOrderGroup(orderId, res.data.singleOrder.orderGroupId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -417,10 +417,13 @@ Page({ | |||
}) | |||
.then(res => { | |||
console.log(res) | |||
that.setData({aa:res}) | |||
if (typeof(res) != "undefined") { | |||
let orderId = "" + res.data.id; | |||
let orderId = "" + res.data.mainOrderId; | |||
that.setData({ | |||
orderId: orderId, | |||
composeOrderType: res.data.composeOrderType, | |||
canSpell: false, | |||
canBuyIf: true | |||
}); | |||
@@ -431,7 +434,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: that.data.composeOrderType | |||
} | |||
}) | |||
.then(res => { | |||
@@ -159,6 +159,7 @@ Page({ | |||
that.setData({ | |||
orderId: options.orderId, | |||
contentType: options.contentType, | |||
composeOrderType: options.composeOrderType | |||
}); | |||
wx.hideShareMenu() | |||
if(options.cardIf){ | |||
@@ -180,7 +181,8 @@ Page({ | |||
if(res.code == 200){ | |||
that.getUserInfo() | |||
that.setData({ | |||
showPage:true | |||
showPage:true, | |||
composeOrderType: res.data.composeOrderType | |||
}) | |||
} | |||
that.setData({ | |||
@@ -251,7 +253,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: that.data.composeOrderType | |||
} | |||
}).then(res => { | |||
var payOrderId = "" + res.data.payOrderId; | |||
@@ -333,7 +336,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -75,6 +75,84 @@ | |||
</view> --> | |||
</view> | |||
</view> | |||
<!-- 券包样式 --> | |||
<!-- <view class="section"> | |||
<view class='detail_top'> | |||
<view> | |||
<text>全包名称</text> | |||
<text class='wait' >等待付款</text> | |||
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | |||
<text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||
<text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text> | |||
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text> | |||
<text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text> | |||
<text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||
<text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="itemImg"> | |||
<image mode="aspectFill" src='https://formall.oss-accelerate.aliyuncs.com/789/737c56bd-066e-4592-bbda-bcbbc8faf409.jpg'></image> | |||
</view> | |||
<view class="itemContent"> | |||
<view class="sub">一面</view> | |||
<view class="face">面额:<text>100元</text></view> | |||
<view class="date">下单时间:<text>2021:07:20 15:00:00</text></view> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="itemImg"> | |||
<image mode="aspectFill" src='https://formall.oss-accelerate.aliyuncs.com/789/737c56bd-066e-4592-bbda-bcbbc8faf409.jpg'></image> | |||
</view> | |||
<view class="itemContent"> | |||
<view class="sub">一面</view> | |||
<view class="face">面额:<text>100元</text></view> | |||
<view class="date">下单时间:<text>2021:07:20 15:00:00</text></view> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="itemImg"> | |||
<image mode="aspectFill" src='https://formall.oss-accelerate.aliyuncs.com/789/737c56bd-066e-4592-bbda-bcbbc8faf409.jpg'></image> | |||
</view> | |||
<view class="itemContent"> | |||
<view class="sub">一面</view> | |||
<view class="face">面额:<text>100元</text></view> | |||
<view class="date">下单时间:<text>2021:07:20 15:00:00</text></view> | |||
</view> | |||
</view> | |||
<view class='payment'> | |||
<view> | |||
<text>实付金额:</text><text>{{item.payment/100}}元</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==1||item.orderStatus==11}}" class="btnZf" data-id="{{item.id}}" bindtap="gotopay"> | |||
<text>去查看</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus == 6}}" class="btn" data-id="{{item.id}}" bindtap="gotoDiscount"> | |||
<text>砍价详情</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==0 || item.orderStatus==7}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||
<text>去支付</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
<text>退款失败</text> | |||
</view> | |||
</view> | |||
</view> --> | |||
<!-- 券包样式 --> | |||
<view > | |||
</view> | |||
<view class="dingdan" wx:if="{{list.length==0}}"> | |||
<image src="{{noOrdersUrl}}" mode="widthFix"></image> | |||
<text>您还没有相关订单</text> | |||
@@ -23,6 +23,7 @@ | |||
} | |||
.section{ | |||
background: #FFFFFF; | |||
overflow: hidden; | |||
} | |||
.detail_msg { | |||
position: relative; | |||
@@ -32,7 +33,7 @@ | |||
margin: 0 30rpx; | |||
padding-bottom: 20rpx; | |||
padding-top: 20rpx; | |||
border-bottom: 1rpx solid #eee; | |||
/* border-bottom: 1rpx solid #eee; */ | |||
} | |||
.sendImg{ | |||
position: absolute; | |||
@@ -175,6 +176,8 @@ | |||
display: flex; | |||
justify-content: space-between; | |||
border-bottom: 8rpx solid #eee; | |||
border-top: 1rpx solid #eee; | |||
} | |||
.payment view:nth-child(1) text:nth-child(1) { | |||
@@ -317,3 +320,51 @@ button::after{ border: none; } | |||
bottom: 0; | |||
margin: auto; | |||
} | |||
.itemBox{ | |||
overflow: hidden; | |||
margin: 20rpx 60rpx; | |||
} | |||
.itemImg{ | |||
float: left; | |||
display: block; | |||
width: 120rpx; | |||
height: 120rpx; | |||
border: 1px solid #f8f8f8; | |||
border-radius: 20rpx; | |||
} | |||
.itemImg image { | |||
display: block; | |||
width: 120rpx; | |||
height: 120rpx; | |||
border-radius: 20rpx; | |||
} | |||
.itemContent{ | |||
float: left; | |||
width: 70%; | |||
} | |||
.face{ | |||
font-size: 24rpx; | |||
color: #999; | |||
letter-spacing: 0; | |||
padding-left: 4%; | |||
line-height: 33rpx; | |||
} | |||
.face text{ | |||
font-size: 24rpx; | |||
color: #333; | |||
letter-spacing: 0; | |||
line-height: 33rpx; | |||
} | |||
.date{ | |||
margin-top: 16rpx; | |||
font-size: 24rpx; | |||
color: #999; | |||
letter-spacing: 0; | |||
padding-left: 4%; | |||
line-height: 33rpx; | |||
} | |||
@@ -0,0 +1,74 @@ | |||
var app = getApp(); | |||
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
navigationBarHeight, | |||
}, | |||
go(e){ | |||
let url = e.currentTarget.dataset.url | |||
wx.navigateTo({ | |||
url: url, | |||
}) | |||
console.log(url) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function (options) { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
onReady: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面显示 | |||
*/ | |||
onShow: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面隐藏 | |||
*/ | |||
onHide: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面卸载 | |||
*/ | |||
onUnload: function () { | |||
}, | |||
/** | |||
* 页面相关事件处理函数--监听用户下拉动作 | |||
*/ | |||
onPullDownRefresh: function () { | |||
}, | |||
/** | |||
* 页面上拉触底事件的处理函数 | |||
*/ | |||
onReachBottom: function () { | |||
}, | |||
/** | |||
* 用户点击右上角分享 | |||
*/ | |||
onShareAppMessage: function () { | |||
} | |||
}) |
@@ -0,0 +1,5 @@ | |||
{ | |||
"usingComponents": { | |||
"navbar": "../components/navbar/navbar" | |||
} | |||
} |
@@ -0,0 +1,10 @@ | |||
<navbar back home text="个人信息" background='#FD832D' color="white"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="item" bindtap="go" data-url="/pages/edit/edit"> | |||
我的个人信息 | |||
<view class="logo">></view> | |||
</view> | |||
<view class="item" bindtap="go" data-url="/pages/siteUser/siteUser"> | |||
我的收货地址 | |||
<view class="logo">></view> | |||
</view> |
@@ -0,0 +1,19 @@ | |||
/* pages/site/site.wxss */ | |||
.item{ | |||
position: relative; | |||
text-align: center; | |||
width: 88%; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
border-radius: 16rpx; | |||
border: 1rpx #333 solid; | |||
margin: 20rpx auto | |||
} | |||
.logo{ | |||
width: 50rpx; | |||
position: absolute; | |||
right: 10rpx; | |||
top: 0rpx; | |||
font-size: 36rpx; | |||
color: rgba(0, 0, 0, 0.8); | |||
} |
@@ -0,0 +1,226 @@ | |||
var app = getApp(); | |||
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} | |||
const Http = require("../../utils/HttpBasics"); | |||
const config = require("../../config/config.js"); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
navigationBarHeight, | |||
userName: "", | |||
userPhone: "", | |||
// region:"", | |||
detail: "", | |||
switch1Checked: false, | |||
region: ['北京市', '北京市', '东城区'], | |||
id: "", | |||
}, | |||
go(e) { | |||
let url = e.currentTarget.dataset.url | |||
wx.navigateTo({ | |||
url: url, | |||
}) | |||
}, | |||
setUserName(e) { | |||
this.setData({ | |||
userName: e.detail.value | |||
}) | |||
}, | |||
setUserPhone(e) { | |||
this.setData({ | |||
userPhone: e.detail.value | |||
}) | |||
}, | |||
setRegion(e) { | |||
this.setData({ | |||
region: e.detail.value | |||
}) | |||
}, | |||
setDetail(e) { | |||
this.setData({ | |||
detail: e.detail.value | |||
}) | |||
}, | |||
switch1Change(e) { | |||
this.setData({ | |||
switch1Checked: e.detail.value | |||
}) | |||
}, | |||
dleSite() { | |||
Http.get({ | |||
url: config.api.siteDel, | |||
data: { | |||
id: this.data.id | |||
} | |||
}).then(res => { | |||
wx.showToast({ | |||
title: '删除成功', | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
wx.navigateBack({ | |||
delta:1 | |||
}) | |||
}).catch(err => { | |||
wx.showToast({ | |||
title: err.message ? err.message : err.data, | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
}) | |||
}, | |||
addSite() { | |||
let myreg = /^[1][3,4,5,7,8][0-9]{9}$/; | |||
if (this.data.userName == "") { | |||
wx.showToast({ | |||
title: '请输入收货人', | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
return | |||
} | |||
if (!myreg.test(this.data.userPhone)) { | |||
// this.redata.Phone = ''; | |||
wx.showToast({ | |||
title: '请输入正确手机号', | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
return | |||
} | |||
if (this.data.detail == "") { | |||
wx.showToast({ | |||
title: '请输入详细地址', | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
return | |||
} | |||
let data = { | |||
consignee: this.data.userName, | |||
mobile: this.data.userPhone, | |||
address: this.data.detail, | |||
region: JSON.stringify(this.data.region), | |||
isDefault: this.data.switch1Checked ? 1 : 0, | |||
} | |||
if (this.data.id && this.data.id != "") { | |||
data.id = this.data.id | |||
} | |||
Http.post({ | |||
url: config.api.collectSite, | |||
data: data, | |||
}).then(res => { | |||
wx.showToast({ | |||
title: '保存成功!', | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
wx.navigateBack({ | |||
delta: 1 | |||
}) | |||
}).catch(err => { | |||
wx.showToast({ | |||
title: err.message ? err.message : err.data, | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
}) | |||
}, | |||
bindRegionChange(e) { | |||
this.setData({ | |||
region: e.detail.value, | |||
obj: {}, | |||
}) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function(options) { | |||
if (options.id) { | |||
this.setData({ | |||
id: options.id | |||
}) | |||
this.siteCheck(options.id) | |||
} | |||
}, | |||
siteCheck(id) { | |||
Http.get({ | |||
url: config.api.siteCheck, | |||
data: { | |||
id | |||
} | |||
}).then(res => { | |||
let obj = res.data | |||
this.setData({ | |||
userName: obj.consignee, | |||
userPhone: obj.mobile, | |||
detail: obj.address, | |||
region: JSON.parse(obj.region), | |||
switch1Checked: obj.isDefault == 0 ? false : true, | |||
}) | |||
}).catch(err => { | |||
wx.showToast({ | |||
title: err.message ? err.message : err.data, | |||
icon: 'none', | |||
duration: 2000, | |||
}) | |||
}) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
onReady: function() { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面显示 | |||
*/ | |||
onShow: function() { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面隐藏 | |||
*/ | |||
onHide: function() { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面卸载 | |||
*/ | |||
onUnload: function() { | |||
}, | |||
/** | |||
* 页面相关事件处理函数--监听用户下拉动作 | |||
*/ | |||
onPullDownRefresh: function() { | |||
}, | |||
/** | |||
* 页面上拉触底事件的处理函数 | |||
*/ | |||
onReachBottom: function() { | |||
}, | |||
/** | |||
* 用户点击右上角分享 | |||
*/ | |||
onShareAppMessage: function() { | |||
} | |||
}) |
@@ -0,0 +1,5 @@ | |||
{ | |||
"usingComponents": { | |||
"navbar": "../components/navbar/navbar" | |||
} | |||
} |
@@ -0,0 +1,40 @@ | |||
<navbar back home text="新增收货地址" background='#FD832D' color="white"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="itemBox"> | |||
<view class="title">收货人</view> | |||
<view class="inputBox"> | |||
<input class="text" bindinput="setUserName" value="{{userName}}"></input> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="title">手机号码</view> | |||
<view class="inputBox"> | |||
<input class="text" bindinput="setUserPhone" value="{{userPhone}}"></input> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="title">所在地区</view> | |||
<view class="inputBox"> | |||
<picker mode="region" class="text" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}"> | |||
<view class="picker"> | |||
{{region[0]}},{{region[1]}},{{region[2]}} | |||
</view> | |||
</picker> | |||
<!-- <input bindinput="setRegion"></input> --> | |||
</view> | |||
</view> | |||
<view class="itemBox"> | |||
<view class="title">详细地址</view> | |||
<view class="inputBox"> | |||
<input class="text" bindinput="setDetail" value="{{detail}}"></input> | |||
</view> | |||
</view> | |||
<view class="tacitly"> | |||
<view class="sez"> | |||
设为默认地址</view> | |||
<view class="switchBox"> | |||
<switch checked="{{switch1Checked}}" bindchange="switch1Change" /> | |||
</view> | |||
</view> | |||
<view class="add" bindtap="addSite">保存</view> | |||
<view wx:if="{{id}}" class="dle" bindtap="dleSite" >删除</view> |
@@ -0,0 +1,67 @@ | |||
/* pages/siteAdd/siteAdd.wxss */ | |||
.itemBox{ | |||
overflow: hidden; | |||
width: 96%; | |||
margin: 20rpx auto; | |||
} | |||
.title{ | |||
float: left; | |||
height: 80rpx; | |||
width: 20%; | |||
line-height: 80rpx; | |||
} | |||
.inputBox{ | |||
float: left; | |||
height: 70rpx; | |||
width: 70%; | |||
border: rgba(0, 0, 0, 0.3) 1rpx solid; | |||
border-radius: 10rpx; | |||
margin: 5rpx 10rpx; | |||
} | |||
.text{ | |||
width: 80%; | |||
height: 70rpx; | |||
line-height: 70rpx; | |||
margin: 0 auto; | |||
} | |||
.tacitly{ | |||
width: 90%; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
/* border: rgba(0, 0, 0, 0.3) 1rpx solid; */ | |||
/* border-radius: 10rpx; */ | |||
margin: 50rpx auto; | |||
overflow: hidden; | |||
} | |||
.sez{ | |||
line-height: 80rpx; | |||
float: left; | |||
margin-left: 20rpx; | |||
} | |||
.switchBox{ | |||
float: right; | |||
} | |||
.add{ | |||
width: 80%; | |||
height: 60rpx; | |||
text-align: center; | |||
line-height: 60rpx; | |||
background-color: #FD832D; | |||
color: #fff; | |||
margin-top: 200rpx; | |||
margin-left: auto; | |||
margin-right: auto; | |||
border-radius: 12rpx; | |||
} | |||
.dle{ | |||
width: 80%; | |||
height: 60rpx; | |||
text-align: center; | |||
line-height: 60rpx; | |||
background-color: red; | |||
color: #fff; | |||
margin-top: 40rpx; | |||
margin-left: auto; | |||
margin-right: auto; | |||
border-radius: 12rpx; | |||
} |
@@ -0,0 +1,108 @@ | |||
var app = getApp(); | |||
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} | |||
const Http = require("../../utils/HttpBasics"); | |||
const config = require("../../config/config.js"); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
navigationBarHeight, | |||
list:[], | |||
pageNum:1, | |||
}, | |||
goAdd(e) { | |||
let url = '/pages/siteAdd/siteAdd' | |||
wx.navigateTo({ | |||
url: url, | |||
}) | |||
console.log(url) | |||
}, | |||
gitLsit(){ | |||
Http.get({ | |||
url: config.api.siteList, | |||
data:{ | |||
pageNum: this.data.pageNum, | |||
pageSize:5, | |||
} | |||
}).then(res=>{ | |||
let tempLsit = res.data.list | |||
tempLsit.map(item=>{ | |||
let regionSty = "" | |||
if (JSON.parse(item.region)[0] == JSON.parse(item.region)[1]){ | |||
regionSty = JSON.parse(item.region)[1] + JSON.parse(item.region)[2] | |||
}else{ | |||
regionSty = JSON.parse(item.region)[0]+JSON.parse(item.region)[1] + JSON.parse(item.region)[2] | |||
} | |||
item.regionSty = regionSty | |||
}) | |||
console.log(tempLsit) | |||
this.setData({ | |||
list: tempLsit | |||
}) | |||
}) | |||
}, | |||
dutu(e){ | |||
wx.navigateTo({ | |||
url: `/pages/siteAdd/siteAdd?id=${e.currentTarget.dataset.id}`, | |||
}) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function (options) { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
onReady: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面显示 | |||
*/ | |||
onShow: function () { | |||
this.gitLsit() | |||
}, | |||
/** | |||
* 生命周期函数--监听页面隐藏 | |||
*/ | |||
onHide: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面卸载 | |||
*/ | |||
onUnload: function () { | |||
}, | |||
/** | |||
* 页面相关事件处理函数--监听用户下拉动作 | |||
*/ | |||
onPullDownRefresh: function () { | |||
}, | |||
/** | |||
* 页面上拉触底事件的处理函数 | |||
*/ | |||
onReachBottom: function () { | |||
}, | |||
/** | |||
* 用户点击右上角分享 | |||
*/ | |||
onShareAppMessage: function () { | |||
} | |||
}) |
@@ -0,0 +1,5 @@ | |||
{ | |||
"usingComponents": { | |||
"navbar": "../components/navbar/navbar" | |||
} | |||
} |
@@ -0,0 +1,12 @@ | |||
<navbar back home text="我的收货地址" background='#FD832D' color="white"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="siteItem" wx:for="{{list}}" > | |||
<view class="siteBox"> | |||
<view class="region">{{item.regionSty}}</view> | |||
<view class="region detail">{{item.address}}</view> | |||
<view class="region phone">{{item.consignee}} {{item.mobile}}</view> | |||
</view> | |||
<view class="updataImg" bindtap="dutu" data-id="{{item.id}}"></view> | |||
</view> | |||
<view class="addSite" bindtap="goAdd">+新建收货地址</view> |
@@ -0,0 +1,47 @@ | |||
/* pages/siteUser/siteUser.wxss */ | |||
page{ | |||
background-color: #eee; | |||
} | |||
.siteItem{ | |||
width: 88%; | |||
margin: 20rpx auto; | |||
border-radius: 10rpx; | |||
border: 1rpx #fff solid; | |||
overflow: hidden; | |||
background-color: #fff; | |||
} | |||
.siteBox{ | |||
float: left; | |||
width: 90%; | |||
} | |||
.region{ | |||
padding: 10rpx; | |||
} | |||
.detail{ | |||
color: #999; | |||
font-size: 26rpx | |||
} | |||
.phone{ | |||
color: #999; | |||
font-size: 26rpx | |||
} | |||
.updataImg{ | |||
float: right; | |||
width: 60rpx; | |||
height: 60rpx; | |||
background-color: #fac; | |||
margin-top: 50rpx; | |||
margin-right: 2rpx | |||
} | |||
.addSite{ | |||
background-color: #FD832D; | |||
color: #fff; | |||
width: 90%; | |||
text-align: center; | |||
height: 60rpx; | |||
border-radius: 100rpx; | |||
margin: 20rpx auto; | |||
line-height: 60rpx; | |||
} |
@@ -263,7 +263,7 @@ Page({ | |||
* 用户点击右上角分享 | |||
*/ | |||
// paramData | |||
onShareAppMessage: function (res) { | |||
onShareAppMessage: function (res) { | |||
app.globalData.previewFlag = true | |||
if (res.from === 'button') { | |||
console.log(res, this.data.nickName, this.data.avatarUrl, 3333333333333333333333) | |||
@@ -154,7 +154,7 @@ Page({ | |||
}, | |||
/** | |||
* 直接购买 | |||
*/ | |||
*/ | |||
gotoBuy(e) { | |||
let that = this; | |||
this.setData({ | |||
@@ -326,11 +326,12 @@ Page({ | |||
data: { | |||
couponId: couponId | |||
} | |||
}).then(res => { | |||
}).then(res => { | |||
that.setData({ | |||
disOrderNumber: res.data.orderNumber, | |||
couponChannelId: res.data.couponChannelId, | |||
orderGroupId: res.data.orderGroupId | |||
orderGroupId: res.data.orderGroupId, | |||
composeOrderType: res.data.composeOrderType | |||
}) | |||
// 拼团订单 | |||
@@ -352,7 +353,7 @@ Page({ | |||
success: function (res) { | |||
if (res.confirm) { | |||
wx.navigateTo({ | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${that.data.disOrderNumber}&couponChannelId=${that.data.couponChannelId}&couponId=${couponId}&orderGroupId={that.data.orderGroupId}`, | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${that.data.disOrderNumber}&couponChannelId=${that.data.couponChannelId}&couponId=${couponId}&orderGroupId={that.data.orderGroupId}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
@@ -366,7 +367,7 @@ Page({ | |||
success: function (res) { | |||
if (res.confirm) { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}`, | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
} | |||
@@ -470,7 +471,7 @@ Page({ | |||
}); | |||
}, | |||
/** | |||
* 去拼团 | |||
* 去拼团 | |||
*/ | |||
goToOrderGroup(orderId, orderGroupId, _this) { | |||
let that = this; | |||
@@ -504,7 +505,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -513,10 +514,10 @@ Page({ | |||
wx.hideLoading() | |||
if (orderGroupId !== 0) { | |||
wx.navigateTo({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.id, | |||
url: '/pages/order/detail/index?orderId=' + res.data.mainOrderId, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.orderGroupId, _this) | |||
_this.goToOrderGroup(orderId, res.data.mainOrderId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -563,7 +564,7 @@ Page({ | |||
data: {} | |||
}).then(res => { | |||
/** | |||
* orderSave 下单 | |||
* orderSave 下单 | |||
*/ | |||
return Http.post({ | |||
url: config.api.orderSave, | |||
@@ -661,11 +662,12 @@ Page({ | |||
}); | |||
} | |||
}).then(res => { | |||
console.log(res) | |||
console.log(res,"123") | |||
if (typeof (res) != "undefined") { | |||
let orderId = "" + res.data.id; | |||
let orderId = "" + res.data.mainOrderId; | |||
that.setData({ | |||
orderId: orderId, | |||
composeOrderType: res.data.composeOrderType, | |||
canSpell: false, | |||
canBuyIf: true | |||
}); | |||
@@ -676,7 +678,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: orderId | |||
orderId: orderId, | |||
composeOrderType: that.data.composeOrderType | |||
} | |||
}).then(res => { | |||
var payOrderId = "" + res.data.payOrderId; | |||
@@ -722,7 +725,7 @@ Page({ | |||
}) | |||
.catch(err => { | |||
that.setData({ | |||
canSpell: true, | |||
canSpell: true, | |||
canBuyIf: true | |||
}) | |||
wx.showToast({ | |||
@@ -137,7 +137,7 @@ Page({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
orderId: orderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
@@ -158,7 +158,7 @@ Page({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.id, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.orderGroupId, _this) | |||
_this.goToOrderGroup(orderId, res.data.mainOrderId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -184,7 +184,8 @@ Page({ | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: that.data.paramData.orderId | |||
orderId: that.data.paramData.orderId, | |||
composeOrderType: that.data.paramData.composeOrderType, | |||
} | |||
}) | |||
.then(res => { | |||
@@ -167,7 +167,7 @@ Page({ | |||
}) | |||
let data = e.currentTarget.dataset.data | |||
wx.navigateTo({ | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}`, | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}&composeOrderType=${data.composeOrderType}`, | |||
}) | |||
}, | |||
gotoEdit(e){ | |||
@@ -120,8 +120,15 @@ | |||
}, | |||
{ | |||
"id": 8, | |||
"name": "pages2/fengMap/fengMap", | |||
"pathName": "pages2/fengMap/fengMap", | |||
"name": "个人信息", | |||
"pathName": "pages/site/site", | |||
"query": "", | |||
"scene": null | |||
}, | |||
{ | |||
"id": -1, | |||
"name": "pages/siteUser/siteUser", | |||
"pathName": "pages/siteUser/siteUser", | |||
"query": "", | |||
"scene": null | |||
} | |||