jufubao-base 1.0.21 → 1.0.22
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/get.package.path.js
CHANGED
|
@@ -11,8 +11,8 @@ const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>
|
|
|
11
11
|
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
if (packname === 'gxd-uni-library') {
|
|
15
|
-
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library/${threePackagePath}`;
|
|
14
|
+
if (packname === 'gxd-uni-library-editx') {
|
|
15
|
+
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
};
|
package/get.package.path.js.tpl
CHANGED
|
@@ -11,8 +11,8 @@ const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>
|
|
|
11
11
|
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
if (packname === 'gxd-uni-library') {
|
|
15
|
-
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library/${threePackagePath}`;
|
|
14
|
+
if (packname === 'gxd-uni-library-editx') {
|
|
15
|
+
return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jufubao-base",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.22",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "聚福宝业务组件基础插件包",
|
|
6
6
|
"main": "index.js",
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"color": "^3.1.3",
|
|
48
48
|
"core-js": "^2.6.5",
|
|
49
49
|
"flyio": "^0.6.2",
|
|
50
|
-
"gxd-commands-bussiness": "^1.0.
|
|
51
|
-
"gxd-uni-library": "1.
|
|
50
|
+
"gxd-commands-bussiness": "^1.0.8",
|
|
51
|
+
"gxd-uni-library-editx": "1.0.2",
|
|
52
52
|
"jweixin-module": "^1.6.0",
|
|
53
53
|
"md5": "^2.3.0",
|
|
54
54
|
"path-to-regexp": "^6.2.1",
|
|
@@ -15,42 +15,68 @@
|
|
|
15
15
|
<!-- #endif -->
|
|
16
16
|
<view class="jfb-base-card__body">
|
|
17
17
|
<view class="jfb-base-card__body-cut">
|
|
18
|
-
<view
|
|
19
|
-
|
|
18
|
+
<view
|
|
19
|
+
class="jfb-base-card__body-cut-item"
|
|
20
|
+
@click="handleScan"
|
|
21
|
+
:style="{background:cutIndex===1?mainColor:'#fff',borderColor:mainColor,color:cutIndex===1?'#fff':mainColor}"
|
|
22
|
+
>
|
|
20
23
|
<xd-font-icon icon="iconsaoma"></xd-font-icon>
|
|
21
24
|
<view>使用扫码绑定</view>
|
|
22
25
|
</view>
|
|
23
|
-
<view
|
|
24
|
-
|
|
26
|
+
<view
|
|
27
|
+
class="jfb-base-card__body-cut-item"
|
|
28
|
+
@click="handleToLink('/pages/cardbind/cardbind')"
|
|
29
|
+
:style="{background:cutIndex===2?mainColor:'#fff',borderColor:mainColor,color:cutIndex===2?'#fff':mainColor}"
|
|
30
|
+
>
|
|
25
31
|
<xd-font-icon icon="iconyuechi"></xd-font-icon>
|
|
26
32
|
<view>券号密码绑定</view>
|
|
27
33
|
</view>
|
|
28
34
|
</view>
|
|
29
35
|
<view class="jfb-base-card__body-line"></view>
|
|
30
36
|
<view class="jfb-base-card__body-tab">
|
|
31
|
-
<view
|
|
32
|
-
|
|
37
|
+
<view
|
|
38
|
+
@click="tabIndex=1"
|
|
39
|
+
:style="{color:tabIndex===1?'#fff':'#B8B7BE',background:tabIndex===1?mainColor:'#fff'}"
|
|
40
|
+
>
|
|
33
41
|
已绑定票券
|
|
34
42
|
</view>
|
|
35
|
-
<view
|
|
36
|
-
|
|
43
|
+
<view
|
|
44
|
+
@click="tabIndex=2"
|
|
45
|
+
:style="{color:tabIndex===2?'#fff':'#B8B7BE',background:tabIndex===2?mainColor:'#fff'}"
|
|
46
|
+
>
|
|
37
47
|
可转换票券
|
|
38
48
|
</view>
|
|
39
49
|
</view>
|
|
40
|
-
<view
|
|
50
|
+
<view
|
|
51
|
+
class="jfb-base-card__body-tips"
|
|
52
|
+
:style="{color:mainColor}"
|
|
53
|
+
v-if="tabIndex===2"
|
|
54
|
+
>
|
|
41
55
|
*目前仅支持电影票兑换券进行转换
|
|
42
56
|
</view>
|
|
43
57
|
<view class="jfb-base-card__body-card">
|
|
44
|
-
<view
|
|
45
|
-
|
|
58
|
+
<view
|
|
59
|
+
v-for="(item,index) in showList"
|
|
60
|
+
:key="index"
|
|
61
|
+
@click="handleBindLogin(item)"
|
|
62
|
+
class="jfb-base-card__body-card-item"
|
|
63
|
+
>
|
|
46
64
|
<view class="jfb-base-card__body-card-item-left">
|
|
47
|
-
<xd-font-icon
|
|
65
|
+
<xd-font-icon
|
|
66
|
+
size="100"
|
|
67
|
+
color="#8D5F18"
|
|
68
|
+
icon="iconyouhuiquan1-011"
|
|
69
|
+
></xd-font-icon>
|
|
48
70
|
<view>{{tabIndex===1?'登录':'转换'}}</view>
|
|
49
71
|
</view>
|
|
50
72
|
<view class="jfb-base-card__body-card-item-right">
|
|
51
73
|
<view class="jfb-base-card__body-card-item-right-top">
|
|
52
74
|
<view>
|
|
53
|
-
<xd-font-icon
|
|
75
|
+
<xd-font-icon
|
|
76
|
+
icon="iconkaquan"
|
|
77
|
+
size="30"
|
|
78
|
+
style="margin-right: 10rpx"
|
|
79
|
+
></xd-font-icon>
|
|
54
80
|
<view>{{item.card_type_name}}</view>
|
|
55
81
|
</view>
|
|
56
82
|
<view>
|
|
@@ -67,7 +93,10 @@
|
|
|
67
93
|
购买其他物品可抵:{{item.other_card_point}}
|
|
68
94
|
</view>
|
|
69
95
|
</view>
|
|
70
|
-
<view
|
|
96
|
+
<view
|
|
97
|
+
@click.stop="toDetail(item)"
|
|
98
|
+
:style="{background:mainColor}"
|
|
99
|
+
>查看</view>
|
|
71
100
|
</view>
|
|
72
101
|
</view>
|
|
73
102
|
</view>
|
|
@@ -76,15 +105,28 @@
|
|
|
76
105
|
失效票券
|
|
77
106
|
</view>
|
|
78
107
|
<view class="jfb-base-card__body-card">
|
|
79
|
-
<view
|
|
108
|
+
<view
|
|
109
|
+
v-for="(item,index) in disableList"
|
|
110
|
+
:key="index"
|
|
111
|
+
class="jfb-base-card__body-card-item"
|
|
112
|
+
>
|
|
80
113
|
<view class="jfb-base-card__body-card-item-left">
|
|
81
|
-
<xd-font-icon
|
|
82
|
-
|
|
114
|
+
<xd-font-icon
|
|
115
|
+
color="#F0F0F0"
|
|
116
|
+
size="100"
|
|
117
|
+
icon="iconyouhuiquan1-011"
|
|
118
|
+
></xd-font-icon>
|
|
119
|
+
<view style="color:#F0F0F0">{{tabIndex===1?'登录':'转换'}}</view>
|
|
83
120
|
</view>
|
|
84
121
|
<view class="jfb-base-card__body-card-item-right">
|
|
85
122
|
<view class="jfb-base-card__body-card-item-right-top">
|
|
86
123
|
<view>
|
|
87
|
-
<xd-font-icon
|
|
124
|
+
<xd-font-icon
|
|
125
|
+
color="#B8B7BE"
|
|
126
|
+
icon="iconyouhuiquan1-011"
|
|
127
|
+
size="30"
|
|
128
|
+
style="margin-right: 10rpx"
|
|
129
|
+
></xd-font-icon>
|
|
88
130
|
<view>{{item.card_type_name}}</view>
|
|
89
131
|
</view>
|
|
90
132
|
<view>
|
|
@@ -174,6 +216,15 @@
|
|
|
174
216
|
}).then(res => {
|
|
175
217
|
if (this.jwxSDK !== null) {
|
|
176
218
|
console.log(this.jwxSDK, 'this.jwxSDK')
|
|
219
|
+
this.jwxSDK.scanQRCode({
|
|
220
|
+
needResult: 1,
|
|
221
|
+
scanType: ["qrCode"],
|
|
222
|
+
success: (res) => {
|
|
223
|
+
this.$xdUniHelper.navigateTo({
|
|
224
|
+
url: `/pages/cardconfirm/cardconfirm?qrcode=${res.resultStr}`
|
|
225
|
+
})
|
|
226
|
+
}
|
|
227
|
+
});
|
|
177
228
|
//todo
|
|
178
229
|
}
|
|
179
230
|
})
|
|
@@ -29,11 +29,18 @@
|
|
|
29
29
|
</view>
|
|
30
30
|
<view class="jfb-base-card-info__body-points-reach">购买其他物品可抵:{{info.other_card_point}}</view>
|
|
31
31
|
</view>
|
|
32
|
-
<view :style="{height:
|
|
32
|
+
<view :style="{height:'100rpx'}"></view>
|
|
33
33
|
</view>
|
|
34
|
-
<view
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
<view
|
|
35
|
+
class="jfb-base-card-info__body-footer"
|
|
36
|
+
:style="{bottom: layoutInfo.bottom + 'rpx',height: '100rpx'}"
|
|
37
|
+
>
|
|
38
|
+
<xd-button
|
|
39
|
+
type="primary"
|
|
40
|
+
width="360rpx"
|
|
41
|
+
@click="handleToLink"
|
|
42
|
+
>立即绑定
|
|
43
|
+
</xd-button>
|
|
37
44
|
</view>
|
|
38
45
|
</view>
|
|
39
46
|
</view>
|
|
@@ -136,8 +143,8 @@
|
|
|
136
143
|
},
|
|
137
144
|
onJfbLoad(options) {
|
|
138
145
|
this.qrcode = options.qrcode
|
|
139
|
-
this.card_number = Base64.decode(options.card_number)
|
|
140
|
-
this.card_password = Base64.decode(options.pwd)
|
|
146
|
+
this.card_number = this.card_number ? Base64.decode(options.card_number) : ''
|
|
147
|
+
this.card_password = this.card_password ? Base64.decode(options.pwd) : ''
|
|
141
148
|
if (this.card_password) {
|
|
142
149
|
jfbRootExec('getByPwdCardDetail',
|
|
143
150
|
{
|