From c85d488de422fe75d4eaa93a8bf479dfa7da8e7a Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 16 Jun 2022 09:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/Dockerfile                               | 15 ++++++++++-----
 docker-build.sh                                | 18 ++++++++++++++++++
 manager/Dockerfile                             | 15 ++++++++++-----
 .../src/views/goods/goods-info/goodsDetail.vue |  2 +-
 manager/src/views/member/list/index.vue        |  4 ++--
 .../src/views/sys/menu-manage/menuManage.vue   |  6 +++---
 .../src/views/sys/user-manage/userManage.vue   |  6 +++---
 seller/Dockerfile                              | 15 ++++++++++-----
 seller/src/views/order/order/orderDetail.vue   |  5 +----
 9 files changed, 58 insertions(+), 28 deletions(-)
 create mode 100644 docker-build.sh

diff --git a/buyer/Dockerfile b/buyer/Dockerfile
index d7e43746..1f66614a 100644
--- a/buyer/Dockerfile
+++ b/buyer/Dockerfile
@@ -1,8 +1,13 @@
-FROM nginx:alpine
+FROM node:10.19.0 as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
 
-RUN mkdir -p /app/
-COPY ./dist /app/
+# production stage
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
-
-
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]k 
diff --git a/docker-build.sh b/docker-build.sh
new file mode 100644
index 00000000..3c0a3096
--- /dev/null
+++ b/docker-build.sh
@@ -0,0 +1,18 @@
+#代码目录
+code_path=$PWD
+REGISTRY_PATH='registry.cn-hangzhou.aliyuncs.com/lilishop-ui'
+BUILD_VERSION=4.2.4.1
+
+read -p "请输入仓库地址": REGISTRY_PATH
+
+echo $REGISTRY_PATH
+
+docker build -t $REGISTRY_PATH/buyer-ui:$BUILD_VERSION ${code_path}/buyer
+docker push $REGISTRY_PATH/buyer-ui:$BUILD_VERSION
+
+docker build -t $REGISTRY_PATH/seller-ui:$BUILD_VERSION ${code_path}/seller
+docker push $REGISTRY_PATH/seller-ui:$BUILD_VERSION
+
+docker build -t $REGISTRY_PATH/manager-ui:$BUILD_VERSION ${code_path}/manager
+docker push $REGISTRY_PATH/manager-ui:$BUILD_VERSION
+
diff --git a/manager/Dockerfile b/manager/Dockerfile
index d7e43746..1f66614a 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -1,8 +1,13 @@
-FROM nginx:alpine
+FROM node:10.19.0 as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
 
-RUN mkdir -p /app/
-COPY ./dist /app/
+# production stage
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
-
-
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]k 
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index da21cc4b..e83198e3 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -25,7 +25,7 @@
             <FormItem label="销售模式">
               {{ goods.salesModel === "RETAIL" ? "零售型" : "批发型" }}
             </FormItem>
-            <FormItem label="销售规则">
+            <FormItem label="销售规则" v-if="goods.salesModel !== 'RETAIL'">
               <Table
                 border
                 :columns="wholesalePreviewColumns"
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 758c6ce8..29a0e562 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -467,8 +467,8 @@ export default {
     handleSubmitModal() {
       const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
-      let birthday =
-        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
+      let birthday = time ?
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate() : '';
       let submit = {
         regionId: this.form.regionId,
         region: this.form.region,
diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue
index d2f7721d..930e2b89 100644
--- a/manager/src/views/sys/menu-manage/menuManage.vue
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@@ -107,7 +107,7 @@
             </FormItem>
             <FormItem label="权限url" v-if="form.level != 0" class="block-tool">
               <Tooltip placement="right" content="*号模糊匹配，逗号分割" transfer>
-                <Input class="menu-input" v-model="form.permission" />
+                <Input class="menu-input" v-model="form.permission" type="textarea" />
               </Tooltip>
             </FormItem>
             <FormItem label="排序值" prop="sortOrder">
@@ -168,7 +168,7 @@
           <Input v-model="formAdd.frontRoute" />
         </FormItem>
         <FormItem label="权限url" v-if="formAdd.level != 0">
-          <Input v-model="formAdd.permission" />
+          <Input v-model="formAdd.permission" type="textarea" />
           <div class="desc">*号模糊匹配，逗号分割</div>
         </FormItem>
         <FormItem label="排序值" prop="sortOrder">
@@ -571,6 +571,6 @@ export default {
   color: #999;
 }
 .menu-input {
-  width: 162px;
+  width: 362px;
 }
 </style>
diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue
index e77498f3..aada1680 100644
--- a/manager/src/views/sys/user-manage/userManage.vue
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -146,7 +146,7 @@ export default {
         email: "",
         sex: "",
         roles: [],
-        departmentId: "",
+        departmentId: 0,
         departmentTitle: ""
       },
       roleList: [], // 角色列表
@@ -354,7 +354,7 @@ export default {
         this.form.departmentId = v.departmentId;
         this.form.departmentTitle = v.departmentTitle;
       } else {
-        this.form.departmentId = "";
+        this.form.departmentId = 0;
         this.form.departmentTitle = "";
       }
     },
@@ -492,7 +492,7 @@ export default {
         email: "",
         sex: "",
         roles: [],
-        departmentId: "",
+        departmentId: 0,
         departmentTitle: ""
       },
       this.$refs.depTree.setData("", "");
diff --git a/seller/Dockerfile b/seller/Dockerfile
index d7e43746..1f66614a 100644
--- a/seller/Dockerfile
+++ b/seller/Dockerfile
@@ -1,8 +1,13 @@
-FROM nginx:alpine
+FROM node:10.19.0 as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
 
-RUN mkdir -p /app/
-COPY ./dist /app/
+# production stage
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
-
-
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]k 
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 86c71c2e..bf7c05a4 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -554,10 +554,7 @@ export default {
       orderDeliverFormValidate: {
         logisticsNo: [
           { required: true, message: "发货单号不能为空", trigger: "change" },
-        ],
-        logisticsId: [
-          { required: true, message: "请选择物流公司", trigger: "blur" },
-        ],
+        ]
       },
       addressRule: {
         consigneeName: [