diff --git a/apis/index.js b/apis/index.js index 9be41a3..33e6bb6 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://api.douhuotest.douhuofalv.com/api/', //测试环境 + // apiUrl : 'https://douhuo.douhuofalv.com/api/', + apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js index e1a1054..ac79a0d 100644 --- a/apis/interfaces/pay.js +++ b/apis/interfaces/pay.js @@ -87,6 +87,33 @@ const dgFree = (orderNo, type) => { }) } +// 银联综法支付 +const umsSynthesize = data => { + return request({ + url : 'pay/cashier_desk/ums', + data, + method: 'POST' + }) +} + +// 抖拱综法支付 +const dgSynthesize = data => { + return request({ + url : 'pay/cashier_desk/dg', + data, + method: 'POST' + }) +} + +// 火力值综法支付 +const coinSynthesize = data => { + return request({ + url : 'pay/cashier_desk/score', + data, + method: 'POST' + }) +} + export { coinPay, diffCoinPay, @@ -97,5 +124,8 @@ export { umsFreeInfo, dgPay, diffDgPay, - dgFree + dgFree, + umsSynthesize, + dgSynthesize, + coinSynthesize } \ No newline at end of file diff --git a/apis/interfaces/synthesis.js b/apis/interfaces/synthesis.js new file mode 100644 index 0000000..d24438a --- /dev/null +++ b/apis/interfaces/synthesis.js @@ -0,0 +1,276 @@ +/** + * 手太欠 + * 愿这世界都如故事里一样 美好而动人~ + */ + +import { request } from '../index' + +// 获取综法订单数据数量 +const synthesisCount = (data) =>{ + return request({ + url: "synthesis/data/orders_count", + data: data + }) +} + + +// 综法咨询-一次免费列表 +const synthList = () =>{ + return request({ + url: "synthesis/index" + }) +} + +// 综法咨询-一次免费详情 +const synthDet = (synthesis_id) =>{ + return request({ + url: "synthesis/index/" + synthesis_id + }) +} + + +// 综法咨询-一次免费创建单 +const synthPost = (synthesis_id, data) =>{ + return request({ + url: "synthesis/index/" + synthesis_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-年费服务包列表 +const yearSynthList = data =>{ + return request({ + url: "synthesis/services", + data: data + }) +} + +// 综法咨询-年费服务包详情 +const yearSynthInfo = (service_id) =>{ + return request({ + url: "synthesis/services/" + service_id + }) +} + + +// 综法咨询-年费服务包创建单 +const yearSynthPost = (service_id, data) =>{ + return request({ + url : "synthesis/services/" + service_id + "/buy", + method : 'POST', + data : data + }) +} + +// 综法咨询-案件委托列表 +const entrustList = () =>{ + return request({ + url: "synthesis/entrusts" + }) +} + +// 综法咨询-案件委托子分类 +const entrustSon = data =>{ + return request({ + url: "synthesis/entrust/all", + data: data + }) +} + + +// 综法咨询-案件委托详情 +const entrustInfo = (entrust_id) =>{ + return request({ + url: "synthesis/entrust/" + entrust_id + }) +} + + +// 综法咨询-案件委托创建单 +const entrustPost = (entrust_id, data) =>{ + return request({ + url: "synthesis/entrust/" + entrust_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-拓展服务列表 +const expandsList = () =>{ + return request({ + url: "synthesis/expands", + }) +} + + +// 综法咨询-拓展服务详情 +const expandsInfo = (expand_id) =>{ + return request({ + url: "synthesis/expand/" + expand_id + }) +} + +// 综法咨询-拓展服务创建单 +const expandsPost = (expand_id, data) =>{ + return request({ + url: "synthesis/expand/" + expand_id + "/order", + method: 'POST', + data: data + }) +} + +// 综法咨询-年费服务包微信支付 +const yearSynthPay = (service_order_id, data) =>{ + return request({ + url: "pay/service_order/" + service_order_id + "/wechat", + data: data + }) +} + +// 年费订单-列表 +const yearOrder = data =>{ + return request({ + url: "synthesis/services/orders", + data: data + }) +} + +// 年费订单-详情 +const yearOrderSee = (order_id) =>{ + return request({ + url: "synthesis/services/order/" + order_id + }) +} + +// 咨询单-列表 +const seekOrder = data =>{ + return request({ + url: "synthesis/orders", + data: data + }) +} + + +// 咨询订单-详情 +const seekOrderSee = (synthesis_order_id) =>{ + return request({ + url: "synthesis/order/" + synthesis_order_id + }) +} + +// 委托单-列表 +const entrustOrder = data =>{ + return request({ + url: "synthesis/entrust/orders", + data: data + }) +} + +// 拓展单-列表 +const expandOrder = data =>{ + return request({ + url: "synthesis/expand/orders", + data: data + }) +} + +// 年费费--线下打款 +const offlineOpen = (data) =>{ + return request({ + url: "pay/offline/pay", + method: 'POST', + data: data + }) +} + +// 查看打款凭证-查看提交信息 +const bankSee = (pay_id, data) =>{ + return request({ + url: "pay/offline/" + pay_id + "/show", + data: data + }) +} + +// 编辑打款凭证 +const bankEdit = (pay_id, data) =>{ + return request({ + url: "pay/offline/" + pay_id + "/edit", + method: 'POST', + data: data + }) +} + + +// 获取线下打款银行 +const bankInfo = (data) =>{ + return request({ + url: "pay/offline/bank" + }) +} + +// 咨询单-补差价列表 +const diffPrices = data =>{ + return request({ + url: "synthesis/diff_prices", + data: data + }) +} + + +// 咨询单-创建补差价 +const entrustPay = data =>{ + return request({ + url: "synthesis/diff_prices/create", + method: 'POST', + data: data + }) +} + +// 咨询单-取消补差价 +const cancelPrices = (diff_price_id) =>{ + return request({ + url: "synthesis/diff_prices/" + diff_price_id, + method: 'DELETE' + }) +} + +// 获取签约地址 +const esignUrl = (data) =>{ + return request({ + url: "synthesis/esign/sign_url", + data: data + }) +} + +export { + synthesisCount, + synthList, + synthDet, + synthPost, + yearSynthList, + yearSynthInfo, + yearSynthPost, + entrustList, + entrustSon, + entrustInfo, + entrustPost, + expandsList, + expandsInfo, + expandsPost, + yearSynthPay, + yearOrder, + yearOrderSee, + seekOrder, + seekOrderSee, + entrustOrder, + expandOrder, + offlineOpen, + bankSee, + bankEdit, + bankInfo, + diffPrices, + entrustPay, + cancelPrices, + esignUrl +} diff --git a/apis/interfaces/synthesisOrder.js b/apis/interfaces/synthesisOrder.js new file mode 100644 index 0000000..c6ee5d1 --- /dev/null +++ b/apis/interfaces/synthesisOrder.js @@ -0,0 +1,93 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦，岁月迢迢华发增。 + * 碌碌无为枉半生，一朝惊醒万事空。 + * moduleName: 综法订单 + */ + +import { request } from '../index' + +// 年费订单 +const servicesOrder = (data) =>{ + return request({ + url : "app/synthesis/services/orders", + data + }) +} + +// 咨询订单 +const synthesisOrder = (data) =>{ + return request({ + url : "app/synthesis/orders", + data + }) +} + +// 委托订单 +const entrustOrder = (data) =>{ + return request({ + url : "app/synthesis/entrusts/orders", + data + }) +} + +// 拓展订单 +const expandOrder = (data) =>{ + return request({ + url : "app/synthesis/expands/orders", + data + }) +} + +// 年费订单 - 详情 +const servicesInfo = service_id => { + return request({ + url : 'app/synthesis/service/order/' + service_id + }) +} + +// 咨询订单 - 详情 +const synthesisInfo = service_id => { + return request({ + url : 'app/synthesis/order/' + service_id + }) +} + +// 委托订单 - 详情 +const entrustInfo = service_id => { + return request({ + url : 'app/synthesis/entrust/order/' + service_id + }) +} + +// 拓展订单 - 详情 +const expandInfo = service_id => { + return request({ + url : 'app/synthesis/expand/order/' + service_id + }) +} + +// 订单详情 +const oderinfo = (order_id, order_type) => { + return request({ + url : 'pay/cashier_desk/info', + data : { + order_id, + order_type + }, + method : 'POST' + }) +} + +export { + servicesOrder, + synthesisOrder, + entrustOrder, + expandOrder, + servicesInfo, + synthesisInfo, + entrustInfo, + expandInfo, + oderinfo +} diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index 68b244d..b8672bd 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -172,6 +172,14 @@ const getFlows = id => { }) } +// 获取所有省市数据 +const createCity = (data) =>{ + return request({ + url: "region/pro_city", + data: data + }) +} + export { relations, code, @@ -192,5 +200,6 @@ export { getTeam, getTeamLogs, getSignLogs, - getFlows + getFlows, + createCity } diff --git a/components/entrustOrder.vue b/components/entrustOrder.vue new file mode 100644 index 0000000..c953c21 --- /dev/null +++ b/components/entrustOrder.vue @@ -0,0 +1,152 @@ + + + + + \ No newline at end of file diff --git a/components/expandOrder.vue b/components/expandOrder.vue new file mode 100644 index 0000000..89bfc90 --- /dev/null +++ b/components/expandOrder.vue @@ -0,0 +1,152 @@ + + + + + \ No newline at end of file diff --git a/components/mould-input.vue b/components/mould-input.vue new file mode 100644 index 0000000..43c6b44 --- /dev/null +++ b/components/mould-input.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/components/servicesOrder.vue b/components/servicesOrder.vue new file mode 100644 index 0000000..0a6f798 --- /dev/null +++ b/components/servicesOrder.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/components/synthesisOrder.vue b/components/synthesisOrder.vue new file mode 100644 index 0000000..068aa88 --- /dev/null +++ b/components/synthesisOrder.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/dhdg-pay/dgali-pay.html b/dhdg-pay/dgali-pay.html new file mode 100644 index 0000000..31fe437 --- /dev/null +++ b/dhdg-pay/dgali-pay.html @@ -0,0 +1,57 @@ + + + + + + + 抖火收银台 + + + +
+ 抖火法律 +

