Merge branch 'wxl-multiple-student' of…

Merge branch 'wxl-multiple-student' of git.server:wangxuelai/wechatapp.shangjiadao.com into students_lvtz

constants/constants.js

@@ -15,7 +15,7 @@ export default {
     duration: 300,
     size: 524288000 // 视频大小5分钟500MB
   },
-  pcWebAddress: 'https://biz.qingxiao.online',    
+  pcWebAddress: 'https://biz.qingxiao.online', 
   register: {
     industry: [
       '教育培训',

src/pages/clockeditor/index.js

@@ -445,6 +445,7 @@ Page({
     }).then((res) => {
       let data = JSON.parse(res.data);
       if (data.status == 'ok') {
+        console.log(filename, 'filenamefilename');
         imageBox[this.data.currentIndex].status = 'fullfilled';
         imageBox[this.data.currentIndex].src = filename;
         let currentIndex = this.data.currentIndex + 1;

utilities/index.js

@@ -53,7 +53,8 @@ function needLogin() {
 
 function getRandomFilename(filename) {
 	const file = filename.match(/^(.*)(\.[A-z]+)$/);
-	return file === null ? md5(String(Date.now() + Math.random()) + filename) : (md5(String(Date.now() + Math.random()) + file[1]) + file[2]);
+	// chooseimage处理图片返回.unknown
+	return file === null ? md5(String(Date.now() + Math.random()) + filename) : (md5(String(Date.now() + Math.random()) + file[1]) + (file[2] == '.unknown' ? '.jpg' : file[2]));
 }
 
 function imagify(src, params) {