xiaoning
/
yogaApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upbug

Browse Source
main
zouyanyan 3 weeks ago
parent d83d27fb60
commit e3e9247002
17 changed files with 475 additions and 186 deletions
Show Stats Download Patch File Download Diff File

103
manifest.json
Unescape View File

@ -2,8 +2,8 @@
"name" : "瑜伽汇", "name" : "瑜伽汇",
"appid" : "__UNI__B6E0086", "appid" : "__UNI__B6E0086",
"description" : "瑜伽汇", "description" : "瑜伽汇",
"versionName" : "1.0.22", "versionName" : "1.0.1",
"versionCode" : 1022, "versionCode" : 101,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"flexible" : true, "flexible" : true,
@ -37,8 +37,7 @@
"Payment" : {}, "Payment" : {},
"Record" : {}, "Record" : {},
"Geolocation" : {}, "Geolocation" : {},
"Maps" : {}, "Maps" : {}
"OAuth" : {}
}, },
/* 横竖屏设置 */ /* 横竖屏设置 */
"screenOrientation" : [ "portrait-primary", "landscape-primary" ], "screenOrientation" : [ "portrait-primary", "landscape-primary" ],
@ -88,9 +87,7 @@
//,"idfa" : true //,"idfa" : true
"sdkConfigs" : { "sdkConfigs" : {
"ad" : {}, "ad" : {},
"speech" : { "speech" : {},
"ifly" : {}
},
"push" : {}, "push" : {},
"payment" : { "payment" : {
"alipay" : { "alipay" : {
@ -100,8 +97,8 @@
"geolocation" : { "geolocation" : {
"amap" : { "amap" : {
"name" : "amapC3ZVrznQc", "name" : "amapC3ZVrznQc",
"__platform__" : [ "android" ], "__platform__" : [ "ios", "android" ],
"appkey_ios" : "", "appkey_ios" : "4b35267e3ea9a8dc9993b51a8335bc4c",
"appkey_android" : "f2e79a46af6f940428350d977bdfae4d" "appkey_android" : "f2e79a46af6f940428350d977bdfae4d"
}, },
"system" : { "system" : {
@ -111,7 +108,7 @@
"maps" : { "maps" : {
"amap" : { "amap" : {
"name" : "amapCmiOEDcOx", "name" : "amapCmiOEDcOx",
"appkey_ios" : "f2e79a46af6f940428350d977bdfae4d", "appkey_ios" : "4b35267e3ea9a8dc9993b51a8335bc4c",
"appkey_android" : "f2e79a46af6f940428350d977bdfae4d" "appkey_android" : "f2e79a46af6f940428350d977bdfae4d"
} }
}, },
@ -153,6 +150,45 @@
} }
}, },
"nativePlugins" : { "nativePlugins" : {
"JG-JCore" : {
"JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_APPKEY_IOS" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_CHANNEL_ANDROID" : "developer-default",
"JPUSH_CHANNEL_IOS" : "developer-default",
"__plugin_info__" : {
"name" : "极光推送 JCore 官方 SDK",
"description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4028",
"android_package_name" : "com.sdlyoga.app",
"ios_bundle_id" : "com.yjhyoga.app",
"isCloud" : true,
"bought" : 1,
"pid" : "4028",
"parameters" : {
"JPUSH_APPKEY_ANDROID" : {
"des" : "[Android]极光portal配置应用信息时分配的AppKey",
"key" : "JPUSH_APPKEY",
"value" : ""
},
"JPUSH_APPKEY_IOS" : {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY",
"value" : ""
},
"JPUSH_CHANNEL_ANDROID" : {
"des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JPUSH_CHANNEL",
"value" : ""
},
"JPUSH_CHANNEL_IOS" : {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JCore:CHANNEL",
"value" : ""
}
}
}
},
"JG-JPush" : { "JG-JPush" : {
"JPUSH_ADVERTISINGID_IOS" : "", "JPUSH_ADVERTISINGID_IOS" : "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "", "JPUSH_DEFAULTINITJPUSH_IOS" : "",
@ -174,12 +210,12 @@
"JPUSH_XIAOMI_APPID" : "", "JPUSH_XIAOMI_APPID" : "",
"JPUSH_XIAOMI_APPKEY" : "", "JPUSH_XIAOMI_APPKEY" : "",
"__plugin_info__" : { "__plugin_info__" : {
"name" : "瑜伽汇", "name" : "极光推送 JPush 官方 SDK",
"description" : "瑜伽汇", "description" : "极光推送JPush官方SDK HBuilder插件版本",
"platforms" : "Android,iOS", "platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4035", "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
"android_package_name" : "com.sdlyoga.app", "android_package_name" : "com.sdlyoga.app",
"ios_bundle_id" : "", "ios_bundle_id" : "com.yjhyoga.app",
"isCloud" : true, "isCloud" : true,
"bought" : 1, "bought" : 1,
"pid" : "4035", "pid" : "4035",
@ -282,43 +318,18 @@
} }
} }
}, },
"JG-JCore" : { "youyacao-Jcore" : {
"JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_APPKEY_IOS" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_CHANNEL_ANDROID" : "",
"JPUSH_CHANNEL_IOS" : "",
"__plugin_info__" : { "__plugin_info__" : {
"name" : "瑜伽汇", "name" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
"description" : "瑜伽汇", "description" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
"platforms" : "Android,iOS", "platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=4028", "url" : "https://ext.dcloud.net.cn/plugin?id=4752",
"android_package_name" : "com.sdlyoga.app", "android_package_name" : "com.sdlyoga.app",
"ios_bundle_id" : "", "ios_bundle_id" : "com.yjhyoga.app",
"isCloud" : true, "isCloud" : true,
"bought" : 1, "bought" : 1,
"pid" : "4028", "pid" : "4752",
"parameters" : { "parameters" : {}
"JPUSH_APPKEY_ANDROID" : {
"des" : "[Android]极光portal配置应用信息时分配的AppKey",
"key" : "JPUSH_APPKEY",
"value" : ""
},
"JPUSH_APPKEY_IOS" : {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY",
"value" : ""
},
"JPUSH_CHANNEL_ANDROID" : {
"des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JPUSH_CHANNEL",
"value" : ""
},
"JPUSH_CHANNEL_IOS" : {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JCore:CHANNEL",
"value" : ""
}
}
} }
} }
} }

26
pages.json
Unescape View File

@ -441,6 +441,32 @@
} }
}, },
{
"path" : "pages/user/info",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/user/infofw",
"style" :
{
"navigationBarTitleText": "用户服务协议",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/user/infoys",
"style" :
{
"navigationBarTitleText": "隐私政策条款",
"enablePullDownRefresh": false
}
},
// ……其他页面配置 更新版本 // ……其他页面配置 更新版本
{ {
"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",

41
pages/cart/cart.vue
Unescape View File

@ -1,11 +1,9 @@
<template> <template>
<view class="page"> <view class="page">
<view class="page-header" :style="{ paddingTop: geStatusBarHeight() + 'px'}"> <view class="page-header" :style="{ paddingTop: geStatusBarHeight() + 'px'}">
<view :class="['title', carts.length > 0 ? '' : 'text-center']">购物车</view> <view class="text-center">购物车</view>
<block v-if="carts.length > 0"> <view class="edit" v-if="carts.length > 0&&btnType === 'edit'" @click="$u.throttle(btnTool('edit'), 2000)">管理</view>
<view class="edit" v-if="btnType === 'edit'" @click="$u.throttle(btnTool('edit'), 2000)">管理</view> <view class="edit" v-if="carts.length > 0&&btnType === 'done'" @click="$u.throttle(btnTool('done'), 2000)">完成</view>
<view class="edit" v-if="btnType === 'done'" @click="$u.throttle(btnTool('done'), 2000)">完成</view>
</block>
</view> </view>
<view class="cart-top"></view> <view class="cart-top"></view>
<!-- 购物车商品 --> <!-- 购物车商品 -->
@ -215,7 +213,6 @@
this.checked = false; this.checked = false;
this.getapicart(); this.getapicart();
var messageNum=getmessageNum(); var messageNum=getmessageNum();
console.log("messageNum",messageNum) console.log("messageNum",messageNum)
if(messageNum>0){ if(messageNum>0){
@ -352,8 +349,8 @@
var ret = false; var ret = false;
fcarts.forEach((cell)=>{ fcarts.forEach((cell)=>{
if(id==cell.storeNmae){ if(id==cell.storeNmae){
ret=cell["check"]; ret=cell["check"]?cell["check"]:false;
return; return false;
} }
}); });
return ret; return ret;
@ -364,7 +361,7 @@
fcarts.forEach((cell)=>{ fcarts.forEach((cell)=>{
cell.cartList.forEach((ii)=>{ cell.cartList.forEach((ii)=>{
if(ii.id==id){ if(ii.id==id){
ret=ii["check"]; ret=ii["check"]?ii["check"]:false;
return; return;
} }
}); });
@ -669,23 +666,27 @@
.page-header { .page-header {
position: fixed; position: fixed;
width: 100%; width: 100%;
z-index: 99; height: 160rpx;
padding: 30rpx 30rpx; /* #ifdef H5 */
height: 100rpx;
/* #endif */
z-index: 999;
padding: 0 30rpx;
display: flex; display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
color: #fff; color: #fff;
font-size: 36rpx;
background-color: #00a89b; background-color: #00a89b;
align-items: center; font-size: 32rpx;
.text-center { .text-center {
width: 100%; display: flex;
text-align: center; transform: translateY(-50%);
flex: 1;
} }
.edit { .edit {
position: absolute; display: flex;
top: 30rpx;
transform: translateY(-50%); transform: translateY(-50%);
right: 20rpx;
font-size: 32rpx;
} }
} }
.cart-bottom{ .cart-bottom{
@ -699,7 +700,7 @@
.cart-top{ .cart-top{
width: 100%; width: 100%;
height: 1rpx; height: 1rpx;
margin-top: 166rpx; margin-top: 180rpx;
/* #ifdef H5 */ /* #ifdef H5 */
margin-top: calc( var(--window-top) + 105rpx); margin-top: calc( var(--window-top) + 105rpx);
/* #endif */ /* #endif */

4
pages/category/category.vue
Unescape View File

@ -1123,8 +1123,8 @@
height: 90rpx; height: 90rpx;
} }
.cur .ptext{ .cur .ptext{
color: #000; color: #00a89b;
font-size: 34rpx; font-size: 36rpx;
} }
.cur .pline{ .cur .pline{
width: 40%; width: 40%;

27
pages/chatbox/chat.vue
Unescape View File

@ -1,9 +1,9 @@
<template> <template>
<view class="page"> <view class="page">
<!-- 页面头部 --> <!-- 页面头部 -->
<view class="page-header" :style="{ paddingTop: geStatusBarHeight() + 8 + 'px' }"> <view class="page-header" :style="{ paddingTop: geStatusBarHeight() }">
<view class="text-center">消息</view> <view class="text-center">消息</view>
<uni-icons type="staff-filled" size="30" color="#ffffff" @click="gotoContacts"></uni-icons> <uni-icons type="staff-filled" size="32" color="#ffffff" @click="gotoContacts"></uni-icons>
</view> </view>
<view class="wrapcon"> <view class="wrapcon">
@ -221,21 +221,26 @@ export default {
.page-header { .page-header {
position: fixed; position: fixed;
width: 100%; width: 100%;
height: 150rpx;
/* #ifdef H5 */
height: 100rpx;
/* #endif */
padding: 0 30rpx 16rpx;
z-index: 999; z-index: 999;
padding: 40rpx 30rpx 30rpx 30rpx;
display: flex; display: flex;
flex-direction: row;
justify-content: space-between;
align-items: flex-end;
color: #fff; color: #fff;
font-size: 36rpx; font-size: 36rpx;
background-color: #00a89b; background-color: #00a89b;
.text-center { .text-center {
width: 100%; width: 100%;
text-align: center; display: flex;
flex: 1;
font-weight: 600;
} }
.edit { .edit {
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 30rpx;
font-size: 32rpx; font-size: 32rpx;
} }
} }
@ -245,11 +250,11 @@ export default {
position: relative; position: relative;
margin: 180rpx 0 0 0; margin: 180rpx 0 0 0;
min-height: calc(100vh - 180rpx); min-height: calc(100vh - 180rpx);
overflow-y: auto;
/* #ifdef H5 */ /* #ifdef H5 */
margin: calc(110rpx + var(--window-top)) 0 0 0; margin: calc(100rpx + var(--window-top)) 0 0 0;
min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 180rpx); min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 100rpx);
/* #endif */ /* #endif */
overflow-y: auto;
} }
.listcell { .listcell {
background: #fff; background: #fff;

2
pages/components/selShop.vue
Unescape View File

@ -248,7 +248,7 @@ export default {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background-color: #FFFFFF; background-color: #FFFFFF;
margin: 40rpx 5% 240rpx 5%; margin: 140rpx 5%;
border-radius: 50rpx; border-radius: 50rpx;
} }
.rclose{ .rclose{

104
pages/login/login.vue
Unescape View File

@ -29,6 +29,28 @@
<view class="regtxtr" @click="gotoregister">注册账号 → </view> <view class="regtxtr" @click="gotoregister">注册账号 → </view>
</view> </view>
<view class="xycon">
<view class="sitem">
<view class="selbtn">
<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
</view>
<view class="conright">
<text class="sname">
我已阅读并同意
</text>
<text class="adress" @click="gotofw">
《用户服务协议》
</text>
<text class="sname">
与
</text>
<text class="adress" @click="gotoys">
《隐私政策条款》
</text>
</view>
</view>
</view>
</uni-forms> </uni-forms>
</view> </view>
@ -60,6 +82,12 @@
address:'', address:'',
longitude:'', // 经度 longitude:'', // 经度
latitude:'', // 维度 latitude:'', // 维度
checkbox1: [1],
checkboxitem: [{
text: '',
value: 1,
}],
ifxy: false // 是否选择协议
} }
}, },
onLoad(){ onLoad(){
@ -274,6 +302,11 @@
// 密码登录 // 密码登录
async loginpwdDo(){ async loginpwdDo(){
// 是否阅读协议
if(!this.checkxy()){
return false;
}
// 手机号码 密码是否输入 // 手机号码 密码是否输入
if(!this.form.phonenumber){ if(!this.form.phonenumber){
this.$refs.uToast.show({ this.$refs.uToast.show({
@ -350,6 +383,7 @@
nickName:user.nickName, nickName:user.nickName,
username:user.userName, username:user.userName,
userphone:user.phoneNumber, userphone:user.phoneNumber,
signature:user.signature,
avatar:user.avatar avatar:user.avatar
}); });
myCache('userInfo',user); myCache('userInfo',user);
@ -365,6 +399,25 @@
} }
getApp().$vm.init(user.userId) getApp().$vm.init(user.userId)
}, },
checkxy(){
console.log(this.checkbox1);
if(this.checkbox1.length>0&&this.checkbox1[0]){
return true;
}
else{
uni.showModal({
title: '提示',
content: '请阅读并同意用户服务协议、隐私政策条款!',
cancelText: '取消',
confirmText: '确定',
success: ress => {
if (ress.confirm) {
}
}
});
return false;
}
},
async loadshop(){ async loadshop(){
// 获取门店 // 获取门店
const {data: res} = await uni.$http.post('/api/index/getStores'); const {data: res} = await uni.$http.post('/api/index/getStores');
@ -403,6 +456,18 @@
myCache('shoplist',shoplist); myCache('shoplist',shoplist);
} }
}, },
gotofw(){
uni.navigateTo({
url: `/pages/user/infofw`
});
},
gotoys(){
uni.navigateTo({
url: `/pages/user/infoys`
});
},
} }
} }
@ -530,7 +595,7 @@
} }
.formregion { .formregion {
width: 100%; width: 100%;
padding: 30px 50rpx; padding: 30px 50rpx 20rpx;
background-color: #fff; background-color: #fff;
border-radius: 10px; border-radius: 10px;
margin-top: 20rpx; margin-top: 20rpx;
@ -567,4 +632,41 @@
padding: 0 0 40rpx 0; padding: 0 0 40rpx 0;
} }
.xycon{
display: flex;
align-items: center;
justify-content: center;
padding: 50rpx 0 0;
width: 100%;
.sitem {
display: flex;
flex-direction: row;
.conright{
flex: 1;
margin: 10rpx 0;
margin-left: -36rpx;
}
.selbtn{
width: 80rpx;
display: flex;
justify-content: center;
align-items: center;
margin-left: 10rpx;
}
.sname{
font-size: 24rpx;
font-weight: 400;
color: #23262F;
line-height: 36rpx;
}
.adress{
font-size: 24rpx;
font-weight: 400;
color: #00a89b;
line-height: 36rpx;
}
}
}
</style> </style>

103
pages/login/register.vue
Unescape View File

@ -33,7 +33,32 @@
</uni-forms> </uni-forms>
<view class="xycon">
<view class="sitem">
<view class="selbtn">
<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
</view> </view>
<view class="conright">
<text class="sname">
我已阅读并同意
</text>
<text class="adress" @click="gotofw">
《用户服务协议》
</text>
<text class="sname">
与
</text>
<text class="adress" @click="gotoys">
《隐私政策条款》
</text>
</view>
</view>
</view>
</view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
</view> </view>
@ -63,6 +88,12 @@
address:'', address:'',
longitude:'', // 经度 longitude:'', // 经度
latitude:'', // 维度 latitude:'', // 维度
checkbox1: [1],
checkboxitem: [{
text: '',
value: 1,
}],
ifxy: false // 是否选择协议
} }
}, },
onLoad(){ onLoad(){
@ -188,6 +219,11 @@
// 注册 // 注册
async loginpwdDo(){ async loginpwdDo(){
// 是否阅读协议
if(!this.checkxy()){
return false;
}
// 手机号码 密码是否输入 // 手机号码 密码是否输入
if(!this.form.phonenumber){ if(!this.form.phonenumber){
this.$refs.uToast.show({ this.$refs.uToast.show({
@ -257,7 +293,36 @@
duration: 2000 duration: 2000
}); });
} }
},
checkxy(){
console.log(this.checkbox1);
if(this.checkbox1.length>0&&this.checkbox1[0]){
return true;
}
else{
uni.showModal({
title: '提示',
content: '请阅读并同意用户服务协议、隐私政策条款!',
cancelText: '取消',
confirmText: '确定',
success: ress => {
if (ress.confirm) {
}
}
});
return false;
} }
},
gotofw(){
uni.navigateTo({
url: `/pages/user/infofw`
});
},
gotoys(){
uni.navigateTo({
url: `/pages/user/infoys`
});
},
} }
@ -423,4 +488,42 @@
padding: 0 0 40rpx 0; padding: 0 0 40rpx 0;
width: 100%; width: 100%;
} }
.xycon{
display: flex;
align-items: center;
justify-content: center;
padding: 50rpx 0 0;
width: 100%;
.sitem {
display: flex;
flex-direction: row;
.conright{
flex: 1;
margin: 10rpx 0;
margin-left: -36rpx;
}
.selbtn{
width: 80rpx;
display: flex;
justify-content: center;
align-items: center;
margin-left: 10rpx;
}
.sname{
font-size: 24rpx;
font-weight: 400;
color: #23262F;
line-height: 36rpx;
}
.adress{
font-size: 24rpx;
font-weight: 400;
color: #00a89b;
line-height: 36rpx;
}
}
}
</style> </style>

