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

Merge pull request 'gyh change' (#90) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/90
This commit is contained in:
gyh 2020-07-31 10:08:00 +08:00
commit c9c7e08a8d
15 changed files with 724 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
App.vue
View File

@ -1,6 +1,27 @@
<script> <script>
export default {} import { mapMutations } from 'vuex';
export default {
onLaunch() {
// 缓存token
uni.getStorage({
key: "token",
success: (res) => {
this.loginIn(res.data);
}
})
},
methods: {
...mapMutations(['loginIn'])
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
@import "/static/css/normalize"; /* #ifndef APP-PLUS-NVUE */
@import "/static/css/normalize";
/* #endif */
/* 顶部自定义导航留白 */
.status_bar {
width: 100%;
height: var(--status-bar-height);
}
</style> </style>

35
components/remaining/remaining.vue
View File

@ -48,7 +48,7 @@
export default { export default {
data() { data() {
return { return {
remaining: 4, remaining: 11,
type: true, type: true,
banner: false, banner: false,
protocol: false, protocol: false,
@ -142,12 +142,19 @@
uni.getSystemInfo({ uni.getSystemInfo({
success: function(res) { success: function(res) {
that.heightOut = res.windowHeight; that.heightOut = res.windowHeight;
console.log('666666666666666' + that.heightOut) console.log(that.heightOut)
} }
}); });
}, },
// 我同意 // 我同意
to_agree() { to_agree() {
uni.setStorage({
key: 'launchFlag',
data: true,
success: function() {
console.log('error时存储launchFlag');
}
});
uni.navigateTo({ uni.navigateTo({
url: '/pageA/login/login' url: '/pageA/login/login'
}); });
@ -174,8 +181,7 @@
}) })
}, },
videoErrorCallback: function(e) { videoErrorCallback: function(e) {
console.log('视频错误信息:') console.log('视频错误信息:',e);
console.log(e.target.errMsg)
}, },
getRandomColor: function() { getRandomColor: function() {
const rgb = [] const rgb = []
@ -222,19 +228,18 @@
// height: 400rpx; // height: 400rpx;
} }
.welcome_jumpes { .welcome_jumpes {
width: 94rpx; z-index: 10;
height: 36rpx;
opacity: 0.5;
border-radius: 18rpx;
position: absolute; position: absolute;
right: 37rpx; top: 80rpx;
top: 66rpx; right: 60rpx;
width: 100rpx;
height: 40rpx;
border-radius: 20rpx;
font-size: 22rpx; font-size: 22rpx;
text-align: center; text-align: center;
line-height: 35rpx; line-height: 40rpx;
color: #fff; color: #fff;
background: #C4CAC6; background-color: rgba(0,0,0,0.5);
z-index: 10;
} }
#myVideo { #myVideo {
@ -257,8 +262,8 @@
.welcome_images { .welcome_images {
width: 100%; width: 100%;
height: 100vh;
position: fixed; position: fixed;
height: 100%
} }
uni-swiper, uni-swiper,
@ -266,7 +271,7 @@
uni-image { uni-image {
width: 100%; width: 100%;
// position: fixed; // position: fixed;
height: 100% height: 100vh;
} }
uni-image { uni-image {

25
manifest.json
View File

@ -23,7 +23,9 @@
"Push" : {}, "Push" : {},
"Maps" : {}, "Maps" : {},
"LivePusher" : {}, "LivePusher" : {},
"Payment" : {} "Payment" : {},
"VideoPlayer" : {},
"Speech" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {
@ -64,6 +66,12 @@
"oauth" : { "oauth" : {
"qq" : { "qq" : {
"appid" : "101884160" "appid" : "101884160"
},
"apple" : {},
"weixin" : {
"appid" : "wx556db1531ec35dc7",
"appsecret" : "f441fc15dd21543871a818f40ce92016",
"UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
} }
}, },
"maps" : { "maps" : {
@ -72,7 +80,20 @@
"appkey_android" : "8045e8a4cd6d544690c786265b248f91" "appkey_android" : "8045e8a4cd6d544690c786265b248f91"
} }
}, },
"share" : {} "share" : {
"weixin" : {
"appid" : "wx556db1531ec35dc7",
"UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
}
},
"speech" : {},
"payment" : {
"alipay" : {},
"weixin" : {
"appid" : "wx556db1531ec35dc7",
"UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
}
}
} }
} }
}, },

