From 9340dfc5d78dc31c3259f8a7f3ea06148d9afd58 Mon Sep 17 00:00:00 2001 From: ranranran12123 Date: Thu, 31 Oct 2024 18:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uniapp05/API/api.ts | 3 +- uniapp05/API/requets.ts | 52 --- uniapp05/pages.json | 25 ++ uniapp05/pages/distribution/distribution.vue | 184 ++++++--- uniapp05/pages/index/index.vue | 342 +++++++++++++++- uniapp05/pages/my/my.vue | 78 ++-- .../pages/orderManagement/orderManagement.vue | 126 +++--- uniapp05/pages/testfour/testfour.vue | 13 + uniapp05/pages/testone/testone.vue | 50 +++ uniapp05/pages/three/three.vue | 376 ++++++++++++++++++ .../dist/dev/.sourcemap/mp-alipay/app.js.map | 2 +- .../dev/.sourcemap/mp-alipay/cancel.js.map | 1 - .../.sourcemap/mp-alipay/common/vendor.js.map | 2 +- .../dev/.sourcemap/mp-alipay/finish.js.map | 1 - .../dist/dev/.sourcemap/mp-alipay/list.js.map | 1 - .../pages/distribution/distribution.js.map | 2 +- .../pages/index/cancel/cancel.js.map | 2 +- .../pages/index/cancel/cancel2.js.map | 1 - .../pages/index/finish/finish.js.map | 2 +- .../pages/index/finish/finish2.js.map | 1 - .../mp-alipay/pages/index/index.js.map | 2 +- .../mp-alipay/pages/index/list.js.map | 2 +- .../mp-alipay/pages/index/list2.js.map | 1 - .../.sourcemap/mp-alipay/pages/my/my.js.map | 2 +- .../orderManagement/orderManagement.js.map | 2 +- .../mp-alipay/pages/testfour/testfour.js.map | 1 + .../mp-alipay/pages/testone/testone.js.map | 1 + .../mp-alipay/pages/three/three.js.map | 1 + uniapp05/unpackage/dist/dev/mp-alipay/app.js | 3 + .../unpackage/dist/dev/mp-alipay/app.json | 5 +- .../unpackage/dist/dev/mp-alipay/cancel.js | 8 - .../dist/dev/mp-alipay/common/vendor.js | 22 + .../unpackage/dist/dev/mp-alipay/finish.js | 8 - .../pages/distribution/distribution.axml | 2 +- .../pages/distribution/distribution.js | 128 ++++-- .../mp-alipay/pages/index/cancel/cancel.js | 10 +- .../mp-alipay/pages/index/cancel/cancel2.js | 4 - .../mp-alipay/pages/index/finish/finish.js | 10 +- .../mp-alipay/pages/index/finish/finish2.js | 4 - .../dist/dev/mp-alipay/pages/index/index.acss | 167 +++++++- .../dist/dev/mp-alipay/pages/index/index.axml | 2 +- .../dist/dev/mp-alipay/pages/index/index.js | 78 +++- .../dist/dev/mp-alipay/pages/index/index.json | 6 +- .../dist/dev/mp-alipay/pages/index/list.js | 10 +- .../dist/dev/mp-alipay/pages/index/list2.js | 4 - .../dist/dev/mp-alipay/pages/my/my.js | 51 ++- .../orderManagement/orderManagement.axml | 2 +- .../pages/orderManagement/orderManagement.js | 89 +++-- .../mp-alipay/pages/testfour/testfour.acss | 0 .../mp-alipay/pages/testfour/testfour.axml | 1 + .../{list.js => pages/testfour/testfour.js} | 6 +- .../mp-alipay/pages/testfour/testfour.json | 5 + .../dev/mp-alipay/pages/testone/testone.acss | 0 .../dev/mp-alipay/pages/testone/testone.axml | 1 + .../dev/mp-alipay/pages/testone/testone.js | 50 +++ .../dev/mp-alipay/pages/testone/testone.json | 5 + .../dist/dev/mp-alipay/pages/three/three.acss | 209 ++++++++++ .../dist/dev/mp-alipay/pages/three/three.axml | 1 + .../dist/dev/mp-alipay/pages/three/three.js | 93 +++++ .../dist/dev/mp-alipay/pages/three/three.json | 6 + 60 files changed, 1881 insertions(+), 385 deletions(-) delete mode 100644 uniapp05/API/requets.ts create mode 100644 uniapp05/pages/testfour/testfour.vue create mode 100644 uniapp05/pages/testone/testone.vue create mode 100644 uniapp05/pages/three/three.vue delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/cancel.js.map delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/finish.js.map delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/list.js.map delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/index/cancel/cancel2.js.map delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/index/finish/finish2.js.map delete mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/index/list2.js.map create mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/testfour/testfour.js.map create mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/testone/testone.js.map create mode 100644 uniapp05/unpackage/dist/dev/.sourcemap/mp-alipay/pages/three/three.js.map delete mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/cancel.js delete mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/finish.js delete mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/index/cancel/cancel2.js delete mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/index/finish/finish2.js delete mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list2.js create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.acss create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.axml rename uniapp05/unpackage/dist/dev/mp-alipay/{list.js => pages/testfour/testfour.js} (61%) create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.json create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.acss create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.axml create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.js create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.json create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.acss create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.axml create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.js create mode 100644 uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.json diff --git a/uniapp05/API/api.ts b/uniapp05/API/api.ts index c1766ef..c45a448 100644 --- a/uniapp05/API/api.ts +++ b/uniapp05/API/api.ts @@ -1 +1,2 @@ -export const apiImageUrl = 'http://39.101.78.35:6271' // 测试服务器 \ No newline at end of file +export const apiImageUrl = 'http://39.101.78.35:6271' +//export const apiImageUrl = 'http://localhost:9999' \ No newline at end of file diff --git a/uniapp05/API/requets.ts b/uniapp05/API/requets.ts deleted file mode 100644 index ef6ca3b..0000000 --- a/uniapp05/API/requets.ts +++ /dev/null @@ -1,52 +0,0 @@ - - -// 定义公共的url -//const baseUrl = "https://xiaode.shop:8066/api"; -//const webSocketUrl = "wss://xiaode.shop:8066/api/ws/" - - -const baseUrl = "http://110.42.248.235:8066/api"; -const webSocketUrl = "ws://110.42.248.235:8066//api/ws/" -/** - * 返回baseUrl - */ -export const getBaseUrl = () => { - return baseUrl; -} -export const getSocketUrl = () => { - return webSocketUrl; -} -/** - * 后端请求工具类 - * @param {*} params 请求参数 - */ -export const requestUtil = (params:any) => { - - let header = { ...params.header }; - - // 拼接header 带上token - header["token"] = uni.getStorageSync("cookie"); - - - - - return new Promise((resolve, reject) => { - uni.request({ - ...params, - method:params.method, - header: header, - url: baseUrl + params.url, - success: (result:any) => { - resolve(result.data); - }, - fail: (err:any) => { - uni.showToast({ - icon: 'error', - title: '连接服务器失败', - duration: 3000 - }) - reject(err); - } - }); - }) -} diff --git a/uniapp05/pages.json b/uniapp05/pages.json index 9a8b931..ce8bbf5 100644 --- a/uniapp05/pages.json +++ b/uniapp05/pages.json @@ -174,6 +174,31 @@ "enablePullDownRefresh" : false, "navigationBarBackgroundColor": "#4095e5" } + }, + { + "path" : "pages/testone/testone", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/testfour/testfour", + "style" : + { + "navigationBarTitleText" : "测试页四", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/three/three", + "style" : + { + "navigationBarTitleText" : "订单", + "enablePullDownRefresh" : false, + "navigationBarBackgroundColor": "#4095e5" + } } ], "globalStyle": { diff --git a/uniapp05/pages/distribution/distribution.vue b/uniapp05/pages/distribution/distribution.vue index 87940be..b7f7d45 100644 --- a/uniapp05/pages/distribution/distribution.vue +++ b/uniapp05/pages/distribution/distribution.vue @@ -1,76 +1,148 @@ +22.42 \ No newline at end of file diff --git a/uniapp05/pages/index/index.vue b/uniapp05/pages/index/index.vue index ed120c8..6ed2117 100644 --- a/uniapp05/pages/index/index.vue +++ b/uniapp05/pages/index/index.vue @@ -1,28 +1,54 @@ \ No newline at end of file diff --git a/uniapp05/pages/my/my.vue b/uniapp05/pages/my/my.vue index c9896e5..471e4b2 100644 --- a/uniapp05/pages/my/my.vue +++ b/uniapp05/pages/my/my.vue @@ -87,7 +87,9 @@ const getLoginUser = () => { }, data: {}, success: (res) => { - console.log(res.data.message)//控制台在登录时返回ok未登录时返回”未登录“ + console.log(res.data.data.id) + uni.setStorageSync('businessId', res.data.data.id); + console.log(res.data.data); user.value.message=res.data.message if(user.value.message==='ok') { @@ -132,57 +134,53 @@ const logout = () => { }); }; +const avatarUrl = uni.getStorageSync('avatarUrl') || ''; +const username = uni.getStorageSync('username') || ''; +const phone = uni.getStorageSync('phone') || ''; +const userId = uni.getStorageSync('id') || ''; +const businessId = uni.getStorageSync('businessId') || ''; +const storeStatus = ref(0); - -/* const handleSwitchChange = (value) => { - const storeStatus = value ? 1 : 0; - console.log(storeStatus+"值为"); */ +const handleSwitchChange = () => { + storeStatus.value = storeStatus.value === 0 ? 1 : 0; + console.log('当前状态:', storeStatus.value); - // 初始化状态 - const [storeStatus, setStoreStatus] = useState(0); - - // 定义handleSwitchChange函数 - const handleSwitchChange = (value) => { - const newStoreStatus = value ? 1 : 0; - setStoreStatus(newStoreStatus); // 更新状态 - console.log(`storeStatus值为: ${newStoreStatus}`); - - -/* const data = { + const data = { address: '', - businessAvatar: 'https://tse4-mm.cn.bing.net/th/id/OIP-C.vNYHZ0vsWMLi4nfLG4rWEwHaE7?rs=1&pid=ImgDetMain', - businessImages: 'https://tse4-mm.cn.bing.net/th/id/OIP-C.vNYHZ0vsWMLi4nfLG4rWEwHaE7?rs=1&pid=ImgDetMain', - businessName: '麻辣烫', - businessPhone: '', + businessAvatar:avatarUrl, + businessImages: avatarUrl, + businessName: username, + businessPhone: phone, + /* businessAvatar:'https://tse2-mm.cn.bing.net/th/id/OIP-C.wq-7irlVpAizKGvyvO0BNQHaFj?rs=1&pid=ImgDetMain', + businessImages: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.wq-7irlVpAizKGvyvO0BNQHaFj?rs=1&pid=ImgDetMain', + businessName: '麻辣烫', + businessPhone: '13613639360', */ businessProfile: '', categoryId: 0, endBusiness: '', - id: 1830063677349658625, + id: businessId, startBusiness: '', state: 0, - storeStatus: 1, - userId: 0 + storeStatus: storeStatus.value, + userId: userId }; uni.request({ url:apiImageUrl+'/api/business/update/my', - method:'POST', - header: { - 'content-type': 'application/json' - }, - data: data, - - success(res) { - console.log('Success:', res.data); - }, - fail() { - console.error('Error:', error); - } - }) */ - - - -}; + method:'POST', + header: { + 'content-type': 'application/json' + }, + data: data, + + success(res) { + console.log('Success:', res.data); + }, + fail() { + console.error('Error:', error); + } + }) +}; diff --git a/uniapp05/pages/orderManagement/orderManagement.vue b/uniapp05/pages/orderManagement/orderManagement.vue index 164586b..438543b 100644 --- a/uniapp05/pages/orderManagement/orderManagement.vue +++ b/uniapp05/pages/orderManagement/orderManagement.vue @@ -1,5 +1,5 @@