angelo
/
web-store-retail-h5
forked from angelo/web-retail-h5
3
0
Fork 0
Code Pull Requests Activity

feat(order): 升级单流程改造50%

This commit is contained in:
woody 2025-06-10 09:21:43 +08:00
parent 9a46dfe0ef
commit 66558d876f
11 changed files with 322 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -1,8 +1,8 @@
{ {
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.eslint": true, "source.fixAll.eslint": "explicit",
"source.organizeImports": true "source.organizeImports": "explicit"
}, },
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"[vue]": { "[vue]": {

1
components/area-product-list/index.vue
View File

@ -108,7 +108,6 @@ export default {
}, },
handleProductClick(item) { handleProductClick(item) {
// 商品点击事件，可根据需求实现跳转或其他逻辑 // 商品点击事件，可根据需求实现跳转或其他逻辑
console.log(item, '....ite?')
this.$emit('product-click', item) this.$emit('product-click', item)
}, },
handleAddToCart(item) { handleAddToCart(item) {

9
components/area-product-list/special-area-wrapper.vue
View File

@ -6,6 +6,7 @@
<area-product-list <area-product-list
:list="registList" :list="registList"
:title="regist.name" :title="regist.name"
@product-click="redirectList"
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
@ -15,6 +16,7 @@
<area-product-list <area-product-list
:list="upgradeList" :list="upgradeList"
:title="upgrade.name" :title="upgrade.name"
@product-click="redirectList"
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
@ -24,6 +26,7 @@
<area-product-list <area-product-list
:list="repurchaseList" :list="repurchaseList"
:title="repurchase.name" :title="repurchase.name"
@product-click="redirectList"
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
@ -33,6 +36,7 @@
<area-product-list <area-product-list
:list="rescissionList" :list="rescissionList"
:title="rescission.name" :title="rescission.name"
@product-click="redirectList"
></area-product-list> ></area-product-list>
</view> </view>
</view> </view>
@ -94,6 +98,11 @@ export default {
} }
}) })
}, },
redirectList(item) {
uni.navigateTo({
url: `/pages/specialArea/list?specialArea=${item.specialArea}&id=${item.pkId}`,
})
},
}, },
} }
</script> </script>

28
components/cartBtmList.vue
View File

