Browse Source

fix: 解决冲突

test2
xuesinan 4 years ago
parent
commit
04bd5a788a
  1. 1
      CHANGELOG.md
  2. 2
      plugins/p-deliver-check/p-deliver-check.vue

1
CHANGELOG.md

@ -79,6 +79,7 @@
--|--|-- --|--|--
- | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714) - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714)
- | 查询查件详情 | [5935a3d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5935a3d)
- | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322) - | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322)
- | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5) - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
- | 获取c插件信息 | [7b02efc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7b02efc) - | 获取c插件信息 | [7b02efc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7b02efc)

2
plugins/p-deliver-check/p-deliver-check.vue

@ -4,7 +4,7 @@
<view class="flex justify-between" @click="collapsed = !collapsed"> <view class="flex justify-between" @click="collapsed = !collapsed">
<!-- {{ deliverData ? deliverData.deliverName : '' }} --> <!-- {{ deliverData ? deliverData.deliverName : '' }} -->
<text> 审核状态 </text> <text> {{ deliverData ? deliverData.deliverName : '' }} 审核状态 </text>
<!-- 展开折叠按钮 --> <!-- 展开折叠按钮 -->
<u-icon :name="collapsed ? 'arrow-up' : 'arrow-down'"></u-icon> <u-icon :name="collapsed ? 'arrow-up' : 'arrow-down'"></u-icon>
</view> </view>

Loading…
Cancel
Save