20
pages/message/contact.vue
Unescape View File

@ -494,46 +494,44 @@ import { mapState, mapActions, mapGetters } from 'vuex'
} }
.cur1{ .cur1{
color:#ff7530; color:#ff7530;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.cur2{ .cur2{
color:#46a0fb; color:#46a0fb;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.cur3{ .cur3{
color:#5bd171; color:#5bd171;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.cur5{ .cur5{
color:#d4237a; color:#d4237a;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.cur6{ .cur6{
color:#00a89b; color:#00a89b;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.cur4{ .cur4{
color:#fca600; color:#fca600;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
} }
} }
.wrapcon{ .wrapcon{
margin: 370rpx 0 0 0; margin: 420rpx 0 0 0;
/* #ifdef H5 */
margin: 300rpx 0 0 0;
/* #endif */
padding: 0; padding: 0;
width: 100%; width: 100%;
position: relative; position: relative;
min-height: calc(100vh - 350rpx); min-height: calc(100vh - 420rpx);
/* #ifdef H5 */ /* #ifdef H5 */
margin: 300rpx 0 0 0;
min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 350rpx); min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 350rpx);
/* #endif */ /* #endif */
overflow-y: auto; overflow-y: auto;

2
pages/product/cdetail.vue
Unescape View File

@ -142,7 +142,7 @@
<view class="sitem" @tap="gotoCart"> <view class="sitem" @tap="gotoCart">
<uni-icons type="cart" size="25" color="#919191"></uni-icons> <uni-icons type="cart" size="25" color="#919191"></uni-icons>
<view class="txt">购物车</view> <view class="txt">购物车</view>
<view class="cnum">{{cartnum}}</view> <view class="cnum" v-if="cartnum>0">{{cartnum}}</view>
</view> </view>
</view> </view>
<button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button> <button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button>