抖火支付宝收银台

+ + + +
河北抖火法律咨询服务有限公司
+
+ + + \ No newline at end of file diff --git a/js_sdk/wa-permission/permission.js b/js_sdk/wa-permission/permission.js new file mode 100644 index 0000000..5df5623 --- /dev/null +++ b/js_sdk/wa-permission/permission.js @@ -0,0 +1,272 @@ +/** + * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启 + */ + +var isIos +// #ifdef APP-PLUS +isIos = (plus.os.name == "iOS") +// #endif + +// 判断推送权限是否开启 +function judgeIosPermissionPush() { + var result = false; + var UIApplication = plus.ios.import("UIApplication"); + var app = UIApplication.sharedApplication(); + var enabledTypes = 0; + if (app.currentUserNotificationSettings) { + var settings = app.currentUserNotificationSettings(); + enabledTypes = settings.plusGetAttribute("types"); + console.log("enabledTypes1:" + enabledTypes); + if (enabledTypes == 0) { + console.log("推送权限没有开启"); + } else { + result = true; + console.log("已经开启推送功能!") + } + plus.ios.deleteObject(settings); + } else { + enabledTypes = app.enabledRemoteNotificationTypes(); + if (enabledTypes == 0) { + console.log("推送权限没有开启!"); + } else { + result = true; + console.log("已经开启推送功能!") + } + console.log("enabledTypes2:" + enabledTypes); + } + plus.ios.deleteObject(app); + plus.ios.deleteObject(UIApplication); + return result; +} + +// 判断定位权限是否开启 +function judgeIosPermissionLocation() { + var result = false; + var cllocationManger = plus.ios.import("CLLocationManager"); + var status = cllocationManger.authorizationStatus(); + result = (status != 2) + console.log("定位权限开启：" + result); + // 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation + /* var enable = cllocationManger.locationServicesEnabled(); + var status = cllocationManger.authorizationStatus(); + console.log("enable:" + enable); + console.log("status:" + status); + if (enable && status != 2) { + result = true; + console.log("手机定位服务已开启且已授予定位权限"); + } else { + console.log("手机系统的定位没有打开或未给予定位权限"); + } */ + plus.ios.deleteObject(cllocationManger); + return result; +} + +// 判断麦克风权限是否开启 +function judgeIosPermissionRecord() { + var result = false; + var avaudiosession = plus.ios.import("AVAudioSession"); + var avaudio = avaudiosession.sharedInstance(); + var permissionStatus = avaudio.recordPermission(); + console.log("permissionStatus:" + permissionStatus); + if (permissionStatus == 1684369017 || permissionStatus == 1970168948) { + console.log("麦克风权限没有开启"); + } else { + result = true; + console.log("麦克风权限已经开启"); + } + plus.ios.deleteObject(avaudiosession); + return result; +} + +// 判断相机权限是否开启 +function judgeIosPermissionCamera() { + var result = false; + var AVCaptureDevice = plus.ios.import("AVCaptureDevice"); + var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide'); + console.log("authStatus:" + authStatus); + if (authStatus == 3) { + result = true; + console.log("相机权限已经开启"); + } else { + console.log("相机权限没有开启"); + } + plus.ios.deleteObject(AVCaptureDevice); + return result; +} + +// 判断相册权限是否开启 +function judgeIosPermissionPhotoLibrary() { + var result = false; + var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary"); + var authStatus = PHPhotoLibrary.authorizationStatus(); + console.log("authStatus:" + authStatus); + if (authStatus == 3) { + result = true; + console.log("相册权限已经开启"); + } else { + console.log("相册权限没有开启"); + } + plus.ios.deleteObject(PHPhotoLibrary); + return result; +} + +// 判断通讯录权限是否开启 +function judgeIosPermissionContact() { + var result = false; + var CNContactStore = plus.ios.import("CNContactStore"); + var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0); + if (cnAuthStatus == 3) { + result = true; + console.log("通讯录权限已经开启"); + } else { + console.log("通讯录权限没有开启"); + } + plus.ios.deleteObject(CNContactStore); + return result; +} + +// 判断日历权限是否开启 +function judgeIosPermissionCalendar() { + var result = false; + var EKEventStore = plus.ios.import("EKEventStore"); + var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0); + if (ekAuthStatus == 3) { + result = true; + console.log("日历权限已经开启"); + } else { + console.log("日历权限没有开启"); + } + plus.ios.deleteObject(EKEventStore); + return result; +} + +// 判断备忘录权限是否开启 +function judgeIosPermissionMemo() { + var result = false; + var EKEventStore = plus.ios.import("EKEventStore"); + var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1); + if (ekAuthStatus == 3) { + result = true; + console.log("备忘录权限已经开启"); + } else { + console.log("备忘录权限没有开启"); + } + plus.ios.deleteObject(EKEventStore); + return result; +} + +// Android权限查询 +function requestAndroidPermission(permissionID) { + return new Promise((resolve, reject) => { + plus.android.requestPermissions( + [permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装 + function(resultObj) { + var result = 0; + for (var i = 0; i < resultObj.granted.length; i++) { + var grantedPermission = resultObj.granted[i]; + console.log('已获取的权限：' + grantedPermission); + result = 1 + } + for (var i = 0; i < resultObj.deniedPresent.length; i++) { + var deniedPresentPermission = resultObj.deniedPresent[i]; + console.log('拒绝本次申请的权限：' + deniedPresentPermission); + result = 0 + } + for (var i = 0; i < resultObj.deniedAlways.length; i++) { + var deniedAlwaysPermission = resultObj.deniedAlways[i]; + console.log('永久拒绝申请的权限：' + deniedAlwaysPermission); + result = -1 + } + resolve(result); + // 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限 + // if (result != 1) { + // gotoAppPermissionSetting() + // } + }, + function(error) { + console.log('申请权限错误：' + error.code + " = " + error.message); + resolve({ + code: error.code, + message: error.message + }); + } + ); + }); +} + +// 使用一个方法，根据参数判断权限 +function judgeIosPermission(permissionID) { + if (permissionID == "location") { + return judgeIosPermissionLocation() + } else if (permissionID == "camera") { + return judgeIosPermissionCamera() + } else if (permissionID == "photoLibrary") { + return judgeIosPermissionPhotoLibrary() + } else if (permissionID == "record") { + return judgeIosPermissionRecord() + } else if (permissionID == "push") { + return judgeIosPermissionPush() + } else if (permissionID == "contact") { + return judgeIosPermissionContact() + } else if (permissionID == "calendar") { + return judgeIosPermissionCalendar() + } else if (permissionID == "memo") { + return judgeIosPermissionMemo() + } + return false; +} + +// 跳转到**应用**的权限页面 +function gotoAppPermissionSetting() { + if (isIos) { + var UIApplication = plus.ios.import("UIApplication"); + var application2 = UIApplication.sharedApplication(); + var NSURL2 = plus.ios.import("NSURL"); + // var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES"); + var setting2 = NSURL2.URLWithString("app-settings:"); + application2.openURL(setting2); + + plus.ios.deleteObject(setting2); + plus.ios.deleteObject(NSURL2); + plus.ios.deleteObject(application2); + } else { + // console.log(plus.device.vendor); + var Intent = plus.android.importClass("android.content.Intent"); + var Settings = plus.android.importClass("android.provider.Settings"); + var Uri = plus.android.importClass("android.net.Uri"); + var mainActivity = plus.android.runtimeMainActivity(); + var intent = new Intent(); + intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + var uri = Uri.fromParts("package", mainActivity.getPackageName(), null); + intent.setData(uri); + mainActivity.startActivity(intent); + } +} + +// 检查系统的设备服务是否开启 +// var checkSystemEnableLocation = async function () { +function checkSystemEnableLocation() { + if (isIos) { + var result = false; + var cllocationManger = plus.ios.import("CLLocationManager"); + var result = cllocationManger.locationServicesEnabled(); + console.log("系统定位开启:" + result); + plus.ios.deleteObject(cllocationManger); + return result; + } else { + var context = plus.android.importClass("android.content.Context"); + var locationManager = plus.android.importClass("android.location.LocationManager"); + var main = plus.android.runtimeMainActivity(); + var mainSvr = main.getSystemService(context.LOCATION_SERVICE); + var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER); + console.log("系统定位开启:" + result); + return result + } +} + +module.exports = { + judgeIosPermission: judgeIosPermission, + requestAndroidPermission: requestAndroidPermission, + checkSystemEnableLocation: checkSystemEnableLocation, + gotoAppPermissionSetting: gotoAppPermissionSetting +} diff --git a/pages.json b/pages.json index 9eca141..5a79595 100644 --- a/pages.json +++ b/pages.json @@ -547,6 +547,7 @@ }, { "path": "pages/im/msg", "name": "ImMsg", + "auth": true, "style": { "navigationBarTitleText": "消息", "enablePullDownRefresh": false, @@ -555,19 +556,155 @@ }, { "path": "pages/user/signLog", "name": "SignLog", + "auth": true, "style": { "navigationBarTitleText": "合同记录", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } }, { - "path": "pages/user/contract", + "path": "pages/user/contract", "name": "SignContract", + "auth": true, "style": { "navigationBarTitleText": "合同", - "enablePullDownRefresh": false, + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#FFFFFF" } + }, { + "path": "pages/synthesize/individual", + "name": "Individual", + "auth": true, + "style": { + "navigationBarTitleText": "个人全年法律", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/entrust", + "name": "Entrust", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/enterprise", + "name": "Enterprise", + "auth": true, + "style": { + "navigationBarTitleText": "企业全年法律", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + + }, { + "path": "pages/synthesize/service", + "name": "Service", + "auth": true, + "style": { + "navigationBarTitleText": "拓展服务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/order", + "name": "SynthesizeOrder", + "auth": true, + "style": { + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/synthesize/servicesInfo", + "name": "OrderServicesInfo", + "auth": true, + "style": { + "navigationBarTitleText": "年费订单详情", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/synthesisInfo", + "name": "OrderSynthesisInfo", + "auth": true, + "style": { + "navigationBarTitleText": "咨询订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/expandInfo", + "name": "OrderExpandInfo", + "auth": true, + "style": { + "navigationBarTitleText": "委托订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/entrustInfo", + "name": "OrderEntrustInfo", + "auth": true, + "style": { + "navigationBarTitleText": "委托订单详情", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "type": "transparent" + } + } + } + }, { + "path": "pages/synthesize/PersonWrite", + "name": "PersonWrite", + "auth": true, + "style": { + "navigationBarTitleText": "个人法律咨询365服务包", + "enablePullDownRefresh": false + } + }, { + "path": "pages/pay/bankPay", + "name": "BankPay", + "auth": true, + "style": { + "navigationBarTitleText": "银行打款支付", + "enablePullDownRefresh": false + } + }, { + "path": "pages/synthesize/entrustCivil", + "name": "EntrustCivil", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托-民事诉讼", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } + + }, { + "path": "pages/synthesize/entrustWrite", + "name": "EntrustWrite", + "auth": true, + "style": { + "navigationBarTitleText": "案件委托-服务包", + "enablePullDownRefresh": false, + "backgroundColor": "#FFF" + } }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/index/index.vue b/pages/index/index.vue index ee95bd2..2aff17f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,7 +34,7 @@ - + @@ -71,14 +71,46 @@ 综法产品 - 更多 - - + + - 2022年尊享综法服务包 - ￥2200 + + 个人全年法律 + 咨询服务 抖火法律 + + ￥365.00/年 + + + + + + + 案件委托 + 咨询服务 抖火法律 + + ￥200元起 + + + + + + + 企业全年法律 + 咨询服务 抖火法律 + + ￥3650.00起/年 + + + + + + + 拓展服务 + 咨询服务 抖火法律 + + ￥500元起 @@ -247,10 +279,8 @@ // console.log(this.bannerArr[e]) }, // 点击轮播图跳转自由服务包 - clickFree(){ - uni.navigateTo({ - url:'/pages/index/free' - }) + onView(name){ + this.$Router.push({ name }) }, // 获取城市数据 getRegion(id){ @@ -382,21 +412,30 @@ .colum-flex{ display: flex; flex-direction: column; - justify-content: space-around; + justify-content: space-between; height: 180rpx; .title{ - line-height: 40rpx; - font-size: 28rpx; + font-size: 34rpx; color: #111111; + line-height: 40rpx; + margin-bottom: 10rpx; + @extend .nowrap; + } + .subtitle{ + font-size: 28rpx; + color: gray; + line-height: 40rpx; + @extend .nowrap; } .price{ - line-height: 40rpx; font-weight: bold; color: #d51959; - font-size: 38rpx; + font-size: 36rpx; + line-height: 40rpx; text{ font-size: 80%; } + @extend .nowrap; } } } diff --git a/pages/pay/bankPay.vue b/pages/pay/bankPay.vue new file mode 100644 index 0000000..1f86235 --- /dev/null +++ b/pages/pay/bankPay.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 019d8cf..8616f41 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -4,11 +4,15 @@ 实付金额 ￥{{total}} + + 火力值：{{totalFire}} + 当前火力值比例1:{{rate}} + 订单号:{{orderNo}} - +