diff --git a/buyer/package.json b/buyer/package.json
index ae2ec6e8..9f64b7fb 100644
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -14,9 +14,10 @@
"js-cookie": "^2.2.1",
"less": "^3.12.2",
"less-loader": "^5.0.0",
+ "mv-count-down": "^0.1.15",
"psl": "^1.8.0",
"qs": "^6.9.4",
- "swiper": "^6.4.1",
+ "swiper": "^5.2.0",
"uuid": "^8.3.2",
"v-distpicker": "^1.0.17",
"view-design": "^4.3.2",
diff --git a/buyer/src/assets/iconfont/icomoon.eot b/buyer/src/assets/iconfont/icomoon.eot
index 5a5b53d3..1155a87a 100644
Binary files a/buyer/src/assets/iconfont/icomoon.eot and b/buyer/src/assets/iconfont/icomoon.eot differ
diff --git a/buyer/src/assets/iconfont/icomoon.svg b/buyer/src/assets/iconfont/icomoon.svg
index a44989ac..780957bd 100644
--- a/buyer/src/assets/iconfont/icomoon.svg
+++ b/buyer/src/assets/iconfont/icomoon.svg
@@ -11,4 +11,6 @@
+
+
\ No newline at end of file
diff --git a/buyer/src/assets/iconfont/icomoon.ttf b/buyer/src/assets/iconfont/icomoon.ttf
index b63f6d43..d89161b6 100644
Binary files a/buyer/src/assets/iconfont/icomoon.ttf and b/buyer/src/assets/iconfont/icomoon.ttf differ
diff --git a/buyer/src/assets/iconfont/icomoon.woff b/buyer/src/assets/iconfont/icomoon.woff
index 1a942db4..64960b47 100644
Binary files a/buyer/src/assets/iconfont/icomoon.woff and b/buyer/src/assets/iconfont/icomoon.woff differ
diff --git a/buyer/src/assets/iconfont/iconfont.css b/buyer/src/assets/iconfont/iconfont.css
index aded85f0..2e74525c 100644
--- a/buyer/src/assets/iconfont/iconfont.css
+++ b/buyer/src/assets/iconfont/iconfont.css
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
- src: url('icomoon.eot?4ejtdc');
- src: url('icomoon.eot?4ejtdc#iefix') format('embedded-opentype'),
- url('icomoon.ttf?4ejtdc') format('truetype'),
- url('icomoon.woff?4ejtdc') format('woff'),
- url('icomoon.svg?4ejtdc#icomoon') format('svg');
+ src: url('icomoon.eot?jvagvf');
+ src: url('icomoon.eot?jvagvf#iefix') format('embedded-opentype'),
+ url('icomoon.ttf?jvagvf') format('truetype'),
+ url('icomoon.woff?jvagvf') format('woff'),
+ url('icomoon.svg?jvagvf#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@@ -25,6 +25,14 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-wallet:before {
+ content: "\e905";
+ color: #3c56c6;
+}
+.icon-qrcode:before {
+ content: "\e904";
+ color: #999;
+}
.icon-customer-service:before {
content: "\e900";
}
diff --git a/buyer/src/components/indexDecorate/modelList/seckill.vue b/buyer/src/components/indexDecorate/modelList/seckill.vue
index c1f16dd8..adbf6f5e 100644
--- a/buyer/src/components/indexDecorate/modelList/seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/seckill.vue
@@ -36,7 +36,7 @@
diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue
index e953892a..470d6afa 100644
--- a/buyer/src/pages/payment/thirdPay.vue
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -70,7 +70,7 @@ export default {
payCallback(params).then(res => {
if (res.result) {
clearInterval(this.interval);
- this.$router.push('/payDone');
+ this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
}
});
}
diff --git a/buyer/yarn.lock b/buyer/yarn.lock
index 6dbcc1c8..afd75933 100644
--- a/buyer/yarn.lock
+++ b/buyer/yarn.lock
@@ -2051,7 +2051,7 @@ copy-webpack-plugin@^4.0.1:
p-limit "^1.0.0"
serialize-javascript "^1.4.0"
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
version "2.6.12"
resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1607216048810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
@@ -5150,6 +5150,16 @@ mute-stream@0.0.7:
resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+mv-count-down@^0.1.15:
+ version "0.1.15"
+ resolved "https://registry.npmjs.org/mv-count-down/-/mv-count-down-0.1.15.tgz#a3f3c1677576e592c7710b441b2dda96acac2702"
+ integrity sha512-7poh86i27D/u4AvE9Ne8QHhy61p4MYAhSf4XAVyxzL0gXVCyccJ0NtJferEOxBP6C2q9jImknpKLGdwnEeJ7qQ==
+ dependencies:
+ core-js "^2.6.5"
+ vue "^2.6.10"
+ vue-router "^3.0.3"
+ vuex "^3.0.1"
+
nan@^2.12.1, nan@^2.13.2:
version "2.14.2"
resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591700047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
@@ -8315,6 +8325,11 @@ vue-router@^3.0.1:
resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1607347231238&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
integrity sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY=
+vue-router@^3.0.3:
+ version "3.5.2"
+ resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c"
+ integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ==
+
vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
version "3.1.2"
resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 3166560d..abb8bb3f 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -159,10 +159,10 @@
+ :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']"
+ :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
+ :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl"
+ :headers="accessToken" style="display: inline-block;margin-left:10px;">
@@ -183,9 +183,9 @@
+ placeholder="请输入规格项名称"
+ :filter-method="filterMethod" :data="skuData"
+ @on-change="editSkuItem">
@@ -441,7 +441,7 @@ export default {
editor,
},
watch: {
- selectGoodsType: {
+ selectGoodsType: { // 选择商品类型
handler(val) {
if (val && this.baseInfoForm.goodsType) {
this.goodsTypeWay.forEach((item) => {