From 27f64e092e80194fa24969732a15042d37a6dd30 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 19:05:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/store/store.wxss | 2 +-
wechat_staff/pages/homeId/index.wxml | 4 ++--
wechat_jiaxuan/utils/config.js | 4 ++--
wechat_jiaxuan/pages/store/store.less | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
index 03a782a..57899f3 100644
--- a/wechat_jiaxuan/pages/store/store.less
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -65,7 +65,7 @@
margin-bottom: 16rpx;
}
.address{
- width: 520rpx;
+ width: 440rpx;
display: flex;
align-items: center;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
index 0d7fd2c..d154814 100644
--- a/wechat_jiaxuan/pages/store/store.wxss
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -63,7 +63,7 @@
margin-bottom: 16rpx;
}
.main_content .shops .shop .header .left .address {
- width: 520rpx;
+ width: 440rpx;
display: flex;
align-items: center;
font-size: 26rpx;
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 1448239..23fa1e2 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
-export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
+export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
diff --git a/wechat_staff/pages/homeId/index.wxml b/wechat_staff/pages/homeId/index.wxml
index 4f1849e..9199dc3 100644
--- a/wechat_staff/pages/homeId/index.wxml
+++ b/wechat_staff/pages/homeId/index.wxml
@@ -1,8 +1,8 @@
<view class="container">
<!-- 鍒嗙被 -->
-<view class="home_tabs">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+<view class="home_tabs" style="width: 100%;">
+ <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelValueCode}}" wx:for="{{ tagList }}" class="item {{ tagCodes == item.labelValueCode ? 'active': '' }}">{{ item.labelValueName }}</view>
</view>
--
Gitblit v1.9.3