wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.xgumi.com/wanma-benteng/new-mshop-view

This commit is contained in:
zpian 2024-02-02 16:34:00 +08:00
parent 4ef596d01d 86b269ba76
commit 99c9eedb2c
4 changed files with 157 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
components/payment/index.vue
View File

@ -4,8 +4,7 @@
<view class="title acea-row row-center-wrapper"> <view class="title acea-row row-center-wrapper">
选择付款方式<text class="iconfont icon-guanbi" @click='close'></text> 选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
</view> </view>
<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)' v-for="(item,index) in payMode" <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">
:key="index">
<view class="left acea-row row-between-wrapper"> <view class="left acea-row row-between-wrapper">
<view class="iconfont" :class="item.icon"></view> <view class="iconfont" :class="item.icon"></view>
<view class="text"> <view class="text">
@ -69,7 +68,7 @@
}; };
}, },
mounted:function(){ mounted:function(){
}, },
methods: { methods: {
close: function() { close: function() {
@ -101,7 +100,7 @@
}else if(paytype == 'alipay'){ }else if(paytype == 'alipay'){
// #ifndef MP // #ifndef MP
type = 'alipay'; type = 'alipay';
// #endif // #endif
// #ifdef MP // #ifdef MP
type = 'alipayQr'; type = 'alipayQr';
// #endif // #endif
@ -115,7 +114,7 @@
uni.showLoading({ uni.showLoading({
title: '支付中' title: '支付中'
}); });
let orderApi = that.order_type === 1 ? presellOrderPay : that.order_type === 2 ? integralOrderPay : orderPay let orderApi = that.order_type === 1 ? presellOrderPay : that.order_type === 2 ? integralOrderPay : orderPay
orderApi(that.order_id, { orderApi(that.order_id, {
type: type, type: type,
// #ifdef H5 // #ifdef H5
@ -127,7 +126,7 @@
jsConfig = res.data.result.config, jsConfig = res.data.result.config,
callback_key = res.data.result.pay_key, callback_key = res.data.result.pay_key,
goPages = that.returnUrl ? that.returnUrl : '/pages/users/order_list/index'; goPages = that.returnUrl ? that.returnUrl : '/pages/users/order_list/index';
switch (status) { switch (status) {
case 'ORDER_EXIST': case 'ORDER_EXIST':
case 'EXTEND_ORDER': case 'EXTEND_ORDER':
case 'PAY_ERROR': case 'PAY_ERROR':
@ -138,13 +137,13 @@
}); });
return that.$util.Tips({ return that.$util.Tips({
title: res.message title: res.message
}); });
break; break;
case 'success': case 'success':
uni.hideLoading(); uni.hideLoading();
this.$emit('onChangeFun', { this.$emit('onChangeFun', {
action: 'payClose' action: 'payClose'
}); });
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
@ -158,19 +157,19 @@
uni.hideLoading(); uni.hideLoading();
this.$emit('onChangeFun', { this.$emit('onChangeFun', {
action: 'payClose' action: 'payClose'
}); });
uni.navigateTo({ uni.navigateTo({
url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig, url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig,
}) })
return return
break; break;
// #ifndef MP // #ifndef MP
case "wechat": case "wechat":
case "weixin": case "weixin":
case "weixinApp": case "weixinApp":
jsConfig.timeStamp = jsConfig.timestamp; jsConfig.timeStamp = jsConfig.timestamp;
// #ifndef APP-PLUS // #ifndef APP-PLUS
that.$wechat.pay(jsConfig).then(res => { that.$wechat.pay(jsConfig).then(res => {
console.log('测试支付数据无效的success：'+res.data) console.log('测试支付数据无效的success：'+res.data)
this.$emit('onChangeFun', { this.$emit('onChangeFun', {
action: 'payClose' action: 'payClose'
@ -179,7 +178,7 @@
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1'
}); });
@ -193,12 +192,12 @@
}else{ }else{
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=0' url: goPages + '?status=0'
}); });
} }
} }
}) })
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
@ -218,7 +217,7 @@
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1'
}); });
@ -231,7 +230,7 @@
}else{ }else{
return that.$util.Tips({ return that.$util.Tips({
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=0' url: goPages + '?status=0'
}); });
@ -265,15 +264,15 @@
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=1' url: goPages + '?status=1'
}); });
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=1' url: goPages + '?status=1'
}); });
@ -288,7 +287,7 @@
}); });
}, },
complete: function(e) { complete: function(e) {
uni.hideLoading(); uni.hideLoading();
//关闭当前页面跳转至订单状态 //关闭当前页面跳转至订单状态
if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({ if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
title: '取消支付' title: '取消支付'
@ -321,8 +320,8 @@
location.href = locations; location.href = locations;
}, 100); }, 100);
break; break;
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
case 'alipayApp': case 'alipayApp':
uni.requestPayment({ uni.requestPayment({
@ -335,11 +334,11 @@
return that.$util.Tips({ return that.$util.Tips({
title: '支付成功', title: '支付成功',
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1'
}); });
}, },
fail: (e) => { fail: (e) => {
return that.$util.Tips({ return that.$util.Tips({

44
pages/agent/invite/index.vue
View File

@ -183,6 +183,7 @@ export default {
mer_images: {}, mer_images: {},
}, },
// 地区选择器 // 地区选择器
area_value:[],
area_status: false, area_status: false,
address: '', address: '',
// 商户相关 // 商户相关
@ -267,7 +268,8 @@ export default {
this.isShowAuth = true this.isShowAuth = true
}else{ }else{
// 已登录 获取信息 // 已登录 获取信息
this.init(); if(Number(this.apply_info_id) > 0) this.getApplyInfo();
else this.init();
} }
}, },
methods: { methods: {
@ -284,7 +286,6 @@ export default {
}, },
// 授权成功 初始化 // 授权成功 初始化
init () { init () {
if(Number(this.apply_info_id) > 0) this.getApplyInfo();
this.getInviteAgentInfo() this.getInviteAgentInfo()
this.generatePageTitle(); this.generatePageTitle();
this.getConfig(); this.getConfig();
@ -395,8 +396,17 @@ export default {
}, },
// 商户相关 - 获取分类列表 // 商户相关 - 获取分类列表
getMerClass() { getMerClass() {
let _this = this;
merClassifly().then(res => { merClassifly().then(res => {
this.mer_cate_list = res.data _this.mer_cate_list = res.data
if(Number(_this.apply_info_id) > 0){
Object.values(res.data).forEach(function(item, index) {
if (item.merchant_category_id == _this.apply_info.mer_class_id) {
_this.mer_cate_index = index;
_this.mer_class_name = item.category_name
}
});
}
}).catch(res => { }).catch(res => {
this.$util.Tips({ this.$util.Tips({
title: res title: res
@ -405,8 +415,17 @@ export default {
}, },
// 商户相关 - 获取类型列表 // 商户相关 - 获取类型列表
getMerType() { getMerType() {
let _this = this;
getStoreTypeApi().then(res => { getStoreTypeApi().then(res => {
this.mer_type_list = res.data _this.mer_type_list = res.data
if(Number(_this.apply_info_id) > 0){
Object.values(res.data).forEach(function(item, index) {
if (item.mer_type_id == _this.apply_info.mer_type_id) {
_this.mer_type_index = index;
_this.mer_type_name = item.type_name
}
});
}
}).catch(res => { }).catch(res => {
this.$util.Tips({ this.$util.Tips({
title: res title: res
@ -470,15 +489,13 @@ export default {
// 提交申请 // 提交申请
submitAgentApplyInfo(applyInfo).then(res => { submitAgentApplyInfo(applyInfo).then(res => {
if (res.status == 200) { if (res.status == 200) {
if(Number(_this.pay_money) > 0){ if(Number(_this.pay_money) > 0 && Number(_this.apply_info_id) <= 0){
let status = res.data.status, let status = res.data.status,
orderId = res.data.result.order_id, orderId = res.data.result.order_id,
callback_key = res.data.result.pay_key, callback_key = res.data.result.pay_key,
jsConfig = res.data.result.config; jsConfig = res.data.result.config;
// let goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message; // let goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message;
let goPages = '/pages/agent/invite/record'; let goPages = '/pages/agent/invite/record';
switch (status) { switch (status) {
case 'ORDER_EXIST': case 'ORDER_EXIST':
case 'EXTEND_ORDER': case 'EXTEND_ORDER':
@ -606,7 +623,8 @@ export default {
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: pages + '&status=0' // url: pages + '&status=0'
url: pages
}); });
}, },
}) })
@ -679,14 +697,15 @@ export default {
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: pages + '&status=0' // url: pages + '&status=0'
url: pages
}); });
} }
}else{ }else{
_this.$util.Tips({ _this.$util.Tips({
title: '操作成功！', title: '操作成功！',
},{ },{
tab: 5, tab: 4,
url: '/pages/agent/invite/record' url: '/pages/agent/invite/record'
}); });
} }
@ -713,8 +732,9 @@ export default {
let data = res.data || {}; let data = res.data || {};
_this.apply_info = data || {}; _this.apply_info = data || {};
_this.agent_type = data.agent_type; _this.agent_type = data.agent_type;
_this.agent_id = data.pid _this.agent_id = data.pid;
_this.getInviteAgentInfo() _this.areaChange({});
_this.init();
} }
}).catch(err => { }).catch(err => {
this.$util.Tips({title: err}); this.$util.Tips({title: err});

117
pages/agent/invite/record.vue
View File

@ -3,25 +3,41 @@
<view class="application-record" v-if="Object.values(list).length > 0"> <view class="application-record" v-if="Object.values(list).length > 0">
<view class="card-list" v-for="(item,index) in list" :key="index"> <view class="card-list" v-for="(item,index) in list" :key="index">
<view class="card-top"> <view class="card-top">
<view class="title"> <view class="title">{{item.contact_name}}({{agentType(item.agent_type)}})</view>
{{item.contact_name}}({{agentType(item.agent_type)}})
</view>
<view class="time">提交时间：{{item.create_time}}</view> <view class="time">提交时间：{{item.create_time}}</view>
<view v-if="item.reason && item.status == 2" class="reason">原因：{{item.reason}}</view> <view v-if="item.reason && item.status == 2" class="reason">原因：{{item.reason}}</view>
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="card-bottom"> <view class="card-bottom">
<view class="card-status"> <block v-if="item.orderInfo && Number(item.orderInfo.status) !== 3">
<image class="status-icon" v-if="item.status === 0" src="@/static/images/pending.png" mode=""></image> <view class="card-status">
<image class="status-icon" v-else-if="item.status === 1" src="@/static/images/passed.png" mode=""></image> <text class="status-text">{{statusText(item)}}</text>
<image class="status-icon" v-else-if="item.status === 2" src="@/static/images/not-pass.png" mode=""></image> </view>
<text class="status-text">{{statusText(item.status)}}</text> <view class="status-btn" @click="goPay(item.orderInfo)">去支付</view>
</view> </block>
<view class="status-btn" v-if="item.status == 2" @click="jump(item)">修改</view> <block v-else>
<view class="card-status">
<image class="status-icon" v-if="item.status === 0" src="@/static/images/pending.png"></image>
<image class="status-icon" v-else-if="item.status === 1" src="@/static/images/passed.png"></image>
<image class="status-icon" v-else-if="item.status === 2" src="@/static/images/not-pass.png"></image>
<text class="status-text">{{statusText(item)}}</text>
</view>
<view class="status-btn" v-if="item.status == 2" @click="jump(item)">修改</view>
</block>
</view> </view>
</view> </view>
</view> </view>
<emptyPage v-else title="暂无记录～"></emptyPage> <emptyPage v-else title="暂无记录～"></emptyPage>
<!-- 支付弹框 -->
<payment
:payMode='pay_list'
:pay_close="pay_close"
@onChangeFun='onChangeFun'
:order_id="pay_order_id"
:totalPrice='totalPrice'
:returnUrl="'/pages/agent/invite/record'">
</payment>
<!-- 授权登录 --> <!-- 授权登录 -->
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authClose"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authClose"></authorize>
</view> </view>
@ -32,11 +48,17 @@ import {mapGetters} from "vuex";
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {agentApplyRecord} from "@/api/agent"; import {agentApplyRecord} from "@/api/agent";
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import payment from '@/components/payment';
import {getUserInfo} from "@/api/user";
export default { export default {
components: { components: {
authorize, authorize,
emptyPage emptyPage,
payment
},
computed: {
...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor'])
}, },
data() { data() {
return { return {
@ -45,11 +67,36 @@ export default {
// 登录相关 // 登录相关
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false,//是否隐藏授权 isShowAuth: false,//是否隐藏授权
// 支付相关
pay_list: [
{
name: "微信支付",
icon: "icon-weixinzhifu",
value: 'wechat',
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
}
],
pay_close: false,
pay_order_id: '',
totalPrice: 0,
} }
}, },
computed: {
...mapGetters(['isLogin', 'userInfo', 'viewColor'])
},
onLoad() { onLoad() {
let _this = this; let _this = this;
// 判断：是否登录 // 判断：是否登录
@ -81,6 +128,9 @@ export default {
// 授权成功 初始化 // 授权成功 初始化
init () { init () {
this.getRecordList(); this.getRecordList();
getUserInfo().then(res => {
this.pay_list[2].number = res.data.now_money;
});
}, },
// 记录 // 记录
getRecordList() { getRecordList() {
@ -99,13 +149,18 @@ export default {
}); });
}, },
//状态判断 //状态判断
statusText(number) { statusText(item) {
let statusData = { let orderStatus = item.orderInfo ? item.orderInfo.status : 0;
0: "审核中", if(Number(orderStatus) != 3 && item.orderInfo){
1: "已通过", return '待支付：' + '¥' + item.orderInfo.pay_price;
2: "已驳回" }else{
}; let statusData = {
return statusData[number] 0: "审核中",
1: "已通过",
2: "已驳回"
};
return statusData[Number(item.status)]
}
}, },
//状态判断 //状态判断
agentType(number) { agentType(number) {
@ -127,6 +182,26 @@ export default {
url: `/pages/agent/invite/index?apply_id=${item.id}` url: `/pages/agent/invite/index?apply_id=${item.id}`
}) })
}, },
// 支付 - 发起支付
goPay(orderInfo) {
this.$set(this, 'pay_close', true);
this.order_id = orderInfo.group_order_id;
this.pay_order_id = orderInfo.group_order_id.toString()
this.$set(this, 'totalPrice', orderInfo.pay_price);
},
// 支付 - 事件回调
onChangeFun(e) {
let opt = e;
let action = opt.action || null;
let value = opt.value != undefined ? opt.value : null;
(action && this[action]) && this[action](value);
},
// 支付 - 关闭弹框
payClose: function() {
this.pay_close = false;
},
} }
} }
</script> </script>

8
pages/users/order_list/index.vue
View File

@ -117,7 +117,7 @@
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
</view> </view>
@ -711,7 +711,7 @@
// 关闭发票弹窗 // 关闭发票弹窗
changeInvoiceClose: function(data) { changeInvoiceClose: function(data) {
if(data)this.getInvoiceData(data); if(data)this.getInvoiceData(data);
this.$set(this.invoice, 'invoice', false); this.$set(this.invoice, 'invoice', false);
}, },
// 开票回调 // 开票回调
getInvoiceData(data) { getInvoiceData(data) {
@ -1022,7 +1022,7 @@
} }
} }
} }
.search { .search {
height: 70rpx; height: 70rpx;
padding: 0 30rpx; padding: 0 30rpx;
@ -1031,7 +1031,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
font-size: 26rpx; font-size: 26rpx;
color: #999999; color: #999999;
.iconfont { .iconfont {
margin-right: 10rpx; margin-right: 10rpx;
font-size: 23rpx; font-size: 23rpx;