xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：处理部分 todo 逻辑

Browse Source
This commit is contained in:
YunaiV
2025-04-28 21:17:18 +08:00
parent 08e7b32fc3
commit 997404dfb4
12 changed files with 47 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/commission/wallet.vue
+1 -1
View File
@@ -64,7 +64,7 @@
</uni-datetime-picker>
<view class="total-box">
<!-- TODO 芋艿：这里暂时不考虑做 -->
<!-- TODO 芋艿：【钱包-可优化】这里暂时不考虑做 -->
<!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view> -->
<!-- <view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view> -->
</view>
pages/commission/withdraw.vue
+1 -2
View File
@@ -78,7 +78,7 @@
limit="1"
mode="grid"
:imageStyles="{ width: '168rpx', height: '168rpx' }"
@success="(payload) => state.accountInfo.accountQrCodeUrl = payload.tempFilePaths[0]"
@success="(payload) => (state.accountInfo.accountQrCodeUrl = payload.tempFilePaths[0])"
/>
</view>
</view>
@@ -206,7 +206,6 @@
// 提交提现
const onConfirm = async () => {
// 参数校验
//debugger;
if (
!state.accountInfo.price ||
state.accountInfo.price > state.brokerageInfo.price ||
pages/order/aftersale/list.vue
+1 -1
View File
@@ -85,7 +85,7 @@
loadStatus: '',
});
// TODO 芋艿：优化点，增加筛选
// TODO 芋艿：【需要】优化点，增加筛选
const tabMaps = [
{
name: '全部',
pages/order/detail.vue
+21 -23
View File
@@ -1,7 +1,6 @@
<!-- 订单详情 -->
<template>
<s-layout title="订单详情" class="index-wrap" navbar="inner">
<!-- 订单状态 TODO -->
<view
class="state-box ss-flex-col ss-col-center ss-row-right"
:style="[
@@ -12,37 +11,36 @@
]"
>
<view class="ss-flex ss-m-t-32 ss-m-b-20">
<!-- 待支付 -->
<image
v-if="
state.orderInfo.status_code == 'unpaid' ||
state.orderInfo.status === 10 || // 待发货
state.orderInfo.status_code == 'nocomment'
"
v-if="state.orderInfo.status === 0"
class="state-img"
:src="sheep.$url.static('/static/img/shop/order/no_pay.png')"
/>
<!-- 待发货 -->
<image
v-if="state.orderInfo.status === 10"
class="state-img"
:src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
>
</image>
/>
<!-- 已完成 -->
<image
v-if="
state.orderInfo.status_code == 'completed' ||
state.orderInfo.status_code == 'refund_agree'
"
v-else-if="state.orderInfo.status === 30"
class="state-img"
:src="sheep.$url.static('/static/img/shop/order/order_success.png')"
>
</image>
/>
<!-- 已关闭 -->
<image
v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
v-else-if="state.orderInfo.status === 40"
class="state-img"
:src="sheep.$url.static('/static/img/shop/order/order_close.png')"
>
</image>
/>
<!-- 已发货 -->
<image
v-if="state.orderInfo.status_code == 'noget'"
v-else-if="state.orderInfo.status === 20"
class="state-img"
:src="sheep.$url.static('/static/img/shop/order/order_express.png')"
>
</image>
/>
<view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
</view>
<view class="ss-font-26 ss-m-x-20 ss-m-b-70">
@@ -331,7 +329,7 @@
// 确认收货
async function onConfirm(orderId, ignore = false) {
// 需开启确认收货组件
// todo: 芋艿：待接入微信 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// todo: 芋艿：【微信物流】待接入微信 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
let isOpenBusinessView = true;
@@ -406,7 +404,7 @@
// 对详情数据进行适配
let res;
if (state.comeinType === 'wechat') {
// TODO 芋艿：微信场景下
// TODO 芋艿：【微信物流】微信场景下
res = await OrderApi.getOrderDetail(id, {
merchant_trade_no: state.merchantTradeNo,
});
@@ -439,7 +437,7 @@
if (options.id) {
id = options.id;
}
// TODO 芋艿：下面两个变量，后续接入
// TODO 芋艿：【微信物流】下面两个变量，后续接入
state.comeinType = options.comein_type;
if (state.comeinType === 'wechat') {
state.merchantTradeNo = options.merchant_trade_no;
pages/order/list.vue
+3 -3
View File
@@ -206,10 +206,10 @@
});
}
// 确认收货 TODO 芋艿：待测试
// 确认收货
async function onConfirm(order, ignore = false) {
// 需开启确认收货组件
// todo: 芋艿：需要后续接入微信收货组件 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// todo: 芋艿：【微信物流】需要后续接入微信收货组件 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
let isOpenBusinessView = true;
@@ -241,7 +241,7 @@
}
// #ifdef MP-WEIXIN
// 小程序确认收货组件 TODO 芋艿：后续再接入
// 小程序确认收货组件 TODO 芋艿：【微信物流】后续再接入
function mpConfirm(order) {
if (!wx.openBusinessView) {
sheep.$helper.toast(`请升级微信版本`);
pages/order/pickUpVerify.vue
+2 -3
View File
@@ -18,12 +18,11 @@
</view>
<view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
<view class="rules">
<!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
<view class="item">
<view class="rulesTitle flex flex-wrap align-center"> 核销时间 </view>
<view class="info">
每日：
<text class="time">2020-2-+52</text>
<text class="time">{{ systemStore.openingTime }} - {{ systemStore.closingTime }}</text>
</view>
</view>
<view class="item">
@@ -78,7 +77,6 @@
* 打开地图
*/
const showMaoLocation = () => {
console.log(props.systemStore);
if (!props.systemStore.latitude || !props.systemStore.longitude) {
sheep.$helper.toast('缺少经纬度信息无法查看地图!');
return;
@@ -91,6 +89,7 @@
address: props.systemStore.areaName + props.systemStore.detailAddress,
});
};
/**
* 拨打电话
*/
pages/user/wallet/score.vue
+1 -1
View File
@@ -36,7 +36,7 @@
</button>
</uni-datetime-picker>
<!-- TODO 芋艿：【钱包】可优化 -->
<!-- TODO 芋艿：【钱包-可优化】展示一下 -->
<!-- <view class="total-box">-->
<!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
<!-- <view>总支出￥{{ -state.pagination.expense }}</view>-->