zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!22 优化管理端促销相关文本，操作条件;优化k8s部署提交 

Merge pull request !22 from OceansDeep/dev-gl
master
OceansDeep 2022-06-22 02:56:27 +00:00 committed by Gitee
parent 2cb6f04465 0a5563e5e2
commit 3de928ee14
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
buyer/nginx.conf
View File

@ -1,51 +1,46 @@
#这个文件给docker用的 #这个文件给docker用的
#user nobody; #user nobody;
worker_processes 1; worker_processes 1;
#error_log logs/error.log; #error_log logs/error.log;
#error_log logs/error.log notice; #error_log logs/error.log notice;
#error_log logs/error.log info; #error_log logs/error.log info;
#pid logs/nginx.pid; #pid logs/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" ' #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" ' # '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"'; # '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main; #access_log logs/access.log main;
sendfile on;
sendfile on;
#tcp_nopush on; #tcp_nopush on;
#keepalive_timeout 0; #keepalive_timeout 0;
keepalive_timeout 65; keepalive_timeout 65;
client_max_body_size 10m; client_max_body_size 10m;
gzip on; gzip on;
gzip_min_length 5k; gzip_min_length 5k;
gzip_buffers 4 16k; gzip_buffers 4 16k;
gzip_http_version 1.0; gzip_http_version 1.0;
gzip_comp_level 4; gzip_comp_level 4;
gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on; gzip_vary on;
server { server {
listen 10000; listen 10000;
server_name localhost;
location / { location / {
root /app; root /app;
try_files $uri $uri/ /index.html $uri/ =404; try_files $uri $uri/ /index.html $uri/ =404;
index index.html index.htm; index index.html index.htm;
} }
} }
} }

2
buyer/src/components/goodsDetail/ShowGoods.vue
View File

@ -78,7 +78,7 @@
<div class="item-price-row" v-else> <div class="item-price-row" v-else>
<!-- 批发价格 --> <!-- 批发价格 -->
<div v-if="wholesaleNum.length"> <div v-if="wholesaleNum && wholesaleNum.length">
<div class="flex"> <div class="flex">
<div class="item-price-title"> <div class="item-price-title">
价 &nbsp;&nbsp;&nbsp;&nbsp;格 价 &nbsp;&nbsp;&nbsp;&nbsp;格

26
manager/nginx.conf
View File

@ -1,51 +1,47 @@
#这个文件给docker用的 #这个文件给docker用的
#user nobody; #user nobody;
worker_processes 1; worker_processes 1;
#error_log logs/error.log; #error_log logs/error.log;
#error_log logs/error.log notice; #error_log logs/error.log notice;
#error_log logs/error.log info; #error_log logs/error.log info;
#pid logs/nginx.pid; #pid logs/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" ' #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" ' # '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"'; # '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main; #access_log logs/access.log main;
sendfile on;
sendfile on;
#tcp_nopush on; #tcp_nopush on;
#keepalive_timeout 0; #keepalive_timeout 0;
keepalive_timeout 65; keepalive_timeout 65;
client_max_body_size 10m; client_max_body_size 10m;
gzip on; gzip on;
gzip_min_length 5k; gzip_min_length 5k;
gzip_buffers 4 16k; gzip_buffers 4 16k;
gzip_http_version 1.0; gzip_http_version 1.0;
gzip_comp_level 4; gzip_comp_level 4;
gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on; gzip_vary on;
server { server {
listen 10003; listen 10003;
server_name localhost;
location / { location / {
root /app; root /app;
try_files $uri $uri/ /index.html $uri/ =404; try_files $uri $uri/ /index.html $uri/ =404;
index index.html index.htm; index index.html index.htm;
} }
} }
} }

4
manager/src/views/promotions/coupon/coupon.vue
View File

@ -59,7 +59,7 @@
> >
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<Button <Button
v-if="row.promotionStatus !== 'START'" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
type="info" type="info"
size="small" size="small"
@click="see(row)" @click="see(row)"
@ -78,7 +78,7 @@
</Button> </Button>
<Button <Button
class="ml_5" class="ml_5"
v-if="row.promotionStatus === 'CLOSE'" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'"
type="error" type="error"
size="small" size="small"
@click="remove(row)" @click="remove(row)"

4
manager/src/views/promotions/full-discount/full-discount.vue
View File

