Browse Source

Merge branch 'milestone-20260128-日常优化1.0' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20260128-日常优化1.0

milestone-20260128-日常优化1.0
zhangrenyuan 4 weeks ago
parent
commit
eafc396bf8
  1. 31
      src/views/consume/gold/addCoinConsume.vue
  2. 4
      src/views/moneyManage/refundDetail/refundHeader.vue
  3. 4
      src/views/recharge/gold/addCoinRecharge.vue

31
src/views/consume/gold/addCoinConsume.vue

@ -105,6 +105,7 @@ const rules = reactive({
}); });
// //
const goods = ref([]) const goods = ref([])
const allGoods = ref([])
// //
function validateInput() { function validateInput() {
@ -323,7 +324,7 @@ const add = async function () {
function handleResponse(result) { function handleResponse(result) {
console.log("响应结果", result) console.log("响应结果", result)
if (result.code === 200) { if (result.code === 200) {
WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
WriteCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
//value //value
WriteCookiesVale.value = JSON.stringify({ WriteCookiesVale.value = JSON.stringify({
payTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), payTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
@ -480,7 +481,7 @@ const addBefore = () => {
if (!validateInput() || !validateRedLimit()) { if (!validateInput() || !validateRedLimit()) {
return; return;
} }
ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
ReadCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
console.log('ReadCookies',ReadCookies.value); console.log('ReadCookies',ReadCookies.value);
// cookie // cookie
const cookieValue = Cookies.get(ReadCookies.value); const cookieValue = Cookies.get(ReadCookies.value);
@ -605,12 +606,13 @@ const getGoods = async function () {
}); });
// //
console.log("请求成功", result); console.log("请求成功", result);
goods.value = result.data.map(item => ({
allGoods.value = result.data.map(item => ({
id: item.id, id: item.id,
label: item.name, label: item.name,
value: item.name, value: item.name,
price: item.price price: item.price
})); }));
goods.value = allGoods.value;
} catch (error) { } catch (error) {
console.log("请求失败", error); console.log("请求失败", error);
// //
@ -640,13 +642,25 @@ watch(
); );
// //
const handleGoodsChange = (newGoods) => {
if (newGoods && typeof newGoods === 'object') {
addConsume.value.price = Number(newGoods.price || 0) || null;
const handleGoodsChange = (val) => {
const selectedItem = goods.value.find(item => item.value === val);
if (selectedItem) {
addConsume.value.price = Number(selectedItem.price || 0) || null;
} else { } else {
addConsume.value.price = null; addConsume.value.price = null;
} }
} }
//
const handleFilter = (query) => {
if (query) {
goods.value = allGoods.value.filter(item => {
return item.label.toLowerCase().includes(query.toLowerCase())
})
} else {
goods.value = allGoods.value
}
}
// //
// watch( // watch(
// () => addConsume.value.goodsName, // () => addConsume.value.goodsName,
@ -786,9 +800,8 @@ onMounted(async function () {
<el-form-item prop="goodsName" :label="t('common_add.goodsName')"> <el-form-item prop="goodsName" :label="t('common_add.goodsName')">
<el-select v-model="addConsume.goodsName" :placeholder="t('common_add.goodsNamePlaceholder')" <el-select v-model="addConsume.goodsName" :placeholder="t('common_add.goodsNamePlaceholder')"
style="width: 200px" clearable filterable >
<el-option v-for="(item, index) in goods" :key="index" :label="item.label" :value="item.value" @click="handleGoodsChange(item)" />
style="width: 200px" clearable filterable :filter-method="handleFilter" @change="handleGoodsChange">
<el-option v-for="(item, index) in goods" :key="item.id" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="price" :label="t('common_add.price')"> <el-form-item prop="price" :label="t('common_add.price')">

4
src/views/moneyManage/refundDetail/refundHeader.vue

@ -473,6 +473,10 @@ const executorList = ref([
{ {
value: '200246', value: '200246',
label: '马:小汪执行人' label: '马:小汪执行人'
},
{
value: '90047947',
label: '总部:测试'
} }
]) ])
// //

4
src/views/recharge/gold/addCoinRecharge.vue

@ -118,7 +118,7 @@ const add = async function () {
addDisabled.value = false addDisabled.value = false
if(result.code == 200){ if(result.code == 200){
// jwcode:permanentGold:freeGold // jwcode:permanentGold:freeGold
WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
WriteCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
//value //value
WriteCookiesVale.value = JSON.stringify({ WriteCookiesVale.value = JSON.stringify({
payTime: recharge.value.payTime, payTime: recharge.value.payTime,
@ -275,7 +275,7 @@ const addBefore = () => {
// cookie // cookie
// jwcode:permanentGold:freeGold // jwcode:permanentGold:freeGold
ReadCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
ReadCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
console.log('ReadCookies',ReadCookies.value); console.log('ReadCookies',ReadCookies.value);

Loading…
Cancel
Save