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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh

Browse Source
This commit is contained in:
Gdpao
2020-08-11 10:36:18 +08:00
parent b34ac35821 def8f0cf1b
commit b3a7b2d032
18 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pageB/follow/index.vue
View File

@@ -4,8 +4,8 @@
<image src="/static/image/common/10.png"></image>
<text>输入达人名称</text>
</view>
<view class="list">
<darenItem style="margin-top:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
<view class="list" style="margin-left:-20rpx">
<darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view>
</view>
</template>
@@ -76,7 +76,7 @@ export default {
},
searchValue() {
uni.navigateTo({
url: '/pageB/search/index?type=1'
url: '/pageB/search/index?type=2'
})
},
},

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;