diff --git a/pages.json b/pages.json index ea9e65f..82eb8ae 100644 --- a/pages.json +++ b/pages.json @@ -217,6 +217,15 @@ "navigationStyle": "custom" } + }, { + "path": "supply_chain/maps", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + }, { "path": "supply_chain/merchant", "style": { diff --git a/pages/nongKe/supply_chain/maps.vue b/pages/nongKe/supply_chain/maps.vue new file mode 100644 index 0000000..d80355d --- /dev/null +++ b/pages/nongKe/supply_chain/maps.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue index 40e9b29..f25197a 100644 --- a/pages/nongKe/supply_chain/supplierA.vue +++ b/pages/nongKe/supply_chain/supplierA.vue @@ -8,14 +8,14 @@ - - {{storeList[0].mer_info}} + + {{titName}} - 热搜sasas商品 --> - + + @@ -293,6 +293,7 @@ }, data() { return { + titName: "", imgList: [ "/static/images/GXSC/BBY.png", "/static/images/GXSC/JYPX.png", @@ -385,6 +386,7 @@ this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || '' this.sotreParam.category_id = options.merchant_category_id || '' this.storeList = []; + if (this.mer_location == 1) { this.selfLocation() } @@ -602,6 +604,7 @@ this.storeList = this.storeList.concat(res.data.list) this.loading = false this.loadingIcon = false + this.titName = this.storeList[0].mer_info }) }, // 进店 @@ -721,14 +724,15 @@ .com_name { font-size: 32rpx; // background-color: red; - max-width: 40vw; + white-space: nowrap; /* 防止文字换行 */ overflow: hidden; /* 超出部分隐藏 */ text-overflow: ellipsis; + max-width: 45vw; /* 使用省略号表示溢出的内容 */ - width: 200px; + /* 可根据实际情况调整容器宽度 */ } @@ -741,8 +745,9 @@ // padding: 0 20rpx 0; .top { - padding-top: 20rpx; - background-color: white; + // padding-top: var(--status-bar-height); + padding-top: 80rpx; + background-color: #F0F2F5; position: fixed; z-index: 999; width: 100%; diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 237f19d..4d1594b 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -315,6 +315,13 @@ this.isFshow = true + + } else if (e.scrollTop == 0) { + this.ishshow = false + this.isFshow = false + } else { + this.ishshow = false + this.isFshow = false } }, // #endif diff --git a/pages/user/index.vue b/pages/user/index.vue index e4e9787..f2e4aa6 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -1,157 +1,160 @@ \ No newline at end of file diff --git a/static/images/GXSC/JJRB.png b/static/images/GXSC/JJRB.png index 690be8f..ed30330 100644 Binary files a/static/images/GXSC/JJRB.png and b/static/images/GXSC/JJRB.png differ diff --git a/static/images/GXSC/JYPX.png b/static/images/GXSC/JYPX.png index 6fa6cc0..e11270d 100644 Binary files a/static/images/GXSC/JYPX.png and b/static/images/GXSC/JYPX.png differ diff --git a/static/images/GXSC/MSGY.png b/static/images/GXSC/MSGY.png new file mode 100644 index 0000000..2a36c7f Binary files /dev/null and b/static/images/GXSC/MSGY.png differ diff --git a/static/images/GXSC/NMJD.png b/static/images/GXSC/NMJD.png new file mode 100644 index 0000000..97930a6 Binary files /dev/null and b/static/images/GXSC/NMJD.png differ diff --git a/static/images/GXSC/NYSC.png b/static/images/GXSC/NYSC.png new file mode 100644 index 0000000..bda55f5 Binary files /dev/null and b/static/images/GXSC/NYSC.png differ diff --git a/static/images/GXSC/SCFW.png b/static/images/GXSC/SCFW.png new file mode 100644 index 0000000..37bc246 Binary files /dev/null and b/static/images/GXSC/SCFW.png differ diff --git a/static/images/GXSC/SHFW.png b/static/images/GXSC/SHFW.png new file mode 100644 index 0000000..0683d47 Binary files /dev/null and b/static/images/GXSC/SHFW.png differ diff --git a/static/images/GXSC/WLSY.png b/static/images/GXSC/WLSY.png new file mode 100644 index 0000000..a227e3c Binary files /dev/null and b/static/images/GXSC/WLSY.png differ diff --git a/static/images/GXSC/WYLY.png b/static/images/GXSC/WYLY.png new file mode 100644 index 0000000..1fc137b Binary files /dev/null and b/static/images/GXSC/WYLY.png differ diff --git a/static/images/GXSC/YLBJ.png b/static/images/GXSC/YLBJ.png new file mode 100644 index 0000000..5d6ae23 Binary files /dev/null and b/static/images/GXSC/YLBJ.png differ diff --git a/static/images/GXSC/ZXJZ.png b/static/images/GXSC/ZXJZ.png new file mode 100644 index 0000000..3f218d4 Binary files /dev/null and b/static/images/GXSC/ZXJZ.png differ