jufubao-base 1.0.242-beta4 → 1.0.242-beta5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -146,6 +146,9 @@
|
|
|
146
146
|
import { mapState } from 'vuex';
|
|
147
147
|
|
|
148
148
|
export default {
|
|
149
|
+
//#ifdef MP-WEIXIN
|
|
150
|
+
options: { styleIsolation: 'shared' },
|
|
151
|
+
//#endif
|
|
149
152
|
name: "JfbBaseConsumpCode",
|
|
150
153
|
components: {
|
|
151
154
|
XdFontIcon,
|
|
@@ -258,10 +261,12 @@
|
|
|
258
261
|
|
|
259
262
|
if (Object.keys(this.stateLocation).length === 0) {
|
|
260
263
|
this.tip = '为了给您提供更好的服务需要获取您的位置信息'
|
|
261
|
-
this.showLocationDialog = true
|
|
264
|
+
this.showLocationDialog = true;
|
|
262
265
|
this.showMask = true;
|
|
263
266
|
this.showDialog = false;
|
|
264
267
|
return
|
|
268
|
+
} else{
|
|
269
|
+
this.showLocationDialog = false
|
|
265
270
|
}
|
|
266
271
|
}
|
|
267
272
|
if (!this.options.shop_id) {
|
|
@@ -1076,7 +1081,7 @@
|
|
|
1076
1081
|
.dialog-btns {
|
|
1077
1082
|
width: 100%;
|
|
1078
1083
|
display: flex;
|
|
1079
|
-
justify-content: space-
|
|
1084
|
+
justify-content: space-around;
|
|
1080
1085
|
|
|
1081
1086
|
}
|
|
1082
1087
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
<view class="jfb-base-footer__body">
|
|
20
20
|
<view :style="[bodyStyle]">
|
|
21
21
|
<xd-footer-bar
|
|
22
|
-
class="footer-bar"
|
|
22
|
+
class="footer-bar-deep"
|
|
23
23
|
style="height:100%"
|
|
24
24
|
v-if="list !== null"
|
|
25
25
|
:height="height"
|
|
@@ -49,6 +49,9 @@
|
|
|
49
49
|
import getServiceUrl from "@/common/getServiceUrl";
|
|
50
50
|
|
|
51
51
|
export default {
|
|
52
|
+
//#ifdef MP-WEIXIN
|
|
53
|
+
options: { styleIsolation: 'shared' },
|
|
54
|
+
//#endif
|
|
52
55
|
name: "JfbBaseFooter",
|
|
53
56
|
components: {
|
|
54
57
|
XdFontIcon,
|
|
@@ -226,9 +229,12 @@
|
|
|
226
229
|
|
|
227
230
|
<style scoped lang="less">
|
|
228
231
|
@import "./JfbBaseFooterLess.less";
|
|
229
|
-
.footer-bar
|
|
230
|
-
|
|
232
|
+
.footer-bar-deep {
|
|
233
|
+
::v-deep .xd-footer-tabbar__border {
|
|
234
|
+
border-color: var(--border-color);
|
|
235
|
+
}
|
|
231
236
|
}
|
|
237
|
+
|
|
232
238
|
|
|
233
239
|
.jfb-base-footer {
|
|
234
240
|
|