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

Compare commits

base: xiaoning:1d05c2d08a2e12d16bc64257d3e9dd6128f9d961
Branches Tags
xiaoning:main
..
compare: xiaoning:06bc49e2922d9c0ac6b097a9e78c04e556004d07
Branches Tags
xiaoning:main

No commits in common. '1d05c2d08a2e12d16bc64257d3e9dd6128f9d961' and '06bc49e2922d9c0ac6b097a9e78c04e556004d07' have entirely different histories.
1d05c2d08a ... 06bc49e292

5 changed files with 122 additions and 307 deletions
Show Stats

150
App.vue
Unescape View File

@ -29,105 +29,63 @@
onLaunch() { onLaunch() {
// 判断版本更新 需要真机进行测试 // 判断版本更新 需要真机进行测试
//checkupdate(); //checkupdate();
// 极光推送start------------------------------
//#ifdef APP-PLUS //#ifdef APP-PLUS
// 消息推送 // 消息推送
jpushModule.setLoggerEnable(true); // jpushModule.setLoggerEnable(true);
jpushModule.initJPushService() // jpushModule.initJPushService()
jpushModule.addConnectEventListener(result=>{ // jpushModule.addConnectEventListener(result=>{
let connectEnable = result.connectEnable // let connectEnable = result.connectEnable
console.log("jpush连接", connectEnable) // console.log("jpush连接", connectEnable)
}); // });
jpushModule.addTagAliasListener(result => { // 设置别名 （再登录时候设置）
let code = result.code // var user= JSON.parse(uni.getStorageSync("user"));
let sequence = result.sequence // if(user&&user.yhdm){
let tags = result.tags // jpushModule.setAlias({
let tag = result.tag // 'alias': user.yhdm,
let tagEnable = result.tagEnable // 'sequence': 1
let alias = result.alias // })
console.log(alias, '别名') // }
});
// jpushModule.addTagAliasListener(result => {
// 通知事件回调 // let code = result.code
jpushModule.addNotificationListener(result => { // let sequence = result.sequence
let notificationEventType = result.notificationEventType // let tags = result.tags
let messageID = result.messageID // let tag = result.tag
let title = result.title // let tagEnable = result.tagEnable
let content = result.content // let alias = result.alias
let extras = result.extras // console.log(alias, '别名')
console.log("消息通知", result); // });
console.log("消息通知extras", extras)
// 点击事件 // // 通知事件回调
if(extras && extras.type && extras.type == 'bookCourses') { // jpushModule.addNotificationListener(result => {
var bookId=extras.bookId?extras.bookId:''; // let notificationEventType = result.notificationEventType
if(bookId){ // let messageID = result.messageID
// 预约课程详情 // let title = result.title
uni.reLaunch({ // let content = result.content
url: `/pages/book/bookinfo?id=${bookId}` // let extras = result.extras
}); // console.log("通知", result)
} // // 点击事件
else{ // if (notificationEventType == 'notificationOpened') {
// 预约课程列表 // uni.reLaunch({
uni.reLaunch({ // url: `/pages/message/newMsg`
url: `/pages/book/booklist` // });
}); // }
} // })
} // jpushModule.getRegistrationID(result => {
if(extras && extras.type && extras.type == 'groupMessage') { // console.log("注册ID", result.registerID)
// 群聊消息 // if (result.registerID) {
// var pagePath=extras.pagePath; // uni.setStorageSync("register_id", result.registerID)
// var groupId=extras.groupId; // }
// if(pagePath&&groupId){ // })
// uni.reLaunch({ // jpushModule.addCustomMessageListener(result => {
// url: `${pagePath}?chatIdx=${groupId}` // let messageID = result.messageID
// }); // let content = result.content
// } // let extras = result.extras
// else{ // console.log("自定义消息", result)
// uni.reLaunch({ // })
// url: `/pages/chatbox/chat`
// });
// }
uni.reLaunch({
url: `/pages/chatbox/chat`
});
}
if(extras && extras.type && extras.type == 'privateMessage') {
// 私信消息
// var pagePath=extras.pagePath;
// var senderId=extras.senderId;
// if(pagePath&&senderId){
// uni.reLaunch({
// url: `${pagePath}?chatIdx=${senderId}`
// });
// }
// else{
// uni.reLaunch({
// url: `/pages/chatbox/chat`
// });
// }
uni.reLaunch({
url: `/pages/chatbox/chat`
});
}
})
jpushModule.getRegistrationID(result => {
console.log("注册ID", result.registerID)
if (result.registerID) {
uni.setStorageSync("register_id", result.registerID)
}
})
jpushModule.addCustomMessageListener(result => {
let messageID = result.messageID
let content = result.content
let extras = result.extras
console.log("自定义消息", result)
})
//#endif //#endif
// 极光推送end--------------
var user = myCache('user'); var user = myCache('user');
this.userId = user.userid? user.userid:''; this.userId = user.userid? user.userid:'';

122
im.scss
Unescape View File

@ -1,77 +1,77 @@
/** 原生button样式 **/ /** 原生button样式 **/
uni-button { uni-button {
font-size: $im-font-size; font-size: $im-font-size !important;
} }
uni-button[type='primary'] { uni-button[type='primary'] {
color: #fff ; color: #fff !important;
background-color: $im-color-primary ; background-color: $im-color-primary !important;
} }
uni-button[type='primary'][plain] { uni-button[type='primary'][plain] {
color: $im-color-primary ; color: $im-color-primary !important;
border: 1px solid $im-color-primary; border: 1px solid $im-color-primary;
background-color: transparent; background-color: transparent;
} }
uni-button[type='warn'] { uni-button[type='warn'] {
color: #fff ; color: #fff !important;
background-color: $im-color-danger ; background-color: $im-color-danger !important;
} }
uni-button[type='warn'][plain] { uni-button[type='warn'][plain] {
color: $im-color-danger ; color: $im-color-danger !important;
border: 1px solid $im-color-danger ; border: 1px solid $im-color-danger !important;
background-color: transparent ; background-color: transparent !important;
} }
uni-button[size='mini'] { uni-button[size='mini'] {
font-size: $im-font-size-smaller ; font-size: $im-font-size-smaller !important;
} }
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
// wx小程序只有button,没有uni-botton // wx小程序只有button,没有uni-botton
button { button {
font-size: $im-font-size ; font-size: $im-font-size !important;
} }
button[type='primary'] { button[type='primary'] {
color: #fff ; color: #fff !important;
background-color: $im-color-primary ; background-color: $im-color-primary !important;
} }
button[type='primary'][plain] { button[type='primary'][plain] {
color: $im-color-primary ; color: $im-color-primary !important;
border: 1px solid $im-color-primary; border: 1px solid $im-color-primary;
background-color: transparent; background-color: transparent;
} }
button[type='warn'] { button[type='warn'] {
color: #fff ; color: #fff !important;
background-color: $im-color-danger ; background-color: $im-color-danger !important;
} }
button[type='warn'][plain] { button[type='warn'][plain] {
color: $im-color-danger ; color: $im-color-danger !important;
border: 1px solid $im-color-danger ; border: 1px solid $im-color-danger !important;
background-color: transparent ; background-color: transparent !important;
} }
button[size='mini'] { button[size='mini'] {
font-size: $im-font-size-smaller ; font-size: $im-font-size-smaller !important;
} }
// #endif // #endif
.button-hover[type='primary'] { .button-hover[type='primary'] {
color: #fff ; color: #fff !important;
background-color: $im-color-primary-dark-1 ; background-color: $im-color-primary-dark-1 !important;
} }
/** uni-ui input激活后边框、图标颜色 **/ /** uni-ui input激活后边框、图标颜色 **/
.uni-easyinput__content.is-focused:not(.is-input-error-border) { .uni-easyinput__content.is-focused:not(.is-input-error-border) {
border-color: $im-color-primary-light-2 ; border-color: $im-color-primary-light-2 !important;
.content-clear-icon { .content-clear-icon {
color: $im-color-primary-light-2 ; color: $im-color-primary-light-2 !important;
} }
} }
@ -85,91 +85,91 @@ button[size='mini'] {
} }
.segmented-control { .segmented-control {
border-color: $im-color-primary ; border-color: $im-color-primary !important;
.segmented-control__item--button { .segmented-control__item--button {
border-color: $im-color-primary ; border-color: $im-color-primary !important;
} }
.segmented-control__item--button--active { .segmented-control__item--button--active {
background-color: $im-color-primary ; background-color: $im-color-primary !important;
.segmented-control__text{ .segmented-control__text{
color: #fff ; color: #fff !important;
} }
} }
.segmented-control__text{ .segmented-control__text{
color: $im-color-primary ; color: $im-color-primary !important;
} }
} }
.uni-radio-input svg{ .uni-radio-input svg{
border-color: white ; border-color: white !important;
background-color: $im-color-primary ; background-color: $im-color-primary !important;
} }
.uni-radio-input svg { .uni-radio-input svg {
background-color: $im-color-primary ; background-color: $im-color-primary !important;
border-color: $im-color-primary ; border-color: $im-color-primary !important;
background-clip: content-box ; background-clip: content-box !important;
box-sizing: border-box; box-sizing: border-box;
border-radius: 50%; border-radius: 50%;
transform: translate(-50%, -50%) scale(0.7); transform: translate(-50%, -50%) scale(0.7)!important;
} }
.uni-radio-input svg path{ .uni-radio-input svg path{
fill: $im-color-primary ; fill: $im-color-primary !important;
} }
.uni-radio-input { .uni-radio-input {
background-color: white ; background-color: white !important;
border-color: $im-color-primary ; border-color: $im-color-primary !important;
} }
.uni-radio-input-disabled { .uni-radio-input-disabled {
background-color: rgb(225, 225, 225) ; background-color: rgb(225, 225, 225) !important;
border-color: rgb(209, 209, 209) ; border-color: rgb(209, 209, 209) !important;
opacity: 0.5; opacity: 0.5;
} }
.uni-section__content-title { .uni-section__content-title {
font-size: $im-font-size ; font-size: $im-font-size !important;
color: $im-text-color-light; color: $im-text-color-light;
} }
.uni-forms-item__label { .uni-forms-item__label {
color: $im-text-color; color: $im-text-color;
font-size: $im-font-size ; font-size: $im-font-size !important;
} }
.uni-forms-item { .uni-forms-item {
//margin-bottom: 8px ; //margin-bottom: 8px !important;
} }
.uni-easyinput__content-input { .uni-easyinput__content-input {
font-size: $im-font-size ; font-size: $im-font-size !important;
} }
.uni-easyinput__placeholder-class { .uni-easyinput__placeholder-class {
color: $im-text-color-lighter; color: $im-text-color-lighter;
font-size: $im-font-size ;; font-size: $im-font-size !important;;
} }
.uni-easyinput__content-textarea { .uni-easyinput__content-textarea {
font-size: $im-font-size ;; font-size: $im-font-size !important;;
} }
.uni-input-input:disabled { .uni-input-input:disabled {
color: $im-text-color-light; color: $im-text-color-light;
} }
.uni-forms-item.is-direction-top .uni-forms-item__label { .uni-forms-item.is-direction-top .uni-forms-item__label {
padding: 0 ; padding: 0 !important;
} }
.uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text { .uni-data-checklist .checklist-group .checklist-box .checklist-content .checklist-text {
font-size: $im-font-size ; font-size: $im-font-size !important;
} }
.uni-card .uni-card__content { .uni-card .uni-card__content {
color: unset ; color: unset !important;
padding: 10px 0 ; padding: 10px 0 !important;
} }
.uni-tag-text--small{ .uni-tag-text--small{
font-size: 10px ; font-size: 10px !important;
font-weight: bolder ; font-weight: bolder !important;
} }
.nav-bar { .nav-bar {
@ -199,19 +199,19 @@ button[size='mini'] {
} }
.emoji-large { .emoji-large {
width: 64rpx ; width: 64rpx !important;
height: 64rpx ; height: 64rpx !important;
vertical-align: bottom ; vertical-align: bottom !important;
} }
.emoji-normal { .emoji-normal {
width: 54rpx ; width: 54rpx !important;
height: 54rpx ; height: 54rpx !important;
vertical-align: bottom ; vertical-align: bottom !important;
} }
.emoji-small { .emoji-small {
width: 36rpx ; width: 36rpx !important;
height: 36rpx ; height: 36rpx !important;
vertical-align: bottom ; vertical-align: bottom !important;
} }

143
manifest.json
Unescape View File

@ -2,8 +2,8 @@
"name" : "瑜伽汇", "name" : "瑜伽汇",
"appid" : "__UNI__B6E0086", "appid" : "__UNI__B6E0086",
"description" : "瑜伽汇", "description" : "瑜伽汇",
"versionName" : "1.0.19", "versionName" : "1.0.18",
"versionCode" : 1019, "versionCode" : 1018,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"flexible" : true, "flexible" : true,
@ -152,143 +152,14 @@
} }
}, },
"nativePlugins" : { "nativePlugins" : {
"JG-JPush" : {
"JPUSH_ADVERTISINGID_IOS" : "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "",
"JPUSH_GOOGLE_API_KEY" : "",
"JPUSH_GOOGLE_APP_ID" : "",
"JPUSH_GOOGLE_PROJECT_ID" : "",
"JPUSH_GOOGLE_PROJECT_NUMBER" : "",
"JPUSH_GOOGLE_STORAGE_BUCKET" : "",
"JPUSH_HONOR_APPID" : "",
"JPUSH_HUAWEI_APPID" : "",
"JPUSH_ISPRODUCTION_IOS" : "",
"JPUSH_MEIZU_APPID" : "",
"JPUSH_MEIZU_APPKEY" : "",
"JPUSH_OPPO_APPID" : "",
"JPUSH_OPPO_APPKEY" : "",
"JPUSH_OPPO_APPSECRET" : "",
"JPUSH_VIVO_APPID" : "",
"JPUSH_VIVO_APPKEY" : "",
"JPUSH_XIAOMI_APPID" : "",
"JPUSH_XIAOMI_APPKEY" : "",
"__plugin_info__" : {
"name" : "瑜伽汇",
"description" : "瑜伽汇",
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4035",
"android_package_name" : "com.sdlyoga.app",
"ios_bundle_id" : "",
"isCloud" : true,
"bought" : 1,
"pid" : "4035",
"parameters" : {
"JPUSH_ADVERTISINGID_IOS" : {
"des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
"key" : "JPush:ADVERTISINGID",
"value" : ""
},
"JPUSH_DEFAULTINITJPUSH_IOS" : {
"des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
"key" : "JPush:DEFAULTINITJPUSH",
"value" : ""
},
"JPUSH_GOOGLE_API_KEY" : {
"des" : "厂商google api_key,示例:g-12346578",
"key" : "google_api_key",
"value" : ""
},
"JPUSH_GOOGLE_APP_ID" : {
"des" : "厂商google mobilesdk_app_id,示例：g-12346578",
"key" : "google_app_id",
"value" : ""
},
"JPUSH_GOOGLE_PROJECT_ID" : {
"des" : "厂商google project_id ,示例：g-12346578",
"key" : "project_id",
"value" : ""
},
"JPUSH_GOOGLE_PROJECT_NUMBER" : {
"des" : "厂商google project_number,示例：g-12346578",
"key" : "gcm_defaultSenderId",
"value" : ""
},
"JPUSH_GOOGLE_STORAGE_BUCKET" : {
"des" : "厂商google storage_bucket,示例：g-12346578",
"key" : "google_storage_bucket",
"value" : ""
},
"JPUSH_HONOR_APPID" : {
"des" : "厂商HONOR-appId,示例：12346578",
"key" : "com.hihonor.push.app_id",
"value" : ""
},
"JPUSH_HUAWEI_APPID" : {
"des" : "厂商HUAWEI-appId,示例：appid=12346578",
"key" : "com.huawei.hms.client.appid",
"value" : ""
},
"JPUSH_ISPRODUCTION_IOS" : {
"des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
"key" : "JPush:ISPRODUCTION",
"value" : ""
},
"JPUSH_MEIZU_APPID" : {
"des" : "厂商MEIZU-appId,示例：MZ-12345678",
"key" : "MEIZU_APPID",
"value" : ""
},
"JPUSH_MEIZU_APPKEY" : {
"des" : "厂商MEIZU-appKey,示例：MZ-12345678",
"key" : "MEIZU_APPKEY",
"value" : ""
},
"JPUSH_OPPO_APPID" : {
"des" : "厂商OPPO-appId,示例：OP-12345678",
"key" : "OPPO_APPID",
"value" : ""
},
"JPUSH_OPPO_APPKEY" : {
"des" : "厂商OPPO-appkey,示例：OP-12345678",
"key" : "OPPO_APPKEY",
"value" : ""
},
"JPUSH_OPPO_APPSECRET" : {
"des" : "厂商OPPO-appSecret,示例：OP-12345678",
"key" : "OPPO_APPSECRET",
"value" : ""
},
"JPUSH_VIVO_APPID" : {
"des" : "厂商VIVO-appId,示例：12345678",
"key" : "com.vivo.push.app_id",
"value" : ""
},
"JPUSH_VIVO_APPKEY" : {
"des" : "厂商VIVO-appkey,示例：12345678",
"key" : "com.vivo.push.api_key",
"value" : ""
},
"JPUSH_XIAOMI_APPID" : {
"des" : "厂商XIAOMI-appId,示例：MI-12345678",
"key" : "XIAOMI_APPID",
"value" : ""
},
"JPUSH_XIAOMI_APPKEY" : {
"des" : "厂商XIAOMI-appKey,示例：MI-12345678",
"key" : "XIAOMI_APPKEY",
"value" : ""
}
}
}
},
"JG-JCore" : { "JG-JCore" : {
"JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5", "JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_APPKEY_IOS" : "d5edb270e4b1cc29616e1dd5", "JPUSH_APPKEY_IOS" : "developer-default",
"JPUSH_CHANNEL_ANDROID" : "", "JPUSH_CHANNEL_ANDROID" : "d5edb270e4b1cc29616e1dd5",
"JPUSH_CHANNEL_IOS" : "", "JPUSH_CHANNEL_IOS" : "developer-default",
"__plugin_info__" : { "__plugin_info__" : {
"name" : "瑜伽汇", "name" : "极光推送 JCore 官方 SDK",
"description" : "瑜伽汇", "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
"platforms" : "Android,iOS", "platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4028", "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
"android_package_name" : "com.sdlyoga.app", "android_package_name" : "com.sdlyoga.app",

7
pages/login/login.vue
Unescape View File

@ -299,17 +299,10 @@
}); });
return false; return false;
} }
if(uni.getStorageSync("register_id")){
this.form.registerId=uni.getStorageSync("register_id");
this.$forceUpdate();
}
uni.setStorageSync('iftoken', "1"); uni.setStorageSync('iftoken', "1");
uni.showLoading({ uni.showLoading({
title: '正在登录...' title: '正在登录...'
}); });
const {data: res} = await uni.$http.post('/api/login',this.form); const {data: res} = await uni.$http.post('/api/login',this.form);
if(res&&res.code=="200"){ if(res&&res.code=="200"){
uni.setStorageSync("loginindex", "1"); uni.setStorageSync("loginindex", "1");

7
pages/login/register.vue
Unescape View File

@ -55,7 +55,6 @@
passwordSecond:"", passwordSecond:"",
password:"", password:"",
code:"", code:"",
registerId:"",
uuid:"" uuid:""
}, },
iflogin:false, iflogin:false,
@ -229,12 +228,6 @@
}); });
return false; return false;
} }
if(uni.getStorageSync("register_id")){
this.form.registerId=uni.getStorageSync("register_id");
this.$forceUpdate();
}
uni.showLoading({ uni.showLoading({
title: '正在注册...' title: '正在注册...'
}); });

Write Preview
Loading…
Cancel
Save