czg_team/cashier_desktop
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决打包问题

Browse Source
This commit is contained in:
gyq
2024-03-06 10:49:45 +08:00
parent 48d6583a03
commit 91ce993270
11 changed files with 119 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/home/index.vue
View File

@@ -142,6 +142,8 @@ const createOrderLoading = ref(false)
// 取餐码
const masterId = ref('')
const uuid = ref('')
// 挂单量
const pendingCartNum = ref(0)
@@ -197,7 +199,7 @@ async function pendingCart(params, status = true) {
status: status,
uuid: params.uuid
})
if (status && !cartList.value.length) createCodeAjax()
if (status && cartList.value.length) createCodeAjax()
} catch (error) {
console.log(error)
}
@@ -255,7 +257,8 @@ async function addCart(params, type = 'add') {
number: params.number || 1,
isPack: params.isPack || false,
isGift: params.isGift || false,
cartId: type == 'add' ? '' : params.id
cartId: type == 'add' ? '' : params.id,
uuid: params.uuid || store.userInfo.uuid
})
masterId.value = res
goodsRef.value.updateData()
@@ -281,10 +284,12 @@ async function queryCartAjax() {
}
}
// 获取取件码
// 获取取餐码
async function createCodeAjax() {
try {
const res = await createCode({ shopId: store.userInfo.shopId })
const res = await createCode({
shopId: store.userInfo.shopId
})
masterId.value = res.code
// masterId.value = '#13'
queryCartAjax()

105
src/views/login.vue
View File

@@ -3,46 +3,48 @@
<div class="logo">
<el-image :src="logo" style="width: 180px"></el-image>
</div>
<div class="form-wrap">
<!-- <div class="reg-wrap">
<div class="form-wrap" style="display: flex;align-items: center;">
<div style="flex: 1;">
<!-- <div class="reg-wrap">
<router-link :to="{ name: 'register' }">
<el-link type="primary">注册</el-link>
</router-link>
</div> -->
<div class="header">
<span class="t1">银收客</span>
<span class="t2">收银、库存、营销、支付等业务一体化解决方案</span>
</div>
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" hide-required-asterisk>
<!-- <el-form-item label="注册商户号" prop="shopCode">
<el-input v-model="form.shopCode" placeholder="请输入注册商户号"></el-input>
</el-form-item> -->
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入11位手机号码"></el-input>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" placeholder="请输入登录密码"></el-input>
</el-form-item>
<el-form-item>
<div style="width: 100%; display: flex; justify-content: flex-end">
<router-link :to="{ name: 'register' }">
<el-link type="info">忘记密码</el-link>
</router-link>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width: 100%" :loading="loading" @click="submitHandle">
<span v-if="!loading">登录</span>
<span v-else>登录中...</span>
</el-button>
</el-form-item>
<el-form-item>
<el-button plain style="width: 100%" @click="logout">退出</el-button>
</el-form-item>
</el-form>
<div class="version">
<el-text size="large">Ver2.1.6</el-text>
<el-text size="large">陕西超掌柜科技有限公司</el-text>
<div class="header">
<span class="t1">银收客</span>
<span class="t2">收银、库存、营销、支付等业务一体化解决方案</span>
</div>
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" hide-required-asterisk>
<el-form-item label="商户号" prop="merchantName">
<el-input v-model="form.merchantName" placeholder="请输入注册商户号"></el-input>
</el-form-item>
<el-form-item label="手机号码" prop="loginName">
<el-input v-model="form.loginName" placeholder="请输入11位手机号码"></el-input>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" placeholder="请输入登录密码"></el-input>
</el-form-item>
<!-- <el-form-item>
<div style="width: 100%; display: flex; justify-content: flex-end">
<router-link :to="{ name: 'register' }">
<el-link type="info">忘记密码</el-link>
</router-link>
</div>
</el-form-item> -->
<el-form-item>
<el-button type="primary" style="width: 100%" :loading="loading" @click="submitHandle">
<span v-if="!loading">登录</span>
<span v-else>登录中...</span>
</el-button>
</el-form-item>
<el-form-item>
<el-button plain style="width: 100%" @click="logout">退出</el-button>
</el-form-item>
</el-form>
<div class="version">
<el-text size="large">Ver2.1.6</el-text>
<el-text size="large">陕西超掌柜科技有限公司</el-text>
</div>
</div>
</div>
</div>
@@ -66,30 +68,32 @@ const loading = ref(false);
const form = reactive({
shopCode: "",
phone: "",
password: "",
serialNumber: RandomNumBoth(1000, 9999),
clientType: 'pc',
merchantName: '18821670757',
loginName: "18821670757",
password: "123456",
});
const rules = reactive({
shopCode: [
merchantName: [
{
required: true,
message: "请输入注册商户号",
message: " ",
trigger: "blur",
},
],
phone: [
loginName: [
{
required: true,
message: "请输入11位手机号码",
message: " ",
trigger: "blur",
},
],
password: [
{
required: true,
message: "请输入登录密码",
message: " ",
trigger: "blur",
},
],
@@ -99,14 +103,7 @@ const rules = reactive({
const submitHandle = () => {
formRef.value.validate(async (valid) => {
if (valid) {
const params = {
serialNumber: RandomNumBoth(1000, 9999),
clientType: 'pc',
loginName: form.phone,
password: form.password
}
store.userlogin(params).then((res) => {
store.userlogin(form).then((res) => {
loading.value = true;
ElMessage.success("登录成功");
setTimeout(() => {
@@ -137,6 +134,10 @@ const logout = () => {
height: 100vh;
background-color: #efefef;
:deep(.el-form-item__label) {
font-size: var(--el-font-size-base);
}
.logo {
flex: 1;
height: inherit;