dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

营销

Browse Source
This commit is contained in:
cun-nan 2024-09-05 16:37:42 +08:00
parent a64be2fd9a
commit 703f4e733b
5 changed files with 1061 additions and 947 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/main.js
View File

@ -55,12 +55,12 @@ Vue.prototype.getName = getName
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// Vue.prototype.pcUrl = 'http://192.168.0.178:83/'
// Vue.prototype.cashierUrl = 'http://192.168.31.178:84/homeindex' // 收银台
// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台
// Vue.prototype.pcUrl = 'http://127.0.0.1:83/'
// Vue.prototype.cashierUrl = 'http://127.0.0.1:84/homeindex' // 收银台
// Vue.prototype.pcUrl = 'http://127.0.0.1:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://127.0.0.1:82/' // 中台
Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/homeindex' // 收银台
Vue.prototype.caUrl = 'http://192.168.31.178:83/' // 收银台校色跳转链接
Vue.prototype.caUrl = 'http://127.0.0.1:83/' // 收银台校色跳转链接
Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
const Collapse= false

2
fuintCashierWeb/.env.development
View File

@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
VUE_APP_SERVER_URL = 'http://192.168.31.95:8080/'

182
fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
View File

@ -1,73 +1,141 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card >
<el-radio-group v-model="radio1">
<el-radio-button label="收银台订单"></el-radio-button>
<el-radio-button label="油品交易订单"></el-radio-button>
<el-radio-button label="商品交易订单"></el-radio-button>
<el-radio-button label="会员充值订单"></el-radio-button>
<!-- <el-radio-button label="小程序交易订单"></el-radio-button>-->
<el-radio-button label="挂账订单"></el-radio-button>
<!-- <el-radio-button label="未支付订单"></el-radio-button>-->
<!-- <el-radio-button label="积分兑换订单"></el-radio-button>-->
</el-radio-group>
</el-card>
<div class="app-center">
<div class="tab-box">
<div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"
:key="index">
{{ item.name }}
</div>
<order_Cashier v-if="radio1 == '收银台订单' "></order_Cashier>
<order_Oil v-if="radio1 == '油品交易订单' "></order_Oil>
<order_Goods v-if="radio1 == '商品交易订单' "></order_Goods>
<order_Vip v-if="radio1 == '会员充值订单' "></order_Vip>
<!-- <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
<order_Added v-if="radio1 == '挂账订单' "></order_Added>
<!-- <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
<!-- <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
</div>
<!-- <div class="app-top">-->
<!-- <el-card>-->
<!-- <el-radio-group v-model="radio1">-->
<!-- <el-radio-button label="收银台订单"></el-radio-button>-->
<!-- <el-radio-button label="油品交易订单"></el-radio-button>-->
<!-- <el-radio-button label="商品交易订单"></el-radio-button>-->
<!-- <el-radio-button label="会员充值订单"></el-radio-button>-->
<!-- &lt;!&ndash; <el-radio-button label="小程序交易订单"></el-radio-button>&ndash;&gt;-->
<!-- <el-radio-button label="挂账订单"></el-radio-button>-->
<!-- &lt;!&ndash; <el-radio-button label="未支付订单"></el-radio-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-radio-button label="积分兑换订单"></el-radio-button>&ndash;&gt;-->
<!-- </el-radio-group>-->
<!-- </el-card>-->
<!-- </div>-->
<!-- 收银台订单-->
<order_Cashier v-if="tabindex == 0 "></order_Cashier>
<!-- 油品订单-->
<order_Oil v-if="tabindex == 1 "></order_Oil>
<!-- 商品订单-->
<order_Goods v-if="tabindex == 2 "></order_Goods>
<!-- 会员充值订单-->
<order_Vip v-if="tabindex == 3 "></order_Vip>
<!-- 挂账订单-->
<order_Added v-if="tabindex == 4 "></order_Added>
<!-- 积分商城订单 暂未修改-->
<order_Added v-if="tabindex == 5 "></order_Added>
<!-- <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
<!-- <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
<!-- <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
</div>
</template>
<script>
import order_Cashier from "../orderComponents/order_Cashier";
import order_Added from "../orderComponents/order_Added";
import order_Goods from "../orderComponents/order_Goods";
import order_Integral from "../orderComponents/order_Integral";
import order_Oil from "../orderComponents/order_Oil";
import order_Ordinary from "../orderComponents/order_Ordinary";
import order_Unpaid from "../orderComponents/order_Unpaid";
import order_Vip from "../orderComponents/order_Vip";
import order_Cashier from "../orderComponents/order_Cashier";
import order_Added from "../orderComponents/order_Added";
import order_Goods from "../orderComponents/order_Goods";
import order_Integral from "../orderComponents/order_Integral";
import order_Oil from "../orderComponents/order_Oil";
import order_Ordinary from "../orderComponents/order_Ordinary";
import order_Unpaid from "../orderComponents/order_Unpaid";
import order_Vip from "../orderComponents/order_Vip";
export default {
name: "Order",
data(){
return{
radio1:'收银台订单'
}
export default {
name: "Order",
data() {
return {
radio1: '收银台订单',
tabindex: 0,
tabs: [
{
name: "收银台订单",
},
components:{
order_Cashier,order_Added,order_Goods,order_Integral,order_Oil,order_Ordinary,order_Unpaid,order_Vip
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
}
}
{
name: "油品订单",
},
{
name: "商品订单",
},
{
name: "会员充值订单",
},
{
name: "挂账订单",
},
{
name: "积分商城订单",
},
],
}
},
components: {
order_Cashier, order_Added, order_Goods, order_Integral, order_Oil, order_Ordinary, order_Unpaid, order_Vip
},
methods: {
getindex(index) {
this.tabindex = index
console.log(index,80)
},
handleClick(tab, event) {
console.log(tab, event);
}
}
}
</script>
<style scoped>
.app-center{
width: 100%;
.app-center {
width: 100%;
box-sizing: border-box;
padding: 10px;
}
.app-top{
width: 100%;
margin-bottom: 20px;
height: 60px;
box-sizing: border-box;
box-sizing: border-box;
padding: 0;
margin: 0;
}
}
.app-top {
width: 100%;
margin-bottom: 20px;
height: 60px;
box-sizing: border-box;
}
.tab-box {
width: 100%;
height: 50px;
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 25px;
}
.tab_ {
width: 85px;
height: 100%;
//border-bottom: 2px solid #FF770F;
display: flex;
font-weight: 500;
font-size: 14px;
color: #999999;
align-items: center;
justify-content: center;
margin-left: 50px;
cursor: pointer;
}
.active {
border-bottom: 2px solid #FF770F !important;
color: #FF770F !important;
}
</style>

1812
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

File diff suppressed because it is too large Load Diff

2
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -374,7 +374,7 @@
import {printOilOrderReport} from "@/api/print";
export default {
name: "order_Cashier",
name: "order_Oil",
data(){
return{
// 会员信息