theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'zhy' (#150) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/150
This commit is contained in:
hansu 2020-08-11 10:23:43 +08:00
commit 39b2749ac9
14 changed files with 54 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/http.interceptor.js
View File

@ -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: "您还未登录，请立即登录",

2
components/index/video-item/index.vue
View File

@ -241,7 +241,7 @@ export default {
// console.log(res)
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("updateList");
this.$emit("getArticlelist");
}
})
},

4
components/logininput/identifying.vue
View File

@ -68,10 +68,6 @@
this.$refs.uToast.show({
title: res.message,
})
uni.showToast({
title: res.message,
icon: "none"
})
setTimeout(() => {
uni.hideLoading();
// 这里此提示会被this.start()方法中的提示覆盖

2
components/remaining/remaining.vue
View File

@ -205,7 +205,7 @@
z-index: 1000;
position: absolute;
bottom: 100rpx;
right: 230rpx;
right: 30%;
width: 300rpx;
height: 80rpx;
line-height: 80rpx;

7
pageA/register/register.vue
View File

@ -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'
})
}
})

30
pageA/start/start.nvue
View File

@ -1,30 +0,0 @@
<template>
<view>
<video :src="src" class="" controls></video>
</view>
</template>
<script>
export default {
data() {
return {
src: "",
}
},
onLoad() {
},
methods: {
// 获取
getVideoInfo() {
}
// 获取手机信息
getPhoneInfo() {}
}
}
</script>
<style>
</style>

11
pageB/photo/index.vue
View File

@ -27,7 +27,7 @@
<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
<view class="top">
<text>评论</text>
<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
</view>
<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
<block v-for="(item,index) in commentList" :key="index">
@ -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,

26
pageB/sdetails/index.vue
View File

@ -127,13 +127,15 @@
<image class="image" :src="goodsInfo.goods_image"></image>
<view class="info">
<text class="u-line-2">{{goodsInfo.goods_name}}</text>
<text>￥{{ goodsInfo.goods_promotion_type == 1 ? goodsInfo.goods_promotion_price : goodsInfo.goods_price }}</text>
<text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
</view>
</view>
<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
<view class="num">
<text>购买数量</text>
<u-number-box v-model="goodsNumber" :min="1"></u-number-box>
<u-number-box v-model="goodsNumber"></u-number-box>
</view>
<view style="height:100rpx"></view>
</view>
@ -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);
}
})
},

44
pageB/video/video.nvue
View File

@ -8,7 +8,7 @@
</cover-image>
<!-- 用户操作 -->
<userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
<cover-view class="info-box" @click="stopClick">
<cover-view class="info-box">
<view class="video-info-box">
<image class="image-play" src="../../static/videoIcon.png" mode=""></image>
<text class="video-slip">视频</text>
@ -68,7 +68,6 @@
<script>
import userinfo from "../components/userinfo/index" // 点赞组件
const temp_url = "https://dmmall.sdbairui.com/api/";
export default {
components: {
userinfo
@ -102,7 +101,7 @@
// 获取信息
getVideoInfo(article_id) {
uni.request({
url: temp_url + "article/articleInfo",
url: "https://dmmall.sdbairui.com/api/article/articleInfo",
method: "POST",
data: {
article_id: article_id
@ -131,7 +130,7 @@
// 获取评论
getComment() {
uni.request({
url: temp_url + "article/articleCommentList",
url: "https://dmmall.sdbairui.com/api/article/articleCommentList",
method: "POST",
data: {
article_id: this.article_id,
@ -145,35 +144,6 @@
}
})
},
// 发布评论
sendComment() {
if (this.send_value.length == 0) {
this.$u.toast("内容不能为空！");
return;
}
uni.request({
url: temp_url + "article/articleAddComment",
method: "POST",
data: {
article_id: this.article_id,
content: this.send_value,
pid: this.pid,
reply_id: this.reply_id,
},
success: (res) => {
if (res.data.errCode == 0) {
this.send_value = "";
this.comment_num = res.data.num;
console.log(res.data);
} else {
uni.showToast({
title: res.data.message,
icon: "none"
})
}
}
})
},
// 获取手机信息
getInfo() {
uni.getSystemInfo({
@ -231,10 +201,6 @@
this.loadinging = false;
}, 2000)
},
// stop
stopClick(event) {
event.stopPropagation();
},
goBack() {
uni.navigateBack({
delta: 1
@ -256,7 +222,6 @@
/* 暂停 */
.pause {
z-index: 99;
position: fixed;
top: 600rpx;
left: 330rpx;
@ -276,7 +241,6 @@
position: fixed;
bottom: 0;
left: 0;
width: 720rpx;
padding: 30rpx;
}
@ -293,7 +257,7 @@
}
.content-box {
z-index: 100;
z-index: 99;
position: fixed;
bottom: 0;
left: 0;

9
pageE/mine/MineConcerns.vue
View File

@ -3,8 +3,8 @@
<view class="concerns-container">
<view v-for="(info, index) in list" :key="index">
<view class="daren-item">
<image class="head" :src="info.friend_tomavatar"></image>
<text class="name">{{ info.friend_tomname || '' }}</text>
<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
<text class="name" @click="viewDetails(info.friend_tomid)">{{ info.friend_tomname || '' }}</text>
<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
</view>
</view>
@ -37,6 +37,11 @@ export default {
}
})
},
viewDetails(id) {
this.$u.route('pageB/details/index', {
id: id
});
},
changeType(id) {
console.log(id);
this.$u.api.attentionMember({

6
pages.json
View File

@ -1029,12 +1029,6 @@
}
],
"pages": [
// {
// "path" : "pageA/start/start",
// "style": {
// "navigationStyle": "custom"
// }
// },
{
"path": "pageA/welcome/welcome",
"style": {

13
pages/index/index.vue
View File

@ -27,11 +27,11 @@
<view class="list">
<view>
<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
@updateList="updateList"></videoItem>
@getArticlelist="getArticlelist"></videoItem>
</view>
<view style="margin-left:20rpx">
<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
@updateList="updateList"></videoItem>
@getArticlelist="getArticlelist"></videoItem>
</view>
</view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@ -103,9 +103,6 @@
display: flex;
flex-direction: column;
height: 100vh;
/* #ifdef APP-PLUS */
padding-bottom: 100rpx;
/* #endif */
overflow: hidden;
.top {
@ -413,12 +410,6 @@
}
})
},
// 屏蔽更新列表
updateList() {
console.log(111);
this.page = 0;
this.getArticlelist();
},
// 发现下拉加载
swiperBottom(e) {
this.getArticlelist();

37
pages/mine/index.vue
View File

@ -46,7 +46,7 @@
<view class="title">
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view class="title-text-more">查看全部订单</view>
<view class="title-text">查看全部订单</view>
<image src="/static/image/mine/21.png"></image>
</view>
</view>
@ -71,14 +71,14 @@
<image src="/static/image/mine/37.png"></image>
<view>拼团中</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
</view>
</view>
<view class="tool">
@ -250,9 +250,8 @@ export default {
> view {
margin-right: 80rpx;
text-align: center;
font-size: 26rpx;
font-weight: 500;
color: #333;
font-size: 24rpx;
color:rgba(51,51,51,1);
> view:first-child {
margin-bottom: 10rpx;
}
@ -276,7 +275,7 @@ export default {
.title {
height: 76rpx;
font-size: 28rpx;
color: #666;
color: rgba(51,51,51,1);
position: relative;
display: flex;
align-items: center;
@ -291,10 +290,6 @@ export default {
transform: translate(-50%,0);
}
}
.title-text-more {
font-size: 24rpx;
color: #999;
}
.content {
padding: $content-padding-top 0 $content-padding-bottom;
display: flex;
@ -335,7 +330,6 @@ export default {
}
.content {
justify-content: space-between;
align-items: center;
> view {
display: flex;
flex-direction: column;
@ -343,25 +337,22 @@ export default {
justify-content: space-between;
}
> view:nth-child(1){
@include image-size($image-width: 36rpx, $image-height: 34rpx);
@include image-size($image-width: 33rpx, $image-height: 36rpx);
}
> view:nth-child(2){
@include image-size($image-width: 38rpx, $image-height: 36rpx);
@include image-size($image-width: 38rpx, $image-height: 32rpx);
}
> view:nth-child(3){
@include image-size($image-width: 40rpx, $image-height: 36rpx);
@include image-size($image-width: 41rpx, $image-height: 33rpx);
}
> view:nth-child(4){
@include image-size($image-width: 38rpx, $image-height: 38rpx);
@include image-size($image-width: 40rpx, $image-height: 35rpx);
}
> view:nth-child(5){
@include image-size($image-width: 36rpx, $image-height: 40rpx);
@include image-size($image-width: 37rpx, $image-height: 37rpx);
}
> view:nth-child(6){
@include image-size($image-width: 40rpx, $image-height: 40rpx);
}
> view:nth-child(7){
@include image-size($image-width: 40rpx, $image-height: 40rpx);
@include image-size($image-width: 33rpx, $image-height: 35rpx);
}
}
}

BIN
static/image/mine/38.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB