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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/tabbar/home/template/tpl_flex_two.vue

@@ -15,11 +15,10 @@
  </div>
</template>
<script>
import '@/uview-components/uview-ui'
import uImage from "@/uview-components/uview-ui/components/u-image/u-image.vue";
import '@/components/uview-components/uview-ui'

import { modelNavigateTo } from "./tpl";
export default {
  components: { uImage },
  title: "两张横图",
  props: ["res"],
  mounted() {