@@ -14,7 +14,10 @@
@@ -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/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue
index 2e2cd35e..55976371 100644
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -66,6 +66,7 @@ export default {
};
},
methods: {
+ // 获取订单详情
getTradeDetail () {
const params = this.$route.query;
params.clientType = 'PC'
@@ -127,7 +128,6 @@ export default {
font-size: 21px;
}
-
.-box-item {
display: flex;
font-size: 18px;
diff --git a/buyer/src/pages/payment/ThirdPay.vue b/buyer/src/pages/payment/ThirdPay.vue
new file mode 100644
index 00000000..651474ac
--- /dev/null
+++ b/buyer/src/pages/payment/ThirdPay.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
订单提交成功，请尽快付款！
+
请您尽快完成支付，否则订单会被自动取消
+
+
+
应付金额 {{$route.query.price | unitPrice}} 元
+
+
+
+
{{params.paymentMethod === 'ALIPAY' ? '支付宝支付' : '微信支付'}}
+
+
+
+
+
+
+
+
支付成功后自动跳转，如未跳转请点击按钮手动跳转。。。
+
+ 重新支付
+ 支付成功
+
+
+
选择其他支付方式>
+
+
+
+
+
diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue
index 3cda768f..651474ac 100644
--- a/buyer/src/pages/payment/thirdPay.vue
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -46,9 +46,9 @@ export default {
};
},
methods: {
+ // 获取支付二维码
handlePay () {
const params = this.$route.query;
-
pay(params).then(res => {
if (res.success) {
this.qrcode = res.result;
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/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/FirstApply.vue
similarity index 97%
rename from buyer/src/pages/shopEntry/first-apply.vue
rename to buyer/src/pages/shopEntry/FirstApply.vue
index 7b82e101..915ba592 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/FirstApply.vue
@@ -254,6 +254,7 @@ export default {
};
},
methods: {
+ // 下一步
next () {
this.$refs.firstForm.validate((valid) => {
if (valid) {
@@ -274,9 +275,8 @@ export default {
}
});
},
+ // 地址选择回显
selectedRegion (item) {
- console.log(item);
- // 地址选择回显
this.$set(this.form, 'storeAddressIdPath', item[0].toString());
this.$set(
this.form,
@@ -284,6 +284,7 @@ export default {
item[1].toString().replace(/\s/g, '')
);
},
+ // 上传之前
beforeUpload () {
this.uploadLoading = true;
if (this.form.licencePhoto.length >= 3) {
@@ -291,6 +292,7 @@ export default {
return false;
}
},
+ // 上传之前
beforeUpload1 () {
this.uploadLoading1 = true;
if (this.form.legalPhoto.length >= 3) {
@@ -298,16 +300,24 @@ export default {
return false;
}
},
+ // 上传成功回调
handleSuccess (res, file) {
this.uploadLoading = false;
this.form.licencePhoto.push(res.result);
},
+ // 上传成功回调
handleSuccess1 (res, file) {
this.uploadLoading1 = false;
this.form.legalPhoto.push(res.result);
console.log(res);
console.log(file);
},
+ // 上传失败
+ uploadErr () {
+ this.uploadLoading = false;
+ this.uploadLoading1 = false;
+ },
+ // 上传失败回调
handleFormatError (file) {
this.uploadLoading = false;
this.uploadLoading1 = false;
@@ -316,6 +326,7 @@ export default {
desc: '上传文件格式不正确'
});
},
+ // 上传大小限制
handleMaxSize (file) {
this.uploadLoading = false;
this.uploadLoading1 = false;
@@ -324,21 +335,19 @@ export default {
desc: '文件大小不能超过2M'
});
},
- uploadErr () {
- this.uploadLoading = false;
- this.uploadLoading1 = false;
- },
+ // 图片查看
handleView (item) {
this.previewPicture = item;
this.visible = true;
},
+ // 删除图片
handleRemove (index, listName) {
this.form[listName].splice(index, 1);
}
},
mounted () {
this.accessToken.accessToken = storage.getItem('accessToken');
- if (Object.keys(this.content).length) {
+ if (Object.keys(this.content).length) { // 处理回显数据
this.form = JSON.parse(JSON.stringify(this.content));
if (this.form.licencePhoto) {
this.form.legalPhoto = this.content.legalPhoto.split(',');
diff --git a/buyer/src/pages/shopEntry/second-apply.vue b/buyer/src/pages/shopEntry/SecondApply.vue
similarity index 99%
rename from buyer/src/pages/shopEntry/second-apply.vue
rename to buyer/src/pages/shopEntry/SecondApply.vue
index 45e1a7e9..7c87a824 100644
--- a/buyer/src/pages/shopEntry/second-apply.vue
+++ b/buyer/src/pages/shopEntry/SecondApply.vue
@@ -70,6 +70,7 @@ export default {
};
},
methods: {
+ // 下一步
next () {
this.$refs.secondForm.validate((valid) => {
if (valid) {
diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/ShopEntry.vue
similarity index 96%
rename from buyer/src/pages/shopEntry/shop-entry.vue
rename to buyer/src/pages/shopEntry/ShopEntry.vue
index e5a288fc..517aaf76 100644
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -39,9 +39,9 @@
diff --git a/manager/src/views/lili-floor-renovation/modelList/seckill.vue b/manager/src/views/lili-floor-renovation/modelList/seckill.vue
index 0ab6a13b..2a75a10d 100644
--- a/manager/src/views/lili-floor-renovation/modelList/seckill.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/seckill.vue
@@ -1,262 +1,291 @@
-
-
-
{{actName}}
-
{{currHour}}:00 点场 倒计时
-
{{hours}} {{minutes}} {{seconds}}
-
{{ actStatus == 0 ?'未开始':'已结束' }}
-
-
-
-
-
-
-
{{item.name}}
-
- {{ item.price | unitPrice('￥') }}
- {{ item.originalPrice | unitPrice('￥') }}
-
-
-
-
+
+
秒杀商品需要在促销活动中添加商品，有商品时才会在首页展示
+
+
{{ actName }}
+
+ {{ currHour }}:00 点场 倒计时
+
+
+ {{ hours }} {{ minutes }} {{ seconds }}
+
+
+ {{ actStatus == 0 ? "未开始" : "已结束" }}
+
+
+
+
+
+
+
{{ item.name }}
+
+ {{ item.price | unitPrice("￥") }}
+ {{ item.originalPrice | unitPrice("￥") }}
+
+
+
+
+
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index 153def56..a2cda18b 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -14,8 +14,11 @@
-
-
保存模板 还原模板
+
+
+ 保存模板
+ 还原模板
+
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()
+ }
};
- 
@@ -14,7 +14,10 @@
@@ -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/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue
index 2e2cd35e..55976371 100644
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -66,6 +66,7 @@ export default {
};
},
methods: {
+ // 获取订单详情
getTradeDetail () {
const params = this.$route.query;
params.clientType = 'PC'
@@ -127,7 +128,6 @@ export default {
font-size: 21px;
}
-
.-box-item {
display: flex;
font-size: 18px;
diff --git a/buyer/src/pages/payment/ThirdPay.vue b/buyer/src/pages/payment/ThirdPay.vue
new file mode 100644
index 00000000..651474ac
--- /dev/null
+++ b/buyer/src/pages/payment/ThirdPay.vue
@@ -0,0 +1,154 @@
+
+