update

src/business/login/index.ts

@@ -2,6 +2,7 @@ import { reactive } from 'vue'
 import { v4 } from 'uuid'
 import { encryptAES, decryptAES } from '@/utils/crypto'
 import { timerTask } from '@/utils/timer'
+import { ClientType } from '@/constants/client'
 import { queryLoginId, login } from '@/services/api/account'
 import { sessionData, localData } from '@/stores/storage'
 import { loginStore, enumStore, errorInfoStore, userStore, futuresStore, accountStore } from '@/stores'
@@ -20,7 +21,7 @@ export function useLogin() {
         LoginPWD: '',
         GUID: v4(),
         LoginType: 0,
-        ClientType: 4,
+        ClientType: ClientType.None,
         Version: '2.0.0.0',
         DeviceID: ''
     })
@@ -86,8 +87,9 @@ export function useLogin() {
     }
 
     // 用户登录
-    const userLogin = async () => {
+    const userLogin = async (clientType: ClientType) => {
         logining.value = true
+        formData.ClientType = clientType
         try {
             const params = { ...formData }
             await loadBaseData()

src/business/order/index.ts

@@ -221,7 +221,10 @@ export function useQueryTHJPromotionIncome() {
             },
             success: (res) => {
                 total.value = res.total
-                dataList.value = res.data
+                dataList.value = res.data.map((e) => ({
+                    ...e,
+                    profitstatus: status ?? e.profitstatus
+                }))
             },
             complete: () => {
                 loading.value = false

src/packages/mobile/views/user/login/index.vue

@@ -37,6 +37,7 @@
 import { shallowRef } from 'vue'
 import { Button, Field, CellGroup, Form, Checkbox, showFailToast, showSuccessToast, showToast } from 'vant'
 import { fullloading } from '@/utils/vant'
+import { ClientType } from '@/constants/client'
 import { useLogin } from '@/business/login'
 import { useNavigation } from '@/hooks/navigation'
 import service from '@/services'
@@ -62,7 +63,7 @@ const navigationTo = (name: string) => {
 const formSubmit = () => {
   if (checked.value) {
     fullloading((hideLoading) => {
-      userLogin().then(() => {
+      userLogin(ClientType.Android).then(() => {
         hideLoading()
         routerBack()
         showSuccessToast('登录成功')

src/packages/pc/views/auth/login/index.vue

@@ -27,6 +27,7 @@ import { shallowRef } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import { ClientType } from '@/constants/client'
 import { useLogin } from '@/business/login'
 import { menuStore } from '@/stores'
 import SignLayout from '../components/layout/index.vue'
@@ -52,7 +53,7 @@ const formSubmit = () => {
   formRef.value?.validate(async (valid) => {
     if (valid) {
       try {
-        await userLogin()
+        await userLogin(ClientType.Web)
         await menuStore.actions.getUserMenuList()
         const redirect = route.query.redirect
         if (redirect) {

src/packages/pc/views/promotion/index.vue

@@ -12,7 +12,8 @@
             </template>
             <!-- 操作 -->
             <template #operate="{ row }">
-                <app-auth-operation :menus="handleOperateButtons(row)" :options="{ selectedRow: row }" />
+                <app-auth-operation :menus="handleOperateButtons(row)" :options="{ selectedRow: row }"
+                    @closed="onRefresh" />
             </template>
             <template #footer>
                 <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
@@ -46,6 +47,8 @@ filterOptons.selectList = [
     {
         label: '支付状态',
         key: 'profitstatus',
+        locked: true,
+        selectedValue: 1,
         options: [
             { label: '未支付', value: 1 },
             { label: '支取中', value: 3 },
@@ -55,7 +58,6 @@ filterOptons.selectList = [
 ]
 
 filterOptons.buttonList = [
-    { lable: '重置', onClick: () => onSearch(true) },
     { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() }
 ]
 

src/packages/pc/views/tradedata/index.vue

@@ -49,8 +49,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'marketid', label: '市场' },
     { prop: 'wrstandardname', label: '商品' },
     { prop: 'accountname', label: '下单好友' },
-    { prop: 'tradeqty', label: '吨数' },
-    { prop: 'tradelot', label: '笔数' },
+    { prop: 'tradeqty', label: '吨数(买/卖)' },
+    { prop: 'tradelot', label: '笔数(买/卖)' },
 ])
 
 filterOptons.selectList = [