mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
jia 2023-08-30 10:20:49 +08:00
parent 4f4d01f61c
commit 97f957bde1
10 changed files with 215 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/orderGoods/index.vue
View File

@ -112,8 +112,9 @@
<view class="btn-item"
v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&& evaluate != 1&&evaluate !=4&& evaluate!=3 || evaluate==2 ||activityType==98"
@click.stop="refund(item)">申请退款</view>
<view class='btn-item'
v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3 && item.refund_num > 0'
v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3 && evaluate!=8&& item.refund_num > 0'
@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
</view>

150
components/payment/index.vue
View File

@ -4,8 +4,8 @@
<view class="title acea-row row-center-wrapper">
选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
</view>
<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)' v-for="(item,index) in payMode"
:key="index" v-if="item.payStatus == 1">
<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)'
v-for="(item,index) in payMode" :key="index" v-if="item.payStatus == 1">
<view class="left acea-row row-between-wrapper">
<view class="iconfont" :class="item.icon"></view>
<view class="text">
@ -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;
}
</style>
</style>

4
components/zbpSwiper.vue
View File

@ -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
}

2
config/app.js
View File

@ -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' //生产
}

8
manifest.json
View File

@ -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打包配置 */

5
pages/index/index.vue
View File

@ -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)

4
pages/nongKe/supply_chain/supplier.vue
View File

@ -3,11 +3,11 @@
<view class='productList' :style="viewColor">
<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
<!--#ifdef H5-->
<view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo"></view>
</view>
<!--#endif-->
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='sotreParam.keyword' @confirm="searchSubmit"></input>

157
pages/order_details/index.vue
View File

@ -27,13 +27,13 @@
</view>
<view class='data' :class='isGoodsReturn ? "on":""'>
<view class='state'>
<block v-if="orderInfo.status == 0 && orderInfo.order_type != 1">待发货</block>
<block v-if="orderInfo.order_status == 2 ">待发货</block>
<block v-if="orderInfo.status == 9">等待其他人参加拼团</block>
<block v-if="orderInfo.status == 0 && orderInfo.order_type == 1">待核销</block>
<block v-if="orderInfo.status == 1">{{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}}
<block v-if="orderInfo.order_status == 7">待核销</block>
<block v-if="orderInfo.order_status == 3">{{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}}
</block>
<block v-if="orderInfo.status == 2">待评价</block>
<block v-if="orderInfo.status == 3">已完成</block>
<block v-if="orderInfo.order_status == 4">待评价</block>
<block v-if="orderInfo.order_status == 5">已完成</block>
<block v-if="orderInfo.status == -1">已为您退款,感谢您的支持</block>
</view>
<view>{{orderInfo.pay_time}}</view>
@ -42,22 +42,28 @@
<block v-if="isGoodsReturn==false">
<view class='nav'>
<view class='navCon acea-row row-between-wrapper'>
<view>待付款</view>
<view :class="(orderInfo.status == 0 || orderInfo.status == 9) ? 'on':''"
<view :class="orderInfo.order_status == 8||orderInfo.order_status == 1 ? 'on':''">待付款</view>
<view
:class="(orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? 'on':''"
v-if="orderInfo.order_type != 1">待发货</view>
<view :class="(orderInfo.status == 0 || orderInfo.status == 9) ? 'on':''"
<view
:class="(orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 7) ? 'on':''"
v-if="orderInfo.order_type == 1">待核销</view>
<view :class="orderInfo.status == 1 ? 'on':''" v-if="orderInfo.order_type != 1">待收货</view>
<view :class="orderInfo.status == 2 ? 'on':''">待评价</view>
<view :class="orderInfo.status == 3 ? 'on':''">已完成</view>
<view :class="orderInfo.order_status == 3 ? 'on':''" v-if="orderInfo.order_type != 1">待收货
</view>
<view :class="orderInfo.order_status == 4 ? 'on':''">待评价</view>
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
</view>
<view class='progress acea-row row-between-wrapper'>
<view class='iconfont icon-yuandianxiao t-color'></view>
<view class='iconfont icon-webicon318 t-color' v-if=" orderInfo.order_status == 8||orderInfo.order_status == 1"></view>
<view class='iconfont icon-yuandianxiao t-color' else></view>
<view class='line b-color'></view>
<view class='iconfont'
:class='((orderInfo.status == 0 || orderInfo.status == 9) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>
:class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>
</view>
<view class='line' :class='orderInfo.status > 0 && orderInfo.status != 9 ? "b-color":""'>
<view class='line'
:class='orderInfo.status > 0 && orderInfo.status != 9||orderInfo.order_status == 7 ? "b-color":""'>
</view>
<view class='iconfont'
:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 && orderInfo.status != 9 ? "t-color":"")'
@ -65,7 +71,7 @@
<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
v-if="orderInfo.order_type == 0"></view>
<view class='iconfont'
:class='(orderInfo.status == 2 && orderInfo.status != 9 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "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":"")'>
</view>
<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
</view>
@ -285,7 +291,7 @@
<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款
</view>
<view v-if="orderInfo.presellOrder.activeStatus == 1" class='bnt b-color' @tap='pay_open'>立即付款
<view v-if="orderInfo.presellOrder.activeStatus == 1" class='bnt b-color' @tap='pay_open()'>立即付款
</view>
<view v-if="orderInfo.presellOrder.activeStatus == 2" class='bnt cancel' @click="cancelOrder">取消订单
</view>
@ -305,17 +311,18 @@
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator>
<view class="" v-if="orderInfo.activity_type==98">
<view class="" v-if="orderInfo.activity_type==98">
<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
</view>
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
</view>
</view>
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==0">取件码</view>
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==0">取件码
</view>
</block>
<block v-if="orderInfo.status == 2">
<view class="bnt cancel" @click="allRefund"
@ -324,8 +331,14 @@
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator>
<view class='bnt b-color' @click="goOrderConfirm"
v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 &&orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
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">
再次购买</view>
<view class='bnt b-color' v-if="orderInfo.order_status==8"
@tap='pay_open(orderInfo.pay_price,orderInfo.group_order_id)'>
去结算
</view>
</block>
<block v-if="orderInfo.status == 3">
<view class='bnt cancel' @click="delOrder">删除订单</view>
@ -338,8 +351,12 @@
</view>
</view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
<!-- <payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
:totalPrice='totalPrice' :order_type='1'></payment>
-->
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
:totalPrice='totalPrice'></payment>
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
<!--核销码弹窗-->
<uni-popup ref="cancellPoupon" type="bottom">
@ -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
});
})
},

