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

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

Browse Source
This commit is contained in:
zmr900709 2020-08-18 11:35:37 +08:00
commit 91927fdc57
11 changed files with 114 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/comment/index.vue
View File

@ -9,7 +9,7 @@
<view class="text">{{ content.geval_content }}</view> <view class="text">{{ content.geval_content }}</view>
</view> </view>
<view class="image-container"> <view class="image-container">
<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image> <image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image)"></image>
</view> </view>
<view class="reply" v-if="reply && content.geval_explain"> <view class="reply" v-if="reply && content.geval_explain">
<view class="title">掌柜回复：</view> <view class="title">掌柜回复：</view>
@ -39,6 +39,14 @@ export default {
}, },
created() { created() {
if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two; if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
},
methods: {
previewImage(urls) {
console.log(urls);
// uni.previewImage({
// urls: urls,
// });
},
} }
}; };
</script> </script>

1
components/shop/group/index.vue
View File

@ -8,7 +8,6 @@
</view> </view>
</view> </view>
<view class="label"> <view class="label">
<!-- <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs> <u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
</view> </view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;"> <swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">

2
components/shop/recommend/pintuan.vue
View File

@ -11,7 +11,7 @@
<view class="user"> <view class="user">
<view class="avatar"> <view class="avatar">
<image :src="info.member_avatar[0]"></image> <image :src="info.member_avatar[0]"></image>
<image :src="info.member_avatar[1]"></image> <image src="/static/image/common/31.png"></image>
</view> </view>
<view class="num">{{ info.pintuan_limit_number }}人团</view> <view class="num">{{ info.pintuan_limit_number }}人团</view>
</view> </view>

9
components/shop/youhq/index.vue
View File

@ -2,11 +2,12 @@
<view class="coupon-swiper"> <view class="coupon-swiper">
<view class="top"> <view class="top">
<view class="title">全部优惠券</view> <view class="title">全部优惠券</view>
<view class="view-more" @click="toCouponPage">查看更多></view> <view class="view-more" @click="toCouponPage">
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view> </view>
<!-- <u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper> -->
<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs> <u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
<!-- :style="{ height: swiperHeight }" -->
<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}"> <swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i"> <swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
<!-- 最多显示四个 --> <!-- 最多显示四个 -->
@ -114,6 +115,8 @@ export default {
.view-more { .view-more {
font-size: 20rpx; font-size: 20rpx;
color: rgba(153,153,153,1); color: rgba(153,153,153,1);
display: flex;
align-items: center;
} }
} }
.box { .box {

4
pageA/bindinges/bindinges.vue
View File

@ -133,8 +133,8 @@
title: res.message, title: res.message,
type: 'success', type: 'success',
}) })
uni.switchTab({ uni.navigateTo({
url: '/pages/index/index' url: '/pageA/topick/topick'
}); });
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({

2
pageB/comment/index.vue
View File

@ -86,7 +86,7 @@ export default {
this.evalueList = []; this.evalueList = [];
} }
return res.data.length; return res.data.length;
} },
} }
}; };
</script> </script>

8
pageB/components/userinfo/index.vue
View File

