diff --git a/江可飞/小程序开发/app.json b/江可飞/小程序开发/app.json index 0ff183a..8f594d2 100644 --- a/江可飞/小程序开发/app.json +++ b/江可飞/小程序开发/app.json @@ -1,13 +1,8 @@ { "pages": [ -<<<<<<< HEAD - "pages/index/index", - "pages/logs/logs", - "pages/shouye/shouye", -======= "pages/shouye/shouye", + "pages/index/index", "pages/logs/logs", ->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58 "pages/fenlei/fenlei", "pages/gouwu/gouwu", "pages/wode/wode" @@ -22,11 +17,7 @@ "selectedColor": "#f00", "list": [ { -<<<<<<< HEAD - "pagePath": "pages/index/index", -======= "pagePath": "pages/shouye/shouye", ->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58 "text": "首页", "iconPath": "pages/index/image/1.png", "selectedIconPath": "pages/index/image/2.png" diff --git a/江可飞/小程序开发/app.wxss b/江可飞/小程序开发/app.wxss index 132e48d..06c6fc9 100644 --- a/江可飞/小程序开发/app.wxss +++ b/江可飞/小程序开发/app.wxss @@ -1,9 +1,4 @@ /**app.wxss**/ -<<<<<<< HEAD -======= -@import 'weui.wxss'; -@import "html-view/index.wxss"; ->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58 .container { height: 100%; display: flex; @@ -13,15 +8,3 @@ padding: 200rpx 0; box-sizing: border-box; } -<<<<<<< HEAD -======= - -.containers { - height: 100%; - flex-direction: column; - align-items: center; - justify-content: space-between; - box-sizing: border-box; -} - ->>>>>>> 2265d9448044d64588fccdf8270e4f514a1b1f58 diff --git a/江可飞/小程序开发/html-view/each/default.js b/江可飞/小程序开发/html-view/each/default.js deleted file mode 100644 index 604014b..0000000 --- a/江可飞/小程序开发/html-view/each/default.js +++ /dev/null @@ -1,79 +0,0 @@ -const html5Entities = require('../vendors/html5-entities') -const { windowWidth } = wx.getSystemInfoSync() - -module.exports = item => { - // decode html entities - if (item.type === 'Text') { - item.content = html5Entities.decode(item.content) - return - } - - //