From 97f957bde1aaf3f847f0075951999ab9dbbf70b2 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 30 Aug 2023 10:20:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/orderGoods/index.vue | 3 +-
components/payment/index.vue | 150 ++++++++++++-----------
components/zbpSwiper.vue | 4 +-
config/app.js | 2 +-
manifest.json | 8 +-
pages/index/index.vue | 5 +-
pages/nongKe/supply_chain/supplier.vue | 4 +-
pages/order_details/index.vue | 157 ++++++++++++++-----------
pages/order_details/stay.vue | 17 +--
pages/users/order_list/indexCopy.vue | 30 +++--
10 files changed, 215 insertions(+), 165 deletions(-)
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 58c59a0..8698c95 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -112,8 +112,9 @@
申请退款
+
去评价
已评价
diff --git a/components/payment/index.vue b/components/payment/index.vue
index b0979bb..a27272f 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -4,8 +4,8 @@
选择付款方式
-
+
@@ -78,7 +78,7 @@
});
},
goPay: function(number, paytype) {
- console.log(this.payMode);
+
if (this.isCall) {
return this.$emit('onChangeFun', {
action: 'payCheck',
@@ -100,16 +100,16 @@
} else if (paytype == 'balance') {
type = 'balance';
console.log('123');
- }else if(paytype == 'alipay'){
+ } else if (paytype == 'alipay') {
// #ifndef MP
type = 'alipay';
// #endif
// #ifdef MP
type = 'alipayQr';
// #endif
- }else if(paytype =='creditBuy'){
+ } else if (paytype == 'creditBuy') {
console.log('123123');
- type='creditBuy'
+ type = 'creditBuy'
}
if (!that.order_id) return that.$util.Tips({
title: '请选择要支付的订单'
@@ -120,20 +120,27 @@
uni.showLoading({
title: '支付中'
});
- let orderApi = that.order_type === 1 ? presellOrderPay : orderPay
+ let orderApi = that.order_type === 1 ? presellOrderPay : orderPay
orderApi(that.order_id, {
type: type,
// #ifdef H5
- return_url: 'http://'+window.location.host+'/pages/users/order_list/index',
+
+ return_url: this.order_type == 98 ? 'http://' + window.location.host +
+ '/pages/users/order_list/indexCopy' : 'http://' + window.location.host +
+ '/pages/users/order_list/index',
+
+
// #endif
-
+
}).then(res => {
let status = res.data.status,
orderId = res.data.result.order_id,
jsConfig = res.data.result.config,
callback_key = res.data.result.pay_key,
- goPages = '/pages/users/order_list/index';
- switch (status) {
+
+ goPages = this.order_type == 98 ? '/pages/users/order_list/indexCopy' :
+ '/pages/users/order_list/index'
+ switch (status) {
case 'ORDER_EXIST':
case 'EXTEND_ORDER':
case 'PAY_ERROR':
@@ -144,19 +151,19 @@
});
return that.$util.Tips({
title: res.message
- });
+ });
break;
case 'success':
uni.hideLoading();
this.$emit('onChangeFun', {
action: 'payClose'
- });
+ });
return that.$util.Tips({
title: '支付成功',
icon: 'success'
}, {
tab: 5,
- url: goPages + '?status=1'
+ url: goPages + '?status=2'
});
break;
case 'alipay':
@@ -164,19 +171,20 @@
uni.hideLoading();
this.$emit('onChangeFun', {
action: 'payClose'
- });
+ });
uni.navigateTo({
- url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig,
- })
- return
- break;
- // #ifndef MP
+ url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
+ jsConfig,
+ })
+ return
+ break;
+ // #ifndef MP
case "wechat":
case "weixin":
case "weixinApp":
jsConfig.timeStamp = jsConfig.timestamp;
// #ifndef APP-PLUS
- that.$wechat.pay(jsConfig).then(res => {
+ that.$wechat.pay(jsConfig).then(res => {
// console.log('测试支付数据无效的success:'+res.data)
this.$emit('onChangeFun', {
action: 'payClose'
@@ -185,35 +193,36 @@
return that.$util.Tips({
title: '支付成功',
icon: 'success'
- }, {
+ }, {
tab: 5,
- url: goPages + 'status=1'
+ url: goPages + 'status=2'
});
}).catch(res => {
// console.log('测试支付数据无效的catch:'+res.data)
- if (res.errMsg == 'chooseWXPay:cancel'){
- if(that.isCall){
+ if (res.errMsg == 'chooseWXPay:cancel') {
+ if (that.isCall) {
return that.$util.Tips({
title: '取消支付'
});
- }else{
+ } else {
return that.$util.Tips({
title: '取消支付'
- }, {
+ }, {
tab: 5,
- url: goPages + '?status=0'
+ url: goPages + '?status=1'
});
}
- }
+ }
})
// #endif
// #ifdef APP-PLUS
- let mp_pay_name=''
- if(uni.requestOrderPayment){
- mp_pay_name='requestOrderPayment'
- }else{
- mp_pay_name='requestPayment'
+ let mp_pay_name = ''
+ if (uni.requestOrderPayment) {
+ mp_pay_name = 'requestOrderPayment'
+ } else {
+ mp_pay_name = 'requestPayment'
}
+ console.log(mp_pay_name, jsConfig)
uni[mp_pay_name]({
provider: 'wxpay',
orderInfo: jsConfig,
@@ -224,22 +233,23 @@
return that.$util.Tips({
title: '支付成功',
icon: 'success'
- }, {
+ }, {
tab: 5,
- url: goPages + 'status=1'
+ url: goPages + 'status=2'
});
},
fail: (e) => {
- if(that.isCall){
+ console.log(e)
+ if (that.isCall) {
return that.$util.Tips({
title: '取消支付'
});
- }else{
+ } else {
return that.$util.Tips({
title: '取消支付'
- }, {
+ }, {
tab: 5,
- url: goPages + '?status=0'
+ url: goPages + '?status=1'
});
}
},
@@ -249,16 +259,16 @@
});
// #endif
break;
- // #endif
- // #ifdef MP
+ // #endif
+ // #ifdef MP
case "routine":
jsConfig.timeStamp = jsConfig.timestamp;
that.toPay = true;
- let mp_pay_name=''
- if(uni.requestOrderPayment){
- mp_pay_name='requestOrderPayment'
- }else{
- mp_pay_name='requestPayment'
+ let mp_pay_name = ''
+ if (uni.requestOrderPayment) {
+ mp_pay_name = 'requestOrderPayment'
+ } else {
+ mp_pay_name = 'requestPayment'
}
uni[mp_pay_name]({
...jsConfig,
@@ -267,21 +277,22 @@
that.$emit('onChangeFun', {
action: 'payClose'
});
- if (that.BargainId || that.combinationId || that.pinkId || that.seckillId)
+ if (that.BargainId || that.combinationId || that.pinkId || that
+ .seckillId)
return that.$util.Tips({
title: '支付成功',
icon: 'success'
- }, {
+ }, {
tab: 5,
- url: goPages + '?status=1'
+ url: goPages + '?status=2'
});
-
+
return that.$util.Tips({
title: '支付成功',
icon: 'success'
- }, {
+ }, {
tab: 5,
- url: goPages + '?status=1'
+ url: goPages + '?status=2'
});
},
fail: function(e) {
@@ -294,18 +305,19 @@
});
},
complete: function(e) {
- uni.hideLoading();
+ uni.hideLoading();
//关闭当前页面跳转至订单状态
- if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
- title: '取消支付'
- });
+ if (res.errMsg == 'requestPayment:cancel') return that.$util
+ .Tips({
+ title: '取消支付'
+ });
that.$emit('onChangeFun', {
action: 'payClose'
});
},
})
break;
- // #endif
+ // #endif
case "balance":
uni.hideLoading();
that.$emit('onChangeFun', {
@@ -316,9 +328,9 @@
title: res.message
});
break;
- // #ifdef H5
+ // #ifdef H5
case 'h5':
- let host = window.location.protocol+"//"+window.location.host;
+ let host = window.location.protocol + "//" + window.location.host;
let url = `${host}/pages/order_pay_status/index?order_id=${orderId}`
let eUrl = encodeURIComponent(url)
let jsurl = jsConfig.mweb_url || jsConfig.h5_url
@@ -327,9 +339,9 @@
location.href = locations;
}, 100);
break;
- // #endif
-
- // #ifdef APP-PLUS
+ // #endif
+
+ // #ifdef APP-PLUS
case 'alipayApp':
uni.requestPayment({
provider: 'alipay',
@@ -341,11 +353,11 @@
return that.$util.Tips({
title: '支付成功',
icon: 'success'
- }, {
+ }, {
tab: 5,
- url: goPages + 'status=1'
+ url: goPages + 'status=2'
});
-
+
},
fail: (e) => {
return that.$util.Tips({
@@ -356,8 +368,8 @@
uni.hideLoading();
},
});
- break;
- // #endif
+ break;
+ // #endif
}
}).catch(err => {
uni.hideLoading();
@@ -461,4 +473,4 @@
font-size: 0.3rpx;
color: #999;
}
-
+
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index ee35f00..3555c48 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -85,8 +85,8 @@
watch: {
location: {
handler(newVal, oldVal) {
- console.log(newVal, oldVal)
- // if (newVal.address_component?.street) this.street = newVal.address_component.street
+ // console.log(newVal, oldVal)
+ if (newVal.address_component?.street) this.street = newVal.address_component.street
},
immediate: true
}
diff --git a/config/app.js b/config/app.js
index cf10f77..d98a31e 100644
--- a/config/app.js
+++ b/config/app.js
@@ -25,7 +25,7 @@ if (process.env.NODE_ENV === "development") {
// #endif
} else if (process.env.NODE_ENV === 'production') {
httpApi = 'https://shop.lihaink.cn' // 生产
- httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
}
diff --git a/manifest.json b/manifest.json
index 707f1e0..06cfd3a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,7 +81,8 @@
"NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
"NSCameraUsageDescription" : "上传用户头像保存分享海报",
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
- "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
+ "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
+ "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店"
},
"idfa" : false,
"dSYMs" : false
@@ -96,7 +97,7 @@
},
"payment" : {
"weixin" : {
- "__platform__" : [ "android" ],
+ "__platform__" : [ "ios", "android" ],
"appid" : "wx9d68c92b550ddd1e",
"UniversalLinks" : "https://mer.crmeb.net/"
}
@@ -328,3 +329,6 @@
"template" : "template.h5.html"
}
}
+//拨打电话权限关闭
+/* ios打包配置 */
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d4e94ce..bc6580c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -131,8 +131,7 @@
this.getCateList()
this.getGoods()
- this.selfLocation()
- this.Area()
+
this.setPermissions()
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
@@ -157,6 +156,8 @@
},
methods: {
selectPlce(e) {
+ this.selfLocation()
+ this.Area()
this.street_id = e.value[1].code
this.town = e.value[1].name
this.getCloudShopMerId(e.value[1].code)
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 408a160..ca5800e 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -3,11 +3,11 @@
-
+
-
+
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 041ba19..1c305e3 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -27,13 +27,13 @@
- 待发货
+ 待发货
等待其他人参加拼团
- 待核销
- {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}}
+ 待核销
+ {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}}
- 待评价
- 已完成
+ 待评价
+ 已完成
已为您退款,感谢您的支持
{{orderInfo.pay_time}}
@@ -42,22 +42,28 @@
- 待付款
- 待付款
+ 待发货
- 待核销
- 待收货
- 待评价
- 已完成
+ 待收货
+
+ 待评价
+ 已完成
-
+
+
+ :class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>
-
+
+
+ :class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
@@ -285,7 +291,7 @@
{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款
- 立即付款
+ 立即付款
取消订单
@@ -305,17 +311,18 @@
查看物流
-
-
+
+
确认收货
确认收货
-
- 取件码
-
-
+
+ 取件码
+
+
+
查看物流
+ v-if="orderInfo.activity_type!=1 &&orderInfo.order_status!=8&& orderInfo.activity_type!=2 && orderInfo.activity_type!=3 &&orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
再次购买
+
+
+ 去结算
+
+
删除订单
@@ -338,8 +351,12 @@
-
+ -->
+
+
@@ -463,7 +480,7 @@
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
- payStatus: this.alipay_open
+ payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
@@ -471,7 +488,7 @@
value: 'balance',
title: '可用余额:',
number: 0,
- payStatus: this.yue_pay_status
+ payStatus: this.$store.getters.globalData.yue_pay_status
}
],
pay_close: false,
@@ -770,10 +787,16 @@
* 打开支付组件
*
*/
- pay_open: function() {
+
+ pay_open: function(pay_price, order_id) {
+
this.pay_close = true;
this.pay_order_id = this.orderInfo.order_id.toString();
this.totalPrice = this.orderInfo.pay_price;
+ // this.$set(this, 'pay_close', true);
+ // this.order_id = order_id;
+ // this.pay_order_id = order_id.toString()
+ // this.$set(this, 'totalPrice', pay_price);
},
/**
* 支付成功回调
@@ -926,28 +949,28 @@
},
confirmOrderb: function(item) {
- let that = this;
- uni.showModal({
- title: '确认收货',
- content: '为保障权益,请收到货确认无误后,再确认收货',
- success: function(res) {
- if (res.confirm) {
- orderTake(item.order_id).then(res => {
- return that.$util.Tips({
- title: '操作成功',
- icon: 'success'
- }, function() {
- that.orderList.splice(index, 1);
- that.getOrderData();
- });
- }).catch(err => {
- return that.$util.Tips({
- title: err
- });
- })
+ let that = this;
+ uni.showModal({
+ title: '确认收货',
+ content: '为保障权益,请收到货确认无误后,再确认收货',
+ success: function(res) {
+ if (res.confirm) {
+ orderTake(item.order_id).then(res => {
+ return that.$util.Tips({
+ title: '操作成功',
+ icon: 'success'
+ }, function() {
+ that.orderList.splice(index, 1);
+ that.getOrderData();
+ });
+ }).catch(err => {
+ return that.$util.Tips({
+ title: err
+ });
+ })
+ }
}
- }
- })
+ })
},
confirmOrder: function(item) {
uni.showModal({
@@ -961,28 +984,28 @@
}
}
})
-
+
},
queding() {
-
- let that = this;
- orderTake(that.order_id).then(res => {
- this.receivingshow = false
- that.getOrderInfo();
- return that.$util.Tips({
- title: '成功收货',
- icon: 'success'
- }, function() {
-
- });
- }).catch(err => {
- this.receivingshow = false
- return that.$util.Tips({
- title: err
- });
- })
-
+ let that = this;
+ orderTake(that.order_id).then(res => {
+ this.receivingshow = false
+ that.getOrderInfo();
+ return that.$util.Tips({
+ title: '成功收货',
+ icon: 'success'
+ }, function() {
+
+
+ });
+ }).catch(err => {
+ this.receivingshow = false
+ return that.$util.Tips({
+ title: err
+ });
+ })
+
},
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 93a03bc..bc382fc 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -217,8 +217,10 @@
@@ -734,8 +736,7 @@
}
.btn_cancel {
- margin-right: 200rpx;
- margin-top: 20rpx;
+ margin-right: 20rpx;
width: 83px;
height: 28px;
text-align: center;
@@ -1214,19 +1215,13 @@
height: 35px;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
border-radius: 18px 18px 18px 18px;
- display: flex;
- justify-content: center;
- align-items: center;
- position: absolute;
- right: 10px;
- bottom: 5px;
+
color: white;
}
.stybgc {
background-color: rgba(0, 0, 0, 0.5);
width: 100vw;
- height: 100vh;
position: relative;
.warp {
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index b137eb4..5eac2c6 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -148,7 +148,7 @@
¥{{item.pay_price}}
-
+
立即付款
@@ -164,6 +164,7 @@
{{item.merchant.mer_name}}
+
{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}
@@ -171,10 +172,10 @@
- 待发货
- 待付款
+ 待发货
+ 待付款
待收货
- 待评价
+ 待评价
已完成
已退款
@@ -271,15 +272,24 @@
确认收货
-
+
+
+
+ 去付款
+
+
+
-
+
+
去结算
@@ -310,8 +320,10 @@
-
+
+
@@ -395,6 +407,7 @@
limit: 20,
receivingshow: false,
domain: HTTP_REQUEST_URL,
+ order_type:0,
payMode: [{
name: "微信支付",
icon: "icon-weixinzhifu",
@@ -580,11 +593,12 @@
* 打开支付组件
*
*/
- goPay: function(pay_price, order_id) {
+ goPay: function(pay_price, order_id,order_type) {
this.$set(this, 'pay_close', true);
this.order_id = order_id;
this.pay_order_id = order_id.toString()
this.$set(this, 'totalPrice', pay_price);
+ this.order_type=order_type
},
/**
* 支付成功回调