diff --git a/App.vue b/App.vue
index c99f28b..e19ed31 100644
--- a/App.vue
+++ b/App.vue
@@ -63,10 +63,12 @@
//千猪名称
qianzhuCityName: '重庆市',
//团油数据
- pelletoilList: '',
- //分享领取次数
- shareNum:0,
-
+ pelletoilList: '',
+ //分享领取次数
+ shareNum: 0,
+ //是否查询数据
+ isSelect: false
+
},
onLaunch: function() {},
@@ -230,7 +232,7 @@
}
}
})
-
+
// #endif
},
onHide: function() {}
@@ -241,7 +243,7 @@
/*每个页面公共css */
@import "/static/iconfont/font.scss";
@import "/static/iconfont/cart.scss";
-
+
@keyframes noticeAnimation {
from {
transform: translateX(100rpx);
@@ -252,52 +254,56 @@
transform: translateX(-100%);
}
}
-
+
//自定义checkbox的样式( 元素使用的时候就是使用类名:mycheck)
- checkbox.mycheck .wx-checkbox-input,
- checkbox.mycheck .uni-checkbox-input {
- width: 30rpx !important;
- height: 30rpx !important;
- background-color: #ffffff !important;
- border-radius: 50% !important;
- border: solid 1px #cccccc !important;
- overflow: hidden;
- }
- // 选中后的 对勾样式
- checkbox.mycheck .uni-checkbox-input-checked::before,
- checkbox.mycheck .wx-checkbox-input-checked::before {
- font-size: 38rpx !important; // 对勾大小 30rpx /
- // color: #FFCC1E;
- }
-
-
- /* 解决小程序和app滚动条的问题 */
- /* #ifdef MP-WEIXIN || APP-PLUS */
- ::-webkit-scrollbar{
- display: none;
- }
- /* #endif */
- /* 解决H5 的问题 */
- /* #ifdef H5 */
- uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
- /* 隐藏滚动条,但依旧具备可以滚动的功能 */
- display: none
- }
- /* #endif */
-
-
-
-
- .cart-num .uni-numbox__minus {
- border-top-left-radius: 10px !important;
- border-bottom-left-radius: 10px !important;
- }
- .cart-num .uni-numbox-btns {
- background-color: #f6f6f6 !important;
- }
- .cart-num .uni-numbox__plus{
- border-top-right-radius: 10px !important;
- border-bottom-right-radius: 10px !important;
- }
+ checkbox.mycheck .wx-checkbox-input,
+ checkbox.mycheck .uni-checkbox-input {
+ width: 30rpx !important;
+ height: 30rpx !important;
+ background-color: #ffffff !important;
+ border-radius: 50% !important;
+ border: solid 1px #cccccc !important;
+ overflow: hidden;
+ }
+
+ // 选中后的 对勾样式
+ checkbox.mycheck .uni-checkbox-input-checked::before,
+ checkbox.mycheck .wx-checkbox-input-checked::before {
+ font-size: 38rpx !important; // 对勾大小 30rpx /
+ // color: #FFCC1E;
+ }
+
-
+ /* 解决小程序和app滚动条的问题 */
+ /* #ifdef MP-WEIXIN || APP-PLUS */
+ ::-webkit-scrollbar {
+ display: none;
+ }
+
+ /* #endif */
+ /* 解决H5 的问题 */
+ /* #ifdef H5 */
+ uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
+ /* 隐藏滚动条,但依旧具备可以滚动的功能 */
+ display: none
+ }
+
+ /* #endif */
+
+
+
+
+ .cart-num .uni-numbox__minus {
+ border-top-left-radius: 10px !important;
+ border-bottom-left-radius: 10px !important;
+ }
+
+ .cart-num .uni-numbox-btns {
+ background-color: #f6f6f6 !important;
+ }
+
+ .cart-num .uni-numbox__plus {
+ border-top-right-radius: 10px !important;
+ border-bottom-right-radius: 10px !important;
+ }
+
\ No newline at end of file
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 28cb43b..e3ce30b 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -1,997 +1,999 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.title }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.title }}
-
-
-
-
-
-
-
-
-
-
- {{item.childDate[0].title}}
-
- {{item.childDate[0].timeData}}
-
-
-
-
-
-
-
-
-
-
- {{swipers.title}}
-
- {{swipers.timeData}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
- 更多
-
-
-
-
- {{goods.couponName}}
-
- ¥{{goods.salesPrice}}
-
-
-
-
-
- {{goods.title}}
-
- ¥{{goods.price}}
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- 惠享生活
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.title }}
+
+
+
+
+
+
+
+
+
+
+ {{item.childDate[0].title}}
+
+ {{item.childDate[0].timeData}}
+
+
+
+
+
+
+
+
+
+
+ {{swipers.title}}
+
+ {{swipers.timeData}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+ 更多
+
+
+
+
+ {{goods.couponName}}
+
+ ¥{{goods.salesPrice}}
+
+
+
+
+
+ {{goods.title}}
+
+ ¥{{goods.price}}
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 惠享生活
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/positioning/positioning.vue b/pages/user/positioning/positioning.vue
index 6cdede3..1bc70e0 100644
--- a/pages/user/positioning/positioning.vue
+++ b/pages/user/positioning/positioning.vue
@@ -110,7 +110,8 @@
app.globalData.cityName = res.return_data.provinceName;
app.globalData.qianzhuCityName = res.return_data.cityName;
app.globalData.cityId = res.return_data.regionId;
- app.globalData.companyId = res.return_data.companyId;
+ app.globalData.companyId = res.return_data.companyId;
+ app.globalData.isSelect = true;
uni.navigateBack({})
} else {
uni.showToast({