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

Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

This commit is contained in:
woody 2025-06-25 15:11:55 +08:00
parent bfd05019c5 b8229da887
commit 7c70a23ae0
4 changed files with 102 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/user.js
View File

@ -17,7 +17,7 @@ export function login(data) {
export function getInfo() {
return request({
url: '/system/manage/user/get-info',
method: 'get',
method: 'get'
})
}
// 管理员是否登录短信验证
@ -63,14 +63,14 @@ export function userCountryList(params) {
export function changeList(id) {
return request({
url: '/system/manage/user-country/change/' + id,
method: 'post',
method: 'post'
})
}
// 切换系统类型
export function changeSystemList(id) {
return request({
url: '/system/manage/system-type/change/' + id,
method: 'post',
method: 'post'
})
}
// 切换语言
@ -81,11 +81,4 @@ export function languages(params) {
params
})
}
// 切换语言
export function systemTypeList(params) {
return request({
url: '/system/manage/system-type/list',
method: 'get',
params
})
}

150
src/layout/components/Navbar.vue
View File

@ -5,7 +5,7 @@
<breadcrumb class="breadcrumb-container" />
<div class="right-menu">
<div class="check" v-if="user.userType != 9">
<div v-if="user.userType != 9" class="check">
<!-- <el-select v-model="languageItem"
@change="setLanguage"
popper-class="selectCls"
@ -16,32 +16,19 @@
:value="item.value">
</el-option>
</el-select> -->
<el-select
v-model="systemItem"
@change="setSystem"
popper-class="selectCls"
size="mini"
>
<el-option
v-for="item in systemTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-dropdown trigger="click" placement="bottom-start">
<div class="kuang">
<div class="dropdown_i">
<img :src="ruleForm.nationalFlag2" alt="" />
<img :src="ruleForm.nationalFlag2" alt="">
<div>{{ ruleForm.name }}</div>
</div>
<i slot="suffix" class="el-icon-arrow-down"></i>
<i slot="suffix" class="el-icon-arrow-down" />
</div>
<el-dropdown-menu slot="dropdown" class="dropdown-container">
<el-dropdown-item v-for="(item, i) in countryList" :key="i">
<div class="dropdown_i" @click="handleClick(item)">
<img :src="item.nationalFlag2" alt="" />
<img :src="item.nationalFlag2" alt="">
<div>{{ item.name }}</div>
</div>
</el-dropdown-item>
@ -71,114 +58,103 @@
</template>
<script>
import { mapGetters } from "vuex";
import Breadcrumb from "@/components/Breadcrumb";
import Hamburger from "@/components/Hamburger";
import { Message } from "element-ui";
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import { Message } from 'element-ui'
import {
userCountryList,
changeList,
languages,
changeSystemList,
systemTypeList,
} from "@/api/user";
changeSystemList
} from '@/api/user'
export default {
components: {
Breadcrumb,
Hamburger,
Hamburger
},
computed: {
...mapGetters(["sidebar", "avatar", "user"]),
...mapGetters(['sidebar', 'avatar', 'user'])
},
data() {
return {
countryList: [],
ruleForm: {
pkCountry: "",
nationalFlag2: "",
name: "",
pkCountry: '',
nationalFlag2: '',
name: ''
},
languageList: [],
languageItem: 0,
systemItem: "",
systemTypeList: [],
};
systemItem: ''
}
},
mounted() {
let that = this;
const that = this
setTimeout(() => {
// 获取结算国列表
that.getJScountry();
that.getJScountry()
// 获取语言列表
that.getLanguages();
that.getSystem();
}, 10);
that.getLanguages()
that.getSystem()
}, 10)
this.systemItem = localStorage.getItem("systemItem") || 2;
this.systemItem = localStorage.getItem('systemItem') || 2
},
methods: {
getJScountry() {
userCountryList().then((res) => {
this.countryList = res.data;
this.ruleForm.pkCountry = this.user.pkCountry;
this.countryList = res.data
this.ruleForm.pkCountry = this.user.pkCountry
this.countryList.forEach((item) => {
if (item.pkCountry == this.ruleForm.pkCountry) {
this.ruleForm.nationalFlag2 = item.nationalFlag2;
this.ruleForm.name = item.name;
this.ruleForm.nationalFlag2 = item.nationalFlag2
this.ruleForm.name = item.name
}
});
});
},
getSystem() {
systemTypeList().then((res) => {
res.data.forEach((item) => {
if (item.value == localStorage.getItem("systemItem")) {
this.systemItem = item.value;
}
});
this.systemTypeList = res.data;
});
})
})
},
getLanguages() {
languages().then((res) => {
res.data.forEach((item) => {
if (item.field == localStorage.getItem("lang")) {
this.languageItem = item.value;
if (item.field == localStorage.getItem('lang')) {
this.languageItem = item.value
}
});
})
if (
localStorage.getItem("lang") == undefined ||
localStorage.getItem("lang") == "undefined"
localStorage.getItem('lang') == undefined ||
localStorage.getItem('lang') == 'undefined'
) {
localStorage.setItem("lang", "zh-CN");
localStorage.setItem('lang', 'zh-CN')
}
this.languageList = res.data;
});
this.languageList = res.data
})
},
handleClick(item) {
this.ruleForm.nationalFlag2 = item.nationalFlag2;
this.ruleForm.name = item.name;
this.ruleForm.nationalFlag2 = item.nationalFlag2
this.ruleForm.name = item.name
changeList(item.pkCountry).then((res) => {
this.$store.dispatch("user/getInfo").then((response) => {
this.$router.go(0);
});
});
this.$store.dispatch('user/getInfo').then((response) => {
this.$router.go(0)
})
})
},
changeSelection(e) {},
setSystem(e) {
console.log(e, "eeee");
this.systemItem = e;
console.log(e, 'eeee')
this.systemItem = e
changeSystemList(e).then((res) => {
if (res.code == 200) {
Message({
message: res.msg,
type: "success",
});
localStorage.setItem("systemItem", e);
location.reload();
type: 'success'
})
localStorage.setItem('systemItem', e)
location.reload()
}
});
})
},
// setLanguage(e) {
// this.languageList.forEach((item) => {
@ -197,20 +173,20 @@ export default {
// this.$router.push(`/login?redirect=${this.$route.fullPath}`)
// },
async logout() {
this.$confirm("确定注销并退出系统吗？", this.$t("w_0034"), {
confirmButtonText: this.$t("w_0035"),
cancelButtonText: this.$t("ENU_P_TYPE0"),
type: "warning",
this.$confirm('确定注销并退出系统吗？', this.$t('w_0034'), {
confirmButtonText: this.$t('w_0035'),
cancelButtonText: this.$t('ENU_P_TYPE0'),
type: 'warning'
})
.then(() => {
this.$store.dispatch("user/LogOut").then(() => {
this.$router.push(`/login?redirect=${this.$route.fullPath}`);
});
this.$store.dispatch('user/LogOut').then(() => {
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
})
.catch(() => {});
},
},
};
})
.catch(() => {})
}
}
}
</script>
<style lang="scss" scoped>

