LiuZhengYu/KunWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.ciy.cn:4001/ciy/ciyon

This commit is contained in:
boi 2025-06-26 07:04:42 +08:00
parent 960c03c1ab cf72f665a1
commit 6ccc055d0d
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue
View File

@ -351,25 +351,25 @@
var sourcetypes = this.sourcetype.split(','); var sourcetypes = this.sourcetype.split(',');
if (sourcetypes.includes('rehcam')) { if (sourcetypes.includes('rehcam')) {
items.push({ items.push({
url: 'rehcam', act: 'rehcam',
name: this.lang('upload.menu_rehcam') name: this.lang('upload.menu_rehcam')
}); });
} }
if (sourcetypes.includes('camera')) { if (sourcetypes.includes('camera')) {
items.push({ items.push({
url: 'camera', act: 'camera',
name: this.lang('upload.menu_camera') name: this.lang('upload.menu_camera')
}); });
} }
if (sourcetypes.includes('album')) { if (sourcetypes.includes('album')) {
items.push({ items.push({
url: 'album', act: 'album',
name: this.lang('upload.menu_album') name: this.lang('upload.menu_album')
}); });
} }
if (sourcetypes.includes('message')) { if (sourcetypes.includes('message')) {
items.push({ items.push({
url: 'message', act: 'message',
name: this.lang('upload.menu_message') name: this.lang('upload.menu_message')
}); });
} }
@ -377,13 +377,13 @@
items, items,
one: true one: true
}); });
if (item.url == 'rehcam') if (item.act == 'rehcam')
this.vrehcam(); this.vrehcam();
if (item.url == 'camera') if (item.act == 'camera')
this.vcamera(); this.vcamera();
if (item.url == 'album') if (item.act == 'album')
this.valbum(); this.valbum();
if (item.url == 'message') if (item.act == 'message')
this.vmessage(); this.vmessage();
}, },
photo_delone(b) { photo_delone(b) {

23
fapp/ciyon_ap/util/ciy.js
View File

@ -902,10 +902,13 @@ export default {
return str; return str;
}, },
async gourl(b, type) { //url支持 http[web]、![原型]、*[alert提示]、$[需登录常规url]、常规url async gourl(b, type, initdata) { //url支持 http[web]、![原型]、*[alert提示]、$[需登录常规url]、常规url
var url = ''; var url = '';
if (typeof(b) != 'string') { if (typeof(b) != 'string') {
url = b.currentTarget.dataset.url; url = b.currentTarget.dataset.url;
if (!initdata) {
initdata = b.currentTarget.dataset.initdata;
}
} else { } else {
url = b; url = b;
} }
@ -932,6 +935,8 @@ export default {
if (auth.me.id == 0) if (auth.me.id == 0)
return; return;
} }
if (initdata)
app.globalData.ciy_page_init = initdata;
app.globalData.ciy_page_g = this.g; app.globalData.ciy_page_g = this.g;
if (type == 'redirect') { if (type == 'redirect') {
uni.redirectTo({ uni.redirectTo({
@ -1787,17 +1792,13 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.getrefs('popmenu').then(ref => { this.getrefs('popmenu').then(ref => {
ref.Open(opn).then(item => { ref.Open(opn).then(item => {
if (item.func == 'go' && item.url) { if (item.url) {
if (item.data) { if (item.data)
var app = getApp(); this.gourl(item.url, item.type, {
app.globalData.ciy_page_init = {
...item.data ...item.data
}; });
app.globalData.ciy_page_g = this.g; else
} this.gourl(item.url, item.type);
uni.navigateTo({
url: item.url
});
return; return;
} }
if (typeof(this[item.func]) == 'function') { if (typeof(this[item.func]) == 'function') {

8
fapp/ciyon_ap/util/style.css
View File

@ -331,7 +331,7 @@ text {
.ciy-list .lb { .ciy-list .lb {
position: absolute; position: absolute;
bottom: 0.8em; bottom: 0.9em;
left: 1.2em; left: 1.2em;
font-size: 0.9em; font-size: 0.9em;
} }
@ -968,15 +968,15 @@ text {
text-decoration: underline; text-decoration: underline;
} }
.txt-left.txt-left { .txt-left.txt-left.txt-left {
text-align: left; text-align: left;
} }
.txt-center.txt-center { .txt-center.txt-center.txt-center {
text-align: center; text-align: center;
} }
.txt-right.txt-right { .txt-right.txt-right.txt-right {
text-align: right; text-align: right;
} }