Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

# Conflicts:
#	Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -22,13 +22,13 @@ export default {
   // ],
   "apiHost": [
     // "http://localhost:31173/"
-	"http://192.168.10.58:8012/"
+	"http://cyzjzx.gnway.cc:30626/"
   ],
-  "webHost":"http://192.168.10.58:8009/",
+  "webHost":"http://cyzjzx.gnway.cc:29618/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428
-    { username: "42052819780120143x", password: "www.qj.com" }
+    { username: "system", password: "www.qj.com" }
   ],
   //是否分布式部署 指WebApi与Web不在一台服务器
   "isDistributed":true,

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js

@@ -273,7 +273,7 @@ export default {
 						var labeId = item.id
 						// 从缓存取出当前审批流程所有的guid
 						var guids = JSON.parse(uni.getStorageSync('guids'))
-						if (guids) {
+						if (guids&&JSON.stringify(guids)!=='{}') {
 							guid = guids[labeId]
 						}
 					}