diff --git a/app.json b/app.json index fb2c0aa..f9d9bcf 100644 --- a/app.json +++ b/app.json @@ -9,6 +9,8 @@ "pages/bankDraft/add/add", "pages/project/project", "pages/project/add/add", + "pages/finance/finance", + "pages/finance/voucher/voucher", "pages/pay/detail", "pages/pay/payee/payee", "pages/contractAssets/fixedAssets", @@ -21,6 +23,10 @@ "pages/bill/bill", "pages/statistics/statistics", "pages/user/region/region", + "pages/finance/index", + "pages/resources/resources", + "pages/resources/detail/detail", + "pages/resources/edit/edit", "pages/phoneLogin" ], "subPackages": [ @@ -138,40 +144,6 @@ "list/edit", "list/detail" ] - }, - { - "root": "pages/finance/", - "pages": [ - "index", - "finance", - "voucher/voucher", - "list_balance_ranking/list_balance_ranking", - "detailed_liabilities/detailed_liabilities", - "detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic" - ] - }, - { - "root": "pages/mainBody/", - "pages": [ - "list/list", - "detail/detail" - ] - }, - { - "root": "pages/resources/", - "pages": [ - "resources", - "edit/edit", - "detail/detail" - ] - }, - { - "root": "pages/discussions/", - "pages": [ - "list", - "form/form", - "detail/detail" - ] } ], "window": { @@ -179,7 +151,7 @@ "navigationStyle": "custom", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "中农融信", + "navigationBarTitleText": "农燊高科", "navigationBarTextStyle": "black" }, "sitemapLocation": "sitemap.json", diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js deleted file mode 100644 index eaec388..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js +++ /dev/null @@ -1,32 +0,0 @@ -// component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.js -import * as UTIL from '../../utils/util.js'; -import * as API from '../../utils/API.js'; -const app = getApp() -Component({ - properties: { - type: Object, - popupVisible:false, - subjects: {}, - observer: function (newVal, oldVal) {} - }, - observers: { - 'subjects': function(val) { - // this.selectComponent('#tabs').resize(); - }, - 'popupVisible': function(val) { - } - }, - /** - * 页面的初始数据 - */ - data: { - }, - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json deleted file mode 100644 index acc5399..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-popup": "@vant/weapp/popup/index", - "van-datetime-picker": "@vant/weapp/datetime-picker/index", - "van-checkbox": "@vant/weapp/checkbox/index", - "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index", - "van-checkbox-group": "@vant/weapp/checkbox-group/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml deleted file mode 100644 index 846bc25..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss b/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss deleted file mode 100644 index cda0f15..0000000 --- a/component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/SubjectTreeChooserNodeItem.wxss */ \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.js b/component/SubjectTreeChooserNodeItem/childrenPage.js deleted file mode 100644 index 2fa77e7..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.js +++ /dev/null @@ -1,43 +0,0 @@ -// component/SubjectTreeChooserNodeItem/childrenPage.js -Component({ - - /** - * 组件的属性列表 - */ - properties: { - type: Object, - subjects: {}, - }, - observers: { - 'subjects': function(val) { - // console.log(val); // 打印innerText的当前值 - // this.selectComponent('#tabs').resize(); - } - }, - - /** - * 组件的初始数据 - */ - data: { - activeNames:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - open(e){ - console.log(e); - }, - onChange(event) { - this.setData({ - activeNames: event.detail, - }); - }, - onItemClicked(e){ - console.log(e); - // this.triggerEvent('cancel',e) - this.triggerEvent('cancel', e, { bubbles: true, composed: true }) - } - } -}) \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.json b/component/SubjectTreeChooserNodeItem/childrenPage.json deleted file mode 100644 index 657e01c..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "component": true, - "usingComponents": { - "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", - "van-collapse": "@vant/weapp/collapse/index", - "van-collapse-item": "@vant/weapp/collapse-item/index" - } -} \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxml b/component/SubjectTreeChooserNodeItem/childrenPage.wxml deleted file mode 100644 index 6e07229..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {{ item.subjectId }} {{ item.subjectName }} - - - - - - - - \ No newline at end of file diff --git a/component/SubjectTreeChooserNodeItem/childrenPage.wxss b/component/SubjectTreeChooserNodeItem/childrenPage.wxss deleted file mode 100644 index accc09e..0000000 --- a/component/SubjectTreeChooserNodeItem/childrenPage.wxss +++ /dev/null @@ -1 +0,0 @@ -/* component/SubjectTreeChooserNodeItem/childrenPage.wxss */ \ No newline at end of file diff --git a/component/editor/editor.js b/component/editor/editor.js index 1cf3543..c3db795 100644 --- a/component/editor/editor.js +++ b/component/editor/editor.js @@ -24,7 +24,6 @@ Component({ }, ready() { const platform = wx.getSystemInfoSync().platform - console.log(platform); const isIOS = platform === 'ios' this.setData({ isIOS diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml index 53d9c35..64395ba 100644 --- a/component/editor/editor.wxml +++ b/component/editor/editor.wxml @@ -1,4 +1,7 @@ - \ No newline at end of file diff --git a/component/editor/editor.wxss b/component/editor/editor.wxss index 86b26cc..0dff491 100644 --- a/component/editor/editor.wxss +++ b/component/editor/editor.wxss @@ -20,7 +20,9 @@ .toolbar { padding: 0 16rpx; + height: 200rpx; width: 100%; + position: fixed; left: 0; right: 100%; bottom: 0; diff --git a/image/apply/MSYH.png b/image/apply/MSYH.png deleted file mode 100644 index 0e0d0d6..0000000 Binary files a/image/apply/MSYH.png and /dev/null differ diff --git a/image/apply/delete_icon_input.png b/image/apply/delete_icon_input.png deleted file mode 100644 index b34d2fb..0000000 Binary files a/image/apply/delete_icon_input.png and /dev/null differ diff --git a/image/apply/fixedAssets_icon_1.png b/image/apply/fixedAssets_icon_1.png deleted file mode 100644 index 1151d4d..0000000 Binary files a/image/apply/fixedAssets_icon_1.png and /dev/null differ diff --git a/image/icon/cancel_icon.png b/image/icon/cancel_icon.png new file mode 100644 index 0000000..2020549 Binary files /dev/null and b/image/icon/cancel_icon.png differ diff --git a/image/icon/cancel_icon2.png b/image/icon/cancel_icon2.png deleted file mode 100644 index a979125..0000000 Binary files a/image/icon/cancel_icon2.png and /dev/null differ diff --git a/image/icon/date_icon.png b/image/icon/date_icon.png deleted file mode 100644 index f094c2d..0000000 Binary files a/image/icon/date_icon.png and /dev/null differ diff --git a/image/index/index_block_04.png b/image/index/index_block_04.png deleted file mode 100644 index 45b8a4e..0000000 Binary files a/image/index/index_block_04.png and /dev/null differ diff --git a/image/index/index_block_23.png b/image/index/index_block_23.png deleted file mode 100644 index 611f4e3..0000000 Binary files a/image/index/index_block_23.png and /dev/null differ diff --git a/image/index/index_block_26.png b/image/index/index_block_26.png deleted file mode 100644 index d8bd41b..0000000 Binary files a/image/index/index_block_26.png and /dev/null differ diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml index b324045..6a16545 100644 --- a/pages/apply/approval/approval.wxml +++ b/pages/apply/approval/approval.wxml @@ -111,6 +111,9 @@ + + +