Skip to content

M
mallapp
Commit 0f0ff7c6 authored by 吴春's avatar 吴春
Browse files
Options

11

parents ffdf1cc2 7d86f027
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2074 additions and 1999 deletions
components/auth/index.vue
View file @ 0f0ff7c6
<template> <template>
<!-- v-if="setting&&setting.is_show_auth==1" -->
<div class="auth-page"> <div class="auth-page">
<u-popup <u-popup
v-model="showDialog" v-model="showDialog"
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
v-if="AppConfig.TenantId!=18" v-if="AppConfig.TenantId!=18"
@tap="showLogin == true ? getUserProfile() : ''" @tap="showLogin == true ? getUserProfile() : ''"
></button> ></button>
<button v-else <button v-else
:style="sureStyle" :style="sureStyle"
class="hotsopt" class="hotsopt"
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
AppConfig:{ AppConfig:{
TenantId:0 TenantId:0
}, },
setting: {},
}; };
}, },
created() { created() {
...@@ -78,6 +79,9 @@ export default { ...@@ -78,6 +79,9 @@ export default {
let y = this.pageinfo.hotspot_cancel; let y = this.pageinfo.hotspot_cancel;
this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`; this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`; this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
let set = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting : {};
this.setting = set;
}, },
methods: { methods: {
//授权获取手机号码 //授权获取手机号码
...@@ -209,6 +213,7 @@ export default { ...@@ -209,6 +213,7 @@ export default {
if (res.resultCode == 1) { if (res.resultCode == 1) {
obj.OpenId = res.data; obj.OpenId = res.data;
that.getLogin(obj); that.getLogin(obj);
} }
} }
); );
...@@ -289,7 +294,31 @@ export default { ...@@ -289,7 +294,31 @@ export default {
//不是相亲模式的时候去更新头像和昵称 //不是相亲模式的时候去更新头像和昵称
that.updateuserinfo(that.msg); //更新用户头像 that.updateuserinfo(that.msg); //更新用户头像
} }
if(uni.getStorageSync('jzTravelOpenId')){
that.SetMemberBindCustomer()
}
}
}
);
},
SetMemberBindCustomer(){
let that = this;
that.request2({
url: "/api/MemberUser/SetMemberBindCustomer",
data: {
Id: that.msg.Id,
CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
},
},
(res) => {
if (res.resultCode == 1) {
uni.removeStorageSync('jzTravelOpenId');
} }
},(err) => {
// uni.showToast({
// title: err.message,
// icon: "none",
// });
} }
); );
}, },
......
components/miaiactivityCustom/style5.vue
View file @ 0f0ff7c6
<template> <template>
<view style="width:100%;padding: 12px;" :style="{ <view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
}"> }">
<view class="her_Two_study" :style="{ <view class="her_Two_study" :style="{
'padding-top':goodsInfo.PaddingTop+'px', 'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px', 'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px' 'padding-left':goodsInfo.PaddingLeft+'px'
}"> }">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" style="margin-right:30rpx" @click="openGood(item)"> <view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" style="margin-right:30rpx" @click="openGood(item)">
<view :class="{'img-box2':(!item.name||item.name==''),'img-box':(item.name&&item.name!='')}" :style="{'background-color': goodsInfo.backgroundColor}"> <view :class="{'img-box2':(!item.name||item.name==''),'img-box':(item.name&&item.name!='')}" :style="{'background-color': goodsInfo.backgroundColor}">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" :style="{'background-color': goodsInfo.backgroundColor}" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" :style="{'background-color': goodsInfo.backgroundColor}" />
</view> </view>
<view class="good-info" v-if="item.name && item.name!=''"> <view class="good-info" v-if="item.name && item.name!=''">
<view class="good-name">{{ item.name }}</view> <view class="good-name">{{ item.name }}</view>
<view style="width: 150px;"> <view style="width: 150px;">
<view class="style_five_label" <view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex"> :style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}} {{subItem}}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view> </view>
</template> </template>
<script> <script>
import auth from '@/components/auth/index.vue'; import auth from '@/components/auth/index.vue';
export default { export default {
components: { components: {
auth auth
}, },
props: ['goodsInfo'], props: ['goodsInfo'],
data() { data() {
return { return {
mainColor: '', mainColor: '',
showAuth: false, showAuth: false,
u: {}, u: {},
}; };
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted(){ mounted(){
}, },
methods: { methods: {
openGood(item) { openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) { if (item.linkUrl) {
uni.navigateTo({ uni.navigateTo({
url: item.linkUrl, url: item.linkUrl,
}); });
} }
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false; // this.showAuth = false;
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth() { gbAuth() {
this.showAuth = false; this.showAuth = false;
} }
} }
}; };
</script> </script>
<style> <style>
.good-five-stydy { .good-five-stydy {
position: relative; position: relative;
margin-bottom: 14px; margin-bottom: 14px;
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
padding: 0 1px 1px 0; padding: 0 1px 1px 0;
width:600px; width:600px;
} }
.good-five-stydy:last-child{ .good-five-stydy:last-child{
margin-bottom:0!important; margin-bottom:0!important;
} }
.good-five-stydy .img-box { .good-five-stydy .img-box {
width: 300rpx; width: 300rpx;
height: 100px; height: 100px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-five-stydy .img-box2 { .good-five-stydy .img-box2 {
width: 300rpx; width: 300rpx;
height: 100px; height: 100px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
margin-right: 12px; margin-right: 12px;
} }
.good-five-stydy .good-info { .good-five-stydy .good-info {
height: 100px; height: 100px;
padding: 0 12px ; padding: 0 12px ;
flex: 1; flex: 1;
border: 10rpx; border: 10rpx;
padding-bottom: 0; padding-bottom: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
/* width:20%; */ /* width:20%; */
} }
.good-five-stydy .good-info .good-name { .good-five-stydy .good-info .good-name {
font-size: 13px; font-size: 13px;
margin-bottom:5px; margin-bottom:5px;
white-space:pre-wrap; white-space:pre-wrap;
overflow: hidden; overflow: hidden;
...@@ -121,41 +121,45 @@ ...@@ -121,41 +121,45 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
width:300rpx; width:300rpx;
} }
.good-five-stydy .good-info .good-price-info { .good-five-stydy .good-info .good-price-info {
display: flex; display: flex;
justify-items: center; justify-items: center;
align-items: flex-end; align-items: flex-end;
height: 22px; height: 22px;
flex: 1; flex: 1;
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.good-five-stydy .good-info .good-price-info .price { .good-five-stydy .good-info .good-price-info .price {
color: #999999; color: #999999;
flex: 1; flex: 1;
font-size: 14px; font-size: 14px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.good-five-stydy .good-info .good-price-info .buy { .good-five-stydy .good-info .good-price-info .buy {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; } .her_Two_study {
.style_five_label{ overflow-x: auto !important;
float:left; display: flex;
padding: 0px 5px; white-space: nowrap;
}
.style_five_label{
float:left;
padding: 0px 5px;
border-radius: 2px; border-radius: 2px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
font-size: 10px; font-size: 10px;
color: #FAF8F9; color: #FAF8F9;
margin:0 5px 5px 0; margin:0 5px 5px 0;
} }
</style> </style>
components/studyArticle/style5.vue
View file @ 0f0ff7c6
<template> <template>
<view style="width:100%;padding: 12px;" :style="{ <view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
}"> }">
<view class="her_Two_study" :style="{ <view class="her_Two_study" :style="{
'padding-top':goodsInfo.PaddingTop+'px', 'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px', 'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px' 'padding-left':goodsInfo.PaddingLeft+'px'
}"> }">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)"> <view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)">
<view class="img-box"> <view class="img-box">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view> <view class="good-name" v-if="item.name">{{ item.name }}</view>
<view style="width: 130px;"> <view style="width: 130px;">
<view class="style_five_label" <view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex"> :style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}} {{subItem}}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'; import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue'; import auth from '@/components/auth/index.vue';
export default { export default {
components: { components: {
auth auth
}, },
props: ['goodsInfo'], props: ['goodsInfo'],
data() { data() {
return { return {
mainColor: '', mainColor: '',
showAuth: false, showAuth: false,
u: {}, u: {},
}; };
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted(){ mounted(){
}, },
methods: { methods: {
openGood(item) { openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync('mall_UserInfo');
uni.navigateTo({ url: "/pages/school/articleDetails?ID=" + item.id }); uni.navigateTo({ url: "/pages/school/articleDetails?ID=" + item.id });
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false; // this.showAuth = false;
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth() { gbAuth() {
this.showAuth = false; this.showAuth = false;
} }
} }
}; };
</script> </script>
<style> <style>
.good-five-stydy { .good-five-stydy {
position: relative; position: relative;
margin-bottom: 14px; margin-bottom: 14px;
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
padding: 0 1px 1px 0; padding: 0 1px 1px 0;
width:600px; width:600px;
} }
.good-five-stydy:last-child{ .good-five-stydy:last-child{
margin-bottom:0!important; margin-bottom:0!important;
} }
.good-five-stydy .img-box { .good-five-stydy .img-box {
width: 110px; width: 110px;
height: 70px; height: 70px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-five-stydy .good-info { .good-five-stydy .good-info {
height: 70px; height: 70px;
padding: 0 12px ; padding: 0 12px ;
flex: 1; flex: 1;
border: 10rpx; border: 10rpx;
padding-bottom: 0; padding-bottom: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
/* width:20%; */ /* width:20%; */
} }
.good-five-stydy .good-info .good-name { .good-five-stydy .good-info .good-name {
font-size: 13px; font-size: 13px;
margin-bottom:5px; margin-bottom:5px;
white-space:pre-wrap; white-space:pre-wrap;
overflow: hidden; overflow: hidden;
...@@ -110,41 +110,45 @@ ...@@ -110,41 +110,45 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
width:130px; width:130px;
} }
.good-five-stydy .good-info .good-price-info { .good-five-stydy .good-info .good-price-info {
display: flex; display: flex;
justify-items: center; justify-items: center;
align-items: flex-end; align-items: flex-end;
height: 22px; height: 22px;
flex: 1; flex: 1;
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.good-five-stydy .good-info .good-price-info .price { .good-five-stydy .good-info .good-price-info .price {
color: #999999; color: #999999;
flex: 1; flex: 1;
font-size: 14px; font-size: 14px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.good-five-stydy .good-info .good-price-info .buy { .good-five-stydy .good-info .good-price-info .buy {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; } .her_Two_study {
.style_five_label{ overflow-x: auto !important;
float:left; display: flex;
padding: 0px 5px; white-space: nowrap;
}
.style_five_label{
float:left;
padding: 0px 5px;
border-radius: 2px; border-radius: 2px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
font-size: 10px; font-size: 10px;
color: #FAF8F9; color: #FAF8F9;
margin:0 5px 5px 0; margin:0 5px 5px 0;
} }
</style> </style>
pages.json
View file @ 0f0ff7c6
This diff is collapsed.
pages/blindDate/personal/peoplescreen.vue
View file @ 0f0ff7c6
This diff is collapsed.
pages/cart/cart.vue
View file @ 0f0ff7c6
...@@ -9,13 +9,12 @@ ...@@ -9,13 +9,12 @@
"> ">
<Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text> <Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text>
<Text class="grid-text" <Text class="grid-text"
v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text> v-if='IsEducation==1'>共{{list[0]&&list[0].GoodsList&&list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text> <Text @click="edit" v-if="editType == false && list[0]&&list[0].GoodsList&&list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text> <Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
</view> </view>
<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view> <view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
<u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty> <u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty>
<view v-if="list.length > 0" <view v-if="list.length > 0"
style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;"> style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
...@@ -77,7 +76,7 @@ ...@@ -77,7 +76,7 @@
<view class="The-title"> <view class="The-title">
{{ item.GoodsName}} {{ item.GoodsName}}
</view> </view>
<view v-if="item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()"> <view v-if="item.EduData&&item.EduData.ClassCondition&&item.EduData.ClassCondition.length>0" class="limit" @touchstart="mouseover()" @touchend="mouseLeave()">
<u-icon name="lock" size="44" :color="mc" /> <u-icon name="lock" size="44" :color="mc" />
<view class="limit-box" v-show="limitShow"> <view class="limit-box" v-show="limitShow">
此课程有报名限制，请点击详情查看 此课程有报名限制，请点击详情查看
...@@ -113,7 +112,7 @@ ...@@ -113,7 +112,7 @@
<!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;"> <!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
上课时间:{{item.EduData.ClassTime}} 上课时间:{{item.EduData.ClassTime}}
</Text> --> </Text> -->
<view v-if="item.EduData.ClassTimeList.length>0&&u.TenantId==27" <view v-if="item.EduData&&item.EduData.ClassTimeList&&item.EduData.ClassTimeList.length>0&&u.TenantId==27"
style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;"> style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
<view v-if="!item.show"> <view v-if="!item.show">
<view style='display: flex; <view style='display: flex;
......
pages/coupon/cards/carddetailed.vue
View file @ 0f0ff7c6
<style> <style>
.cardsdStyle .mingxilist{ .cardsdStyle .mingxilist{
margin-top: 15px; margin-top: 15px;
display: flex; display: flex;
width: 100%; width: 100%;
justify-content: space-between; justify-content: space-between;
padding: 0 15px; padding: 0 15px;
} }
.mingxilist-l{ .mingxilist-l{
width: calc(100vw - 60rpx - 30px - 50px); width: calc(100vw - 60rpx - 30px - 50px);
font-size: 15px; font-size: 15px;
color: #000000; color: #000000;
} }
.mingxilist-r{ .mingxilist-r{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-end; align-items: flex-end;
font-size: 15px; font-size: 15px;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
</style> </style>
<template> <template>
<view class="cardsdStyle" :style="{ height: contentHeight }"> <view class="cardsdStyle" :style="{ height: contentHeight }">
<u-empty v-if="g.length == 0" text="暂无相关数据" mode="coupon"></u-empty> <u-empty v-if="g.length == 0" text="暂无相关数据" mode="coupon"></u-empty>
...@@ -35,19 +35,19 @@ ...@@ -35,19 +35,19 @@
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
:style="{ height: '100%' }"> :style="{ height: '100%' }">
<view class="couponList"> <view class="couponList">
<view class="mingxilist" v-for="(x, i) in g" :key="i" > <view class="mingxilist" v-for="(x, i) in g" :key="i" >
<view class="mingxilist-l"> <view class="mingxilist-l">
<view class="oneText" style="text-align: left;">{{x.Remarks}}</view> <view class="oneText" style="text-align: left;">{{x.Remarks}}</view>
<view style="font-size: 12px;color: #BCBCBC;">{{x.CreateDate}}</view> <view style="font-size: 12px;color: #BCBCBC;">{{x.CreateDate}}</view>
</view> </view>
<view class="mingxilist-r"> <view class="mingxilist-r">
<view v-if="x.Type== 1" :style="{color:mainColor}">+{{x.Surplus - x.Balance}}</view> <view v-if="x.Type== 1" :style="{color:mainColor}">+{{x.Surplus - x.Balance}}</view>
<view v-if="x.Type== 2" >-{{x.Balance-x.Surplus}}</view> <view v-if="x.Type== 2" >-{{x.Balance-x.Surplus}}</view>
<!-- <view style="font-size: 12px;color: #F44235;font-weight: normal;"> <!-- <view style="font-size: 12px;color: #F44235;font-weight: normal;">
{{x.Remarks}} {{x.Remarks}}
</view> --> </view> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
OldDepositBuyId:0, OldDepositBuyId:0,
}, },
page_count: 1, page_count: 1,
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
}; };
}, },
...@@ -117,9 +117,9 @@ ...@@ -117,9 +117,9 @@
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
onLoad: function(option) { onLoad: function(option) {
if(option && option.ID){ if(option && option.ID){
this.msg.OldDepositBuyId= option.ID this.msg.OldDepositBuyId= option.ID
} }
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
...@@ -143,9 +143,9 @@ ...@@ -143,9 +143,9 @@
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.loading = false; this.loading = false;
res.data.pageData.forEach(x=>{ res.data.pageData.forEach(x=>{
x.ischecked = false x.ischecked = false
}) })
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
} }
} }
); );
}, },
lower(e) { lower(e) {
if (this.msg.pageIndex < this.page_count) { if (this.msg.pageIndex < this.page_count) {
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
}, },
}, },
}; };
...@@ -212,4 +212,4 @@ ...@@ -212,4 +212,4 @@
border-radius: 12rpx; border-radius: 12rpx;
overflow: hidden; overflow: hidden;
} }
</style> </style>
pages/coupon/cards/list.vue
View file @ 0f0ff7c6
This diff is collapsed.
pages/coupon/cards/purchase.vue
View file @ 0f0ff7c6
<style> <style>
.salesvolume { .salesvolume {
background: #FFF; background: #FFF;
font-family: aa; font-family: aa;
} }
.salesvolume .headStatus { .salesvolume .headStatus {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
width: 140vw; width: 140vw;
padding-right: 40vw; padding-right: 40vw;
padding-bottom: 10px; padding-bottom: 10px;
position: fixed; position: fixed;
left: 0; left: 0;
right: 0; right: 0;
top: 0; top: 0;
display: flex; display: flex;
background: #FFFFFF; background: #FFFFFF;
} }
.salesvolume .headStatus .arrow { .salesvolume .headStatus .arrow {
height: 24px; height: 24px;
margin: 5px 10px; margin: 5px 10px;
width: 24px; width: 24px;
} }
.salesvolume .headStatus .title { .salesvolume .headStatus .title {
font-size: 16px; font-size: 16px;
color: #000; color: #000;
flex: 1; flex: 1;
width: 1px; width: 1px;
margin-left: 10px; margin-left: 10px;
line-height: 34px; line-height: 34px;
} }
.salesvolume .sharebox_top { .salesvolume .sharebox_top {
width: 100%; width: 100%;
height: 316rpx; height: 316rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
background: linear-gradient(90deg, #F89A60, #E38358); background: linear-gradient(90deg, #F89A60, #E38358);
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.salesvolume .sharebox_top .sharebox_top_nav { .salesvolume .sharebox_top .sharebox_top_nav {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
line-height: 34px; line-height: 34px;
padding: 0 10px; padding: 0 10px;
} }
.top-nav-c{ .top-nav-c{
width: 690rpx; width: 690rpx;
...@@ -144,30 +144,30 @@ ...@@ -144,30 +144,30 @@
font-weight: bold; font-weight: bold;
} }
</style> </style>
<template> <template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;"> <scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
<view class="salesvolume"> <view class="salesvolume">
<view class="headStatus" v-if="scrollTop > 50" :style="[ <view class="headStatus" v-if="scrollTop > 50" :style="[
headStyle, headStyle,
{ {
zIndex: scrollTop < 10 ? 'unset' : 2, zIndex: scrollTop < 10 ? 'unset' : 2,
opacity: scrollTop < 10 ? '100' : scrollTop, opacity: scrollTop < 10 ? '100' : scrollTop,
},]"> },]">
<view class="arrow" @click="redirectPrev"> <view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#000"></u-icon> <u-icon name="arrow-left" size="48" color="#000"></u-icon>
</view> </view>
<view class="title" v-if="scrollTop > 50">{{pageTitle}}</view> <view class="title" v-if="scrollTop > 50">{{pageTitle}}</view>
</view> </view>
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<view class="sharebox_top"> <view class="sharebox_top">
<view class="sharebox_top_nav" :style="{paddingTop:nav+'px'}"> <view class="sharebox_top_nav" :style="{paddingTop:nav+'px'}">
<view class="arrow" @click="redirectPrev"> <view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#fff"></u-icon> <u-icon name="arrow-left" size="48" color="#fff"></u-icon>
</view> </view>
<view class="title" style="color: #FFFFFF;font-size: 16px;">{{pageTitle}}</view> <view class="title" style="color: #FFFFFF;font-size: 16px;">{{pageTitle}}</view>
<view style="width: 24px;height: 24px;"></view> <view style="width: 24px;height: 24px;"></view>
</view> </view>
<view class="top-nav-c"> <view class="top-nav-c">
<view> <view>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<u-icon name="arrow" color="#B65646" size="30" ></u-icon> <u-icon name="arrow" color="#B65646" size="30" ></u-icon>
</view> </view>
</view> </view>
<image src="../../../static/images/icon/card-bottom.png" style="width: 100%;height: 13px;position: absolute;left: 0;bottom: 0;"></image> <image src="../../../static/images/icon/card-bottom.png" style="width: 100%;height: 13px;position: absolute;left: 0;bottom: 0;"></image>
</view> </view>
<view class="goumai"> <view class="goumai">
<view style="display: flex;"> <view style="display: flex;">
...@@ -224,32 +224,32 @@ ...@@ -224,32 +224,32 @@
</view> --> </view> -->
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-modal v-model="show" :content="content" :show-cancel-button='true' @confirm='queren'></u-modal> <u-modal v-model="show" :content="content" :show-cancel-button='true' @confirm='queren'></u-modal>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth>
</scroll-view> </scroll-view>
</template> </template>
<script> <script>
import auth from "../../../components/auth/index.vue"; import auth from "../../../components/auth/index.vue";
export default { export default {
components: { components: {
auth auth
}, },
data() { data() {
return { return {
pageTitle: "储蓄卡", pageTitle: "储蓄卡",
show:false, show:false,
mainColor: "", mainColor: "",
showAuth: false, showAuth: false,
U: {}, U: {},
headStyle: {}, headStyle: {},
scrollTop: 0, scrollTop: 0,
nav: 0, nav: 0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
...@@ -265,12 +265,12 @@ ...@@ -265,12 +265,12 @@
orderInfo:{}, orderInfo:{},
balanceList:[],//流水列表 balanceList:[],//流水列表
AllUseDeposit:{},//基础资料 AllUseDeposit:{},//基础资料
type:0,//是否是从领取页面过来的 type:0,//是否是从领取页面过来的
} }
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.nav = uni.getMenuButtonBoundingClientRect().top; this.nav = uni.getMenuButtonBoundingClientRect().top;
this.headStyle.paddingTop = this.nav + 'px'; this.headStyle.paddingTop = this.nav + 'px';
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
...@@ -284,13 +284,13 @@ ...@@ -284,13 +284,13 @@
this.getdetailed()//明细 this.getdetailed()//明细
this.getxq()//详情 this.getxq()//详情
} }
}, },
onLoad(options) { onLoad(options) {
if(options && options.type){ if(options && options.type){
this.type = options.type this.type = options.type
} }
}, },
methods: { methods: {
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
...@@ -306,13 +306,13 @@ ...@@ -306,13 +306,13 @@
goxuanze(x){ goxuanze(x){
this.Paymsg.DepositId = x.ID this.Paymsg.DepositId = x.ID
this.Paymsg.SalePrice = x.SalePrice this.Paymsg.SalePrice = x.SalePrice
}, },
scrollHandler(e) { scrollHandler(e) {
this.scrollTop = e.detail.scrollTop; this.scrollTop = e.detail.scrollTop;
}, },
scrollTopHandler() { scrollTopHandler() {
this.scrollTop = 0; this.scrollTop = 0;
}, },
redirectPrev() {//返回上一个页面 redirectPrev() {//返回上一个页面
if(this.type==0){ if(this.type==0){
uni.navigateBack({ uni.navigateBack({
...@@ -322,8 +322,8 @@ ...@@ -322,8 +322,8 @@
uni.reLaunch({ uni.reLaunch({
url:'/pages/index/index' url:'/pages/index/index'
}) })
} }
}, },
getxq(){ getxq(){
this.request2({ this.request2({
...@@ -416,8 +416,8 @@ ...@@ -416,8 +416,8 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/coupon/cards/carddetailed' url: '/pages/coupon/cards/carddetailed'
}) })
} }
} }
} }
</script> </script>
pages/friendcircle/friendcircle.vue
View file @ 0f0ff7c6
This diff is collapsed.
pages/friendcircle/my-news.vue
View file @ 0f0ff7c6
This diff is collapsed.
pages/index/index.vue
View file @ 0f0ff7c6
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view> <view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</view> </view>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon> <coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
<template v-show="setting&&setting.is_show_auth==1"> <template v-if="setting&&setting.is_show_auth==1">
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</template> </template>
<official-account></official-account> <official-account></official-account>
...@@ -260,6 +260,9 @@ ...@@ -260,6 +260,9 @@
let c = this.$uiConfig.is_bang ? 78 : 50; let c = this.$uiConfig.is_bang ? 78 : 50;
this.boxpaddingbottom = c; this.boxpaddingbottom = c;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
if (options && options.jzTravelOpenId) {
uni.setStorageSync("jzTravelOpenId", options.jzTravelOpenId);
}
if (options && options.page_id) { if (options && options.page_id) {
this.pageId = options.page_id; this.pageId = options.page_id;
let queryString = ""; let queryString = "";
...@@ -440,6 +443,7 @@ ...@@ -440,6 +443,7 @@
} else { } else {
that.sharejump(); //4-9新加 that.sharejump(); //4-9新加
this.handleChengShuang(); this.handleChengShuang();
this.SetMemberBindCustomer()
} }
// #endif // #endif
...@@ -609,6 +613,27 @@ ...@@ -609,6 +613,27 @@
} }
}, },
methods: { methods: {
SetMemberBindCustomer(){
let that = this;
that.request2({
url: "/api/MemberUser/SetMemberBindCustomer",
data: {
Id: that.u.UserId,
CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
},
},
(res) => {
if (res.resultCode == 1) {
uni.removeStorageSync('jzTravelOpenId');
}
},(err) => {
// uni.showToast({
// title: err.message,
// icon: "none",
// });
}
);
},
getunilogin(res) { getunilogin(res) {
let that = this; let that = this;
//静默登录操作 //静默登录操作
......
pages/order-submit/order-submit.vue
View file @ 0f0ff7c6
...@@ -222,7 +222,17 @@ ...@@ -222,7 +222,17 @@
<text class="bold">{{ ds.total_price }}</text> <text class="bold">{{ ds.total_price }}</text>
</view> </view>
<view class="right"> <view class="right">
<u-button :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="ds.promptNoSuperiorFY== true ? submitModel():submitOrderHandler()" <u-button v-if="ds.promptNoSuperiorFY== true" :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitModel()"
:custom-style="{
backgroundColor: mc,
height: '80rpx',
color: '#FFF',
fontSize: '14px'
}">
<u-loading mode="circle" style="margin-right: 5px;" v-if="submitOrder"></u-loading>
{{btntext}}
</u-button>
<u-button v-else :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitOrderHandler()"
:custom-style="{ :custom-style="{
backgroundColor: mc, backgroundColor: mc,
height: '80rpx', height: '80rpx',
...@@ -554,7 +564,7 @@ ...@@ -554,7 +564,7 @@
that.payInfo.total_price = that.ds.total_price; that.payInfo.total_price = that.ds.total_price;
} }
if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果 if ((that.formdata.Use_Deposit_Id != 0 || that.formdata.use_integral != 0) && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
uni.reLaunch({ uni.reLaunch({
url: '/pages/order-submit/pay-success?payInfo=' + JSON.stringify(that.payInfo) url: '/pages/order-submit/pay-success?payInfo=' + JSON.stringify(that.payInfo)
}) })
......
pages/order/order-detail.vue
View file @ 0f0ff7c6
...@@ -162,6 +162,10 @@ ...@@ -162,6 +162,10 @@
<view class="label">佣金抵扣</view> <view class="label">佣金抵扣</view>
<view class="content right">-￥{{ orders.DeductionCommission }}</view> <view class="content right">-￥{{ orders.DeductionCommission }}</view>
</view> </view>
<view class="field" v-if="orders.IntegralMoney>0">
<view class="label">积分抵扣</view>
<view class="content right">-￥{{ orders.IntegralMoney }}</view>
</view>
<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view> <view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
<view class="field"> <view class="field">
<view class="label">&nbsp;</view> <view class="label">&nbsp;</view>
......
pages/school/mystudy/mystudy.vue
View file @ 0f0ff7c6
...@@ -375,13 +375,13 @@ ...@@ -375,13 +375,13 @@
height: 400upx; height: 400upx;
position: relative; position: relative;
} }
.plot .charts { .plot .charts {
width: 750upx; width: 750upx;
height: 400upx; height: 400upx;
background-color: #FFFFFF; background-color: #FFFFFF;
background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mystudybg.png'); background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mystudybg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
} }
.plot .plotimg{ .plot .plotimg{
width: 100px; width: 100px;
......
pages/school/personal/JhphoneRz.vue
View file @ 0f0ff7c6
<style lang="scss" scoped> <style lang="scss" scoped>
.JhphoneRz { .JhphoneRz {
width: 100%; width: 100%;
// height: 100vh; // height: 100vh;
background: #FFF; background: #FFF;
.box{ .box{
width: 100%; width: 100%;
...@@ -58,11 +58,11 @@ ...@@ -58,11 +58,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
} }
</style> </style>
<template> <template>
<div class='JhphoneRz'> <div class='JhphoneRz'>
<view class="box" v-if="isAttestationEdu==0"> <view class="box" v-if="isAttestationEdu==0">
<view style="font-size: 40rpx;color: #111111;margin-top: 40rpx;">请完成手机绑定验证</view> <view style="font-size: 40rpx;color: #111111;margin-top: 40rpx;">请完成手机绑定验证</view>
...@@ -94,36 +94,36 @@ ...@@ -94,36 +94,36 @@
<view v-if="isAttestationEdu==1" style="width: 100%;display: flex;flex-direction: column;align-items: center;"> <view v-if="isAttestationEdu==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> <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> <text style="font-size: 20px;color: #111111;margin-top: 53px;">验证成功 成为学员</text>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
</div> </div>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue";
export default { import auth from "@/components/auth/index.vue";
export default {
components: { components: {
auth auth
}, },
data() { data() {
return { return {
showAuth:false, showAuth:false,
u:{}, u:{},
mainColor: '', mainColor: '',
addMsg:{ addMsg:{
StuTel:'', StuTel:'',
Sendcode:'', Sendcode:'',
}, },
btntext:'获取验证码', btntext:'获取验证码',
show: true, show: true,
count: '', count: '',
timer: null, timer: null,
daojis:'60s', daojis:'60s',
isAttestationEdu:0,//学员是否认证了 0否1是 isAttestationEdu:0,//学员是否认证了 0否1是
}; };
}, },
onLoad(options) { onLoad(options) {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
...@@ -137,29 +137,29 @@ ...@@ -137,29 +137,29 @@
} }
let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):''; let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0 this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
mounted() { mounted() {
let pageTitle = '学员认证' let pageTitle = '学员认证'
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ? let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title : []; wx.getStorageSync("basedata").bar_title : [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
pageTitle = x.new_name ? x.new_name : x.name; pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: pageTitle, title: pageTitle,
}); });
}, },
methods: { methods: {
getCode(){ getCode(){
const TIME_COUNT = 60; const TIME_COUNT = 60;
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
uni.hideLoading() uni.hideLoading()
} }
); );
}, },
reloadUserinfo() { reloadUserinfo() {
...@@ -277,13 +277,13 @@ ...@@ -277,13 +277,13 @@
}, },
(error) => {} (error) => {}
); );
}, },
} }
}; };
</script> </script>
<style> <style>
</style> </style>
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