Skip to content
GitLab
Commit e1d44016 authored by linlinjava's avatar linlinjava
Browse files

Merge branch 'master' of https://github.com/linlinjava/litemall

parents 14bc821e 3adb69b8
Hide whitespace changes
Inline Side-by-side
litemall-admin/.env.development
View file @ e1d44016
......@@ -2,7 +2,7 @@
ENV = 'development'
# base api
VUE_APP_BASE_API = 'http://localhost:8080/admin'
VUE_APP_BASE_API = '/admin'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
......
litemall-admin/vue.config.js
View file @ e1d44016
......@@ -29,6 +29,11 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
devServer: {
proxy: {
'/admin': {
target: 'http://localhost:8080'
},
},
port: port,
open: true,
overlay: {
......
litemall-vue/.env.development
View file @ e1d44016
......@@ -2,7 +2,7 @@
ENV = 'development'
# base api
VUE_APP_BASE_API = 'http://localhost:8080/'
VUE_APP_BASE_API = '/wx'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
......@@ -11,4 +11,4 @@ VUE_APP_BASE_API = 'http://localhost:8080/'
# when you have a large number of pages.
# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
VUE_CLI_BABEL_TRANSPILE_MODULES = true
litemall-vue/.gitignore
View file @ e1d44016
.DS_Store
node_modules
/dist
/package-lock.json
# local env files
.env.local
......
litemall-vue/src/api/api.js
View file @ e1d44016
import request from '@/utils/request'
const IndexUrl= 'wx/home/index'; //首页数据接口
const IndexUrl= '/home/index'; //首页数据接口
export function getHome() {
return request({
url: IndexUrl,
......@@ -8,7 +8,7 @@ export function getHome() {
})
}
const CatalogList='wx/catalog/index'; //分类目录全部分类数据接口
const CatalogList='/catalog/index'; //分类目录全部分类数据接口
export function catalogList() {
return request({
url: CatalogList,
......@@ -16,7 +16,7 @@ export function catalogList() {
})
}
const CatalogCurrent='wx/catalog/current'; //分类目录当前分类数据接口
const CatalogCurrent='/catalog/current'; //分类目录当前分类数据接口
export function catalogCurrent(query) {
return request({
url: CatalogCurrent,
......@@ -25,10 +25,10 @@ export function catalogCurrent(query) {
})
}
const AuthLoginByWeixin='wx/auth/login_by_weixin'; //微信登录
const AuthLoginByWeixin='/auth/login_by_weixin'; //微信登录
const AuthLoginByAccount='wx/auth/login'; //账号登录
const AuthLoginByAccount='/auth/login'; //账号登录
export function authLoginByAccount(data) {
return request({
url: AuthLoginByAccount,
......@@ -36,29 +36,29 @@ export function authLoginByAccount(data) {
data
})
}
const AuthLogout='wx/auth/logout'; //账号登出
const AuthLogout='/auth/logout'; //账号登出
export function authLogout() {
return request({
url: AuthLogout,
method: 'post'
})
}
const AuthInfo='wx/auth/info'; //用户信息
const AuthInfo='/auth/info'; //用户信息
export function authInfo() {
return request({
url: AuthInfo,
method: 'get'
})
}
const AuthProfile='wx/auth/profile'; //账号修改
const AuthProfile='/auth/profile'; //账号修改
export function authProfile(data) {
return request({
url: AuthProfile,
method: 'post',
data
data
})
}
const AuthRegister='wx/auth/register'; //账号注册
const AuthRegister='/auth/register'; //账号注册
export function authRegister(data) {
return request({
url: AuthRegister,
......@@ -66,39 +66,39 @@ export function authRegister(data) {
data
});
}
const AuthReset='wx/auth/reset'; //账号密码重置
const AuthReset='/auth/reset'; //账号密码重置
export function authReset(data) {
return request({
url: AuthReset,
method: 'post',
data
data
})
}
const AuthRegisterCaptcha='wx/auth/regCaptcha'; //注册验证码
const AuthRegisterCaptcha='/auth/regCaptcha'; //注册验证码
export function authRegisterCaptcha(data) {
return request({
url: AuthRegisterCaptcha,
method: 'post',
data
data
})
}
const AuthCaptcha='wx/auth/captcha'; //验证码
const AuthCaptcha='/auth/captcha'; //验证码
export function authCaptcha(data) {
return request({
url: AuthCaptcha,
method: 'post',
data
data
})
}
const GoodsCount='wx/goods/count'; //统计商品总数
const GoodsCount='/goods/count'; //统计商品总数
export function goodsCount() {
return request({
url: GoodsCount,
method: 'get'
})
}
export const GoodsList='wx/goods/list'; //获得商品列表
export const GoodsList='/goods/list'; //获得商品列表
export function goodsList(query) {
return request({
url: GoodsList,
......@@ -106,7 +106,7 @@ export function goodsList(query) {
params: query
})
}
const GoodsCategory='wx/goods/category'; //获得分类数据
const GoodsCategory='/goods/category'; //获得分类数据
export function goodsCategory(query) {
return request({
url: GoodsCategory,
......@@ -114,7 +114,7 @@ export function goodsCategory(query) {
params: query
})
}
const GoodsDetail='wx/goods/detail'; //获得商品的详情
const GoodsDetail='/goods/detail'; //获得商品的详情
export function goodsDetail(query) {
return request({
url: GoodsDetail,
......@@ -122,9 +122,9 @@ export function goodsDetail(query) {
params: query
})
}
const GoodsRelated='wx/goods/related'; //商品详情页的关联商品（大家都在看）
const GoodsRelated='/goods/related'; //商品详情页的关联商品（大家都在看）
const BrandList='wx/brand/list'; //品牌列表
const BrandList='/brand/list'; //品牌列表
export function brandList(query) {
return request({
url: BrandList,
......@@ -132,7 +132,7 @@ export function brandList(query) {
params: query
})
}
const BrandDetail='wx/brand/detail'; //品牌详情
const BrandDetail='/brand/detail'; //品牌详情
export function brandDetail(query) {
return request({
url: BrandDetail,
......@@ -141,7 +141,7 @@ export function brandDetail(query) {
})
}
const CartList='wx/cart/index'; //获取购物车的数据
const CartList='/cart/index'; //获取购物车的数据
export function cartList(query) {
return request({
url: CartList,
......@@ -149,7 +149,7 @@ export function cartList(query) {
params: query
})
}
const CartAdd='wx/cart/add'; // 添加商品到购物车
const CartAdd='/cart/add'; // 添加商品到购物车
export function cartAdd(data) {
return request({
url: CartAdd,
......@@ -157,7 +157,7 @@ export function cartAdd(data) {
data
})
}
const CartFastAdd='wx/cart/fastadd'; // 立即购买商品
const CartFastAdd='/cart/fastadd'; // 立即购买商品
export function cartFastAdd(data) {
return request({
url: CartFastAdd,
......@@ -165,7 +165,7 @@ export function cartFastAdd(data) {
data
})
}
const CartUpdate='wx/cart/update'; // 更新购物车的商品
const CartUpdate='/cart/update'; // 更新购物车的商品
export function cartUpdate(data) {
return request({
url: CartUpdate,
......@@ -173,7 +173,7 @@ export function cartUpdate(data) {
data
})
}
const CartDelete='wx/cart/delete'; // 删除购物车的商品
const CartDelete='/cart/delete'; // 删除购物车的商品
export function cartDelete(data) {
return request({
url: CartDelete,
......@@ -181,7 +181,7 @@ export function cartDelete(data) {
data
})
}
const CartChecked='wx/cart/checked'; // 选择或取消选择商品
const CartChecked='/cart/checked'; // 选择或取消选择商品
export function cartChecked(data) {
return request({
url: CartChecked,
......@@ -189,14 +189,14 @@ export function cartChecked(data) {
data
})
}
const CartGoodsCount='wx/cart/goodscount'; // 获取购物车商品件数
const CartGoodsCount='/cart/goodscount'; // 获取购物车商品件数
export function cartGoodsCount() {
return request({
url: CartGoodsCount,
method: 'get'
})
}
const CartCheckout='wx/cart/checkout'; // 下单前信息确认
const CartCheckout='/cart/checkout'; // 下单前信息确认
export function cartCheckout(query) {
return request({
url: CartCheckout,
......@@ -205,7 +205,7 @@ export function cartCheckout(query) {
})
}
const CollectList='wx/collect/list'; //收藏列表
const CollectList='/collect/list'; //收藏列表
export function collectList(query) {
return request({
url: CollectList,
......@@ -213,7 +213,7 @@ export function collectList(query) {
params: query
})
}
const CollectAddOrDelete='wx/collect/addordelete'; //添加或取消收藏
const CollectAddOrDelete='/collect/addordelete'; //添加或取消收藏
export function collectAddOrDelete(data) {
return request({
url: CollectAddOrDelete,
......@@ -221,11 +221,11 @@ export function collectAddOrDelete(data) {
data
})
}
const CommentList='wx/comment/list'; //评论列表
const CommentCount='wx/comment/count'; //评论总数
const CommentPost='wx/comment/post'; //发表评论
const CommentList='/comment/list'; //评论列表
const CommentCount='/comment/count'; //评论总数
const CommentPost='/comment/post'; //发表评论
const TopicList='wx/topic/list'; //专题列表
const TopicList='/topic/list'; //专题列表
export function topicList(query) {
return request({
url: TopicList,
......@@ -233,7 +233,7 @@ export function topicList(query) {
params: query
})
}
const TopicDetail='wx/topic/detail'; //专题详情
const TopicDetail='/topic/detail'; //专题详情
export function topicDetail(query) {
return request({
url: TopicDetail,
......@@ -241,7 +241,7 @@ export function topicDetail(query) {
params: query
})
}
const TopicRelated='wx/topic/related'; //相关专题
const TopicRelated='/topic/related'; //相关专题
export function topicRelated(query) {
return request({
url: TopicRelated,
......@@ -250,12 +250,12 @@ export function topicRelated(query) {
})
}
const SearchIndex='wx/search/index'; //搜索关键字
const SearchResult='wx/search/result'; //搜索结果
const SearchHelper='wx/search/helper'; //搜索帮助
const SearchClearHistory='wx/search/clearhistory'; //搜索历史清楚
const SearchIndex='/search/index'; //搜索关键字
const SearchResult='/search/result'; //搜索结果
const SearchHelper='/search/helper'; //搜索帮助
const SearchClearHistory='/search/clearhistory'; //搜索历史清楚
const AddressList='wx/address/list'; //收货地址列表
const AddressList='/address/list'; //收货地址列表
export function addressList(query) {
return request({
url: AddressList,
......@@ -264,7 +264,7 @@ export function addressList(query) {
})
}
const AddressDetail='wx/address/detail'; //收货地址详情
const AddressDetail='/address/detail'; //收货地址详情
export function addressDetail(query) {
return request({
url: AddressDetail,
......@@ -272,7 +272,7 @@ export function addressDetail(query) {
params: query
})
}
const AddressSave='wx/address/save'; //保存收货地址
const AddressSave='/address/save'; //保存收货地址
export function addressSave(data) {
return request({
url: AddressSave,
......@@ -280,7 +280,7 @@ export function addressSave(data) {
data
})
}
const AddressDelete='wx/address/delete'; //保存收货地址
const AddressDelete='/address/delete'; //保存收货地址
export function addressDelete(data) {
return request({
url: AddressDelete,
......@@ -289,9 +289,9 @@ export function addressDelete(data) {
})
}
const ExpressQuery='wx/express/query'; //物流查询
const ExpressQuery='/express/query'; //物流查询
const OrderSubmit='wx/order/submit'; // 提交订单
const OrderSubmit='/order/submit'; // 提交订单
export function orderSubmit(data) {
return request({
url: OrderSubmit,
......@@ -299,7 +299,7 @@ export function orderSubmit(data) {
data
})
}
const OrderPrepay='wx/order/prepay'; // 订单的预支付会话
const OrderPrepay='/order/prepay'; // 订单的预支付会话
export function orderPrepay(data) {
return request({
url: OrderPrepay,
......@@ -307,7 +307,7 @@ export function orderPrepay(data) {
data
})
}
const OrderH5pay = 'wx/order/h5pay'; // h5支付
const OrderH5pay = '/order/h5pay'; // h5支付
export function orderH5pay(data) {
return request({
url: OrderH5pay,
......@@ -315,7 +315,7 @@ export function orderH5pay(data) {
data
});
}
export const OrderList='wx/order/list'; //订单列表
export const OrderList='/order/list'; //订单列表
export function orderList(query) {
return request({
url: OrderList,
......@@ -323,7 +323,7 @@ export function orderList(query) {
params: query
})
}
const OrderDetail='wx/order/detail'; //订单详情
const OrderDetail='/order/detail'; //订单详情
export function orderDetail(query) {
return request({
url: OrderDetail,
......@@ -331,7 +331,7 @@ export function orderDetail(query) {
params: query
})
}
const OrderCancel='wx/order/cancel'; //取消订单
const OrderCancel='/order/cancel'; //取消订单
export function orderCancel(data) {
return request({
url: OrderCancel,
......@@ -339,7 +339,7 @@ export function orderCancel(data) {
data
})
}
const OrderRefund='wx/order/refund'; //退款取消订单
const OrderRefund='/order/refund'; //退款取消订单
export function orderRefund(data) {
return request({
url: OrderRefund,
......@@ -347,7 +347,7 @@ export function orderRefund(data) {
data
})
}
const OrderDelete='wx/order/delete'; //删除订单
const OrderDelete='/order/delete'; //删除订单
export function orderDelete(data) {
return request({
url: OrderDelete,
......@@ -355,7 +355,7 @@ export function orderDelete(data) {
data
})
}
const OrderConfirm='wx/order/confirm'; //确认收货
const OrderConfirm='/order/confirm'; //确认收货
export function orderConfirm(data) {
return request({
url: OrderConfirm,
......@@ -363,10 +363,10 @@ export function orderConfirm(data) {
data
})
}
const OrderGoods='wx/order/goods'; // 代评价商品信息
const OrderComment='wx/order/comment'; // 评价订单商品信息
const OrderGoods='/order/goods'; // 代评价商品信息
const OrderComment='/order/comment'; // 评价订单商品信息
const FeedbackAdd='wx/feedback/submit'; //添加反馈
const FeedbackAdd='/feedback/submit'; //添加反馈
export function feedbackAdd(data) {
return request({
url: FeedbackAdd,
......@@ -375,10 +375,10 @@ export function feedbackAdd(data) {
})
}
const FootprintList='wx/footprint/list'; //足迹列表
const FootprintDelete='wx/footprint/delete'; //删除足迹
const FootprintList='/footprint/list'; //足迹列表
const FootprintDelete='/footprint/delete'; //删除足迹
const GrouponList='wx/groupon/list'; //团购列表
const GrouponList='/groupon/list'; //团购列表
export function grouponList(query) {
return request({
url: GrouponList,
......@@ -386,12 +386,12 @@ export function grouponList(query) {
params: query
})
}
const GroupOn='wx/groupon/query'; //团购API-查询
const GroupOnMy='wx/groupon/my'; //团购API-我的团购
const GroupOnDetail='wx/groupon/detail'; //团购API-详情
const GroupOnJoin='wx/groupon/join'; //团购API-详情
const GroupOn='/groupon/query'; //团购API-查询
const GroupOnMy='/groupon/my'; //团购API-我的团购
const GroupOnDetail='/groupon/detail'; //团购API-详情
const GroupOnJoin='/groupon/join'; //团购API-详情
const CouponList='wx/coupon/list'; //优惠券列表
const CouponList='/coupon/list'; //优惠券列表
export function couponList(query) {
return request({
url: CouponList,
......@@ -399,7 +399,7 @@ export function couponList(query) {
params: query
})
}
export const CouponMyList='wx/coupon/mylist'; //我的优惠券列表
export const CouponMyList='/coupon/mylist'; //我的优惠券列表
export function couponMyList(query) {
return request({
url: CouponMyList,
......@@ -407,7 +407,7 @@ export function couponMyList(query) {
params: query
})
}
const CouponSelectList='wx/coupon/selectlist'; //当前订单可用优惠券列表
const CouponSelectList='/coupon/selectlist'; //当前订单可用优惠券列表
export function couponSelectList(query) {
return request({
url: CouponSelectList,
......@@ -415,7 +415,7 @@ export function couponSelectList(query) {
params: query
})
}
const CouponReceive='wx/coupon/receive'; //优惠券领取
const CouponReceive='/coupon/receive'; //优惠券领取
export function couponReceive(data) {
return request({
url: CouponReceive,
......@@ -423,18 +423,18 @@ export function couponReceive(data) {
data
})
}
const CouponExchange='wx/coupon/exchange'; //优惠券兑换
const CouponExchange='/coupon/exchange'; //优惠券兑换
const StorageUpload='wx/storage/upload'; //图片上传,
const StorageUpload='/storage/upload'; //图片上传,
const UserIndex='wx/user/index'; //个人页面用户相关信息
const UserIndex='/user/index'; //个人页面用户相关信息
export function userIndex() {
return request({
url: UserIndex,
method: 'get'
})
}
const IssueList='wx/issue/list'; //帮助信息
const IssueList='/issue/list'; //帮助信息
export function issueList() {
return request({
url: IssueList,
......
litemall-vue/vue.config.js
View file @ e1d44016
......@@ -12,6 +12,11 @@ module.exports = {
devServer: {
//九键输入法的 「mall」= 「6255」
port: 6255,
proxy: {
'/wx': {
target: 'http://localhost:8080'
},
},
},
chainWebpack: config => {
config.plugins.delete('prefetch');
......
pom.xml
View file @ e1d44016
......@@ -116,7 +116,7 @@
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
<version>5.6.8</version>
<version>5.6.24</version>
</dependency>
<dependency>
......@@ -244,4 +244,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
Supports Markdown
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