diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index f1a4095..6ca6879 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -46,7 +46,7 @@ const install = (Vue, vm) => {
} else if(res.data.errCode == 401) {
// 假设201为token失效,这里跳转登录
// vm.$u.toast('您还没有登录哦,请先去登录!');
- if (res.data.data.action != "memberinfo") {
+ if (res.data.action != "memberinfo") {
uni.showModal({
title: "温馨提示",
content: "您还未登录,请立即登录",
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index a9cfe18..a51ec25 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -241,7 +241,7 @@ export default {
// console.log(res)
if(res.errCode == 0) {
this.$u.toast(res.message);
- this.$emit("updateList");
+ this.$emit("getArticlelist");
}
})
},
diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index b212e45..712914a 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -1,11 +1,11 @@
-
+
{{ item.addtime }}
{{ item.content }}
-
+
查看详情
diff --git a/components/logininput/identifying.vue b/components/logininput/identifying.vue
index d86d325..fd9db9c 100644
--- a/components/logininput/identifying.vue
+++ b/components/logininput/identifying.vue
@@ -68,10 +68,6 @@
this.$refs.uToast.show({
title: res.message,
})
- uni.showToast({
- title: res.message,
- icon: "none"
- })
setTimeout(() => {
uni.hideLoading();
// 这里此提示会被this.start()方法中的提示覆盖
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 96664c5..c0dd56b 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -205,7 +205,7 @@
z-index: 1000;
position: absolute;
bottom: 100rpx;
- right: 230rpx;
+ right: 30%;
width: 300rpx;
height: 80rpx;
line-height: 80rpx;
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index d77a45b..2b567ab 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -152,9 +152,16 @@
// type: 'success',
// url: '/pageA/topick/topick'
// })
+ } else if(res.errCode == 2){
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'primary',
+ url: '/pageA/login/login'
+ })
} else {
this.$refs.uToast.show({
title: res.message,
+ type: 'primary'
})
}
})
diff --git a/pageA/start/start.nvue b/pageA/start/start.nvue
deleted file mode 100644
index 4e01977..0000000
--- a/pageA/start/start.nvue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pageB/follow/index.vue b/pageB/follow/index.vue
index 32aa774..2147b98 100644
--- a/pageB/follow/index.vue
+++ b/pageB/follow/index.vue
@@ -4,8 +4,8 @@
输入达人名称
-
-
+
+
@@ -76,7 +76,7 @@ export default {
},
searchValue() {
uni.navigateTo({
- url: '/pageB/search/index?type=1'
+ url: '/pageB/search/index?type=2'
})
},
},
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index d0a673d..5ffccac 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -27,7 +27,7 @@
评论
-
+
@@ -180,16 +180,13 @@
z-index: 1000;
position: fixed;
top: 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
width: 100%;
height: 88rpx;
padding: 0 20rpx;
line-height: 88rpx;
background-color: #ECECEC;
& > text {
- // margin-right: 280rpx;
+ margin-right: 280rpx;
color: #333;
font-size: 30rpx;
font-weight: 500;
@@ -517,10 +514,6 @@ export default {
},
// 发布评论
sendComment() {
- if (this.send_value.length == 0) {
- this.$u.toast("内容不能为空!");
- return;
- }
this.$u.post("article/articleAddComment",{
article_id: this.article_id,
content: this.send_value,
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 67de9e1..2b14b17 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -127,13 +127,15 @@
{{goodsInfo.goods_name}}
- ¥{{ goodsInfo.goods_promotion_type == 1 ? goodsInfo.goods_promotion_price : goodsInfo.goods_price }}
+ ¥{{ goodsInfo.goods_price }}
+ ¥{{ goodsInfo.pintuan_price }}
+ ¥{{ groupbuyInfo.groupbuy_price }}
购买数量
-
+
@@ -273,7 +275,7 @@ export default {
this.time = time;
this.date = date
}
- console.log(123)
+ // console.log(123)
this.$u.api.getAtwillUserInfo({
id:this.storeid
}).then((res)=>{
@@ -347,6 +349,16 @@ export default {
this.showSpec = true;
return false;
}
+ // 如果没有规格设规格已全选
+ if(this.goodsInfo.spec_value == null) {
+ this.quanxuan = true;
+ }
+ if(!this.quanxuan) {
+ this.$refs.uToast.show({
+ title: '请选择规格'
+ })
+ return false;
+ }
this.$u.api.addCart({
goods_id: this.id,
quantity: this.goodsNumber,
@@ -476,12 +488,6 @@ export default {
})
return false;
}
- if (num == 0) {
- this.$refs.uToast.show({
- title: '数量不能为0'
- })
- return false;
- }
}
if(!this.debounce) return;
this.debounce = false;
@@ -513,9 +519,7 @@ export default {
url: '/pageC/cart/ConfirmOrder'
})
} else {
- // console.log(res.message);
this.debounce = true;
- this.$u.toast(res.message);
}
})
},
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index 26c17c8..1da0d21 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -8,7 +8,7 @@
-
+
视频
@@ -68,7 +68,6 @@