From f4ddeaa5c5884a8a0f40bebd3239c2c10539d8c4 Mon Sep 17 00:00:00 2001
From: 17600048398 <277692624@qq.com>
Date: Thu, 9 Mar 2023 18:16:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/api/member.js                       | 45 +++++++++++++++++--
 buyer/src/pages/GoodsDetail.vue               | 12 ++---
 buyer/src/pages/Merchant.vue                  |  6 +--
 .../src/pages/home/memberCenter/Favorites.vue | 30 ++++++++++---
 manager/src/views/member/list/index.vue       |  5 ++-
 manager/src/views/seller/shop/shopDetail.vue  | 12 ++++-
 seller/src/api/logistics.js                   |  2 +-
 7 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js
index 301b7414..eeb7de21 100644
--- a/buyer/src/api/member.js
+++ b/buyer/src/api/member.js
@@ -59,7 +59,7 @@ export function withdrawalApply (params) {
   });
 }
 
-// 收藏商品、店铺
+// 收藏商品
 export function collectGoods (type, id) {
   return request({
     url: `/buyer/member/collection/add/${type}/${id}`,
@@ -68,7 +68,16 @@ export function collectGoods (type, id) {
   });
 }
 
-// 取消 收藏商品、店铺
+// 收藏店铺
+export function collectStore (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/add/${type}/${id}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+// 取消 收藏商品
 export function cancelCollect (type, id) {
   return request({
     url: `/buyer/member/collection/delete/${type}/${id}`,
@@ -77,7 +86,16 @@ export function cancelCollect (type, id) {
   });
 }
 
-// 查看是否收藏
+// 取消 收藏店铺
+export function cancelStoreCollect (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/delete/${type}/${id}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+// 查看是否收藏商品
 export function isCollection (type, goodsId) {
   return request({
     url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
@@ -86,7 +104,16 @@ export function isCollection (type, goodsId) {
   });
 }
 
-// 会员收藏列表
+// 查看是否收藏店铺
+export function isStoreCollection (type, goodsId) {
+  return request({
+    url: `/buyer/member/storeCollection/isCollection/${type}/${goodsId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 会员收藏商品列表
 export function collectList (params) {
   return request({
     url: `/buyer/member/collection/${params.type}`,
@@ -96,6 +123,16 @@ export function collectList (params) {
   });
 }
 
+// 会员收藏店铺列表
+export function storeCollectList (params) {
+  return request({
+    url: `/buyer/member/storeCollection/${params.type}`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
 // 单个商品评价
 export function goodsComment (params) {
   return request({
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 14870db6..63a421f0 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -44,9 +44,9 @@ import ShowGoods from "@/components/goodsDetail/ShowGoods";
 import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
 import { goodsSkuDetail } from "@/api/goods";
 import {
-  cancelCollect,
-  collectGoods,
-  isCollection,
+  cancelStoreCollect,
+  collectStore,
+  isStoreCollection,
   getGoodsDistribution,
 } from "@/api/member";
 import { getDetailById } from "@/api/shopentry";
@@ -121,7 +121,7 @@ export default {
             this.$set(this, "goodsMsg", res.result);
             // 判断是否收藏
             if (this.Cookies.getItem("userInfo")) {
-              isCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
+              isStoreCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
                 if (res.success && res.result) {
                   this.storeCollected = true;
                 }
@@ -159,13 +159,13 @@ export default {
     async collect () {
       // 收藏店铺
       if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.goodsMsg.data.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.goodsMsg.data.storeId);
         if (cancel.success) {
           this.$Message.success("已取消收藏");
           this.storeCollected = false;
         }
       } else {
-        let collect = await collectGoods("STORE", this.goodsMsg.data.storeId);
+        let collect = await collectStore("STORE", this.goodsMsg.data.storeId);
         if (collect.code === 200) {
           this.storeCollected = true;
           this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index 3cf82442..773d8ac8 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -108,7 +108,7 @@
 <script>
 
 import {getDetailById, getCateById} from "@/api/shopentry";
-import {cancelCollect, collectGoods, isCollection} from "@/api/member";
+import {cancelStoreCollect, collectStore, isStoreCollection} from "@/api/member";
 import {goodsList} from "@/api/goods";
 import Search from "@/components/Search";
 import ModelForm from "@/components/indexDecorate/ModelForm";
@@ -296,13 +296,13 @@ export default {
     async collect() {
       // 收藏店铺
       if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.storeMsg.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.storeMsg.storeId);
         if (cancel.success) {
           this.$Message.success("已取消收藏");
           this.storeCollected = false;
         }
       } else {
-        let collect = await collectGoods("STORE", this.storeMsg.storeId);
+        let collect = await collectStore("STORE", this.storeMsg.storeId);
         if (collect.code === 200) {
           this.storeCollected = true;
           this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index aea53270..57962bcf 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -25,7 +25,7 @@
             <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)" v-if="params.type === 'GOODS'">立即购买</Button>
             <Button size="small" type="primary" @click="goShop(item.id)" v-else>店铺购买</Button>
             <Button size="small" v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
-            <Button size="small" v-if="params.type === 'SHOP'" @click="cancel(item.id)">取消收藏</Button>
+            <Button size="small" v-if="params.type === 'STORE'" @click="cancelStore(item.id)">取消收藏</Button>
           </div>
         </div>
       </template>
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { collectList, cancelCollect } from '@/api/member.js'
+import { collectList, cancelCollect,storeCollectList,cancelStoreCollect} from '@/api/member.js'
 export default {
   name: 'Favorites',
   props: {
@@ -66,10 +66,16 @@ export default {
         if (res.success) this.list = res.result.records;
       })
     },
+    getStoreList () { // 获取收藏列表
+      this.spinShow = true
+      storeCollectList(this.params).then(res => {
+        this.spinShow = false
+        if (res.success) this.list = res.result.records;
+      })
+    },
     change (index) { // tab栏切换
-      if (index === 0) { this.params.type = 'GOODS' }
-      if (index === 1) { this.params.type = 'SHOP' }
-      this.getList()
+      if (index === 0) { this.params.type = 'GOODS',this.getList()}
+      if (index === 1) { this.params.type = 'STORE',this.getStoreList()}
     },
     cancel (id) { // 取消收藏
       let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
@@ -85,6 +91,20 @@ export default {
         }
       });
     },
+    cancelStore (id) { // 取消收藏
+      let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
+      this.$Modal.confirm({
+        title: 'Title',
+        content: `<p>确定取消收藏该${typeName}吗？</p>`,
+        onOk: () => {
+          cancelStoreCollect(this.params.type, id).then(res => {
+            if (res.success) {
+              this.getStoreList();
+            }
+          })
+        }
+      });
+    },
     buynow (skuId, goodsId) { // 跳转详情
       let url = this.$router.resolve({
         path: '/goodsDetail',
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 214b0104..0f0ad381 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -465,10 +465,11 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
+      debugger
       const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
-      let birthday = time ?
-        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate() : '';
+      let birthday = this.form.birthday=== undefined?'':
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
       let submit = {
         regionId: this.form.regionId,
         region: this.form.region,
diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
index ff7763b3..ee732760 100644
--- a/manager/src/views/seller/shop/shopDetail.vue
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -87,7 +87,17 @@
           <p class="item">
             <span class="label">店铺所在地：</span>
             <span class="info">
-              {{storeInfo.storeAddressPath || storeInfo.storeAddressDetail?storeInfo.storeAddressPath +storeInfo.storeAddressDetail:"暂未完善"}}
+              <span>
+                {{
+                (storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined )? storeInfo.storeAddressPath: ""
+                }}
+              </span>
+              <span>
+                {{
+                (storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )? storeInfo.storeAddressDetail:""
+                }}
+              </span>
+              {{(storeInfo.storeAddressPath!==null && storeInfo.storeAddressPath!=='' && storeInfo.storeAddressPath!=="null" && storeInfo.storeAddressPath!==undefined) || (storeInfo.storeAddressDetail!==null && storeInfo.storeAddressDetail!=='' && storeInfo.storeAddressDetail!=="null" && storeInfo.storeAddressDetail!==undefined )?"":"暂未完善"}}
             </span>
           </p>
           <p class="item">
diff --git a/seller/src/api/logistics.js b/seller/src/api/logistics.js
index c0d7da8b..7388100d 100644
--- a/seller/src/api/logistics.js
+++ b/seller/src/api/logistics.js
@@ -38,7 +38,7 @@ export const getCheckedOn = params =>{
 
 //获取物流设置
 export const getLogisticsSetting = () =>{
-  return getRequest(`/other/logistics/setting`);
+  return getRequest(`/other/logistics`);
 }
 
 export const getShunFengFaceSheet = (url,headers) =>{

From b51040c73ec4da209d4417cb7fc617e4b00bca01 Mon Sep 17 00:00:00 2001
From: 17600048398 <277692624@qq.com>
Date: Tue, 14 Mar 2023 09:10:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=89=A9=E6=B5=81=E4=BC=A0=E5=8F=82=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/distribution/distributionSetting.vue | 2 +-
 manager/src/views/page-decoration/modelForm.vue        | 2 +-
 seller/src/views/shop/ship/logistics.vue               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue
index 8714be1d..68ee5629 100644
--- a/manager/src/views/distribution/distributionSetting.vue
+++ b/manager/src/views/distribution/distributionSetting.vue
@@ -14,7 +14,7 @@
         <InputNumber :min="1" :max="365" style="width:100px;" v-model="form.distributionDay"></InputNumber>
       </FormItem>
       <FormItem label="分销结算天数" prop="cashDay">
-        <InputNumber :min="1"  :max="365"  style="width:100px;" v-model="form.cashDay"></InputNumber>
+        <InputNumber :min="0"  :max="365"  style="width:100px;" v-model="form.cashDay"></InputNumber>
       </FormItem>
       <FormItem>
         <Button type="primary" @click="submit">保存</Button>
diff --git a/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue
index acfaefce..5d85cec1 100644
--- a/manager/src/views/page-decoration/modelForm.vue
+++ b/manager/src/views/page-decoration/modelForm.vue
@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="nav-con">
-        <div class="all-categories">全部商品分类</div>
+        <div class="all-categories">全部商品分类11</div>
         <ul class="nav-item">
           <li v-for="(item, index) in navList.list" :key="index">
             <a href="#">{{ item.name }}</a>
diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index 3346edd6..a3e0889e 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -139,7 +139,7 @@ export default {
           minWidth: 120,
           sortable: true,
           render: (h, params) => {
-            if (params.row.selected === null || params.row.selected === "") {
+            if (!params.row.selected) {
               return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
             } else {
               return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
@@ -152,7 +152,7 @@ export default {
           align: "center",
           width: 200,
           render: (h, params) => {
-            if (params.row.selected === null) {
+            if (!params.row.selected) {
               return h("div", [
                 h(
                   "Button",
@@ -301,7 +301,7 @@ export default {
     },
 
     submit() {
-      if ( this.row.selected === null ||  this.row.selected === "") {
+      if ( !this.row.selected) {
         API_Shop.logisticsChecked(
           this.row.logisticsId,
           this.faceSheetForm

From 3159c325e3ed5d2ff1c3aee0384078723f32d50f Mon Sep 17 00:00:00 2001
From: 17600048398 <277692624@qq.com>
Date: Tue, 14 Mar 2023 11:18:17 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/page-decoration/modelForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue
index 5d85cec1..acfaefce 100644
--- a/manager/src/views/page-decoration/modelForm.vue
+++ b/manager/src/views/page-decoration/modelForm.vue
@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="nav-con">
-        <div class="all-categories">全部商品分类11</div>
+        <div class="all-categories">全部商品分类</div>
         <ul class="nav-item">
           <li v-for="(item, index) in navList.list" :key="index">
             <a href="#">{{ item.name }}</a>

From 1ca94d289aaa9ecbc54f292ef3b94825589bb86c Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Wed, 15 Mar 2023 10:19:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E5=88=A4=E5=AE=9A?=
 =?UTF-8?q?=E6=9C=AA=E5=88=A4=E5=AE=9A=E6=96=B0=E6=B4=BB=E5=8A=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AF=BC=E8=87=B4=E6=96=B0=E6=B4=BB=E5=8A=A8=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/promotions/full-discount/full-discount.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index 3a03819d..31b0e1c1 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -169,7 +169,7 @@ export default {
     // 开启或关闭活动
     openOrClose(row) {
       let name = "开启";
-      if (row.promotionStatus === "START") {
+      if (row.promotionStatus === 'NEW' ||row.promotionStatus === "START") {
         name = "关闭";
         this.$Modal.confirm({
           title: "提示",

From 8f629db5abd755c16d2902dadb021d77471d4e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Wed, 15 Mar 2023 10:44:02 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80Input=E8=A1=A8=E5=8D=95=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E8=BE=93=E5=85=A5=E5=80=BC=EF=BC=8C=E5=BC=80?=
 =?UTF-8?q?=E6=94=BEconfig=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/assets/images/default.png | Bin 0 -> 11353 bytes
 buyer/src/config/index.js           |   1 +
 buyer/src/main.js                   |  11 +++--
 manager/src/config/index.js         |   1 +
 manager/src/main.js                 |  64 ++++++++++++++--------------
 seller/src/config/index.js          |   5 ++-
 seller/src/main.js                  |  28 +++++++-----
 7 files changed, 63 insertions(+), 47 deletions(-)
 create mode 100644 buyer/src/assets/images/default.png

diff --git a/buyer/src/assets/images/default.png b/buyer/src/assets/images/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f2b94c021155c6d77ffec162d5123f47b2a7942
GIT binary patch
literal 11353
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
bX%759f$$IB?>{%(00000NkvXXu0mjfvmY+r

literal 0
HcmV?d00001

diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index e3fd5c56..135fe97e 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -18,4 +18,5 @@ module.exports = {
   aMapKey: "7f11113750315d8543daaf5c3ba353ca", //高德web端js申请的api key
   enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10000, //端口
+  inputMaxLength:'140' //全局输入框默认最大输入长度字
 };
diff --git a/buyer/src/main.js b/buyer/src/main.js
index e6f9e700..24d8e867 100644
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -8,10 +8,15 @@ import * as filters from "./plugins/filters";
 import store from "@/vuex/store";
 import storage from "@/plugins/storage";
 // 全局引入封装组件
-import { InstallAll } from "@/components/global.js";
+import {InstallAll} from "@/components/global.js";
+
+const {aMapSecurityJsCode, title, inputMaxLength} = require("@/config");
+
+const copyViewUi = {...ViewUI}
+copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值
+Vue.use(copyViewUi);
+
 
-const { aMapSecurityJsCode, title } = require("@/config");
-Vue.use(ViewUI);
 Vue.use(InstallAll);
 Vue.config.productionTip = false;
 
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 7c8628ea..cbbf0588 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -11,4 +11,5 @@ module.exports = {
   website: "https://www.pickmall.cn", //官网地址
   enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10003, //端口
+  inputMaxLength:'140' //全局输入框默认最大输入长度字
 };
diff --git a/manager/src/main.js b/manager/src/main.js
index b62fae93..595d42ce 100644
--- a/manager/src/main.js
+++ b/manager/src/main.js
@@ -8,12 +8,12 @@ import './styles/theme.less';
 import "core-js/stable"
 // import "regenerator-runtime/runtime"
 import App from './App'
-import { router } from './router/index'
+import {router} from './router/index'
 import store from './store'
 import i18n from '@/locale'
 
-import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios'
-import { setStore, getStore, removeStore } from '@/libs/storage'
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest} from '@/libs/axios'
+import {setStore, getStore, removeStore} from '@/libs/storage'
 import util from '@/libs/util'
 
 import * as filters from '@/utils/filters' // global filter
@@ -23,8 +23,9 @@ import {md5} from '@/utils/md5.js';
 
 // 打印
 import Print from 'vue-print-nb';
+
 Vue.use(Print);
-const { aMapSecurityJsCode } = require("@/config");
+const {aMapSecurityJsCode, inputMaxLength} = require("@/config");
 // 高德安全密钥
 if (aMapSecurityJsCode) {
   window._AMapSecurityConfig = {
@@ -44,14 +45,15 @@ Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
   return `${WAP_URL}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
 };
 
-Vue.use(ViewUI, {
-    i18n: (key, value) => i18n.t(key, value)
+
+const copyViewUi = {...ViewUI}
+copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值
+Vue.use(copyViewUi, {
+  i18n: (key, value) => i18n.t(key, value),
 });
 
-Vue.component('liliDialog',liliDialog)
-Vue.component('i18nBox',i18nBox)
-
-
+Vue.component('liliDialog', liliDialog)
+Vue.component('i18nBox', i18nBox)
 
 
 // 挂载全局使用的方法
@@ -66,31 +68,31 @@ Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
 
-Array.prototype.remove = function(from, to) {
-    var rest = this.slice((to || from) + 1 || this.length);
-    this.length = from < 0 ? this.length + from : from;
-    return this.push.apply(this, rest);
+Array.prototype.remove = function (from, to) {
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
 };
 
 Object.keys(filters).forEach(key => {
-    Vue.filter(key, filters[key])
+  Vue.filter(key, filters[key])
 })
 /* eslint-disable no-new */
 new Vue({
-    el: '#app',
-    router,
-    store,
-    i18n,
-    render: h => h(App),
-    data: {
-        currentPageName: ''
-    },
-    mounted() {
-        // 初始化菜单
-        util.initRouter(this);
-        this.currentPageName = this.$route.name;
-        // 显示打开的页面的列表
-        this.$store.commit('setOpenedList');
-        this.$store.commit('initCachePage');
-    }
+  el: '#app',
+  router,
+  store,
+  i18n,
+  render: h => h(App),
+  data: {
+    currentPageName: ''
+  },
+  mounted() {
+    // 初始化菜单
+    util.initRouter(this);
+    this.currentPageName = this.$route.name;
+    // 显示打开的页面的列表
+    this.$store.commit('setOpenedList');
+    this.$store.commit('initCachePage');
+  }
 })
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index c03118db..ca3ce143 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -1,14 +1,15 @@
 module.exports = {
   title: "lilishop", //配置显示在浏览器标签的title
-   /**
+  /**
    * 高德地图申请链接
    * https://lbs.amap.com/api/javascript-api/guide/abc/prepare
    * 添加成功后，可获取到key值和安全密钥jscode（自2021年12月02日升级，升级之后所申请的 key 必须配备安全密钥 jscode 一起使用)
    */
   //FIXME 请检查当前高德key创建的日期，如果2021年12月02日之前申请的 无需填写安全密钥
-  aMapSecurityJsCode:"2bd0fbf621881f4c77be74f0e76495f3", // 高德web端js申请的安全密钥
+  aMapSecurityJsCode: "2bd0fbf621881f4c77be74f0e76495f3", // 高德web端js申请的安全密钥
   aMapKey: "7f11113750315d8543daaf5c3ba353ca", //高德web端js申请的api key
   website: "https://www.pickmall.cn", //官网地址
   enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10002, //端口
+  inputMaxLength:'140' //全局输入框默认最大输入长度字
 };
diff --git a/seller/src/main.js b/seller/src/main.js
index 7aa95b4a..a1abb8b1 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -7,7 +7,7 @@ import vueQr from "vue-qr";
 
 import liliDialog from '@/views/lili-dialog'
 import App from "./App";
-import { router } from "./router/index";
+import {router} from "./router/index";
 import store from "./store";
 import {
   getRequest,
@@ -17,7 +17,7 @@ import {
   importRequest,
   uploadFileRequest
 } from "@/libs/axios";
-import { setStore, getStore, removeStore } from "@/libs/storage";
+import {setStore, getStore, removeStore} from "@/libs/storage";
 
 import i18nBox from '@/views/lili-components/i18n-translate'
 import util from "@/libs/util";
@@ -26,10 +26,12 @@ import VueLazyload from "vue-lazyload";
 
 import * as filters from "@/utils/filters"; // global filter
 
-import { md5 } from "@/utils/md5.js";
-const { aMapSecurityJsCode } = require("@/config");
+import {md5} from "@/utils/md5.js";
+
+const {aMapSecurityJsCode, inputMaxLength} = require("@/config");
 // 打印
 import Print from 'vue-print-nb';
+
 Vue.use(Print);
 // 高德安全密钥
 if (aMapSecurityJsCode) {
@@ -44,10 +46,14 @@ Vue.use(VueLazyload, {
   loading: require("./assets/loading2.gif")
 });
 
-Vue.use(ViewUI);
-Vue.component('liliDialog',liliDialog)
-Vue.component('i18nBox',i18nBox)
-Vue.component('liliDialog',liliDialog)
+
+const copyViewUi = {...ViewUI}
+copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值
+Vue.use(copyViewUi);
+
+Vue.component('liliDialog', liliDialog)
+Vue.component('i18nBox', i18nBox)
+Vue.component('liliDialog', liliDialog)
 Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
 
 // 挂载全局使用的方法
@@ -63,19 +69,19 @@ Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
 const PC_URL = BASE.PC_URL; // 跳转买家端地址 pc端
 const WAP_URL = BASE.WAP_URL; // 跳转买家端地址 wap端
-Vue.prototype.linkTo = function(goodsId, skuId) {
+Vue.prototype.linkTo = function (goodsId, skuId) {
   // 跳转买家端商品
   window.open(
     `${PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`,
     "_blank"
   );
 };
-Vue.prototype.wapLinkTo = function(goodsId, skuId) {
+Vue.prototype.wapLinkTo = function (goodsId, skuId) {
   // app端二维码
   return `${WAP_URL}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`;
 };
 
-Array.prototype.remove = function(from, to) {
+Array.prototype.remove = function (from, to) {
   var rest = this.slice((to || from) + 1 || this.length);
   this.length = from < 0 ? this.length + from : from;
   return this.push.apply(this, rest);

From bf58711c882352bfbb6ab263eb44c8ee610813e6 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 15 Mar 2023 19:41:08 +0800
Subject: [PATCH 6/6] =?UTF-8?q?-fix=20APP=E7=89=88=E6=9C=AC=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98,=E5=BE=AE=E4=BF=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/message-manage/weChatMessageManager.vue   |  3 +++
 manager/src/views/sys/app-version/appVersion.vue     | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/manager/src/views/member/message-manage/weChatMessageManager.vue b/manager/src/views/member/message-manage/weChatMessageManager.vue
index 4d9e2a59..1bc0d3f7 100644
--- a/manager/src/views/member/message-manage/weChatMessageManager.vue
+++ b/manager/src/views/member/message-manage/weChatMessageManager.vue
@@ -281,6 +281,9 @@ export default {
     wechatFormDataEdit() {
       this.$refs['wechatFormData'].validate((valid) => {
         if (valid) {
+          if(!this.wechatFormData.updateTime){
+            this.wechatFormData.updateTime = ''
+          }
           editWechatMessageTemplate(this.id, this.wechatFormData).then(res => {
             if (res.message === 'success') {
               this.$Message.success('微信模板修改成功');
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
index c4d15694..5aa32fc5 100644
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -342,11 +342,13 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
-          const versionUpdateDate = this.$options.filters.unixToDate(
-            this.form.versionUpdateDate / 1000
-          );
-          this.form.versionUpdateDate = versionUpdateDate;
-          this.form.updateTime = versionUpdateDate;
+          if(JSON.stringify(this.form.versionUpdateDate).includes('T')){
+              const versionUpdateDate = this.$options.filters.unixToDate(
+              this.form.versionUpdateDate / 1000
+            );
+            this.form.versionUpdateDate = versionUpdateDate;
+            this.form.updateTime = versionUpdateDate;
+          }
           if (this.modalType == 0) {
             // 添加 避免编辑后传入id等数据 记得删除
             delete this.form.id;