Skip to content

J
jiedao-app-customer-new-master
Commit ae2ee3f5 authored by Smile's avatar Smile
Browse files
Options

Merge remote-tracking branch 'origin/jd_dev' into jd_dev

parents 6de4aa5a 11a96a4a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/pages/my_info/cityListPicker.vue
View file @ ae2ee3f5
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
padding: 0rpx 8rpx; // padding: 0rpx 8rpx;
} }
.pickerInput{ .pickerInput{
width: 60%; width: 60%;
......
src/pages/notice/notice.vue
View file @ ae2ee3f5
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view class="notice-list-top"> <view class="notice-list-top">
<image src="../../static/img/notice-1.png" mode=""></image> <image src="../../static/img/notice-1.png" mode=""></image>
<!-- <image v-else src="../../static/img/notice-2.png" mode=""></image> --> <!-- <image v-else src="../../static/img/notice-2.png" mode=""></image> -->
<view class="">{{$lang.locale=='zh'?item.title:item.titleEn}}</view> <view class="">{{$lang.locale=='zh'?item.title:$lang.locale=='en'?item.titleEn:item.titleFr}}</view>
</view> </view>
<view class="times"> <view class="times">
<image src="../../static/img/time.png" mode=""></image> <image src="../../static/img/time.png" mode=""></image>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment