diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index e301f76..c093e6e 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
"type" : "uniCloud"
},
{
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
},
{
diff --git a/apis/index.js b/apis/index.js
index cc2a4dd..cee64b3 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
// 基础配置
const config = {
- apiUrl : 'https://douhuo.douhuofalv.com/api/',
- // apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境
+ // apiUrl : 'https://douhuo.douhuofalv.com/api/',
+ apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境
timeout : 60000
}
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
index 3f3695e..235d4a8 100644
--- a/apis/interfaces/index.js
+++ b/apis/interfaces/index.js
@@ -119,7 +119,75 @@ const delegationCancel = id => {
method : "DELETE"
})
}
+
+// **
+// 最新五大板块
+// **
+// 业务列表
+const bigfive = data => {
+ return request({
+ url : "bigfive/index",
+ data
+ })
+}
+
+// 业务详情
+const bigfiveInfo = (bigFive) => {
+ return request({
+ url : "bigfive/" + bigFive + "/info"
+ })
+}
+// 办理初始接口
+const bigfiveInit = (bigFive) => {
+ return request({
+ url : "bigfive/order/" + bigFive + "/init"
+ })
+}
+
+// 标的额比例计算
+const settleAmount = (data, bigFive) => {
+ return request({
+ url : "bigfive/order/" + bigFive + "/settle_amount",
+ method : "POST",
+ data
+ })
+}
+
+// 三级分类服务费类型
+const amountType = (bigFive) => {
+ return request({
+ url : "bigfive/order/" + bigFive + "/amount_type",
+ method : "POST"
+ })
+}
+
+// 办理业务
+const bigfiveStore = data => {
+ return request({
+ url : "bigfive/order/store",
+ method : "POST",
+ data
+ })
+}
+
+// 订单列表
+const orderLists = data => {
+ return request({
+ url : "bigfive/order/lists",
+ data
+ })
+}
+
+// 订单取消
+const orderCancel = (order) => {
+ return request({
+ url : "bigfive/order/" + order + "/cancel",
+ method : "DELETE"
+ })
+}
+
+
export {
categories,
jf,
@@ -135,6 +203,15 @@ export {
delegation,
delegationFrom,
delegationOrder,
- delegationCancel
+ delegationCancel,
+
+ bigfive,
+ bigfiveInfo,
+ bigfiveInit,
+ settleAmount,
+ amountType,
+ bigfiveStore,
+ orderLists,
+ orderCancel
}
diff --git a/manifest.json b/manifest.json
index 8c4c842..c71cf91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "抖火法律",
"appid" : "__UNI__C305C03",
"description" : "纵有疾风起,人生不言弃",
- "versionName" : "1.6.5",
- "versionCode" : 1065,
+ "versionName" : "1.5.3",
+ "versionCode" : 1053,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 622f76a..ee0b288 100644
--- a/pages.json
+++ b/pages.json
@@ -939,6 +939,69 @@
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#353ef4"
}
+ },
+ {
+ "path" : "pages/business/list",
+ "name" : "businessList",
+ "style" : {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/info",
+ "name" : "businessInfo",
+ "style" : {
+ "navigationBarTitleText" : "详情",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/bigFive",
+ "name" : "businessBigFive",
+ "style" : {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/handle",
+ "name" : "businessHandle",
+ "style" : {
+ "navigationBarTitleText" : "业务办理",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/other",
+ "name" : "businessOther",
+ "style" : {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/order",
+ "name" : "businessOrder",
+ "style" : {
+ "navigationBarTitleText" : "订单列表",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path" : "pages/business/orderInfo",
+ "name" : "businessOrderInfo",
+ "style" : {
+ "navigationBarTitleText" : "订单详情",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
}],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/business/bigFive.vue b/pages/business/bigFive.vue
new file mode 100644
index 0000000..beab292
--- /dev/null
+++ b/pages/business/bigFive.vue
@@ -0,0 +1,156 @@
+
+
+
+ 创建新的订单
+ 选择业务类型
+
+
+
+
+
+
+ {{item.title || '-'}}
+ {{item.subtitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/business/handle.vue b/pages/business/handle.vue
new file mode 100644
index 0000000..4e8d345
--- /dev/null
+++ b/pages/business/handle.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+ {{pickerArr[pickerIndex].title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/business/info.vue b/pages/business/info.vue
new file mode 100644
index 0000000..d882150
--- /dev/null
+++ b/pages/business/info.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+ {{bigFiveInfo.title}}
+
+ ★
+ {{bigFiveInfo.subtitle}}
+
+
+
+ {{bigFiveInfo.remark}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/business/list.vue b/pages/business/list.vue
new file mode 100644
index 0000000..129a20d
--- /dev/null
+++ b/pages/business/list.vue
@@ -0,0 +1,51 @@
+
+
+
+
+ 0{{index + 1}}
+ {{item.title}}
+ {{item.subtitle}}
+
+ 点击查看详情
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/business/order.vue b/pages/business/order.vue
new file mode 100644
index 0000000..93dc9eb
--- /dev/null
+++ b/pages/business/order.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.order_no}}
+
+ {{item.status.text}}
+
+
+
+
+ {{item.title}}
+
+
+
+ {{item.name}}
+
+
+
+ {{item.mobile}}
+
+
+
+ ¥{{item.amount}}
+
+
+
+ ¥{{item.price}}
+
+
+
+ {{item.created_at}}
+
+
+
+ {{item.paid_at}}
+
+
+
+ ¥{{item.price}}
+
+ 取消订单
+ 立即支付
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/business/orderInfo.vue b/pages/business/orderInfo.vue
new file mode 100644
index 0000000..7048fcd
--- /dev/null
+++ b/pages/business/orderInfo.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+
+
diff --git a/pages/business/other.vue b/pages/business/other.vue
new file mode 100644
index 0000000..6abec12
--- /dev/null
+++ b/pages/business/other.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ 协商调解咨询类
+ 信用卡、贷款业务
+
+ 去查看
+
+
+
+
+ 账户管理咨询类
+ 客户账户管理咨询类订单
+
+ 去查看
+
+
+
+
+ 委托管理类
+ 客户委托管理类订单
+
+ 去查看
+
+
+
+
+
+ 法律咨询类
+ 个人、企业法律
+
+ 去查看
+
+
+
+
+ 诉讼委托咨询类
+ 案件委托、拓展服务
+
+ 去查看
+
+
+
+
+ 增收赋能咨询类
+ 销售、领袖、演说等
+
+ 去查看
+
+
+
+
+ 线下订单
+ 线下咨询类订单
+
+ 去查看
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index-备份.vue b/pages/index/index-备份.vue
new file mode 100644
index 0000000..126ca06
--- /dev/null
+++ b/pages/index/index-备份.vue
@@ -0,0 +1,669 @@
+
+
+
+
+
+
+
+
+
+
+ 协商调解咨询类
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}}定金
+
+
+
+
+
+
+ 账户管理咨询类
+
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}} /{{item.limit}}
+
+
+
+
+
+
+
+ 委托管理类
+
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}} /{{item.limit}}
+
+
+
+
+
+
+
+ 法律咨询类
+
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}} /{{item.limit}}
+
+
+
+
+
+
+
+ 诉讼委托咨询类
+
+
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}}{{item.limit}}
+
+
+
+
+
+
+
+
+ 增收赋能咨询类
+
+
+
+
+ {{item.title}}
+ ¥{{item.price}}
+
+
+
+
+
+
+
+
+
+ 自动关闭{{ timeData.seconds }}S
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 126ca06..1a8502e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -36,139 +36,25 @@
-
-
-
-
- 协商调解咨询类
-
-
-
- {{item.title}}
-
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}}定金
-
-
-
-
-
-
- 账户管理咨询类
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}} /{{item.limit}}
-
-
-
-
-
-
-
- 委托管理类
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}} /{{item.limit}}
-
-
-
-
-
-
-
- 法律咨询类
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}} /{{item.limit}}
-
-
-
-
-
-
-
- 诉讼委托咨询类
-
-
-
-
-
-
- {{item.title}}
- ¥{{item.price}}{{item.limit}}
-
-
-
-
-
-
-
-
- 增收赋能咨询类
-
-
-
-
- {{item.title}}
- ¥{{item.price}}
-
-
-
+
+
+
+
+
+
+ {{item.title}}
+ {{item.subtitle}}
+
+
+
+
+ {{item.remark}}
+
+
+
+
+
+
@@ -200,24 +86,12 @@
diff --git a/pages/work/orderInfo.vue b/pages/work/orderInfo.vue
index 51ee7c2..36f7623 100644
--- a/pages/work/orderInfo.vue
+++ b/pages/work/orderInfo.vue
@@ -120,7 +120,7 @@
methods: {
// 订单详情
getInfo(){
- info(this.orderId).then(res => {
+ info(this.orderId).then(res => {
let { status, created_at, total, order_no, user, item_type, items, services, service_prices, tutor, teachers } = res
this.statusText = status
this.created_at = created_at
diff --git a/static/imgs/basic_down.png b/static/imgs/basic_down.png
new file mode 100644
index 0000000..c8dea2c
Binary files /dev/null and b/static/imgs/basic_down.png differ