Skip to content

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

1

parent 9b882ed3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 542 additions and 291 deletions
components/auth/index.vue
View file @ ce9f1689
This diff is collapsed.
pages.json
View file @ ce9f1689
......@@ -190,6 +190,8 @@
"root": "pages/share-qrcode",
"pages": [{
"path": "share-qrcode"
},{
"path": "share-select-school"
}]
},
{
......@@ -453,6 +455,8 @@
"path":"jieheactivityBM"//甲鹤活动报名
},{
"path":"personal/JhphoneRz"//电话认证
},{
"path":"picDetail"//相册详情
}]
},
//线下服务
......
pages/index/index.vue
View file @ ce9f1689
......@@ -208,8 +208,9 @@
orderPopup
},
onLoad(options) {
console.log(211,options)
let that = this;
// options = {id:15,JumpType:16,type:'shopping mall'}
// options = {user_id:125459,SmallShopId:0,EduSchoolId:79}
uni.getSystemInfo({
success(res) {
that.titleStyle = {
......@@ -279,6 +280,11 @@
SmallShopId: options.SmallShopId
});
}
if (options && options.EduSchoolId) {
uni.setStorageSync("EduSchoolId", {
EduSchoolId: options.EduSchoolId
});
}
//从其他小程序跳转过来
if (options && options.CounponPassword) {//小程序的来自
uni.setStorageSync("CounponPassword", {
......@@ -643,7 +649,7 @@
0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
let KeyWord = uni.getStorageSync("KeyWord") ? uni.getStorageSync("KeyWord").KeyWord : '';
let EduSchoolId = uni.getStorageSync("EduSchoolId") ? uni.getStorageSync("EduSchoolId").EduSchoolId : 0;
that.request2({
url: "/api/AppletLogin/Login",
data: {
......@@ -657,6 +663,7 @@
UserPageType: Up,
CounponPassword:CounponPassword,
KeyWord:KeyWord,
EduSchoolId:EduSchoolId,
},
},
(res) => {
......@@ -672,6 +679,7 @@
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
uni.removeStorageSync("KeyWord");
uni.removeStorageSync("EduSchoolId");
that.getPageType()
if (res.data.IsOpenSchool == 1) { //校园开启
that.init()
......
pages/school/JIaheactivitydetails.vue
View file @ ce9f1689
......@@ -106,6 +106,73 @@
background: #CCCCCC;
}
}
.title-pic{
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 800;
color: #111111;
text-align: center;
margin-top: 30rpx;
}
.pic-name{
margin-bottom: 30rpx;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.video-box{
display: flex;
flex-wrap: wrap;
& .pic-box:nth-child(3n){
margin-right: 0 !important;
}
.pic-box{
width: 222rpx;
height: 300rpx;
border-radius: 12rpx;
margin: 0 10rpx 30rpx 0;
.oneimg{
width: 222rpx;
height: 222rpx;
border-radius: 12rpx;
border: 1rpx solid #EEEEEE;
}
.fourimg-box{
width: 222rpx;
height: 222rpx;
border-radius: 12rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-content: space-between;
border: 1rpx solid #EEEEEE;
.fourimg{
width: 105rpx;
height:105rpx;
border-radius: 11rpx;
// background-color: #000000;
}
}
.item-name{
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
.item-num{
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #666666;
}
}
}
</style>
<template>
<view class="Jiaheactivitydetails">
......@@ -175,6 +242,50 @@
</view>
<view style="width: 100%;padding: 15px;margin-bottom: 150rpx;">
<view class="acdetail_Intro" v-html="richtext"></view>
<view class="title-pic" v-if="detial.FileGroup.length>0">
活动相册
</view>
<view class="pic-name" v-if="detial.FileGroup[0]">
视频
</view>
<view class="video-box">
<view v-for="(item,index) in detial.FileGroup[0].groupList" :key="index" class="pic-box" @click="goPicDetail(item.FileList)">
<image class="oneimg" :src="item.FileList[0].Path" mode="aspectFill" v-if="item.FileList.length<4" ></image>
<view class="fourimg-box" v-if="item.FileList.length>=4" >
<div v-for="(_item,_index) in item.FileList" :key="_item.id" class="subpic-box" v-if="_index<=3">
<!-- {{_item.Path}} -->
<image class="fourimg" :src="_item.Path" mode="aspectFill" ></image>
</div>
</view>
<view class="item-name">
{{item.Name}}
</view>
<view class="item-num">
{{item.FileList.length}}
</view>
</view>
</view>
<view class="pic-name" v-if="detial.FileGroup[1]">
图片
</view>
<view class="video-box">
<view v-for="(item,index) in detial.FileGroup[1].groupList" :key="index" class="pic-box" @click="goPicDetail(item.FileList)">
<image class="oneimg" :src="item.FileList[1].Path" mode="aspectFill" v-if="item.FileList.length<4" ></image>
<view class="fourimg-box" v-if="item.FileList.length>=4" >
<div v-for="(_item,_index) in item.FileList" :key="_item.id" class="subpic-box" v-if="_index<=3">
<image class="fourimg" :src="_item.Path" mode="aspectFill" ></image>
</div>
</view>
<view class="item-name">
{{item.Name}}
</view>
<view class="item-num">
{{item.FileList.length}}
</view>
</view>
</view>
</view>
<view class="positionb">
......@@ -206,10 +317,11 @@
</view>
<view v-if="detial.IsJoinActivity==1">
<view class="btnc" v-if="detial.IsSignUp==1">已报名</view>
</view>
</view>
</view>
</view>
</template>
......@@ -239,6 +351,11 @@
});
},
methods:{
goPicDetail(arr){
uni.navigateTo({
url:"/pages/school/picDetail?data=" + encodeURIComponent(JSON.stringify({data:arr}))
})
},
GetActivityDetial(){
this.request2({
url: '/api/AppletEducation/GetActivityDetial',
......
pages/school/Jiaheactivity.vue
View file @ ce9f1689
......@@ -133,14 +133,15 @@
<view class="box-top">
<view style="display: flex;">
<view class="box-t-item" :class="{currentStyle:current == 1}" @click="listType(1)">即将开始</view>
<view class="box-t-item" :class="{currentStyle:current == 3}" @click="listType(3)">已结束</view>
<view class="box-t-item" :class="{currentStyle:current == 2}" @click="listType(2)">正在参加</view>
</view>
<view class="box-top-r" @click="show=true" v-if="current == 1">
<view class="box-top-r" @click="show=true" >
<text class="box-top-r-text">{{ActivityName}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/salesxiala.png" style="width: 17px;height: 17px;margin-left: 7px;"></image>
</view>
</view>
<view v-show="current==1">
<view v-show="current==1||current==3">
<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
<view v-if=" g.length>0"
class="scroll-box"
......@@ -273,6 +274,7 @@
pageIndex: 1,
pageSize: 10,
ActivityType: 0,
SelectIsEnd:0
},
ActivityName:'',
page_count: 1,
......@@ -346,6 +348,9 @@
if (res.resultCode == 1) {
let data = this.groupArr(res.data.pageData,'MonthStr');
let data2 = data
if( this.msg.pageIndex===1){
this.g=[]
}
if(this.g.length>0){
data2.forEach(x=>{
if(x.Day == this.g[this.g.length-1].Day){//判断当前第一条数据和已有的是否同一天 放在一起
......@@ -355,7 +360,10 @@
}
})
}
this.g = this.g.concat(data);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
......@@ -413,8 +421,17 @@
},
listType(type){
this.current = type;
if(type==3){
this.msg.SelectIsEnd=1
this.msg.pageIndex=1;
this.init()
}else{
this.msg.SelectIsEnd=0
}
if(type==1){//TODO 暂时不知道接口
this.msg.pageIndex=1;
this.msg.SelectIsEnd=0
this.init()
}else{
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
......
pages/share-qrcode/share-qrcode.vue
View file @ ce9f1689
<template>
<view class="qrcodeStyle" :style="{'height':contentHeight}">
<u-top-tips ref="uTips"></u-top-tips>
<img :src="tempPic" mode="widthFix" style="width: 320px;margin-top: 20px;" />
......@@ -7,6 +8,7 @@
<Text>保存图片分享赚钱</Text>
</view>
</view>
</template>
<script>
......@@ -21,6 +23,8 @@
UserInfo: '',
tempPic: '',
type: 1,
EduSchoolId: 0,
AppletID: 0, //判断是否是甲鹤小程序value：5
}
},
created() {
......@@ -31,6 +35,9 @@
},
onLoad(options) {
console.log(options, 'options')
if (options.schoolId) {
this.EduSchoolId = options.schoolId
}
if (options && options.type) {
this.type = options.type
if (this.type == 1) {
......@@ -44,12 +51,12 @@
}
this.init()
}
let basedata = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata") : '';
this.AppletID = basedata.home_pages.id ? basedata.home_pages.id : 0;
console.log(56, this.AppletID)
},
onReady() {
},
mounted() {
},
methods: {
init() {
......@@ -87,15 +94,39 @@
if (SmallShopId == 0) {
SmallShopId = that.UserInfo.UserSmallShopId ? that.UserInfo.UserSmallShopId : 0;
}
if (that.AppletID == 5) {
that.request2({
url: '/api/AppletUser/GetWeiXinQRCodeForAppletSchool',
data: {
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' +
SmallShopId + '&EduSchoolId=' + this.EduSchoolId,
With: that.qrcode.QrCodeSize,
EduSchoolId: that.EduSchoolId,
}
},
(res) => {
console.log(103,this.EduSchoolId)
uni.hideNavigationBarLoading()
that.fenxqrcode = that.host2 + res.data;
console.log(that.fenxqrcode)
let tmpTimeout = setTimeout(() => {
that.drawCtx();
clearTimeout(tmpTimeout)
}, 100)
}
);
} else {
if (that.type == 1) {
that.request2({
url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: {
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId,
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' +
SmallShopId + '&EduSchoolId=' + this.EduSchoolId,
With: that.qrcode.QrCodeSize,
}
},
(res) => {
// console.log(103,this.EduSchoolId)
uni.hideNavigationBarLoading()
that.fenxqrcode = that.host2 + res.data;
// that.fenxqrcode = 'https://mallapi.oytour.com/upfile/temporary/864369a3-8da8-4735-bcc8-a2dfe5c6f357.jpg'
......@@ -110,7 +141,8 @@
that.request2({
url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: {
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId + '&Up=2',
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' +
SmallShopId + '&Up=2' + '&EduSchoolId=' + this.EduSchoolId,
With: that.qrcode.QrCodeSize,
}
},
......@@ -125,6 +157,8 @@
}
);
}
}
},
drawCtx() {
uni.showLoading({
......@@ -149,10 +183,13 @@
ctx.save(); // 先保存状态 已便于画完圆再用
ctx.beginPath(); //开始绘制
//先画个圆
ctx.arc(that.qrcode.HeadSize / 2 + that.qrcode.HeadPaddingLeft, that.qrcode.HeadSize / 2 + that.qrcode.HeadPaddingTop,
ctx.arc(that.qrcode.HeadSize / 2 + that.qrcode.HeadPaddingLeft,
that.qrcode.HeadSize / 2 + that.qrcode.HeadPaddingTop,
that.qrcode.HeadSize / 2, 0, Math.PI * 2, false);
ctx.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
ctx.drawImage(image.path, that.qrcode.HeadPaddingLeft, that.qrcode.HeadPaddingTop, that.qrcode.HeadSize,
ctx
.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
ctx.drawImage(image.path, that.qrcode.HeadPaddingLeft, that
.qrcode.HeadPaddingTop, that.qrcode.HeadSize,
that.qrcode.HeadSize); //绘制头像
ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 可以继续绘制
if (that.qrcode.IsShowQrCode == 0) { //二维码
......@@ -162,12 +199,22 @@
src: that.fenxqrcode,
success: function(image) {
if (that.qrcode.QrCodeType == 0) {
ctx.arc(that.qrcode.QrCodeSize / 2 + that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodeSize / 2 +
that.qrcode.QrCodePaddingTop, that.qrcode.QrCodeSize / 2, 0, Math.PI * 2, false);
ctx.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
}
ctx.drawImage(image.path, that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodePaddingTop, that.qrcode
.QrCodeSize, that.qrcode.QrCodeSize); //绘制二维码
ctx.arc(that.qrcode.QrCodeSize /
2 + that.qrcode
.QrCodePaddingLeft, that
.qrcode.QrCodeSize / 2 +
that.qrcode
.QrCodePaddingTop, that
.qrcode.QrCodeSize / 2, 0,
Math.PI * 2, false);
ctx
.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
}
ctx.drawImage(image.path, that.qrcode
.QrCodePaddingLeft, that.qrcode
.QrCodePaddingTop, that.qrcode
.QrCodeSize, that.qrcode
.QrCodeSize); //绘制二维码
that.drawQrCode(ctx)
},
});
......@@ -183,11 +230,17 @@
src: that.fenxqrcode,
success: function(image) {
if (that.qrcode.QrCodeType == 0) {
ctx.arc(that.qrcode.QrCodeSize / 2 + that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodeSize / 2 + that.qrcode
.QrCodePaddingTop, that.qrcode.QrCodeSize / 2, 0, Math.PI * 2, false);
ctx.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
}
ctx.drawImage(image.path, that.qrcode.QrCodePaddingLeft, that.qrcode.QrCodePaddingTop, that.qrcode.QrCodeSize,
ctx.arc(that.qrcode.QrCodeSize / 2 + that.qrcode
.QrCodePaddingLeft, that.qrcode.QrCodeSize /
2 + that.qrcode
.QrCodePaddingTop, that.qrcode.QrCodeSize / 2,
0, Math.PI * 2, false);
ctx
.clip(); //画了圆 再剪切 原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则所有之后的绘图都会被限制在被剪切的区域内
}
ctx.drawImage(image.path, that.qrcode.QrCodePaddingLeft,
that.qrcode.QrCodePaddingTop, that.qrcode
.QrCodeSize,
that.qrcode.QrCodeSize); //绘制二维码
that.drawQrCode(ctx)
},
......@@ -267,9 +320,18 @@
success: (res) => {
if (res.confirm) {
uni.openSetting({
success: (res) => {
console.log(res);
if (res.authSetting['scope.writePhotosAlbum']) {
success: (
res
) => {
console
.log(
res
);
if (res
.authSetting[
'scope.writePhotosAlbum'
]
) {
that.preservation()
}
}
......
pages/share/index/index.vue
View file @ ce9f1689
......@@ -183,13 +183,13 @@
</view>
</view>
<view class="sharebox_menus" v-if="UserPageType.UserPageType!=2">
<view class="menus_item" @click="goUrl('/pages/share-qrcode/share-qrcode',1)">
<!-- <view class="menus_item" @click="goUrl('/pages/share-qrcode/share-qrcode',1)"> -->
<view class="menus_item" @click="goUrl('/pages/share-qrcode/share-select-school')">
<view style="display: flex;flex-direction: row;align-items: center;">
<image :src="sharedata.CustomModel.PromoteQRCodeImage" style="width: 14px;height: auto;" mode='widthFix'></image>
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">{{sharedata.CustomModel.PromoteQRCodeName}}</text>
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">{{sharedata.CustomModel.PromoteQRCodeName}}</text><!--推广二维码-->
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
</view>
</view>
......
pages/user-center/user-center.vue
View file @ ce9f1689
......@@ -417,6 +417,7 @@
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
let KeyWord = uni.getStorageSync("KeyWord") ? uni.getStorageSync("KeyWord").KeyWord : '';
let EduSchoolId = uni.getStorageSync("EduSchoolId") ? uni.getStorageSync("EduSchoolId").EduSchoolId : 0;
that.request2({
url: '/api/AppletLogin/Login',
data: {
......@@ -430,6 +431,7 @@
UserPageType: Up,
CounponPassword:CounponPassword,
KeyWord:KeyWord,
EduSchoolId:EduSchoolId,
}
},
res => {
......@@ -440,6 +442,7 @@
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
uni.removeStorageSync("KeyWord");
uni.removeStorageSync("EduSchoolId");
}
}
);
......
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