@ -73,7 +73,7 @@
<Button type="info" size="small" @click="view(row)">查看</Button> <Button type="info" size="small" @click="view(row)">查看</Button>
<Button <Button
type="error" type="error"
v-if="row.promotionStatus === 'START'" v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'START'"
style="margin-left: 5px" style="margin-left: 5px"
size="small" size="small"
@click="openOrClose(row)" @click="openOrClose(row)"
@ -113,7 +113,7 @@ export default {
// 请求参数 // 请求参数
pageNumber: 1, pageNumber: 1,
pageSize: 10, pageSize: 10,
sort: "startTime", sort: "createTime",
order: "desc", order: "desc",
}, },
columns: [ columns: [

18
manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
View File

@ -97,20 +97,20 @@
</template> </template>
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<Button <Button
v-if="row.promotionStatus != 'NEW'" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
size="small"
style="margin-right: 10px"
@click="edit(row, 'onlyView')"
>查看
</Button>
<Button
v-if="row.promotionStatus === 'NEW'"
type="info" type="info"
size="small" size="small"
style="margin-right: 10px" style="margin-right: 10px"
@click="edit(row)" @click="edit(row)"
>编辑 >编辑
</Button> </Button>
<Button
v-else
size="small"
style="margin-right: 10px"
@click="edit(row, 'onlyView')"
>查看
</Button>
<Button <Button
v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'" v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'"
type="error" type="error"
@ -161,7 +161,7 @@ export default {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "startTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
goodsName: "", goodsName: "",
}, },

4
manager/src/views/promotions/pintuan/pintuan.vue
View File

@ -56,7 +56,7 @@
<Button <Button
type="error" type="error"
size="small" size="small"
:disabled="row.promotionStatus == 'END' || row.promotionStatus == 'CLOSE'" v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
@click="close(row)" @click="close(row)"
>关闭 >关闭
</Button> </Button>
@ -94,7 +94,7 @@ export default {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "startTime", sort: "createTime",
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
columns: [ columns: [

5
manager/src/views/promotions/points-goods/points-goods.vue
View File

@ -105,7 +105,7 @@
</template> </template>
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<Button <Button
v-if="row.promotionStatus !== 'START'" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
type="info" type="info"
size="small" size="small"
@click="edit(row.id)" @click="edit(row.id)"
@ -125,6 +125,7 @@
type="error" type="error"
size="small" size="small"
@click="close(row.id)" @click="close(row.id)"
style="margin-right: 5px"
>删除</Button >删除</Button
> >
</template> </template>
@ -168,7 +169,7 @@ export default {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "create_time", sort: "createTime",
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
statusList: [ statusList: [

8
manager/src/views/promotions/seckill/seckill.vue
View File

@ -66,7 +66,7 @@
type="info" type="info"
size="small" size="small"
class="mr_5" class="mr_5"
v-if="row.promotionStatus == 'NEW'" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
@click="edit(row)" @click="edit(row)"
>编辑</Button >编辑</Button
> >
@ -90,13 +90,13 @@
v-if="row.promotionStatus == 'START' || row.promotionStatus == 'NEW'" v-if="row.promotionStatus == 'START' || row.promotionStatus == 'NEW'"
class="mr_5" class="mr_5"
@click="off(row)" @click="off(row)"
>下架</Button >关闭</Button
> >
&nbsp; &nbsp;
<Button <Button
type="error" type="error"
size="small" size="small"
v-if="row.promotionStatus == 'CLOSE'" v-if="row.promotionStatus == 'CLOSE' || row.promotionStatus == 'END'"
ghost ghost
@click="expire(row)" @click="expire(row)"
>删除</Button >删除</Button
@ -146,7 +146,7 @@ export default {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "startTime", sort: "createTime",
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
setupFlag: false, //默认不请求设置 setupFlag: false, //默认不请求设置

26
seller/nginx.conf
View File

@ -1,51 +1,47 @@
#这个文件给docker用的 #这个文件给docker用的
#user nobody; #user nobody;
worker_processes 1; worker_processes 1;
#error_log logs/error.log; #error_log logs/error.log;
#error_log logs/error.log notice; #error_log logs/error.log notice;
#error_log logs/error.log info; #error_log logs/error.log info;
#pid logs/nginx.pid; #pid logs/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" ' #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" ' # '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"'; # '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main; #access_log logs/access.log main;
sendfile on;
sendfile on;
#tcp_nopush on; #tcp_nopush on;
#keepalive_timeout 0; #keepalive_timeout 0;
keepalive_timeout 65; keepalive_timeout 65;
client_max_body_size 10m; client_max_body_size 10m;
gzip on; gzip on;
gzip_min_length 5k; gzip_min_length 5k;
gzip_buffers 4 16k; gzip_buffers 4 16k;
gzip_http_version 1.0; gzip_http_version 1.0;
gzip_comp_level 4; gzip_comp_level 4;
gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on; gzip_vary on;
server { server {
listen 10002; listen 10002;
server_name localhost;
location / { location / {
root /app; root /app;
try_files $uri $uri/ /index.html $uri/ =404; try_files $uri $uri/ /index.html $uri/ =404;
index index.html index.htm; index index.html index.htm;
} }
} }
} }