Skip to content

G
group-buy-ui
Commit 86b3e1d5 authored by Xuguangxing's avatar Xuguangxing
Browse files
Options

feat: 增加团购信息组件

parent fd345759
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 46 deletions
package-lock.json
View file @ 86b3e1d5
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
"@qg/js-bridge": "^1.1.9", "@qg/js-bridge": "^1.1.9",
"@qg/qg-scroll": "^1.4.2", "@qg/qg-scroll": "^1.4.2",
"@qg/ui-request": "^0.0.20", "@qg/ui-request": "^0.0.20",
"@qg/ui-track-web": "0.0.3",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"crypto-js": "^3.1.9-1",
"intersection-observer": "^0.12.0", "intersection-observer": "^0.12.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"raven-js": "^3.27.2", "raven-js": "^3.27.2",
...@@ -1244,6 +1246,23 @@ ...@@ -1244,6 +1246,23 @@
"node": ">=0.6" "node": ">=0.6"
} }
}, },
"node_modules/@qg/ui-track-web": {
"version": "0.0.3",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fui-track-web/-/ui-track-web-0.0.3.tgz",
"integrity": "sha512-eVo3fXcp3eRGG5YznmfZQa8ih03nJtmNJYCS9VCt3Q8x/mpK3iaqk7Be6+ntUUeCfVSre7uq7fXGwUEfj1ieUw==",
"license": "ISC",
"dependencies": {
"@qg/js-bridge": "^1.1.11",
"sa-sdk-javascript": "^1.18.2",
"vue": "^2.6.14"
}
},
"node_modules/@qg/ui-track-web/node_modules/vue": {
"version": "2.6.14",
"resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.14.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==",
"license": "MIT"
},
"node_modules/@qg/webpack-cos-cdn-upload-plugin": { "node_modules/@qg/webpack-cos-cdn-upload-plugin": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fwebpack-cos-cdn-upload-plugin/-/webpack-cos-cdn-upload-plugin-0.0.4.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fwebpack-cos-cdn-upload-plugin/-/webpack-cos-cdn-upload-plugin-0.0.4.tgz",
...@@ -4453,6 +4472,12 @@ ...@@ -4453,6 +4472,12 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/crypto-js": {
"version": "3.3.0",
"resolved": "http://npmprivate.quantgroups.com/crypto-js/-/crypto-js-3.3.0.tgz",
"integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==",
"license": "MIT"
},
"node_modules/css": { "node_modules/css": {
"version": "2.2.4", "version": "2.2.4",
"resolved": "http://npmprivate.quantgroups.com/css/-/css-2.2.4.tgz", "resolved": "http://npmprivate.quantgroups.com/css/-/css-2.2.4.tgz",
...@@ -12598,9 +12623,10 @@ ...@@ -12598,9 +12623,10 @@
} }
}, },
"node_modules/sa-sdk-javascript": { "node_modules/sa-sdk-javascript": {
"version": "1.15.16", "version": "1.18.17",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.15.16.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.17.tgz",
"integrity": "sha512-UIFJBYk8EEcMAg6kSeUdjYAnl3IEXA8DDk/7xqS1aU4bZV3+iUXo2hT1rzGPsSWanVvcDZ/uSGUNZqojsfZaGA==" "integrity": "sha1-mLW7PyfL2jmwcCTb3G/Bes6H0n8=",
"license": "Apache-2.0"
}, },
"node_modules/safe-buffer": { "node_modules/safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
...@@ -18675,11 +18701,6 @@ ...@@ -18675,11 +18701,6 @@
"vue": "^2.6.14" "vue": "^2.6.14"
}, },
"dependencies": { "dependencies": {
"sa-sdk-javascript": {
"version": "1.18.17",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.17.tgz",
"integrity": "sha1-mLW7PyfL2jmwcCTb3G/Bes6H0n8="
},
"vue": { "vue": {
"version": "2.6.14", "version": "2.6.14",
"resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.14.tgz", "resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.14.tgz",
...@@ -21494,8 +21515,8 @@ ...@@ -21494,8 +21515,8 @@
}, },
"crypto-js": { "crypto-js": {
"version": "3.3.0", "version": "3.3.0",
"resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-3.3.0.tgz", "resolved": "http://npmprivate.quantgroups.com/crypto-js/-/crypto-js-3.3.0.tgz",
"integrity": "sha1-hG3RzOL2iqz6FWyFePkmpgm3l2s=" "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
}, },
"css": { "css": {
"version": "2.2.4", "version": "2.2.4",
...@@ -28215,9 +28236,9 @@ ...@@ -28215,9 +28236,9 @@
} }
}, },
"sa-sdk-javascript": { "sa-sdk-javascript": {
"version": "1.15.16", "version": "1.18.17",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.15.16.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.17.tgz",
"integrity": "sha512-UIFJBYk8EEcMAg6kSeUdjYAnl3IEXA8DDk/7xqS1aU4bZV3+iUXo2hT1rzGPsSWanVvcDZ/uSGUNZqojsfZaGA==" "integrity": "sha1-mLW7PyfL2jmwcCTb3G/Bes6H0n8="
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
src/config/env.config.js
View file @ 86b3e1d5
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
const protocol = window.location.protocol; const protocol = window.location.protocol;
const qiniuHost = protocol + '//kdspstatic.q-gp.com/'; const qiniuHost = protocol + '//kdspstatic.q-gp.com/';
const shenceHost = 'https://bn.xyqb.com/sa?project=default'; // 测试地址 const shenceHost = 'https://bn.xyqb.com/sa?project=default'; // 测试地址
const talosHost = 'https://talos-tob.liangkebang.net'; const talosHost = 'https://talos-vcc2.liangkebang.net';
const faceHost = 'https://auth-tob.liangkebang.net'; const faceHost = 'https://auth-vcc2.liangkebang.net';
const kdspHost = 'https://kdsp-api-tob.liangkebang.net'; const kdspHost = 'https://kdsp-api-vcc2.liangkebang.net';
const VCC_CHANNEL = ''; const VCC_CHANNEL = '';
const TERMINAL = 'H5'; const TERMINAL = 'H5';
const VERSION = '7.9.00'; const VERSION = '7.9.00';
......
src/views/goodsDetail/components/bottomNav.vue
View file @ 86b3e1d5
<template> <template>
<div class="goods-bottom"> <div class="goods-bottom">
<cr-button plain type="primary" shape="circle" :disabled="disabled">自己做团长</cr-button> <template v-if="status == 1">
<cr-button shape="circle" :disabled="disabled" type="primary" block @click="buy"> <cr-button class="mutiplie" plain type="primary" shape="circle" :disabled="disabled"
立即参团 >自己做团长</cr-button
</cr-button> >
<cr-button
class="mutiplie"
shape="circle"
:disabled="disabled"
type="primary"
block
@click="buy"
>
立即参团
</cr-button>
</template>
<template v-if="status == 2">
<cr-button shape="circle" :disabled="disabled" type="primary" block @click="buy">
立即开团
</cr-button>
</template>
</div> </div>
</template> </template>
<script> <script>
...@@ -31,16 +47,15 @@ export default { ...@@ -31,16 +47,15 @@ export default {
goodsId: { goodsId: {
type: String, type: String,
default: '' default: ''
},
status: {
type: Number,
default: 2
} }
}, },
methods: { methods: {
buy() { buy() {
this.$emit('buy'); this.$emit('buy');
},
goHome() {
setTimeout(() => {
this.$router.push({ name: 'home' });
}, 500);
} }
} }
}; };
...@@ -60,8 +75,10 @@ export default { ...@@ -60,8 +75,10 @@ export default {
box-sizing: border-box; box-sizing: border-box;
z-index: 2; z-index: 2;
button { button {
width: 50%; flex: 1;
margin: 0 10px; &.mutiplie {
margin: 0 @padding-xs;
}
} }
} }
</style> </style>
src/views/goodsDetail/index.vue
View file @ 86b3e1d5
...@@ -158,9 +158,9 @@ ...@@ -158,9 +158,9 @@
</div> </div>
</div> </div>
<span v-else class="goods-area-none">暂未添加地址哦～</span> <span v-else class="goods-area-none">暂未添加地址哦～</span>
<div class="goods-area-button" @click="addAddress"> <!-- <div class="goods-area-button" @click="addAddress"> -->
<button class="goods-bottom-buy btn-absolute">添加新地址</button> <!-- <button class="goods-bottom-buy btn-absolute">添加新地址</button> -->
</div> <!-- </div> -->
</div> </div>
</cr-popup> </cr-popup>
<bottom-nav type="shoppingCar" :disabled="false" @buy="goVccOrDetail" /> <bottom-nav type="shoppingCar" :disabled="false" @buy="goVccOrDetail" />
...@@ -312,18 +312,19 @@ export default { ...@@ -312,18 +312,19 @@ export default {
if (addressInfo) { if (addressInfo) {
this.addressList = (addressInfo && addressInfo.addrReceiverList) || []; this.addressList = (addressInfo && addressInfo.addrReceiverList) || [];
this.show = true; this.show = true;
} else {
this.addAddress();
} }
// else {
// this.addAddress();
// }
}, },
addAddress() { // addAddress() {
if (!this.hasLogin) { // if (!this.hasLogin) {
this.$router.push({ name: 'login' }); // this.$router.push({ name: 'login' });
return; // return;
} // }
this.show = false; // this.show = false;
this.$router.push({ name: 'addressManage' }); // this.$router.push({ name: 'addressManage' });
}, // },
toOrder() { toOrder() {
if (!this.hasLogin) { if (!this.hasLogin) {
this.$router.push({ name: 'login' }); this.$router.push({ name: 'login' });
......
yarn.lock
View file @ 86b3e1d5
...@@ -927,7 +927,7 @@ ...@@ -927,7 +927,7 @@
"vue-lazyload" "^1.3.3" "vue-lazyload" "^1.3.3"
"vue-video-player" "^5.0.2" "vue-video-player" "^5.0.2"
"@qg/js-bridge@^1.1.9": "@qg/js-bridge@^1.1.11", "@qg/js-bridge@^1.1.9":
"integrity" "sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA==" "integrity" "sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA=="
"resolved" "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz" "resolved" "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz"
"version" "1.1.11" "version" "1.1.11"
...@@ -957,6 +957,15 @@ ...@@ -957,6 +957,15 @@
"@qg/js-bridge" "^1.2.0-beta2" "@qg/js-bridge" "^1.2.0-beta2"
"axios" "^0.19.2" "axios" "^0.19.2"
"@qg/ui-track-web@0.0.3":
"integrity" "sha512-eVo3fXcp3eRGG5YznmfZQa8ih03nJtmNJYCS9VCt3Q8x/mpK3iaqk7Be6+ntUUeCfVSre7uq7fXGwUEfj1ieUw=="
"resolved" "http://npmprivate.quantgroups.com/@qg%2fui-track-web/-/ui-track-web-0.0.3.tgz"
"version" "0.0.3"
dependencies:
"@qg/js-bridge" "^1.1.11"
"sa-sdk-javascript" "^1.18.2"
"vue" "^2.6.14"
"@qg/webpack-cos-cdn-upload-plugin@0.0.4": "@qg/webpack-cos-cdn-upload-plugin@0.0.4":
"integrity" "sha512-ekReJxjD+/R+Rgsatb6qRsJHYyQmS525NfTYjRQTZM/4IEdhfG+068xI9837jpCo8DvjllaaypB6m4Qol5s0gw==" "integrity" "sha512-ekReJxjD+/R+Rgsatb6qRsJHYyQmS525NfTYjRQTZM/4IEdhfG+068xI9837jpCo8DvjllaaypB6m4Qol5s0gw=="
"resolved" "http://npmprivate.quantgroups.com/@qg%2fwebpack-cos-cdn-upload-plugin/-/webpack-cos-cdn-upload-plugin-0.0.4.tgz" "resolved" "http://npmprivate.quantgroups.com/@qg%2fwebpack-cos-cdn-upload-plugin/-/webpack-cos-cdn-upload-plugin-0.0.4.tgz"
...@@ -2865,6 +2874,11 @@ ...@@ -2865,6 +2874,11 @@
"randombytes" "^2.0.0" "randombytes" "^2.0.0"
"randomfill" "^1.0.3" "randomfill" "^1.0.3"
"crypto-js@^3.1.9-1":
"integrity" "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
"resolved" "http://npmprivate.quantgroups.com/crypto-js/-/crypto-js-3.3.0.tgz"
"version" "3.3.0"
"css-color-names@^0.0.4", "css-color-names@0.0.4": "css-color-names@^0.0.4", "css-color-names@0.0.4":
"integrity" "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" "integrity" "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
"resolved" "http://npmprivate.quantgroups.com/css-color-names/-/css-color-names-0.0.4.tgz" "resolved" "http://npmprivate.quantgroups.com/css-color-names/-/css-color-names-0.0.4.tgz"
...@@ -7765,10 +7779,10 @@ ...@@ -7765,10 +7779,10 @@
dependencies: dependencies:
"tslib" "^1.9.0" "tslib" "^1.9.0"
"sa-sdk-javascript@^1.15.16": "sa-sdk-javascript@^1.15.16", "sa-sdk-javascript@^1.18.2":
"integrity" "sha512-UIFJBYk8EEcMAg6kSeUdjYAnl3IEXA8DDk/7xqS1aU4bZV3+iUXo2hT1rzGPsSWanVvcDZ/uSGUNZqojsfZaGA==" "integrity" "sha1-mLW7PyfL2jmwcCTb3G/Bes6H0n8="
"resolved" "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.15.16.tgz" "resolved" "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.17.tgz"
"version" "1.15.16" "version" "1.18.17"
"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@~5.1.0", "safe-buffer@~5.1.1", "safe-buffer@5.1.2": "safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@~5.1.0", "safe-buffer@~5.1.1", "safe-buffer@5.1.2":
"integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
...@@ -9266,6 +9280,11 @@ ...@@ -9266,6 +9280,11 @@
"videojs-flash" "^2.1.0" "videojs-flash" "^2.1.0"
"videojs-hotkeys" "^0.2.20" "videojs-hotkeys" "^0.2.20"
"vue@^2.6.14":
"integrity" "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
"resolved" "http://npmprivate.quantgroups.com/vue/-/vue-2.6.14.tgz"
"version" "2.6.14"
"vue@2.6.11": "vue@2.6.11":
"integrity" "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" "integrity" "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
"resolved" "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz" "resolved" "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment