diff --git a/components/BsAddress.vue b/components/BsAddress.vue index a34308c..b2112f3 100644 --- a/components/BsAddress.vue +++ b/components/BsAddress.vue @@ -93,9 +93,9 @@ :class="!isAccount ? 'flex-column' : ''" > 设为默认地址 -
+
取消 item.isDefault); vm.curAddressListItem = curIndex > -1 ? vm.addressList[curIndex] : vm.addressList[0]; vm.$emit("getList", vm.addressList); vm.$emit("emitAddress", vm.curAddressListItem); } else { + vm.defaultAddress = true; vm.isOperation = true; } console.log("获取收货地址", res); @@ -410,6 +408,9 @@ export default { margin-right: 38px; } } + .clearmargin{ + margin: 0 0 0 20px; + } } } diff --git a/pages/account/index/message.vue b/pages/account/index/message.vue index cf66be9..e29c595 100644 --- a/pages/account/index/message.vue +++ b/pages/account/index/message.vue @@ -49,8 +49,8 @@ export default { ...mapState(["token"]), }, mounted() { - // let url = `ws://192.168.10.93:8090/ws?client=eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjQwNzA4ODAwMDAsImlkIjoyLCJ0aW1lIjoxNjUyNDQyMDIyMjE4fQ.ybPvJ-pkywqzBgAK9Lv_7yme50cGhtTvzVcfp-kLyjlzKpsgcvQrhd_FhCHZo-eUEN-OuotoLblU94UMa_oKZ1TU78gjzPWeUpUO9LZVOs0HKIxeFmPbJTe0js5Ckw79p8uTNyO6p9DmZTb3TsX9OmoNoeTDkZLMiJsIXEi9eRU&type=1`; - let url = `wss://k8s-horse-gateway.mashibing.cn/ws?client=${this.token}&type=1`; + let url = `ws://192.168.10.93:8090/ws?client=${this.token}&type=1`; + // let url = `wss://k8s-horse-gateway.mashibing.cn/ws?client=${this.token}&type=1`; this.socket(url); }, methods: { diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue index 36dd5c7..af7ba91 100644 --- a/pages/goods/detail/_id.vue +++ b/pages/goods/detail/_id.vue @@ -1,14 +1,51 @@