Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx

pages/release/tosign.vue

@@ -62,7 +62,8 @@
 				fileListes:[],
 				rSelect:[],
 				image:"",
-				token:""
+				token:"",
+				tiaozhuan:false
 			};
 		},
 		methods: {
@@ -80,6 +81,7 @@
 			tupian(){
 				uni.hideLoading()
 			},
+            sccg() {},
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
 				//console.log(e);
@@ -106,8 +108,11 @@
 				this.init()
 			},
 			tupian(a){
-				console.log(JSON.parse(a.data))
+                // console.log(JSON.parse(a.data));
-				this.image = JSON.parse(a.data).data.file_name
+                let info = JSON.parse(a.data);
+                console.log(info.data.file_path);
+				// console.log(JSON.stringify(a.data))
+				this.image = info.data.file_path;
 			},
 			navto(url){
 				this.$u.route({
@@ -115,6 +120,10 @@
 				})
 			},
 			kaibo(){
+				if(this.tiaozhuan){
+					return ;
+				}
+				this.tiaozhuan = true
 				this.$u.api.createChatRoom({
 					chat_name:this.max,
 					live_desc:this.form.text,
@@ -128,6 +137,7 @@
 							title: res.message,
 							type: 'error'
 						});
+						this.tiaozhuan = false
 					}
 					this.$u.route({
 						url:"/pages/release/zhibo",