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

fapp/ciyon_ap/components/ciy-upload/ciy-upload.vue

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

fapp/ciyon_ap/util/ciy.js

@@ -902,10 +902,13 @@ export default {
 					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 = '';
 					if (typeof(b) != 'string') {
 						url = b.currentTarget.dataset.url;
+						if (!initdata) {
+							initdata = b.currentTarget.dataset.initdata;
+						}
 					} else {
 						url = b;
 					}
@@ -932,6 +935,8 @@ export default {
 							if (auth.me.id == 0)
 								return;
 						}
+						if (initdata)
+							app.globalData.ciy_page_init = initdata;
 						app.globalData.ciy_page_g = this.g;
 						if (type == 'redirect') {
 							uni.redirectTo({
@@ -1787,17 +1792,13 @@ export default {
 					return new Promise((resolve, reject) => {
 						this.getrefs('popmenu').then(ref => {
 							ref.Open(opn).then(item => {
-								if (item.func == 'go' && item.url) {
-									if (item.data) {
-										var app = getApp();
-										app.globalData.ciy_page_init = {
+								if (item.url) {
+									if (item.data)
+										this.gourl(item.url, item.type, {
 											...item.data
-										};
-										app.globalData.ciy_page_g = this.g;
-									}
-									uni.navigateTo({
-										url: item.url
-									});
+										});
+									else
+										this.gourl(item.url, item.type);
 									return;
 								}
 								if (typeof(this[item.func]) == 'function') {

fapp/ciyon_ap/util/style.css

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