Skip to content

U
uni-starter

DCloud / uni-starter

通知 4684
Star 229
Fork 210
U
uni-starter
提交 83711abb 编写于 作者: Anne_LXM's avatar Anne_LXM 提交者： Anne_LXM
浏览文件
操作

static下的app-plus改为app

上级 4762d3c6
隐藏空白更改
内联 并排
Showing with 110 addition and 120 deletion
pages/ucenter/about/about.vue
浏览文件 @ 83711abb
......@@ -4,15 +4,15 @@
<image class="logoImg" :src="about.logo"></image>
<text class="tip appName">{{about.appName}}</text>
<text class="tip">Version {{version}}</text>
<view class="qrcode">
<!--uqrcode 组件来源，插件Sansnn-uQRCode 链接地址：https://ext.dcloud.net.cn/plugin?id=1287-->
<uqrcode :size="100" canvas-id="qrcode" :value="about.download"></uqrcode>
</view>
<view class="qrcode">
<!--uqrcode 组件来源，插件Sansnn-uQRCode 链接地址：https://ext.dcloud.net.cn/plugin?id=1287-->
<uqrcode :size="100" canvas-id="qrcode" :value="about.download"></uqrcode>
</view>
<text class="tip">{{$t('about.sacnQR')}} {{about.appName}} {{$t('about.client')}}</text>
</view>
<view class="copyright">
<view class="agreement-box" v-for="(agreement,index) in agreements" :key="index">
<view class="copyright">
<view class="agreement-box" v-for="(agreement,index) in agreements" :key="index">
<text class="agreement" @click="navigateTo(agreement)">《{{agreement.title}}》</text>
<text class="hint" v-if="agreements.length-1>index">{{$t('about.and')}}</text>
</view>
......@@ -22,25 +22,25 @@
</view>
</template>
<script>
// #ifdef APP
import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
const uniShare = new UniShare()
// #endif
import uniIdPagesConfig from '@/uni_modules/uni-id-pages/config.js';
import uqrcode from "@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode"
export default {
components:{
uqrcode
},
// #ifdef APP
onBackPress({from}) {
if(from=='backbutton'){
this.$nextTick(function(){
uniShare.hide()
})
return uniShare.isShow;
}
},
// #ifdef APP
import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
const uniShare = new UniShare()
// #endif
import uniIdPagesConfig from '@/uni_modules/uni-id-pages/config.js';
import uqrcode from "@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode"
export default {
components:{
uqrcode
},
// #ifdef APP
onBackPress({from}) {
if(from=='backbutton'){
this.$nextTick(function(){
uniShare.hide()
})
return uniShare.isShow;
}
},
// #endif
onLoad() {
// #ifdef APP-PLUS
......@@ -50,22 +50,22 @@
computed: {
uniStarterConfig() {
return getApp().globalData.config
},
agreements() {
if(!uniIdPagesConfig.agreements){
return []
}
let {serviceUrl,privacyUrl} = uniIdPagesConfig.agreements
return [
{
url:serviceUrl,
title:"用户服务协议"
},
{
url:privacyUrl,
title:"隐私政策条款"
}
]
},
agreements() {
if(!uniIdPagesConfig.agreements){
return []
}
let {serviceUrl,privacyUrl} = uniIdPagesConfig.agreements
return [
{
url:serviceUrl,
title:"用户服务协议"
},
{
url:privacyUrl,
title:"隐私政策条款"
}
]
}
},
data() {
......@@ -80,7 +80,7 @@
uni.setNavigationBarTitle({
title: this.$t('about.about')+ " " + this.about.appName
})
this.year = (new Date).getFullYear()
this.year = (new Date).getFullYear()
},
onNavigationBarButtonTap() {
let {
......@@ -98,7 +98,7 @@
imageUrl: logo + '?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决，在ios端分享图过大导致的图片失效问题
},
menus: [{
"img": "/static/app-plus/sharemenu/wechatfriend.png",
"img": "/static/app/sharemenu/wechatfriend.png",
"text": this.$t('common.wechatFriends'),
"share": {
"provider": "weixin",
......@@ -106,7 +106,7 @@
}
},
{
"img": "/static/app-plus/sharemenu/wechatmoments.png",
"img": "/static/app/sharemenu/wechatmoments.png",
"text": this.$t('common.wechatBbs'),
"share": {
"provider": "weixin",
......@@ -114,26 +114,26 @@
}
},
{
"img": "/static/app-plus/sharemenu/weibo.png",
"img": "/static/app/sharemenu/weibo.png",
"text": this.$t('common.weibo'),
"share": {
"provider": "sinaweibo"
}
},
{
"img": "/static/app-plus/sharemenu/qq.png",
"img": "/static/app/sharemenu/qq.png",
"text": "QQ",
"share": {
"provider": "qq"
}
},
{
"img": "/static/app-plus/sharemenu/copyurl.png",
"img": "/static/app/sharemenu/copyurl.png",
"text": this.$t('common.copy'),
"share": "copyurl"
},
{
"img": "/static/app-plus/sharemenu/more.png",
"img": "/static/app/sharemenu/more.png",
"text": this.$t('common.more'),
"share": "shareSystem"
}
......@@ -149,7 +149,7 @@
title
}) {
uni.navigateTo({
url: '/uni_modules/uni-id-pages/pages/common/webview/webview?url=' + url + '&title=' + title,
url: '/uni_modules/uni-id-pages/pages/common/webview/webview?url=' + url + '&title=' + title,
success: res => {},
fail: () => {},
complete: () => {}
......@@ -167,8 +167,8 @@
}
/* #endif */
.about {
flex-direction: column;
justify-content: center;
flex-direction: column;
justify-content: center;
align-items: center;
}
......@@ -199,14 +199,14 @@
font-weight: 500;
}
.qrcode ,.qrcode .uqrcode{
margin: 10px 0;
width: 100px;
.qrcode ,.qrcode .uqrcode{
margin: 10px 0;
width: 100px;
height: 100px;
/* #ifndef APP-NVUE */
display: block;
/* #endif */
}
/* #ifndef APP-NVUE */
display: block;
/* #endif */
}
.copyright {
font-size: 32rpx;
......
pages/ucenter/ucenter.vue
浏览文件 @ 83711abb
......@@ -125,7 +125,7 @@
"to": '/pages/ucenter/settings/settings',
"icon": "gear"
}],
// #ifndef MP-WEIXIN
// #ifdef APP-PLUS
[{
"title": this.$t('mine.about'),
"to": '/pages/ucenter/about/about',
......@@ -156,12 +156,13 @@
})
//#endif
},
onShow() {},
onShow() {
},
computed: {
userInfo() {
return store.userInfo
},
hasLogin() {
hasLogin(){
return store.hasLogin
},
// #ifdef APP-PLUS
......@@ -174,10 +175,6 @@
}
},
methods: {
// 自动化测试专用
hasLoginTest(){
return store.hasLogin
},
toSettings() {
uni.navigateTo({
url: "/pages/ucenter/settings/settings"
......@@ -186,7 +183,7 @@
signIn() { //普通签到
this.$refs.signIn.open()
},
signInByAd() { //看激励视频广告签到
signInByAd(){ //看激励视频广告签到
this.$refs.signIn.showRewardedVideoAd()
},
/**
......@@ -217,7 +214,7 @@
tapGrid(index) {
uni.showToast({
// title: '你点击了，第' + (index + 1) + '个',
title: this.$t('mine.clicked') + " " + (index + 1),
title: this.$t('mine.clicked') + " " + (index + 1) ,
icon: 'none'
});
},
......@@ -229,11 +226,8 @@
if (uni.getSystemInfoSync().platform == "ios") {
// 这里填写appstore应用id
let appstoreid = this.appConfig.marketId.ios; // 'id1417078253';
console.log({
appstoreid
});
plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8',
err => {
console.log({appstoreid});
plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8',err=>{
console.log('plus.runtime.openURL err:' + JSON.stringify(err));
});
}
......@@ -250,7 +244,7 @@
/**
* 获取积分信息
*/
async getScore() {
getScore() {
if (!this.userInfo) return uni.showToast({
title: this.$t('mine.checkScore'),
icon: 'none'
......@@ -258,7 +252,7 @@
uni.showLoading({
mask: true
})
return await db.collection("uni-id-scores")
db.collection("uni-id-scores")
.where('"user_id" == $env.uid')
.field('score,balance')
.orderBy("create_date", "desc")
......@@ -268,23 +262,19 @@
console.log(res);
const data = res.result.data[0];
let msg = '';
msg = data ? (this.$t('mine.currentScore') + data.balance) : this.$t('mine.noScore');
msg = data ? (this.$t('mine.currentScore')+ data.balance) : this.$t('mine.noScore');
uni.showToast({
title: msg,
icon: 'none'
});
return res.result.data[0]
}).finally((err) => {
}).finally(()=>{
uni.hideLoading()
return err
})
},
async share() {
let {
result
} = await db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('my_invite_code').get()
let {result} = await db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('my_invite_code').get()
let myInviteCode = result.data[0].my_invite_code
if (!myInviteCode) {
if(!myInviteCode){
return uni.showToast({
title: '请检查uni-config-center中uni-id配置，是否已启用 autoSetInviteCode',
icon: 'none'
......@@ -309,7 +299,7 @@
'?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决，在ios端分享图过大导致的图片失效问题
},
menus: [{
"img": "/static/app-plus/sharemenu/wechatfriend.png",
"img": "/static/app/sharemenu/wechatfriend.png",
"text": this.$t('common.wechatFriends'),
"share": {
"provider": "weixin",
......@@ -317,7 +307,7 @@
}
},
{
"img": "/static/app-plus/sharemenu/wechatmoments.png",
"img": "/static/app/sharemenu/wechatmoments.png",
"text": this.$t('common.wechatBbs'),
"share": {
"provider": "weixin",
......@@ -325,26 +315,26 @@
}
},
{
"img": "/static/app-plus/sharemenu/weibo.png",
"img": "/static/app/sharemenu/weibo.png",
"text": this.$t('common.weibo'),
"share": {
"provider": "sinaweibo"
}
},
{
"img": "/static/app-plus/sharemenu/qq.png",
"img": "/static/app/sharemenu/qq.png",
"text": "QQ",
"share": {
"provider": "qq"
}
},
{
"img": "/static/app-plus/sharemenu/copyurl.png",
"img": "/static/app/sharemenu/copyurl.png",
"text": this.$t('common.copy'),
"share": "copyurl"
},
{
"img": "/static/app-plus/sharemenu/more.png",
"img": "/static/app/sharemenu/more.png",
"text": this.$t('common.more'),
"share": "shareSystem"
}
......
uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
浏览文件 @ 83711abb
......@@ -66,47 +66,47 @@
{
"id": "apple",
"text": "苹果登录",
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/apple.png",
},
{
"id": "univerify",
"text": "一键登录",
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/univerify.png",
},
{
"id": "taobao",
"text": "淘宝登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/taobao.png",
},
{
"id": "facebook",
"text": "脸书登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/facebook.png",
},
{
"id": "alipay",
"text": "支付宝登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/alipay.png",
},
{
"id": "qq",
"text": "QQ登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/qq.png",
},
{
"id": "google",
"text": "谷歌登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/google.png",
},
{
"id": "douyin",
"text": "抖音登录", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/douyin.png",
},
{
"id": "sinaweibo",
"text": "新浪微博", //暂未提供该登录方式的接口示例
"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png",
"logo": "/uni_modules/uni-id-pages/static/app/uni-fab-login/sinaweibo.png",
}
// #endif
],
......@@ -211,22 +211,22 @@
} else if (this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
uni.navigateBack();
} else if (this.getRoute(1) != path) {
if(index === 0){
uni.navigateTo({
url: path,
animationType: 'slide-in-left',
complete(e) {
// console.log(e);
}
})
}else{
uni.redirectTo({
url: path,
animationType: 'slide-in-left',
complete(e) {
// console.log(e);
}
})
if(index === 0){
uni.navigateTo({
url: path,
animationType: 'slide-in-left',
complete(e) {
// console.log(e);
}
})
}else{
uni.redirectTo({
url: path,
animationType: 'slide-in-left',
complete(e) {
// console.log(e);
}
})
}
} else {
console.log('出乎意料的情况,path：' + path);
......
uni_modules/uni-share/readme.md
浏览文件 @ 83711abb
......@@ -27,7 +27,7 @@
imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png'
},
menus: [{
"img": "/static/app-plus/sharemenu/wechatfriend.png",
"img": "/static/app/sharemenu/wechatfriend.png",
"text": "微信好友",
"share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5
"provider": "weixin",
......@@ -35,7 +35,7 @@
}
},
{
"img": "/static/app-plus/sharemenu/wechatmoments.png",
"img": "/static/app/sharemenu/wechatmoments.png",
"text": "微信朋友圈",
"share": {
"provider": "weixin",
......@@ -43,7 +43,7 @@
}
},
{
"img": "/static/app-plus/sharemenu/mp_weixin.png",
"img": "/static/app/sharemenu/mp_weixin.png",
"text": "微信小程序",
"share": {
provider: "weixin",
......@@ -58,26 +58,26 @@
}
},
{
"img": "/static/app-plus/sharemenu/weibo.png",
"img": "/static/app/sharemenu/weibo.png",
"text": "微博",
"share": {
"provider": "sinaweibo"
}
},
{
"img": "/static/app-plus/sharemenu/qq.png",
"img": "/static/app/sharemenu/qq.png",
"text": "QQ",
"share": {
"provider": "qq"
}
},
{
"img": "/static/app-plus/sharemenu/copyurl.png",
"img": "/static/app/sharemenu/copyurl.png",
"text": "复制",
"share": "copyurl"
},
{
"img": "/static/app-plus/sharemenu/more.png",
"img": "/static/app/sharemenu/more.png",
"text": "更多",
"share": "shareSystem"
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或