@ -152,6 +152,13 @@
<script> <script>
import * as api from '@/config/goods' import * as api from '@/config/goods'
import {
REGIEST_AREA,
UPGRADE_AREA,
REPURCHASE_AREA,
REISSUE_AREA,
} from '@/util/specialAreaMap'
import { MEMBER_SIGN } from '@/util/common'
export default { export default {
data() { data() {
@ -345,8 +352,9 @@ export default {
}) })
uni.setStorageSync('allGoods', JSON.stringify(shoppArr)) uni.setStorageSync('allGoods', JSON.stringify(shoppArr))
if ( if (
this.goodsCheck[0].specialArea == 1 || [REGIEST_AREA.id, UPGRADE_AREA.id].includes(
this.goodsCheck[0].specialArea == 24 this.goodsCheck[0].specialArea
)
) { ) {
let deleteList = [] let deleteList = []
shoppArr.forEach(item => { shoppArr.forEach(item => {
@ -430,22 +438,6 @@ export default {
}) })
} }
} }
} else if (this.goodsCheck[0].specialArea == 31) {
if (this.totalPrice < 1000) {
uni.showToast({
title: '购买商品总价格不能低于1000元',
icon: 'none',
duration: 1500,
})
} else {
uni.navigateTo({
url:
'/pages/other/index?specialArea=' +
this.goodsCheck[0].specialArea +
'&shoppArr=' +
JSON.stringify(shoppArr),
})
}
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: url:

2
config/order.js
View File

@ -49,3 +49,5 @@ export const getUpgradeLevel = params =>
// 下单前校验 // 下单前校验
export const validRelation = params => export const validRelation = params =>
http.post('sale/api/retail-order/valid-relation', { params }) http.post('sale/api/retail-order/valid-relation', { params })
// 升级订单

2
config/request.js
View File

@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER //#ifdef DEV_SERVER
console.log('DEV_SERVER') console.log('DEV_SERVER')
config.baseURL = 'http://192.168.0.100:8080' config.baseURL = 'http://192.168.0.102:8080'
//#endif //#endif
//#ifdef QA_SERVER //#ifdef QA_SERVER

5
pages.json
View File

@ -262,10 +262,7 @@
"path": "pages/shareRegist/index", "path": "pages/shareRegist/index",
"style": { "style": {
"navigationBarTitleText": "注册", "navigationBarTitleText": "注册",
"navigationBarBackgroundColor": "#F33030", "navigationBarBackgroundColor": "#fff"
"app-plus": {
"titleNView": false
}
} }
}, },
{ {

138
pages/regiest/index.vue
View File

@ -18,7 +18,7 @@
</view> --> </view> -->
<view class="context"> <view class="context">
<u-form :model="form" labelWidth="75" :rules="rules" ref="uForm"> <u-form :model="form" labelWidth="75" :rules="rules" ref="uForm">
<u-form-item :label="'申请级别'" borderBottom prop="pkGradeVal"> <u-form-item :label="formLevelLabel" borderBottom prop="pkGradeVal">
<u-input <u-input
v-model="form.pkGradeVal" v-model="form.pkGradeVal"
border="none" border="none"
@ -26,47 +26,59 @@
disabled disabled
/> />
</u-form-item> </u-form-item>
<!-- <u-form-item <u-form-item
:label="'自然国家'" v-show="isRegiest"
@tap="changeCountry(0)" :label="'推荐编号'"
required
borderBottom borderBottom
prop="parent"
> >
<view class="disFlex justBwn">
<view class="disFlex">
<img class="countImg" :src="form.pkCountryImg" alt="" />
<view>{{ form.pkCountryLabel }}</view>
</view>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item> -->
<!-- @tap="changeCountry(1)" -->
<!-- <u-form-item :label="'结算国家'" borderBottom>
<view class="disFlex justBwn">
<view class="disFlex">
<img class="countImg" :src="form.pkSettleCountryImg" alt="" />
<view>{{ form.pkSettleCountryLabel }}</view>
</view>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item> -->
<u-form-item :label="'推荐编号'" required borderBottom prop="parent">
<u-input <u-input
v-model="form.parent" v-model="form.parent"
@blur="getValidPcode()" @blur="getValidPcode()"
border="none" border="none"
/> />
</u-form-item> </u-form-item>
<u-form-item :label="'推荐姓名'" borderBottom prop="parentName"> <u-form-item
v-show="isRegiest"
:label="'推荐姓名'"
borderBottom
prop="parentName"
>
<u-input v-model="form.parentName" disabled border="none" /> <u-input v-model="form.parentName" disabled border="none" />
</u-form-item> </u-form-item>
<u-form-item
<u-form-item label="会员昵称" required borderBottom prop="memberName"> v-if="!isRegiest"
<u-input :maxlength="40" v-model="form.memberName" border="none" /> label="会员编号"
required
borderBottom
prop="memberCode"
>
<u-input
:disabled="isRegiest"
:maxlength="40"
v-model="form.memberCode"
border="none"
/>
</u-form-item> </u-form-item>
<u-form-item :label="'联系方式'" required borderBottom prop="phone"> <u-form-item label="会员昵称" required borderBottom prop="memberName">
<u-input
:disabled="isRegiest"
:maxlength="40"
v-model="form.memberName"
border="none"
/>
</u-form-item>
<u-form-item
v-show="isRegiest"
:label="'联系方式'"
required
borderBottom
prop="phone"
>
<u-input <u-input
v-model="form.phone" v-model="form.phone"
:disabled="isRegiest"
maxlength="11" maxlength="11"
type="number" type="number"
border="none" border="none"
@ -366,14 +378,7 @@
:columns="countryList" :columns="countryList"
keyName="label" keyName="label"
></u-picker> ></u-picker>
<!-- 选择安置位置 -->
<u-picker
:show="isPlace"
@cancel="isPlace = false"
@confirm="surePlace"
:columns="placeList"
keyName="label"
></u-picker>
<!-- 发货方式 --> <!-- 发货方式 -->
<u-picker <u-picker
:show="isDelivery" :show="isDelivery"
@ -467,19 +472,6 @@ export default {
isDelivery: false, isDelivery: false,
isBank: false, isBank: false,
isTrans: false, isTrans: false,
placeList: [
[
{
id: 1,
label: '安置左区',
},
{
id: 2,
label: '安置右区',
},
],
],
isPlace: false,
countryIndex: 0, countryIndex: 0,
isCountry: false, isCountry: false,
userInfo: '', userInfo: '',
@ -614,6 +606,14 @@ export default {
selTable: [], selTable: [],
} }
}, },
computed: {
formLevelLabel() {
return this.specialArea == UPGRADE_AREA.id ? '升级级别' : '申请级别'
},
isRegiest() {
return this.specialArea == REGIEST_AREA.id
},
},
onLoad(options) { onLoad(options) {
const user = uni.getStorageSync('User') const user = uni.getStorageSync('User')
this.pkCountry = user.pkSettleCountry this.pkCountry = user.pkSettleCountry
@ -805,19 +805,31 @@ export default {
// this.allGoodsData.deleteList = deleteList // this.allGoodsData.deleteList = deleteList
// console.log(this.shoppingArr, '....allGoodsData') // console.log(this.shoppingArr, '....allGoodsData')
// return // return
api const params = {
.memLevel({ firstCheck: 0,
firstCheck: 0, specialArea: this.specialArea,
specialArea: this.specialArea, shopList: this.shoppingArr.map(id => {
shopList: this.shoppingArr.map(id => { return {
return { shoppingId: id,
shoppingId: id, }
} }),
}), }
}) if (this.specialArea == UPGRADE_AREA.id) {
.then(res => { params.upgradeMemberCode = this.form.parent
this.form.pkGradeVal = res.data.pkGradeVal }
}) api.memLevel(params).then(res => {
if (res.code == 200) {
if (res.data.isEnough) {
this.form.pkGradeVal = res.data.pkGradeVal
} else {
this.form.pkGradeVal = ''
uni.showToast({
title: res.data.msg,
icon: 'none',
})
}
}
})
}, },
checkAddress() {}, checkAddress() {},
getValidPcode() { getValidPcode() {

292
pages/shareRegist/index.vue
View File

@ -5,93 +5,91 @@
* @Date: 2022-11-21 15:11:22 * @Date: 2022-11-21 15:11:22
--> -->
<template> <template>
<view > <view>
<view v-if="!pkCountry" class="content1"> <view v-if="!pkCountry" class="content1">
<!-- <view class="index_header"> <!-- <view class="index_header">
<view>注册</view> <view>注册</view>
</view> --> </view> -->
<!-- <view class="tit" v-if="!pkCountry">{{ '嗨粉扫天下' }}</view> --> <!-- <view class="tit" v-if="!pkCountry">{{ '嗨粉扫天下' }}</view> -->
<!-- 海粉 --> <!-- 海粉 -->
<view class="formed1" <view class="formed1">
> <u-form :model="form" labelWidth="80px" ref="uForm" :rules="rules">
<u-form :model="form" <u-form-item label="" prop="memberCode">
labelWidth="80px" <u-input v-model="form.memberCode" type="number" disabled>
ref="uForm" <u--text
:rules="rules"> :text="howHeader"
<u-form-item label="" slot="prefix"
prop="memberCode"> margin="0 3px 0 0"
<u-input v-model="form.memberCode" type="tips"
type="number" ></u--text>
disabled> </u-input>
<u--text :text="howHeader" </u-form-item>
slot="prefix" <u-form-item label="" prop="memberName">
margin="0 3px 0 0" <u-input
type="tips"></u--text> v-model="form.memberName"
</u-input> :placeholder="'请输入会员姓名'"
</u-form-item> />
<u-form-item label="" </u-form-item>
prop="memberName"> <u-form-item label="" prop="phone">
<u-input v-model="form.memberName" <u-input
:placeholder="'请输入会员姓名'" /> v-model="form.phone"
</u-form-item> @blur="setMemberCode"
<u-form-item label="" :placeholder="'请输入联系方式'"
prop="phone"> type="number"
<u-input v-model="form.phone" @blur="setMemberCode" maxlength="20"
:placeholder="'请输入联系方式'" type="number" maxlength="20" /> />
</u-form-item> </u-form-item>
<u-form-item label="" <u-form-item label="" prop="loginPassword">
prop="loginPassword"> <u-input
<u-input :password="isPwd" :password="isPwd"
:placeholder="'请输入登录密码'" :placeholder="'请输入登录密码'"
v-model="form.loginPassword"> v-model="form.loginPassword"
<template slot="suffix"> >
<u-icon name="eye" <template slot="suffix">
@tap="isPwd=!isPwd" <u-icon name="eye" @tap="isPwd = !isPwd" v-if="!isPwd"></u-icon>
v-if="!isPwd"></u-icon> <u-icon name="eye-off" @tap="isPwd = !isPwd" v-else></u-icon>
<u-icon name="eye-off" </template>
@tap="isPwd=!isPwd" </u-input>
v-else></u-icon> </u-form-item>
</template> <u-form-item label="" prop="payPassword">
</u-input> <u-input
</u-form-item> :password="isPwd2"
<u-form-item label="" :placeholder="'请输入支付密码'"
prop="payPassword"> v-model="form.payPassword"
<u-input :password="isPwd2" >
:placeholder="'请输入支付密码'" <template slot="suffix">
v-model="form.payPassword"> <u-icon
<template slot="suffix"> name="eye"
<u-icon name="eye" @tap="isPwd2 = !isPwd2"
@tap="isPwd2=!isPwd2" v-if="!isPwd2"
v-if="!isPwd2"></u-icon> ></u-icon>
<u-icon name="eye-off" <u-icon name="eye-off" @tap="isPwd2 = !isPwd2" v-else></u-icon>
@tap="isPwd2=!isPwd2" </template>
v-else></u-icon> </u-input>
</template> </u-form-item>
</u-input> <u-form-item label="" prop="code">
</u-form-item> <u-input v-model="form.code" :placeholder="'请输入验证码'">
<u-form-item label="" <template slot="suffix">
prop="code"> <view class="getCode" @tap="getVilCode">{{ getCode }}</view>
<u-input v-model="form.code" </template>
:placeholder="'请输入验证码'"> </u-input>
<template slot="suffix"> </u-form-item>
<view class="getCode" </u-form>
@tap="getVilCode">{{ getCode }}</view> <u-button
</template> type="success"
</u-input> class="uBtn"
</u-form-item> shape="circle"
</u-form> color="linear-gradient(to right, #005BAC, #005BAC )"
<u-button type="success" :loading="isLoading"
class="uBtn" :loadingText="'注册中'"
shape="circle" @click="toLogin"
color="linear-gradient(to right, #005BAC, #005BAC )" >{{ '立即注册' }}</u-button
:loading="isLoading" >
:loadingText="'注册中'" </view>
@click="toLogin">{{ '立即注册' }}</u-button>
</view> </view>
</view> <view v-else class="content">
<view v-else class="content"> <!-- <view class="tit" >{{ '海粉扫天下' }}</view>
<!-- <view class="tit" >{{ '海粉扫天下' }}</view>
<view class="formed" <view class="formed"
> >
<u-form :model="form" <u-form :model="form"
@ -184,11 +182,9 @@
:columns="countryList"></u-picker> :columns="countryList"></u-picker>
</view> --> </view> -->
</view>
<view class="mask" v-if="isTrue"> </view>
</view> </view>
<view class="mask" v-if="isTrue">
</view>
</view>
</template> </template>
<script> <script>
@ -197,7 +193,7 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
isTrue:false, isTrue: false,
howHeader: 'HF', howHeader: 'HF',
pkParent: '', pkParent: '',
form: { form: {
@ -225,15 +221,15 @@ export default {
memberName: [ memberName: [
{ {
required: true, required: true,
message:'请输入会员姓名', message: '请输入会员姓名',
trigger: [ 'blur'], trigger: ['blur'],
}, },
], ],
phone: [ phone: [
{ {
required: true, required: true,
message: '请输入联系方式', message: '请输入联系方式',
trigger: [ 'blur'], trigger: ['blur'],
}, },
], ],
code: [ code: [
@ -254,7 +250,7 @@ export default {
{ {
required: true, required: true,
message: '请输入支付密码', message: '请输入支付密码',
trigger: [ 'blur'], trigger: ['blur'],
}, },
], ],
}, },
@ -303,11 +299,12 @@ export default {
this.pkCountry = options.country || '' this.pkCountry = options.country || ''
this.getGenerate() this.getGenerate()
if (this.pkCountry) { if (this.pkCountry) {
this.getCountry() this.getCountry()
this.form.pkCountry = this.pkCountry this.form.pkCountry = this.pkCountry
uni.setStorageSync('pkCountry',this.pkCountry) uni.setStorageSync('pkCountry', this.pkCountry)
uni.redirectTo({ url: '/pages/shareArea/hiList?pkParent=' + this.pkParent}) uni.redirectTo({
url: '/pages/shareArea/hiList?pkParent=' + this.pkParent,
})
// this.$refs.uForm1.setRules(this.rules1) // this.$refs.uForm1.setRules(this.rules1)
} else { } else {
// 获取前缀 // 获取前缀
@ -318,20 +315,20 @@ export default {
}, },
onShow() {}, onShow() {},
methods: { methods: {
setMemberCode(){ setMemberCode() {
// this.form.memberCode = this.form.phone // this.form.memberCode = this.form.phone
this.$set(this.form,'memberCode',this.form.phone) this.$set(this.form, 'memberCode', this.form.phone)
}, },
selCountry(){ selCountry() {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认更换自然国', content: '确认更换自然国',
success: (res) => { success: res => {
if (res.confirm) { if (res.confirm) {
this.isCountry = true this.isCountry = true
} }
}, },
}) })
}, },
memberCodeRule(rule, value, callback) { memberCodeRule(rule, value, callback) {
if (!value) { if (!value) {
@ -340,7 +337,7 @@ export default {
if (value.length < 10 || value.length > 20) { if (value.length < 10 || value.length > 20) {
callback(new Error('请输入10-20位数字')) callback(new Error('请输入10-20位数字'))
} else { } else {
api.validateMember(value).then((res) => { api.validateMember(value).then(res => {
if (res.code == 200) { if (res.code == 200) {
callback() callback()
} else { } else {
@ -351,30 +348,30 @@ export default {
} }
}, },
getHeader() { getHeader() {
api.checkShare().then((res) => { api.checkShare().then(res => {
if(res.code != 200){ if (res.code != 200) {
this.isTrue = true this.isTrue = true
}else{ } else {
this.isTrue = false this.isTrue = false
} }
}) })
// api.prefix(this.pkParent).then((res) => { // api.prefix(this.pkParent).then((res) => {
// this.howHeader = res.msg // this.howHeader = res.msg
// }) // })
}, },
getGenerate() { getGenerate() {
api.generate().then((res) => { api.generate().then(res => {
uni.setStorageSync('mToken', res.msg) uni.setStorageSync('mToken', res.msg)
}) })
}, },
toLogin() { toLogin() {
this.$refs.uForm.validate().then((res) => { this.$refs.uForm.validate().then(res => {
this.isLoading = true this.isLoading = true
api api
.regShareMember( .regShareMember(
Object.assign({}, this.form, { parent: this.pkParent }) Object.assign({}, this.form, { parent: this.pkParent })
) )
.then((res) => { .then(res => {
this.isLoading = false this.isLoading = false
if (res.code == 200) { if (res.code == 200) {
uni.redirectTo({ uni.redirectTo({
@ -387,11 +384,11 @@ export default {
}) })
}, },
hiLogin() { hiLogin() {
this.$refs.uForm1.validate().then((res) => { this.$refs.uForm1.validate().then(res => {
this.isLoading = true this.isLoading = true
api api
.hiRegister(Object.assign({}, this.form, { pkParent: this.pkParent })) .hiRegister(Object.assign({}, this.form, { pkParent: this.pkParent }))
.then((res) => { .then(res => {
this.isLoading = false this.isLoading = false
if (res.code == 200) { if (res.code == 200) {
uni.redirectTo({ uni.redirectTo({
@ -409,16 +406,16 @@ export default {
this.isCountry = false this.isCountry = false
}, },
getCountry() { getCountry() {
api.getCountry().then((res) => { api.getCountry().then(res => {
this.countryList = [ this.countryList = [
res.data.map((item) => { res.data.map(item => {
return { return {
label: item.shortName, label: item.shortName,
id: item.pkId, id: item.pkId,
} }
}), }),
] ]
this.countryList[0].forEach((item) => { this.countryList[0].forEach(item => {
if (this.pkCountry == item.id) { if (this.pkCountry == item.id) {
this.form.jsName = item.label this.form.jsName = item.label
this.form.pkCountryName = item.label this.form.pkCountryName = item.label
@ -433,8 +430,8 @@ export default {
.verification({ .verification({
phone: this.form.phone, phone: this.form.phone,
}) })
.then((res) => {}) .then(res => {})
.catch((err) => { .catch(err => {
this.beginTime = 0 this.beginTime = 0
}) })
}, },
@ -460,35 +457,38 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content1{ .content1 {
background-image: url('@/static/images/haiRgeiest1.jpg'); background-color: #fff;
// background-image: url('@/static/images/haiRgeiest1.jpg');
background-size: 100%; background-size: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100vh; height: 100vh;
} }
.content{ .content {
background-image: url('@/static/images/huan.jpg'); background-image: url('@/static/images/huan.jpg');
// background-image: url('@/static/images/regiestBg.jpg'); // background-image: url('@/static/images/regiestBg.jpg');
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
height: 100vh; height: 100vh;
} }
.tit{ .tit {
font-size: 48px; font-size: 48px;
font-family: PangMenZhengDao-Regular, PangMenZhengDao; font-family: PangMenZhengDao-Regular, PangMenZhengDao;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #ffffff;
text-align: center; text-align: center;
padding-top: 80px; padding-top: 80px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.index_header { .index_header {
background: #f9f9f9;; background: #f9f9f9;
height: 330rpx; height: 330rpx;
font-size: 18px; font-size: 18px;
font-family: PingFang SC-Semibold, PingFang SC; font-family:
PingFang SC-Semibold,
PingFang SC;
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
text-align: center; text-align: center;
@ -503,9 +503,11 @@ margin-bottom: 20px;
} }
.getCode { .getCode {
font-size: 10px; font-size: 10px;
font-family: PingFang SC-Regular, PingFang SC; font-family:
PingFang SC-Regular,
PingFang SC;
font-weight: 400; font-weight: 400;
color: #005BAC; color: #005bac;
} }
.uBtn { .uBtn {
margin-top: 120rpx; margin-top: 120rpx;
@ -519,14 +521,14 @@ margin-bottom: 20px;
border-style: solid; border-style: solid;
border-radius: 4px; border-radius: 4px;
padding: 6px 9px; padding: 6px 9px;
background: #fff;
}
::v-deep .u-input{
background: #fff; background: #fff;
} }
.mask{ ::v-deep .u-input {
background: #fff;
}
.mask {
position: fixed; position: fixed;
background: rgba(0,0,0,0.5); background: rgba(0, 0, 0, 0.5);
width: 100%; width: 100%;
height: 100vh; height: 100vh;
top: 0; top: 0;

1
pages/specialArea/index.vue
View File

@ -35,5 +35,6 @@ export default {
background: #f2f2f2; background: #f2f2f2;
// padding: 0 20rpx; // padding: 0 20rpx;
min-height: 94vh; min-height: 94vh;
padding-bottom: 100rpx;
} }
</style> </style>

174
pages/specialArea/list.vue
View File

@ -10,13 +10,6 @@
<view class="index_header"> <view class="index_header">
<view>{{ titLabel }}</view> <view>{{ titLabel }}</view>
</view> </view>
<view class="shareImg" v-if="specialArea == 7" @click="goShare">
<u-icon name="share-square" size="24" color="#005BAC"> </u-icon>
</view>
<view class="shareImg1" v-if="specialArea == 1" @tap="changeCountry">
<img :src="pkCountryImg" alt="" />
<u-icon name="arrow-down" color="#999"></u-icon>
</view>
<u-scroll-list <u-scroll-list
:indicator="false" :indicator="false"
v-if="itemChildren.length > 1" v-if="itemChildren.length > 1"
@ -107,12 +100,6 @@
<view class="pv" v-if="specialArea == 10"> <view class="pv" v-if="specialArea == 10">
积分可抵扣:{{ item.deductMoney | numberToCurrency }} 积分可抵扣:{{ item.deductMoney | numberToCurrency }}
</view> </view>
<view
class="pv"
v-if="specialArea == 31 && userInfo.isMakerSpace == 0"
>
业绩:{{ item.waresAchieve | numberToCurrency }}
</view>
<view class="pv" v-if="specialArea == 13"> <view class="pv" v-if="specialArea == 13">
BV:{{ item.assAchieve | numberToCurrency }} BV:{{ item.assAchieve | numberToCurrency }}
</view> </view>
@ -181,6 +168,15 @@ import { mapGetters, mapActions } from 'vuex'
import * as api from '@/config/goods' import * as api from '@/config/goods'
import clTabbar from '@/components/cl-tabbar.vue' import clTabbar from '@/components/cl-tabbar.vue'
import selSpaceGoods from '@/components/selSpaceGoods.vue' import selSpaceGoods from '@/components/selSpaceGoods.vue'
import {
REGIEST_AREA,
UPGRADE_AREA,
REPURCHASE_AREA,
REISSUE_AREA,
} from '@/util/specialAreaMap'
import { MEMBER_SIGN } from '@/util/common'
import areaProductList from '@/components/area-product-list/index.vue'
import { getAreaGoods } from '@/config/special-area'
export default { export default {
components: { components: {
@ -221,13 +217,13 @@ export default {
} }
}, },
onLoad(options) { onLoad(options) {
if (JSON.parse(options.children).length > 0) { if (JSON.parse(options?.children || '[]').length > 0) {
let arr = [] let arr = []
if (options.childArea) { if (options.childArea) {
this.specialArea = options.childArea this.specialArea = options.childArea
// this.diff = 1 // this.diff = 1
} else { } else {
JSON.parse(options.children).forEach(item => { JSON.parse(options?.children || '[]').forEach(item => {
if (item.isShow) { if (item.isShow) {
arr.push(item.value) arr.push(item.value)
} }
@ -242,40 +238,36 @@ export default {
this.specialArea = options.specialArea this.specialArea = options.specialArea
} }
this.titLabel = options.label // this.titLabel = options.label
let tempArr = JSON.parse(options.children) // let tempArr = JSON.parse(options?.children || '[]')
if (this.specialArea != 18) { // if (this.specialArea != 18) {
api.menuList().then(res => { // api.menuList().then(res => {
tempArr = tempArr.filter(item => // tempArr = tempArr.filter(item =>
res.data.find(ctem => ctem.menuKey == item.name) // res.data.find(ctem => ctem.menuKey == item.name)
) // )
this.itemChildren = tempArr // this.itemChildren = tempArr
}) // })
} // }
// 修改标题 // 修改标题
const areaMap = {
[REGIEST_AREA.id]: REGIEST_AREA.name,
[UPGRADE_AREA.id]: UPGRADE_AREA.name,
[REPURCHASE_AREA.id]: REPURCHASE_AREA.name,
[REISSUE_AREA.id]: REISSUE_AREA.name,
}
this.titLabel = areaMap[this.specialArea]
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.titLabel, title: this.titLabel,
success: () => {}, success: () => {
console.log(title)
},
}) })
// 获取一级分类并获取商品列表 // 获取一级分类并获取商品列表
// this.getClassIfy() // this.getClassIfy()
this.userInfo = uni.getStorageSync('User') this.userInfo = uni.getStorageSync('User')
console.log(
'%c [ this.userInfo ]-242', this.pkCountry = this.userInfo.pkCountry || 1
'font-size:13px; background:#cb38d2; color:#ff7cff;',
this.userInfo
)
if (this.specialArea == 1) {
if (uni.getStorageSync('pkCountry')) {
this.pkCountry = uni.getStorageSync('pkCountry')
} else {
this.pkCountry = this.userInfo.pkSettleCountry
uni.setStorageSync('pkCountry', this.pkCountry + '')
}
} else {
this.pkCountry = this.userInfo.pkSettleCountry
}
this.setSpecial({ this.setSpecial({
value: this.specialArea, value: this.specialArea,
}) })
@ -299,7 +291,6 @@ export default {
this.setSmallCarLength(0) this.setSmallCarLength(0)
}, },
beforeDestroy() { beforeDestroy() {
console.log('beforeDestroy........?')
this.setSmallCarLength(0) this.setSmallCarLength(0)
}, },
methods: { methods: {
@ -342,18 +333,8 @@ export default {
}) })
}, },
setSpecial(item) { setSpecial(item) {
if (item.value == 21) { this.specialArea = item.value
// uni.navigateTo({ this.getClassIfy()
// url:
// '/pages/specialArea/haIndex?label=' +
// this.titLabel +
// '&specialArea=21&children=' +
// JSON.stringify(this.itemChildren),
// })
} else {
this.specialArea = item.value
this.getClassIfy()
}
}, },
addCar(item) { addCar(item) {
let carList = { let carList = {
@ -363,29 +344,20 @@ export default {
waresCode: item.waresCode, waresCode: item.waresCode,
productGroup: item.productGroup, productGroup: item.productGroup,
} }
if ( api.addShopping(carList).then(res => {
item.isMakerGift == 2 && if (res.code == 200) {
(item.specialArea == 1 || item.specialArea == 3) uni.showToast({
) { title: '购物车添加成功',
this.$refs.selSpaceGoods.getData(carList) icon: 'success',
} else { mask: true,
api.addShopping(carList).then(res => { })
if (res.code == 200) { setTimeout(() => {
uni.showToast({ this.$store.dispatch('getCarLength', this.specialArea).then(res => {
title: '购物车添加成功', this.shopCarLength = res.data.smallCount
icon: 'success',
mask: true,
}) })
setTimeout(() => { }, 200)
this.$store }
.dispatch('getCarLength', this.specialArea) })
.then(res => {
this.shopCarLength = res.data.smallCount
})
}, 200)
}
})
}
}, },
getCatLength() { getCatLength() {
this.$store.dispatch('getCarLength', this.specialArea).then(res => { this.$store.dispatch('getCarLength', this.specialArea).then(res => {
@ -429,37 +401,33 @@ export default {
}) })
}, },
getAllGoods(id) { getAllGoods(id) {
api getAreaGoods({
.getAllGoods({ pkCountry: this.pkCountry,
pkCountry: this.pkCountry, specialArea: Number(this.specialArea),
specialArea: Number(this.specialArea), pkAreaClassify: id ? id : '',
pkAreaClassify: id ? id : '', }).then(res => {
}) this.goodList = res.data || []
.then(res => { this.goodList.forEach(item => {
this.goodList = res.data if (item.waresName.length > 11) {
this.goodList.forEach(item => { item.waresName = item.waresName.substring(0, 11) + '...'
if (item.waresName.length > 11) { }
item.waresName = item.waresName.substring(0, 11) + '...'
}
})
}) })
})
}, },
getAllGoods1(id) { getAllGoods1(id) {
api getAreaGoods({
.getAllGoods({ pkCountry: this.pkCountry,
pkCountry: this.pkCountry, specialArea: this.specialArea,
specialArea: this.specialArea, waresName: this.waresName,
waresName: this.waresName, pkAreaClassify: id ? id : this.oneId,
pkAreaClassify: id ? id : this.oneId, }).then(res => {
}) this.goodList = res.data
.then(res => { this.goodList.forEach(item => {
this.goodList = res.data if (item.waresName.length > 11) {
this.goodList.forEach(item => { item.waresName = item.waresName.substring(0, 11) + '...'
if (item.waresName.length > 11) { }
item.waresName = item.waresName.substring(0, 11) + '...'
}
})
}) })
})
}, },
goDetails(item) { goDetails(item) {
if (item.preSaleStatus != 3 && item.isSale != 1) { if (item.preSaleStatus != 3 && item.isSale != 1) {