17
pages/order_details/stay.vue
View File

@ -217,8 +217,10 @@
<view class="content-clip"></view>
<view class='footer acea-row row-right row-middle'>
<view class="btn_cancel" @click.stop="cancelOrder">取消订单</view>
<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-if="orderInfo.pay_type == 8">立即结算</view>
<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-else>立即付款</view>
<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-if="orderInfo.pay_type == 8">立即结算</view>
<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-else>立即付款</view>
</view>
</view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
@ -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 {

30
pages/users/order_list/indexCopy.vue
View File

@ -148,7 +148,7 @@
<text class='money p-color'>￥{{item.pay_price}}</text>
</view>
<view class='bottom acea-row row-right row-middle'>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
立即付款</view>
</view>
</view>
@ -164,6 +164,7 @@
<view class="store-name">{{item.merchant.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
</view>
<view v-if="item.order_status ==7" class='t-color'>
<text
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
@ -171,10 +172,10 @@
</view>
<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
<view v-if="item.order_status == 2 " class='t-color'>待发货</view>
<view v-if="item.order_status == 1 " class='t-color'>待付款</view>
<view v-if="item.order_status == 3" class='t-color'>待收货</view>
<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价
<view v-if="item.order_status == 4" class='t-color'>待评价
</view>
<view v-if="item.order_status == 5" class='t-color'>已完成</view>
<view v-if="item.order_status == 6" class='t-color'>已退款</view>
@ -271,15 +272,24 @@
</view>
<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
</block>
<block v-if="item.order_status == 1 ">
<view class='bnt b-color'
@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
去付款
</view>
</block>
<block v-if="item.status == 2 ">
<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
<text class="iconfont icon-fabu"></text>
发布种草
</navigator> -->
<view class='bnt b-color' v-if="item.order_status==8" @click.stop='goPay(item.pay_price,item.group_order_id)'>
<view class='bnt b-color' v-if="item.order_status==8"
@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
去结算
</view>
<view v-else class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>
@ -310,8 +320,10 @@
</view>
<home></home>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
<payment :payMode='payMode' :pay_close="pay_close" :order_type='order_type' @onChangeFun='onChangeFun' :order_id="pay_order_id"
:totalPrice='totalPrice'></payment>
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
<view class="warp">
@ -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
},
/**
* 支付成功回调