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

Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-h5 into lx-online

This commit is contained in:
woody 2025-05-15 10:10:12 +08:00
parent affc9f316b 8a41de8643
commit 37049df9ec
14 changed files with 37 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/login.js
View File

@ -16,7 +16,7 @@ export const getData = (params) => http.get('/member/api/member/get-data', { par
export const getCard = (params) => http.get('/member/api/member/get-card', { params })
//获取验证码
export const verification = (params) => http.get('/member/api/sms/verification', { params })
export const verification = (params) => http.get('/member/api/sms/self-verification', { params })
//忘记密码获取验证码
export const forgetVerification = (params) => http.get('/member/api/sms/forget-verification', { params })
@ -67,7 +67,6 @@ export const queryBonusHaiFun = (data, data1) => http.post('/bonus/api/bonus/que
export const getBonusType = (params) => http.get('/system/api/bd-bonus-items/list', { params })
//获取语言下拉
export const getLanguages = (params) => http.get('/system/pub/enums/get-languages', { params })
//上传图片
@ -101,7 +100,8 @@ export const fansConvertCode = (params) => http.get('/member/api/member/fans-con
export const getIndexAwards = (params) => http.get('/member/api/member/index-awards', { params })
//当前用户短信验证码
export const selfVerification = (params) => http.get('/member/api/sms/self-verification', { params })
// 重置支付密码获取验证码
export const resetPayPasswordVerification = (params) => http.get('/member/api/sms/reset-verification', { params })
//更新支付密码
export const forgetPayPassword = (data) => http.put('/member/api/member/forget-pay-password', data)

4
config/regiest.js
View File

@ -48,10 +48,6 @@ export const waresinfo = (params) => http.post('/sale/api/wares/query-confirm-wa
export const confirmShareOrder = (params) => http.post('/sale/api/order/confirm-share-order', params)
//删除地址
export const delAddress = (data) => http.delete('/member/api/member-address/' + data)
//仓库店铺
export const storehouseList = (params) => http.get('/system/api/storehouse/list', { params })
//会员店铺
export const storeList = (params) => http.get('/member/api/store/list', { params })
//省市区
export const areaList = (params) => http.get('system/api/area/get-level-list', { params })
//创客空间选择

6
pages/forgetPassword/index.vue
View File

@ -50,9 +50,11 @@
<u-form-item :label="'验证码'"
label-width="80px"
prop="code">
<view style="display: flex; align-items: center; padding-right:10rpx;">
<u-input v-model="emailObj.code"
class="border-color width-s"
class="border-color"
:placeholder="'请输入验证码'"
style="width: auto;"
placeholder-class="place-class" />
<button :disabled="disabled"
@ -60,7 +62,7 @@
@click.stop="getCode()">
{{getCodeText}}
</button>
</view>
</u-form-item>
</u-form>
</view>

2
pages/forgetPayPassword/index.vue
View File

@ -137,7 +137,7 @@ export default {
this.getYzm()
},
getYzm() {
api.selfVerification().then(res => {
api.resetPayPasswordVerification().then(res => {
if (res.code == '200') {
setTimeout(() => {
uni.showToast({

43
pages/hiFans/index.vue
View File

@ -409,18 +409,7 @@
@confirm="sureTrans"
:columns="transList"
keyName="label"></u-picker>
<!-- 发货仓库 -->
<u-picker :show="isCk"
@cancel='isCk=false'
@confirm="sureCk"
:columns="storehouseList"
keyName="label"></u-picker>
<!-- 所属店铺 -->
<u-picker :show="isDp"
@cancel='isDp=false'
@confirm="sureDp"
:columns="storeList"
keyName="label"></u-picker>
<!-- 银行名称 -->
<u-picker :show="isBank"
@cancel='isBank=false'
@ -462,7 +451,6 @@ export default {
pt: false,
isDp: false,
storeList: [],
storehouseList: [],
isCk: false,
delAddress: false,
@ -667,12 +655,6 @@ export default {
this.getTransList()
// 获取发货方式
this.getDeliveryList()
if (this.userInfo.pkCountry != 1) {
//获取会员店铺
this.getStoreList()
//获取仓库
this.getStorehouseList()
}
// 获取银行
this.getBank()
// 获取省市县
@ -925,28 +907,7 @@ export default {
}
})
},
getStorehouseList() {
api.storehouseList().then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.name,
}
})
this.storehouseList = [data]
})
},
getStoreList() {
api.storeList().then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.storeName,
}
})
this.storeList = [data]
})
},
sureBank(e) {
const { value } = e
this.form.pkBank = value[0].id

27
pages/index/index.vue
View File

@ -207,7 +207,6 @@ export default {
promptMsg: "",
confirmText: "",
userInfo: uni.getStorageSync("User"),
getLanguageList: [],
moreFlag: false,
index: 0,
indicatorDots: true,
@ -552,12 +551,7 @@ export default {
this.goodsList = res.data;
});
},
bindPickerChange(e) {
this.index = e.detail.value;
uni.setStorageSync("lang", this.getLanguageList[e.detail.value].field);
this.$i18n.locale = this.getLanguageList[e.detail.value].field;
window.location.reload();
},
goUrl(item) {
ban.agreementName().then((res) => {
if (res.data == 0) {
@ -656,24 +650,7 @@ export default {
url: "/pages/index/specialArea/index",
});
},
getLanguage() {
api.getLanguages().then((res) => {
if (res.code == 200) {
res.data.forEach((item, index) => {
if (item.field == uni.getStorageSync("lang")) {
this.index = index;
}
});
if (
uni.getStorageSync("lang") == undefined ||
uni.getStorageSync("lang") == "undefined"
) {
uni.setStorageSync("lang", "zh-CN");
}
this.getLanguageList = res.data;
}
});
},
},
};
</script>

20
pages/login/index.vue
View File

@ -1,21 +1,6 @@
<template>
<view class="main">
<view class="changeLanguages"
v-if="getLanguageList.length>0">
<picker :range="getLanguageList"
:value="index"
range-key="label"
@change="bindPickerChange">
<view class="select-text">
<view class="texts">{{ getLanguageList[index].label }}</view>
<view class="">
<image class="selIcon"
src="../../static/images/drop-666.png"></image>
</view>
</view>
</picker>
</view>
<view class="title">
{{ '会员登录' }}
</view>
@ -155,11 +140,6 @@ export default {
this.loginForm.uuid = res.uuid
})
},
getLanguage() {
api.getLanguages().then((res) => {
this.getLanguageList = res.data
})
},
toLogin() {
api.login(this.loginForm).then((res) => {
this.isLoading = false

6
pages/mine/bindBank/bindBank.vue
View File

@ -26,12 +26,12 @@
<u-form-item label-width="200rpx" :label="'联系方式'" prop="phone" borderBottom ref="item1">
<u--input v-model="dataForm.phone" :placeholder="'请输入'" maxlength="20" border="none"></u--input>
</u-form-item>
<!-- <u-form-item v-if="userInfo.pkCountry==1&&cancode" label-width="200rpx" :label="'验证码'"
<u-form-item v-if="userInfo.pkCountry==1&&cancode" label-width="200rpx" :label="'验证码'"
prop="verificationCode" borderBottom ref="item1">
<u--input v-model="dataForm.verificationCode" :placeholder="'请输入'" border="none"></u--input>
<u-button @tap='getCode' class="getcodes" type="primary" shape="circle" :text="tips"
color="#2FBC42"></u-button>
</u-form-item> -->
</u-form-item>
<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
<u-picker @cancel='showAmount=false' :show="showAmount" ref="uPicker" :columns="bankCardChioceList"
@ -235,7 +235,7 @@
.theform {
margin-top: 6rpx;
background: #FFFFFF;
padding: 20rpx 23rpx 48rpx 23rpx;
padding: 20rpx 23rpx 0rpx 23rpx;
.contentye {
font-size: 28rpx;

25
pages/mine/index.vue
View File

@ -473,7 +473,6 @@ export default {
onShow() {
this.getInfo();
this.orderNum();
this.getLanguage();
this.getUserAwardss();
},
@ -564,30 +563,6 @@ export default {
this.payNum = res.data.payNum;
});
},
getLanguage() {
api.getLanguages().then((res) => {
if (res.code == 200) {
res.data.forEach((item, index) => {
if (item.field == uni.getStorageSync("lang")) {
this.index = index;
}
});
if (
uni.getStorageSync("lang") == undefined ||
uni.getStorageSync("lang") == "undefined"
) {
uni.setStorageSync("lang", "zh-CN");
}
this.getLanguageList = res.data;
}
});
},
bindPickerChange(e) {
this.index = e.detail.value;
uni.setStorageSync("lang", this.getLanguageList[e.detail.value].field);
this.$i18n.locale = this.getLanguageList[e.detail.value].field;
window.location.reload();
},
getInfo() {
api.getInfo().then((res) => {
if (res) {

49
pages/other/index.vue
View File

@ -426,22 +426,8 @@
:columns="queryCardList"
keyName="label"
></u-picker>
<!-- 发货仓库 -->
<u-picker
:show="isCk"
@cancel="isCk = false"
@confirm="sureCk"
:columns="storehouseList"
keyName="label"
></u-picker>
<!-- 所属店铺 -->
<u-picker
:show="isDp"
@cancel="isDp = false"
@confirm="sureDp"
:columns="storeList"
keyName="label"
></u-picker>
<!-- 强制阅读协议 -->
<mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
<agreement ref="agreement"></agreement>
@ -488,7 +474,6 @@ export default {
return {
isDeliveryWay: true,
isDp: false,
storeList: [],
storehouseList: [],
isCk: false,
strTitle: '',
@ -839,12 +824,7 @@ export default {
if (this.specialArea == 3) {
this.checkGoods()
}
if (this.userInfo.pkSettleCountry != 1) {
//获取会员店铺
this.getStoreList()
//获取仓库
this.getStorehouseList()
}
})
},
checkGoods() {
@ -933,28 +913,7 @@ export default {
})
}
},
getStorehouseList() {
api.storehouseList().then(res => {
let data = res.rows.map(item => {
return {
id: item.pkId,
label: item.name,
}
})
this.storehouseList = [data]
})
},
getStoreList() {
api.storeList().then(res => {
let data = res.rows.map(item => {
return {
id: item.pkId,
label: item.storeName,
}
})
this.storeList = [data]
})
},
sureCk(e) {
const { value } = e
this.form.pkStorehouse = value[0].id

48
pages/regiest/index.vue
View File

@ -529,22 +529,7 @@
:columns="queryCardList"
keyName="label"
></u-picker>
<!-- 发货仓库 -->
<u-picker
:show="isCk"
@cancel="isCk = false"
@confirm="sureCk"
:columns="storehouseList"
keyName="label"
></u-picker>
<!-- 所属店铺 -->
<u-picker
:show="isDp"
@cancel="isDp = false"
@confirm="sureDp"
:columns="storeList"
keyName="label"
></u-picker>
<!-- 银行名称 -->
<u-picker
:show="isBank"
@ -592,7 +577,6 @@ export default {
isDeliveryWay: true,
pt: false,
isDp: false,
storeList: [],
storehouseList: [],
isCk: false,
delAddress: false,
@ -867,12 +851,7 @@ export default {
this.getTransList();
// 获取发货方式
this.getDeliveryList();
if (this.pkCountry != 1) {
//获取会员店铺
this.getStoreList();
//获取仓库
this.getStorehouseList();
}
// 获取银行
this.getBank();
// 获取省市县
@ -1222,28 +1201,7 @@ export default {
// }
});
},
getStorehouseList() {
api.storehouseList({ pkCountry: this.pkCountry }).then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.name,
};
});
this.storehouseList = [data];
});
},
getStoreList() {
api.storeList({ pkCountry: this.pkCountry }).then((res) => {
let data = res.rows.map((item) => {
return {
id: item.pkId,
label: item.storeName,
};
});
this.storeList = [data];
});
},
sureBank(e) {
const { value } = e;
this.form.pkBank = value[0].id;

5
pages/selfService/realName/realName.vue
View File

@ -183,7 +183,7 @@
>
<u--input v-model="dataForm.phone" :placeholder="'请输入'"></u--input>
</u-form-item>
<!-- <u-form-item
<u-form-item
required
label-width="180rpx"
:label="'验证码'"
@ -195,7 +195,8 @@
<text style="color: #18acff" @tap="getCode">{{ tips }}</text>
</template>
</u--input>
</u-form-item> -->
</u-form-item>
<u-code
:seconds="seconds"

2
pages/selfService/updateDomicile/updateDomicile.vue
View File

@ -27,7 +27,7 @@
</view>
<view class="">
<u-button shape="circle" color="#f93025" size="small" :text="'申请变更'"
<u-button shape="circle" color="#005BAC" size="small" :text="'申请变更'"
@click="updateDomicile(item)"></u-button>
</view>
</view>

18
pages/userSecure/index.vue
View File

@ -24,7 +24,7 @@
class="border-style">
<view slot="title"
class="u-slot-title">
<text class="u-cell-text">{{'重置支付密码'}}</text>
<text class="u-cell-text">重置支付密码</text>
</view>
</u-cell>
<u-cell v-if="showFix == 1">
@ -92,25 +92,9 @@ export default {
})
},
goUrl() {
ban.authenticationDetails().then((res) => {
if (res.data) {
uni.navigateTo({
url: '/pages/forgetPayPassword/index',
})
} else {
uni.showModal({
title: '提示',
content: '请先进行实名认证',
success: (res) => {
if (res.confirm) {
uni.navigateTo({
url: '/pages/selfService/realName/realName',
})
}
},
})
}
})
},
surePsw() {
min