jmash-core-mp 0.1.47 → 0.1.48
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 +1 -1
- package/src/components/cms/jmash-cms-article-view.mpx +1 -1
- package/src/components/common/jmash-cell-group.mpx +1 -1
- package/src/components/common/jmash-code-interest-popup.mpx +42 -96
- package/src/components/common/jmash-tab-bar.mpx +1 -1
- package/src/components/core/jmash-popup-login.ali.mpx +4 -4
- package/src/components/core/jmash-popup-login.mpx +4 -4
- package/src/components/core/jmash-popup-login.web.mpx +3 -3
- package/src/custom-tab-bar/index.mpx +1 -1
- package/src/packages/pages/auth/cms-protocol.mpx +1 -1
- package/src/packages/pages/auth/login.mpx +1 -1
- package/src/packages/pages/cms/cms-activity-list.mpx +1 -1
- package/src/packages/pages/cms/cms-article-list.mpx +1 -1
- package/src/packages/pages/cms/cms-article.mpx +1 -1
- package/src/packages/pages/cms/cms-location-list.mpx +1 -1
- package/src/packages/pages/cms/cms-location.mpx +1 -1
- package/src/packages/pages/cms/cms-product-list.mpx +1 -1
- package/src/pages/half-home.mpx +1 -1
- package/src/pages/tabbar/home.mpx +1 -1
- package/src/pages/tabbar/my.mpx +3 -3
package/package.json
CHANGED
|
@@ -71,7 +71,7 @@ createComponent({
|
|
|
71
71
|
},
|
|
72
72
|
]);
|
|
73
73
|
// 使用父组件传入的列表或默认列表
|
|
74
|
-
const arr =
|
|
74
|
+
const arr = computed(() => props.menuList.length > 0 ? props.menuList : defaultMenuList.value);
|
|
75
75
|
// 公众号弹窗显示状态
|
|
76
76
|
let gzShow = ref(false);
|
|
77
77
|
|
|
@@ -1,45 +1,42 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<!--
|
|
3
|
-
<
|
|
4
|
-
<view class="
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
<view class="main">
|
|
11
|
-
|
|
12
|
-
<view class="main-
|
|
13
|
-
|
|
14
|
-
|
|
2
|
+
<!-- 关注公众号弹窗 -->
|
|
3
|
+
<jmash-popup show="{{ show }}" titleShow="{{ false }}" borderRadius="0" padding="0" bind:close="handleClose">
|
|
4
|
+
<view class="organ-code-interest-popup">
|
|
5
|
+
<view class="position-box">
|
|
6
|
+
<image wx:if="{{ resourceUrl }}" class="main-bgc-image" src="{{ resourceUrl + 'replaced/push_bgc.png' }}"
|
|
7
|
+
mode="widthFix" />
|
|
8
|
+
<view class="main">
|
|
9
|
+
<!-- 关闭文字 -->
|
|
10
|
+
<view class="main-close-text" bind:tap="handleClose">稍后关注</view>
|
|
11
|
+
<view class="main-title-image-box">
|
|
12
|
+
<view class="main-title">关注公众号</view>
|
|
13
|
+
</view>
|
|
14
|
+
<!-- 手的图片的定位盒子 -->
|
|
15
|
+
<view class="main-push-position-box">
|
|
16
|
+
<image wx:if="{{ resourceUrl }}" class="main-push-bgc-image"
|
|
17
|
+
src="{{ resourceUrl + 'replaced/push_hand_none.png' }}" mode="widthFix" />
|
|
18
|
+
<!-- 公司公众号二维码 -->
|
|
19
|
+
<view class="main-push-code-image">
|
|
20
|
+
<image wx:if="{{ resourceUrl && appQrcodeUrl }}" class="code-image" show-menu-by-longpress="{{ true }}"
|
|
21
|
+
src="{{ appQrcodeUrl }}" mode="aspectFit" />
|
|
15
22
|
</view>
|
|
16
|
-
<!--
|
|
17
|
-
<view class="main-push-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
<
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
<!-- 提示文字 -->
|
|
26
|
-
<view class="main-push-text">
|
|
27
|
-
关注后即可获得以下权益
|
|
28
|
-
<view class="main-push-text_item">
|
|
29
|
-
<image wx:if="{{ resourceUrl }}" class="main-push-text_item_left"
|
|
30
|
-
src="{{ resourceUrl + 'icon_image/interest_lisk.png' }}" mode="aspectFit" />
|
|
31
|
-
<view class="main-push-text_item_right">
|
|
32
|
-
<view class="main-push-text_item_right_title">消息实时提醒</view>
|
|
33
|
-
<view>及时接收订单、收发货、交易、收益等动态信息</view>
|
|
34
|
-
</view>
|
|
23
|
+
<!-- 提示文字 -->
|
|
24
|
+
<view class="main-push-text">
|
|
25
|
+
关注后即可获得以下权益
|
|
26
|
+
<view class="main-push-text_item">
|
|
27
|
+
<image wx:if="{{ resourceUrl }}" class="main-push-text_item_left"
|
|
28
|
+
src="{{ resourceUrl + 'icon_image/interest_lisk.png' }}" mode="aspectFit" />
|
|
29
|
+
<view class="main-push-text_item_right">
|
|
30
|
+
<view class="main-push-text_item_right_title">消息实时提醒</view>
|
|
31
|
+
<view>及时接收订单、收发货、交易、收益等动态信息</view>
|
|
35
32
|
</view>
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
33
|
+
</view>
|
|
34
|
+
<view class="main-push-text_item">
|
|
35
|
+
<image wx:if="{{ resourceUrl }}" class="main-push-text_item_left"
|
|
36
|
+
src="{{ resourceUrl + 'icon_image/interest_lisk.png' }}" mode="aspectFit" />
|
|
37
|
+
<view class="main-push-text_item_right">
|
|
38
|
+
<view class="main-push-text_item_right_title">享受更多服务</view>
|
|
39
|
+
<view>关注公众号，解锁客服、活动、会员等超值服务！</view>
|
|
43
40
|
</view>
|
|
44
41
|
</view>
|
|
45
42
|
</view>
|
|
@@ -47,12 +44,11 @@
|
|
|
47
44
|
</view>
|
|
48
45
|
</view>
|
|
49
46
|
</view>
|
|
50
|
-
</
|
|
47
|
+
</jmash-popup>
|
|
51
48
|
</template>
|
|
52
49
|
|
|
53
50
|
<script lang="ts">
|
|
54
51
|
import { createComponent, ref } from "@mpxjs/core";
|
|
55
|
-
import { getHeight } from "../../utils/common";
|
|
56
52
|
import { config } from "../../utils/config";
|
|
57
53
|
|
|
58
54
|
createComponent({
|
|
@@ -67,9 +63,6 @@ createComponent({
|
|
|
67
63
|
show: {
|
|
68
64
|
type: Boolean,
|
|
69
65
|
value: false,
|
|
70
|
-
observer() {
|
|
71
|
-
this.innerShow = this.show;
|
|
72
|
-
}
|
|
73
66
|
}
|
|
74
67
|
},
|
|
75
68
|
/**
|
|
@@ -78,17 +71,12 @@ createComponent({
|
|
|
78
71
|
setup() {
|
|
79
72
|
// 资源路径
|
|
80
73
|
let resourceUrl = config.resourceUrl + "/images/";
|
|
81
|
-
// 底部安全距离
|
|
82
|
-
let paddingBottom = ref(getHeight().computeHeightFn(getHeight().bottomHeight, 30));
|
|
83
74
|
// 公司公众号二维码图片
|
|
84
75
|
let appQrcodeUrl = ref(config.resourceUrl + "/images/replaced/official_account2x.png");
|
|
85
|
-
let innerShow = ref(false);
|
|
86
76
|
|
|
87
77
|
return {
|
|
88
78
|
resourceUrl,
|
|
89
|
-
paddingBottom,
|
|
90
79
|
appQrcodeUrl,
|
|
91
|
-
innerShow,
|
|
92
80
|
};
|
|
93
81
|
},
|
|
94
82
|
/**
|
|
@@ -96,11 +84,9 @@ createComponent({
|
|
|
96
84
|
*/
|
|
97
85
|
methods: {
|
|
98
86
|
// 关闭弹框
|
|
99
|
-
|
|
100
|
-
this.innerShow = false;
|
|
87
|
+
handleClose() {
|
|
101
88
|
this.triggerEvent("close");
|
|
102
89
|
},
|
|
103
|
-
noop() { },
|
|
104
90
|
}
|
|
105
91
|
});
|
|
106
92
|
</script>
|
|
@@ -108,48 +94,6 @@ createComponent({
|
|
|
108
94
|
<style lang="scss">
|
|
109
95
|
@use "../../styles/index.scss" as *;
|
|
110
96
|
|
|
111
|
-
.ci-popup {
|
|
112
|
-
position: fixed;
|
|
113
|
-
top: 0;
|
|
114
|
-
left: 0;
|
|
115
|
-
right: 0;
|
|
116
|
-
bottom: 0;
|
|
117
|
-
z-index: 999999;
|
|
118
|
-
pointer-events: none;
|
|
119
|
-
|
|
120
|
-
&.ci-popup--show {
|
|
121
|
-
pointer-events: auto;
|
|
122
|
-
|
|
123
|
-
.ci-popup__mask {
|
|
124
|
-
opacity: 1;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
.ci-popup__content {
|
|
128
|
-
transform: translateY(0);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
.ci-popup__mask {
|
|
133
|
-
position: absolute;
|
|
134
|
-
top: 0;
|
|
135
|
-
left: 0;
|
|
136
|
-
right: 0;
|
|
137
|
-
bottom: 0;
|
|
138
|
-
background: rgba(0, 0, 0, 0.5);
|
|
139
|
-
opacity: 0;
|
|
140
|
-
transition: opacity 0.3s ease;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
.ci-popup__content {
|
|
144
|
-
position: absolute;
|
|
145
|
-
bottom: 0;
|
|
146
|
-
left: 0;
|
|
147
|
-
right: 0;
|
|
148
|
-
transform: translateY(100%);
|
|
149
|
-
transition: transform 0.3s ease;
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
|
|
153
97
|
.organ-code-interest-popup {
|
|
154
98
|
.position-box {
|
|
155
99
|
position: relative;
|
|
@@ -272,6 +216,8 @@ createComponent({
|
|
|
272
216
|
<script type="application/json">
|
|
273
217
|
{
|
|
274
218
|
"component": true,
|
|
275
|
-
"usingComponents": {
|
|
219
|
+
"usingComponents": {
|
|
220
|
+
"jmash-popup": "./jmash-popup"
|
|
221
|
+
}
|
|
276
222
|
}
|
|
277
|
-
</script>
|
|
223
|
+
</script>
|
|
@@ -303,10 +303,10 @@ $bg-card: #ffffff;
|
|
|
303
303
|
{
|
|
304
304
|
"component": true,
|
|
305
305
|
"usingComponents": {
|
|
306
|
-
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index",
|
|
307
|
-
"cube-button": "@mpxjs/mpx-cube-ui/lib/components/button/index",
|
|
308
|
-
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index",
|
|
309
|
-
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index"
|
|
306
|
+
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index.mpx",
|
|
307
|
+
"cube-button": "@mpxjs/mpx-cube-ui/lib/components/button/index.mpx",
|
|
308
|
+
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index.mpx",
|
|
309
|
+
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index.mpx"
|
|
310
310
|
}
|
|
311
311
|
}
|
|
312
312
|
</script>
|
|
@@ -408,10 +408,10 @@ $bg-card: #ffffff;
|
|
|
408
408
|
{
|
|
409
409
|
"component": true,
|
|
410
410
|
"usingComponents": {
|
|
411
|
-
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index",
|
|
412
|
-
"cube-button": "@mpxjs/mpx-cube-ui/lib/components/button/index",
|
|
413
|
-
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index",
|
|
414
|
-
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index"
|
|
411
|
+
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index.mpx",
|
|
412
|
+
"cube-button": "@mpxjs/mpx-cube-ui/lib/components/button/index.mpx",
|
|
413
|
+
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index.mpx",
|
|
414
|
+
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index.mpx"
|
|
415
415
|
}
|
|
416
416
|
}
|
|
417
417
|
</script>
|
|
@@ -381,9 +381,9 @@ $text-disabled: #999999;
|
|
|
381
381
|
{
|
|
382
382
|
"component": true,
|
|
383
383
|
"usingComponents": {
|
|
384
|
-
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index",
|
|
385
|
-
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index",
|
|
386
|
-
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index"
|
|
384
|
+
"cube-modal": "@mpxjs/mpx-cube-ui/lib/components/modal/index.mpx",
|
|
385
|
+
"cube-checkbox": "@mpxjs/mpx-cube-ui/lib/components/checkbox/index.mpx",
|
|
386
|
+
"cube-checkbox-group": "@mpxjs/mpx-cube-ui/lib/components/checkbox-group/index.mpx"
|
|
387
387
|
}
|
|
388
388
|
}
|
|
389
389
|
</script>
|
|
@@ -81,7 +81,7 @@ page {
|
|
|
81
81
|
"navigationBarTitleText": "列表",
|
|
82
82
|
"usingComponents": {
|
|
83
83
|
"jmash-search": "../../../components/common/jmash-search",
|
|
84
|
-
"jmash-cms-activity-list": "../../../components/cms/jmash-cms-activity-list"
|
|
84
|
+
"jmash-cms-activity-list": "../../../components/cms/jmash-cms-activity-list.mpx"
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
</script>
|
|
@@ -83,7 +83,7 @@ page {
|
|
|
83
83
|
"navigationBarTitleText": "列表",
|
|
84
84
|
"usingComponents": {
|
|
85
85
|
"jmash-search": "../../../components/common/jmash-search",
|
|
86
|
-
"jmash-cms-article-list": "../../../components/cms/jmash-cms-article-list"
|
|
86
|
+
"jmash-cms-article-list": "../../../components/cms/jmash-cms-article-list.mpx"
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
</script>
|
|
@@ -78,7 +78,7 @@ page {
|
|
|
78
78
|
"navigationBarTitleText": "列表",
|
|
79
79
|
"usingComponents": {
|
|
80
80
|
"jmash-search": "../../../components/common/jmash-search",
|
|
81
|
-
"jmash-cms-location-list": "../../../components/cms/jmash-cms-location-list"
|
|
81
|
+
"jmash-cms-location-list": "../../../components/cms/jmash-cms-location-list.mpx"
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
</script>
|
|
@@ -83,7 +83,7 @@ page {
|
|
|
83
83
|
"navigationBarTitleText": "列表",
|
|
84
84
|
"usingComponents": {
|
|
85
85
|
"jmash-search": "../../../components/common/jmash-search",
|
|
86
|
-
"jmash-cms-product-list": "../../../components/cms/jmash-cms-product-list"
|
|
86
|
+
"jmash-cms-product-list": "../../../components/cms/jmash-cms-product-list.mpx"
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
</script>
|
package/src/pages/half-home.mpx
CHANGED
package/src/pages/tabbar/my.mpx
CHANGED
|
@@ -71,9 +71,9 @@ $bg-page: #f5f5f5;
|
|
|
71
71
|
<script type="application/json">
|
|
72
72
|
{
|
|
73
73
|
"usingComponents": {
|
|
74
|
-
"jmash-user": "../../components/auth-user/jmash-user",
|
|
75
|
-
"jmash-menu": "../../components/common/jmash-menu",
|
|
76
|
-
"jmash-logout": "../../components/auth-user/jmash-logout"
|
|
74
|
+
"jmash-user": "../../components/auth-user/jmash-user.mpx",
|
|
75
|
+
"jmash-menu": "../../components/common/jmash-menu.mpx",
|
|
76
|
+
"jmash-logout": "../../components/auth-user/jmash-logout.mpx"
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
</script>
|