diff --git a/apis/modules/user.js b/apis/modules/user.js
index 4c94db6..7af8fc2 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -37,8 +37,8 @@ export const changeAccount = account => {
return post(`users/applets/mine/changeAccount?account=${account}`)
}
-export const changePhoneNumber = phone => {
- return post(`users/applets/mine/changePhoneNumber?phone=${phone}`)
+export const changePhoneNumber = (phone, code) => {
+ return post(`users/applets/mine/changePhoneNumber?phone=${phone}&code=${code}`)
}
export const checkIfAnAccountExists = account => {
diff --git a/manifest.json b/manifest.json
index b17d47a..344437a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "crm-pro",
+ "name" : "或然crm",
"appid" : "__UNI__2E89BA6",
"description" : "",
"versionName" : "1.0.0",
@@ -48,7 +48,6 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- /* 小程序特有相关 */
"appid" : "wx77a8a2a23138998b",
"setting" : {
"urlCheck" : false,
diff --git a/pages/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
similarity index 100%
rename from pages/addCourse/addCourse.vue
rename to order/addCourse/addCourse.vue
diff --git a/pages/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
similarity index 100%
rename from pages/editCourse/editCourse.vue
rename to order/editCourse/editCourse.vue
diff --git a/pages/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
similarity index 99%
rename from pages/orderDetail/orderDetail.vue
rename to order/orderDetail/orderDetail.vue
index 69ce43b..b23f89e 100644
--- a/pages/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -382,14 +382,14 @@
update(data).then(res => {
this.$util.sucMsg('编辑成功')
setTimeout(() => {
- this.$util.to('../orders/orders')
+ uni.navigateBack()
}, 1500)
}).catch(res => {})
} else {
add(data).then(res => {
this.$util.sucMsg('添加成功')
setTimeout(() => {
- this.$util.to('../orders/orders')
+ uni.navigateBack()
}, 1500)
}).catch(res => {})
}
diff --git a/pages/ordered/ordered.vue b/order/ordered/ordered.vue
similarity index 100%
rename from pages/ordered/ordered.vue
rename to order/ordered/ordered.vue
diff --git a/pages/orders/orders.vue b/order/orders/orders.vue
similarity index 100%
rename from pages/orders/orders.vue
rename to order/orders/orders.vue
diff --git a/pages.json b/pages.json
index a1fe601..bc7eeda 100644
--- a/pages.json
+++ b/pages.json
@@ -23,14 +23,6 @@
"navigationBarTitleText": "邀请加入",
"enablePullDownRefresh": false
}
- },
- {
- "path" : "pages/orders/orders",
- "style" :
- {
- "navigationBarTitleText": "订单列表",
- "enablePullDownRefresh": true
- }
},
{
"path" : "pages/clients/clients",
@@ -47,14 +39,6 @@
"navigationBarTitleText": "产品",
"enablePullDownRefresh": true
}
- },
- {
- "path" : "pages/addCourse/addCourse",
- "style" :
- {
- "navigationBarTitleText": "选择产品",
- "enablePullDownRefresh": true
- }
},
{
"path" : "pages/clientDetail/clientDetail",
@@ -64,14 +48,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path" : "pages/orderDetail/orderDetail",
- "style" :
- {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "pages/addStaff/addStaff",
"style" :
@@ -128,22 +104,6 @@
"enablePullDownRefresh": true
}
},
- {
- "path" : "pages/ordered/ordered",
- "style" :
- {
- "navigationBarTitleText": "已订阅产品",
- "enablePullDownRefresh": false
- }
- },
- {
- "path" : "pages/editCourse/editCourse",
- "style" :
- {
- "navigationBarTitleText": "编辑产品",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "pages/account/account",
"style" :
@@ -169,6 +129,57 @@
}
}
],
+ "subPackages": [{
+ "root": "order",
+ "pages": [
+ {
+ "path": "orders/orders",
+ "style" :
+ {
+ "navigationBarTitleText": "订单列表",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path" : "addCourse/addCourse",
+ "style" :
+ {
+ "navigationBarTitleText": "选择产品",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path" : "orderDetail/orderDetail",
+ "style" :
+ {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "ordered/ordered",
+ "style" :
+ {
+ "navigationBarTitleText": "已订阅产品",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "editCourse/editCourse",
+ "style" :
+ {
+ "navigationBarTitleText": "编辑产品",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }],
+ "preloadRule": {
+ "order/orders/orders": {
+ "network": "all",
+ "packages": ["__APP__"]
+ }
+ },
"condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式（list 的索引项）
"list": [{
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 82c52b6..1459c21 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -75,11 +75,11 @@
编辑
-
+
已订阅产品
-
+
订单
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 61b29db..8f6f7dd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,7 +22,7 @@
方案
-
+
订单
diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue
index 96914e8..23f6390 100644
--- a/pages/phone/phone.vue
+++ b/pages/phone/phone.vue
@@ -72,7 +72,7 @@
const { phone, code } = this.form
if (!phone) return this.$util.errMsg('请输入手机号')
if (!code) return this.$util.errMsg('请输入验证码')
- changePhoneNumber(phone).then(res => {
+ changePhoneNumber(phone, code).then(res => {
this.$util.sucMsg('修改成功！')
setTimeout(() => {
uni.reLaunch({
diff --git a/static/image/person4.png b/static/image/person4.png
index 35bbd6e..84b1d54 100644
Binary files a/static/image/person4.png and b/static/image/person4.png differ