jufubao-base 1.0.197-beta10 → 1.0.197-beta11
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
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
>{{searchBtnText || '搜索'}}</view>
|
|
80
80
|
</view>
|
|
81
81
|
<view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
|
|
82
|
-
|
|
82
|
+
class="search_btn_out"
|
|
83
83
|
:style="[searchBtnStyle]"
|
|
84
84
|
@click="doSearch"
|
|
85
85
|
>{{searchBtnText || '搜索'}}</view>
|
|
@@ -226,11 +226,8 @@
|
|
|
226
226
|
this.searchBtnRadius = getContainerPropsValue(container, 'content.searchBtnRadius', 100);
|
|
227
227
|
this.searchBoxRadius = getContainerPropsValue(container, 'content.searchBoxRadius', 30);
|
|
228
228
|
let bottomBorder = getContainerPropsValue(container, 'content.bottomBorder', "Y");
|
|
229
|
-
this.bottomBorder
|
|
230
|
-
|
|
231
|
-
width: this.is_border_w,
|
|
232
|
-
color: this.is_border_c
|
|
233
|
-
})
|
|
229
|
+
console.log("this.bottomBorder", this.bottomBorder)
|
|
230
|
+
this.bottomBorder = this.getBorderCompatibleOldStyle(bottomBorder, {})
|
|
234
231
|
this.inputBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.inputBorder', {}))
|
|
235
232
|
|
|
236
233
|
let name , logo, platform_logo;
|
|
@@ -333,7 +330,7 @@
|
|
|
333
330
|
|
|
334
331
|
&-city {
|
|
335
332
|
height: unit(110, rpx);
|
|
336
|
-
padding-left: unit(20, rpx);
|
|
333
|
+
// padding-left: unit(20, rpx);
|
|
337
334
|
display: flex;
|
|
338
335
|
justify-content: center;
|
|
339
336
|
align-items: center;
|
|
@@ -412,6 +409,16 @@
|
|
|
412
409
|
box-sizing: border-box;
|
|
413
410
|
}
|
|
414
411
|
}
|
|
412
|
+
.search_btn_out{
|
|
413
|
+
height: 64rpx;
|
|
414
|
+
margin-left: 4px;
|
|
415
|
+
padding: 8rpx 32rpx;
|
|
416
|
+
font-size: 28rpx;
|
|
417
|
+
box-sizing: border-box;
|
|
418
|
+
display: flex;
|
|
419
|
+
align-items: center;
|
|
420
|
+
justify-content: center;
|
|
421
|
+
}
|
|
415
422
|
}
|
|
416
423
|
}
|
|
417
424
|
}
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
:style="[logoutStyleComp]"
|
|
46
46
|
@click="handleLogout()"
|
|
47
47
|
>
|
|
48
|
-
<xd-font-icon class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
48
|
+
<xd-font-icon v-if="rightContent.icon" class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
49
49
|
{{rightContent.name || '退出登录'}}
|
|
50
50
|
</view>
|
|
51
51
|
<view v-if="rightContent && rightContent.type === 'addr'"
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
:style="[logoutStyleComp]"
|
|
54
54
|
@click="handleAddress()"
|
|
55
55
|
>
|
|
56
|
-
<xd-font-icon class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
56
|
+
<xd-font-icon v-if="rightContent.icon" class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
57
57
|
{{ rightContent.name || '地址' }}
|
|
58
58
|
</view>
|
|
59
59
|
</view>
|
|
@@ -67,14 +67,14 @@
|
|
|
67
67
|
:style="[logoutStyleComp]"
|
|
68
68
|
@click="handleLogout()"
|
|
69
69
|
>
|
|
70
|
-
<xd-font-icon class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
70
|
+
<xd-font-icon v-if="rightContent.icon" class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
71
71
|
{{rightContent.name || '退出登录'}}
|
|
72
72
|
</view>
|
|
73
73
|
<view v-if="rightContent && rightContent.type === 'addr'" class="right_cont_i"
|
|
74
74
|
:style="[logoutStyleComp]"
|
|
75
75
|
@click="handleAddress()"
|
|
76
76
|
>
|
|
77
|
-
<xd-font-icon class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
77
|
+
<xd-font-icon v-if="rightContent.icon"class="xd-font-icon" :icon="rightContent.icon" :size="28"></xd-font-icon>
|
|
78
78
|
{{ rightContent.name || '地址' }}
|
|
79
79
|
</view>
|
|
80
80
|
</view>
|