From 327d911f80feea7100c6c3bb18aca93d221ee78b Mon Sep 17 00:00:00 2001 From: mabo Date: Wed, 28 Jul 2021 09:02:48 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E4=B9=B0=E5=AE=B6=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/decorate.png | Bin 0 -> 46604 bytes .../components/indexDecorate/modelFormItem.vue | 4 +--- manager/src/config/index.js | 16 ++++++++-------- manager/src/views/order/order/orderDetail.vue | 5 +---- manager/src/views/sys/oss-manage/ossManage.vue | 2 +- seller/src/config/index.js | 13 ++++++++----- 6 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 buyer/decorate.png diff --git a/buyer/decorate.png b/buyer/decorate.png new file mode 100644 index 0000000000000000000000000000000000000000..7701d18ad38eaa0090309b9f08260689431c0bea GIT binary patch literal 46604 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 H*oOZfU)h9i literal 0 HcmV?d00001 diff --git a/buyer/src/components/indexDecorate/modelFormItem.vue b/buyer/src/components/indexDecorate/modelFormItem.vue index 222ae46b..91c6ee17 100644 --- a/buyer/src/components/indexDecorate/modelFormItem.vue +++ b/buyer/src/components/indexDecorate/modelFormItem.vue @@ -37,9 +37,7 @@ - diff --git a/buyer/src/components/map/index.vue b/buyer/src/components/map/index.vue index f408d1e8..1c5b9467 100644 --- a/buyer/src/components/map/index.vue +++ b/buyer/src/components/map/index.vue @@ -53,6 +53,7 @@ export default { }; }, watch: { + // 监听搜索框搜索地图 mapSearch: function (val) { this.searchOfMap(val); } diff --git a/buyer/src/components/map/region.vue b/buyer/src/components/map/region.vue index 3545e7d8..f55f07a7 100644 --- a/buyer/src/components/map/region.vue +++ b/buyer/src/components/map/region.vue @@ -167,7 +167,6 @@ export default { watch: { addressId: { handler: function (v) { - console.log(v); if (v) { this.reviewData(); } else { @@ -175,9 +174,6 @@ export default { } }, immediate: true - }, - addr (v) { - console.log(v); } } }; diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index b9f8a32d..23784c11 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -12,7 +12,7 @@ export default { * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} * 用来在菜单中显示文字 */ - useI18n: true, + useI18n: false, /** * @description api请求基础路径 */ diff --git a/buyer/src/pages/article/index.vue b/buyer/src/pages/article/index.vue index ee314193..ed59795c 100644 --- a/buyer/src/pages/article/index.vue +++ b/buyer/src/pages/article/index.vue @@ -17,7 +17,7 @@ :open-names="openName" @on-select="onSelect" > - + {{ chlidren.articleCategoryName }} - diff --git a/buyer/src/pages/home/Main.vue b/buyer/src/pages/home/Main.vue index 3c508218..ab5dbc66 100644 --- a/buyer/src/pages/home/Main.vue +++ b/buyer/src/pages/home/Main.vue @@ -30,11 +30,11 @@
- +
- +
diff --git a/buyer/src/pages/home/memberCenter/AccountBind.vue b/buyer/src/pages/home/memberCenter/AccountBind.vue deleted file mode 100644 index f645538c..00000000 --- a/buyer/src/pages/home/memberCenter/AccountBind.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/buyer/src/pages/home/memberCenter/AccountSafe.vue b/buyer/src/pages/home/memberCenter/AccountSafe.vue index 61d7b9a4..fdcceaa0 100644 --- a/buyer/src/pages/home/memberCenter/AccountSafe.vue +++ b/buyer/src/pages/home/memberCenter/AccountSafe.vue @@ -20,9 +20,7 @@ diff --git a/buyer/src/pages/home/memberCenter/ModifyPwd.vue b/buyer/src/pages/home/memberCenter/ModifyPwd.vue index 48651f20..5a7fdbf6 100644 --- a/buyer/src/pages/home/memberCenter/ModifyPwd.vue +++ b/buyer/src/pages/home/memberCenter/ModifyPwd.vue @@ -126,7 +126,7 @@ export default { {type: 'string', min: 6, message: '密码不能少于6位'} ], againPassword: [ - {required: true, message: '请输入新密码', trigger: 'blur'}, + {required: true, message: '请确认新密码', trigger: 'blur'}, {type: 'string', min: 6, message: '密码不能少于6位'} ] } @@ -200,13 +200,10 @@ export default { diff --git a/buyer/src/pages/home/orderCenter/AddAddress.vue b/buyer/src/pages/home/orderCenter/AddAddress.vue index f5bf0beb..9ebad4b9 100644 --- a/buyer/src/pages/home/orderCenter/AddAddress.vue +++ b/buyer/src/pages/home/orderCenter/AddAddress.vue @@ -10,21 +10,22 @@ :rules="ruleInline" > - + - + - +
-
{{ order.storeName }}
@@ -201,7 +200,7 @@ export default { this.getList() }, changePageSize (val) { // 修改页数 - this.pageNumber = 1; + this.params.pageNumber = 1; this.params.pageSize = val; this.getList() }, diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue index 1260367b..951349ad 100644 --- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue +++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue @@ -54,7 +54,7 @@ 商品处理方式{{afterSale.serviceType == 'RETURN_MONEY' ? '退款' : '退货'}} - 退款原因{{afterSale.reason}} + 退款原因{{afterSale.reasonName}} 问题描述{{afterSale.problemDesc}} @@ -70,7 +70,7 @@ diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 46d3cd36..54c738b2 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -60,10 +60,8 @@ -
- {{ order.storeName }} + {{ order.storeName }}
@@ -79,25 +77,26 @@
-
+
-
- -
-
-
+
+ +
+
+
@@ -116,11 +115,7 @@ import { orderStatusList } from '../enumeration.js' export default { name: 'MyOrder', props: { - paging: { - type: Boolean, - default: true - }, - homePage: { + homePage: { // 判断是否个人中心首页展示内容 type: Boolean, default: false } diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 1709b4c1..9bf1407f 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -96,10 +96,8 @@
diff --git a/buyer/src/pages/home/Main.vue b/buyer/src/pages/home/Main.vue index ab5dbc66..dd3b18a2 100644 --- a/buyer/src/pages/home/Main.vue +++ b/buyer/src/pages/home/Main.vue @@ -37,8 +37,6 @@
- -
@@ -48,7 +46,6 @@ - - diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue index 708bdbe4..1ad89ad0 100644 --- a/buyer/src/pages/PointMall.vue +++ b/buyer/src/pages/PointMall.vue @@ -105,7 +105,7 @@ export default { this.getList() }, changePageSize (val) { // 修改页数 - this.pageNumber = 1; + this.params.pageNumber = 1; this.params.pageSize = val; this.getList() } diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue index 3c71aa07..e6220a07 100644 --- a/buyer/src/pages/couponCenter.vue +++ b/buyer/src/pages/couponCenter.vue @@ -32,10 +32,10 @@ @@ -57,11 +57,13 @@ export default { } }, methods: { + // 搜索优惠券 search (item) { this.params.couponName = item this.params.pageNumber = 1 this.getList() }, + // 获取优惠券列表 getList () { this.$Spin.show() couponList(this.params).then(res => { @@ -73,18 +75,18 @@ export default { } }).catch(() => { this.$Spin.hide() }) }, - + // 分页 改变页码 changePageNum (val) { this.params.pageNumber = val; this.getList() }, - + // 分页 改变每页数 changePageSize (val) { - this.pageNumber = 1; + this.params.pageNumber = 1; this.params.pageSize = val; this.getList() }, - + // 领取优惠券 receive (item) { receiveCoupon(item.id).then(res => { if (res.success) { @@ -111,7 +113,7 @@ export default { } }) }, - + // 优惠券可用范围 useScope (type, storeName) { let shop = '平台'; let goods = '全部商品' diff --git a/buyer/src/pages/home/Main.vue b/buyer/src/pages/home/Main.vue index dd3b18a2..24dd1a51 100644 --- a/buyer/src/pages/home/Main.vue +++ b/buyer/src/pages/home/Main.vue @@ -1,43 +1,15 @@ diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue index 6be8fd93..6a425f2a 100644 --- a/buyer/src/pages/SignUp.vue +++ b/buyer/src/pages/SignUp.vue @@ -88,7 +88,7 @@ 条款 - Copyright © 2021 - Present + Copyright © {{year}} - Present lili-shop 版权所有 @@ -107,6 +107,7 @@ export default { components: { Verify }, data () { return { + year: new Date().getFullYear(), formRegist: { // 注册表单 mobilePhone: '', @@ -156,6 +157,7 @@ export default { } else {} }); }, + // 发送短信验证码 sendCode () { if (this.time === 60) { if (this.formRegist.mobilePhone === '') { @@ -191,14 +193,13 @@ export default { }); } }, - handleCancel () { - this.$refs.formRegist.resetFields(); - }, + // 图片验证码成功回调 verifyChange (con) { if (!con.status) return; this.$refs.verify.show = false; this.verifyStatus = true; }, + // 打开图片验证码 verifyBtnClick () { if (!this.verifyStatus) { this.$refs.verify.init(); diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue index 6c447f90..8d9eda12 100644 --- a/buyer/src/pages/forgetPassword.vue +++ b/buyer/src/pages/forgetPassword.vue @@ -241,6 +241,7 @@ export default { } }, mounted () { + document.querySelector('.forget-password').style.height = window.innerHeight + 'px' this.$refs.formFirst.resetFields(); }, watch: { @@ -250,7 +251,7 @@ export default { diff --git a/buyer/src/components/indexDecorate/ModelFormItem.vue b/buyer/src/components/indexDecorate/ModelFormItem.vue new file mode 100644 index 00000000..c854011b --- /dev/null +++ b/buyer/src/components/indexDecorate/ModelFormItem.vue @@ -0,0 +1,283 @@ + + + + diff --git a/buyer/src/components/indexDecorate/modelForm.vue b/buyer/src/components/indexDecorate/modelForm.vue index 9b1c4dc1..c9d3fb2e 100644 --- a/buyer/src/components/indexDecorate/modelForm.vue +++ b/buyer/src/components/indexDecorate/modelForm.vue @@ -14,7 +14,7 @@ + + diff --git a/buyer/src/components/indexDecorate/modelList/FirstPageAdvert.vue b/buyer/src/components/indexDecorate/modelList/FirstPageAdvert.vue new file mode 100644 index 00000000..687af8f5 --- /dev/null +++ b/buyer/src/components/indexDecorate/modelList/FirstPageAdvert.vue @@ -0,0 +1,98 @@ + + + diff --git a/buyer/src/components/indexDecorate/modelList/NewGoodsSort.vue b/buyer/src/components/indexDecorate/modelList/NewGoodsSort.vue new file mode 100644 index 00000000..ef609df7 --- /dev/null +++ b/buyer/src/components/indexDecorate/modelList/NewGoodsSort.vue @@ -0,0 +1,234 @@ + + + diff --git a/buyer/src/components/indexDecorate/modelList/NotEnough.vue b/buyer/src/components/indexDecorate/modelList/NotEnough.vue new file mode 100644 index 00000000..6f18e288 --- /dev/null +++ b/buyer/src/components/indexDecorate/modelList/NotEnough.vue @@ -0,0 +1,144 @@ + + + diff --git a/buyer/src/components/indexDecorate/modelList/Recommend.vue b/buyer/src/components/indexDecorate/modelList/Recommend.vue new file mode 100644 index 00000000..eefa0aa3 --- /dev/null +++ b/buyer/src/components/indexDecorate/modelList/Recommend.vue @@ -0,0 +1,217 @@ + + + diff --git a/buyer/src/components/indexDecorate/modelList/Seckill.vue b/buyer/src/components/indexDecorate/modelList/Seckill.vue new file mode 100644 index 00000000..9105c7ca --- /dev/null +++ b/buyer/src/components/indexDecorate/modelList/Seckill.vue @@ -0,0 +1,196 @@ + + + diff --git a/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue b/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue index 0508d78c..ef609df7 100644 --- a/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue +++ b/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue @@ -231,4 +231,4 @@ export default { margin-top: 15px; } } - \ No newline at end of file + diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue new file mode 100644 index 00000000..e64111d1 --- /dev/null +++ b/buyer/src/components/nav/CateNav.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/buyer/src/pages/CouponCenter.vue b/buyer/src/pages/CouponCenter.vue new file mode 100644 index 00000000..e6220a07 --- /dev/null +++ b/buyer/src/pages/CouponCenter.vue @@ -0,0 +1,176 @@ + + + diff --git a/buyer/src/pages/ForgetPassword.vue b/buyer/src/pages/ForgetPassword.vue new file mode 100644 index 00000000..9ac13ce7 --- /dev/null +++ b/buyer/src/pages/ForgetPassword.vue @@ -0,0 +1,330 @@ + + + + + diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue index ab8beb24..f363e2f0 100644 --- a/buyer/src/pages/Index.vue +++ b/buyer/src/pages/Index.vue @@ -21,7 +21,7 @@ + diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/FirstApply.vue similarity index 100% rename from buyer/src/pages/shopEntry/first-apply.vue rename to buyer/src/pages/shopEntry/FirstApply.vue diff --git a/buyer/src/pages/shopEntry/second-apply.vue b/buyer/src/pages/shopEntry/SecondApply.vue similarity index 100% rename from buyer/src/pages/shopEntry/second-apply.vue rename to buyer/src/pages/shopEntry/SecondApply.vue diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/ShopEntry.vue similarity index 97% rename from buyer/src/pages/shopEntry/shop-entry.vue rename to buyer/src/pages/shopEntry/ShopEntry.vue index c56e4011..517aaf76 100644 --- a/buyer/src/pages/shopEntry/shop-entry.vue +++ b/buyer/src/pages/shopEntry/ShopEntry.vue @@ -39,9 +39,9 @@ diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue index 72ab5695..abc4e101 100644 --- a/seller/src/views/promotion/seckill/seckillGoods.vue +++ b/seller/src/views/promotion/seckill/seckillGoods.vue @@ -395,6 +395,13 @@ export default { mounted() { this.init(); }, + // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面 + beforeRouteLeave(to, from, next){ + if(to.name === 'seckill') { + to.meta.keepAlive = true + } + next() + } }; diff --git a/buyer/src/components/indexDecorate/modelList/seckill.vue b/buyer/src/components/indexDecorate/modelList/seckill.vue index 9105c7ca..3c53d455 100644 --- a/buyer/src/components/indexDecorate/modelList/seckill.vue +++ b/buyer/src/components/indexDecorate/modelList/seckill.vue @@ -1,56 +1,171 @@ @@ -23,7 +26,6 @@ export default { margin: 100px; display: flex; flex-direction: column; - justify-content: center; align-items: center; } .pay-btn{ diff --git a/buyer/src/pages/promotion/seckill.vue b/buyer/src/pages/promotion/seckill.vue index 46b21558..bdcc7d82 100644 --- a/buyer/src/pages/promotion/seckill.vue +++ b/buyer/src/pages/promotion/seckill.vue @@ -68,6 +68,10 @@ export default { nowHour: new Date().getHours() // 当前小时数 } }, + beforeDestroy () { + // 销毁前清除定时器 + clearInterval(this.interval); + }, watch: { currIndex (val) { clearInterval(this.interval) diff --git a/buyer/yarn.lock b/buyer/yarn.lock index 9f463fb0..924202e2 100644 --- a/buyer/yarn.lock +++ b/buyer/yarn.lock @@ -2724,6 +2724,13 @@ "domelementtype" "^2.0.1" "entities" "^2.0.0" +"dom7@^2.1.3": + "integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==" + "resolved" "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz" + "version" "2.1.5" + dependencies: + "ssr-window" "^2.0.0" + "domain-browser@^1.1.1": "integrity" "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=" "resolved" "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1604239910191&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz" @@ -7728,6 +7735,16 @@ "safer-buffer" "^2.0.2" "tweetnacl" "~0.14.0" +"ssr-window@^1.0.1": + "integrity" "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==" + "resolved" "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz" + "version" "1.0.1" + +"ssr-window@^2.0.0": + "integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==" + "resolved" "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz" + "version" "2.0.0" + "ssri@^5.2.4": "integrity" "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==" "resolved" "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz" @@ -7991,6 +8008,14 @@ "unquote" "~1.1.1" "util.promisify" "~1.0.0" +"swiper@^4.0.7": + "integrity" "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==" + "resolved" "https://registry.npmjs.org/swiper/-/swiper-4.5.1.tgz" + "version" "4.5.1" + dependencies: + "dom7" "^2.1.3" + "ssr-window" "^1.0.1" + "table@4.0.2": "integrity" "sha1-ozRHN1OR52atNNNIbm4q7chNLjY= sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==" "resolved" "https://registry.npm.taobao.org/table/download/table-4.0.2.tgz" @@ -8487,6 +8512,14 @@ "resolved" "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz" "version" "1.1.2" +"vue-awesome-swiper@^3.1.3": + "integrity" "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==" + "resolved" "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz" + "version" "3.1.3" + dependencies: + "object-assign" "^4.1.1" + "swiper" "^4.0.7" + "vue-eslint-parser@^2.0.3": "integrity" "sha1-wmjJbG2Uz+PZOKX3WTlZsMozYNE= sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==" "resolved" "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz?cache=0&sync_timestamp=1608030990315&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-2.0.3.tgz" diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue index ec19150b..fc47c4a6 100644 --- a/manager/src/views/lili-floor-renovation/modelFormItem.vue +++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue @@ -35,7 +35,7 @@ - - - - - -