diff --git a/components/cartBtmList.vue b/components/cartBtmList.vue
index 66d8e08..254d4df 100644
--- a/components/cartBtmList.vue
+++ b/components/cartBtmList.vue
@@ -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: '续约专区每次只能购买一件商品',
diff --git a/config/order.js b/config/order.js
index c703ec1..8452598 100644
--- a/config/order.js
+++ b/config/order.js
@@ -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)
diff --git a/config/pay.js b/config/pay.js
index c061caa..849cf9c 100644
--- a/config/pay.js
+++ b/config/pay.js
@@ -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)
diff --git a/config/regiest.js b/config/regiest.js
index d4e3a8b..364a823 100644
--- a/config/regiest.js
+++ b/config/regiest.js
@@ -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 =>
diff --git a/index.html b/index.html
index 72a52eb..adb4f69 100644
--- a/index.html
+++ b/index.html
@@ -1,25 +1,32 @@
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 46b3284..5616a97 100644
--- a/pages.json
+++ b/pages.json
@@ -324,11 +324,12 @@
}
},
{
- "path": "pages/shareArea/haiShare",
+ "path": "pages/upgrade/index",
"style": {
- "navigationBarTitleText": "海粉信息"
+ "navigationBarTitleText": "升级专区"
}
},
+
{
"path": "pages/shareArea/hiList",
"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 417f604..2ae46d2 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,60 +1,61 @@
-
-
-
-
-
-
-
-
-
- {{ userInfo.memberCode }}
+
+
+
+
+
+
-
-
- {{ '结算等级' }}:
- {{ userInfo.pkGradeVal }}
+
+
+
+ {{ userInfo.memberCode }}
-
-
-
-
- {{ userData.registerAuthorityVal }}
+
+
+ {{ '结算等级' }}:
+ {{ userInfo.pkGradeVal }}
+
+
+
+
+
+ {{ userData.registerAuthorityVal }}
+
-
-
- {{ '荣誉奖衔' }}:
- {{ userInfo.pkAwardsVal }}
+
+ {{ '荣誉奖衔' }}:
+ {{ userInfo.pkAwardsVal }}
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 奖衔晋升
-
-
-
- 晋升
- {{ awards.tarAwardsName }}
- 小区仅需
- {{ sprintProgress.achieved }}
-
+
+
+
+ 奖衔晋升
+
+
+
+ 晋升
+ {{ awards.tarAwardsName }}
+ 小区仅需
+ {{
+ sprintProgress.achieved
+ }}
+
+
-
-
- 昨日业绩
-
+
+ 昨日业绩
-
- 左区 {{ awards.aNewPv || 0 }}/右区 {{ awards.bNewPv || 0 }}
-
-
-
-
- 当月业绩
-
-
-
- 左区 {{ awards.aMonthPv || '0.00' }}/右区
- {{ awards.bMonthPv || '0.00' }}
-
-
-
-
- {{ '历史业绩' }}
-
-
-
- 左区 {{ awards.aSumPv }}/右区 {{ awards.bSumPv }}
+
+
+ 左区 {{ awards.aNewPv || 0 }}/右区 {{ awards.bNewPv || 0 }}
+
+
+
+
+ 当月业绩
+
+
+
+ 左区 {{ awards.aMonthPv || '0.00' }}/右区
+ {{ awards.bMonthPv || '0.00' }}
+
+
+
+
+ {{ '历史业绩' }}
+
+
+
+ 左区 {{ awards.aSumPv }}/右区 {{ awards.bSumPv }}
+
-
-
-
- {{ '我的订单' }}
-
- {{ '全部订单' }}
-
-
-
-
-
-
- {{ '待付款' }}
- {{ waitPayNum }}
-
-
-
- {{ '待发货' }}
- {{ payNum }}
-
-
-
- {{ '待收货' }}
-
-
-
- {{ '已收货' }}
-
-
-
-
-
-
-
- {{ '市场动态' }}
-
-
-
-
-
- {{ item.name }}
+
+
+ {{ '我的订单' }}
+
+ {{ '全部订单' }}
+
-
-
-
-
-
-
-
-
-
- {{ item.name }}
+
+
+
+
+ {{ '待付款' }}
+ {{ waitPayNum }}
-
-
+
+
+ {{ '市场动态' }}
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
-
-
-
-
+
-
-
+
-
-
+
+
+
{
- 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%,
diff --git a/pages/other/index.vue b/pages/other/index.vue
index 39ef92c..a35096c 100644
--- a/pages/other/index.vue
+++ b/pages/other/index.vue
@@ -20,18 +20,14 @@
-->
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
{{ '收货人信息' }}
@@ -418,14 +346,6 @@
:columns="transList"
keyName="label"
>
-
-
@@ -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,26 +943,30 @@ export default {
})
})
let url
- if (this.specialArea == 7 || this.specialArea == 101) {
- } else {
- url = api.confirmOthOrder
- }
- url(
- Object.assign({}, this.form, this.allGoodsData, {
- deleteList: deleteList,
- })
- ).then(res => {
- this.isLoading = false
- if (res.code == 200) {
- uni.redirectTo({
- url:
- '/pages/pay/index?paramsPost=' +
- JSON.stringify(res.data) +
- '&businessType=1',
+ api
+ .confirmOthOrder(
+ Object.assign({}, this.form, this.allGoodsData, {
+ deleteList: deleteList,
+ buyMemberCode: this.userInfo.memberCode,
})
- }
- })
+ )
+ .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(params) +
+ '&businessType=1',
+ })
+ }
+ })
})
},
getDiqu() {
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index aecf552..31c7457 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -333,7 +333,7 @@
-
+
-
+
-
+
-
-
{{ '海粉会员信息' }}
-
-
-
-
{{ '新会员编号' }}
-
{{ orderData.memberCode }}
-
-
-
{{ '申请级别' }}
-
{{ orderData.pkGradeVal }}
-
-
-
{{ '新会员姓名' }}
-
{{ orderData.memberName }}
-
-
-
{{ '新联系方式' }}
-
{{ orderData.phone }}
-
-
-
{{ '推荐编号' }}
-
{{ orderData.parent }}
-
-
-
{{ '推荐姓名' }}
-
{{ orderData.parentName }}
-
-
-
-
-
{{ '发货方式' }}
-
{{ orderData.deliveryWayVal }}
-
-
-
{{ '运输方式' }}
-
{{ orderData.transTypeVal }}
-
-
-
{{ '收货人' }}
-
{{ orderData.recName }}
-
-
-
{{ '收货电话' }}
-
{{ orderData.recPhone }}
-
-
-
{{ '收货地址' }}
-
- {{ orderData.recProvince }}{{ orderData.recCity
- }}{{ orderData.recAddress }}
-
-
-
-
-
-
{{ '福利会员信息' }}
-
-
-
{{ '会员编号' }}
-
{{ orderData.memberCode }}
-
-
-
{{ '会员姓名' }}
-
{{ orderData.memberName }}
-
-
-
{{ '发货方式' }}
-
{{ orderData.deliveryWayVal }}
-
-
-
{{ '运输方式' }}
-
{{ orderData.transTypeVal }}
-
-
-
{{ '收货人' }}
-
{{ orderData.recName }}
-
-
-
{{ '收货电话' }}
-
{{ orderData.recPhone }}
-
-
-
{{ '收货地址' }}
-
- {{ orderData.recProvince }}{{ orderData.recCity
- }}{{ orderData.recAddress }}
-
-
-
-
@@ -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({
diff --git a/pages/regiest/index.vue b/pages/regiest/index.vue
index 3d401d8..66c6191 100644
--- a/pages/regiest/index.vue
+++ b/pages/regiest/index.vue
@@ -1,24 +1,8 @@
-
-
-
+
-
-
-
-
+
{
- console.log(title)
- },
+ success: () => {},
})
// 获取一级分类并获取商品列表
// this.getClassIfy()
diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue
new file mode 100644
index 0000000..08d21b9
--- /dev/null
+++ b/pages/upgrade/index.vue
@@ -0,0 +1,1257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '收货人信息' }}
+
+
+ {{ '添加' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '历史地址' }}
+
+
+
+
+
+
+
+ {{ item.recName }}
+ {{
+ '默认'
+ }}
+
+
+
+
+
+
+ {{ item.recPhone }}
+ {{ item.recArea }}{{ item.recAddress }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.waresName }}
+
+ x{{ item.quantity }}
+
+
+
+ {{ item.price | numberToCurrency | isLocal }}
+
+ 业绩: {{ item.achieve | numberToCurrency | isLocal }}
+
+
+
+
+
+
+ {{ stem.productName }} {{ stem.skuInfo }}
+ x{{ stem.quantity }}
+
+
+
+
+ {{ '商品业绩' }}
+ {{
+ item.achieveAmount | numberToCurrency
+ }}
+
+
+ {{ '金额小计' }}
+ {{
+ item.priceAmount | numberToCurrency
+ }}
+
+
+
+
+
+
+
+ {{ '商品金额总计' }}(¥):
+ {{
+ allGoodsData.priceAmount | numberToCurrency | isLocal
+ }}
+
+
+ {{ '邮费' }}:
+ {{
+ form.postage | numberToCurrency | isLocal
+ }}
+
+
+ {{ '总价' }}:
+ {{
+ totalAmont | numberToCurrency | isLocal
+ }}
+
+
+ {{ '业绩' }}
+ {{
+ allGoodsData.achieveAmount | numberToCurrency | isLocal
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/util/specialAreaMap.js b/util/specialAreaMap.js
index 9b17100..02c2991 100644
--- a/util/specialAreaMap.js
+++ b/util/specialAreaMap.js
@@ -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: '复购专区',
}