angelo
/
web-retail-h5
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(specialArea): 下单主流程跑通

This commit is contained in:
woody 2025-06-10 15:44:49 +08:00
parent bbcbd9ef97
commit f79426d5d6
13 changed files with 1556 additions and 620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
components/cartBtmList.vue
View File

@ -362,56 +362,19 @@ export default {
shoppingId: item,
})
})
const area =
this.goodsCheck[0].specialArea == REGIEST_AREA.id
? 'regiest'
: 'upgrade'
uni.navigateTo({
url:
'/pages/regiest/index?specialArea=' +
this.goodsCheck[0].specialArea +
'&shoppArr=' +
JSON.stringify(shoppArr),
})
} else if (this.goodsCheck[0].specialArea == 21) {
if (
this.userInfo.registerShare == 0 ||
this.userInfo.registerFans == 0
) {
uni.navigateTo({
url:
'/pages/shareArea/haiShare?allData=' +
JSON.stringify(this.goodsCheck[0].orderItemsParams),
})
} else {
uni.setStorageSync(
'haiConfirm',
JSON.stringify(this.goodsCheck[0].orderItemsParams)
)
uni.navigateTo({
url: '/pages/other/haiConfirm?shoppArr=' + JSON.stringify(shoppArr),
})
}
} else if (this.goodsCheck[0].specialArea == 7) {
uni.navigateTo({
url:
'/pages/hiFans/index?specialArea=' +
`/pages/${area}/index?specialArea=` +
this.goodsCheck[0].specialArea +
'&shoppArr=' +
JSON.stringify(shoppArr),
})
} else {
if (this.goodsCheck[0].specialArea == 2) {
let deleteList = []
shoppArr.forEach(item => {
deleteList.push({
shoppingId: item,
})
})
uni.navigateTo({
url:
'/pages/other/index?specialArea=' +
this.goodsCheck[0].specialArea +
'&shoppArr=' +
JSON.stringify(shoppArr),
})
} else if (this.goodsCheck[0].specialArea == 30) {
if (this.goodsCheck[0].specialArea == 30) {
if (this.goodsCheck[0].orderItemsParams.length > 1) {
uni.showToast({
title: '续约专区每次只能购买一件商品',

2
config/order.js
View File

@ -51,3 +51,5 @@ export const validRelation = params =>
http.post('sale/api/retail-order/valid-relation', { params })
// 升级订单
export const upgradeOrder = data =>
http.post('/sale/api/retail-order/confirm-upg-order', data)

13
config/pay.js
View File

@ -51,7 +51,7 @@ export const payRegOrder = params =>
http.post('/sale/api/retail-order/pay-reg-order', params)
//支付其他订单
export const payOthOrder = params =>
http.post('/sale/api/retail-order/pay-oth-order', params)
http.post('/sale/api/retail-order/pay-other-order', params)
//宝付确认支付h5
export const baoFuPay = params => http.post('/pay/baofu-code/order', params)
//汇付确认支付h5
@ -69,15 +69,14 @@ export const payDrawGift = 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 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 registerInfo = params =>
http.get('/member/api/member/register-order/' + params)
// 升级支付
export const upgradePay = params =>
http.post('/sale/api/retail-order/pay-upg-order', params)

6
config/regiest.js
View File

@ -49,12 +49,10 @@ export const validPPcode = params =>
//注册订单验证手机号
export const validPhone = params =>
http.post('/sale/api/retail-order/valid-phone', params)
//获取name
export const upgRel = params =>
http.post('/sale/api/retail-order/validate-upg-rel', params)
//升级复购单确认
export const confirmOthOrder = params =>
http.post('/sale/api/retail-order/confirm-oth-order', params)
http.post('/sale/api/retail-order/confirm-other-order', params)
//嗨粉确认订单
export const confirmFunOrder = params =>

37
index.html
View File

@ -1,25 +1,32 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<head>
<meta charset="UTF-8" />
<script>
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
CSS.supports('top: constant(a)'))
var coverSupport =
'CSS' in window &&
typeof CSS.supports === 'function' &&
(CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
(coverSupport ? ', viewport-fit=cover' : '') +
'" />'
)
</script>
<title></title>
<!--preload-links-->
<!--app-context-->
<link rel="stylesheet" href="<%= BASE_URL %>static/index.css"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"/>
<link rel="stylesheet" href="<%= BASE_URL %>static/index.css" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<script src="https://bd-qd.oss-cn-beijing.aliyuncs.com/test_01/language/zh-CN.js"></script>
</head>
<body>
<div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script>
<script type="module" src="static/cdn/echarts.min.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
</body>
</head>
<body>
<div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script>
<script type="module" src="static/cdn/echarts.min.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
</body>
</html>

5
pages.json
View File

@ -324,11 +324,12 @@
}
},
{
"path": "pages/shareArea/haiShare",
"path": "pages/upgrade/index",
"style": {
"navigationBarTitleText": "海粉信息"
"navigationBarTitleText": "升级专区"
}
},
{
"path": "pages/shareArea/hiList",
"style": {

20
pages/mine/index.vue
View File

@ -1,6 +1,7 @@
<template>
<view class="content">
<!-- 上方头部 -->
<view>
<view class="topBox">
<view class="top_inder">
<view class="top_left">
@ -80,7 +81,9 @@
晋升
<span class="award-name">{{ awards.tarAwardsName }}</span>
小区仅需
<span class="award-amount">{{ sprintProgress.achieved }}</span>
<span class="award-amount">{{
sprintProgress.achieved
}}</span>
<!-- 已完成 {{ awards.sumRealPv }} / 目标 {{ sprintProgress.target }} -->
</view>
</view>
@ -261,6 +264,7 @@
:text="'退出登录'"
></u-button>
</view>
</view>
<cl-tabbar :current="4"></cl-tabbar>
<u-popup
:show="pswShow"
@ -485,7 +489,7 @@ export default {
onShow() {
this.getInfo()
this.orderNum()
this.getUserAwardss()
// this.getUserAwardss()
},
computed: {
@ -693,11 +697,11 @@ export default {
}
}
})
api.getData().then(res => {
if (res.code == 200) {
this.userData = res.data
}
})
// api.getData().then(res => {
// if (res.code == 200) {
// this.userData = res.data
// }
// })
api.getMenuList().then(res => {
res.data.forEach(item => {
@ -1075,6 +1079,8 @@ export default {
padding-bottom: 100rpx; // background-color: #f2f2f2;
position: relative;
font-size: 24rpx;
height: 100vh;
overflow: scroll;
background-image: linear-gradient(
to bottom,
#005bac 5%,

198
pages/other/index.vue
View File

@ -20,18 +20,14 @@
<u-icon name="arrow-down"></u-icon>
</view>
</u-form-item> -->
<view v-if="specialArea != 2 && specialArea != 25 && specialArea != 27">
<view>
<u-form-item
:label="'会员编号'"
required
borderBottom
prop="upgradeMemberCode"
>
<u-input
v-model="form.upgradeMemberCode"
:disabled="isSpace"
border="none"
/>
<u-input v-model="form.upgradeMemberCode" disabled border="none" />
</u-form-item>
<u-form-item
:label="'会员姓名'"
@ -43,39 +39,7 @@
</u-form-item>
</view>
<view v-if="specialArea == 2 || specialArea == 25 || specialArea == 27">
<u-form-item
:label="'升级编号'"
required
borderBottom
prop="upgradeMemberCode"
>
<u-input
v-model="form.upgradeMemberCode"
:disabled="isSpace"
border="none"
/>
</u-form-item>
<u-form-item
:label="'升级姓名'"
required
borderBottom
prop="upgradeMemberName"
>
<u-input v-model="form.upgradeMemberName" disabled border="none" />
</u-form-item>
</view>
<u-form-item
:label="'升级级别'"
v-if="specialArea == 2 || specialArea == 25 || specialArea == 27"
required
borderBottom
prop="pkGradeVal"
>
<u-input v-model="form.pkGradeVal" disabled border="none" />
</u-form-item>
<u-form-item
<!-- <u-form-item
:label="'发货方式'"
required
borderBottom
@ -90,8 +54,8 @@
/>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item
</u-form-item> -->
<!-- <u-form-item
:label="'运输方式'"
:required="isDeliveryWay"
borderBottom
@ -106,44 +70,8 @@
/>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item
v-if="howSure"
required
:label="'创客空间'"
borderBottom
@click="ishowSure = true"
prop="makerSpaceMemberLabel"
>
<view class="disFlex justBwn">
<u-input v-model="form.makerSpaceMemberLabel" border="none" />
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item
:label="'仓库'"
v-if="userInfo.pkSettleCountry != 1"
borderBottom
@click="isCk = true"
prop="pkStorehouseLabel"
>
<view class="disFlex justBwn">
<u-input v-model="form.pkStorehouseLabel" border="none" />
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item
:label="'会员店铺'"
v-if="userInfo.pkSettleCountry != 1"
borderBottom
@click="isDp = true"
prop="pkMemberStoreLabel"
>
<view class="disFlex justBwn">
<u-input v-model="form.pkMemberStoreLabel" border="none" />
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
</u-form-item> -->
<view class="subTxt" v-if="isDeliveryWay">
<view class="subTxt1">{{ '收货人信息' }}</view>
<span class="subTxt2" @click="addAdress">
@ -418,14 +346,6 @@
:columns="transList"
keyName="label"
></u-picker>
<!-- 创客空间 -->
<u-picker
:show="ishowSure"
@cancel="ishowSure = false"
@confirm="surehowSure"
:columns="queryCardList"
keyName="label"
></u-picker>
<!-- 强制阅读协议 -->
<mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
@ -493,19 +413,6 @@ export default {
isDelivery: false,
isBank: false,
isTrans: false,
placeList: [
[
{
id: 1,
label: '安置左区',
},
{
id: 2,
label: '安置右区',
},
],
],
isPlace: false,
countryIndex: 0,
isCountry: false,
userInfo: '',
@ -546,7 +453,6 @@ export default {
upgradeMemberCode: [
{
required: true,
validator: this.upgradeMemberCodePass,
trigger: ['blur'],
},
],
@ -650,7 +556,8 @@ export default {
// 登录信息
this.userInfo = uni.getStorageSync('User')
this.form.upgradeMemberCode = this.userInfo.memberCode
this.getUserName()
this.form.upgradeMemberName = this.userInfo.memberName
// this.getUserName()
if (this.specialArea == 30) {
this.agreementShow = [1]
@ -702,10 +609,6 @@ export default {
item => item.isMakerGift == 4 || item.isMakerGift == 0
)
this.howSure = howSure
// 获取创客空间
if (this.howSure) {
this.getQueryCard()
}
}
api.memLevel(this.allGoodsData).then(res => {
@ -815,12 +718,6 @@ export default {
isYes++
}
})
if (isYes != 0) {
this.howSure = true
if (this.howSure) {
this.getQueryCard()
}
}
}
})
},
@ -857,36 +754,6 @@ export default {
}
}
},
// 升级编号获取name
upgradeMemberCodePass(rule, value, callback) {
if (!value) {
callback(new Error('请输入会员编号'))
} else {
api
.upgRel({
upgradeMemberCode: value,
})
.then(res => {
if (res.code == 200) {
this.form.upgradeMemberName = res.data.upgradeMemberName
if (
this.specialArea == 2 ||
this.specialArea == 25 ||
this.specialArea == 27
) {
this.getMember()
}
this.$forceUpdate()
callback()
} else {
callback(new Error(res.msg))
}
})
.catch(err => {
callback(new Error(err))
})
}
},
sureCk(e) {
const { value } = e
@ -965,6 +832,7 @@ export default {
// this.allGoodsData.deliveryWay = this.form.deliveryWay
// this.allGoodsData.transType = this.form.transType
this.allGoodsData.deleteList = deleteList
this.allGoodsData.shopList = deleteList
api
.queryPostage(
Object.assign(
@ -1027,22 +895,7 @@ export default {
}
})
},
getQueryCard() {
api
.queryCard({
specialArea: this.specialArea,
upgradeMemberCode: this.form.upgradeMemberCode,
})
.then(res => {
let data = res.data.map(item => {
return {
id: item.pkMember,
label: item.storeName,
}
})
this.queryCardList = [data]
})
},
surehowSure(e) {
const { value } = e
this.form.makerSpaceMember = value[0].id
@ -1081,16 +934,7 @@ export default {
})
return
}
if (this.specialArea == 31) {
if (this.totalAmont < 1000) {
uni.showToast({
title: '购买商品总价格不能低于1000元',
icon: 'none',
duration: 1500,
})
return
}
}
this.isLoading = true
let deleteList = []
this.shoppingArr.forEach(item => {
@ -1099,22 +943,26 @@ export default {
})
})
let url
if (this.specialArea == 7 || this.specialArea == 101) {
} else {
url = api.confirmOthOrder
}
url(
api
.confirmOthOrder(
Object.assign({}, this.form, this.allGoodsData, {
deleteList: deleteList,
buyMemberCode: this.userInfo.memberCode,
})
).then(res => {
)
.then(res => {
this.isLoading = false
if (res.code == 200) {
const params = {
...res.data,
specialArea: this.specialArea,
}
uni.redirectTo({
url:
'/pages/pay/index?paramsPost=' +
JSON.stringify(res.data) +
JSON.stringify(params) +
'&businessType=1',
})
}

136
pages/pay/index.vue
View File

@ -333,7 +333,7 @@
</u-collapse>
</view>
<view class="kuang" v-if="!ifcz">
<div v-show="specialArea == 1 || specialArea == 24">
<div v-show="specialArea == REGIEST_AREA.id">
<div class="tit4">{{ '注册会员信息' }}</div>
<div class="quan">
<div class="kuang_i">
@ -405,9 +405,7 @@
</div>
</div>
</div>
<div
v-show="specialArea == 2 || specialArea == 25 || specialArea == 27"
>
<div v-show="specialArea == UPGRADE_AREA.id">
<div class="tit4">{{ '升级会员信息' }}</div>
<div class="quan">
<div class="kuang_i">
@ -447,9 +445,7 @@
</div>
</div>
</div>
<div
v-show="specialArea == 3 || specialArea == 26 || specialArea == 28"
>
<div v-show="specialArea == REPURCHASE_AREA.id">
<div class="tit4">{{ '复购会员信息' }}</div>
<div class="quan">
<div class="kuang_i">
@ -485,112 +481,6 @@
</div>
</div>
</div>
<div v-show="specialArea == 7">
<div class="tit4">{{ '海粉会员信息' }}</div>
<!-- <div class="quan">
<div class="kuang_i">
<div>{{ '申请级别' }}</div>
<div>{{ orderData.pkGradeVal }}</div>
</div>
</div> -->
<div class="quan">
<div class="kuang_i">
<div>{{ '新会员编号' }}</div>
<div>{{ orderData.memberCode }}</div>
</div>
<div class="kuang_i">
<div>{{ '申请级别' }}</div>
<div>{{ orderData.pkGradeVal }}</div>
</div>
<div class="kuang_i">
<div>{{ '新会员姓名' }}</div>
<div>{{ orderData.memberName }}</div>
</div>
<div class="kuang_i">
<div>{{ '新联系方式' }}</div>
<div>{{ orderData.phone }}</div>
</div>
<div class="kuang_i">
<div>{{ '推荐编号' }}</div>
<div>{{ orderData.parent }}</div>
</div>
<div class="kuang_i">
<div>{{ '推荐姓名' }}</div>
<div>{{ orderData.parentName }}</div>
</div>
<!-- <div class="kuang_i">
<div>{{ '安置编号' }}</div>
<div>{{ orderData.placeParent }}</div>
</div>
<div class="kuang_i">
<div>{{ '安置姓名' }}</div>
<div>{{ orderData.placeParentName }}</div>
</div> -->
<!-- <div class="kuang_i">
<div>{{ '安置位置' }}</div>
<div>{{ orderData.placeDeptVal }}</div>
</div> -->
<div class="kuang_i">
<div>{{ '发货方式' }}</div>
<div>{{ orderData.deliveryWayVal }}</div>
</div>
<div class="kuang_i">
<div>{{ '运输方式' }}</div>
<div>{{ orderData.transTypeVal }}</div>
</div>
<div class="kuang_i">
<div>{{ '收货人' }}</div>
<div>{{ orderData.recName }}</div>
</div>
<div class="kuang_i">
<div>{{ '收货电话' }}</div>
<div>{{ orderData.recPhone }}</div>
</div>
<div class="kuang_i">
<div style="white-space: nowrap">{{ '收货地址' }}</div>
<div>
{{ orderData.recProvince }}{{ orderData.recCity
}}{{ orderData.recAddress }}
</div>
</div>
</div>
</div>
<div v-show="specialArea == 13">
<div class="tit4">{{ '福利会员信息' }}</div>
<div class="quan">
<div class="kuang_i">
<div>{{ '会员编号' }}</div>
<div>{{ orderData.memberCode }}</div>
</div>
<div class="kuang_i">
<div>{{ '会员姓名' }}</div>
<div>{{ orderData.memberName }}</div>
</div>
<div class="kuang_i">
<div>{{ '发货方式' }}</div>
<div>{{ orderData.deliveryWayVal }}</div>
</div>
<div class="kuang_i">
<div>{{ '运输方式' }}</div>
<div>{{ orderData.transTypeVal }}</div>
</div>
<div class="kuang_i">
<div>{{ '收货人' }}</div>
<div>{{ orderData.recName }}</div>
</div>
<div class="kuang_i">
<div>{{ '收货电话' }}</div>
<div>{{ orderData.recPhone }}</div>
</div>
<div class="kuang_i">
<div style="white-space: nowrap">{{ '收货地址' }}</div>
<div>
{{ orderData.recProvince }}{{ orderData.recCity
}}{{ orderData.recAddress }}
</div>
</div>
</div>
</div>
</view>
</view>
<!-- 输入验证码，密码 -->
@ -751,6 +641,10 @@ export default {
qrcodeimg: '',
onlinePay: true,
unBindCode: '',
REGIEST_AREA,
UPGRADE_AREA,
REPURCHASE_AREA,
REISSUE_AREA,
}
},
computed: {
@ -916,7 +810,10 @@ export default {
if (
[REGIEST_AREA.id, UPGRADE_AREA.id].includes(Number(this.specialArea))
) {
url = api.payRegOrder
url =
this.specialArea == REGIEST_AREA.id
? api.payRegOrder
: api.upgradePay
} else {
url = api.payOthOrder
}
@ -957,19 +854,12 @@ export default {
url(obj).then(res => {
if (res.code == 200) {
this.isPw = false
if (
[REGIEST_AREA.id, UPGRADE_AREA.id].includes(
Number(this.specialArea)
)
) {
if ([REGIEST_AREA.id].includes(Number(this.specialArea))) {
if (this.isBank) {
this.isPw = false
} else {
this.$refs.successDialog.showSuccess(res.data)
this.$refs.successDialog.showSuccess(res.data || this.orderData)
}
// api.registerInfo(this.orderCode).then(res=>{
// this.$refs.successDialog.showSuccess(res.data)
// })
} else {
if (this.ifcz) {
uni.showToast({

37
pages/regiest/index.vue
View File

@ -1,24 +1,8 @@
<!--
* @Descripttion:
* @version:
* @Author: kBank
* @Date: 2022-11-21 15:11:22
-->
<template>
<view class="content">
<!-- <view class="con_top">
<view class="con_top_i" @click="toRegiest(0)">
<view>{{ '快速注册' }}</view>
<view :class="isClick == 0 ? 'bai' : ''"></view>
</view>
<view class="con_top_i" @click="toRegiest(1)">
<view>{{ '普通注册' }}</view>
<view :class="isClick == 1 ? 'bai' : ''"></view>
</view>
</view> -->
<view class="context">
<u-form :model="form" labelWidth="75" :rules="rules" ref="uForm">
<u-form-item :label="formLevelLabel" borderBottom prop="pkGradeVal">
<u-form-item label="申请级别" borderBottom prop="pkGradeVal">
<u-input
v-model="form.pkGradeVal"
border="none"
@ -47,21 +31,7 @@
>
<u-input v-model="form.parentName" disabled border="none" />
</u-form-item>
<u-form-item
v-if="!isRegiest"
label="会员编号"
required
borderBottom
prop="memberCode"
>
<u-input
:disabled="isRegiest"
:maxlength="40"
v-model="form.memberCode"
border="none"
/>
</u-form-item>
<u-form-item label="会员昵称" required borderBottom prop="memberName">
<u-form-item label="会员姓名" required borderBottom prop="memberName">
<u-input
:disabled="isRegiest"
:maxlength="40"
@ -607,9 +577,6 @@ export default {
}
},
computed: {
formLevelLabel() {
return this.specialArea == UPGRADE_AREA.id ? '升级级别' : '申请级别'
},
isRegiest() {
return this.specialArea == REGIEST_AREA.id
},

4
pages/specialArea/list.vue
View File

@ -258,9 +258,7 @@ export default {
this.titLabel = areaMap[this.specialArea]
uni.setNavigationBarTitle({
title: this.titLabel,
success: () => {
console.log(title)
},
success: () => {},
})
// 获取一级分类并获取商品列表
// this.getClassIfy()

1257
pages/upgrade/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

4
util/specialAreaMap.js
View File

@ -9,10 +9,10 @@ export const UPGRADE_AREA = {
}
export const REISSUE_AREA = {
id: 43,
id: 44,
name: '重消专区',
}
export const REPURCHASE_AREA = {
id: 44,
id: 43,
name: '复购专区',
}