From e2a99766bf7f58a4df83c78aeff3ab2f08b4345a Mon Sep 17 00:00:00 2001 From: longjieli <11918793+longjieli@user.noreply.gitee.com> Date: Sun, 30 Mar 2025 17:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B5=81=E6=B0=B4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/address/address.js | 4 +- api/amount/{amount.js => index.js} | 0 api/date/index.js | 23 +-- manifest.json | 129 ++++++++-------- .../authentication/connectAddress/detail.vue | 42 ++++-- otherPages/authentication/connectAddress/index.vue | 10 +- otherPages/myOrdersManage/date/detail.vue | 165 +++++++++++++++++++-- otherPages/myOrdersManage/date/index.vue | 9 +- otherPages/myOrdersManage/transaction/index.vue | 31 +++- pages/login/index.scss | 11 +- pages/login/index.vue | 40 +++-- pages/myOrdersManage/index.vue | 66 +++++---- pages/orderTakingManage/index.vue | 102 +++++++------ pages/userManage/index.vue | 19 ++- pages/workbenchManage/index.vue | 61 ++------ store/modules/user.js | 15 +- 16 files changed, 463 insertions(+), 264 deletions(-) rename api/amount/{amount.js => index.js} (100%) diff --git a/api/address/address.js b/api/address/address.js index dce96a5..c670e81 100644 --- a/api/address/address.js +++ b/api/address/address.js @@ -38,9 +38,9 @@ export const insertAddress = (data) => { } // 地址-地址修改 -export const udpateAddress = () => { +export const udpateAddress = (data) => { return request({ - url: '/prod-api/applet/address/udpateAddress', + url: '/applet/address/udpateAddress', headers: { isToken: true }, diff --git a/api/amount/amount.js b/api/amount/index.js similarity index 100% rename from api/amount/amount.js rename to api/amount/index.js diff --git a/api/date/index.js b/api/date/index.js index aa59ac3..fcc0cd3 100644 --- a/api/date/index.js +++ b/api/date/index.js @@ -7,40 +7,31 @@ export function deleteOutDate(data) { 'url': '/applet/outDate/deleteOutDate', 'method': 'post', data - }).then(res => { - return res.data }) } // 接单地址-不接单日期添加 -export function deleteOutDate(data) { +export function insertOutDate(data) { return request({ 'url': '/applet/outDate/insertOutDate', 'method': 'post', data - }).then(res => { - return res.data }) } // 接单地址-不接单日期列表数据查询 -export function deleteOutDate(params) { +export function outDateList() { return request({ - 'url': '​/applet​/outDate​/outDateList', - 'method': 'get', - params - }).then(res => { - return res.data + 'url': '​/applet/outDate/outDateList', + 'method': 'get' }) } -// 接单地址-不接单日期修改s -export function deleteOutDate(data) { +// 接单地址-不接单日期修改 +export function udpateOutDate(data) { return request({ - 'url': '/prod-api/applet/outDate/udpateOutDate', + 'url': '/applet/outDate/udpateOutDate', 'method': 'post', data - }).then(res => { - return res.data }) } \ No newline at end of file diff --git a/manifest.json b/manifest.json index b9665cf..218c530 100644 --- a/manifest.json +++ b/manifest.json @@ -1,63 +1,68 @@ { - "name": "uni-vuu3", - "appid": "", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - /* 5+App特有相关 */ - "usingComponents": true, - "nvueCompiler": "uni-app", - "nvueStyleCompiler": "uni-app", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": {}, - /* 模块配置 */ - "distribute": { - /* 应用发布信息 */ - "android": { - /* android打包配置 */ - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": {}, - /* ios打包配置 */ - "sdkConfigs": {} - } - }, - /* SDK配置 */ - "quickapp": {}, - /* 快应用特有相关 */ - "mp-weixin": { - /* 小程序特有相关 */ - "appid": "wx01f0f43759922fda", - "setting": { - "urlCheck": false, - "postcss": true, - "minified": true - }, - "usingComponents": true, - "mergeVirtualHostAttributes": true - }, - "vueVersion": "3" -} \ No newline at end of file + "name" : "uni-vuu3", + "appid" : "__UNI__BCA90DD", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + /* 5+App特有相关 */ + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "nvueStyleCompiler" : "uni-app", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : {}, + /* 模块配置 */ + "distribute" : { + /* 应用发布信息 */ + "android" : { + /* android打包配置 */ + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios" : {}, + /* ios打包配置 */ + "sdkConfigs" : {} + } + }, + /* SDK配置 */ + "quickapp" : {}, + /* 快应用特有相关 */ + "mp-weixin" : { + /* 小程序特有相关 */ + "appid" : "wx01f0f43759922fda", + "setting" : { + "urlCheck" : false, + "postcss" : true, + "minified" : true + }, + "usingComponents" : true, + "mergeVirtualHostAttributes" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "获取用户地址" + } + } + }, + "vueVersion" : "3" +} diff --git a/otherPages/authentication/connectAddress/detail.vue b/otherPages/authentication/connectAddress/detail.vue index daea207..4d2f519 100644 --- a/otherPages/authentication/connectAddress/detail.vue +++ b/otherPages/authentication/connectAddress/detail.vue @@ -6,7 +6,7 @@ - + {{ form.area }} 请定位选择小区或商城等 @@ -37,8 +37,7 @@ - - + @@ -55,7 +54,7 @@ - {{ eidtId ? '修改地址' : '新增地址'}} + {{ eidtItem ? '修改地址' : '新增地址'}} @@ -91,10 +90,18 @@ disabledDate: [], }) const rules = ref({}) - const eidtId = ref(0); + const eidtItem = ref(null); onLoad((options) => { - eidtId.value = options?.id || 0 + eidtItem.value = options?.item ? JSON.parse(options.item) : null; + form.value = { + id: eidtItem?.value?.id || null, + area: eidtItem?.value?.area || null, + address: eidtItem?.value?.address || null, + status: eidtItem?.value?.status || null, + latitude: eidtItem?.value?.latitude || null, + longitude: eidtItem?.value?.longitude || null + } }); const setAddress = (res) => { @@ -123,18 +130,29 @@ } const onSave = async () => { - if (eidtId.value) { + let code = null; + if (eidtItem?.value?.id) { let result = await udpateAddress({ - ...form + ...form.value }) + code = result.code } else { // 新增地址 let result = await insertAddress({ - ...form + ...form.value }) - if (result.code == 200) { - uni.navigateBack() - } + code = result.code + } + if (code == 200) { + uni.navigateBack() + } + } + + const toNoOrderDate = () => { + if (eidtItem?.value?.id) { + uni.navigateTo({ + url: `/otherPages/myOrdersManage/date/detail?addressId=${eidtItem.value.id}` + }); } } diff --git a/otherPages/authentication/connectAddress/index.vue b/otherPages/authentication/connectAddress/index.vue index 70d9665..bf5bbd8 100644 --- a/otherPages/authentication/connectAddress/index.vue +++ b/otherPages/authentication/connectAddress/index.vue @@ -36,10 +36,10 @@ 接单中 - + - + 编辑 @@ -95,10 +95,10 @@ return dateArr.map(date => dayjs(date).format('MM-DD')).join('、') } - const toAdd = (editId) => { - if(editId) { + const toAdd = (item) => { + if(item) { uni.navigateTo({ - url: `/otherPages/authentication/connectAddress/detail?id=${editId}` + url: `/otherPages/authentication/connectAddress/detail?item=${JSON.stringify(item)}` }) }else { uni.navigateTo({ diff --git a/otherPages/myOrdersManage/date/detail.vue b/otherPages/myOrdersManage/date/detail.vue index 0d607b6..65b92de 100644 --- a/otherPages/myOrdersManage/date/detail.vue +++ b/otherPages/myOrdersManage/date/detail.vue @@ -8,43 +8,180 @@ 您不会再接收到选择日期内的订单 - + 添加不接单日期 - - - + + - 8天 + {{ selectDateList.length }}天 共不接单时间 - - + + 清空 - - 2月不接单 + + + {{ month }}不接单 - 共6天:2月19日、2月22日、2月24日、2月27日、2月28日、2月29日 + 共{{ dates.length }}天:{{ item + (index != dates.length - 1 ? "," : "") }} - + 保存 + + + - + @import "index.scss"; + \ No newline at end of file diff --git a/pages/userManage/index.vue b/pages/userManage/index.vue index c11e7a5..d2bfc22 100644 --- a/pages/userManage/index.vue +++ b/pages/userManage/index.vue @@ -25,7 +25,7 @@ 提现 | - 明细 + 明细 @@ -110,6 +110,17 @@ import { useStore } from "vuex" + import { + onShow + } from "@dcloudio/uni-app" + + onShow(() => { + if (!getIsLogin()) { + uni.navigateTo({ + url: "/pages/login/index" + }) + } + }) const store = useStore(); const isLogin = ref(false) @@ -129,6 +140,12 @@ url: "/otherPages/orderTakingManage/evaluate/index" }) } + + const toRunningWater = () => { + uni.navigateTo({ + url: "/otherPages/myOrdersManage/transaction/index" + }) + }