wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-05 00:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复服务商品后台手动核销后，前端状态仍然显示正常的问题。

Browse Source 
【修复】修复微信同步头像及昵称数据，只更新用户表，未更新微信来源表的问题。
This commit is contained in:
大灰灰
2022-08-01 01:47:45 +08:00
parent 7857b9f8cb
commit 4c6ad4c0dc
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
View File

@@ -13,7 +13,7 @@
<view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
<view class="u-line-1 coreshop-text-red" v-if="item.code == 'balancepay'">
当前余额：{{userInfo.balance}}元
</view>
</view>
<view class="u-line-1" v-else>
{{item.memo}}
</view>
@@ -110,7 +110,7 @@
payments = payments.filter(item => item.code !== 'alipay')
// 如果是充值订单,服务订单 过滤余额支付 过滤非线上支付方式
if (this.type == this.$globalConstVars.paymentType.recharge || this.type === this.$globalConstVars.paymentType.serviceOrder) {
if (this.type == this.$globalConstVars.paymentType.recharge) {
payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false)
}
@@ -129,18 +129,19 @@
let data = {
payment_code: code,
payment_type: this.type,
params: {
trade_type: 'JSAPI',
}
params: {}
}
data['ids'] = (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.skill || this.type == this.$globalConstVars.paymentType.bargain || this.type == this.$globalConstVars.paymentType.giveaway || this.type == this.$globalConstVars.paymentType.solitaire || this.type == this.$globalConstVars.paymentType.transactionComponent || this.type == this.$globalConstVars.paymentType.serviceOrder) ? this.orderId : this.uid
// 判断订单支付类型
if (this.type == this.$globalConstVars.paymentType.recharge && this.recharge) {
data.params.money = this.recharge;
data['params'] = {
money: this.recharge
}
} else if ((this.type == this.$globalConstVars.paymentType.formPay || this.type == this.$globalConstVars.paymentType.formOrder) && this.recharge) {
data.ids = this.orderId;
data['ids'] = this.orderId;
data['params'] = {
}
}
let _this = this
switch (code) {

9
CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
View File

@@ -58,8 +58,13 @@
<view class="date u-line-1" v-if="item.validityStartTime && item.validityEndTime">{{item.validityStartTime}} 至 {{item.validityEndTime}}</view>
</view>
</view>
<view class="right">
<view class="use immediate-use" :round="true">{{item.statusStr}}</view>
<view class="right coreshop-flex coreshop-align-center coreshop-justify-center">
<view class="coreshop-width-fit-content">
<u-button text="正常" type="info" plain size="mini" v-if="item.status==0"></u-button>
<u-button text="过期" type="default" plain size="mini" v-if="item.status==1"></u-button>
<u-button text="作废" type="warning" plain size="mini" v-if="item.status==2"></u-button>
<u-button text="已核销" type="success" plain size="mini" v-if="item.status==3"></u-button>
</view>
</view>
</view>
<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />