From 3b922839a1583e01dc038b9f61bf22db285dfea2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 14:59:20 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B1=95=E7=A4=BA=E6=90=9C=E7=B4=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 21 ++++++ seller/src/views/goods/goods-seller/goods.vue | 69 ++++++++++++------- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index d46ce5e8..21271b7e 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -38,6 +38,12 @@ + + + @@ -132,6 +138,7 @@ export default { pageSize: 10, // 页面大小 sort: "create_time", // 默认排序字段 order: "desc", // 默认排序方式 + goodsType: "", // 商品类型 }, underForm: { // 下架原因 reason: "", @@ -174,6 +181,20 @@ export default { ); }, }, + { + title: "商品类型", + key: "goodsType", + width: 130, + render: (h, params) => { + if (params.row.goodsType === 'PHYSICAL_GOODS') { + return h("div", "实物商品"); + } else if (params.row.goodsType === 'VIRTUAL_GOODS') { + return h("div", "虚拟商品"); + } else { + return h("div", "电子卡券"); + } + }, + }, { title: "状态", key: "marketEnable", diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index c20f5c3e..df95601d 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -4,7 +4,7 @@
- + + + + - + @@ -45,11 +51,12 @@
- {{row.goodsName}} + {{ row.goodsName }}
- +
@@ -60,13 +67,14 @@ - + - +
@@ -78,7 +86,8 @@ - + 卖家承担运费 @@ -245,6 +254,20 @@ export default { ); }, }, + { + title: "商品类型", + key: "goodsType", + width: 130, + render: (h, params) => { + if (params.row.goodsType === 'PHYSICAL_GOODS') { + return h("div", "实物商品"); + } else if (params.row.goodsType === 'VIRTUAL_GOODS') { + return h("div", "虚拟商品"); + } else { + return h("div", "电子卡券"); + } + }, + }, { title: "商品价格", key: "price", @@ -432,10 +455,10 @@ export default { this.getDataList(); }, addGoods() { - this.$router.push({ name: "goods-operation" }); + this.$router.push({name: "goods-operation"}); }, editGoods(v) { - this.$router.push({ name: "goods-operation-edit", query: { id: v.id } }); + this.$router.push({name: "goods-operation-edit", query: {id: v.id}}); }, //批量操作 @@ -458,7 +481,7 @@ export default { } }, getStockDetail(id) { - getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => { + getGoodsSkuListDataSeller({goodsId: id, pageSize: 1000}).then((res) => { if (res.success) { this.updateStockModalVisible = true; this.stockAllUpdate = undefined; @@ -468,7 +491,7 @@ export default { }, updateStock() { let updateStockList = this.stockList.map((i) => { - let j = { skuId: i.id, quantity: i.quantity }; + let j = {skuId: i.id, quantity: i.quantity}; if (this.stockAllUpdate) { j.quantity = this.stockAllUpdate; } @@ -481,28 +504,28 @@ export default { } }); }, - 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(); }, - handleReset () { + handleReset() { this.searchForm = {}; 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") { @@ -510,15 +533,15 @@ export default { } this.getDataList(); }, - clearSelectAll () { + clearSelectAll() { this.$refs.table.selectAll(false); }, - changeSelect (e) { + changeSelect(e) { this.selectList = e; this.selectCount = e.length; }, //保存运费模板信息 - saveShipTemplate () { + saveShipTemplate() { if (this.shipTemplateForm.freightPayer == "STORE") { { this.shipTemplateForm.templateId = 0; @@ -716,10 +739,10 @@ export default { }); }, }, - mounted () { - this.init(); + mounted() { + this.init(); }, - activated () { + activated() { this.init(); }, }; From d3576b691cc388ce1c8335096a970b3c5035633b Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 15:16:02 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index 21271b7e..a63543e9 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -138,7 +138,6 @@ export default { pageSize: 10, // 页面大小 sort: "create_time", // 默认排序字段 order: "desc", // 默认排序方式 - goodsType: "", // 商品类型 }, underForm: { // 下架原因 reason: "", From 8e239a5bbfab4d4b63d2784488f53a16e37e027f Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 17:36:07 +0800 Subject: [PATCH 03/38] =?UTF-8?q?token=20=E8=A7=A3=E6=9E=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/plugins/request.js | 104 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index b937df34..7d3233d5 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -1,27 +1,27 @@ // import Vue from 'vue'; -import axios from "axios"; -import https from "https"; -import { Message, Spin, Modal } from "view-design"; -import Storage from "./storage"; -import config from "@/config"; -import router from "../router/index.js"; -import store from "../vuex/store"; -import { handleRefreshToken } from "@/api/index"; -const qs = require("qs"); +import axios from 'axios'; +import https from 'https'; +import { Message, Spin, Modal } from 'view-design'; +import Storage from './storage'; +import config from '@/config'; +import router from '../router/index.js'; +import store from '../vuex/store'; +import { handleRefreshToken } from '@/api/index'; +const qs = require('qs'); export const buyerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.buyer : config.api_prod.buyer; export const commonUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common; export const managerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager; export const sellerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller; // 创建axios实例 @@ -35,7 +35,7 @@ const service = axios.create({ }), paramsSerializer: params => qs.stringify(params, { - arrayFormat: "repeat" + arrayFormat: 'repeat' }) }); @@ -44,15 +44,15 @@ service.interceptors.request.use( config => { const { loading } = config; // 如果是put/post请求，用qs.stringify序列化参数 - const isPutPost = config.method === "put" || config.method === "post"; - const isJson = config.headers["Content-Type"] === "application/json"; - const isFile = config.headers["Content-Type"] === "multipart/form-data"; + const isPutPost = config.method === 'put' || config.method === 'post'; + const isJson = config.headers['Content-Type'] === 'application/json'; + const isFile = config.headers['Content-Type'] === 'multipart/form-data'; if (isPutPost && isJson) { config.data = JSON.stringify(config.data); } if (isPutPost && !isFile && !isJson) { config.data = qs.stringify(config.data, { - arrayFormat: "repeat" + arrayFormat: 'repeat' }); } /** 配置全屏加载 */ @@ -60,16 +60,16 @@ service.interceptors.request.use( config.loading = Spin.show(); } - const uuid = Storage.getItem("uuid"); - config.headers["uuid"] = uuid; + const uuid = Storage.getItem('uuid'); + config.headers['uuid'] = uuid; // 获取访问Token - let accessToken = Storage.getItem("accessToken"); + let accessToken = Storage.getItem('accessToken'); if (accessToken && config.needToken) { - config.headers["accessToken"] = accessToken; + config.headers['accessToken'] = accessToken; // 解析当前token时间 let jwtData = JSON.parse( - decodeURIComponent(escape(window.atob(accessToken.split(".")[1]))) + decodeURIComponent(escape(window.atob(accessToken.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')))) ); if (jwtData.exp < Math.round(new Date() / 1000)) { refresh() @@ -83,33 +83,33 @@ service.interceptors.request.use( } ); -async function refresh() { +async function refresh () { const getTokenRes = await refreshToken(); - if (getTokenRes === "success") { + if (getTokenRes === 'success') { // 刷新token if (isRefreshToken === 1) { error.response.config.headers.accessToken = Storage.getItem( - "accessToken" + 'accessToken' ); return service(error.response.config); } else { router.go(0); } } else { - Storage.removeItem("accessToken"); - Storage.removeItem("refreshToken"); - Storage.removeItem("userInfo"); - Storage.setItem("cartNum", 0); - store.commit("SET_CARTNUM", 0); - console.log("1111"); + Storage.removeItem('accessToken'); + Storage.removeItem('refreshToken'); + Storage.removeItem('userInfo'); + Storage.setItem('cartNum', 0); + store.commit('SET_CARTNUM', 0); + console.log('1111'); Modal.confirm({ - title: "请登录", - content: "

请登录后执行此操作

", - okText: "立即登录", - cancelText: "继续浏览", + title: '请登录', + content: '

请登录后执行此操作

', + okText: '立即登录', + cancelText: '继续浏览', onOk: () => { router.push({ - path: "/login", + path: '/login', query: { rePath: router.history.current.path, query: JSON.stringify(router.history.current.query) @@ -146,9 +146,9 @@ service.interceptors.response.use( } else { if (error.message) { let _message = - error.code === "ECONNABORTED" - ? "连接超时，请稍候再试！" - : "网络错误，请稍后再试！"; + error.code === 'ECONNABORTED' + ? '连接超时，请稍候再试！' + : '网络错误，请稍后再试！'; Message.error(errorData.message || _message); } } @@ -171,13 +171,13 @@ const closeLoading = target => { }; export const Method = { - GET: "get", - POST: "post", - PUT: "put", - DELETE: "delete" + GET: 'get', + POST: 'post', + PUT: 'put', + DELETE: 'delete' }; -export default function request(options) { +export default function request (options) { // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。 // if (process.server || options.url.indexOf('passport/token') !== -1) { return service(options); @@ -186,19 +186,19 @@ export default function request(options) { } // 防抖闭包来一波 -function getTokenDebounce() { +function getTokenDebounce () { let lock = false; let success = false; - return function() { + return function () { if (!lock) { lock = true; - let oldRefreshToken = Storage.getItem("refreshToken"); + let oldRefreshToken = Storage.getItem('refreshToken'); handleRefreshToken(oldRefreshToken) .then(res => { if (res.success) { let { accessToken, refreshToken } = res.result; - Storage.setItem("accessToken", accessToken); - Storage.setItem("refreshToken", refreshToken); + Storage.setItem('accessToken', accessToken); + Storage.setItem('refreshToken', refreshToken); success = true; lock = false; @@ -220,9 +220,9 @@ function getTokenDebounce() { if (!lock) { clearInterval(timer); if (success) { - resolve("success"); + resolve('success'); } else { - resolve("fail"); + resolve('fail'); } } }, 500); // 轮询时间间隔 From bce709a57a1b4b2449f53768075c319832c0e1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 22 Jun 2021 18:11:23 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 +- .../views/order/order/fictitiousOrderList.vue | 6 +- manager/src/views/order/order/orderDetail.vue | 2 +- manager/src/views/promotion/coupon/coupon.vue | 6 +- .../src/views/promotion/seckill/seckill.vue | 97 ++++--------- .../views/promotion/seckill/setupSeckill.vue | 4 +- .../views/statistics/order/orderDetail.vue | 2 +- seller/src/config/index.js | 16 +- seller/src/utils/filters.js | 137 +++++++++++------- seller/src/views/order/order/orderDetail.vue | 2 +- seller/src/views/promotion/coupon/coupon.vue | 132 +++++------------ 11 files changed, 172 insertions(+), 240 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 1a28698c..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // 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: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue index 2d4c9ac3..da5d7bb9 100644 --- a/manager/src/views/order/order/fictitiousOrderList.vue +++ b/manager/src/views/order/order/fictitiousOrderList.vue @@ -94,8 +94,8 @@ // 搜索框初始化对象 pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 - sort: "createTime", // 默认排序字段 - order: "desc", // 默认排序方式 + sort: "", // 默认排序字段 + order: "", // 默认排序方式 startDate: "", // 起始时间 endDate: "", // 终止时间 orderType: "FICTITIOUS", @@ -118,8 +118,6 @@ title: "下单时间", key: "createTime", width: 200, - sortable: true, - sortType: "desc", }, { title: "订单来源", diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 2005fe73..ddf1d3a0 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -37,7 +37,7 @@
订单来源：
- {{ orderInfo.order.clientType }} + {{ orderInfo.order.clientType | clientTypeWay}}
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 7f2ae93d..c34bb812 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -101,7 +101,7 @@ export default { { title: "面额/折扣", key: "price", - width: 120, + width: 100, render: (h, params) => { if (params.row.price) { return h( @@ -117,14 +117,14 @@ export default { { title: "领取数量/总数量", key: "publishNum", - width: 150, + width: 130, render: (h, params) => { return h( "div", params.row.receivedNum + "/" + params.row.publishNum ); }, - minWidth: 130, + }, { title: "优惠券类型", diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue index 00e634dd..3b2531ab 100644 --- a/manager/src/views/promotion/seckill/seckill.vue +++ b/manager/src/views/promotion/seckill/seckill.vue @@ -24,78 +24,35 @@ - - -
- - -
@@ -302,7 +259,7 @@ export default { diff --git a/manager/src/views/promotion/seckill/setupSeckill.vue b/manager/src/views/promotion/seckill/setupSeckill.vue index 9ad7c77b..0ab8ce68 100644 --- a/manager/src/views/promotion/seckill/setupSeckill.vue +++ b/manager/src/views/promotion/seckill/setupSeckill.vue @@ -1,5 +1,5 @@ From f2f2984c3e8d864a9c170366958920f044fc09c0 Mon Sep 17 00:00:00 2001 From: mabo Date: Wed, 23 Jun 2021 16:49:35 +0800 Subject: [PATCH 10/38] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/GoodsList.vue | 2 +- buyer/src/plugins/request.js | 2 + manager/src/libs/axios.js | 10 +-- .../my-components/lili/upload-pic-thumb.vue | 83 +++++++++-------- seller/src/config/index.js | 16 ++-- seller/src/libs/axios.js | 10 +-- seller/src/libs/routerJson.js | 28 +++--- seller/src/router/router.js | 2 +- .../views/goods/goods-seller/addGoods.scss | 4 +- .../goods/goods-seller/goodsOperation.vue | 73 ++++----------- .../my-components/lili/upload-pic-thumb.vue | 90 ++++++++++--------- 11 files changed, 141 insertions(+), 179 deletions(-) diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 718ae499..7020c2f4 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -69,7 +69,7 @@ >人评价
- {{ item.storeName }} + 自营{{ item.storeName }}
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index 5a897bb0..c5457098 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -142,6 +142,8 @@ service.interceptors.response.use( refresh(error) isRefreshToken = 0; } + } else if (errorResponse.status === 404) { + // 避免刷新token时也提示报错信息 } else { if (error.message) { let _message = diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js index 6bd6d6c1..5d8c68ec 100644 --- a/manager/src/libs/axios.js +++ b/manager/src/libs/axios.js @@ -64,14 +64,6 @@ service.interceptors.response.use( } return data; break; - case 403: - // 权限不足 - if (data.message !== null) { - Message.error(data.message); - } else { - Message.error("权限不足"); - } - break; case 500: // 系统异常 if (data.message !== null) { @@ -89,6 +81,8 @@ service.interceptors.response.use( if (error.response) { if (error.response.status === 401) { // 这种情况一般调到登录页 + } else if (error.response.status === 404) { + // 避免刷新token报错 } else if (error.response.status === 403) { isRefreshToken++; if(isRefreshToken === 1) { diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue index d9583ca6..03ec4086 100644 --- a/manager/src/views/my-components/lili/upload-pic-thumb.vue +++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue @@ -1,47 +1,48 @@ - +
- + @@ -185,23 +197,30 @@
- - - + + + -
+
- - + + - +
@@ -225,34 +244,36 @@ } " :span-method="handleSpan"> 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" From 4160ebe004057c3741a8c1fc2811a1d977d8d3bd Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 25 Jun 2021 17:36:00 +0800 Subject: [PATCH 32/38] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=94=AE=E5=90=8E=EF=BC=8C=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/goodsDetail/ShowGoods.vue | 1 + .../goodsDetail/ShowGoodsDetail.vue | 22 +++++++++++++++++++ .../home/orderCenter/AfterSaleDetail.vue | 9 ++++++++ .../pages/home/orderCenter/ApplyAfterSale.vue | 11 ++++++---- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 4378d9ac..32536da6 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -327,6 +327,7 @@ export default { }) }, promotion () { // 格式化促销活动，返回当前促销的对象 + if (!this.detail.promotionMap) return false; let keysArr = Object.keys(this.detail.promotionMap); if (keysArr.length === 0) return false; diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue index 72b4a349..d58f5a6e 100644 --- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue +++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue @@ -86,6 +86,14 @@
+ + + + + +
{{param.paramName}}{{param.paramValue}}
+ +
@@ -475,4 +483,18 @@ export default { .ivu-rate-star-full:before, .ivu-rate-star-half .ivu-rate-star-content:before { color: $theme_color; } +table{ + border-color: #eee; + color: #999; + width: 70%; + margin-left: 10px; + tr{ + td:nth-child(1){ + width: 200px; + } + } + td{ + padding: 5px; + } +} diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue index 7adcfd1a..51301f2e 100644 --- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue +++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue @@ -44,6 +44,12 @@ +
+

图片信息

+
+ +
+
From 0adbde45b9ba6d0ebfaf14a7c85fb186be8db45d Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 25 Jun 2021 18:30:30 +0800 Subject: [PATCH 33/38] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home/userCenter/MoneyManagement.vue | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index d9e8a317..f57011b3 100644 --- a/buyer/src/pages/home/userCenter/MoneyManagement.vue +++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue @@ -215,7 +215,7 @@ export default { color: 'green' } }, - params.row.money + this.$options.filters.unitPrice(params.row.money, '+ ¥') ) ]); } else if (params.row.money < 0) { @@ -227,7 +227,7 @@ export default { color: 'red' } }, - params.row.money + this.$options.filters.unitPrice(0 - params.row.money, '- ¥') ) ]); } @@ -252,7 +252,10 @@ export default { }, { title: '充值金额', - key: 'rechargeMoney' + key: 'rechargeMoney', + render: (h, params) => { + return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]); + } }, { title: '支付状态', @@ -281,7 +284,9 @@ export default { { title: '提现金额', key: 'applyMoney', - width: 120 + render: (h, params) => { + return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]); + } }, { title: '提现状态', @@ -392,9 +397,10 @@ export default { if (valid) { recharge(this.formData).then((res) => { if (res.message === 'success') { - // TODO 根据返回的值跳转到收银台进行支付,一下是输出sn - console.warn(res.result.rechargeSn); - this.modal = false; + this.$router.push({ + path: '/payment', + query: { orderType: 'RECHARGE', sn: res.result.rechargeSn } + }); } }); } From 31c585bcafeeeff44fde77f671b4738a62c049d4 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 25 Jun 2021 18:31:55 +0800 Subject: [PATCH 34/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/package.json | 2 +- buyer/src/assets/iconfont/icomoon.eot | Bin 2380 -> 3260 bytes buyer/src/assets/iconfont/icomoon.svg | 2 + buyer/src/assets/iconfont/icomoon.ttf | Bin 2216 -> 3096 bytes buyer/src/assets/iconfont/icomoon.woff | Bin 2292 -> 3172 bytes buyer/src/assets/iconfont/iconfont.css | 18 ++-- .../indexDecorate/modelList/seckill.vue | 2 +- buyer/src/pages/payment/PayMent.vue | 83 +++++++++++------- 8 files changed, 66 insertions(+), 41 deletions(-) diff --git a/buyer/package.json b/buyer/package.json index 7a960738..9f64b7fb 100644 --- a/buyer/package.json +++ b/buyer/package.json @@ -17,7 +17,7 @@ "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 5a5b53d373f1261ad6934976642f5d4b111fe746..1155a87a0b218ca403925d4f0941eb704e047617 100644 GIT binary patch delta 1189 zcmZuxPe>F|82`R`JM(;F>$L99ny|X=Os$g9uCA_8N>T?S3p#9uh}5EM9<&yc5>gf_ zIz$$-Py|JXf-HgxgNQ6Tbm(B04$&c{h%QkOL=ae0-ik1U>`69DRodMzi^UDTCU&Db`wdmKPzlE&#m=$4U_cZS zkb<4i1qYxHMqmPpa04E~JiLeR$kC*_F-tQ8p>QhJoNf)Y#92tQV^*BhG?~ICw=Jy( zL*Z@MobJGuIJa91;aEAv`Okr zaTXL>Xe(?mCn_pLPWSsOGnukdfZao);P;Cm;rhOoR4~-i5~mDPa4wi~UlT%mfM^-v zu;DC{q*iDtjG`A6hI<6xs_BAnJk5pRMJ}9oab1&oT8eu@8CCIa1%{Hl@+IFOczoyX(<`J4rKM4ksg~jsmkX_FcgV|f)T%! zNLbjAuzsDfl1YnAScywL{lSPAIGl{N#*(*V$z<&JH5vF(QLhH8RF!@O zNTlfN@6AjeG}?baxsMDXfOkuMQ=~2Ll5??^S64@+%@=jkq`I>7;yzxtk#did(_1=~ bsfBrr;~iy$z46tOS$5Mg43)DN_%r+qL>$k0 delta 322 zcmdlZc}9rMhm(O}1;<1-GZw|eg^?2-$_0-zFfi-^;)LYf!~*fKOI;IB$kdnQNIYg> zV60$ZV7ZZznwTQ9N%A8D16u%4ommD@fc-G@DImWC$XCh8EvXP=WB{_+)&ThmIr+(n z%)6Mnfc!H+zEEyrMFE2V1Bm|sB%hay2r^EU$nJCMuRR*+v@!oUnFhHWYA7-om9I2j*}wh%m@8oMBXBT*Z_F6agva N0D6sm^FOYAi~y@}MJfOQ 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 b63f6d43ced31f4d9052ebfee5e4fe8caf067d84..d89161b6aba46403a9920b2a9654b381732298ba 100644 GIT binary patch delta 1242 zcmZuxU1$_n6h3EeW^V2*n=#p)O&&HsJEI#>>29*grkI5K1Ew^Q7F;7Gh%RQ6JS4i1 zAQ2-gT6`!CB@I*s#Rn17BGh6)q%G`2AN9ot@gWI{_#*X51R*+l&ddgv&&VzvTw}(=lR)hYEJb%-7{KQng*f{+7Cjg8S&W-1%i!^T`%yaGd zNjegFg3(W#Z%KWB$P(z9mhe4zZS}0q5caF zqJD1(b-mO8ry(PL6bHeAR!Bhx_QL=iff1O5Iaq|7unZ638N5M>HjySA!>*6UGKtP? zcYRkDwl){C9le(Xw0w>uO0A0K9dcxfjF1w9$tm7B=j$R_rl zAUCMZa*yt=Czl+MTdE>rLv!BH(V{I41KEvd?v+S8?b58A1 z@^+ANU#ejxGn_|;UOT<}kL8+HQHC(ILkB%w|33MKJLm;8I!U_5Y$=mqPu0WgN74QT z(q+pIU3(ReMC0*jBp!BBDF?TwocBLC>9ix}oYb$wp>2(!sPgXM(MUW2%`5bxwSt>DMBSx=ud`{&UcG^!wboV^-f=2-T3|0Km%n$ULnob44@#A3$R-4Js1l zk7aSADElmYTX(i4jd zfV2RR5288Jb1KtHawHxD`4tQdEH^Sz6H{b1Nq%HtU<&}sn`Hn6*bg(G0`fb6e3gvc zk_s_K1|XYl4Un&plb`IE$h?aQXaU<9pnyqNI_m=Zt6@g&fg3S>_9GK zTS0zt3DBWHzyUH)fq|KM*2Dw$jLef5y&0J|`!KSyYJ&U&#F2%E732ABzA|vLfYdYG zIq_;2g8qMig>mvdPDx3SY6ccYkPZ~UF91^|J^x)Epy=4Qaklls{CjZS&_=tN-(086xyXK5Px`|Ma@nz6fN z*H`6}vGMOl3A;~FAIpF9!}m+Y!U%v#E|6ns>0bG%L?B_?$o`Z?J`u~MiJ6mx9VB}L zOKUs$5oswQpHuez=v*CVu zGll`ZS=*Cql6$c=*?U9ZFgC|Edb(4av7<_cm;~fvRWi}la3aEWZ02PXn_xk~x>u$I zHT2l(4V}4*pb)8`?uR&T%tq^T6Tnjr5bP2gT7w;QIC zn|_o^$%<6|!<1?8I>+j|GDdhd)B!^kr8*~7S;=2H!spDiC-&La2Oj?I)h>j#J7TVq zpU(SJwHEFO8)S!>{9kJ_5IH^vp?S7-h09#gG$!>0pH`Uq~)v+PHTUpv6t#kw}J2odOjPI|h*eew-=(hF#E zQ*@2FayH3G&BNC;U RL)gMpJO)OwwV9WqYgn+Pk*rl%Y z#A1-x9*`a=7D&&jOaqD?VPIgn0m3CY5|1-d6H^!%*yaG$n1Qg&CdrQ(KtZ6`6(C;) zgxL=>pUTKBsQ`-o0P+<;Sd5XOBPTx@sLqdF0w^E^!pysvx^fdMfEKgsfE0nT07F+^ zVs0u>%m-+B8wk(z;{08ZUt9uo8^{ufI%Xh?nR(V^9!7gc=E**c-i*wfXE3s|Ml%8> zfH<=7uwp#F%~u9)7N7tF!<`eab|L8h2Ur-H4*>Zb3``(VAOPxNKJfnl(5E01KqQz3 yv7vxtatxOO$cqdNTnr)%atvn})fiVX