Skip to content

J
jwhx
Commit a53f99b0 authored by xieyishang's avatar xieyishang
Browse files
Options

~~

parent c0fd900e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1263 additions and 21 deletions
resources/admin/package.json
View file @ a53f99b0
......@@ -35,7 +35,11 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"autoprefixer": "^10.0.0",
"postcss": "^8.0.0",
"rollup-plugin-postcss": "^4.0.2",
"sass": "1.77.2",
"tailwindcss": "^3.0.0",
"terser": "^5.31.0",
"vite": "^5.2.0"
}
......
resources/admin/postcss.config.js 0 → 100644
View file @ a53f99b0
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
\ No newline at end of file
resources/admin/src/assets/style/main.css 0 → 100644
View file @ a53f99b0
@tailwind base;
@tailwind components;
@tailwind utilities;
\ No newline at end of file
resources/admin/src/assets/style/style.scss
View file @ a53f99b0
......@@ -4,3 +4,6 @@
@import 'media.scss';
@import 'dark.scss';
@import 'diy.scss';
resources/admin/src/main.js
View file @ a53f99b0
......@@ -8,6 +8,7 @@ import router from './router'
import store from './store'
import App from './App.vue'
import './assets/style/main.css'; // 假设 main.css 在 src/assets 目录下
import BarcodeScanner from '@/utils/barcode-scanner';
......
resources/admin/src/pages/cashier/cashier.scss 0 → 100644
View file @ a53f99b0
.sku_card {
.sku_card_title {
font-size: 15px;
line-height: 40px;
color: #222;
font-weight: bold;
}
.sku_card_main {
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
.sku_card_item {
font-size: 12px;
line-height: 24px;
background-color: #f1f2f2;
color: #373737;
margin-right: 10px;
margin-bottom: 10px;
padding: 0 10px;
flex-shrink: 0;
border-radius: 3px;
cursor: pointer;
}
.sku_card_item_active {
background-color: #409eff !important;
color: #fff !important;
}
}
}
.card {
margin: 18px auto 0;
background-color: #fff;
.top {
display: flex;
justify-content: flex-start;
align-items: center;
height: 50px;
font-size: 16px;
line-height: 1;
.shop_name {
margin-left: 5px;
font-size: 15px;
font-weight: normal;
font-stretch: normal;
color: #222222;
}
}
.select_box {
width: 40px;
display: flex;
justify-content: center;
align-items: center;
flex-shrink: 0;
font-size: 16px;
.circle {
color: #666;
}
.checked {
color: #f64f15;
}
}
.main {
padding-bottom: 23px;
.card_wrap {
margin-top: 15px;
&:first-child {
margin-top: 0;
}
}
.card_item {
width: 100%;
box-sizing: border-box;
}
.card_item_wrap {
display: flex;
justify-content: flex-start;
align-items: center;
}
.img_wrap {
width: 70px;
height: 70px;
border-radius: 10px;
overflow: hidden;
flex-shrink: 0;
img {
display: block;
width: 70px;
height:70px;
}
}
.info {
margin-left: 20px;
padding-right: 20px;
width: calc(100% - 40px - 100px - 15px);
// height: 70px;
display: flex;
flex-direction: column;
justify-content: space-between;
.it {
.goods_title {
display: block;
width: 100%;
font-size: 12px;
font-weight: bold;
font-stretch: normal;
color: #222222;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.deleteicon{
margin: 6px 0;
display: flex;
justify-content: flex-end;
}
.delete{
cursor: pointer;
color: red;
}
.sku {
height: 26px;
border-radius: 5px;
margin-top: 11px;
font-size: 12px;
line-height: 26px;
font-stretch: normal;
color: #838383;
display: flex;
justify-content: flex-start;
align-items: center;
.text {
padding: 0 10px;
background-color: #f6f6f6;
}
.sku_arr {
display: block;
padding-left: 10px;
padding-right: 10px;
background-color: #f6f6f6;
}
}
}
.ib {
display: flex;
justify-content: space-between;
.pricebox{
display: flex;
align-items: center;
}
.jfprice{
margin-left: 8px;
.price_icon,.price_main{
font-size: 12px !important;
color: #a5a5a5 !important;
}
}
.price {
display: flex;
justify-content: flex-start;
align-items: baseline;
.price_icon {
font-size: 13px;
font-weight: bold;
font-stretch: normal;
color: #f64f15;
}
.price_main {
font-size: 16px;
font-weight: bold;
font-stretch: normal;
color: #f64f15;
.mini {
font-size: 15px;
}
}
.ori {
font-size: 12px;
font-stretch: normal;
color: #8a8a8a;
}
}
.num {
flex-shrink: 0;
--stepper-input-disabled-text-color: #323233;
}
}
}
}
}
.qrcodepup{
text-align: center;
}
resources/admin/src/pages/cashier/cashier.vue 0 → 100644
View file @ a53f99b0
This diff is collapsed.
resources/admin/src/pages/cashierhome/cashierhome.scss
View file @ a53f99b0
......@@ -315,4 +315,7 @@ text-align: center;
.qrcodepup{
text-align: center;
}
\ No newline at end of file
}
resources/admin/src/pages/cashierhome/cashierhome.vue
View file @ a53f99b0
......@@ -53,12 +53,7 @@
</div>
</div>
<div class="price jfprice">
<div class="price_icon">积分可抵扣:</div>
<div class="price_main din">
{{ cc.goods.integral }}
</div>
</div>
</div>
......@@ -74,12 +69,7 @@
<!-- 会员 -->
<div class="pricebox">
<div class="price">
<div class="price_icon">使用积分 ¥</div>
<div class="price_main din">
{{ parseFloat(parseFloat(cc.goods.price) - parseFloat(cc.goods.integral)).toFixed(2) }}
</div>
</div>
</div>
</div>
......@@ -94,23 +84,19 @@
<div class="total">
<small>数量:</small>{{ totalCount }}
<!-- <small>金额:</small>￥{{ totalMoney }} -->
<small>积分可抵扣:</small>{{ totaljifen }}
</div>
<div class="total">
<small>使用积分需付:</small>￥{{Userprice }}
</div>
<div class="total">
<small>不使用积分需付:</small>￥{{totalMoney }}
<small>需付:</small>￥{{totalMoney }}
</div>
<div class="pos_btn">
<el-button size="large" type="primary" @click="focusfun(1)" >监听扫码枪识别</el-button>
<!-- <el-button size="large" type="primary" @click="focusfun(1)" >监听扫码枪识别</el-button> -->
<el-button size="large" type="danger" @click="delAllGoods()">清空购物单</el-button>
<!-- <el-button size="large" type="success" @click="focusfun(2)">会员扣积分</el-button> -->
<el-button size="large" type="success" @click="checkOut()">用户结算</el-button>
......@@ -378,10 +364,16 @@ export default {
type: "success"
});
this.getCartList();//获取购物清单
this.scannedCode = "";
this.childgoods={spec_list:[]};
}else{
this.$message.error(res.message);
this.scannedCode = "";
this.childgoods={spec_list:[]};
}
}).catch((err) => {
this.scannedCode = "";
this.childgoods={spec_list:[]};
console.log("🚀 ~ cart ~ err:", err);
});
},
......
resources/admin/tailwind.config.js 0 → 100644
View file @ a53f99b0
module.exports = {
content: [
'./src/**/*.{html,js,vue}', // 根据你的项目结构调整路径
],
theme: {
extend: {
colors: {
primary: '#3490dc', // 这里替换为你想要的颜色代码
pricecolar:"#f64f15",
},
},
},
plugins: [],
}
\ No newline at end of file
resources/admin/vite.config.js
View file @ a53f99b0
......@@ -2,6 +2,9 @@ import { defineConfig } from 'vite'
import path from 'path'
import vue from '@vitejs/plugin-vue'
import tailwindcss from 'tailwindcss'
import autoprefixer from 'autoprefixer'
export default defineConfig({
base:'./',
plugins: [vue()],
......@@ -35,6 +38,8 @@ export default defineConfig({
css: {
postcss: {
plugins: [
tailwindcss(),
autoprefixer(),
{
postcssPlugin: 'internal:charset-removal',
AtRule: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment