czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复，下单优化，订单结算问题修复

Browse Source
This commit is contained in:
YeMingfei666
2025-10-31 16:30:47 +08:00
parent 09fc28de06
commit 31d91f7de5
10 changed files with 379 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
distribution/income-details/index.vue
View File

@@ -69,7 +69,7 @@
<text class="color-666" v-if="item.status == 'success'"
>已入账</text
>
<text class="color-666" v-if="item.status == 'REFUND'"
<text class="color-666" v-if="item.status == 'refund'"
>已退款</text
>
</view>
@@ -80,12 +80,12 @@
<text class="color-333 font-700">{{ item.orderNo }}</text>
</view>
<view class="money">
<text class="money reduce" v-if="item.status == 'REFUND'"
<text class="money reduce" v-if="item.status == 'refund'"
>-{{ item.rewardAmount }}</text
>
<text class="money" v-else>+{{ item.rewardAmount }}</text>
<text class="tag" v-if="item.status == 'REFUND'">订单退款</text>
<text class="tag" v-if="item.status == 'refund'">订单退款</text>
<text class="tag" v-else-if="item.level == 1"
>(订单一级分成)</text
>
@@ -205,7 +205,7 @@ const statusList = ref([
fontSize: "16",
},
{
value: "REFUND",
value: "refund",
name: "已退款",
color: "#333",
fontSize: "16",

49
distribution/shop-detail/index.vue
View File

@@ -54,7 +54,14 @@
@click="questionClick('等级升级条件')"
/>
</view>
<view class="u-m-t-28 u-flex align-center" v-if="juNextLvMoney&&state.distributionUser&&!state.distributionUser.IsAssignLevel">
<view
class="u-m-t-28 u-flex align-center"
v-if="
juNextLvMoney &&
state.distributionUser &&
state.distributionUser.isAssignLevel == 0
"
>
<text class="color-666">距离下一级还差：</text>
<text class="color-333 font-700 u-m-r-18"
>{{ juNextLvMoney }}
@@ -72,7 +79,11 @@
<view class="u-flex u-m-t-28">
<view class="u-flex-1">
<view class="u-flex align-center">
<text class="u-m-r-10 font-12 color-666" @click="toShouyiDetail('')">总收益</text>
<text
class="u-m-r-10 font-12 color-666"
@click="toShouyiDetail('')"
>总收益</text
>
<up-icon
name="question-circle"
size="24rpx"
@@ -80,13 +91,20 @@
@click="questionClick('总收益')"
/>
</view>
<view class="u-m-t-16 price" @click="toShouyiDetail('')" v-if="state.distributionUser">{{
state.distributionUser.totalIncome
}}</view>
<view
class="u-m-t-16 price"
@click="toShouyiDetail('')"
v-if="state.distributionUser"
>{{ state.distributionUser.totalIncome }}</view
>
</view>
<view class="u-flex-1">
<view class="u-flex align-center">
<text class="u-m-r-10 font-12 color-666" @click="toShouyiDetail('待入账')">待入账</text>
<text
class="u-m-r-10 font-12 color-666"
@click="toShouyiDetail('待入账')"
>待入账</text
>
<up-icon
name="question-circle"
size="24rpx"
@@ -94,9 +112,12 @@
@click="questionClick('待入账')"
/>
</view>
<view class="u-m-t-16 price" @click="toShouyiDetail('待入账')" v-if="state.distributionUser">{{
state.distributionUser.pendingIncome
}}</view>
<view
class="u-m-t-16 price"
@click="toShouyiDetail('待入账')"
v-if="state.distributionUser"
>{{ state.distributionUser.pendingIncome }}</view
>
</view>
</view>
</view>
@@ -219,9 +240,7 @@
<text v-if="item.inviteTime">{{
item.inviteTime.split(" ")[0]
}}</text>
<text style="color: #fff" v-else>{{
"yyyy-MM-dd"
}}</text>
<text style="color: #fff" v-else>{{ "yyyy-MM-dd" }}</text>
</view>
</view>
</view>
@@ -358,7 +377,11 @@ const commissionTipsType = ref("");
function toShouyiDetail(name) {
uni.navigateTo({
url: "/distribution/income-details/index?name="+name+'&shopId='+options.shopId,
url:
"/distribution/income-details/index?name=" +
name +
"&shopId=" +
options.shopId,
});
}
function questionClick(title) {