2
pages/teacher/course.vue
Unescape View File

@ -12,7 +12,7 @@
</uni-th> </uni-th>
<uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index"> <uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index">
<view class="rightcell"> <view class="rightcell">
<view class="ctitle">{{item.day}}</view> <view class="ctitle">{{item.day?item.day.substring(5):""}}</view>
<view class="ctitle">{{item.weekName}}</view> <view class="ctitle">{{item.weekName}}</view>
<view class="cnum" v-if="item.count>0">{{item.count}}</view> <view class="cnum" v-if="item.count>0">{{item.count}}</view>
</view> </view>

7
pages/user/courselist.vue
Unescape View File

@ -109,7 +109,7 @@
</uni-th> </uni-th>
<uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index"> <uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index">
<view class="rightcell"> <view class="rightcell">
<view class="ctitle">{{item.day}}</view> <view class="ctitle">{{item.day?item.day.substring(5):""}}</view>
<view class="ctitle">{{item.weekName}}</view> <view class="ctitle">{{item.weekName}}</view>
<view class="cnum" v-if="item.count>0">{{item.count}}</view> <view class="cnum" v-if="item.count>0">{{item.count}}</view>
</view> </view>
@ -909,7 +909,8 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
background-color: #FFFFFF; background-color: #FFFFFF;
padding-top: 10rpx; min-height: 100rpx;
width: 100%;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
.hback{ .hback{
display: flex; display: flex;
@ -1280,7 +1281,7 @@
} }
.courcon{ .courcon{
width: 100%; width: 100%;
height: calc(100vh - 100rpx); height: calc(100vh - 200rpx);
/* #ifdef H5 */ /* #ifdef H5 */
height: calc(100vh - 100rpx - var(--window-top)); height: calc(100vh - 100rpx - var(--window-top));
/* #endif */ /* #endif */

87
pages/user/info.vue
Unescape View File

@ -12,9 +12,6 @@
<mp-html v-if="id==1" :content="html1" :markdown="true" :lazy-load="true"/> <mp-html v-if="id==1" :content="html1" :markdown="true" :lazy-load="true"/>
<mp-html v-if="id==2" :content="html2" :markdown="true" :lazy-load="true"/> <mp-html v-if="id==2" :content="html2" :markdown="true" :lazy-load="true"/>
<mp-html v-if="id==3" :content="html3" :markdown="true" :lazy-load="true"/> <mp-html v-if="id==3" :content="html3" :markdown="true" :lazy-load="true"/>
<mp-html v-if="id==4" :content="html4" :markdown="true" :lazy-load="true"/>
<mp-html v-if="id==5" :content="html5" :markdown="true" :lazy-load="true"/>
<mp-html v-if="id==9" :content="html9" :markdown="true" :lazy-load="true"/>
</view> </view>
</view> </view>
@ -38,14 +35,11 @@
}, },
data() { data() {
return { return {
id:1, // 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、 id:1, // 1、用户服务协议 2、隐私政策条款 3、用户注册协议
title: "用户授权协议", title: "用户授权协议",
html1:``, html1:``,
html2:``, html2:``,
html3:``, html3:``,
html4:``,
html5:``,
html9:``,
} }
}, },
onShow(){ onShow(){
@ -57,52 +51,24 @@
} }
}, },
async onReady(){ async onReady(){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、 // 1、用户服务协议 2、隐私政策条款 3、用户注册协议
if(this.id==1) if(this.id==1)
{ {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "用户授权协议", title: "用户服务协议",
}); });
this.getxy(); this.getxy();
} }
else if(this.id==2) else if(this.id==2)
{ {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "用户隐私协议", title: "隐私政策条款",
});
this.getxy();
}
else if(this.id==3)
{
uni.setNavigationBarTitle({
title: "用户注册协议",
}); });
this.getxy(); this.getxy();
} }
else if(this.id==4)
{
uni.setNavigationBarTitle({
title: "征信授权协议",
});
this.getxy();
}
else if(this.id==5)
{
uni.setNavigationBarTitle({
title: "租赁服务协议",
});
this.getxy();
}
else if(this.id==9)
{
uni.setNavigationBarTitle({
title: "招商入驻",
});
this.getInvestmentInfo();
}
else{ else{
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "租赁服务协议及相关", title: "用户注册协议",
}); });
} }
@ -112,60 +78,29 @@
this.$refs.topId.topData(e.scrollTop); this.$refs.topId.topData(e.scrollTop);
}, },
methods:{ methods:{
async getInvestmentInfo(){
try{
uni.showLoading({
title: '数据加载中...'
});
const {data: res} = await uni.$http.post('/platform/getInvestmentInfo');
if(res){
this.html9=res;
this.$forceUpdate();
}
}
catch(e){
console.log(e)
}
},
async getxy(){ async getxy(){
if(this.id){ if(this.id){
try{ try{
uni.showLoading({ uni.showLoading({
title: '数据加载中...' title: '数据加载中...'
}); });
const {data: res} = await uni.$http.post('/platform/getProtocol'); const {data: res} = await uni.$http.get('/yoga/api/privacyPolicy');
// Conten1:用户授权协议 // Conten1:用户服务协议
// Conten2:用户隐私协议 // Conten2:隐私政策条款
// Conten3:用户注册协议 // Conten3:用户注册协议
// Conten4:征信授权协议
// Conten5:租赁服务协议
if(res){ if(res){
// console.log(res.content1)
// console.log(res.content2)
// console.log(res.content3)
// console.log(res.content4)
// console.log(res.content5)
if(this.id==1){ if(this.id==1){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、 // 1、用户服务协议 2、隐私政策条款 3、用户注册协议
this.html1=res.content1; this.html1=res.content1;
} }
else if(this.id==2){ else if(this.id==2){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、 // 1、用户服务协议 2、隐私政策条款 3、用户注册协议
this.html2=res.content2; this.html2=res.content2;
} }
else if(this.id==3){ else if(this.id==3){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、 // 1、用户服务协议 2、隐私政策条款 3、用户注册协议
this.html3=res.content3; this.html3=res.content3;
} }
else if(this.id==4){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
this.html4=res.content4;
}
else if(this.id==5){
// 1、用户授权协议 2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
this.html5=res.content5;
}
this.$forceUpdate(); this.$forceUpdate();
} }
} }

23
pages/user/infofw.vue
Unescape View File

@ -0,0 +1,23 @@
<template>
<view>
<web-view :webview-styles="webviewStyles" src="https://yoga.runpengsoft.com/yoga/api/termsOfService"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
webviewStyles: {
progress: {
color: '#ffffff'
}
}
}
}
}
</script>
<style>
</style>

23
pages/user/infoys.vue
Unescape View File

@ -0,0 +1,23 @@
<template>
<view>
<web-view :webview-styles="webviewStyles" src="https://yoga.runpengsoft.com/yoga/api/privacyPolicy"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
webviewStyles: {
progress: {
color: '#ffffff'
}
}
}
}
}
</script>
<style>
</style>

