diff --git a/src/App.vue b/src/App.vue
index b89e1e9..dde7a33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,12 +13,20 @@ const tabbar = [
selectedIconPath: "/static/tabbar/canteen-select.png",
auth: ["zhezhengding", "shihua"],
},
- // {
- // "pagePath": "pages/tabbar/shop",
- // "text": "超市",
- // "iconPath": "/static/tabbar/shop.png",
- // "selectedIconPath": "/static/tabbar/shop-select.png"
- // },
+ {
+ pagePath: "pages/tabbar/shop",
+ text: "超市",
+ iconPath: "/static/tabbar/shop.png",
+ selectedIconPath: "/static/tabbar/shop-select.png",
+ auth: ["zhezhengding", "shihua"],
+ },
+ {
+ pagePath: "pages/tabbar/coopShop",
+ text: "合作商家",
+ iconPath: "/static/tabbar/coopShop.png",
+ selectedIconPath: "/static/tabbar/coopShop-select.png",
+ auth: ["zhezhengding"],
+ },
{
pagePath: "pages/tabbar/order",
text: "订单",
diff --git a/src/pages.json b/src/pages.json
index 26907c7..277aa80 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -16,13 +16,20 @@
"disableScroll": true
}
},
- // {
- // "path": "pages/tabbar/shop",
- // "style": {
- // "navigationBarTitleText": "超市",
- // "disableScroll": true
- // }
- // },
+ {
+ "path": "pages/tabbar/shop",
+ "style": {
+ "navigationBarTitleText": "超市",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "pages/tabbar/coopShop",
+ "style": {
+ "navigationBarTitleText": "合作商家",
+ "disableScroll": true
+ }
+ },
{
"path": "pages/tabbar/order",
"style": {
@@ -277,7 +284,7 @@
{
"path": "scanPay",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "支付",
"disableScroll": true
}
}
@@ -299,12 +306,18 @@
"iconPath": "",
"selectedIconPath": ""
},
- // {
- // "pagePath": "pages/tabbar/shop",
- // "text": "",
- // "iconPath": "",
- // "selectedIconPath": ""
- // },
+ {
+ "pagePath": "pages/tabbar/shop",
+ "text": "",
+ "iconPath": "",
+ "selectedIconPath": ""
+ },
+ {
+ "pagePath": "pages/tabbar/coopShop",
+ "text": "",
+ "iconPath": "",
+ "selectedIconPath": ""
+ },
{
"pagePath": "pages/tabbar/order",
"text": "",
@@ -343,6 +356,12 @@
// "selectedIconPath": "static/tabbar/shop-select.png"
// },
// {
+ // pagePath: "pages/tabbar/coopShop",
+ // text: "合作商家",
+ // iconPath: "static/tabbar/coopShop.png",
+ // selectedIconPath: "static/tabbar/coopShop-select.png",
+ // },
+ // {
// "pagePath": "pages/tabbar/order",
// "text": "订单",
// "iconPath": "static/tabbar/order.png",
diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue
index 98739e5..00cd8fa 100644
--- a/src/pages/merchant/food.vue
+++ b/src/pages/merchant/food.vue
@@ -150,17 +150,17 @@ const doProduct = (v: any) => {
-
+
{{ item.name }}
-
- ¥{{ hooks.useMoney(item.price) }}
- ¥{{ hooks.useMoney(item.marketPrice) }}
-
-
- {{ hooks.useFormatNum("库存", "", item.stock) }}
-
- {{ hooks.useFormatNum("销量", "", item.salesCount) }}
-
+
+ ¥{{ hooks.useMoney(item.price) }}
+
+
+
+
+
+
+
diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index ffc974f..19ee234 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -1,7 +1,7 @@
- 支付
+ {{ scanData.name }}
¥
diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue
new file mode 100644
index 0000000..a5459c2
--- /dev/null
+++ b/src/pages/tabbar/coopShop.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.name }}
+ {{ v.deptName }}
+
+ {{ v.phone }}
+
+ 营业时间：
+ {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}
+ {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}
+ {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}
+
+
+ 地址
+ {{ v.addressDes }}
+
+
+
+
+
+
+
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 92d8ed6..d67e428 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -128,9 +128,9 @@
{{ hooks.useEnum("hardwareRefundStatusEnum", state.curOrder.refundStatus) }}
- 共 {{ state.curOrder.carList.length }} 件
+
+ 共 {{ state.curOrder.carList.length }} 件
+
¥ {{ hooks.useMoney(state.curOrder.totalPrice) }}
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 7bb6cef..4443598 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -141,7 +141,7 @@ const doRefund = (v: any) => {
-->
- 共 {{ v.carList.length }} 件
+ 共 {{ v.carList.length }} 件
¥ {{ hooks.useMoney(v.totalPrice) }}
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 3690736..86d2b2c 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -9,13 +9,13 @@ const pageRef = ref(null)
const state = reactive({
pa: {
pagesize: 10,
- type: "2",
+ type: "3",
},
})
-const { startPage, list, scroll } = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
+const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
const query = (page: number, pagesize: number) => {
- startPage(page, pagesize, false, state.pa)
+ pageHook.startPage(page, pagesize, false, state.pa)
}
onLoad(() => {
@@ -27,6 +27,7 @@ onShow(() => {
})
const toDetail = async (v: any) => {
+ return
const isLogin = await hooks.useCheckLogin()
if (isLogin) {
router.jump("/pages/shop/detail", { id: v.id })
@@ -40,7 +41,7 @@ const toDetail = async (v: any) => {
ref="pageRef"
height="100%"
:fixed="false"
- v-model="list"
+ v-model="pageHook.list"
:default-page-size="10"
safe-area-inset-bottom
:loading-more-enabled="true"
@@ -48,10 +49,10 @@ const toDetail = async (v: any) => {
@query="query"
:auto-clean-list-when-reload="false"
:auto-scroll-to-top-when-reload="false"
- @scroll="scroll"
+ @scroll="pageHook.scroll"
>
-
+
@@ -61,7 +62,7 @@ const toDetail = async (v: any) => {
{{ v.phone }}
- 营业时间：
+ 营业时间：
{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}
{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}
{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}
diff --git a/src/sheep/plugs/use-router/vite-router-plug.ts b/src/sheep/plugs/use-router/vite-router-plug.ts
index d9e905e..0b2bae3 100644
--- a/src/sheep/plugs/use-router/vite-router-plug.ts
+++ b/src/sheep/plugs/use-router/vite-router-plug.ts
@@ -1,99 +1,91 @@
-import fs from "fs";
-import stripJsonComments from "./strip-json-comments";
+import fs from "fs"
+import stripJsonComments from "./strip-json-comments"
class TransformPages {
- routes: any = [];
- tabbar: any = [];
- includes = [];
- uniPagesJSON: any = "";
+ routes: any = []
+ tabbar: any = []
+ includes = []
+ uniPagesJSON: any = ""
- constructor({ includes, pagesJsonDir }: any) {
- this.includes = includes;
- this.uniPagesJSON = JSON.parse(
- stripJsonComments(fs.readFileSync(pagesJsonDir, "utf-8"))
- );
- this.routes = this.getPagesRoutes().concat(this.getSubPackagesRoutes());
- this.tabbar = this.getTabbarRoutes();
- }
+ constructor({ includes, pagesJsonDir }: any) {
+ this.includes = includes
+ this.uniPagesJSON = JSON.parse(stripJsonComments(fs.readFileSync(pagesJsonDir, "utf-8")))
+ this.routes = this.getPagesRoutes().concat(this.getSubPackagesRoutes())
+ this.tabbar = this.getTabbarRoutes()
+ }
- getPagesRoutes(pages = this.uniPagesJSON.pages, rootPath = null) {
- let routes = [];
- for (let i = 0; i < pages.length; i++) {
- const item = pages[i];
- let route: any = {};
- for (let j = 0; j < this.includes.length; j++) {
- const key = this.includes[j];
- let value = item[key];
- if (key === "path") {
- value = rootPath ? `/${rootPath}/${value}` : `/${value}`;
- }
- if (key === "aliasPath" && i == 0 && rootPath == null) {
- route[key] = route[key] || "/";
- } else if (value !== undefined) {
- route[key] = value;
- }
- }
- routes.push(route);
- }
- return routes;
- }
+ getPagesRoutes(pages = this.uniPagesJSON.pages, rootPath = null) {
+ let routes = []
+ for (let i = 0; i < pages.length; i++) {
+ const item = pages[i]
+ let route: any = {}
+ for (let j = 0; j < this.includes.length; j++) {
+ const key = this.includes[j]
+ let value = item[key]
+ if (key === "path") {
+ value = rootPath ? `/${rootPath}/${value}` : `/${value}`
+ }
+ if (key === "aliasPath" && i == 0 && rootPath == null) {
+ route[key] = route[key] || "/"
+ } else if (value !== undefined) {
+ route[key] = value
+ }
+ }
+ routes.push(route)
+ }
+ return routes
+ }
- getSubPackagesRoutes() {
- if (!(this.uniPagesJSON && this.uniPagesJSON.subPackages)) {
- return [];
- }
- const subPackages = this.uniPagesJSON.subPackages;
- let routes: any = [];
- for (let i = 0; i < subPackages.length; i++) {
- const subPages = subPackages[i].pages;
- const root = subPackages[i].root;
- const subRoutes = this.getPagesRoutes(subPages, root);
- routes = routes.concat(subRoutes);
- }
- return routes;
- }
+ getSubPackagesRoutes() {
+ if (!(this.uniPagesJSON && this.uniPagesJSON.subPackages)) {
+ return []
+ }
+ const subPackages = this.uniPagesJSON.subPackages
+ let routes: any = []
+ for (let i = 0; i < subPackages.length; i++) {
+ const subPages = subPackages[i].pages
+ const root = subPackages[i].root
+ const subRoutes = this.getPagesRoutes(subPages, root)
+ routes = routes.concat(subRoutes)
+ }
+ return routes
+ }
- getTabbarRoutes() {
- if (
- !(
- this.uniPagesJSON &&
- this.uniPagesJSON.tabBar &&
- this.uniPagesJSON.tabBar.list
- )
- ) {
- return [];
- }
- const tabbar = this.uniPagesJSON.tabBar.list;
- let tabbarMap: any = [];
- tabbar.forEach((bar: { pagePath: string }) => {
- tabbarMap.push("/" + bar.pagePath);
- });
- return tabbarMap;
- }
+ getTabbarRoutes() {
+ if (!(this.uniPagesJSON && this.uniPagesJSON.tabBar && this.uniPagesJSON.tabBar.list)) {
+ return []
+ }
+ const tabbar = this.uniPagesJSON.tabBar.list
+ let tabbarMap: any = []
+ tabbar.forEach((bar: { pagePath: string }) => {
+ tabbarMap.push("/" + bar.pagePath)
+ })
+ return tabbarMap
+ }
}
export const useRouter = ({ pagesJsonDir, includes = [] }: any) => {
- let defaultIncludes = ["path", "aliasPath", "name"];
- includes = [...defaultIncludes, ...includes];
- let pages = new TransformPages({
- pagesJsonDir,
- includes,
- });
- if (pages.tabbar && pages.tabbar.length) {
- console.table(pages.tabbar);
- }
- if (pages.routes && pages.routes.length) {
- console.table(pages.routes);
- }
- return {
- name: "use-router",
- config() {
- return {
- define: {
- __ROUTES__: JSON.stringify(pages.routes),
- __TABBAR__: JSON.stringify(pages.tabbar),
- },
- };
- },
- };
-};
+ let defaultIncludes = ["path", "aliasPath", "name"]
+ includes = [...defaultIncludes, ...includes]
+ let pages = new TransformPages({
+ pagesJsonDir,
+ includes,
+ })
+ if (pages.tabbar && pages.tabbar.length) {
+ console.table(pages.tabbar)
+ }
+ if (pages.routes && pages.routes.length) {
+ console.table(pages.routes)
+ }
+ return {
+ name: "use-router",
+ config() {
+ return {
+ define: {
+ __ROUTES__: JSON.stringify(pages.routes),
+ __TABBAR__: JSON.stringify(pages.tabbar),
+ },
+ }
+ },
+ }
+}
diff --git a/src/static/tabbar/coopShop-select.png b/src/static/tabbar/coopShop-select.png
new file mode 100644
index 0000000..aa72a06
Binary files /dev/null and b/src/static/tabbar/coopShop-select.png differ
diff --git a/src/static/tabbar/coopShop.png b/src/static/tabbar/coopShop.png
new file mode 100644
index 0000000..ffb65d1
Binary files /dev/null and b/src/static/tabbar/coopShop.png differ