diff --git a/buyer/src/components/addressManage/index.vue b/buyer/src/components/addressManage/index.vue index ea4df620..a7b2669a 100644 --- a/buyer/src/components/addressManage/index.vue +++ b/buyer/src/components/addressManage/index.vue @@ -147,9 +147,7 @@ export default { }, watch: { id: { - immediate: true, handler: function (v) { - console.log(v); if (v) { this.getAddrById(v); } else { diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index d5cc3dc7..c3161388 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,10 +17,15 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' + common: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' + + // common: 'https://common-api.pickmall.cn', + // buyer: 'https://buyer-api.pickmall.cn', + // seller: 'https://store-api.pickmall.cn', + // manager: 'https://admin-api.pickmall.cn' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index b5b99543..fea3ff18 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -44,7 +44,6 @@
{{shop.storeName}} -
diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 4e45f86a..aaae009a 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -64,7 +64,7 @@
{{ order.storeName }}  + >
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 26051703..a21d8731 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -39,7 +39,7 @@
- {{ order.order.storeName }}   + {{ order.order.storeName }}
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 19e79fea..e1b711f6 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -63,14 +63,13 @@
{{shop.storeName}}   - - +
@@ -200,7 +199,7 @@ export default { // {value: 'LOCAL_TOWN_DELIVERY', label: '同城配送'} ], addressList: [], // 地址列表 - selectedAddress: {}, // 所选地址的id + selectedAddress: {}, // 所选地址 goodsList: [], // 商品列表 priceDetailDTO: {}, // 商品价格 totalNum: 0, // 购买数量 @@ -227,7 +226,6 @@ export default { methods: { init () { this.getGoodsDetail(); - this.getAddress(); }, goAddressManage () { // 跳转地址管理页面 this.$router.push('/home/MyAddress'); @@ -236,8 +234,10 @@ export default { memberAddress().then(res => { if (res.success) { this.addressList = res.result.records; - this.addressList.forEach((e) => { - if (e.isDefault) this.selectedAddress = e; + this.addressList.forEach((e, index) => { + if (e.id === this.selectedAddress.id && index > 2) { + this.moreAddr = true + } }); } }); @@ -250,13 +250,30 @@ export default { this.goodsList = res.result.cartList; this.priceDetailDTO = res.result.priceDetailDTO; this.skuList = res.result.skuList; + let notSupArea = res.result.notSupportFreight + if (notSupArea) { + let content = []; + let title = '' + notSupArea.forEach(e => { + title = e.errorMessage + content.push(e.goodsSku.goodsName) + }) + this.$Modal.warning({ + title: '以下商品超出配送区域' || title, + content: content.toString() + }) + } + if (res.result.memberAddress) { + this.selectedAddress = res.result.memberAddress + } + this.getAddress() this.totalNum = 0; for (let i = 0; i < this.skuList.length; i++) { this.totalNum += this.skuList[i].num; } this.getCouponNum() } - }).catch(() => { this.$Spin.hide(); }); + }).catch(() => { this.$Spin.hide() }); }, getCouponNum () { // 获取可用优惠券数量 couponNum({way: this.$route.query.way}).then(res => { diff --git a/manager/src/main.js b/manager/src/main.js index 68b3c5c0..2bbf62ee 100644 --- a/manager/src/main.js +++ b/manager/src/main.js @@ -11,7 +11,7 @@ import App from './App' import { router } from './router/index' import store from './store' import i18n from '@/locale' - +import vueQr from 'vue-qr' import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios' import { setStore, getStore, removeStore } from '@/libs/storage' import util from '@/libs/util' @@ -22,6 +22,12 @@ import liliDialog from '@/views/lili-dialog' import {md5} from '@/utils/md5.js'; Vue.config.devtools = true; Vue.config.productionTip = false +Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') { // 跳转买家端商品 + window.open(`${link}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') +}; +Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码 + return `https://m-b2b2c.pickmall.cn/pages/product/goods?id=${skuId}&goodsId=${goodsId}` +}; Vue.use(VueLazyload, { error: require('./assets/img-error.png'), loading: require('./assets/loading2.gif') @@ -31,6 +37,7 @@ Vue.use(ViewUI, { }); Vue.component('liliDialog',liliDialog) +Vue.component(vueQr) diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue index 98a8960c..a888bab2 100644 --- a/manager/src/views/distribution/distributionGoods.vue +++ b/manager/src/views/distribution/distributionGoods.vue @@ -21,7 +21,21 @@ -
+ + +
@@ -84,7 +98,7 @@ export default { }, { title: "商品名称", - key: "goodsName", + slot: "goodsName", minWidth: 200, tooltip: true }, @@ -99,7 +113,6 @@ export default { { title: "库存", key: "quantity", - minWidth: 80 }, { title: "添加时间", @@ -109,13 +122,11 @@ export default { { title: "店铺名称", key: "storeName", - minWidth: 120, tooltip: true }, { title: "佣金金额", key: "commission", - minWidth: 120, sortable: false, render: (h, params) => { return h("div", this.$options.filters.unitPrice(params.row.commission,'￥')); diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue index 57591647..895f23fb 100644 --- a/manager/src/views/goods/goods-info/goodsApply.vue +++ b/manager/src/views/goods/goods-info/goodsApply.vue @@ -262,24 +262,24 @@ }; }, methods: { - init() { + init() { // 初始化数据 this.getDataList(); }, - changePage(v) { + changePage(v) { // 改变页码 this.searchForm.pageNumber = v; this.getDataList(); this.clearSelectAll(); }, - changePageSize(v) { + changePageSize(v) { // 改变每页数量 this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch() { // 搜索 this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - changeSort(e) { + changeSort(e) { // 排序 this.searchForm.sort = e.key; this.searchForm.order = e.order; if (e.order === "normal") { @@ -287,14 +287,14 @@ } this.getDataList(); }, - clearSelectAll() { + clearSelectAll() { // 取消全部选中 this.$refs.table.selectAll(false); }, - changeSelect(e) { + changeSelect(e) { // 选中一项 this.selectList = e; this.selectCount = e.length; }, - getDataList() { + getDataList() { // 获取列表数据 this.loading = true; // 带多条件搜索参数获取表单数据 this.searchForm.isAuth = 0; @@ -306,7 +306,7 @@ } }); }, - examine(v, isAuth) { + examine(v, isAuth) { // 审核商品 let examine = "通过"; this.goodsAuditForm.isAuth = "PASS"; if (isAuth != 1) { diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue index 0373eb7d..4b3d9382 100644 --- a/manager/src/views/order/after-order/afterSaleOrder.vue +++ b/manager/src/views/order/after-order/afterSaleOrder.vue @@ -87,16 +87,22 @@ @on-selection-change="changeSelect" > -