diff --git a/pages.json b/pages.json index 66c5068..eefda79 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,44 @@ { "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页" + } + }, + { + "path" : "pages/send/send", + "style" : + { + "navigationBarTitleText": "下载发送", + "enablePullDownRefresh": false + } + + }, + { + "path" : "pages/plans/plans", + "style" : + { + "navigationBarTitleText": "产品方案", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/teams/teams", + "style" : + { + "navigationBarTitleText": "团队", + "enablePullDownRefresh": false + } + }, + { + "path" : "pages/addOrder/addOrder", + "style" : + { + "navigationBarTitleText": "新建订单", + "enablePullDownRefresh": false + } + }, { "path" : "pages/clients/clients", "style" : @@ -16,13 +55,7 @@ "enablePullDownRefresh": false } - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页" - } - } + } ,{ "path" : "pages/addClient/addClient", "style" : @@ -50,6 +83,42 @@ } } + ,{ + "path" : "pages/person/person", + "style" : + { + "navigationBarTitleText": "我的", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/addMember/addMember", + "style" : + { + "navigationBarTitleText": "添加成员", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/addStaff/addStaff", + "style" : + { + "navigationBarTitleText": "添加成员", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/detail/detail", + "style" : + { + "navigationBarTitleText": "详情", + "enablePullDownRefresh": false + } + + } ], "condition": { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) @@ -66,5 +135,27 @@ "app-plus": { "background": "#efeff4" } + }, + "tabBar": { + "color": "#7A7E83", + "selectedColor": "#0070ff", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/index/index", + // "iconPath": "static/image/icon_component.png", + // "selectedIconPath": "static/image/icon_component_HL.png", + "text": "首页" + }, { + "pagePath": "pages/clients/clients", + // "iconPath": "static/image/icon_API.png", + // "selectedIconPath": "static/image/icon_API_HL.png", + "text": "团队" + }, { + "pagePath": "pages/person/person", + // "iconPath": "static/image/icon_API.png", + // "selectedIconPath": "static/image/icon_API_HL.png", + "text": "我的" + }] } } diff --git a/pages/addClient/addClient.vue b/pages/addClient/addClient.vue index 96a11e8..42c4bce 100644 --- a/pages/addClient/addClient.vue +++ b/pages/addClient/addClient.vue @@ -127,7 +127,7 @@ } - diff --git a/pages/addOrder/addOrder.vue b/pages/addOrder/addOrder.vue new file mode 100644 index 0000000..4d5a8f5 --- /dev/null +++ b/pages/addOrder/addOrder.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/pages/addStaff/addStaff.vue b/pages/addStaff/addStaff.vue new file mode 100644 index 0000000..9c0232d --- /dev/null +++ b/pages/addStaff/addStaff.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue index 62a69b5..d845060 100644 --- a/pages/clients/clients.vue +++ b/pages/clients/clients.vue @@ -48,7 +48,7 @@ } - diff --git a/pages/index/index.vue b/pages/index/index.vue index 96a11e8..44fb2b1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,48 +1,6 @@ @@ -50,86 +8,18 @@ export default { data() { return { - candidates: ['北京', '南京', '东京', '武汉', '天津', '上海', '海口'], - dataTree: [{ - text: "一年级", - value: "1-0", - children: [{ - text: "1.1班", - value: "1-1" - }, - { - text: "1.2班", - value: "1-2" - } - ] - }, - { - text: "二年级", - value: "2-0", - children: [{ - text: "2.1班", - value: "2-1" - }, - { - text: "2.2班", - value: "2-2" - } - ] - }, - { - text: "三年级", - value: "3-0", - disable: true - } - ], - form: { - name: '', - provience: '', - city: '', - industryId: '', - age: '', - introduction: '', - sex: 2, - hobby: [5], - datetimesingle: 1627529992399 - }, - sexs: [{ - text: '男', - value: 0 - }, { - text: '女', - value: 1 - }, { - text: '保密', - value: 2 - }], + } }, onLoad() { - console.log(getApp()) + }, methods: { - onchange(e) { - console.log('---------onchange:', e); - }, - submit(ref) { - this.$refs[ref].validate().then(res => { - console.log('success', res); - uni.showToast({ - title: `校验通过` - }) - }).catch(err => { - console.log('err', err); - }) - }, + } } diff --git a/pages/ordered/ordered.vue b/pages/ordered/ordered.vue index 00305ea..4ecf78f 100644 --- a/pages/ordered/ordered.vue +++ b/pages/ordered/ordered.vue @@ -83,23 +83,6 @@ flex: 1; } } -.tab { - display: flex; - justify-content: space-around; - padding: 10px; - margin-bottom: 10px; - background-color: #fff; - li { - padding: 0 4px; - font-size: 14px; - line-height: 30px; - border-bottom: 3px solid transparent; - } - .active { - color: $uni-primary; - border-bottom-color: $uni-primary; - } -} .list { background-color: #fff; li { diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue index 12c349a..ed95d67 100644 --- a/pages/orders/orders.vue +++ b/pages/orders/orders.vue @@ -24,7 +24,7 @@ - + diff --git a/pages/person/person.vue b/pages/person/person.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/pages/person/person.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/pages/plans/plans.vue b/pages/plans/plans.vue new file mode 100644 index 0000000..11defdb --- /dev/null +++ b/pages/plans/plans.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/pages/send/send.vue b/pages/send/send.vue new file mode 100644 index 0000000..72d737b --- /dev/null +++ b/pages/send/send.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/pages/teams/teams.vue b/pages/teams/teams.vue new file mode 100644 index 0000000..1985901 --- /dev/null +++ b/pages/teams/teams.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/static/avatar.jpg b/static/avatar.jpg new file mode 100644 index 0000000..d047eb7 Binary files /dev/null and b/static/avatar.jpg differ diff --git a/static/iconfont/iconfont.css b/static/iconfont/iconfont.css index 76c2e97..3a65ec5 100644 --- a/static/iconfont/iconfont.css +++ b/static/iconfont/iconfont.css @@ -1,6 +1,5 @@ @font-face { - font-family: "iconfont"; - src: url('/static/iconfont/iconfont.ttf') format('truetype'); + font-family: "iconfont"; src: url('/static/iconfont/iconfont.ttf') format('truetype'); } .iconfont { @@ -11,6 +10,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-qrcode:before { + content: "\e7dd"; +} + .icon-dingdan:before { content: "\e601"; } diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf index dbb36b9..9db285d 100644 Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ diff --git a/styles/common.scss b/styles/common.scss index f4aafa6..5039078 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -1,3 +1,21 @@ button[type=primary] { background-color: #007eff; +} + +.tab { + display: flex; + justify-content: space-around; + padding: 10px; + margin-bottom: 10px; + background-color: #fff; + li { + padding: 0 4px; + font-size: 14px; + line-height: 30px; + border-bottom: 3px solid transparent; + } + .active { + color: $uni-primary; + border-bottom-color: $uni-primary; + } } \ No newline at end of file