diff --git a/README.md b/README.md
index 2837dc6..39739a4 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# 职站商城
\ No newline at end of file
+# 幼教产品B2B生态平台小程序端
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a7b7a2b..7968197 100644
--- a/pages.json
+++ b/pages.json
@@ -83,14 +83,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path" : "password/password",
- "style" :
- {
- "navigationBarTitleText": "修改密码",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "teams/teams",
"style" :
@@ -108,14 +100,6 @@
}
},
{
- "path" : "account/account",
- "style" :
- {
- "navigationBarTitleText": "修改账号",
- "enablePullDownRefresh": false
- }
- }
- ,{
"path" : "phone/phone",
"style" :
{
@@ -123,14 +107,6 @@
"enablePullDownRefresh": false
}
}
- ,{
- "path" : "email/email",
- "style" :
- {
- "navigationBarTitleText": "修改邮箱",
- "enablePullDownRefresh": false
- }
- }
,{
"path" : "qrcode/qrcode",
"style" :
@@ -139,30 +115,20 @@
"enablePullDownRefresh": false
}
}
- ,{
- "path" : "article/article",
- "style" :
- {
- "navigationBarTitleText": "学习",
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#fff",
- "enablePullDownRefresh": false
- }
- }
- ,{
- "path" : "scheme/scheme",
- "style" :
+ ,{
+ "path" : "info/info",
+ "style" :
{
- "navigationBarTitleText": "方案详情",
+ "navigationBarTitleText": "信息维护",
"enablePullDownRefresh": false
}
- },
+ },
{
- "path" : "send/send",
- "style" :
+ "path" : "userName/userName",
+ "style" :
{
- "navigationBarTitleText": "下载发送",
- "enablePullDownRefresh": false
+ "navigationBarTitleText" : "用户名修改",
+ "enablePullDownRefresh" : false
}
}
]
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 9a659c3..4acd622 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -18,11 +18,41 @@
基础功能
- -
+
-
- {{ item.name }}
+ 我的电子券
+
+ -
+
+
+
+ 我的关注
+
+ -
+
+
+
+ 已报名活动
+
+ -
+
+
+
+ 我的发票
+
+ -
+
+
+
+ 我的订单
+
+ -
+
+
+
+ 发布采购
@@ -40,17 +70,65 @@
工作台
- -
+
-
+
+
+
+ 供应商认证
+
+ -
- {{ item.name }}
+ 商品管理
+
+ -
+
+
+
+ 团队管理
+
+ -
+
+
+
+ 订单管理
+
+ -
+
+
+
+ 活动管理
+
+ -
+
+
+
+ 信息维护
+
+ -
+
+
+
+ 对账管理
+
+ -
+
+
+
+ 商机线索
+
+ -
+
+
+
+ 发票管理
-
+
设置
@@ -87,32 +165,6 @@
userName: uni.getStorageSync('userName'),
hasOwnTeam: 0, // 有自己的团队
disabled: true,
- provinces: [],
- cities: [],
- provinceIcon: {
- color: '#007eff',
- size: '22',
- type: 'location'
- },
- cityIcon: {
- color: '#007eff',
- size: '22',
- type: 'map-pin-ellipse'
- },
- provinceId: '',
- cityId: '',
- provinceName: '',
- cityName: '',
- funcs: [
- {
- id: 1,
- name: '我的电子券'
- },
- {
- id: 2,
- name: '已报名活动'
- },
- ]
}
},
onShow() {
@@ -242,12 +294,12 @@
createTeam() {
this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}&my=1`)
},
- // 进入设置
- toSet() {
- this.$util.to(`/team/setting/setting`)
+ toPage(href) {
+ this.$util.to(href)
},
- toFunc(item) {
-
+ // 提示暂未开放
+ tips() {
+ this.$util.errMsg('功能暂未开放!')
}
}
}
@@ -260,7 +312,7 @@
}
.wrap {
position: relative;
- padding: 0 24rpx;
+ padding: 0 24rpx 24rpx;
margin-top: -150rpx;
}
.block {
diff --git a/styles/common.scss b/styles/common.scss
index 5b18094..fe369f5 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -78,7 +78,6 @@ ul {
}
}
.form-list {
- border-top: 1px solid #E6E8ED;
.line {
display: flex;
justify-content: space-between;
@@ -93,15 +92,35 @@ ul {
font-size: 28rpx;
color: #999;
}
- .name, .val, input {
+ .with-arrow {
+ .val {
+ display: inline-flex;
+ align-items: center;
+ }
+ .arrow {
+ margin-left: 15rpx;
+ }
+ }
+ .name {
+ white-space: nowrap;
+ font-size: 28rpx;
+ color: #4a4a4a;
+ }
+ .val, input, textarea {
font-size: 28rpx;
color: #333;
}
- input {
+ input, textarea {
flex: 1;
margin-left: 20rpx;
text-align: right;
}
+ .textarea-line {
+ align-items: flex-start;
+ }
+ textarea {
+ height: 150rpx;
+ }
.req {
.name:after {
content: '*';
diff --git a/team/email/email.vue b/team/email/email.vue
deleted file mode 100644
index 64f7850..0000000
--- a/team/email/email.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
- {{ btnText }}
-
-
-
-
-
-
-
-
diff --git a/team/info/info.vue b/team/info/info.vue
index 1674629..21639ac 100644
--- a/team/info/info.vue
+++ b/team/info/info.vue
@@ -1,285 +1,116 @@
-
-
-
-
-
-
-
-
- {{ item.classificationName }}
-
-
-
-
-
-
- {{ item.title }}
-
-
- {{ item.mainBody }}
-
- {{ item.releaseTime }}
-
- {{ label }}
-
-
-
-
+
+
+
+ LOGO
+
+
+
+
+ 幼儿园名称
+
+
+
+
+
+
+ 标签
+
+
+
+
+
+
+ 幼儿园slogan
+
+
+
+ 地址
+
+
+
+ 幼儿园简介
+
+
-
-
-
+
-
-
- 所属分类
-
- {{ item.classificationName }}
-
+
+ 联系我们
+ 地址:测试测试
+ 联系电话:测试测试
+
diff --git a/team/password/password.vue b/team/password/password.vue
deleted file mode 100644
index 94d0c0b..0000000
--- a/team/password/password.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/team/plans/plans.vue b/team/plans/plans.vue
deleted file mode 100644
index aa9c727..0000000
--- a/team/plans/plans.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-
-
-
-
-
-
-
-
- - {{ tab.classificationName }}
-
-
-
-
-
- {{ item.title }}
-
-
-
- 产品:
-
- {{ item.productNames }}
-
- {{ item.toggle ? '收起' : '展开' }}
-
-
-
- 更新日期:
- {{ item.updateTime }}
-
-
- 适用专业:
- {{ item.applicableMajor }}
-
-
-
-
-
-
-
-
-
-
- 所属分类
-
- {{ item.classificationName }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/team/scheme/scheme.vue b/team/scheme/scheme.vue
deleted file mode 100644
index 1360698..0000000
--- a/team/scheme/scheme.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
- {{ form.title }}
-
- {{ form.applicableMajor }}
- {{ form.schemeIntroduction }}
-
-
- {{ form.fileName }}
- 下载
-
-
-
-
-
-
-
diff --git a/team/send/send.vue b/team/send/send.vue
deleted file mode 100644
index 1215954..0000000
--- a/team/send/send.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
- 我的邮箱
-
- 绑定
-
-
-
- 其他邮箱
-
-
-
-
-
-
-
-
-
-
-
diff --git a/team/setting/setting.vue b/team/setting/setting.vue
index d4ca793..f4fae57 100644
--- a/team/setting/setting.vue
+++ b/team/setting/setting.vue
@@ -2,9 +2,7 @@
-
-
-
+
退出登录
diff --git a/team/study/study.vue b/team/study/study.vue
deleted file mode 100644
index 2228e1a..0000000
--- a/team/study/study.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-
-
-
- 销售必备技能
-
-
-
-
-
- {{ item.classificationName }}
-
-
-
-
-
-
-
-
- {{ item.title }}
-
- {{ label }}
-
-
-
-
- {{ item.learnerNumber }}人学过
-
-
-
- {{ item.collectionNumber }}
-
-
- 上次阅读
-
-
-
-
-
-
-
-
-
- 所属分类
-
- {{ item.classificationName }}
-
-
-
-
-
-
-
-
diff --git a/team/account/account.vue b/team/userName/userName.vue
similarity index 60%
rename from team/account/account.vue
rename to team/userName/userName.vue
index 991902e..809d1ea 100644
--- a/team/account/account.vue
+++ b/team/userName/userName.vue
@@ -1,7 +1,7 @@
-
+
@@ -12,7 +12,6 @@
export default {
data() {
return {
- timer: null,
account: '',
repeat: false
}
@@ -21,21 +20,9 @@
},
methods: {
- // 账号判重
- accountChange() {
- clearTimeout(this.timer)
- this.timer = setTimeout(() => {
- checkIfAnAccountExists(this.account).then(() => {
- this.repeat = false
- }).catch(e => {
- this.repeat = true
- })
- }, 500)
- },
submit() {
const { account } = this
- if(!account) return this.$util.errMsg('请输入账号')
- if (this.repeat) return this.$util.errMsg('账号已存在!')
+ if(!account) return this.$util.errMsg('请输入用户名')
changeAccount(account).then(res => {
this.$util.sucMsg('修改成功!')
setTimeout(() => {