whycq
2022-05-19 c86b4ccf132c985e86fb47110ed76ee2b155bbb3
Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms

 Conflicts:
 App.vue
1个文件已修改
20 ■■■■■ 已修改文件
pages/basics/demo.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/basics/demo.vue
@@ -60,12 +60,28 @@
        <view class="square-none">
            <view class="v-show">暂无更多数据...</view>
        </view>
        <!-- 商品列表 -->
        <view>
            <view></view>
        </view>
        <!-- 表单 -->
        <view class="square-form">
            <view class="form-title">
                <text>结束时间</text>
            </view>
            <view class="form-input">
                <input type="text" placeholder="请输入...">
            </view>
        </view>
        <!-- 表单必填 -->
        <view class="square-form">
            <view class="form-title">
                <text>结束时间</text>
            </view>
            <view class="form-input">
                <input type="text" placeholder="请输入...">
            </view>
        </view>
    </view>
</template>