dever 5 years ago
parent
commit
40950f8361
3 changed files with 20 additions and 15 deletions
  1. 15 12
      lib/dever/index.js
  2. 1 1
      main.js
  3. 4 2
      pages/user/login.vue

+ 15 - 12
lib/dever/index.js

@@ -587,21 +587,20 @@ var dever = {
 	//设置全局变量
 	setConfig : function(url, config, key, value) {
 		var self = this;
+		if (!config && key && value) {
+			config = self.data('dever_config');
+			config[key] = value;
+		}
+		self.config = config;
+		self.vue.prototype.$config = self.config;
+		self.data('dever_config', self.config);
 		if (url) {
 			self.post(url, {noloading:1}, function(t) {
 				self.config = t;
 				self.config.update_time = self.curTime();
 				self.data('dever_config', self.config);
-				vue.prototype.$config = self.config;
+				self.vue.prototype.$config = self.config;
 			});
-		} else {
-			if (!config && key && value) {
-				config = self.data('dever_config');
-				config[key] = value;
-			}
-			self.config = config;
-			vue.prototype.$config = self.config;
-			self.data('dever_config', self.config);
 		}
 	},
 	//加载通用的方法
@@ -696,12 +695,16 @@ var dever = {
 		var route = page.route;
 		var options = page.options;
 		
+		
 		// 拼接参数
-		let param = ''
-		if (options && options.length > 0) {
+		let param = []
+		if (options) {
 			for (let key in options) {
-			    param += '&' + key + '=' + options[key]
+				param.push(key + '=' + options[key]);
 			}
+		}
+		param = param.join('&');
+		if (param) {
 			param = '?' + param;
 		}
 

+ 1 - 1
main.js

@@ -27,7 +27,7 @@ Vue.prototype.Dever = Dever;
 var defaultConfig = {
 	'system_name' : '云店',
 	'system_info' : '云店',
-	'system_logo' : 'static/yd_logo.png',
+	'system_logo' : '../../static/yd_logo.png',
 	//自动更新时间间隔
 	'set_update' : 86400,
 	//本次更新时间

+ 4 - 2
pages/user/login.vue

@@ -3,8 +3,8 @@
 	
 		<view class="content">
 			<!-- 头部logo -->
-			<view class="header">
-				<image :src="Dever.config.system_logo" @click="Dever.viewPic([Dever.config.system_logo], Dever.config.system_logo)"></image>
+			<view class="header" v-if="system_logo">
+				<image :src="system_logo" @click="Dever.viewPic([system_logo], system_logo)"></image>
 			</view>
 			<!-- 主体 -->
 			<view class="main">
@@ -77,6 +77,7 @@
 	export default {
 		data() {
 			return {
+				system_logo : '',
 				phoneData:'', // 用户/电话
 				passData:'', //密码
 				verCode:"", //验证码
@@ -90,6 +91,7 @@
 		},
 		mounted() {
 			self = this;
+			this.system_logo = this.Dever.config.system_logo;
 		},
 		methods: {
 			isShowAgree(){