@ -24,7 +24,7 @@
<text class="operat-span">{{ comment_num }}</text> <text class="operat-span">{{ comment_num }}</text>
</view> </view>
<!-- 购物车 --> <!-- 购物车 -->
<view class="operat gouwu"> <view class="operat gouwu" v-if="cart_num">
<image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' " <image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
mode="" @click="carting()"></image> mode="" @click="carting()"></image>
</view> </view>
@ -100,18 +100,20 @@
is_collect: this.list.is_collect || false, is_collect: this.list.is_collect || false,
is_content: false, is_content: false,
is_cart: false, is_cart: false,
cart_num: 0,
comment_num: this.list.comment_num || 0, comment_num: this.list.comment_num || 0,
item: this.list || {} item: this.list || {},
} }
}, },
watch: { watch: {
list(newValue, old) { list(newValue, old) {
// console.log(newValue); // console.log(newValue.goods.length);
this.item = newValue || {}; this.item = newValue || {};
this.is_follow = this.list.is_attention || false; this.is_follow = this.list.is_attention || false;
this.is_like = this.list.is_like || false; this.is_like = this.list.is_like || false;
this.is_collect = this.list.is_collect || false; this.is_collect = this.list.is_collect || false;
this.comment_num = this.list.comment_num || 0; this.comment_num = this.list.comment_num || 0;
this.cart_num = newValue.goods.length;
}, },
cart(newValue, old) { cart(newValue, old) {
// console.log(newValue); // console.log(newValue);

85
pageE/mine/ArticleDetails.vue
View File

@ -1,6 +1,24 @@
<template> <template>
<view class="article-details"> <view>
<rich-text :nodes="nodes"></rich-text> <view class="header" v-if="type == 2">
<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
<view class="title">德铭阳光</view>
<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
</view>
<rich-text :nodes="nodes" v-if="type != 2"></rich-text>
<view class="main" v-if="type == 2">
<view @click="show = true">
<text>产品介绍</text>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
<view>
<text>版本更新</text>
<text class="tips">已是最新版本</text>
</view>
</view>
<u-popup v-model="show" v-if="type == 2">
<view>出淤泥而不染，濯清涟而不妖</view>
</u-popup>
</view> </view>
</template> </template>
<script> <script>
@ -8,7 +26,11 @@ import common from '@/static/js/common.js'
export default { export default {
data() { data() {
return { return {
nodes: '', version: "",
phone_type: "",
type: 1,
nodes: "",
show: false,
} }
}, },
onLoad(option) { onLoad(option) {
@ -17,6 +39,9 @@ export default {
if(option.id) this.getUseHelpInfo(option.id); if(option.id) this.getUseHelpInfo(option.id);
if(option.type == 1) this.certificateInfo(); if(option.type == 1) this.certificateInfo();
if(option.type == 2) this.getAboutUsInfo(); if(option.type == 2) this.getAboutUsInfo();
this.type = option.type;
this.getVersion();
this.phone_type = this.$u.os();
}, },
methods: { methods: {
setTitle(title){ setTitle(title){
@ -50,14 +75,58 @@ export default {
} }
}) })
}, },
// 检查版本号
getVersion() {
this.$u.post("Specialci/checkVersion",{app_version: 1}).then(res => {
console.log(res);
this.version = res.data.app_version;
})
}
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.article-details { page {
min-height: calc(100vh - var(--window-top)); background-color: #f2f2f2;
background: #ECECEC; }
padding: 20rpx 35rpx 0; .header {
line-height: 45rpx; width: 500rpx;
margin: 0 auto;
padding: 30rpx;
text-align: center;
.tit-img {
width: 200rpx;
height: 200rpx;
}
.title {
margin: 18rpx 0;
font-weight: bold;
font-size: 26rpx;
letter-spacing: 2rpx;
}
.tit-info {
font-size: 22rpx;
color: #666;
}
}
.main {
margin: 20rpx 0;
& > view {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 100rpx;
padding: 0 20rpx;
line-height: 100rpx;
color: #333;
font-size: 30rpx;
background-color: #fff;
border-bottom: 1px solid #f2f2f2;
}
.tips {
color: #999;
font-size: 22rpx;
}
} }
</style> </style>

5
pageE/mine/storeConcerns.vue
View File

@ -133,8 +133,10 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.collection-item { .collection-item {
width: 100%;
background-color: #ffffff; background-color: #ffffff;
.item { .item {
width: 750rpx;
padding: 30rpx; padding: 30rpx;
display: flex; display: flex;
> image { > image {
@ -145,14 +147,17 @@ export default {
flex-shrink: 0; flex-shrink: 0;
} }
.title-wrap { .title-wrap {
overflow: hidden;
flex: 1; flex: 1;
.item-top { .item-top {
width: 100%;
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
line-height: 44rpx; line-height: 44rpx;
margin-bottom: 54rpx; margin-bottom: 54rpx;
} }
.item-bottom { .item-bottom {
width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;

10
pageE/more/Complaints.vue
View File

@ -5,7 +5,7 @@
<view class="suggestions"> <view class="suggestions">
<view class="text">{{ item.fb_content }}</view> <view class="text">{{ item.fb_content }}</view>
<view class="image"> <view class="image">
<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image> <image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images)"></image>
</view> </view>
</view> </view>
<view class="reply" v-if="item.is_reply"> <view class="reply" v-if="item.is_reply">
@ -13,7 +13,7 @@
<view class="reply-content u-line-4">{{ item.reply_content }}</view> <view class="reply-content u-line-4">{{ item.reply_content }}</view>
</view> </view>
<view class="date"> <view class="date">
<image src="../static/mine/26.png"></image> <image src="../static/mine/26.png" mode="aspectFit"></image>
<view>{{ item.fb_time }}</view> <view>{{ item.fb_time }}</view>
</view> </view>
</view> </view>
@ -45,6 +45,12 @@ export default {
} }
}) })
}, },
previewImage(urls) {
console.log(urls);
uni.previewImage({
urls: urls,
});
},
}, },
} }
</script> </script>

BIN
static/image/common/31.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB