diff --git a/apis/request.js b/apis/request.js
index 25b4a1a..0d41bab 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -35,7 +35,7 @@ const request = options => {
fail: err => {
uni.showToast({
title: '请求失败！',
- icon: 'fail'
+ icon: 'none'
})
reject(err)
},
diff --git a/config/request.js b/config/request.js
index c3aa89f..24cd55b 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,7 @@
*/
export default {
- baseURL: 'http://192.168.31.137:9000/',
+ baseURL: 'http://192.168.31.151:9000/',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
diff --git a/pages.json b/pages.json
index edecbef..34addde 100644
--- a/pages.json
+++ b/pages.json
@@ -1,13 +1,21 @@
{
"pages": [
{
- "path" : "pages/invite/invite",
+ "path" : "pages/orderDetail/orderDetail",
"style" :
{
- "navigationBarTitleText": "加入团队",
+ "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false
}
},
+ {
+ "path" : "pages/clientDetail/clientDetail",
+ "style" :
+ {
+ "navigationBarTitleText": "客户详情",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path" : "pages/clients/clients",
"style" :
@@ -23,6 +31,36 @@
"navigationBarTitleText": "订单列表",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/plans/plans",
+ "style" :
+ {
+ "navigationBarTitleText": "产品方案",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "pages/person/person",
+ "style" :
+ {
+ "navigationBarTitleText": "我的",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "首页"
+ }
+ },
+ {
+ "path" : "pages/invite/invite",
+ "style" :
+ {
+ "navigationBarTitleText": "加入团队",
+ "enablePullDownRefresh": false
+ }
},
{
"path" : "pages/qrcode/qrcode",
@@ -55,20 +93,6 @@
"navigationBarTitleText": "添加成员",
"enablePullDownRefresh": false
}
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "首页"
- }
- },
- {
- "path" : "pages/orderDetail/orderDetail",
- "style" :
- {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
},
{
"path" : "pages/password/password",
@@ -86,14 +110,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path" : "pages/plans/plans",
- "style" :
- {
- "navigationBarTitleText": "产品方案",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "pages/teams/teams",
"style" :
@@ -109,14 +125,6 @@
"navigationBarTitleText": "新建订单",
"enablePullDownRefresh": false
}
- },{
- "path" : "pages/clientDetail/clientDetail",
- "style" :
- {
- "navigationBarTitleText": "客户详情",
- "enablePullDownRefresh": false
- }
-
},
{
"path" : "pages/ordered/ordered",
@@ -126,14 +134,6 @@
"enablePullDownRefresh": false
}
- }
- ,{
- "path" : "pages/person/person",
- "style" :
- {
- "navigationBarTitleText": "我的",
- "enablePullDownRefresh": false
- }
},
{
"path" : "pages/detail/detail",
@@ -143,6 +143,15 @@
"enablePullDownRefresh": false
}
}
+ ,{
+ "path" : "pages/login/login",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式（list 的索引项）
@@ -152,33 +161,35 @@
}]
},
"globalStyle": {
- "navigationBarTextStyle": "black",
+ "navigationBarTextStyle": "white",
"navigationBarTitleText": "或然CRM系统",
- "navigationBarBackgroundColor": "#F8F8F8",
+ "navigationBarBackgroundColor": "#007EFF",
"backgroundColor": "#f5f5f5",
"app-plus": {
"background": "#efeff4"
}
},
"tabBar": {
- "color": "#7A7E83",
- "selectedColor": "#0070ff",
- "borderStyle": "black",
+ "color": "#B8B9B8",
+ "selectedColor": "#007FFF",
+ "borderStyle": "white",
"backgroundColor": "#ffffff",
+ "height": "100px",
+ "spacing": "10px",
"list": [{
"pagePath": "pages/index/index",
- // "iconPath": "static/image/icon_component.png",
- // "selectedIconPath": "static/image/icon_component_HL.png",
+ "iconPath": "static/image/tab1.png",
+ "selectedIconPath": "static/image/tab1-1.png",
"text": "首页"
}, {
"pagePath": "pages/teams/teams",
- // "iconPath": "static/image/icon_API.png",
- // "selectedIconPath": "static/image/icon_API_HL.png",
+ "iconPath": "static/image/tab2.png",
+ "selectedIconPath": "static/image/tab2-1.png",
"text": "团队"
}, {
"pagePath": "pages/person/person",
- // "iconPath": "static/image/icon_API.png",
- // "selectedIconPath": "static/image/icon_API_HL.png",
+ "iconPath": "static/image/tab3.png",
+ "selectedIconPath": "static/image/tab3-1.png",
"text": "我的"
}]
}
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 84f0175..bce538b 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -8,54 +8,66 @@
-
-
-
-
-
- {{ form.customerName || '请选择学校' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 基本信息
-
+
+ 客户名称
+ {{ form.customerName || '请选择学校' }}
+
+
+ 省份
+ {{ form.provinceName }}
+
+
+ 城市
+ {{ form.cityName }}
+
+
+ 行业类型
+ {{ form.industryClassName }}
+
+
+
+ 行业
+ {{ form.industryName }}
+
+
+
+ 联系人姓名
+ {{ form.name }}
+
+
+
+ 手机
+ {{ form.phone }}
+
+
+
+ 账号
+ {{ form.account }}
+
+
+
+ 职务
+ {{ form.position }}
+
+
+
+ 邮箱
+ {{ form.email }}
+
+
+
+ 产品到期时间
+ {{ form.expireDate }}
+
+
+ 客户类型
+ {{ customerType }}
+
+
@@ -321,10 +333,6 @@
color: #333;
}
}
-.form {
- padding: 15px;
- background-color: #fff;
-}
.action {
z-index: 2;
position: fixed;
@@ -343,17 +351,6 @@
color: #959595;
}
}
-.school-input {
- padding: 0 10px;
- font-size: 12px;
- line-height: 34px;
- color: #ccc;
- border: 1px solid #e5e5e5;
- border-radius: 4px;
- &.active {
- color: #333;
- }
-}
.mask {
z-index: 9;
position: fixed;
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..3988183
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,37 @@
+
+
+
+ Hi，或然科技城市合伙人请登录备份
+
+
+ 微信授权登录
+
+
+
+ 手机账号登录
+
+
+
+
+
+
+
+
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 8183fd0..641ba27 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -1,6 +1,37 @@
-
-
+
+
+
+
+
+
+ 仲达
+ 1356231564
+
+
+
+
+
+
+ 我的收益
+
+ 231323元
+
+
+
+
+ 团队收益
+
+ 231323元
+
+
+
+
+ 设置
+
+
+
+
@@ -17,6 +48,61 @@
}
-
diff --git a/static/image/avatar.png b/static/image/avatar.png
new file mode 100644
index 0000000..f03d1cb
Binary files /dev/null and b/static/image/avatar.png differ
diff --git a/static/image/person-bg.png b/static/image/person-bg.png
new file mode 100644
index 0000000..d2bb7af
Binary files /dev/null and b/static/image/person-bg.png differ
diff --git a/static/image/person1.png b/static/image/person1.png
new file mode 100644
index 0000000..06a3d66
Binary files /dev/null and b/static/image/person1.png differ
diff --git a/static/image/person2.png b/static/image/person2.png
new file mode 100644
index 0000000..339f3fd
Binary files /dev/null and b/static/image/person2.png differ
diff --git a/static/image/person3.png b/static/image/person3.png
new file mode 100644
index 0000000..cf086bb
Binary files /dev/null and b/static/image/person3.png differ
diff --git a/static/image/tab1-1.png b/static/image/tab1-1.png
new file mode 100644
index 0000000..39520bc
Binary files /dev/null and b/static/image/tab1-1.png differ
diff --git a/static/image/tab1.png b/static/image/tab1.png
new file mode 100644
index 0000000..ec3858a
Binary files /dev/null and b/static/image/tab1.png differ
diff --git a/static/image/tab2-1.png b/static/image/tab2-1.png
new file mode 100644
index 0000000..c8a9aa2
Binary files /dev/null and b/static/image/tab2-1.png differ
diff --git a/static/image/tab2.png b/static/image/tab2.png
new file mode 100644
index 0000000..3faee96
Binary files /dev/null and b/static/image/tab2.png differ
diff --git a/static/image/tab3-1.png b/static/image/tab3-1.png
new file mode 100644
index 0000000..a09d2e2
Binary files /dev/null and b/static/image/tab3-1.png differ
diff --git a/static/image/tab3.png b/static/image/tab3.png
new file mode 100644
index 0000000..3c3a76a
Binary files /dev/null and b/static/image/tab3.png differ
diff --git a/static/login-bg.png b/static/login-bg.png
new file mode 100644
index 0000000..ec85238
Binary files /dev/null and b/static/login-bg.png differ
diff --git a/static/phone.png b/static/phone.png
new file mode 100644
index 0000000..8b6eab4
Binary files /dev/null and b/static/phone.png differ
diff --git a/static/wechat.png b/static/wechat.png
new file mode 100644
index 0000000..d33739e
Binary files /dev/null and b/static/wechat.png differ
diff --git a/styles/common.scss b/styles/common.scss
index e377bbd..508447d 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -2,6 +2,61 @@ button[type=primary] {
background-color: #007eff;
}
+.l-title {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ color: #333;
+ &:before {
+ content: '';
+ width: 6rpx;
+ height: 28rpx;
+ margin-right: 12rpx;
+ vertical-align: middle;
+ background-color: #4876F9;
+ }
+}
+.form-list {
+ padding: 0 24rpx;
+ margin: 20rpx 24rpx;
+ border-radius: 16rpx;
+ background-color: #fff;
+ .line {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 28rpx 0;
+ border-bottom: 1px solid #E6E8ED;
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+ .ph {
+ font-size: 28rpx;
+ color: #999;
+ }
+ .name, .val, input {
+ font-size: 28rpx;
+ color: #333;
+ }
+ input {
+ flex: 1;
+ margin-left: 20rpx;
+ text-align: right;
+ }
+ .req {
+ .name:after {
+ content: '*';
+ margin-left: 3px;
+ color: #F53232;
+ vertical-align: middle;
+ }
+ }
+}
+.picker-input .input-value-border {
+ line-height: 1;
+ border: 0;
+}
.tab {
display: flex;
justify-content: space-around;