jufubao-base 1.0.297-beta21 → 1.0.297
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/JfbBaseChangeCompany/JfbBaseChangeCompany.vue +1 -3
- package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue +4 -4
- package/src/components/JfbBaseEntry/JfbBaseEntry.vue +12 -2
- package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue +5 -0
package/package.json
CHANGED
|
@@ -10,9 +10,7 @@
|
|
|
10
10
|
:class="{ editx: isEditx && active }"
|
|
11
11
|
v-if="isEditx && active"
|
|
12
12
|
>
|
|
13
|
-
<view class="jfb-base-change-company__edit-icon" @click="delEdit"
|
|
14
|
-
>删除</view
|
|
15
|
-
>
|
|
13
|
+
<view class="jfb-base-change-company__edit-icon" @click="delEdit">删除</view>
|
|
16
14
|
</view>
|
|
17
15
|
<!-- #endif -->
|
|
18
16
|
<view class="jfb-base-change-company__body">
|
|
@@ -10,9 +10,7 @@
|
|
|
10
10
|
:class="{ editx: isEditx && active }"
|
|
11
11
|
v-if="isEditx && active"
|
|
12
12
|
>
|
|
13
|
-
<view class="jfb-base-chose-company__edit-icon" @click="delEdit"
|
|
14
|
-
>删除</view
|
|
15
|
-
>
|
|
13
|
+
<view class="jfb-base-chose-company__edit-icon" @click="delEdit">删除</view>
|
|
16
14
|
</view>
|
|
17
15
|
<!-- #endif -->
|
|
18
16
|
<view
|
|
@@ -257,9 +255,11 @@ export default {
|
|
|
257
255
|
company_source_from: item.company_source_from,
|
|
258
256
|
},
|
|
259
257
|
}).then((res) => {
|
|
258
|
+
|
|
260
259
|
//#ifdef MP-WEIXIN
|
|
261
260
|
if (this.jfbAuthorize !== null) {
|
|
262
|
-
this.jfbAuthorize.setAllToken(res)
|
|
261
|
+
this.jfbAuthorize.setAllToken(res);//只返回用户登陆信息，无卡登陆信息
|
|
262
|
+
this.jfbAuthorize.removeAllCardToken();
|
|
263
263
|
}
|
|
264
264
|
//#endif
|
|
265
265
|
|
|
@@ -26,7 +26,10 @@
|
|
|
26
26
|
</view>
|
|
27
27
|
</view>
|
|
28
28
|
<view v-else class="entry_list" :style="entryStyle">
|
|
29
|
-
<view
|
|
29
|
+
<view
|
|
30
|
+
v-if="entryList.length > 0"
|
|
31
|
+
v-for="(item,i) in entryList"
|
|
32
|
+
:key="i"
|
|
30
33
|
class="entry_item"
|
|
31
34
|
:class="'row_num_'+rowNum"
|
|
32
35
|
@click="toLink(item)"
|
|
@@ -35,6 +38,11 @@
|
|
|
35
38
|
<image v-if="rowNum == 2" :src="item.image_url2" mode="widthFix"/>
|
|
36
39
|
<image v-if="rowNum == 3" :src="item.image_url3" mode="widthFix"/>
|
|
37
40
|
</view>
|
|
41
|
+
<xd-no-data
|
|
42
|
+
icon-type="empty"
|
|
43
|
+
:scale-size="2"
|
|
44
|
+
v-if="entryList.length === 0"
|
|
45
|
+
>暂无数据</xd-no-data>
|
|
38
46
|
</view>
|
|
39
47
|
</view>
|
|
40
48
|
</view>
|
|
@@ -49,11 +57,13 @@
|
|
|
49
57
|
import componentsMixins from "@/mixins/componentsMixins";
|
|
50
58
|
import extsMixins from "@/mixins/extsMixins";
|
|
51
59
|
import getServiceUrl from "@/common/getServiceUrl";
|
|
60
|
+
import XdNoData from "@/components/XdNoData/XdNoData.vue";
|
|
52
61
|
import {mapState} from "vuex";
|
|
53
62
|
export default {
|
|
54
63
|
name: "JfbBaseEntry",
|
|
55
64
|
components: {
|
|
56
|
-
XdFontIcon
|
|
65
|
+
XdFontIcon,
|
|
66
|
+
XdNoData
|
|
57
67
|
},
|
|
58
68
|
mixins: [
|
|
59
69
|
componentsMixins, extsMixins, JfbBaseEntryMixin
|
|
@@ -491,6 +491,11 @@
|
|
|
491
491
|
//登录成功调整地址优先级
|
|
492
492
|
this.inCallback = inCallback || this.allEntryPath || this.settings.index;
|
|
493
493
|
|
|
494
|
+
//检查是否为小程序环境
|
|
495
|
+
//#ifdef H5
|
|
496
|
+
if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
|
|
497
|
+
// #endif
|
|
498
|
+
|
|
494
499
|
this.getCardList();
|
|
495
500
|
},
|
|
496
501
|
/**
|