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 @@
@@ -57,49 +61,49 @@ import { ref,onMounted,computed,onUnmounted } from 'vue'
-
+
-
+
+
+
+ +{{ order.totalPrice }}元
+
+ 下单时间:{{ order.createTime }}
+
+ 订单编号:{{ order.id }}
-
- +{{item.money}}元
-
- 下单时间:{{item.time}}
-
- 订单编号:{{item.orderNumber}}
-
-
-
-
-
-
-
- +{{item.money}}元
-
- 下单时间:{{item.time}}
-
- 订单编号:{{item.orderNumber}}
-
-
-
+
+
+
+
+
+
+ +{{ order.totalPrice }}元
+
+ 下单时间:{{ order.createTime }}
+
+ 订单编号:{{ order.id }}
+
+
+
-
+
-
+
+
+
+ +{{ order.totalPrice }}元
+
+ 下单时间:{{ order.createTime.substr(0, 29).replace('T', ' ') }}
+
+ 订单编号:{{ order.id }}
-
- +{{item.money}}元
-
- 下单时间:{{item.time}}
-
- 订单编号:{{item.orderNumber}}
-
diff --git a/uniapp05/pages/testfour/testfour.vue b/uniapp05/pages/testfour/testfour.vue
new file mode 100644
index 0000000..71ccc9f
--- /dev/null
+++ b/uniapp05/pages/testfour/testfour.vue
@@ -0,0 +1,13 @@
+
+
+ 测试页面4
+
+
+
+
+
+
diff --git a/uniapp05/pages/testone/testone.vue b/uniapp05/pages/testone/testone.vue
new file mode 100644
index 0000000..151f105
--- /dev/null
+++ b/uniapp05/pages/testone/testone.vue
@@ -0,0 +1,50 @@
+
+
+
+
当前状态: {{ storeStatus }}
+
\ No newline at end of file
+ #{{order.a}} 商家已自动接单 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 门店新客 美团外卖会员 确认出餐 顾客需要餐具； 1种商品，共1件 预计收入￥{{order.d}} #{{order.a}} 已取消 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 1.5km|点击查看配送地址 > 门店新客 美团外卖会员 #{{order.a}} 已完成 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 1.5km|点击查看配送地址 > 门店新客 美团外卖会员 打印小票
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.js
index a92bd92..0cc6b81 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.js
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.js
@@ -1,23 +1,47 @@
"use strict";
const common_vendor = require("../../common/vendor.js");
-if (!Math) {
- (list + finish + cancel)();
-}
-const list = () => "./list2.js";
-const finish = () => "./finish/finish2.js";
-const cancel = () => "./cancel/cancel2.js";
+const API_api = require("../../API/api.js");
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "index",
setup(__props) {
const currentIndex = common_vendor.ref(0);
const tabs = common_vendor.ref([
{ name: "待出餐" },
- { name: "已完成" },
- { name: "已取消" }
+ { name: "已取消" },
+ { name: "已完成" }
]);
const switchTab = (index) => {
currentIndex.value = index;
};
+ const orderList = common_vendor.ref([]);
+ const getOrder = () => {
+ common_vendor.index.request({
+ url: API_api.apiImageUrl + "/api/orders/my/page",
+ method: "POST",
+ data: {
+ current: 1,
+ endTime: "",
+ id: "",
+ pageSize: 100,
+ pickupMethod: 0,
+ sortField: "",
+ sortOrder: "",
+ startTime: "",
+ state: 0
+ },
+ success(res) {
+ console.log(res);
+ orderList.value = res.data.data.records.reverse();
+ console.log(orderList.value);
+ },
+ fail() {
+ console.log("出错啦");
+ }
+ });
+ };
+ common_vendor.onMounted(() => {
+ getOrder();
+ });
return (_ctx, _cache) => {
return common_vendor.e({
a: common_vendor.f(tabs.value, (tab, index, i0) => {
@@ -29,11 +53,39 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
};
}),
b: currentIndex.value === 0
- }, currentIndex.value === 0 ? {} : {}, {
- c: currentIndex.value === 1
- }, currentIndex.value === 1 ? {} : {}, {
- d: currentIndex.value === 2
- }, currentIndex.value === 2 ? {} : {});
+ }, currentIndex.value === 0 ? {
+ c: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: common_vendor.t(order.totalPrice),
+ e: index
+ };
+ })
+ } : {}, {
+ d: currentIndex.value === 1
+ }, currentIndex.value === 1 ? {
+ e: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: index
+ };
+ })
+ } : {}, {
+ f: currentIndex.value === 2
+ }, currentIndex.value === 2 ? {
+ g: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: index
+ };
+ })
+ } : {});
};
}
});
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.json b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.json
index 0c39b6e..ef15c77 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.json
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/index.json
@@ -1,9 +1,5 @@
{
"defaultTitle": "订单",
"titleBarColor": "#4095e5",
- "usingComponents": {
- "list": "./list",
- "finish": "./finish/finish",
- "cancel": "./cancel/cancel"
- }
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list.js
index 4769b9b..0f13371 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list.js
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list.js
@@ -1,4 +1,8 @@
"use strict";
-const list = require("../../list.js");
-require("../../common/vendor.js");
-my.createPage(list.MiniProgramPage);
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {};
+function _sfc_render(_ctx, _cache) {
+ return {};
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/111111000000/uniapp05/pages/index/list.vue"]]);
+my.createPage(MiniProgramPage);
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list2.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list2.js
deleted file mode 100644
index 4769b9b..0000000
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/index/list2.js
+++ /dev/null
@@ -1,4 +0,0 @@
-"use strict";
-const list = require("../../list.js");
-require("../../common/vendor.js");
-my.createPage(list.MiniProgramPage);
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/my/my.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/my/my.js
index b176ade..4e2a0a0 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/my/my.js
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/my/my.js
@@ -30,7 +30,9 @@ const _sfc_main = {
},
data: {},
success: (res) => {
- console.log(res.data.message);
+ console.log(res.data.data.id);
+ common_vendor.index.setStorageSync("businessId", res.data.data.id);
+ console.log(res.data.data);
user.value.message = res.data.message;
if (user.value.message === "ok") {
user.value.userName = res.data.data.businessName;
@@ -71,11 +73,48 @@ const _sfc_main = {
duration: 2e3
});
};
- const [storeStatus, setStoreStatus] = useState(0);
- const handleSwitchChange = (value) => {
- const newStoreStatus = value ? 1 : 0;
- setStoreStatus(newStoreStatus);
- console.log(`storeStatus值为: ${newStoreStatus}`);
+ const avatarUrl = common_vendor.index.getStorageSync("avatarUrl") || "";
+ const username = common_vendor.index.getStorageSync("username") || "";
+ const phone = common_vendor.index.getStorageSync("phone") || "";
+ const userId = common_vendor.index.getStorageSync("id") || "";
+ const businessId = common_vendor.index.getStorageSync("businessId") || "";
+ const storeStatus = common_vendor.ref(0);
+ const handleSwitchChange = () => {
+ storeStatus.value = storeStatus.value === 0 ? 1 : 0;
+ console.log("当前状态:", storeStatus.value);
+ const data = {
+ address: "",
+ 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: businessId,
+ startBusiness: "",
+ state: 0,
+ storeStatus: storeStatus.value,
+ userId
+ };
+ common_vendor.index.request({
+ url: API_api.apiImageUrl + "/api/business/update/my",
+ method: "POST",
+ header: {
+ "content-type": "application/json"
+ },
+ data,
+ success(res) {
+ console.log("Success:", res.data);
+ },
+ fail() {
+ console.error("Error:", error);
+ }
+ });
};
return (_ctx, _cache) => {
return common_vendor.e({
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.axml b/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.axml
index 68f75ba..1e698b1 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.axml
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.axml
@@ -1 +1 @@
-+{{item.b}}元下单时间:{{item.c}}订单编号:{{item.d}}+{{item.b}}元下单时间:{{item.c}}订单编号:{{item.d}}+{{item.b}}元下单时间:{{item.c}}订单编号:{{item.d}}
\ No newline at end of file
++{{order.a}}元下单时间:{{order.b}}订单编号:{{order.c}}+{{order.a}}元下单时间:{{order.b}}订单编号:{{order.c}}+{{order.a}}元下单时间:{{order.b}}订单编号:{{order.c}}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.js
index 05d6c8f..09df2b3 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.js
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/orderManagement/orderManagement.js
@@ -1,5 +1,6 @@
"use strict";
const common_vendor = require("../../common/vendor.js");
+const API_api = require("../../API/api.js");
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "orderManagement",
setup(__props) {
@@ -12,32 +13,35 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
const switchTab = (index) => {
currentIndex.value = index;
};
- const orderList = common_vendor.ref([
- {
- imgUrl: "https://img.zcool.cn/community/015ac85f110b9fa801206621387957.png@1280w_1l_2o_100sh.png",
- money: 13,
- time: "2024-03-15 11:15:10",
- orderNumber: 4568415846158841
- },
- {
- imgUrl: "https://img.zcool.cn/community/015ac85f110b9fa801206621387957.png@1280w_1l_2o_100sh.png",
- money: 12,
- time: "2024-03-15 11:15:10",
- orderNumber: 4568415846158841
- },
- {
- imgUrl: "https://img.zcool.cn/community/0105ec5b5ac3cba801206a35cf08a8.jpg@1280w_1l_2o_100sh.jpg",
- money: 123,
- time: "2024-03-15 11:15:10",
- orderNumber: 4568415846158841
- },
- {
- imgUrl: "https://img.zcool.cn/community/015ac85f110b9fa801206621387957.png@1280w_1l_2o_100sh.png",
- money: 123,
- time: "2024-03-15 11:15:10",
- orderNumber: 4568415846158841
- }
- ]);
+ const orderList = common_vendor.ref([]);
+ const getOrder = () => {
+ common_vendor.index.request({
+ url: API_api.apiImageUrl + "/api/orders/my/page",
+ method: "POST",
+ data: {
+ current: 1,
+ endTime: "",
+ id: "",
+ pageSize: 100,
+ pickupMethod: 0,
+ sortField: "",
+ sortOrder: "",
+ startTime: "",
+ state: 0
+ },
+ success(res) {
+ console.log(res);
+ orderList.value = res.data.data.records;
+ console.log(orderList.value);
+ },
+ fail() {
+ console.log("出错啦");
+ }
+ });
+ };
+ common_vendor.onMounted(() => {
+ getOrder();
+ });
return (_ctx, _cache) => {
return common_vendor.e({
a: common_vendor.f(tabs.value, (tab, index, i0) => {
@@ -50,37 +54,34 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}),
b: currentIndex.value === 0
}, currentIndex.value === 0 ? {
- c: common_vendor.f(orderList.value, (item, index, i0) => {
+ c: common_vendor.f(orderList.value, (order, index, i0) => {
return {
- a: item.imgUrl,
- b: common_vendor.t(item.money),
- c: common_vendor.t(item.time),
- d: common_vendor.t(item.orderNumber),
- e: index
+ a: common_vendor.t(order.totalPrice),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.id),
+ d: index
};
})
} : {}, {
d: currentIndex.value === 1
}, currentIndex.value === 1 ? {
- e: common_vendor.f(orderList.value, (item, index, i0) => {
+ e: common_vendor.f(orderList.value, (order, index, i0) => {
return {
- a: item.imgUrl,
- b: common_vendor.t(item.money),
- c: common_vendor.t(item.time),
- d: common_vendor.t(item.orderNumber),
- e: index
+ a: common_vendor.t(order.totalPrice),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.id),
+ d: index
};
})
} : {}, {
f: currentIndex.value === 2
}, currentIndex.value === 2 ? {
- g: common_vendor.f(orderList.value, (item, index, i0) => {
+ g: common_vendor.f(orderList.value, (order, index, i0) => {
return {
- a: item.imgUrl,
- b: common_vendor.t(item.money),
- c: common_vendor.t(item.time),
- d: common_vendor.t(item.orderNumber),
- e: index
+ a: common_vendor.t(order.totalPrice),
+ b: common_vendor.t(order.createTime.substr(0, 29).replace("T", " ")),
+ c: common_vendor.t(order.id),
+ d: index
};
})
} : {});
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.acss b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.acss
new file mode 100644
index 0000000..e69de29
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.axml b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.axml
new file mode 100644
index 0000000..6a346ad
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.axml
@@ -0,0 +1 @@
+ 测试页面4
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/list.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.js
similarity index 61%
rename from uniapp05/unpackage/dist/dev/mp-alipay/list.js
rename to uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.js
index 13d3a7a..732ec3d 100644
--- a/uniapp05/unpackage/dist/dev/mp-alipay/list.js
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.js
@@ -1,8 +1,8 @@
"use strict";
-const common_vendor = require("./common/vendor.js");
+const common_vendor = require("../../common/vendor.js");
const _sfc_main = {};
function _sfc_render(_ctx, _cache) {
return {};
}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/111111000000/uniapp05/pages/index/list.vue"]]);
-exports.MiniProgramPage = MiniProgramPage;
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/111111000000/uniapp05/pages/testfour/testfour.vue"]]);
+my.createPage(MiniProgramPage);
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.json b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.json
new file mode 100644
index 0000000..4675834
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testfour/testfour.json
@@ -0,0 +1,5 @@
+{
+ "defaultTitle": "测试页四",
+ "pullRefresh": false,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.acss b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.acss
new file mode 100644
index 0000000..e69de29
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.axml b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.axml
new file mode 100644
index 0000000..3595e13
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.axml
@@ -0,0 +1 @@
+当前状态: {{b}}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.js
new file mode 100644
index 0000000..26d074e
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.js
@@ -0,0 +1,50 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const API_api = require("../../API/api.js");
+const _sfc_main = {
+ __name: "testone",
+ setup(__props) {
+ const storeStatus = common_vendor.ref(0);
+ const handleSwitchChange = () => {
+ storeStatus.value = storeStatus.value === 0 ? 1 : 0;
+ console.log("当前状态:", storeStatus.value);
+ 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: "",
+ businessProfile: "",
+ categoryId: 0,
+ endBusiness: "",
+ id: 1830063677349658600,
+ startBusiness: "",
+ state: 0,
+ storeStatus: storeStatus.value,
+ userId: 0
+ };
+ common_vendor.index.request({
+ url: API_api.apiImageUrl + "/api/business/update/my",
+ method: "POST",
+ header: {
+ "content-type": "application/json"
+ },
+ data,
+ success(res) {
+ console.log("Success:", res.data);
+ },
+ fail() {
+ console.error("Error:", error);
+ }
+ });
+ };
+ return (_ctx, _cache) => {
+ return {
+ a: common_vendor.o(handleSwitchChange),
+ b: common_vendor.t(storeStatus.value)
+ };
+ };
+ }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/111111000000/uniapp05/pages/testone/testone.vue"]]);
+my.createPage(MiniProgramPage);
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.json b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.json
new file mode 100644
index 0000000..99ee86e
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/testone/testone.json
@@ -0,0 +1,5 @@
+{
+ "defaultTitle": "",
+ "pullRefresh": false,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.acss b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.acss
new file mode 100644
index 0000000..861f6ea
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.acss
@@ -0,0 +1,209 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.tabs {
+ display: flex;
+ justify-content: space-around;
+ line-height: 60rpx;
+ margin: 0 10rpx;
+ background-color: #fff;
+ box-shadow: 0 4rpx 6rpx rgba(240, 240, 240, 0.6);
+ position: relative;
+ z-index: 9;
+}
+.tabs .item {
+ flex: 1;
+ text-align: center;
+ padding: 20rpx;
+ font-size: 28rpx;
+ color: #262626;
+}
+.tabs .cursor {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 18%;
+ height: 6rpx;
+ padding: 0 50rpx;
+ background-color: #4095e5;
+ /* 过渡效果 */
+ transition: all 0.4s;
+}
+.preview image {
+ width: 100%;
+}
+page {
+ height: 100%;
+ overflow: hidden;
+ background-color: #f5f5f5;
+}
+.tab-menu {
+ display: flex;
+ justify-content: space-around;
+ padding: 10px 0;
+ background-color: #f5f5f5;
+}
+.tab-item {
+ padding: 10px;
+ cursor: pointer;
+}
+.tab-item.active {
+ color: #4095e5;
+ font-weight: bold;
+}
+.scroll-view {
+ width: 100%;
+ height: 100%;
+ flex: 1;
+}
+.orderItem {
+ width: 100%;
+ height: 80px;
+ margin-bottom: 10px;
+ background-color: #fff;
+}
+.orderImg {
+ display: inline-block;
+ width: 20%;
+ height: 100%;
+ margin: auto 0;
+}
+.img {
+ width: 100%;
+ height: 100%;
+ border-radius: 15px;
+}
+.orderMessage {
+ width: 75%;
+ height: 80%;
+ float: right;
+ display: inline-block;
+ margin-top: 10px;
+}
+.money {
+ font-size: 30rpx;
+ font-weight: 700;
+}
+.time {
+ font-size: 25rpx;
+}
+.container {
+ width: 90%;
+ height: 100vh;
+ margin: 0 auto;
+}
+.container1 {
+ width: 80%;
+ margin: 0 auto;
+ background-color: #fff;
+ margin-bottom: 20px;
+}
+.numberState {
+ height: 80rpx;
+}
+.number {
+ font-weight: 700;
+ font-size: 60rpx;
+ float: left;
+}
+.state {
+ font-size: 30rpx;
+ font-weight: 700;
+ float: right;
+ margin-top: 15rpx;
+}
+.time {
+ font-size: 30rpx;
+ color: #999;
+ padding-bottom: 10px;
+ border-bottom: 1px dotted #787878;
+}
+.message {
+ padding-top: 15rpx;
+ height: 70rpx;
+}
+.name {
+ font-size: 45rpx;
+ font-weight: 700;
+ float: left;
+}
+.phone {
+ float: left;
+ font-size: 30rpx;
+ line-height: 70rpx;
+ padding-left: 10rpx;
+ color: #787878;
+}
+.km {
+ font-size: 30rpx;
+ padding-top: 5px;
+ color: #787878;
+ margin-bottom: 10px;
+}
+.button {
+ display: inline;
+ color: #787878;
+ padding: 5px 10px 5px 10px;
+ border: 1px solid gray;
+ margin-right: 10px;
+ font-size: 24rpx;
+ border-radius: 5px;
+ margin-top: 10px;
+}
+.sure {
+ display: block;
+ font-size: 30rpx;
+ background-color: #c1c1c1;
+ color: #000;
+ border-radius: 5px;
+ padding: 10px;
+ width: 65px;
+ margin-left: 220px;
+}
+.box {
+ padding-bottom: 30px;
+ border-bottom: 1px dotted #787878;
+}
+.beizhu {
+ font-size: 40rpx;
+ font-weight: 700;
+ padding-bottom: 15px;
+ padding-top: 10px;
+ background: linear-gradient(to bottom, #fde16d, #fff);
+}
+.goods {
+ float: left;
+ font-size: 40rpx;
+ font-weight: 700;
+}
+.money {
+ font-size: 30rpx;
+ float: right;
+ margin-top: 5px;
+}
+.box2 {
+ padding-bottom: 50px;
+ border-bottom: 1px dotted #787878;
+}
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.axml b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.axml
new file mode 100644
index 0000000..1e81f56
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.axml
@@ -0,0 +1 @@
+ #{{order.a}} 商家已自动接单 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 门店新客 美团外卖会员 确认出餐 顾客需要餐具； 1种商品，共1件 预计收入￥{{order.d}} #{{order.a}} 已取消 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 1.5km|点击查看配送地址 > 门店新客 美团外卖会员 #{{order.a}} 已完成 立即送达/{{order.b}}前送达 柿子先生 手机尾号{{order.c}} 1.5km|点击查看配送地址 > 门店新客 美团外卖会员 打印小票
\ No newline at end of file
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.js b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.js
new file mode 100644
index 0000000..aa65ae3
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.js
@@ -0,0 +1,93 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const API_api = require("../../API/api.js");
+const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
+ __name: "three",
+ setup(__props) {
+ const currentIndex = common_vendor.ref(0);
+ const tabs = common_vendor.ref([
+ { name: "待出餐" },
+ { name: "已取消" },
+ { name: "已完成" }
+ ]);
+ const switchTab = (index) => {
+ currentIndex.value = index;
+ };
+ const orderList = common_vendor.ref([]);
+ const getOrder = () => {
+ common_vendor.index.request({
+ url: API_api.apiImageUrl + "/api/orders/my/page",
+ method: "POST",
+ data: {
+ current: 1,
+ endTime: "",
+ id: "",
+ pageSize: 100,
+ pickupMethod: 0,
+ sortField: "",
+ sortOrder: "",
+ startTime: "",
+ state: 0
+ },
+ success(res) {
+ console.log(res);
+ orderList.value = res.data.data.records.reverse();
+ console.log(orderList.value);
+ },
+ fail() {
+ console.log("出错啦");
+ }
+ });
+ };
+ common_vendor.onMounted(() => {
+ getOrder();
+ });
+ return (_ctx, _cache) => {
+ return common_vendor.e({
+ a: common_vendor.f(tabs.value, (tab, index, i0) => {
+ return {
+ a: common_vendor.t(tab.name),
+ b: index,
+ c: currentIndex.value === index ? 1 : "",
+ d: common_vendor.o(($event) => switchTab(index))
+ };
+ }),
+ b: currentIndex.value === 0
+ }, currentIndex.value === 0 ? {
+ c: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: common_vendor.t(order.totalPrice),
+ e: index
+ };
+ })
+ } : {}, {
+ d: currentIndex.value === 1
+ }, currentIndex.value === 1 ? {
+ e: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: index
+ };
+ })
+ } : {}, {
+ f: currentIndex.value === 2
+ }, currentIndex.value === 2 ? {
+ g: common_vendor.f(orderList.value, (order, index, i0) => {
+ return {
+ a: common_vendor.t(order.id),
+ b: common_vendor.t(order.createTime),
+ c: common_vendor.t(order.phone),
+ d: index
+ };
+ })
+ } : {});
+ };
+ }
+});
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/111111000000/uniapp05/pages/three/three.vue"]]);
+my.createPage(MiniProgramPage);
diff --git a/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.json b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.json
new file mode 100644
index 0000000..12a19da
--- /dev/null
+++ b/uniapp05/unpackage/dist/dev/mp-alipay/pages/three/three.json
@@ -0,0 +1,6 @@
+{
+ "defaultTitle": "订单",
+ "pullRefresh": false,
+ "titleBarColor": "#4095e5",
+ "usingComponents": {}
+}
\ No newline at end of file