126
pageA/login/login.vue
View File

@ -43,11 +43,11 @@
<u-mask :show="show" @click="show = false"> <u-mask :show="show" @click="show = false">
<view class="warp"> <view class="warp">
<view class="rect" @tap.stop> <view class="rect" @tap.stop>
<view class="rect_view" @click="rect_qq()"> <view class="rect_view" @click="loginOther(1)">
<image src="../../static/pageA/qq.png" class="image"></image> <image src="../../static/pageA/qq.png" class="image"></image>
<view>QQ登录</view> <view>QQ登录</view>
</view> </view>
<view class="rect_view"> <view class="rect_view" @click="loginOther(2)">
<image src="../../static/pageA/weixin.png" class="image"></image> <image src="../../static/pageA/weixin.png" class="image"></image>
<view>微信登录</view> <view>微信登录</view>
</view> </view>
@ -61,7 +61,9 @@
</template> </template>
<script> <script>
import identifying from '@/components/logininput/identifying' import identifying from '@/components/logininput/identifying'
import { mapMutations } from 'vuex'; import {
mapMutations
} from 'vuex';
export default { export default {
data() { data() {
return { return {
@ -91,21 +93,35 @@
}, { }, {
"id": '3', "id": '3',
"text": "《使用协议》" "text": "《使用协议》"
}, }, ],
temp_url: "", // 上个页面路径
] pagesArr: ["pages/mine/index"], // 特殊路径
}; };
}, },
onLoad() { onLoad() {
// 数据的请求 // 数据的请求
this.apiwelcome(); this.apiwelcome();
}, },
onShow() {
let pages = getCurrentPages();
let prePage = pages[pages.length - 2];
this.temp_url = prePage.route;
// console.log(this.temp_url);
},
// 切断正常返回
onBackPress(e) {
console.log(1, e);
if (this.pagesArr.includes(this.temp_url) && !this.hasLogin) {
uni.switchTab({
url: '../../pages/index/index'
})
return true;
}
},
methods: { methods: {
...mapMutations(['loginIn']), ...mapMutations(['loginIn']),
apiwelcome() { apiwelcome() {
this.$u.api.sendSmsCode({ this.$u.api.sendSmsCode({}).then((res) => {
}).then((res) => {
console.log(res) console.log(res)
}) })
}, },
@ -189,8 +205,7 @@
// type: 'success', // type: 'success',
// url: '/pageA/topick/topick' // url: '/pageA/topick/topick'
// }) // })
} } else {
if (res.errCode == 1) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: 'error' type: 'error'
@ -199,40 +214,75 @@
}) })
}, },
// qq授权登录 // qq授权登录
rect_qq() { loginOther(type) {
console.log("授权QQ") var me = this;
var vm = this;
uni.getProvider({ uni.getProvider({
service: 'oauth', service: 'oauth',
success: function(res) { success: (res) => {
console.log('qq', res) //weixin if (type == 1) {
if (~res.provider.indexOf('qq')) {
uni.login({ uni.login({
provider: 'qq', provider: 'qq',
success: function(loginRes) { success: (qqres) => {
console.log(loginRes) console.log(qqres);
this.getApplogin(loginRes) uni.getUserInfo({
vm.$HTTP({ provider: 'qq',
method: 'GET', success: (data) => {
baseURL: 'https://graph.qq.com/user/get_user_info', console.log(data);
url: '', this.$u.api.qqLogin({
data: { member_qqopenid: data.userInfo.openId,
openid: loginRes.authResult.openid, member_nickname: data.userInfo.nickName,
access_token: loginRes.authResult.access_token, member_avatar: data.userInfo.avatarUrl,
appid: '101884160' }).then(res => {
console.log(res.errCode);
if (res.errCode == 0) {
this.loginIn(res.data.token);
this.show = false;
uni.switchTab({
url: "../../pages/index/index"
})
}
})
}
})
}, },
load: true fail: (e) => {
}).then((data) => { console.log(e);
console.log(data)
}, (err) => {
console.log(err)
});
} }
}); });
} else { } else {
console.log("错误") uni.login({
provider: 'weixin',
success: (wxres) => {
console.log(wxres);
uni.getUserInfo({
provider: 'weixin',
success: (data) => {
console.log(data);
this.$u.api.wechatLogin({
member_wxopenid: data.userInfo.openId,
member_nickname: data.userInfo.nickName,
member_avatar: data.userInfo.avatarUrl,
}).then(res => {
console.log(res);
if (res.errCode == 0) {
this.loginIn(res.data.token);
this.show = false;
uni.switchTab({
url: "../../pages/index/index"
})
} }
})
}
})
},
fail: (e) => {
console.log(e);
}
});
}
},
fail: (e) => {
console.log(e);
} }
}); });
}, },
@ -242,10 +292,6 @@
url: '/pageA/register/register' url: '/pageA/register/register'
}); });
}, },
// 授权登录
getApplogin() {
console.log("11")
},
// 选中某个复选框时，由checkbox时触发 // 选中某个复选框时，由checkbox时触发
checkboxChange(e) { checkboxChange(e) {
//console.log(e); //console.log(e);

10
pageA/pactList/pactList.vue
View File

@ -62,10 +62,14 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.packlist{} .packlist{}
.packlist > view{ .packlist > view{
width:676px;
font-size:26rpx;
color: #333;
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
padding: 16upx 0;
font-size: 26upx;
color: #333;
}
.rict_type {
text-indent: 1rem;
line-height: 1.2;
} }
</style> </style>

31
pageA/topick/topick.vue
View File

@ -10,7 +10,7 @@
</view> </view>
<!-- 标签 --> <!-- 标签 -->
<view class="tab_lable"> <view class="tab_lable">
<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item.name}}</view> <view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index,item.id)">{{item.name}}</view>
</view> </view>
<!-- 提交按钮 --> <!-- 提交按钮 -->
<view class="submites" @click="toHomePage">{{submites}}</view> <view class="submites" @click="toHomePage">{{submites}}</view>
@ -30,12 +30,12 @@
show: false, show: false,
tab_lables: [], tab_lables: [],
submites: '选好了进入首页', submites: '选好了进入首页',
rSelect:[] rSelect: [],
list: [],
}; };
}, },
onLoad(){ onLoad() {
// 标签的列表展示 // 标签的列表展示
console.log("11111222")
this.$u.api.labelList({ this.$u.api.labelList({
}).then((res) => { }).then((res) => {
@ -44,8 +44,7 @@
}) })
}, },
mounted(){ mounted() {},
},
methods: { methods: {
// 选中某个复选框时，由checkbox时触发 // 选中某个复选框时，由checkbox时触发
checkboxChange(e) { checkboxChange(e) {
@ -59,14 +58,21 @@
this.show = !this.show this.show = !this.show
}, },
// 点击切换颜色 // 点击切换颜色
tapClick(index) { tapClick(index, id) {
console.log(index) // console.log(id);
if (this.rSelect.indexOf(index) == -1) { if (this.rSelect.indexOf(index) == -1) {
console.log(index) //打印下标 this.rSelect.push(index); // 选中状态
this.rSelect.push(index); //选中添加到数组里 this.list.push(id); //选中添加到数组里
if (this.rSelect.length > 9) {
this.$u.toast("只能选择10个标签！");
return false;
}
} else { } else {
this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消 this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消
this.list.splice(this.rSelect.indexOf(id), 1); //取消
} }
// console.log(this.rSelect);
// console.log(this.list);
}, },
toHomePage() { toHomePage() {
uni.switchTab({ uni.switchTab({
@ -360,9 +366,10 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
// 选中的样式 // 选中的样式
.cur { .cur {
background-color: #ff5d00!important; background-color: #ff5d00 !important;
color: #fff!important; color: #fff !important;
} }
</style> </style>

53
pageA/welcome/welcome.vue
View File

@ -1,45 +1,76 @@
<template> <template>
<view class="welcome"> <view class="welcome">
<!-- 倒计时（跳过） --> <!-- 倒计时（跳过） -->
<remaining></remaining> <remaining v-if="guidePages"></remaining>
</view> </view>
</template> </template>
<script> <script>
import {
mapState
} from 'vuex';
import remaining from '@/components/remaining/remaining'; import remaining from '@/components/remaining/remaining';
export default { export default {
computed: {
...mapState(['hasLogin', 'token'])
},
data() { data() {
return { return {
guidePages: true
} }
}, },
onLoad() { onLoad() {
this.loadExecution();
}, },
methods: { methods: {
loadExecution() {
}, /**
mounted(){ * 获取本地存储中launchFlag的值
}, * 若存在，说明不是首次启动，直接进入首页；
components:{} * 若不存在，说明是首次启动，进入引导页；
*/
// 获取本地存储中launchFlag标识
const value = uni.getStorageSync('launchFlag') || "";
// console.log(value, this.hasLogin);
if (value) {
this.guidePages = false;
if (this.hasLogin) {
uni.switchTab({
url: '../../pages/index/index'
});
} else {
// launchFlag=true直接跳转到首页
uni.navigateTo({
url: '../../pageA/login/login'
});
}
} else {
// launchFlag!=true显示引导页
this.guidePages = true;
}
}
}
} }
</script> </script>
<style> <style>
.welcome {} .welcome {}
.welcome_jumpes{
.welcome_jumpes {
width: 90rpx; width: 90rpx;
height: 35rpx; height: 35rpx;
opacity:0.5; opacity: 0.5;
border-radius:18rpx; border-radius: 18rpx;
position: absolute; position: absolute;
right: 37rpx; right: 37rpx;
top: 34rpx; top: 34rpx;
font-size:20rpx; font-size: 20rpx;
text-align: center; text-align: center;
line-height: 35rpx; line-height: 35rpx;
color: #fff; color: #fff;
background: #C4CAC6; background: #C4CAC6;
} }
.welcome_images { .welcome_images {
width: 100%; width: 100%;
position: fixed; position: fixed;

7
pageB/photo/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="photo"> <view class="photo">
<view class="back"> <view class="back">
<u-icon name="close" color="#999999" :size="30"></u-icon> <u-icon name="close" color="#999999" :size="30" @click="goBack"></u-icon>
</view> </view>
<swiper class="swiper"> <swiper class="swiper">
<swiper-item> <swiper-item>
@ -128,6 +128,11 @@ export default {
console.log(res) console.log(res)
this.list = res.data.info this.list = res.data.info
}) })
},
goBack() {
uni.navigateBack({
delta: 1
})
} }
}, },
onLoad(o){ onLoad(o){

14
pageB/sdetails/index.vue
View File

@ -553,14 +553,16 @@ export default {
.title{ .title{
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 30rpx; margin-bottom: 30rpx;
line-height: 1.2;
>text{ >text{
padding: 13rpx;
font-size: 24rpx;
color:#fff;
margin-right: 13rpx;
background-color: #FF780F;
display: inline-block; display: inline-block;
border-radius: 25rpx; padding: 8rpx 10rpx;
margin: 0 10rpx 4rpx 0;
vertical-align: middle;
font-size: 20rpx;
color: #fff;
border-radius: 30rpx;
background-color: #FF780F;
} }
} }
.pic{ .pic{

5
pageB/search/index.vue
View File

@ -40,7 +40,10 @@ export default {
}, },
search(value){ search(value){
// console.log(value) // console.log(value)
if(!value) this.$u.toast('搜索内容不可为空'); if(!value) {
this.$u.toast('搜索内容不可为空');
return false;
}
this.$u.route({ this.$u.route({
url: "/pageB/search/out", url: "/pageB/search/out",
params: { params: {

13
pageE/setting/Index.vue
View File

@ -16,6 +16,7 @@
</view> </view>
<u-action-sheet v-model="sheetStatus" :list="list" :tips="tips" :border-radius="20" @click="choiceOption"> <u-action-sheet v-model="sheetStatus" :list="list" :tips="tips" :border-radius="20" @click="choiceOption">
</u-action-sheet> </u-action-sheet>
<u-modal v-model="show" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
</view> </view>
</template> </template>
<script> <script>
@ -67,7 +68,9 @@
title: '帮助与反馈', title: '帮助与反馈',
link: './feedback' link: './feedback'
}, },
] ],
content: "是否退出登录！",
show: false
} }
}, },
methods: { methods: {
@ -76,13 +79,19 @@
choiceOption(index) { choiceOption(index) {
console.log(index); console.log(index);
if (index == 1) { if (index == 1) {
this.logout(); this.show = true;
} }
}, },
toNextPage(url, ...params) { toNextPage(url, ...params) {
uni.navigateTo({ uni.navigateTo({
url: url url: url
}); });
},
loginOut() {
this.logout();
uni.redirectTo({
url: "../../pageA/login/login",
})
} }
}, },
}; };

52
pages.json
View File

@ -145,17 +145,57 @@
{ {
"path": "search/index", "path": "search/index",
"style": { "style": {
"navigationBarTitleText": "", "app-plus": {
"navigationStyle": "custom" "titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF",
"buttons": [
{
"type":"none",
"text":"搜索",
"float":"right",
"fontSize":"16",
"color": "#FF780F"
}
],
"searchInput": {
"align": "left",
"borderRadius": "15px",
"placeholder": "搜索您需要的商品",
"backgroundColor": "rgb(236,236,236)",
"placeholderColor": "#999999",
"disabled": false
}
}
}
} }
}, },
{ {
"path": "search/out", "path": "search/out",
"style": { "style": {
"navigationBarTitleText": "", "app-plus": {
"navigationStyle": "custom" "titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF",
"buttons": [
{
"type":"none",
"text":"搜索",
"float":"right",
"fontSize":"16",
"color": "#FF780F"
}
],
"searchInput": {
"align": "left",
"borderRadius": "15px",
"placeholder": "搜索您需要的商品",
"backgroundColor": "rgb(236,236,236)",
"placeholderColor": "#999999",
"disabled": false
}
}
}
} }
}, },
{ {

29
pages/index/index.vue
View File

@ -1,4 +1,6 @@
<template> <template>
<view>
<view class="status_bar"></view>
<view class="index"> <view class="index">
<view class="top"> <view class="top">
<view class="sosuo"></view> <view class="sosuo"></view>
@ -19,7 +21,7 @@
<scroll-view style="width:100%;height:100%" scroll-y="true"> <scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box"> <view class="box">
<!-- <indexad style="width:690rpx"></indexad> --> <!-- <indexad style="width:690rpx"></indexad> -->
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper> <u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
<view class="list"> <view class="list">
<view> <view>
<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item" <videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@ -36,13 +38,15 @@
<swiper-item> <swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true"> <scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box"> <view class="box">
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper> <u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
<view class="list"> <view class="list">
<view> <view>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem> <zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :key="item.live_id" :name="item.store_name"
:image="item.cover_img" :url="item.url"></zhiboItem>
</view> </view>
<view style="margin-left:20rpx"> <view style="margin-left:20rpx">
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem> <zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :key="item.live_id" :name="item.store_name"
:image="item.cover_img" :url="item.url"></zhiboItem>
</view> </view>
</view> </view>
</view> </view>
@ -53,7 +57,7 @@
<scroll-view style="width:100%;height:100%" scroll-y="true"> <scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box"> <view class="box">
<view class="tuijian"> <view class="tuijian">
<view class="title" @click="toSearchPage" > <view class="title" @click="toSearchPage">
<view class="left"> <view class="left">
<view></view> <view></view>
<text>推荐达人</text> <text>推荐达人</text>
@ -63,7 +67,7 @@
<view class="tuijianlist"> <view class="tuijianlist">
<!-- <darenItem style="margin-right:23rpx"></darenItem> <!-- <darenItem style="margin-right:23rpx"></darenItem>
<darenItem style="margin-right:23rpx"></darenItem> --> <darenItem style="margin-right:23rpx"></darenItem> -->
<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType" ></darenItem> <darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view> </view>
</view> </view>
<view class="list"> <view class="list">
@ -84,6 +88,7 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
</view>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -203,7 +208,7 @@
recommendList: [], // 推荐达人 recommendList: [], // 推荐达人
indexImageSwiper: [], indexImageSwiper: [],
zhiboImageSwiper: [], zhiboImageSwiper: [],
tabLiveLists:[] tabLiveLists: []
} }
}, },
components: { components: {
@ -220,8 +225,8 @@
this.tabLiveList(); this.tabLiveList();
}, },
methods: { methods: {
tabLiveList(){ tabLiveList() {
this.$u.api.tabLiveList().then((res)=>{ this.$u.api.tabLiveList().then((res) => {
console.log(res) console.log(res)
this.tabLiveLists = res.data this.tabLiveLists = res.data
}) })
@ -233,12 +238,12 @@
} }
}) })
}, },
changeType(member_id){ changeType(member_id) {
console.log(member_id); console.log(member_id);
this.$emit("pChangeType") this.$emit("pChangeType")
this.$u.api.attentionMember({ this.$u.api.attentionMember({
member_id: member_id member_id: member_id
}).then((res)=>{ }).then((res) => {
console.log(res) console.log(res)
this.getRecommendList(); this.getRecommendList();
}) })
@ -263,7 +268,7 @@
page: this.page, page: this.page,
is_video_img: 0, // 查询视频1 图文2 都查0 is_video_img: 0, // 查询视频1 图文2 都查0
}).then(res => { }).then(res => {
console.log('37647744ghj',res) console.log('37647744ghj', res)
if (res.errCode == 0) { if (res.errCode == 0) {
this.articleList = res.data.list; this.articleList = res.data.list;
} }

18
pages/mine/index.vue
View File

@ -124,7 +124,11 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex';
export default { export default {
computed: {
...mapState(['hasLogin', 'token'])
},
data() { data() {
return { return {
userInfo: {}, userInfo: {},
@ -136,6 +140,12 @@ export default {
} }
}, },
onShow() { onShow() {
// 尝试登录
if (!this.hasLogin) {
uni.navigateTo({
url: "../../pageA/login/login"
})
}
this.getUserInfo(); this.getUserInfo();
}, },
onNavigationBarButtonTap() { onNavigationBarButtonTap() {
@ -160,7 +170,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.mine { .mine {
min-height: calc(calc(100vh - var(--window-top)) - 50px); min-height: calc(calc(100vh - var(--window-top)));
background: #ECECEC; background: #ECECEC;
.mine-top { .mine-top {
// width: 100%; // width: 100%;
@ -295,7 +305,7 @@ export default {
$content-padding-top: 22rpx, $content-padding-top: 22rpx,
$content-padding-bottom: 30rpx, $content-padding-bottom: 30rpx,
$image-height: 36rpx, $image-height: 36rpx,
$image-width: 36rpx, $image-width: 36rpx
); );
.title { .title {
justify-content: space-between; justify-content: space-between;
@ -337,7 +347,7 @@ export default {
$content-padding-top: 8rpx, $content-padding-top: 8rpx,
$content-padding-bottom: 25rpx, $content-padding-bottom: 25rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx, $image-width: 71rpx
); );
.content { .content {
> view:not(:last-child) { > view:not(:last-child) {
@ -350,7 +360,7 @@ export default {
$content-padding-top: 8rpx, $content-padding-top: 8rpx,
$content-padding-bottom: 48rpx, $content-padding-bottom: 48rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx, $image-width: 71rpx
); );
.content { .content {
> view:not(:last-child) { > view:not(:last-child) {

145
pages/shop/index.vue
View File

@ -1,4 +1,6 @@
<template> <template>
<view>
<view class="status_bar"></view>
<scroll-view class="shop" scroll-y @scrolltolower="onreachBottom"> <scroll-view class="shop" scroll-y @scrolltolower="onreachBottom">
<view class="top"> <view class="top">
<image src="/static/image/shop/1.png" class="local"></image> <image src="/static/image/shop/1.png" class="local"></image>
@ -43,26 +45,25 @@
<pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan> <pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
<!-- 拼团列表 --> <!-- 拼团列表 -->
<group></group> <group></group>
<view class="activity-view"> <image class="lingquan"></image>
<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
</view>
<youhq></youhq> <youhq></youhq>
<list ref="recommendGoods"></list> <list ref="recommendGoods"></list>
<view class="cart" @click="toCartPage"> <view class="cart" @click="toCartPage">
<image src="/static/image/common/3.png"></image> <image src="/static/image/common/3.png"></image>
</view> </view>
<u-picker mode="region" :params="areaParams" v-model="chooseArea" @confirm="setArea"></u-picker> <u-picker mode="selector" :range="areaList" v-model="chooseArea" range-key="area_name" @confirm="setArea"></u-picker>
</scroll-view> </scroll-view>
</view>
</template> </template>
<script> <script>
import shopitem from "@/components/shop/shop-item/index"; import shopitem from "@/components/shop/shop-item/index";
import recommend from "@/components/shop/recommend/index"; import recommend from "@/components/shop/recommend/index";
import pintuan from "@/components/shop/recommend/pintuan"; import pintuan from "@/components/shop/recommend/pintuan";
import seckill from "@/components/shop/seckill/index"; import seckill from "@/components/shop/seckill/index";
import group from "@/components/shop/group/index"; import group from "@/components/shop/group/index";
import youhq from "@/components/shop/youhq/index"; import youhq from "@/components/shop/youhq/index";
import list from "@/components/shop/list/index"; import list from "@/components/shop/list/index";
export default { export default {
name: "shop", name: "shop",
components: { components: {
shopitem, shopitem,
@ -77,11 +78,6 @@ export default {
return { return {
area: "请选择", area: "请选择",
chooseArea: false, chooseArea: false,
areaParams: {
province: true,
city: true,
area: false
},
keyword: "", keyword: "",
list: [], list: [],
goodsClassify: [], // 商品分类 goodsClassify: [], // 商品分类
@ -91,27 +87,50 @@ export default {
seckillTime: {}, // 秒杀时间 seckillTime: {}, // 秒杀时间
// couponGroupList: [], // 优惠券拼团分类 // couponGroupList: [], // 优惠券拼团分类
pinTuanPush: {}, // 拼团推荐 pinTuanPush: {}, // 拼团推荐
activityInfo: {}, areaList: [], // 位置信息
} }
}, },
onLoad() { onLoad() {
this.getShopTopList(); this.getShopTopList();
this.getLocation(); // 获取定位
// this.area = uni.getStorageSync("address") || "请选择";
}, },
onShow() { onShow() {
this.getRecommendedSpike(); this.getRecommendedSpike();
this.getSpikeList(); this.getSpikeList();
this.getPinTuanPush(); this.getPinTuanPush();
this.getStoreActivity(); this.getAllLoaction(); // 获取位置
}, },
methods: { methods: {
sousuo() { sousuo() {
// console.log(123) // console.log(123)
this.$u.route({ this.$u.route({
url:"pageB/search/index" url: "pageB/search/index"
})
},
// 获取定位
getLocation() {
uni.getLocation({
type: 'wgs84',
geocode: true,
success: (res) => {
// console.log(res.address);
this.area = res.address.city;
},
fail: (e) => {
console.log(e);
}
});
},
// 获取位置
getAllLoaction() {
this.$u.api.getAreaList({pid: 0}).then(res => {
// console.log(res);
this.areaList = res.data;
}) })
}, },
getShopTopList() { getShopTopList() {
this.$u.api.getShopTopList().then((res)=>{ this.$u.api.getShopTopList().then((res) => {
if (res.errCode == 0) { if (res.errCode == 0) {
let temp = []; let temp = [];
res.data.banner.forEach(item => { res.data.banner.forEach(item => {
@ -128,22 +147,24 @@ export default {
}, },
getRecommendedSpike() { getRecommendedSpike() {
this.$u.api.recommendedSpike().then(res => { this.$u.api.recommendedSpike().then(res => {
if(res.errCode == 0) this.recommendedSpike = res.data; if (res.errCode == 0) this.recommendedSpike = res.data;
// console.log(this.recommendedSpike); // console.log(this.recommendedSpike);
}) })
}, },
// 拼团推荐 // 拼团推荐
getPinTuanPush() { getPinTuanPush() {
this.$u.api.getPinTuanPush().then(res => { this.$u.api.getPinTuanPush().then(res => {
if(res.errCode == 0) { if (res.errCode == 0) {
this.pinTuanPush = res.data; this.pinTuanPush = res.data;
} }
}) })
}, },
// 全部秒杀 // 全部秒杀
getSpikeList() { getSpikeList() {
this.$u.api.getSpikeList({ page: 0 }).then(res => { this.$u.api.getSpikeList({
if(res.errCode == 0) { page: 0
}).then(res => {
if (res.errCode == 0) {
this.spikeList = res.data.list; this.spikeList = res.data.list;
this.seckillTime = { this.seckillTime = {
bigHour: res.data.bigHour, bigHour: res.data.bigHour,
@ -161,8 +182,8 @@ export default {
this.$refs.recommendGoods.loadMore(); this.$refs.recommendGoods.loadMore();
}, },
setArea(e) { setArea(e) {
// console.log(e); console.log(e);
this.area = e.city.label; this.area = this.areaList[e[0]].area_name;
}, },
toCartPage() { toCartPage() {
uni.navigateTo({ uni.navigateTo({
@ -174,33 +195,15 @@ export default {
url: '/pageC/classify/index' url: '/pageC/classify/index'
}); });
}, },
getStoreActivity() { },
this.$u.api.getStoreActivity().then(res => {
if(res.errCode == 0) {
this.activityInfo = res.data;
} }
})
},
activityLink({ type, id }) {
if(type == 0 || type == 2) return false;
// type 1 商品详情页, 2 店铺详情页
const url = type == 1 ? 'pageB/sdetails/index' : '';
let params = { id: id };
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
if(type == 1) Object.assign(params, { type: 1 });
this.$u.route({
url: url,
params: params
})
},
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.shop { .shop {
height: calc(100vh - var(--window-top)); height: calc(100vh - var(--window-top));
box-sizing: border-box; box-sizing: border-box;
background-color: #F0EDF1; background-color: #F0EDF1;
.top { .top {
padding: 0 30rpx; padding: 0 30rpx;
background-color: #ffffff; background-color: #ffffff;
@ -208,15 +211,18 @@ export default {
height: 88rpx; height: 88rpx;
display: flex; display: flex;
align-items: center; align-items: center;
.local{
.local {
width: 31rpx; width: 31rpx;
height: 37rpx; height: 37rpx;
} }
} }
.swiper-image { .swiper-image {
background-color: #ffffff; background-color: #ffffff;
padding: 0 30rpx; padding: 0 30rpx;
} }
.add { .add {
width: 115rpx; width: 115rpx;
height: 25rpx; height: 25rpx;
@ -227,62 +233,72 @@ export default {
align-items: center; align-items: center;
margin-left: 14rpx; margin-left: 14rpx;
margin-right: 37rpx; margin-right: 37rpx;
> text {
>text {
width: 80rpx; width: 80rpx;
} }
> image {
>image {
width: 24rpx; width: 24rpx;
height: 15rpx; height: 15rpx;
} }
} }
.mnue { .mnue {
background-color: #ffffff; background-color: #ffffff;
width: 35rpx; width: 35rpx;
height: 26rpx; height: 26rpx;
margin-left: 36rpx; margin-left: 36rpx;
} }
.chengnuo { .chengnuo {
padding: 30rpx; padding: 30rpx;
background-color: #ffffff; background-color: #ffffff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
> view {
>view {
display: flex; display: flex;
align-items: center; align-items: center;
> image {
>image {
width: 23rpx; width: 23rpx;
height: 23rpx; height: 23rpx;
} }
> text {
>text {
font-size: 22rpx; font-size: 22rpx;
color: #999; color: #999;
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
} }
.fenlei { .fenlei {
padding: 30rpx; padding: 30rpx;
background-color: #ffffff; background-color: #ffffff;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 20rpx; margin-bottom: 20rpx;
> view {
>view {
margin-bottom: 30rpx; margin-bottom: 30rpx;
&:not(:nth-child(5n)) { &:not(:nth-child(5n)) {
margin-right: 70rpx; margin-right: 70rpx;
} }
} }
} }
.activity-view {
padding: 20rpx 30rpx;
text-align: center;
.lingquan { .lingquan {
width: 750rpx;
height: 177rpx;
margin-left: -33rpx;
margin-top: 29rpx;
background-color: #ececec; background-color: #ececec;
width: 688rpx;
height: 138rpx;
}
} }
.cart { .cart {
z-index: 9; z-index: 9;
position: fixed; position: fixed;
@ -291,15 +307,16 @@ export default {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
background: rgba(253, 211, 96, 1); background: rgba(253, 211, 96, 1);
box-shadow: 0rpx 10rpx 6rpx 0rpx rgba(253,211,96,0.34); box-shadow: 0rpx 10rpx 6rpx 0rpx rgba(253, 211, 96, 0.34);
border-radius: 50%; border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
> image {
>image {
width: 56rpx; width: 56rpx;
height: 54rpx; height: 54rpx;
} }
} }
} }
</style> </style>