Skip to content

M
mallapp
Commit 60dec3b8 authored by 罗超's avatar 罗超
Browse files
Options

1

parent f410def8
Hide whitespace changes
Inline Side-by-side
Showing with 466 additions and 20 deletions
pages.json
View file @ 60dec3b8
...@@ -457,6 +457,8 @@ ...@@ -457,6 +457,8 @@
"path":"personal/JhphoneRz"//电话认证 "path":"personal/JhphoneRz"//电话认证
},{ },{
"path":"picDetail"//相册详情 "path":"picDetail"//相册详情
},{
"path":"personal/bindSalesman"//绑定销售
}] }]
}, },
//线下服务 //线下服务
......
pages/index/index.vue
View file @ 60dec3b8
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
</view> </view>
<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> --> <view @click='yj' style="width: 200px;height: 50px;">活动</view>
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs" <u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs> :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs"> <template v-for="(item, i) in myPageData.home_pages.navs">
...@@ -208,7 +208,6 @@ ...@@ -208,7 +208,6 @@
orderPopup orderPopup
}, },
onLoad(options) { onLoad(options) {
console.log(211,options)
let that = this; let that = this;
// options = {user_id:125459,SmallShopId:0,EduSchoolId:79} // options = {user_id:125459,SmallShopId:0,EduSchoolId:79}
uni.getSystemInfo({ uni.getSystemInfo({
...@@ -808,6 +807,10 @@ ...@@ -808,6 +807,10 @@
uni.navigateTo({ url: "/pages/kotra/brand/detail?id=" + that.GoodsId}); uni.navigateTo({ url: "/pages/kotra/brand/detail?id=" + that.GoodsId});
}else if(that.JumpType == 16){//载体详情 }else if(that.JumpType == 16){//载体详情
uni.navigateTo({ url: "/pages/kotra/carrier/detail?id=" + that.GoodsId+'&type='+that.carrierType}); uni.navigateTo({ url: "/pages/kotra/carrier/detail?id=" + that.GoodsId+'&type='+that.carrierType});
}else if(that.JumpType == 17){//教育后台，广告二维码进入
// uni.navigateTo({ url: "/pages/kotra/carrier/detail?id=" + that.GoodsId+'&type='+that.carrierType});
}else if(that.JumpType == 18){//活动详情
uni.navigateTo({ url: "/pages/school/JIaheactivitydetails?Id=" + that.GoodsId});
} }
}, 500); }, 500);
...@@ -1238,8 +1241,8 @@ ...@@ -1238,8 +1241,8 @@
yj(){ yj(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId=123978' // url: '/pages/blindDate/persondetails?UserId=123978'
// url: '/pages/blindDate/personal/IDidentification' url: '/pages/school/personal/bindSalesman'
}) })
} }
......
pages/school/JIaheactivitydetails.vue
View file @ 60dec3b8
...@@ -112,7 +112,8 @@ ...@@ -112,7 +112,8 @@
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
// text-align: center; // text-align: center;
margin-top: 30rpx; margin-top: 40rpx;
margin-bottom: 30rpx;
position: relative; position: relative;
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
border-radius: 4rpx; border-radius: 4rpx;
position: absolute; position: absolute;
left: 0; left: 0;
bottom:5rpx; bottom:-5rpx;
opacity: 0.8; opacity: 0.8;
} }
.pic-name{ .pic-name{
...@@ -199,19 +200,24 @@ ...@@ -199,19 +200,24 @@
background-color: #40766E; background-color: #40766E;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
align-items: center; // align-items: center;
padding: 28rpx; padding: 28rpx;
margin-top: 30rpx;
} }
.jz_TripLeft { .jz_TripLeft {
font-size: 32rpx; width: 80rpx;
white-space: nowrap;
font-size: 30rpx;
font-weight: 500;
margin-right: 20rpx;
} }
.jz_TripRight { .jz_TripRight {
color: #111111; font-size: 30rpx;
font-size: 22rpx; font-weight: 500;
// color: #111111;
// font-size: 22rpx;
} }
.jz_TripLine { .jz_TripLine {
...@@ -370,16 +376,16 @@ ...@@ -370,16 +376,16 @@
<view class="line-bottom"></view> <view class="line-bottom"></view>
</view> </view>
<view class="acdetail_Intro" v-html="richtext"></view> <view class="acdetail_Intro" v-html="richtext"></view>
<view class="title-pic" v-if="richtext"> <view class="title-pic" v-if="detial.ActivityTitleList.length>0">
活动内容 活动内容
<view class="line-bottom"></view> <view class="line-bottom"></view>
</view> </view>
<view class="jz_TripMain"> <view class="jz_TripMain">
<view class="jz_TripLine"></view> <view class="jz_TripLine"></view>
<view v-for="(item,index) in detial.ActivityTitleList" :key="index"> <view v-for="(item,index) in detial.ActivityTitleList" :key="index">
<view class="jz_TripTitle" > <view class="jz_TripTitle" :style="{'margin-top':index===0 ? '10rpx':'40rpx'}">
<view class="jz_TripLeft">{{item.Title}}</view> <view class="jz_TripLeft">第{{index+1}}天</view>
<view class="jz_TripRight"></view> <view class="jz_TripRight">{{item.Title}}</view>
</view> </view>
<view class="jz_RightInner"> <view class="jz_RightInner">
<template v-for="(item2,index2) in item.ActivityPlanList" v-if="item.ActivityPlanList.length>0"> <template v-for="(item2,index2) in item.ActivityPlanList" v-if="item.ActivityPlanList.length>0">
...@@ -510,8 +516,56 @@ ...@@ -510,8 +516,56 @@
pricecolor:'', pricecolor:'',
Id:0, Id:0,
detial:{}, detial:{},
richtext:"" richtext:"",
Up:0
}
},
onShareTimeline() {
// setTimeout(() => {
// console.log("分享朋友圈调用");
// this.getReceive();
// }, 2500);
let uid = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserId : 0;
if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo").SmallShopId :
0;
if (SmallShopId == 0) { //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo").UserSmallShopId : 0;
}
let title = this.detial.ActivityName ? this.detial.ActivityName : '活动详情';
let imageUrl = this.detial.CoverImg ? this.detial.CoverImg:'';
let id = this.Id;
this.Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
return {
title: title,
query: "id=" + this.id + "&user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + this.Up,
imageUrl: imageUrl,
};
},
onShareAppMessage(res) {
// setTimeout(() => {
// console.log("分享好友调用");
// this.getReceive();
// }, 2500);
let u = uni.getStorageSync("mall_UserInfo");
let uid = u.UserId ? u.UserId : 0;
if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0
}
let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
if (SmallShopId == 0) { //如果微店id为0 去找所属微店id
SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0
} }
return {
title: this.detial.ActivityName ? this.detial.ActivityName : '活动详情',
path: "/pages/index/index?id=" + this.Id + "&user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" +
this.Up + '&JumpType=18',
imageUrl: this.detial.CoverImg ? this.detial.CoverImg:''
};
}, },
onLoad(options) { onLoad(options) {
if(options && options.Id){ if(options && options.Id){
......
pages/school/personal/bindSalesman.vue 0 → 100644
View file @ 60dec3b8
<style lang="scss" scoped>
.bindsale {
width: 100%;
height: 100vh;
background-color: #FAFAFA;
.box{
width: 100%;
padding: 0 15px;
}
.box-item{
width: 100%;
margin-top: 40rpx;
}
.box-item-top{
display: flex;
align-items: center;
font-size: 24rpx;
color: #111111;
}
.imgstb{
width: 11px;
height: 15px;
margin-right: 5px;
}
.box-item-b{
width:100%;
height:55px;
border-bottom:1px solid #E2E2E2;
display: flex;
align-items: center;
justify-content: space-between;
input{
margin-left: 15px;
}
}
.yanbtn{
width: 170rpx;
height: 60rpx;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #E2E2E2;
font-size: 24rpx;
color: #40766E;
}
.tijiao{
width: 100%;
height: 40px;
background: #40766E;
border-radius: 4px;
margin-top: 100px;
font-size: 14px;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
}
}
.successStatus{
width: 620rpx;
height: 449rpx;
background-color: #FFF;
margin-top: 60rpx;
box-shadow: 0rpx 6rpx 30rpx 0rpx rgba(139, 115, 64, 0.06);
border-radius: 12rpx;
padding-top: 50rpx;
.info{
margin: 0 auto;
text-align: center;
margin-bottom: 30rpx;
font-family: PingFang SC;
}
.headimg{
width: 140rpx;
height: 140rpx;
border-radius: 50%;
background-color: #eee;
overflow: hidden;
}
.name{
font-size: 40rpx;
font-weight: bold;
color: #111111;
}
.work{
font-size: 22rpx;
font-weight: 500;
}
.department{
width: 140rpx;
height: 40rpx;
background-color: #40766E;
color: #FFFFFF;
border-radius: 8rpx;
line-height: 38rpx;
font-size: 22rpx;
font-weight: 500;
}
.knowBtn{
width: 620rpx;
height: 80rpx;
background-color: #40766E;
border-radius: 8rpx;
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 90rpx;
text-align: center;
line-height: 78rpx;
}
}
</style>
<template>
<div class='bindsale'>
<view class="box" v-if="isBindSell===0">
<view style="font-size: 40rpx;color: #111111;margin-top: 40rpx;">请完成销售绑定验证</view>
<!-- <view style="font-size: 24rpx;color: #999999;margin-top: 20rpx;">请获取验证码进行绑定</view> -->
<view class="box-item" style="margin-top: 70rpx;">
<view class="box-item-top">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Jhdianhua.png" class="imgstb"></image>
<text>账号</text>
</view>
<view class="box-item-b">
<input type="number" v-model="addMsg.EduSellAccount" placeholder="请输入你的账号">
</view>
</view>
<view class="box-item">
<view class="box-item-top">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Jhyanzm.png" class="imgstb"></image>
<text>密码</text>
</view>
<view class="box-item-b" >
<input type="number" password v-model="addMsg.password" placeholder="请输入你的密码">
<!-- <view class="yanbtn" @click="getCode">{{show == true?btntext:daojis}}</view> -->
</view>
</view>
<view class="tijiao" @click="tj()">
提交绑定
</view>
</view>
<view v-if="isBindSell===1" style="width: 100%;display: flex;flex-direction: column;align-items: center;">
<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Jhrenzcg.png" style="width: 300rpx;height: 324rpx;margin-top: 256rpx;"></image> -->
<!-- <text style="font-size: 20px;color: #111111;margin-top: 53px;">验证成功 成为学员</text> -->
<view class="successStatus">
<view class="headimg info">
<image style="width: 100%;height: 100%;" :src="sellInfo.UserIcon" mode="aspectFill"></image>
</view>
<view class="info name">
{{sellInfo.EmployeeName}}
</view>
<view class="info work">
{{sellInfo.PostName}}
</view>
<view class="info department">
{{sellInfo.DeptName}}
</view>
<view class="knowBtn" @click="gbAuth">
我知道了
</view>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
</div>
</template>
<script>
import auth from "@/components/auth/index.vue";
export default {
components: {
auth
},
data() {
return {
showAuth:false,
u:{},
mainColor: '',
addMsg:{
EduSellAccount:'',
password:'',
},
btntext:'获取验证码',
show: true,
count: '',
timer: null,
daojis:'60s',
isAttestationEdu:0,//学员是否认证了 0否1是
isBindSell:0,//是否绑定了销售，0否1是
sellInfo:{}
}
},
onLoad(options) {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
this.getBindStatus()
}
// let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
// this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
let pageTitle = '绑定销售'
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title : [];
pages.forEach((x) => {
if (x.value == u) {
pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: pageTitle,
});
},
methods: {
// getCode(){
// const TIME_COUNT = 60;
// if(this.addMsg.StuTel==''){
// uni.showToast({
// title:'请输入手机号码',
// icon:'none'
// })
// return
// }
// if(this.show==true){
// if (!this.timer) {
// this.getcodedata()//获取验证码
// this.count = TIME_COUNT;
// this.show = false;
// this.timer = setInterval(() => {
// if (this.count > 0 && this.count <= TIME_COUNT) {
// this.count--;
// this.daojis = this.count+'s'
// } else {
// this.show = true;
// clearInterval(this.timer);
// this.timer = null;
// this.btntext = '重新获取'
// this.daojis = '60s'
// }
// }, 1000)
// }
// }else{
// console.log('不能操作')
// }
// },
// getcodedata(){
// this.request2({
// url: '/api/AppletEducation/SendCodeByStudentInfo',
// data: {StuTel:this.addMsg.StuTel}
// },
// res => {
// if (res.resultCode == 1) {
// uni.showToast({
// title:'短信已发送,注意查收！',
// icon:'none'
// })
// }
// },
// error=>{
// this.show = true;
// clearInterval(this.timer);
// this.timer = null;
// this.btntext = '重新获取'
// this.daojis = '60s'
// }
// );
// },
//获取绑定状态
getBindStatus(){
this.request2({
url: '/api/AppletEducation/GetBindEduSellInfo',
data: {}
},
res => {
if (res.resultCode == 1) {
console.log(res)
if(res.data.Id>0){
this.isBindSell=1
this.sellInfo=res.data
}else{
this.isBindSell=0
}
}
},
error=>{
uni.hideLoading()
}
);
},
tj(){
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
uni.showToast({
title:'请登录账号',
icon:'none'
})
return
}
if(this.addMsg.EduSellAccount==''){
uni.showToast({
title:'请输入账号',
icon:'none'
})
return
}
if(this.addMsg.password==''){
uni.showToast({
title:'请输入密码',
icon:'none'
})
return
}
uni.showLoading({
title: '认证中'
});
this.request2({
url: '/api/AppletEducation/GetBindEduSell',
data: this.addMsg
},
res => {
console.log(res)
uni.hideLoading()
if (res.resultCode == 1) {
uni.showToast({
title:res.message,
icon:'none'
})
this.isBindSell = 1;
this.getHome()
}
},
error=>{
uni.hideLoading()
}
);
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.getHome();
this.getBindStatus();
},
//关闭登录窗口
gbAuth(){
uni.navigateBack()
},
getHome(){
this.request2({
url: "/api/Mall/GetHome",
data: {page_id: 0,open_school: 0,StoreId: 0},
},
(res) => {
uni.setStorageSync("basedata", res.data);
let basedata = wx.getStorageSync("basedata")
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
},
(error) => {}
);
},
}
};
</script>
pages/school/picDetail.vue
View file @ 60dec3b8
...@@ -86,13 +86,11 @@ ...@@ -86,13 +86,11 @@
}, },
enlarge(i) { enlarge(i) {
console.log(i)
// 全屏 // 全屏
this.videoContext = uni.createVideoContext('myVideo'+i); this.videoContext = uni.createVideoContext('myVideo'+i);
this.videoContext.requestFullScreen({ this.videoContext.requestFullScreen({
direction:0 direction:0
}) })
console.log(this.videoContext)
}, },
videoControl(e){ videoControl(e){
if(e.detail.fullScreen==false){ if(e.detail.fullScreen==false){
...@@ -141,4 +139,4 @@ ...@@ -141,4 +139,4 @@
width: 100%; width: 100%;
text-align:center; text-align:center;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment