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

Merge pull request 'gdpao' (#111) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/111
This commit is contained in:
gyh 2020-08-04 19:47:48 +08:00
commit 43845b4810
11 changed files with 228 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,7 @@
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
.bubble {
position: relative;
border-radius: 20rpx;
background-color: #fff;
&::after {
position: absolute;
@ -130,8 +131,7 @@
> view {
display: flex;
align-items: center;
height: 52rpx;
padding: 10rpx 20rpx;
padding: 20rpx 30rpx;
&:not(:last-child) {
border-bottom: 2rpx #ECECEC solid;
}
@ -142,17 +142,17 @@
}
> image {
&:first-child {
@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
}
&:nth-child(2) {
@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
}
&:last-child {
@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
@include image-class($width: 30rpx, $height: 30rpx, $right: 9rpx);
}
}
> text {
font-size: 20rpx;
font-size: 24rpx;
color: rgba(51,51,51,1);
}
}
@ -205,19 +205,18 @@ export default {
}).then(res => {
console.log(res)
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("getArticlelist");
// this.$u.toast(res.message);
} else {
// this.$u.toast(res.message);
}
}
})
},
articleCollect() {
this.$u.api.articleCollect({
article_id: this.item.article_id,
}).then(res => {
console.log(res)
console.log(res);
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("getArticlelist");
}
})
@ -229,6 +228,7 @@ export default {
}).then(res => {
// console.log(res)
if(res.errCode == 0) {
this.$u.toast(res.message);
this.$emit("getArticlelist");
}
})

37
components/remaining/remaining.vue
View File

