From 9a46dfe0effec98c308ea8480476c153600207b1 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 9 Jun 2025 19:50:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B3=A8=E5=86=8C=E4=B8=93?= =?UTF-8?q?=E5=8C=BA=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/order.js | 6 +- config/pay.js | 79 ++- config/regiest.js | 106 ++- config/request.js | 2 +- pages/other/index.vue | 1 + pages/pay/index.vue | 666 +++++++++--------- pages/regiest/index.vue | 255 ++----- pages/specialArea/list.vue | 1314 +++++++++++++++++++----------------- 8 files changed, 1191 insertions(+), 1238 deletions(-) diff --git a/config/order.js b/config/order.js index a84c0fa..39a54e9 100644 --- a/config/order.js +++ b/config/order.js @@ -4,7 +4,7 @@ const http = uni.$u.http export const payConfig = params => http.get('/pay/config', { params }) //查询订单明细 export const orderInfo = params => - http.post('/sale/api/order/query-order', params) + http.post('/sale/api/retail-order/query-order', params) //订单状态 export const orderStatus = params => http.get('/system/pub/enums/order-status-api', { params }) @@ -45,3 +45,7 @@ export const selfRevokeOrder = params => // 获取可升级级别 export const getUpgradeLevel = params => http.post('/sale/api/retail-order/valid-mem-level', { params }) + +// 下单前校验 +export const validRelation = params => + http.post('sale/api/retail-order/valid-relation', { params }) diff --git a/config/pay.js b/config/pay.js index c2d540a..c061caa 100644 --- a/config/pay.js +++ b/config/pay.js @@ -1,64 +1,83 @@ const http = uni.$u.http //支付配置 -export const payConfig = (params) => http.get('/pay/config', { params }) +export const payConfig = params => http.get('/pay/config', { params }) //京东银行列表 -export const jdBankList = (params) => http.get('/pay/jd-fast/list', { params }) +export const jdBankList = params => http.get('/pay/jd-fast/list', { params }) //汇付银行列表 -export const hfBankList = (params) => http.get('/pay/ada-fast/list', { params }) +export const hfBankList = params => http.get('/pay/ada-fast/list', { params }) //通联银行列表 -export const tlBankList = (params) => http.get('/pay/all-in-fast/list', { params }) +export const tlBankList = params => + http.get('/pay/all-in-fast/list', { params }) //查询订单明细 -export const orderInfo = (params) => http.post('/sale/api/order/query-order', params) +export const orderInfo = params => + http.post('/sale/api/retail-order/query-order', params) //查询订单消费明细 -export const spendDetails = (params) => http.post('/sale/api/order/query-spend-details', params) +export const spendDetails = params => + http.post('/sale/api/retail-order/query-spend-details', params) //京东绑卡短信 -export const bindJd = (params) => http.post('/pay/jd-fast/bind', params) +export const bindJd = params => http.post('/pay/jd-fast/bind', params) //通联绑卡短信 -export const bindTl = (params) => http.post('/pay/all-in-fast/bind', params) +export const bindTl = params => http.post('/pay/all-in-fast/bind', params) //汇付绑卡短信 -export const bindHf = (params) => http.post('/pay/ada-fast/bind', params) +export const bindHf = params => http.post('/pay/ada-fast/bind', params) //京东绑卡 -export const bindJdConfirm = (params) => http.post('/pay/jd-fast/bind-confirm', params) +export const bindJdConfirm = params => + http.post('/pay/jd-fast/bind-confirm', params) //通联绑卡 -export const bindTlConfirm = (params) => http.post('/pay/all-in-fast/bind-confirm', params) +export const bindTlConfirm = params => + http.post('/pay/all-in-fast/bind-confirm', params) //汇付绑卡 -export const bindHfConfirm = (params) => http.post('/pay/ada-fast/bind-confirm', params) +export const bindHfConfirm = params => + http.post('/pay/ada-fast/bind-confirm', params) //银行卡支付获取验证码 -export const unifiedorder = (params) => http.post('/pay/unifiedorder', params) +export const unifiedorder = params => http.post('/pay/unifiedorder', params) //汇付银行卡确认 -export const payConfirmHf = (params) => http.post('/pay/ada-fast/pay-confirm', params) +export const payConfirmHf = params => + http.post('/pay/ada-fast/pay-confirm', params) //京东银行卡确认 -export const payConfirmJd = (params) => http.post('/pay/jd-fast/pay-confirm', params) +export const payConfirmJd = params => + http.post('/pay/jd-fast/pay-confirm', params) //通联银行卡确认 -export const payConfirmTl = (params) => http.post('/pay/all-in-fast/pay-confirm', params) +export const payConfirmTl = params => + http.post('/pay/all-in-fast/pay-confirm', params) //支付状态 -export const payStatus = (params) => http.get('/pay/status', { params }) +export const payStatus = params => http.get('/pay/status', { params }) //幂等性 -export const generate = (params) => http.get('/system/api/idempotent/generate', { params }) +export const generate = params => + http.get('/system/api/idempotent/generate', { params }) //支付注册订单 -export const payRegOrder = (params) => http.post('/sale/api/order/pay-reg-order', params) +export const payRegOrder = params => + http.post('/sale/api/retail-order/pay-reg-order', params) //支付其他订单 -export const payOthOrder = (params) => http.post('/sale/api/order/pay-oth-order', params) +export const payOthOrder = params => + http.post('/sale/api/retail-order/pay-oth-order', params) //宝付确认支付h5 -export const baoFuPay = (params) => http.post('/pay/baofu-code/order', params) +export const baoFuPay = params => http.post('/pay/baofu-code/order', params) //汇付确认支付h5 -export const huiFuPay = (params) => http.post('/pay/ada-code/order', params) +export const huiFuPay = params => http.post('/pay/ada-code/order', params) //在线预充值 -export const preCharge = (params) => http.get('/member/api/recharge/preCharge', { params }) +export const preCharge = params => + http.get('/member/api/recharge/preCharge', { params }) //海粉注册信息 -export const fansOrder = (params) => http.get('/member/api/member/fans-order/'+params) +export const fansOrder = params => + http.get('/member/api/member/fans-order/' + params) //抽奖下单 -export const payDrawGift = (params) => http.post('/activity/api/draw/pay-draw-num', params) +export const payDrawGift = params => + http.post('/activity/api/draw/pay-draw-num', params) //提货下单 -export const payPickOrder = (params) => http.post('/activity/api/pick/order', params) +export const payPickOrder = params => + http.post('/activity/api/pick/order', params) //植树查看账户 -export const deductionAccount = (params) => http.post('activity/api/sa-tree-order/deductionAccount', params) +export const deductionAccount = params => + http.post('activity/api/sa-tree-order/deductionAccount', params) //植树活动 -export const shoppingTree = (params) => http.post('activity/api/sa-tree-order/shoppingTree', params) +export const shoppingTree = params => + http.post('activity/api/sa-tree-order/shoppingTree', params) //解绑银行卡 -export const unBind = (params) => http.post('/pay/ada-fast/un-bind', params) +export const unBind = params => http.post('/pay/ada-fast/un-bind', params) //查询注册信息 -export const registerInfo = (params) => http.get('/member/api/member/register-order/' + params,) \ No newline at end of file +export const registerInfo = params => + http.get('/member/api/member/register-order/' + params) diff --git a/config/regiest.js b/config/regiest.js index 16d2489..d4e3a8b 100644 --- a/config/regiest.js +++ b/config/regiest.js @@ -1,71 +1,109 @@ const http = uni.$u.http //幂等性 -export const generate = (params) => http.get('/system/api/idempotent/generate', { params }) +export const generate = params => + http.get('/system/api/idempotent/generate', { params }) //商品列表 -export const getAllGoods = (params) => http.post('/sale/api/wares/query-spe-wares', params) +export const getAllGoods = params => + http.post('/sale/api/wares/query-spe-wares', params) //商品详情 -export const waresDetail = (params) => http.post('/sale/api/wares/query-spe-wares-detail', params) +export const waresDetail = params => + http.post('/sale/api/wares/query-spe-wares-detail', params) //获取国家 -export const countryList = (params) => http.get('/system/api/country/list', { params }) +export const countryList = params => + http.get('/system/api/country/list', { params }) //发货 -export const deliveryList = (params) => http.get('/system/pub/enums/delivery-list', { params }) +export const deliveryList = params => + http.get('/system/pub/enums/delivery-list', { params }) //运输 -export const transportList = (params) => http.get('/system/pub/enums/transport-type', { params }) +export const transportList = params => + http.get('/system/pub/enums/transport-type', { params }) //行列表输 -export const bankList = (params) => http.get('/system/api/bank/list', { params }) +export const bankList = params => http.get('/system/api/bank/list', { params }) //购物车商品详情 -export const shoppingWaresDetail = (params) => http.post('/sale/api/shopping/get-shopping-wares-detail', params) +export const shoppingWaresDetail = params => + http.post('/sale/api/shopping/get-shopping-wares-detail', params) //一键注册 -export const quickReg = (params) => http.post('/sale/api/order/quick-reg', params) +export const quickReg = params => + http.post('/sale/api/retail-order/quick-reg', params) //获取会员等级 -export const memLevel = (params) => http.post('/sale/api/order/valid-mem-level', params) +export const memLevel = params => + http.post('/sale/api/retail-order/valid-mem-level', params) //注册页面显示权限 -export const registerList = (params) => http.get('/system/api/register-page/list', { params }) +export const registerList = params => + http.get('/system/api/register-page/list', { params }) //获取地址列表 -export const addressList = (params) => http.get('/member/api/member-address/list', { params }) +export const addressList = params => + http.get('/member/api/member-address/list', { params }) //查询邮费 -export const queryPostage = (params) => http.post('/sale/api/order/query-order-postage', params) +export const queryPostage = params => + http.post('/sale/api/retail-order/query-order-postage', params) //确认注册订单-生成待支付订单 -export const confirmRegOrder = (params) => http.post('/sale/api/order/confirm-reg-order', params) +export const confirmRegOrder = params => + http.post('/sale/api/retail-order/confirm-reg-order', params) //根据推荐人编号获取安置信息 -export const validPcode = (params) => http.post('/sale/api/order/valid-p-code', params) +export const validPcode = params => + http.post('/sale/api/retail-order/valid-p-code', params) //注册订单验证安置人编号 -export const validPPcode = (params) => http.post('/sale/api/order/valid-p-p-code', params) +export const validPPcode = params => + http.post('/sale/api/retail-order/valid-p-p-code', params) //注册订单验证手机号 -export const validPhone = (params) => http.post('/sale/api/order/valid-phone', params) +export const validPhone = params => + http.post('/sale/api/retail-order/valid-phone', params) //获取name -export const upgRel = (params) => http.post('/sale/api/order/validate-upg-rel', params) +export const upgRel = params => + http.post('/sale/api/retail-order/validate-upg-rel', params) //升级复购单确认 -export const confirmOthOrder = (params) => http.post('/sale/api/order/confirm-oth-order', params) +export const confirmOthOrder = params => + http.post('/sale/api/retail-order/confirm-oth-order', params) //嗨粉确认订单 -export const confirmFunOrder = (params) => http.post('/sale/api/order/confirm-fun-order', params) +export const confirmFunOrder = params => + http.post('/sale/api/retail-order/confirm-fun-order', params) //协议 -export const waresAgreement = (params) => http.post('/sale/api/wares/get-wares-agreement', params) +export const waresAgreement = params => + http.post('/sale/api/wares/get-wares-agreement', params) //海粉订单详情 -export const waresinfo = (params) => http.post('/sale/api/wares/query-confirm-waresinfo', params) +export const waresinfo = params => + http.post('/sale/api/wares/query-confirm-waresinfo', params) //海粉订单确认 -export const confirmShareOrder = (params) => http.post('/sale/api/order/confirm-share-order', params) +export const confirmShareOrder = params => + http.post('/sale/api/retail-order/confirm-share-order', params) //删除地址 -export const delAddress = (data) => http.delete('/member/api/member-address/' + data) +export const delAddress = data => + http.delete('/member/api/member-address/' + data) //省市区 -export const areaList = (params) => http.get('system/api/area/get-level-list', { params }) +export const areaList = params => + http.get('system/api/area/get-level-list', { params }) //创客空间选择 -export const list_maker = (data) => http.post('/member/api/maker-space/list-maker?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize, data ) +export const list_maker = data => + http.post( + '/member/api/maker-space/list-maker?pageNum=' + + data.pageNum + + '&pageSize=' + + data.pageSize, + data + ) // 礼包获取邮费 -export const queryAdressPostage = (params) => http.post('/sale/api/order/self-order-postage', params) +export const queryAdressPostage = params => + http.post('/sale/api/retail-order/self-order-postage', params) // 特殊会员完善信息 -export const saveSpecial = (params) => http.post('/member/api/member-special/save-special', params) +export const saveSpecial = params => + http.post('/member/api/member-special/save-special', params) // 下载 -export const specialExport = (params) => http.post('/member/api/member-special/special-export', params,{header: { 'Content-Type': 'application/x-www-form-urlencoded' }, -responseType: 'blob',}) +export const specialExport = params => + http.post('/member/api/member-special/special-export', params, { + header: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + }) //特殊信息列表 -export const specialList = (params) => http.get('/member/api/member-special/special-list', { params }) - +export const specialList = params => + http.get('/member/api/member-special/special-list', { params }) // 创客空间接口 -export const queryCard = (params) => http.post('/sale/api/wares/query-cabin-card', params) +export const queryCard = params => + http.post('/sale/api/wares/query-cabin-card', params) //复购特殊商品列表 -export const makerList = (params) => http.get('/sale/api/order/list-maker-ware', { params }) \ No newline at end of file +export const makerList = params => + http.get('/sale/api/retail-order/list-maker-ware', { params }) diff --git a/config/request.js b/config/request.js index f7009c6..38e02c9 100644 --- a/config/request.js +++ b/config/request.js @@ -20,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://localhost:8080' + config.baseURL = 'http://192.168.0.100:8080' //#endif //#ifdef QA_SERVER diff --git a/pages/other/index.vue b/pages/other/index.vue index 76ff2c7..39ef92c 100644 --- a/pages/other/index.vue +++ b/pages/other/index.vue @@ -656,6 +656,7 @@ export default { this.agreementShow = [1] this.$forceUpdate() } + this.setPageTitle(this.specialArea) }, onShow() { // 获取地址 diff --git a/pages/pay/index.vue b/pages/pay/index.vue index e1126a7..aecf552 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -1,42 +1,42 @@ - @@ -756,6 +701,12 @@ import * as api from '@/config/pay.js' import QRCode from 'qrcodejs2' import successDialog from '@/components/successDialog.vue' import * as act from '@/config/activity.js' +import { + REGIEST_AREA, + UPGRADE_AREA, + REPURCHASE_AREA, + REISSUE_AREA, +} from '@/util/specialAreaMap' var payStatus export default { components: { @@ -873,7 +824,7 @@ export default { .unBind({ bindCode: this.unBindCode, }) - .then((res) => { + .then(res => { if (res.code == 200) { uni.showToast({ title: '解绑成功', @@ -901,7 +852,7 @@ export default { pkBaseId: this.luckydrawData.pkBaseId, payNum: this.luckydrawData.payNum, }) - .then((res) => { + .then(res => { if (res.code == 200) { this.orderData.orderAmount = res.data.toBePaidMoney this.payDetail = res.data @@ -952,15 +903,18 @@ export default { bindCode: this.bindCode, specialArea: this.specialArea, smsCode: this.codeValue, - pkSettleCountry: this.pkCountry, + pkSettleCountry: this.pkCountry || 1, + pkCountry: this.pkCountry || 1, } } else { // 钱包支付 - + console.log( + '%c [ this.specialArea ]-910', + 'font-size:13px; background:#777244; color:#bbb688;', + this.specialArea + ) if ( - this.specialArea == 1 || - this.specialArea == 7 || - this.specialArea == 24 + [REGIEST_AREA.id, UPGRADE_AREA.id].includes(Number(this.specialArea)) ) { url = api.payRegOrder } else { @@ -970,8 +924,9 @@ export default { orderCode: this.orderCode, specialArea: this.specialArea, payPwd: this.codeValue, - pkSettleCountry: this.pkCountry, - makerSpaceMember: this.paramsPost?.makerSpaceMember||'', + pkSettleCountry: this.pkCountry || 1, + pkCountry: this.pkCountry || 1, + makerSpaceMember: this.paramsPost?.makerSpaceMember || '', } } if (this.paramsPost?.orderType === 4) { @@ -980,9 +935,10 @@ export default { payPwd: this.codeValue, payNum: this.luckydrawData.payNum, pkBaseId: this.luckydrawData.pkBaseId, - pkSettleCountry: this.pkCountry, + pkSettleCountry: this.pkCountry || 1, + pkCountry: this.pkCountry || 1, } - api.payDrawGift(obj).then((res) => { + api.payDrawGift(obj).then(res => { if (res.code == 200) { // this.$message({ // message: res.msg, @@ -998,13 +954,13 @@ export default { } }) } else { - url(obj).then((res) => { + url(obj).then(res => { if (res.code == 200) { this.isPw = false if ( - this.specialArea == 1 || - this.specialArea == 7 || - this.specialArea == 24 + [REGIEST_AREA.id, UPGRADE_AREA.id].includes( + Number(this.specialArea) + ) ) { if (this.isBank) { this.isPw = false @@ -1057,7 +1013,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { this.paramsPost = res.data this.orderCode = res.orderCode if (this.whatPay == 11) { @@ -1100,7 +1056,7 @@ export default { payType: 3, //银行卡 bindCode: this.hfList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'hf' this.bindCode = this.hfList[indexed].bindCode this.isPw = true @@ -1111,7 +1067,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1119,7 +1075,7 @@ export default { payType: 3, //银行卡 bindCode: this.hfList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'hf' this.bindCode = this.hfList[indexed].bindCode this.orderCode = res.orderCode @@ -1139,7 +1095,7 @@ export default { payType: 3, //银行卡 bindCode: this.jdList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'jd' this.bindCode = this.jdList[indexed].bindCode this.isPw = true @@ -1150,7 +1106,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1158,7 +1114,7 @@ export default { payType: 3, //银行卡 bindCode: this.jdList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'jd' this.bindCode = this.jdList[indexed].bindCode this.orderCode = res.orderCode @@ -1177,7 +1133,7 @@ export default { payType: 3, //银行卡 bindCode: this.tlList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'tl' this.bindCode = this.tlList[indexed].bindCode this.isPw = true @@ -1188,7 +1144,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1196,7 +1152,7 @@ export default { payType: 3, //银行卡 bindCode: this.tlList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'tl' this.bindCode = this.tlList[indexed].bindCode this.orderCode = res.orderCode @@ -1214,7 +1170,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { this.paramsPost = res.data this.orderCode = res.orderCode if (this.whatPay == 12) { @@ -1226,7 +1182,7 @@ export default { this.isBank = '' this.isPw = true } else { - api.generate().then((res) => { + api.generate().then(res => { uni.setStorageSync('mToken', res.msg) }) this.isBank = '' @@ -1251,7 +1207,7 @@ export default { payType: 2, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup = true let that = this this.$nextTick(() => { @@ -1295,7 +1251,7 @@ export default { payType: 2, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup = true let that = this this.$nextTick(() => { @@ -1339,7 +1295,7 @@ export default { payType: 1, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup1 = true let that = this this.$nextTick(() => { @@ -1385,12 +1341,13 @@ export default { appletFlag: 0, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=20f03b022bc39e837056bdbe475632c8&t=1715569339&state=' + - res.data + '&payment=0' - // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + - // res.data + '&payment=0' + res.data + + '&payment=0' + // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + + // res.data + '&payment=0' window.open(url) }) this.checkPayStatus(params) @@ -1415,12 +1372,13 @@ export default { appletFlag: 0, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=20f03b022bc39e837056bdbe475632c8&t=1715569339&state=' + - res.data+ '&payment=1' - // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + - // res.data + '&payment=1' + res.data + + '&payment=1' + // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + + // res.data + '&payment=1' window.open(url) }) this.checkPayStatus(params) @@ -1436,12 +1394,12 @@ export default { } }, getPayConfig() { - api.payConfig().then((res) => { + api.payConfig().then(res => { this.payList = res.data }) }, getBankList() { - api.jdBankList().then((res) => { + api.jdBankList().then(res => { this.jdList = res.data }) // api.hfBankList().then((res) => { @@ -1460,9 +1418,8 @@ export default { .orderInfo({ specialArea: this.specialArea, orderCode: this.orderCode, - pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { this.orderData = res.data this.downTime() }) @@ -1482,9 +1439,8 @@ export default { .spendDetails({ specialArea: this.specialArea, orderCode: this.orderCode, - pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { // this.payDetail = res.data this.$set(this, 'payDetail', res.data) this.$nextTick(() => { @@ -1494,7 +1450,7 @@ export default { }) }, reset() { - this.$store.dispatch('GetInfo').then((res) => { + this.$store.dispatch('GetInfo').then(res => { uni.reLaunch({ url: '/pages/index/index', }) @@ -1509,11 +1465,11 @@ export default { // 清除定时器 clearInterval(payStatus) if ( - this.specialArea == 1 || - this.specialArea == 7 || - this.specialArea == 24 + [REGIEST_AREA.id, UPGRADE_AREA.id].includes( + Number(this.specialArea) + ) ) { - api.registerInfo(this.orderCode).then((res) => { + api.registerInfo(this.orderCode).then(res => { this.$refs.successDialog.showSuccess(res.data) }) } else { @@ -1522,7 +1478,7 @@ export default { this.showSucce = true } } else { - api.payStatus(data).then((res) => { + api.payStatus(data).then(res => { that.sucPay = res.data }) } @@ -1563,7 +1519,9 @@ export default { .tit { font-size: 24px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; text-align: center; color: #333333; @@ -1572,7 +1530,9 @@ export default { .tit1 { font-size: 24px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #e02b26; text-align: center; @@ -1581,7 +1541,9 @@ export default { .tit2 { font-size: 11px; - font-family: PingFang SC-Regular, PingFang SC; + font-family: + PingFang SC-Regular, + PingFang SC; font-weight: 400; color: #666666; display: flex; @@ -1608,7 +1570,9 @@ export default { display: flex; align-items: center; font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #333333; @@ -1646,7 +1610,9 @@ export default { display: flex; align-items: center; font-size: 12px; - font-family: PingFang SC-Regular, PingFang SC; + font-family: + PingFang SC-Regular, + PingFang SC; font-weight: 400; color: #333333; @@ -1773,14 +1739,18 @@ export default { justify-content: space-between; color: #666; font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #999; } .tTit { font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #666; } diff --git a/pages/regiest/index.vue b/pages/regiest/index.vue index da0a60f..8683672 100644 --- a/pages/regiest/index.vue +++ b/pages/regiest/index.vue @@ -53,83 +53,26 @@ - - - - - - - - - - - - - + + - + - - - - - - - + - - - - - - - - - - - - - - - - - - - + {{ '收货人信息' }} item.id == areaId)?.name + uni.setNavigationBarTitle({ + title, + }) + }, toAgree() { // agreeMent this.$refs.agreement.openDig() @@ -855,9 +747,9 @@ export default { // 获取国家 this.getCountry() // 获取运输方式 - this.getTransList() + // this.getTransList() // 获取发货方式 - this.getDeliveryList() + // this.getDeliveryList() // 获取银行 this.getBank() @@ -876,8 +768,6 @@ export default { // 推荐姓名赋值 this.form.parentName = this.userInfo.memberName this.pt = false - // 从推荐编号获取安置信息 - this.getQuickReg() } else { } if (this.pkCountry == 1) { @@ -906,77 +796,38 @@ export default { }) }, getMember() { - let deleteList = [] - this.shoppingArr.forEach(item => { - deleteList.push({ - shoppingId: item, - }) - }) - this.allGoodsData.deleteList = deleteList - api.memLevel(this.allGoodsData).then(res => { - this.form.pkGradeVal = res.data.pkGradeVal - }) - }, - checkAddress() {}, - getQuickReg() { + // let deleteList = [] + // this.shoppingArr.forEach(item => { + // deleteList.push({ + // shoppingId: item, + // }) + // }) + // this.allGoodsData.deleteList = deleteList + // console.log(this.shoppingArr, '....allGoodsData') + // return api - .quickReg({ - parent: this.form.parent, + .memLevel({ + firstCheck: 0, specialArea: this.specialArea, - pkSettleCountry: this.pkCountry, + shopList: this.shoppingArr.map(id => { + return { + shoppingId: id, + } + }), }) .then(res => { - if (res.code == 200) { - this.form.placeDept = res.data.placeDept - this.form.placeDeptLabel = res.data.placeDeptVal - this.$set(this.form, 'placeDeptLabel', res.data.placeDeptVal) - this.form.placeParent = res.data.placeParent - this.form.placeParentName = res.data.placeParentName - this.form.parentName = res.data.parentName - if (res.data.isFirst) { - // 普通注册首单 - this.pt = true - } else { - // 普通注册首单 - this.pt = false - } - // 获取创客空间 - if (this.howSure) { - this.getQueryCard() - } - this.$forceUpdate() - } else { - console.log(122) - this.$set(this.form, 'parentName', '') - } + this.form.pkGradeVal = res.data.pkGradeVal }) }, + checkAddress() {}, getValidPcode() { api .validPcode({ parent: this.form.parent, - pkSettleCountry: this.pkCountry, }) .then(res => { if (res.code == 200) { this.form.parentName = res.data.parentName - if (res.data.isFirst) { - // 普通注册首单 - this.pt = true - this.form.placeDept = res.data.placeDept - this.form.placeDeptLabel = - res.data.placeDept == 1 ? '左区' : '右区' - this.form.placeParent = res.data.placeParent - this.form.placeParentName = res.data.placeParentName - } else { - // 普通注册首单 - this.pt = false - } - // 获取创客空间 - if (this.howSure) { - this.getQueryCard() - } - this.$forceUpdate() } }) }, @@ -1120,6 +971,7 @@ export default { }) }) this.allGoodsData.deleteList = deleteList + this.allGoodsData.shopList = deleteList api .queryPostage( Object.assign( @@ -1314,14 +1166,6 @@ export default { }, goBuy() { this.$refs.uForm.validate().then(res => { - // if (this.agreementShow.length == 0) { - // uni.showToast({ - // title: '请阅读并同意购买协议', - // icon: "none", - // duration: 1500, - // }); - // return; - // } this.isLoading = true let deleteList = [] this.shoppingArr.forEach(item => { @@ -1333,6 +1177,8 @@ export default { .confirmRegOrder( Object.assign({}, this.form, this.allGoodsData, { deleteList: deleteList, + shopList: deleteList, + parentCode: this.form.parent, }) ) .then(res => { @@ -1342,10 +1188,7 @@ export default { url: '/pages/pay/index?paramsPost=' + JSON.stringify( - Object.assign( - { makerSpaceMember: this.form.makerSpaceMember }, - res.data - ) + Object.assign({ specialArea: this.specialArea }, res.data) ) + '&businessType=1', }) diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue index 0400976..f01f1fc 100644 --- a/pages/specialArea/list.vue +++ b/pages/specialArea/list.vue @@ -1,662 +1,740 @@ \ No newline at end of file +.search { + margin: 10rpx 20rpx; + padding: 10rpx; + background: #eeeeee; + border-radius: 20px; + font-size: 14px; +} +