diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..9b0d791 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
- // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
- "version": "0.0",
- "configurations": [{
- "app-plus" :
- {
- "launchtype" : "local"
- },
- "default" :
- {
- "launchtype" : "local"
- },
- "type" : "uniCloud"
- }
+{
+ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+ "version" : "0.0",
+ "configurations" : [
+ {
+ "app-plus" : {
+ "launchtype" : "local"
+ },
+ "default" : {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ },
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-android"
+ }
]
}
diff --git a/apis/index.js b/apis/index.js
index 1912f23..a358fdc 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -8,9 +8,9 @@ import store from '@/store'
import { router } from '@/router/index.js'
// 基础配置
-const config = {
- apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', // 测试环境
- // apiUrl : 'https://douhuo.douhuofalv.com/api/', // 正式环境
+const config = {
+ apiUrl : 'https://douhuo.douhuofalv.com/api/',
+ // apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境
timeout : 60000
}
diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js
index ad9d4a3..5b5f60d 100644
--- a/apis/interfaces/auth.js
+++ b/apis/interfaces/auth.js
@@ -1,11 +1,11 @@
-
+
/**
* 手太欠
* 愿这世界都如故事里一样 美好而动人~
- */
-
-import { request } from '../index'
+ */
+import { request } from '../index'
+
// 用户注册
const Register = (data) =>{
return request({
@@ -14,65 +14,74 @@ const Register = (data) =>{
data: data
})
}
-
-// 获取短信前图形验证码
+
+// 获取短信前图形验证码
const Captcha = (data) =>{
return request({
url: "user/auth/captcha",
method: 'POST',
data: data
})
-}
-
-// 需校验图形验证码
+}
+
+// 需校验图形验证码
const smsAuth = (data) =>{
return request({
url: "user/auth/verify_captcha",
method: 'POST',
data: data
})
-}
-
-// 用户账号密码登录
+}
+
+// 用户账号密码登录
const Login = (data) =>{
return request({
url: "user/auth/login",
method: 'POST',
data: data
})
-}
-
-// 重置密码
+}
+
+// 重置密码
const resetPassword = (data) =>{
return request({
url: "user/auth/reset_password",
method: 'POST',
data: data
})
-}
-
-// 修改密码
+}
+
+// 修改密码
const modifyPassword = (data) =>{
return request({
url: "user/setting/reset_password",
method: 'POST',
data: data
})
-}
-
-// 隐私+协议
+}
+
+// 隐私+协议
const registeragree = (website) =>{
return request({
url: "cms/pages/" + website
})
+}
+
+// 验证码登录
+const authSms = (data) =>{
+ return request({
+ url: "user/auth/sms",
+ method: 'POST',
+ data: data
+ })
}
-
-export {
- Register,
- Captcha,
- smsAuth,
- Login,
- resetPassword,
+export {
+ Register,
+ Captcha,
+ smsAuth,
+ Login,
+ resetPassword,
modifyPassword,
- registeragree
+ registeragree,
+ authSms
}
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
index 717b5d1..63508e5 100644
--- a/apis/interfaces/index.js
+++ b/apis/interfaces/index.js
@@ -1,238 +1,311 @@
-
+
/**
* 手太欠
* 愿这世界都如故事里一样 美好而动人~
- */
-
-import { request } from '../index'
+ */
+import { request } from '../index'
+
// 首页数据
const home = () =>{
return request({
url: "business/home"
})
-}
-
-
+}
+
+
// 文章分类
const articleSort = () =>{
return request({
url: "cms/categories"
})
-}
-
+}
+
// 文章列表
const articleList = (data) =>{
return request({
- url: "cms/articles",
+ url: "cms/articles",
data: data
})
-}
-
+}
+
// 文章详情
const articleBrief = (article_id) =>{
return request({
- url: "cms/articles/" + article_id
+ url: "cms/articles/" + article_id
})
-}
-
+}
+
// 文章收藏
const collect = (article_id) =>{
return request({
- url: "cms/articles/favorite/" + article_id
+ url: "cms/articles/favorite/" + article_id
})
-}
-
+}
+
// 我的文章收藏
const myCollect = (data) =>{
return request({
- url: "user/favorites",
- data: data
+ url: "user/favorites",
+ data: data
})
-}
-
+}
+
// 精选律师列表
const lawyers = (data) =>{
return request({
- url: "lawyers",
- data: data
+ url: "lawyers",
+ data: data
})
-}
-
+}
+
// 精选律师详情
const lawyersdet = (lawyer_id) =>{
return request({
- url: "lawyers/" + lawyer_id
+ url: "lawyers/" + lawyer_id
})
-}
-
-//律师业务
+}
+
+//律师业务
const lawyersBusiness = () =>{
return request({
- url: "lawyers/businesses"
+ url: "lawyers/businesses"
})
-}
-
-
-//律师业务详情
+}
+
+
+//律师业务详情
const businessDet = (lawyer_business_id) =>{
return request({
- url: "lawyers/businesses/" + lawyer_business_id
+ url: "lawyers/businesses/" + lawyer_business_id
})
-}
-
-//律师订单金额
+}
+
+//律师订单金额
const lawyerOrder = (lawyer_id) =>{
return request({
- url: "lawyers/" + lawyer_id + "/order"
-
+ url: "lawyers/" + lawyer_id + "/order"
+
})
-}
-
-//律师业务-创建订单
+}
+
+//律师业务-创建订单
const businessOrder = (lawyer_business_id) =>{
return request({
- url: "lawyers/businesses/" + lawyer_business_id + "/order"
-
+ url: "lawyers/businesses/" + lawyer_business_id + "/order"
+
})
-}
+}
// 获取主业务
const workIndex = () =>{
return request({
url: "business/index"
})
-}
-
-// 获取主业务机构
+}
+
+// 获取主业务机构
const workOne = (business_id) =>{
return request({
url: "business/" + business_id + "/institution"
})
-}
-
+}
+
// 获取二级业务类型
const workLevel = (business_id) =>{
return request({
url: "business/institution/" + business_id + "/type"
})
-}
-
+}
+
// 提交基础信息
const workStore = (data) =>{
return request({
- url: "business/store",
- method: 'POST',
+ url: "business/store",
+ method: 'POST',
data: data
})
-}
-
+}
+
// 9.9预约
const Apply = (business_order_id) =>{
return request({
- url: "business/apply/" + business_order_id + "/info"
+ url: "business/apply/" + business_order_id + "/info"
})
-}
-
-// 9.9预约--微信支付
+}
+
+// 9.9预约--微信支付
const Wechat = (apply_order_no, data) =>{
return request({
- url: "pay/apply/" + apply_order_no + "/wechat",
- data: data
- })
-}
-
-// 咨询服务费--微信支付
+ url: "pay/apply/" + apply_order_no + "/wechat",
+ data: data
+ })
+}
+
+// 咨询服务费--微信支付
const applyPay = (business_order_id, data) =>{
return request({
- url: "pay/order/" + business_order_id + "/wechat",
- data: data
- })
-}
-
-// 补差价--微信支付
+ url: "pay/order/" + business_order_id + "/wechat",
+ data: data
+ })
+}
+
+// 补差价--微信支付
const diffPay = (business_order_diff_price_id, data) =>{
return request({
- url: "pay/diff/" + business_order_diff_price_id + "/wechat",
- data: data
- })
-}
-
-
-// 获取公众号openid
-const Openid = (data) =>{
+ url: "pay/diff/" + business_order_diff_price_id + "/wechat",
+ data: data
+ })
+}
+
+
+// 获取公众号openid
+const Openid = (data) =>{
return request({
- url: "user/auth/official/openid",
- data: data
+ url: "user/auth/official/openid",
+ data: data
})
+}
+
+// 获取授权页面
+const authFollow = (data) => {
+ return request({
+ url : 'user/auth/official/url',
+ data: data
+ })
}
-
-// 获取授权页面
-const authFollow = (data) => {
- return request({
- url : 'user/auth/official/url',
- data: data
- })
-}
-
+
// 获取方案
const Schemes = (business_order_id) =>{
return request({
- url: "business/" + business_order_id + "/schemes"
+ url: "business/" + business_order_id + "/schemes"
+ })
+}
+
+// h5入库用户数据
+const wechatCode = (data) => {
+ return request({
+ url : 'user/auth/login/wechat/add',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 校验分享用户
+const Verify = (data) => {
+ return request({
+ url : 'user/relations/verify',
+ data: data
+ })
+}
+
+// 绑定分享用户
+const Bind = (data) => {
+ return request({
+ url : 'user/relations/bind',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 账户管理类
+const accountManagement = () => {
+ return request({
+ url: "account_management/index"
})
}
-// h5入库用户数据
-const wechatCode = (data) => {
- return request({
- url : 'user/auth/login/wechat/add',
- method: 'POST',
- data: data
- })
+// 账户管理类 - 办理
+const accountFrom = (data, id) => {
+ return request({
+ url : "account_management/" + id + "/store",
+ method : "POST",
+ data
+ })
}
-// 校验分享用户
-const Verify = (data) => {
- return request({
- url : 'user/relations/verify',
- data: data
- })
+// 账户管理类 - 订单
+const accountOrder = data => {
+ return request({
+ url : "account_management/order/lists",
+ data
+ })
}
-// 绑定分享用户
-const Bind = (data) => {
- return request({
- url : 'user/relations/bind',
- method: 'POST',
- data: data
- })
+// 账户管理类 - 取消订单
+const accountCancel = id => {
+ return request({
+ url : "account_management/order/" + id + "/cancel",
+ method : "DELETE"
+ })
}
-export {
- home,
- articleSort,
- articleList,
- articleBrief,
- collect,
- myCollect,
- lawyers,
- lawyersdet,
- lawyersBusiness,
- businessDet,
- lawyerOrder,
- businessOrder,
- workIndex,
- workOne,
- workLevel,
- workStore,
- Apply,
- Wechat,
- applyPay,
- diffPay,
- Openid,
- authFollow,
- Schemes,
- wechatCode,
- Verify,
- Bind
+// 委托管理类
+const delegation = () => {
+ return request({
+ url: "delegation/index"
+ })
+}
+
+// 委托管理类 - 办理
+const delegationFrom = (data, id) => {
+ return request({
+ url : "delegation/" + id + "/store",
+ method : "POST",
+ data
+ })
+}
+
+// 委托管理类 - 订单
+const delegationOrder = data => {
+ return request({
+ url : "delegation/order/lists",
+ method : "POST",
+ data
+ })
+}
+
+// 委托管理类 - 取消订单
+const delegationCancel = id => {
+ return request({
+ url : "delegation/order/" + id + "/cancel",
+ method : "DELETE"
+ })
+}
+
+export {
+ home,
+ articleSort,
+ articleList,
+ articleBrief,
+ collect,
+ myCollect,
+ lawyers,
+ lawyersdet,
+ lawyersBusiness,
+ businessDet,
+ lawyerOrder,
+ businessOrder,
+ workIndex,
+ workOne,
+ workLevel,
+ workStore,
+ Apply,
+ Wechat,
+ applyPay,
+ diffPay,
+ Openid,
+ authFollow,
+ Schemes,
+ wechatCode,
+ Verify,
+ Bind,
+ accountManagement,
+ accountFrom,
+ accountOrder,
+ accountCancel,
+ delegation,
+ delegationFrom,
+ delegationOrder,
+ delegationCancel
}
diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index 6afd66b..1287112 100644
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -164,9 +164,6 @@ const payInfo = data => {
}
const payWechat = data => {
-
- console.log('111')
-
return request({
url : "pay/cashier_desk/wechat",
method : 'POST',
diff --git a/pages.json b/pages.json
index 1550d99..08d2be4 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,15 @@
"aliasPath": "/login/login",
"name": "Login",
"style": {
- "navigationBarTitleText": "抖火法律-登录",
+ "navigationBarTitleText": "抖火法律-验证码登录",
+ "navigationStyle": "custom"
+ }
+ }, {
+ "path": "pages/login/passwordLogin",
+ "aliasPath": "/login/passwordLogin",
+ "name": "PasswordLogin",
+ "style": {
+ "navigationBarTitleText": "抖火法律-密码登录",
"navigationStyle": "custom"
}
}, {
@@ -657,6 +665,38 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },{
+ "path" : "pages/management/account",
+ "name" : "MagAccount",
+ "style" : {
+ "navigationBarTitleText" : "账户咨询办理",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/management/delegation",
+ "name" : "MagDelegation",
+ "style" : {
+ "navigationBarTitleText" : "委托管理办理",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/work/account",
+ "name" : "AccountWork",
+ "style" : {
+ "navigationBarTitleText" : "账户管理咨询类",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },{
+ "path" : "pages/work/delegation",
+ "name" : "DelegationWork",
+ "style" : {
+ "navigationBarTitleText" : "委托管理类",
+ "enablePullDownRefresh" : false,
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
}
],
"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 08dc776..7c83552 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,7 @@
-
+
协商调解类
@@ -76,13 +76,53 @@
+
+
+
+
+ 账户管理咨询类
+
+
+
+
+
+
+ {{item.title}}
+
+
+ ¥{{item.price}}
+
+
+
+
+
+
+
+
+ 委托管理类
+
+
+
+
+
+
+ {{item.title}}
+
+
+ ¥{{item.price}}
+
+
+
+
+
+
- 法律咨询类
+ 企业法律顾问
-
+
@@ -158,7 +198,7 @@
- 诉讼委托类
+ 案件诉讼委托
@@ -187,7 +227,7 @@
-
+
增收赋能类
@@ -349,7 +389,7 @@
-
diff --git a/pages/login/passwordLogin.vue b/pages/login/passwordLogin.vue
new file mode 100644
index 0000000..e4a5976
--- /dev/null
+++ b/pages/login/passwordLogin.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+ 用户登录
+
+
+ 密码登录仅适用于已注册用户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 忘记密码?
+
+ 我要注册
+ 验证码登录
+
+
+
+
+
+
+
+
+
+
+ 我已阅读并同意抖火法律《隐私协议》和《服务协议》
+
+
+
+
+
+
+
+
+
diff --git a/pages/management/account.vue b/pages/management/account.vue
new file mode 100644
index 0000000..a670e23
--- /dev/null
+++ b/pages/management/account.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ {{pickerArr[pickerIndex].title}}
+
+
+
+
+
+
+ ¥{{pickerArr[pickerIndex].price}}
+
+
+
+ {{pickerArr[pickerIndex].subtitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/management/delegation.vue b/pages/management/delegation.vue
new file mode 100644
index 0000000..0386648
--- /dev/null
+++ b/pages/management/delegation.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+ {{pickerArr[pickerIndex].title}}
+
+
+
+
+
+
+ ¥{{pickerArr[pickerIndex].price}}
+
+
+
+ {{pickerArr[pickerIndex].subtitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index cced9ba..e1440cf 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -217,8 +217,9 @@
}
// 获取微信授权信息-获取oppid
authFollow({
- // url: 'https://web.douhuofalv.com/webWechat/index'
- url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
+ url: 'https://web.douhuofalv.com/webWechat/index'
+ // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index',
+ // url: 'http://web.douhuo.demos.uzchain.tech/webWechat/index' 最新
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/sheet/authSuccess.vue b/pages/sheet/authSuccess.vue
index cd26e91..e2ddedd 100644
--- a/pages/sheet/authSuccess.vue
+++ b/pages/sheet/authSuccess.vue
@@ -78,8 +78,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode',
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode',
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/sheet/feerCreate.vue b/pages/sheet/feerCreate.vue
index 5274689..653cb3b 100644
--- a/pages/sheet/feerCreate.vue
+++ b/pages/sheet/feerCreate.vue
@@ -1,188 +1,188 @@
-
-
-
-
- 选择咨询类型
-
-
-
-
-
- {{item.title || '-'}}
- 免费咨询一次
-
-
-
-
-
-
-
-
+
+
+
+
+ 选择咨询类型
+
+
+
+
+
+ {{item.title || '-'}}
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
diff --git a/pages/sheet/idcard.vue b/pages/sheet/idcard.vue
index 14b3631..3cd62ac 100644
--- a/pages/sheet/idcard.vue
+++ b/pages/sheet/idcard.vue
@@ -94,8 +94,8 @@
realName({
front_card: this.frontCard.path,
back_card : this.backCard.path,
- // redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
- redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
+ redirect_url: "https://web.douhuofalv.com/sheet/authSuccess",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/sheet/authSuccess"
}).then(res => {
this.realData = res.certification
this.authShortUrl = res.sign.authShortUrl
diff --git a/pages/sheet/index.vue b/pages/sheet/index.vue
index dd1797d..24316f7 100644
--- a/pages/sheet/index.vue
+++ b/pages/sheet/index.vue
@@ -558,8 +558,8 @@
// 去签约
contractClick(id) {
contractGo(id, {
- // redirect_url: "https://web.douhuofalv.com/user/index",
- redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
+ redirect_url: "https://web.douhuofalv.com/user/index",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
app_scheme : ''
}).then(res => {
// let faceUrl = encodeURIComponent(res.sign_url)
diff --git a/pages/sheet/loan.vue b/pages/sheet/loan.vue
index f75a6df..6dd120d 100644
--- a/pages/sheet/loan.vue
+++ b/pages/sheet/loan.vue
@@ -81,8 +81,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode',
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode',
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/sheet/payment.vue b/pages/sheet/payment.vue
index c8439d0..f111acf 100644
--- a/pages/sheet/payment.vue
+++ b/pages/sheet/payment.vue
@@ -289,8 +289,9 @@
// 获取微信授权信息-获取oppid
authFollow({
- url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
- // url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+ // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+ // url: 'http://web.douhuo.demos.uzchain.tech/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price 最新
+ url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/sheet/speed.vue b/pages/sheet/speed.vue
index 921d024..ddd826e 100644
--- a/pages/sheet/speed.vue
+++ b/pages/sheet/speed.vue
@@ -436,8 +436,8 @@
// 去签约
contractClick() {
contractGo(this.$Route.query.id, {
- // redirect_url: "https://web.douhuofalv.com/user/index",
- redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
+ redirect_url: "https://web.douhuofalv.com/user/index",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
app_scheme : ''
}).then(res => {
// let faceUrl = encodeURIComponent(res.sign_url)
diff --git a/pages/synthesis/entrustBrief.vue b/pages/synthesis/entrustBrief.vue
index 027f472..0c7fc98 100644
--- a/pages/synthesis/entrustBrief.vue
+++ b/pages/synthesis/entrustBrief.vue
@@ -231,8 +231,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode'
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode'
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/synthesis/entrustOrder.vue b/pages/synthesis/entrustOrder.vue
index 1695d9d..fcdff82 100644
--- a/pages/synthesis/entrustOrder.vue
+++ b/pages/synthesis/entrustOrder.vue
@@ -240,8 +240,8 @@
esignUrl({
order_id : id,
order_type: type,
- // redirect_url: "https://web.douhuofalv.com/user/index",
- redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
+ redirect_url: "https://web.douhuofalv.com/user/index",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {
diff --git a/pages/synthesis/expandBrief.vue b/pages/synthesis/expandBrief.vue
index 9a5cd94..39f58e5 100644
--- a/pages/synthesis/expandBrief.vue
+++ b/pages/synthesis/expandBrief.vue
@@ -210,8 +210,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode'
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode'
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/synthesis/expandOrder.vue b/pages/synthesis/expandOrder.vue
index dbcf0ff..53e39a0 100644
--- a/pages/synthesis/expandOrder.vue
+++ b/pages/synthesis/expandOrder.vue
@@ -219,8 +219,8 @@
esignUrl({
order_id : id,
order_type: type,
- // redirect_url: "https://web.douhuofalv.com/user/index",
- redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
+ redirect_url: "https://web.douhuofalv.com/user/index",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {
diff --git a/pages/synthesis/feePay.vue b/pages/synthesis/feePay.vue
index 37c55b1..fe41c3f 100644
--- a/pages/synthesis/feePay.vue
+++ b/pages/synthesis/feePay.vue
@@ -116,7 +116,7 @@
const jweixin = require('jweixin-module');
import { Apply, Wechat, authFollow } from '@/apis/interfaces/index'
import { ums, umsState } from '@/apis/interfaces/pay'
- import { servicePay, serviceUms, serviceDg, expandPay, expandUms, expandDg, entrustPay, entrustUms, entrustDg, synDiffPay, synDiffUms, synDiffDg } from '@/apis/interfaces/pay'
+ import { servicePay, serviceUms, serviceDg, expandPay, expandUms, expandDg, entrustPay, entrustUms, entrustDg, synDiffPay, synDiffUms, synDiffDg, payWechat, payUms, payDg } from '@/apis/interfaces/pay'
export default {
data() {
return {
@@ -133,7 +133,7 @@
payForm : '', // 支付类型
}
},
- onShow() {
+ onShow() {
this.token = this.$store.getters.getToken
this.payPrice = this.$Route.query.price
this.payForm = this.$Route.query.payForm
@@ -174,6 +174,8 @@
apiUrl = expandDg
} else if (this.payForm == 'entrust') {
apiUrl = entrustDg
+ } else if (this.payForm == 'synthesize') {
+ apiUrl = payDg
}
NewUrl = apiUrl
}
@@ -213,6 +215,8 @@
apiUrl = serviceUms
} else if (this.payForm == 'expand') {
apiUrl = expandUms
+ } else if (this.payForm == 'synthesize') {
+ apiUrl = payUms
} else {
apiUrl = entrustUms
}
@@ -265,6 +269,8 @@
apiUrl = servicePay
} else if (this.payForm == 'expand') {
apiUrl = expandPay
+ } else if (this.payForm == 'synthesize') {
+ apiUrl = payWechat
} else {
apiUrl = entrustPay
}
@@ -307,6 +313,9 @@
} else if (this.payForm == 'expand') {
// 跳到拓展单
this.$Router.replace({name: 'ExpandOrder'})
+ } else if (this.payForm == 'synthesize') {
+ // 个人中心
+ this.$Router.replace({name: 'User'})
} else {
// 跳到委托单
this.$Router.replace({name: 'EntrustOrder'})
@@ -329,6 +338,11 @@
setTimeout(()=>{
this.$Router.replace({name: 'ExpandOrder'})
},1000)
+ } else if (this.payForm == 'synthesize') {
+ // 个人中心
+ setTimeout(()=>{
+ this.$Router.replace({name: 'User'})
+ },1000)
} else {
// 跳到委托单
setTimeout(()=>{
@@ -349,8 +363,9 @@
// 获取微信授权信息-获取oppid
authFollow({
- // url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
- url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+ url: 'https://web.douhuofalv.com/webWechat/index?id=' + this.$Route.query.id + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+ // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price
+ // url: 'http://web.douhuo.demos.uzchain.tech/webWechat/index?id=' + this.orderId + '&style=' + this.$Route.query.style + '&price=' + this.$Route.query.price 最新
}).then(res => {
window.location.href = res
}).catch(err => {
@@ -370,6 +385,9 @@
} else if (this.payForm == 'expand') {
// 跳到拓展单
this.$Router.replace({name: 'ExpandOrder'})
+ } else if (this.payForm == 'synthesize') {
+ // 个人中心
+ this.$Router.replace({name: 'User'})
} else {
// 跳到委托单
this.$Router.replace({name: 'EntrustOrder'})
diff --git a/pages/synthesis/feeWrite.vue b/pages/synthesis/feeWrite.vue
index 58ca4f5..06aa133 100644
--- a/pages/synthesis/feeWrite.vue
+++ b/pages/synthesis/feeWrite.vue
@@ -1,416 +1,425 @@
-
-
-
-
- 个人法律咨询
- 请仔细填写以下信息
-
-
-
-
-
-
-
-
-
-
- *{{item.title}}
-
-
-
-
-
-
-
- {item.value = $event}">
-
-
- {item.value = $event}">
-
-
-
-
-
-
-
-
-
- {{item.options[item.value]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 500字以内
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/synthesis/personBrief.vue b/pages/synthesis/personBrief.vue
index f489455..25445af 100644
--- a/pages/synthesis/personBrief.vue
+++ b/pages/synthesis/personBrief.vue
@@ -243,8 +243,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode'
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode'
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/synthesis/seekOrder.vue b/pages/synthesis/seekOrder.vue
index 9a4e32b..006c117 100644
--- a/pages/synthesis/seekOrder.vue
+++ b/pages/synthesis/seekOrder.vue
@@ -1,226 +1,230 @@
-
-
-
-
-
- 订单号:{{item.order_no}}
-
-
-
-
- 订单类型
-
-
- {{item.synthesis.title}}
-
-
-
-
- 业务联系人
-
-
- {{item.user.parent.nickname}}
-
-
-
-
- 所属律师
-
-
- {{item.lawyer.name}}
-
-
-
-
-
-
- {{item.created_at}}
-
-
-
- 查看详情
-
-
-
-
-
-
-
-
- 暂无订单
-
+
+
+
+
+
+ 订单号:{{item.order_no}}
+
+
+
+
+ 订单类型
+
+
+ {{item.synthesis.title}}
+
+
+
+
+ 业务联系人
+
+
+ {{item.user.parent.nickname}}
+
+
+
+
+ 所属律师
+
+
+ {{item.lawyer.name}}
+
+
+
+
+
+
+ {{item.created_at}}
+
+
+
+ 去支付
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+ 暂无订单
+
-
-
\ No newline at end of file
diff --git a/pages/synthesis/standBrief.vue b/pages/synthesis/standBrief.vue
index cee9376..34009a6 100644
--- a/pages/synthesis/standBrief.vue
+++ b/pages/synthesis/standBrief.vue
@@ -268,8 +268,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode'
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode'
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/synthesis/yearOrder.vue b/pages/synthesis/yearOrder.vue
index dcd31e2..8d607f8 100644
--- a/pages/synthesis/yearOrder.vue
+++ b/pages/synthesis/yearOrder.vue
@@ -218,8 +218,8 @@
esignUrl({
order_id : id,
order_type: type,
- // redirect_url: "https://web.douhuofalv.com/user/index",
- redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
+ redirect_url: "https://web.douhuofalv.com/user/index",
+ // redirect_url: "https://web.douhuotest.douhuofalv.com/user/index",
channel : 'h5',
app_scheme : ''
}).then(res => {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f0acc85..d50ce20 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -30,7 +30,7 @@
-
+
+
+
+
+ 账户管理资讯类
+
+
+
+
+
+ 客户账户管理资讯类订单
+
+
+
+
+
+ 委托管理类
+
+
+
+
+
+ 客户委托管理类订单
+
+
@@ -56,7 +81,8 @@
{{synthesisAll.legal_consulting ? synthesisAll.legal_consulting : '0'}}单
- 个人、企业法律
+
+ 企业法律
@@ -72,7 +98,7 @@
-
+
增收赋能类
@@ -88,7 +114,7 @@
-
+
数据看板
diff --git a/pages/user/setup.vue b/pages/user/setup.vue
index b068a8e..4c10c62 100644
--- a/pages/user/setup.vue
+++ b/pages/user/setup.vue
@@ -273,8 +273,8 @@
judgeGeneral(){
// 获取微信授权信息
authFollow({
- // url: 'https://web.douhuofalv.com/webview/webCode'
- url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
+ url: 'https://web.douhuofalv.com/webview/webCode'
+ // url: 'https://web.douhuotest.douhuofalv.com/webview/webCode'
}).then(res => {
window.location.href = res
}).catch(err => {
diff --git a/pages/work/account.vue b/pages/work/account.vue
new file mode 100644
index 0000000..e40df1a
--- /dev/null
+++ b/pages/work/account.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.order_no}}
+
+ {{item.status.text}}
+
+
+
+
+ {{item.item.title}}
+
+
+
+ {{item.name}}
+
+
+
+ {{item.mobile}}
+
+
+
+ {{item.created_at}}
+
+
+
+ {{item.paid_at}}
+
+
+
+ ¥{{item.item.price}}
+
+ 取消订单
+ 立即支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/delegation.vue b/pages/work/delegation.vue
new file mode 100644
index 0000000..34c66f2
--- /dev/null
+++ b/pages/work/delegation.vue
@@ -0,0 +1,313 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.order_no}}
+
+ {{item.status.text}}
+
+
+
+
+ {{item.item.title}}
+
+
+
+ {{item.name}}
+
+
+
+ {{item.mobile}}
+
+
+
+ {{item.created_at}}
+
+
+
+ {{item.paid_at}}
+
+
+
+ ¥{{item.item.price}}
+
+ 取消订单
+ 立即支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/router/index.js b/router/index.js
index 83a5322..5c15135 100644
--- a/router/index.js
+++ b/router/index.js
@@ -30,20 +30,21 @@ router.beforeEach((to, from, next) => {
return
}
// 检查用户是否授权了微信
- // if(to.name != 'webWechatIndex' && openId === ''){
- // authFollow({
- // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
- // // url: 'https://web.douhuofalv.com/webWechat/index'
- // }).then(res => {
- // window.location.href = res
- // }).catch(err => {
- // uni.showToast({
- // title: err.message,
- // icon: "none"
- // })
- // })
- // return
- // }
+ if(to.name != 'webWechatIndex' && openId === ''){
+ authFollow({
+ // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index',
+ // url: 'https://web.douhuo.demos.uzchain.tech/webWechat/index' 最新,
+ url: 'https://web.douhuofalv.com/webWechat/index'
+ }).then(res => {
+ window.location.href = res
+ }).catch(err => {
+ uni.showToast({
+ title: err.message,
+ icon: "none"
+ })
+ })
+ return
+ }
// 检查是否需要登录
if(to.auth && token === ''){