zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并master

master
lemon橪 2021-08-06 11:59:20 +08:00
parent 4c217b85e9 c75bd5208b
commit 10dcf4473c
17 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buyer/src/components/nav/CateNav.vue
View File

@ -89,7 +89,11 @@ export default {
},
computed: {
navList () { // 导航列表
return JSON.parse(storage.getItem('navList')) || []
if (storage.getItem('navList')) {
return JSON.parse(storage.getItem('navList'))
} else {
return []
}
}
},
methods: {

2
buyer/src/components/nav/GoodsClassNav.vue
View File

@ -188,7 +188,7 @@ export default {
},
computed: {
cateList () { // 商品分类
return this.$store.state.category
return this.$store.state.category || []
}
},
watch: {

6
buyer/src/components/nav/cateNav.vue
View File

@ -89,7 +89,11 @@ export default {
},
computed: {
navList () { // 导航列表
return JSON.parse(storage.getItem('navList')) || []
if (storage.getItem('navList')) {
return JSON.parse(storage.getItem('navList'))
} else {
return []
}
}
},
methods: {

2
buyer/src/vuex/store.js
View File

@ -13,7 +13,7 @@ export default new Vuex.Store({
cartNum: storage.getItem('cartNum') || 0,
logoImg: require('@/assets/images/logo2.png'),
hotWordsList: storage.getItem('hotWordsList'),
category: localStorage.getItem('category')
category: JSON.parse(localStorage.getItem('category'))
},
getters,
actions,

8
manager/src/main.js
View File

@ -22,11 +22,13 @@ 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')
const buyerUrlPC = 'https://pc-b2b2c.pickmall.cn' // 跳转买家端地址 pc端
const buyerUrlWap = 'https://m-b2b2c.pickmall.cn' // 跳转买家端地址 wap端
Vue.prototype.linkTo = function (goodsId, skuId) { // 跳转买家端商品
window.open(`${buyerUrlPC}/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}`
return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
};
Vue.use(VueLazyload, {
error: require('./assets/img-error.png'),

8
seller/src/api/goods.js
View File

@ -8,14 +8,6 @@ import {
getRequestWithNoToken,
commonUrl
} from "@/libs/axios";
import config from "@/config";
// 文件上传接口
export const uploadFile = commonUrl + "/common/upload/file";
// 验证码渲染图片接口
export const drawCodeImage = "/common/captcha/draw/";
// 获取菜单
export const getMenuList = "/permission/getMenuList";
// 获取数据字典
export const getDictData = "/dictData/getByType/";
// Websocket

9
seller/src/api/index.js
View File

@ -6,17 +6,8 @@ import {
deleteRequest,
getRequestWithNoToken,
postRequestWithNoToken,
commonUrl,
baseUrl
} from "@/libs/axios";
// 文件上传接口
export const uploadFile = commonUrl + "/common/upload/file";
// 验证码渲染图片接口
export const drawCodeImage = commonUrl + "/common/captcha/draw/";
// 获取菜单
export const getMenuList = baseUrl + "/permission/getMenuList";
//获取所有city
export const getAllCity = (params) => {
return getRequest(commonUrl+'/common/region/allCity', params)

4
seller/src/api/platform.js
View File

@ -1,10 +1,6 @@
// 统一请求路径前缀在libs/axios.js中修改
import { getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken } from '@/libs/axios';
// 验证码渲染图片接口
export const drawCodeImage = "/lili/common/captcha/draw/"
// 获取kuaidi配置
export const getParams = (params) => {
return getRequest('/platformSetting/get/'+params)

6
seller/src/api/shops.js
View File

@ -3,12 +3,6 @@ import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRe
// Vaptcha ID
export const vaptchaID = "5dce36188713b71e70a41eb7"
// 文件上传接口
export const uploadFile = "/upload/file"
// 验证码渲染图片接口
export const drawCodeImage = "/common/captcha/draw/"
// 获取菜单
export const getMenuList = "/permission/getMenuList"
// 获取数据字典
export const getDictData = "/dictData/getByType/"
// Websocket

3
seller/src/libs/axios.js
View File

@ -15,7 +15,8 @@ export const commonUrl =
process.env.NODE_ENV === "development"
? config.api_dev.common
: config.api_prod.common;
// 文件上传接口
export const uploadFile = commonUrl + "/common/upload/file";
var isRefreshToken = 0;
const refreshToken = getTokenDebounce();
const service = axios.create({

8
seller/src/main.js
View File

@ -56,11 +56,13 @@ Vue.prototype.setStore = setStore;
Vue.prototype.getStore = getStore;
Vue.prototype.removeStore = removeStore;
Vue.prototype.md5 = md5;
Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') { // 跳转买家端商品
window.open(`${link}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
const buyerUrlPC = 'https://pc-b2b2c.pickmall.cn' // 跳转买家端地址 pc端
const buyerUrlWap = 'https://m-b2b2c.pickmall.cn' // 跳转买家端地址 wap端
Vue.prototype.linkTo = function (goodsId, skuId) { // 跳转买家端商品
window.open(`${buyerUrlPC}/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}`
return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
};
Array.prototype.remove = function(from, to) {

3
seller/src/views/goods/goods-seller/goodsOperationSec.vue
View File

@ -315,6 +315,7 @@ import * as API_Shop from "@/api/shops";
import cloneObj from "@/utils/index";
import vuedraggable from "vuedraggable";
import editor from "@/views/my-components/lili/editor";
import { uploadFile } from "@/libs/axios";
import {regular} from "@/utils";
export default {
@ -371,7 +372,7 @@ export default {
//提交状态
submitLoading: false,
//上传图片路径
uploadFileUrl: API_GOODS.uploadFile,
uploadFileUrl: uploadFile,
// 预览图片路径
previewPicture: "",
//商品图片

2
seller/src/views/my-components/lili/editor.vue
View File

@ -50,7 +50,7 @@
</template>
<script>
import { uploadFile } from "@/api/index";
import { uploadFile } from "@/libs/axios";
import E from "wangeditor";
import xss from "xss";
// 表情包配置 自定义表情可在该js文件中统一修改

4
seller/src/views/my-components/lili/upload-pic-input.vue
View File

@ -49,7 +49,7 @@
</template>
<script>
import { uploadFile } from "@/api/index";
import { uploadFile } from "@/libs/axios";
export default {
name: "uploadPicInput",
props: {
@ -87,7 +87,7 @@ export default {
currentValue: this.value, // 当前值
loading: false, // 加载状态
viewImage: false, // 是否预览图片
uploadFileUrl: uploadFile // 上传列表
uploadFileUrl: uploadFile // 上传路径
};
},
methods: {

2
seller/src/views/my-components/lili/upload-pic-thumb.vue
View File

@ -55,7 +55,7 @@
</template>
<script>
import { uploadFile } from "@/api/index";
import { uploadFile } from "@/libs/axios";
import vuedraggable from "vuedraggable";
export default {
name: "uploadPicThumb",

4
seller/src/views/order/after-order/orderComplaintDetail.vue
View File

@ -237,7 +237,7 @@
<script>
import * as API_Order from "@/api/order";
import * as API_GOODS from "@/api/goods";
import { uploadFile } from "@/libs/axios";
export default {
name: "orderComplaint",
data() {
@ -245,7 +245,7 @@ export default {
//展示图片层
visible: false,
//上传图片路径
uploadFileUrl: API_GOODS.uploadFile,
uploadFileUrl: uploadFile,
accessToken: "", // 验证token
id: 0, // 投诉单id
complaintInfo: "", // 投诉信息

2
seller/src/views/promotion/live/addLive.vue
View File

@ -146,7 +146,7 @@
</template>
<script>
import { uploadFile } from "@/api/index";
import { uploadFile } from "@/libs/axios";
import {
addLive,
addLiveGoods,