diff --git a/api/common.js b/api/common.js
index d3daa64..849c381 100644
--- a/api/common.js
+++ b/api/common.js
@@ -35,6 +35,7 @@ export default {
detail:(activity_id)=>request.get(`/api/coupon-activities/${activity_id}`),
receive:(activity_id)=>request.post(`/api/coupon-activities/${activity_id}/receive`,{},{noTips:true})
},
+ getPickupCodeWidthImgUrl:(url)=>request.post('/api/ai/recognition/pickup_code_with_url',{url}),
uploadImg(file,progress){
if(!app)app = getApp();
return new Promise((rs,rj)=>{
diff --git a/api/user.js b/api/user.js
index 4bc3aeb..2ed5215 100644
--- a/api/user.js
+++ b/api/user.js
@@ -81,7 +81,7 @@ export default {
list:()=>request.get('/api/user/referrals')
},
updateUser:(data)=>request.put('/api/user/update',data),
- createPayment(order_id,order_type){
- return request.post('/api/wechat/create-payment',{order_id,order_type});
+ createPayment(order_id){
+ return request.post('/api/wechat/create-payment',{order_id});
}
}
\ No newline at end of file
diff --git a/app.js b/app.js
index 8008ee2..599c349 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,6 @@
import userApi from './api/user';
import commonApi from './api/common';
let token = wx.getStorageSync('accessToken');
-console.log(1);
App({
async onLaunch(options){
wx.getStorage({
@@ -15,7 +14,6 @@ App({
const currentPage = page[page.length-1];
if(currentPage){
currentPage.onShareAppMessage = async()=>{
- console.log(this.globalData.userInfo.user_code);
if(!(this.globalData.appConfig&&this.globalData.appConfig.share_card_title)){
await this.getAppConfig();
}
diff --git a/components/merchantOrder/index.js b/components/merchantOrder/index.js
index 239933e..f7b9060 100644
--- a/components/merchantOrder/index.js
+++ b/components/merchantOrder/index.js
@@ -45,7 +45,7 @@ Component({
});
},
createPayment(orderId,needStay){
- userApi.createPayment(orderId,'PRODUCT').then((data)=>{
+ userApi.createPayment(orderId).then((data)=>{
wx.requestPayment({
timeStamp:data.payment_params.timeStamp,
nonceStr:data.payment_params.nonceStr,
diff --git a/pages/help/index/index.js b/pages/help/index/index.js
index e072231..d9cf3b1 100644
--- a/pages/help/index/index.js
+++ b/pages/help/index/index.js
@@ -39,7 +39,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- console.log('onLoad',new Date().getTime());
let height = this.selectComponent("#navBar").getHeight();
this.setData({
navBarHeight:height
@@ -65,17 +64,14 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
- console.log('onReady',new Date().getTime());
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
- console.log('onShow',new Date().getTime());
wx.getStorage({
key:'pre-order',
success:(res)=>{
- console.log(res);
const name = [];
let count = 0;
if(res.data.price_request.pickup_images){
@@ -135,7 +131,6 @@ Page({
});
},
changeCommunity(community){
- console.log('changeCommunity',community);
//手动设置社区之后 做个标记
this.setData({
currentCommunity:{
@@ -250,11 +245,9 @@ Page({
});
},
enterPageContainer(){
- console.log('enterPageContainer');
// wx.hideTabBar();
},
leavePageContainer(){
- console.log('leavePageContainer');
wx.showTabBar();
},
/**
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index eac9f80..b73a767 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -123,6 +123,12 @@
+
+ 加价金额
+
+
+
+
支付金额
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 1d7ea08..e90455c 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -212,7 +212,10 @@ Page({
pay(event){
const item = event.currentTarget.dataset.item;
const orderConfirm = this.selectComponent("#merchantOrderConfirm");
- orderConfirm.createPayment(item.order_id);
+ orderConfirm.createPayment(item.orderid||item.order_id,true);
+ },
+ paySuccess(){
+ this.refreshList();
},
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index ed337d6..ca74635 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -26,21 +26,24 @@
- 代取快递
+ 订单号 {{item.orderid}}
{{orderStatusKV[item.status]}}
- {{item.address.community_name}}{{item.address.address_detail}}
- 下单时间：{{item.create_time}}
-
+
+ 快递数量：10 件
+ 送达地址：{{item.address.community_name}}{{item.address.address_detail}}
+ 下单时间：{{item.create_time}}
+
+
-
+
@@ -134,4 +137,4 @@
-
+
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 38eccf5..14c9262 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -8,7 +8,7 @@
background-color: #fff;
border-radius: 18rpx;
margin:24rpx 0;
- padding:30rpx;
+ padding:30rpx 30rpx 50rpx 30rpx;
}
.order-list .head{
display: flex;
@@ -17,7 +17,7 @@
.order-list .head .center{
margin-left:24rpx;
flex:1;
- font-size:34rpx;
+ font-size:32rpx;
font-weight: 500;
}
.order-list .head .status{
@@ -42,25 +42,22 @@
display: flex;
}
.order-list .content{
- margin-top:24rpx;
margin-left:80rpx;
}
-.order-list .content .address{
- margin-top:30rpx;
- font-size: 34rpx;
- font-weight: 500;
+.order-list .content .kv{
+ display: flex;
+ flex-direction: column;
+ gap: 24rpx;
+ color: #222222;
}
-.order-list .content .time{
- font-size: 26rpx;
- color:#888888;
- margin-top:24rpx;
- padding-bottom:48rpx;
+.order-list .content .spliter{
+ margin:24rpx 0 30rpx 0;
}
.order-list .content .pay{
display: flex;
justify-content: space-between;
align-items: center;
- margin-top:12rpx;
+ margin-top:60rpx;
font-size: 26rpx;
color: #888888;
}
diff --git a/pages/shop/bill/index.js b/pages/shop/bill/index.js
index ea2f07b..49dcbb0 100644
--- a/pages/shop/bill/index.js
+++ b/pages/shop/bill/index.js
@@ -34,7 +34,7 @@ Page({
},
merchantPay(){
shopApi.merchantPay(this.data.shopId,this.data.amount).then((data)=>{
- userApi.createPayment(data.order_id,'ONLINE_PAY').then((data)=>{
+ userApi.createPayment(data.order_id).then((data)=>{
wx.requestPayment({
timeStamp:data.payment_params.timeStamp,
nonceStr:data.payment_params.nonceStr,