@ -4,9 +4,8 @@
<view v-if="type" id="video_mp4">
<view class="page-body">
<view class="page-section">
<video id="myVideo" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback"
<video id="myVideo" enable-progress-gesture="false" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback"
enable-danmu danmu-btn></video>
<cover-view class="time">abc</cover-view>
</view>
</view>
</view>
@ -22,8 +21,8 @@
<swiper-item v-for="(item,index) in list" :key="index">
<view class="swiper-item uni-bg-red">
<image :src=" 'https://' + item.launch_path"></image>
<view v-if="index == 3">立即体验</view>
</view>
<view class="btn-init" v-if="parseInt(index) == 2" @click="goNext">立即体验</view>
</swiper-item>
</swiper>
</view>
@ -72,7 +71,8 @@
background: ['color1', 'color2', 'color3'],
indicatorDots: true,
interval: 2000,
duration: 500
duration: 500,
swiper_index: "",
};
},
onReady: function(res) {
@ -133,6 +133,11 @@
}
});
},
// 立即体验
goNext() {
this.protocol = true;
this.banner = false;
},
// 我同意
to_agree() {
uni.setStorage({
@ -203,8 +208,21 @@
.uni-padding-wrap{
// height: 400rpx;
}
.btn-init {
z-index: 1000;
position: absolute;
bottom: 100rpx;
right: 30%;
width: 300rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: #fff;
border-radius: 40rpx;
background-color: #007AFF;
}
.welcome_jumpes {
z-index: 10000;
z-index: 100;
position: absolute;
top: 80rpx;
right: 60rpx;
@ -220,15 +238,6 @@
#myVideo {
width: 100%;
.time {
position: absolute;
top: 0;
left: 0;
width: 10rpx;
height: 10rpx;
color: #fff;
font-size: 30rpx;
}
}
uni-video {

5
components/shop/list/item.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="item" @click="toDetailsPage">
<image :src="info.goods_image" class="img"></image>
<image :src="info.goods_image" mode="aspectFill" class="img"></image>
<view class="info">
<text class="title u-line-1">{{ info.goods_name }}</text>
<text class="jianjie u-line-2">{{ info.goods_advword }}</text>
@ -44,13 +44,12 @@ export default {
<style lang="scss" scoped>
.item{
width: 330rpx;
height: 460rpx;
margin-bottom: 26rpx;
background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx;
.img{
width: 330rpx;
height: 272rpx;
height: 300rpx;
background: rgba(245,245,245,1);
border-radius: 10rpx 10rpx 0rpx 0rpx;
margin-bottom: 24rpx;

13
components/shop/shop-item/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="shop-item" @click="toClassifyPage">
<image :src="info.goodscn_pic"></image>
<text class="u-line-1">{{ info.gc_name }}</text>
<text class="">{{ info.gc_name }}</text>
</view>
</template>
<script>
@ -23,21 +23,20 @@ export default {
<style lang="scss" scoped>
.shop-item{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100rpx;
flex-direction: column;
width: 20%;
margin-bottom: 20rpx;
>image{
width: 80rpx;
height: 80rpx;
border-radius: 50%;
}
>text{
width: 100%;
width: 100rpx;
margin-top: 14rpx;
font-size: 24rpx;
color: #333;
margin-top: 14rpx;
text-align: center;
}
}
</style>

36
manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "deming",
"name" : "德铭阳光",
"appid" : "__UNI__EBFF00A",
"description" : "",
"versionName" : "1.0.0",
@ -105,7 +105,10 @@
"xhdpi" : "static/app/start/720x1242.png",
"xxhdpi" : "static/app/start/1080x1882.png"
},
"iosStyle" : "storyboard"
"iosStyle" : "storyboard",
"ios" : {
"storyboard" : "static/CustomStoryboard.zip"
}
},
"icons" : {
"android" : {
@ -115,16 +118,27 @@
"xxxhdpi" : "static/app/icon/192x192.png"
},
"ios" : {
"appstore" : "static/app/icon/192x192.png",
"appstore" : "unpackage/res/icons/1024x1024.png",
"iphone" : {
"app@2x" : "static/app/icon/144x144.png",
"app@3x" : "static/app/icon/192x192.png",
"spotlight@2x" : "static/app/icon/96x96.png",
"spotlight@3x" : "static/app/icon/144x144.png",
"settings@2x" : "static/app/icon/72x72.png",
"settings@3x" : "static/app/icon/96x96.png",
"notification@2x" : "static/app/icon/72x72.png",
"notification@3x" : "static/app/icon/72x72.png"
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png"
},
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
}
}
}

1
pageA/register/register.vue
View File

@ -103,6 +103,7 @@
},
// 用户注册
loginIns(){
let me = this;
let type_phone = this.$u.test.mobile( this.member_mobile)
if( this.member_mobile == ''){
this.$refs.uToast.show({

20
pageB/photo/index.vue
View File

@ -6,7 +6,7 @@
</view>
<swiper class="swiper" circular autoplay @change="changeSwiper">
<swiper-item v-for="(simg,sindex) in list.photo" :key="sindex">
<image :src="simg.url" mode="aspectFill" @tap="viewImage" :data-url="simg.url"></image>
<image :src="simg.url" mode="widthFix" @tap="viewImage" :data-url="simg.url"></image>
</swiper-item>
</swiper>
<view class="bottom">
@ -32,7 +32,7 @@
<scroll-view class="scroll-box" scroll-y="true" >
<block v-for="(item,index) in commentList" :key="index" v-if="commentList.length">
<view class="box">
<image :src="item.member_avatar" mode=""></image>
<image :src="item.member_avatar" mode="aspectFill"></image>
<view class="info">
<text>{{ item.member_nickname }}</text>
<text class="time">{{ item.create_time }}</text>
@ -83,7 +83,7 @@
<!-- 单个 -->
<view class="good-one" v-else v-show="cart_type">
<view class="box" v-for="(item,index) in list.goods" :key="index" @click="gotoInfo(item.goods_id)">
<image :src="item.goods_image" mode=""></image>
<image :src="item.goods_image" mode="aspectFill"></image>
<view>
<view class="title u-line-1">{{ item.goods_advword }}</view>
<view class="content u-line-2">{{ item.goods_name }}</view>
@ -98,7 +98,7 @@
.photo{
width: 100%;
height: 100%;
background-color: #ececec;
background-color: #000000;
.back{
padding-top: 28rpx;
padding-right: 31rpx;
@ -106,16 +106,15 @@
}
.swiper{
width: 750rpx;
height: 702rpx;
margin-top: 102rpx;
height: 700rpx;
margin-top: 140rpx;
image{
width: 100%;
height: 100%;
}
}
.bottom{
width: 100%;
margin-top: 150rpx;
margin-top: 180rpx;
padding: 20rpx 30rpx;
background-color: #fff;
.item{
@ -146,10 +145,7 @@
}
.info{
margin: 20rpx 0;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
line-height: 1.2;
font-size: 28rpx;
}
.box {

294
pageB/search/out.vue
View File

@ -1,15 +1,18 @@
<template>
<view class="out">
<u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32" active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0" height="88"></u-tabs-swiper>
<swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
<u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32"
active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0"
height="88"></u-tabs-swiper>
<swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition"
@animationfinish="animationfinish">
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view style="padding-top:30rpx">
<shop></shop>
</view>
</scroll-view>
</swiper-item>
<swiper-item>
</swiper-item>
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view class="list">
<!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
@ -19,7 +22,7 @@
</swiper>
<view v-else style=" display: flex;flex-direction: column;height: calc(100vh - 88rpx);">
<view class="select">
<view @click="sx(0)" class="xz" data-type="xl">销量</view>
<view @click="sx(0)" class="xz" data-type="xl">销量</view>
<view class="xz" @click="sx(1)">
<text>价格</text>
<view class="jiage">
@ -29,163 +32,162 @@
</view>
<view data-type="hp" @click="sx(2)">好评</view>
</view>
<swiper class="swiper" :current="swiperCurrent" @change="huadong">
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view style="padding-top:30rpx">
<shop v-for="(i,j) in shoplist[0]" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid" :image="i.goods_image"></shop>
</view>
</scroll-view>
</swiper-item>
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view class="list">
<!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
</view>
</scroll-view>
</swiper-item>
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
D
</scroll-view>
</swiper-item>
</swiper>
<view class="swiper" :current="swiperCurrent" @change="huadong">
<scroll-view :scroll-y="true" style="height:100%">
<view style="padding-top:30rpx">
<shop v-for="(i,j) in shoplist" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid"
:image="i.goods_image"></shop>
</view>
</scroll-view>
</view>
</view>
</view>
</template>
<style lang="scss" scoped>
.out{
display: flex;
flex-direction: column;
height: 100vh;
.sosuo{
width: 100%;
height: 88rpx;
border-bottom: 1rpx solid #ececec;
.out {
display: flex;
align-items: center;
padding: 0 30rpx;
flex-shrink: 0;
flex-direction: column;
height: 100vh;
>image{
width: 18rpx;
height: 32rpx;
margin-right: 24rpx;
flex-shrink: 0;
}
align-items: center;
}
.swiper{
width: 100%;
height: 100%;
.list{
display: flex;
flex-wrap: wrap;
.sosuo {
width: 100%;
padding-left: 30rpx;
}
}
.select{
width: 100%;
height: 89rpx;
border-bottom: 1rpx solid #ececec;
display: flex;
align-items: center;
padding: 0 40rpx;
flex-shrink: 0;
justify-content: space-between;
>view{
font-size: 32rpx;
color: #333;
height: 88rpx;
border-bottom: 1rpx solid #ececec;
display: flex;
font-weight:400;
.jiage{
align-items: center;
padding: 0 30rpx;
flex-shrink: 0;
>image {
width: 18rpx;
height: 32rpx;
margin-right: 24rpx;
flex-shrink: 0;
}
align-items: center;
}
.swiper {
width: 100%;
height: 100%;
.list {
display: flex;
flex-direction: column;
.top{
width: 12rpx;
border-bottom: 12rpx solid #707070;
border-left: 11rpx solid #fff ;
border-right: 11rpx solid #fff ;
margin-bottom: 2rpx;
}
.bottom{
width: 12rpx;
border-top: 12rpx solid #707070;
border-left: 11rpx solid #fff ;
border-right: 11rpx solid #fff ;
}
.topxz{
border-bottom: 12rpx solid #FF780F;
}
.bottomxz{
border-top: 12rpx solid #FF780F;
}
flex-wrap: wrap;
width: 100%;
padding-left: 30rpx;
}
}
.xz{
color:#FF780F;
.select {
width: 100%;
height: 89rpx;
border-bottom: 1rpx solid #ececec;
display: flex;
align-items: center;
padding: 0 40rpx;
flex-shrink: 0;
justify-content: space-between;
>view {
font-size: 32rpx;
color: #333;
display: flex;
font-weight: 400;
.jiage {
display: flex;
flex-direction: column;
.top {
width: 12rpx;
border-bottom: 12rpx solid #707070;
border-left: 11rpx solid #fff;
border-right: 11rpx solid #fff;
margin-bottom: 2rpx;
}
.bottom {
width: 12rpx;
border-top: 12rpx solid #707070;
border-left: 11rpx solid #fff;
border-right: 11rpx solid #fff;
}
.topxz {
border-bottom: 12rpx solid #FF780F;
}
.bottomxz {
border-top: 12rpx solid #FF780F;
}
}
}
.xz {
color: #FF780F;
}
}
}
}
</style>
<script>
import shop from "../components/search/shop"
import darenItem from "@/components/index/daren-item/index"
export default {
name:"out",
components:{
shop,
darenItem
},
data(){
return {
list:[
{
name:"店铺"
},{
name:"达人"
}
],
current: 0,
swiperCurrent: 0,
keyword:"",
type:"",
shoplist:[]
}
},
onLoad(o){
this.type = o.type
this.keyword = o.value
this.search()
},
methods: {
tabsChange(index) {
this.swiperCurrent = index;
},
transition(e) {
let dx = e.detail.dx;
this.$refs.uTabs.setDx(dx);
import shop from "../components/search/shop"
import darenItem from "@/components/index/daren-item/index"
export default {
name: "out",
components: {
shop,
darenItem
},
animationfinish(e) {
let current = e.detail.current;
this.$refs.uTabs.setFinishCurrent(current);
this.swiperCurrent = current;
this.current = current;
data() {
return {
list: [{
name: "店铺"
}, {
name: "达人"
}],
current: 0,
swiperCurrent: 0,
keyword: "",
type: "",
shoplist: []
}
},
sx(type){
console.log(type)
onLoad(o) {
this.type = o.type
this.keyword = o.value
this.search()
},
methods: {
tabsChange(index) {
this.swiperCurrent = index;
},
transition(e) {
let dx = e.detail.dx;
this.$refs.uTabs.setDx(dx);
},
animationfinish(e) {
let current = e.detail.current;
this.$refs.uTabs.setFinishCurrent(current);
this.swiperCurrent = current;
this.current = current;
},
sx(type) {
console.log(type)
},
huadong(e) {
console.log(e.detail.current)
},
search() {
this.$u.api.ShopSearch({
keyword: this.keyword
}).then((res) => {
this.shoplist = res.data.data
})
}
},
huadong(e){
console.log(e.detail.current)
},
search(){
this.$u.api.ShopSearch({keyword:this.keyword}).then((res)=>{
this.shoplist[0] = res.data.data
})
}
},
}
</script>
}
</script>

2
pages/information/information.vue
View File

@ -9,7 +9,7 @@
<view class="content">
<!-- 正文内容 -->
</view>
<view class="sousuo"></view>
<!-- <view class="sousuo"></view> -->
<view class="backes">
<titles :information="information_dles"></titles>
</view>

14
pages/shop/index.vue
View File

@ -35,7 +35,7 @@
</view>
</view>
<view class="fenlei">
<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item"></shopitem>
</view>
<!-- 秒杀 -->
<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
@ -299,19 +299,11 @@
}
.fenlei {
padding: 30rpx;
background-color: #ffffff;
display: flex;
flex-wrap: wrap;
padding: 30rpx;
margin-bottom: 20rpx;
>view {
margin-bottom: 30rpx;
&:not(:nth-child(5n)) {
margin-right: 42rpx;
}
}
background-color: #ffffff;
}
.activity-view {

BIN
static/CustomStoryboard.zip Normal file
View File

Binary file not shown.