diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
index 3a3653a1..0354bcf4 100644
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -63,17 +63,17 @@ export default {
};
},
methods: {
- selectTags (item) {
+ selectTags (item) { // 选择热门标签
this.searchData = item;
this.search();
},
- search () {
+ search () { // 全平台搜索商品
this.$router.push({
path: '/goodsList',
query: { keyword: this.searchData }
});
},
- searchStore () {
+ searchStore () { // 店铺搜索商品
this.$emit('search', this.searchData)
}
},
diff --git a/buyer/src/components/drawer/Drawer.vue b/buyer/src/components/drawer/Drawer.vue
index 54db455f..d7990232 100644
--- a/buyer/src/components/drawer/Drawer.vue
+++ b/buyer/src/components/drawer/Drawer.vue
@@ -151,8 +151,6 @@ export default {
]
};
},
- components: {},
- mounted () {},
methods: {
getCartList () { // 获取购物车列表
this.loading = true
diff --git a/buyer/src/components/drawer/Main.vue b/buyer/src/components/drawer/Main.vue
index c5c32162..78252f5a 100644
--- a/buyer/src/components/drawer/Main.vue
+++ b/buyer/src/components/drawer/Main.vue
@@ -44,12 +44,12 @@ export default {
}
},
methods: {
- showCartNum (item) {
+ showCartNum (item) { // 获取购物车数量
if (this.userInfo && item.title === '购物车') {
this.getCartList()
}
},
- clickBar (val) {
+ clickBar (val) { // tabbar点击操作
if (!this.userInfo) {
this.$Modal.confirm({
title: '请登录',
@@ -83,7 +83,7 @@ export default {
}
}
},
- openBlank (path) {
+ openBlank (path) { // 新页面打开地址
let routerUrl = this.$router.resolve({
path: path
})
diff --git a/buyer/src/components/empty/Main.vue b/buyer/src/components/empty/Main.vue
index a1af93a8..4b0a0555 100644
--- a/buyer/src/components/empty/Main.vue
+++ b/buyer/src/components/empty/Main.vue
@@ -13,11 +13,6 @@
@@ -283,14 +276,12 @@ export default {
}
.item-intro-detail{
margin: 0 30px;
- // min-height: 1500px;
width: 100%;
}
.item-intro-nav{
width: 100%;
height: 38px;
background-color: #F7F7F7;
- // border-bottom: 1px solid $theme_color;
}
.item-intro-nav ul{
margin: 0px;
@@ -329,8 +320,6 @@ export default {
width: 240px;
height: 36px;
font-size: 14px;
- /* text-align: center; */
- /* background-color: #ccc; */
}
.item-param-title {
color: #232323;
diff --git a/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue b/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue
deleted file mode 100644
index bd70c809..00000000
--- a/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
- 问
- 有屏幕调节亮度吗
-
-
2020年10月21日17:03:35
-
-
-
-
- 答
- 能调节,点屏幕上方有一条调整带,可正负2调整。
-
-
2020年10月21日17:03:35
-
-
-
-
-
-
-
-
-
-
diff --git a/buyer/src/components/goodsDetail/ShowProductWarranty.vue b/buyer/src/components/goodsDetail/ShowProductWarranty.vue
deleted file mode 100644
index 3bbb7550..00000000
--- a/buyer/src/components/goodsDetail/ShowProductWarranty.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
- 卖家服务
-
-
- 高品质敢承诺:7天无理由退货,30天免费换新,质量问题商家承担来回运费换新;如需发票,请在确认收货无误后联系商家开出。(注*发票不随货品一同发出)
-
-
-
-
-
- 平台承诺
-
-
- 平台卖家销售并发货的商品,由平台卖家提供发票和相应的售后服务。请您放心购买!
注:因厂家会在没有任何提前通知的情况下更改产品包装、产地或者一些附件,本司不能确保客户收到的货物与商城图片、产地、附件说明完全一致。只能确保为原厂正货!并且保证与当时市场上同样主流新品一致。若本商城没有及时更新,请大家谅解!
-
-
-
-
-
- 正品行货
-
-
- BIT商城向您保证所售商品均为正品行货,BIT自营商品开具机打发票或电子发票。
-
-
-
-
-
- 全国联保
-
-
- 凭质保证书及BIT商城发票,可享受全国联保服务(奢侈品、钟表除外;奢侈品、钟表由BIT联系保修,享受法定三包售后服务),与您亲临商场选购的商品享受相同的质量保证。BIT商城还为您提供具有竞争力的商品价格和运费政策,请您放心购买!
注:因厂家会在没有任何提前通知的情况下更改产品包装、产地或者一些附件,本司不能确保客户收到的货物与商城图片、产地、附件说明完全一致。只能确保为原厂正货!并且保证与当时市场上同样主流新品一致。若本商城没有及时更新,请大家谅解!
-
-
-
-
-
-
-
-
-
diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index 8293b17a..55281fbf 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -25,7 +25,6 @@
-
-
请登录
@@ -148,31 +147,22 @@ export default {
}
},
methods: {
- handleClickTheme () {
- this.themeType === 'light'
- ? (this.themeType = 'dark')
- : (this.themeType = 'light');
- window.document.documentElement.setAttribute(
- 'data-theme',
- this.themeType
- );
- },
- changeCity (city) {
+ changeCity (city) { // 选择所在城市
this.city = city;
},
- goToPay () {
+ goToPay () { // 跳转购物车
let url = this.$router.resolve({
path: '/cart'
})
window.open(url.href, '_blank')
},
- myInfo () {
+ myInfo () { // 跳转会员中心
let url = this.$router.resolve({
path: '/home'
})
window.open(url.href, '_blank')
},
- signOutFun () {
+ signOutFun () { // 退出登录
storage.removeItem('accessToken');
storage.removeItem('refreshToken');
storage.removeItem('userInfo');
diff --git a/buyer/src/components/header/ShopHeader.vue b/buyer/src/components/header/ShopHeader.vue
index 0b2bda67..33f32a02 100644
--- a/buyer/src/components/header/ShopHeader.vue
+++ b/buyer/src/components/header/ShopHeader.vue
@@ -20,7 +20,7 @@ export default {
}
},
computed: {
- storeDetail () {
+ storeDetail () { // 店铺详情
return this.detail;
}
}
diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue
index 5c9e21a0..a81980b8 100644
--- a/buyer/src/components/header/hoverSearch.vue
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -23,7 +23,7 @@ export default {
}
},
methods: {
- goCartList () {
+ goCartList () { // 跳转购物车页面
let routerUrl = this.$router.resolve({
path: '/cart'
})
diff --git a/buyer/src/components/indexDecorate/modelList/carousel.vue b/buyer/src/components/indexDecorate/modelList/carousel.vue
index 0c737399..45c6be95 100644
--- a/buyer/src/components/indexDecorate/modelList/carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/carousel.vue
@@ -67,14 +67,14 @@ export default {
};
},
methods: {
- getArticleList () {
+ getArticleList () { // 获取常见问题列表
articleList(this.params).then(res => {
if (res.success) {
this.articleList = res.result.records
}
})
},
- goArticle (id) {
+ goArticle (id) { // 跳转文章详情
let routeUrl = this.$router.resolve({
path: '/article',
query: {id}
diff --git a/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
index 270e6377..7d35c935 100644
--- a/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
+++ b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
@@ -32,7 +32,6 @@ export default {
options: this.data.options // 装修数据
};
},
- methods: {}
};
diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue
index 7cf5ae32..e72d219b 100644
--- a/buyer/src/pages/PointMall.vue
+++ b/buyer/src/pages/PointMall.vue
@@ -63,7 +63,8 @@ export default {
pageNumber: 1,
pageSize: 20,
pointsGoodsCategoryId: ''
- }
+ },
+ total: 0 // 商品总数
}
},
mounted () {
@@ -76,6 +77,7 @@ export default {
pointGoods(this.params).then(res => {
if (res.success) {
this.goodsList = res.result.records
+ this.total = res.result.total
}
})
},
@@ -94,7 +96,7 @@ export default {
goGoodsDetail (skuId, goodsId) { // 跳转商品详情
let routerUrl = this.$router.resolve({
path: '/goodsDetail',
- query: {skuId, goodsId}
+ query: {skuId, goodsId, way: 'POINT'}
})
window.open(routerUrl.href, '_blank')
},
diff --git a/buyer/src/pages/home/memberCenter/AccountBind.vue b/buyer/src/pages/home/memberCenter/AccountBind.vue
index 114f7d90..f645538c 100644
--- a/buyer/src/pages/home/memberCenter/AccountBind.vue
+++ b/buyer/src/pages/home/memberCenter/AccountBind.vue
@@ -25,13 +25,6 @@
diff --git a/buyer/src/pages/home/memberCenter/AccountSafe.vue b/buyer/src/pages/home/memberCenter/AccountSafe.vue
index b39ff66c..61d7b9a4 100644
--- a/buyer/src/pages/home/memberCenter/AccountSafe.vue
+++ b/buyer/src/pages/home/memberCenter/AccountSafe.vue
@@ -1,7 +1,6 @@
-
@@ -16,102 +15,11 @@
-
-
-
-
-
-
-
-
diff --git a/manager/src/api/common.js b/manager/src/api/common.js
index aea5012d..d0690dda 100644
--- a/manager/src/api/common.js
+++ b/manager/src/api/common.js
@@ -1,4 +1,4 @@
-import {commonUrl, getRequest} from '@/libs/axios';
+import {commonUrl, getRequest, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios';
// 通过id获取子地区
export const getChildRegion = (id) => {
@@ -6,6 +6,16 @@ export const getChildRegion = (id) => {
};
// 点地图获取地址信息
-export const getRegion = (parpams) => {
- return getRequest(`${commonUrl}/common/region/region`, parpams);
+export const getRegion = (params) => {
+ return getRequest(`${commonUrl}/common/region/region`, params);
+};
+
+// 获取拼图验证
+export const getVerifyImg = (verificationEnums) => {
+ return getRequestWithNoToken(`${commonUrl}/common/slider/${verificationEnums}`);
+};
+
+// 拼图验证
+export const postVerifyImg = (params) => {
+ return postRequestWithNoToken(`${commonUrl}/common/slider/${params.verificationEnums}`, params);
};
diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js
index 3e91766a..6bd6d6c1 100644
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -24,6 +24,8 @@ service.interceptors.request.use(
...config.params
}
}
+ const uuid = getStore('uuid');
+ config.headers['uuid'] = uuid;
return config;
},
err => {
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index c08baced..6f2dfdb3 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -5,7 +5,7 @@ export const loginRouter = {
path: "/login",
name: "login",
meta: {
- title: "登录 - lili "
+ title: "登录 - lili运营后台"
},
component: () => import("@/views/login.vue")
};
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index e5c43a0d..d2ea2e2f 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -22,6 +22,13 @@
+
+
@@ -41,6 +48,7 @@ import LangSwitch from "@/views/main-components/lang-switch";
import RectLoading from "@/views/my-components/lili/rect-loading";
import CountDownButton from "@/views/my-components/lili/count-down-button";
import util from "@/libs/util.js";
+import verify from '@/views/my-components/verify';
export default {
components: {
@@ -49,6 +57,7 @@ export default {
LangSwitch,
Header,
Footer,
+ verify
},
data() {
return {
@@ -79,7 +88,7 @@ export default {
},
methods: {
mounted() {},
- afterLogin(res) {
+ afterLogin(res) { // 登录成功后处理
let accessToken = res.result.accessToken;
let refreshToken = res.result.refreshToken;
this.setStore("accessToken", accessToken);
@@ -100,23 +109,28 @@ export default {
}
});
},
- submitLogin() {
+ submitLogin() { // 登录操作
this.$refs.usernameLoginForm.validate((valid) => {
if (valid) {
- this.loading = true;
- login({
- username: this.form.username,
- password: this.md5(this.form.password),
- }).then((res) => {
- if (res && res.success) {
- this.afterLogin(res);
- } else {
- this.loading = false;
- }
- });
+ this.$refs.verify.show = true;
}
});
},
+ verifyChange (con) { // 拼图验证码回显
+ if (!con.status) return;
+
+ this.loading = true;
+ login({
+ username: this.form.username,
+ password: this.md5(this.form.password),
+ }).then((res) => {
+ if (res && res.success) {
+ this.afterLogin(res);
+ } else {
+ this.loading = false;
+ }
+ }).catch(()=>{this.loading = false});
+ }
},
};
@@ -140,7 +154,12 @@ export default {
position: relative;
zoom: 1;
}
-
+ .verify-con{
+ position: absolute;
+ top: 90px;
+ z-index: 10;
+ left: 20px;
+ }
.form {
padding-top: 1vh;
diff --git a/manager/src/views/my-components/verify/README.md b/manager/src/views/my-components/verify/README.md
new file mode 100644
index 00000000..b1fa811e
--- /dev/null
+++ b/manager/src/views/my-components/verify/README.md
@@ -0,0 +1,14 @@
+### 滑动拼图验证
+
+### 在页面中引入 .vue文件
+
+#### 参数
+
+#### 在组件上添加v-if来判断组件显隐
+
+#### verifyType 验证格式[ 'LOGIN' ,'REGISTER' ]
+
+#### @change方法 获取回调,参数为对象 {status:false,distance:100} status 为回调状态,distance为移动距离
+
+
+####
\ No newline at end of file
diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue
new file mode 100644
index 00000000..2ce1ef45
--- /dev/null
+++ b/manager/src/views/my-components/verify/index.vue
@@ -0,0 +1,185 @@
+
+
+
+
![]()
+
![]()
+
+
+
+
+
+
+
+ {{verifyText}}
+
+
+
+
+
diff --git a/manager/src/views/my-components/verify/verify.js b/manager/src/views/my-components/verify/verify.js
new file mode 100644
index 00000000..9282f5b3
--- /dev/null
+++ b/manager/src/views/my-components/verify/verify.js
@@ -0,0 +1,13 @@
+
+import {commonUrl, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios';
+
+
+// 获取拼图验证
+export const getVerifyImg = (verificationEnums) => {
+ return getRequestWithNoToken(`${commonUrl}/common/slider/${verificationEnums}`);
+};
+
+// 拼图验证
+export const postVerifyImg = (params) => {
+ return postRequestWithNoToken(`${commonUrl}/common/slider/${params.verificationEnums}`, params);
+};
diff --git a/seller/package.json b/seller/package.json
index 39448129..dee8c0ed 100644
--- a/seller/package.json
+++ b/seller/package.json
@@ -44,7 +44,8 @@
"vuex": "^3.4.0",
"wangeditor": "^4.6.13",
"xlsx": "^0.16.2",
- "xss": "^1.0.7"
+ "xss": "^1.0.7",
+ "uuid": "^8.3.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.4.4",
diff --git a/seller/src/App.vue b/seller/src/App.vue
index 2a6fc3f5..1f841906 100644
--- a/seller/src/App.vue
+++ b/seller/src/App.vue
@@ -5,13 +5,15 @@
diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js
index 037a4c0f..56d3afd8 100644
--- a/seller/src/libs/axios.js
+++ b/seller/src/libs/axios.js
@@ -24,6 +24,8 @@ service.interceptors.request.use(
...config.params
}
}
+ const uuid = getStore('uuid');
+ config.headers['uuid'] = uuid;
return config;
},
err => {
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index 1a1828a3..5bb9b88e 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -5,7 +5,7 @@ export const loginRouter = {
path: "/login",
name: "login",
meta: {
- title: "登录 - lili "
+ title: "登录 - lili商家后台 "
},
component: () => import("@/views/login.vue")
};
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 1458178b..bb794f9b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -61,7 +61,7 @@
或选择商品模版
-