diff --git a/README.md b/README.md index baff557..b067c18 100644 --- a/README.md +++ b/README.md @@ -40,3 +40,4 @@ npm run build:mp-weixin ### [蓝湖](https://lanhuapp.com/web/#/item/project/board?pid=9ab56cc5-0b3b-4a9c-8cd0-0cf57751010a) +*分包情况下,H5无法编译image的绝对路径,相对路径正常* diff --git a/src/App.vue b/src/App.vue index a5f3b49..5335f6f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,9 @@ import util from './utils/util'; export default { onLaunch: function() { + // #ifndef H5 this.updateManager(); + // #endif }, methods: { isLogin(){ diff --git a/src/pages.json b/src/pages.json index 7f6bdb7..f2fb9d4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -162,6 +162,37 @@ } ], + "subpackages": [ + { + "root": "subpackage/device", + "pages": [ + { + "path": "pages/index/index", + "style" : { + "navigationBarTitleText": "欧轩智能商家助手" + } + }, + { + "path": "pages/switch_manage/switch_manage", + "style" : { + "navigationBarTitleText": "开关管理" + } + }, + { + "path": "pages/device_manage/device_manage", + "style" : { + "navigationBarTitleText": "设备管理" + } + }, + { + "path": "pages/sell_box_test/sell_box_test", + "style" : { + "navigationBarTitleText": "售货柜管理" + } + } + ] + } + ], "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "欧轩智能商家助手", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 0200e45..f2345af 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -122,11 +122,16 @@ }, ]; + const app = getApp(); + + //#ifndef H5 + const uniGetSetting = util.promisify(uni.getSetting); const uniLogin = util.promisify(uni.login); const uniGetUserInfo= util.promisify(uni.getUserInfo); - const app = getApp(); const APPID = uni.getAccountInfoSync().miniProgram.appId; + + //#endif export default { computed: { @@ -140,7 +145,9 @@ } }, async onLoad() { + // #ifndef H5 try{ + util.showLoad(); await this.checkUserAuthor(); util.hideLoad(); @@ -153,10 +160,13 @@ util.showNone(err.message || '身份校验失败!'); console.log('onLoad err',err); } + // #endif }, onShow(){ + // #ifndef MP-WEIXIN let { indexData } = this; if(JSON.stringify(indexData)!='{}'&&!!app.isLogin())this.getIndexInfo(); + // #endif }, methods: { toNoticeList(){ diff --git a/src/subpackage/device/components/device_name/device_name.vue b/src/subpackage/device/components/device_name/device_name.vue new file mode 100644 index 0000000..17d09a6 --- /dev/null +++ b/src/subpackage/device/components/device_name/device_name.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/components/store_name/store_name.vue b/src/subpackage/device/components/store_name/store_name.vue new file mode 100644 index 0000000..040c72f --- /dev/null +++ b/src/subpackage/device/components/store_name/store_name.vue @@ -0,0 +1,48 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/pages/device_manage/device_manage.vue b/src/subpackage/device/pages/device_manage/device_manage.vue new file mode 100644 index 0000000..4ed27fb --- /dev/null +++ b/src/subpackage/device/pages/device_manage/device_manage.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/pages/index/index.vue b/src/subpackage/device/pages/index/index.vue new file mode 100644 index 0000000..927aa51 --- /dev/null +++ b/src/subpackage/device/pages/index/index.vue @@ -0,0 +1,62 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/pages/sell_box_test/sell_box_test.vue b/src/subpackage/device/pages/sell_box_test/sell_box_test.vue new file mode 100644 index 0000000..a565343 --- /dev/null +++ b/src/subpackage/device/pages/sell_box_test/sell_box_test.vue @@ -0,0 +1,95 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue new file mode 100644 index 0000000..11f2e95 --- /dev/null +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -0,0 +1,145 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/device/static/images/arrow_b2.png b/src/subpackage/device/static/images/arrow_b2.png new file mode 100644 index 0000000..54df2b3 Binary files /dev/null and b/src/subpackage/device/static/images/arrow_b2.png differ