diff --git a/src/App.vue b/src/App.vue
index dde7a33..78bd20c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,6 +65,7 @@ export default {
methods: {
_initTabbar() {
console.log("环境判断")
+ console.log(uni.getLaunchOptionsSync())
let appEnv = 1 // 1:浙政钉 2:诗画
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index 9523232..f1df8c2 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -287,8 +287,9 @@ const doFood = () => {
-
+
+
{
:list="foodList"
:gutter="10"
:breakpoints="{
- 1600: { rowPerView: 4 },
- 1200: { rowPerView: 3 },
- 375: { rowPerView: 2 },
+ 1800: { rowPerView: 4 },
+ 1400: { rowPerView: 3 },
+ 975: { rowPerView: 2 },
}"
:hasAroundGutter="false"
backgroundColor="#ffffff00"
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index 7ccdddc..eabee3c 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -13,22 +13,56 @@
-
+
- {{ state.detail.name }}
+ {{ state.detail.name }}
{{ state.detail.deptName }}
- {{ state.detail.phone }}
-
- 营业时间：
+
+
+ {{ state.detail.phone }}
+
+
+ {{ state.detail.jobTime == ",," ? "" : "营业时间：" }}
{{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }}
{{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }}
{{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }}
-
- 地址
+
+
+ 地址:
{{ state.detail.addressDes }}
@@ -37,11 +71,14 @@
-
-
-
-
+
diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue
index a5459c2..dd72892 100644
--- a/src/pages/tabbar/coopShop.vue
+++ b/src/pages/tabbar/coopShop.vue
@@ -23,11 +23,10 @@ onLoad(() => {
app._initTabbar()
})
onShow(() => {
- pageRef.value && pageRef.value.reload(false)
+ // pageRef.value && pageRef.value.reload(false)
})
const toDetail = async (v: any) => {
- return
const isLogin = await hooks.useCheckLogin()
if (isLogin) {
router.jump("/pages/shop/detail", { id: v.id })
@@ -52,25 +51,57 @@ const toDetail = async (v: any) => {
@scroll="pageHook.scroll"
>
-
-
-
-
-
- {{ 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 }}
-
+
+
+
+
+ {{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }}
+ {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : 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/shop.vue b/src/pages/tabbar/shop.vue
index 86d2b2c..00c55fe 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -23,11 +23,10 @@ onLoad(() => {
app._initTabbar()
})
onShow(() => {
- pageRef.value && pageRef.value.reload(false)
+ // pageRef.value && pageRef.value.reload(false)
})
const toDetail = async (v: any) => {
- return
const isLogin = await hooks.useCheckLogin()
if (isLogin) {
router.jump("/pages/shop/detail", { id: v.id })
@@ -52,25 +51,57 @@ const toDetail = async (v: any) => {
@scroll="pageHook.scroll"
>
-
-
-
-
-
- {{ 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 }}
-
+
+
+
+
+ {{ v.name }}
+ {{ v.deptName }}
+
+
+
+ {{ v.phone }}
+
+
+ {{ v.jobTime == ",," ? "" : "营业时间：" }}
+ {{ 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 }}