4
src/views/settlementCenter/bonusDetail/index.vue
View File

@ -239,13 +239,13 @@
:formatter="stateFormat"
/>
<el-table-column
<!-- <el-table-column
align="center"
prop="retailRealSubtotalOri"
width="130"
:label="$t('收益小计') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
/> -->
<!-- <el-table-column
align="center"

88
src/views/settlementCenter/totalBonus/index.vue
View File

@ -158,14 +158,20 @@
/>
<el-table-column
align="center"
prop="retailRangeIncomeOri"
prop="settleDate"
width="200"
:label="'结算时间'"
/>
<el-table-column
align="center"
prop="retailRangeIncome"
width="130"
:label="$t('级差收益') + `(${isLocalSymbol()})`"
:label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailSameLevelIncomeOri"
prop="retailSameLevelIncome"
width="130"
:label="$t('平级收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
@ -173,25 +179,38 @@
<el-table-column
align="center"
prop="retailAreaIncomeOri"
prop="retailAreaIncome"
width="130"
:label="$t('区域收益') + `(${isLocalSymbol()})`"
:label="$t('区域分红') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitRangeIncomeOri"
prop="retailBenefitRangeIncome"
width="130"
:label="$t('福利级差收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncomeOri"
prop="retailMonthRepurchaseIncome"
width="130"
:label="$t('福利分红收益') + `(${isLocalSymbol()})`"
:label="$t('复购极差收益') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitAvgIncome"
width="160"
:label="$t('福利分红平均收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitIncome"
width="160"
:label="$t('福利分红加权收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
@ -203,53 +222,13 @@
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailRealSubtotalOri"
width="130"
:label="$t('小计') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="backPointsOri"
width="130"
:label="'商城重消' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="serviceSpendOri"
width="130"
:label="'平台服务费' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
<!-- <el-table-column
align="center"
prop="globalPointsOri"
width="130"
:label="$t('直推级差') + '(￥)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="purRealSubtotalOri"
width="130"
:label="'首购实发小计' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="repurRealSubtotalOri"
width="130"
:label="'复购实发小计' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
/> -->
<!-- <el-table-column
align="center"
@ -274,12 +253,7 @@
:label="'开始日期'"
v-if="allTxt.settleDate"
/> -->
<el-table-column
align="center"
prop="settleDate"
width="200"
:label="'结算时间'"
/>
<el-table-column
align="center"
prop="time"