60
pages/user/user.vue
Unescape View File

@ -156,12 +156,20 @@
</view> </view>
<view class="title">{{servers[11].name}}</view> <view class="title">{{servers[11].name}}</view>
</view> </view>
<!-- 退出登录 -->
<view v-if="userid" class="product-item" @click="gotoServe(99)"> <view v-if="userid" class="product-item" @click="gotoServe(99)">
<view class="image-wrapper"> <view class="image-wrapper">
<image class="imgicon" :src="servers[15].img" mode="aspectFill" lazy-load></image> <image class="imgicon" :src="servers[15].img" mode="aspectFill" lazy-load></image>
</view> </view>
<view class="title">{{servers[15].name}}</view> <view class="title">{{servers[15].name}}</view>
</view> </view>
<!-- 账户注销 -->
<view v-if="userid" class="product-item" @click="gotoServe(98)">
<view class="image-wrapper">
<image class="imgicon" :src="servers[16].img" mode="aspectFill" lazy-load></image>
</view>
<view class="title">{{servers[16].name}}</view>
</view>
</scroll-view> </scroll-view>
</view> </view>
@ -303,6 +311,12 @@
img:'../../static/image/tc.png', img:'../../static/image/tc.png',
name:'退出登录', name:'退出登录',
}, },
{
key:98,
img:'../../static/image/zx.png',
name:'账户注销',
},
], ],
}; };
}, },
@ -322,7 +336,7 @@
this.avatar = user.avatar?user.avatar:'../../static/image/logo.png'; this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
this.nickName= user.nickName? user.nickName:''; this.nickName= user.nickName? user.nickName:'';
this.phone = user.phonenumber; this.phone = user.phonenumber;
this.signature = user.signature; // this.signature = user.signature?user.signature:this.signature;
this.roleId=user.roleId?user.roleId:[]; this.roleId=user.roleId?user.roleId:[];
} }
@ -606,7 +620,7 @@
} }
}); });
} }
else if(ii==13){ else if(ii==98){
// 注销账号 // 注销账号
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
@ -668,13 +682,14 @@
}; };
const {data: res} = await uni.$http.post('/appiso/deleteBuyer',params); const {data: res} = await uni.$http.post('/appiso/deleteBuyer',params);
console.log("账号注销返回",res) console.log("账号注销返回",res)
if (res) { if (res&&res.data) {
// 清除登录缓存 // 清除登录缓存
this.openId = ""; this.openId = "";
this.phone = ""; this.phone = "";
this.avatar = ""; this.avatar = "../../static/image/logo.png";
this.userid = ""; this.userid = "";
this.nickName = ""; this.nickName = "";
this.signature = "";
this.userInfo={ this.userInfo={
id:'', id:'',
avatar: "../../static/image/logo.png", avatar: "../../static/image/logo.png",
@ -682,11 +697,48 @@
phone: "", phone: "",
isauth:0, isauth:0,
}; };
this.$forceUpdate();
// 清除缓存
myCache('token','');
myCache('user',''); myCache('user','');
myCache('userInfo',''); myCache('userInfo','');
myCache('phone',''); myCache('phone','');
myCache('openId',''); myCache('openId','');
myCache('userid',''); myCache('userid','');
// 门店信息退出
myCache('shop','');
myCache('myshop','');
myCache('myshopid','');
myCache('shoplist','');
// 订单信息数字清除
this.menus[0].num=0;
this.menus[1].num=0;
this.menus[2].num=0;
this.menus[3].num=0;
this.favoritesnum=0;// 我的收藏
// 清空购物车
var cartnum=getcartNum();
if(cartnum>0){
// 底部菜单消息角标
uni.setTabBarBadge({
//显示未读消息条数
index: 4,
text: cartnum+''
});
}
else{
uni.removeTabBarBadge({
index: 4
})
}
// app清除角标的数量
//#ifdef APP-PLUS
plus.runtime.setBadgeNumber(-1);
//#endif
uni.showModal({ uni.showModal({
title: '提示', title: '提示',

9
pages/user/userEdit.vue
Unescape View File

@ -228,6 +228,15 @@
this.messageText = `提交成功！`; this.messageText = `提交成功！`;
this.$refs.message.open(); this.$refs.message.open();
myCache("ifuserEdit", true); myCache("ifuserEdit", true);
var user = myCache('userInfo');
myCache('user',{
userid:user.userid,
nickName:that.valiFormData.nickName,
username:user.username,
userphone:user.userphone,
signature:that.valiFormData.signature,
avatar:that.valiFormData.avatar
});
setTimeout(() => { setTimeout(() => {
// 返回 关闭当前页面 // 返回 关闭当前页面
uni.navigateBack({ uni.navigateBack({

Write Preview
Loading…
Cancel
Save