zlg 7 years ago
parent
commit
11c5ab5c4a

+ 1 - 0
.gitignore

@@ -7,6 +7,7 @@ dist/settingview
 dist/smsChart
 dist/talkview
 dist/userview
+dist/web12345
 dist/lszw12345
 dist/web12345
 dist/peer

+ 11 - 0
bash.exe.stackdump

@@ -0,0 +1,11 @@
+Stack trace:
+Frame        Function    Args
+001803380D0  0018007164E (0018025E730, 00180224DD9, 001803380D0, 000FFFFB9F0)
+001803380D0  00180046669 (00000000002, 00000000003, 00000000002, 000C0000000)
+001803380D0  001800466A2 (00000000002, 001803383E0, 001803380D0, 00000000008)
+001803380D0  0018006BC7A (655C645C2F5C3E5C, 745C745C2F5C765C, 265C265C205C795C, 615C655C725C205C)
+000FFFFCCC0  0018006BD20 (635C655C205C265C, 3E5C205C6F5C685C, 765C655C645C2F5C, 795C745C745C2F5C)
+000FFFFCCC0  00180046E7F (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  0018004590C (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  001800459A4 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace

+ 1 - 0
lszw12345/src/less/app.home.less

@@ -31,6 +31,7 @@ body{
 
 .lszw-home {
     width: 100%;
+    height: 100%;
     .bgImg {
         height: 100px;
         background: url(../img/webChatImg/flower.png) left top no-repeat;

File diff suppressed because it is too large
+ 4 - 4
userview/src/js/templates.js


+ 1 - 1
userview/temp/manifest/app-css-manifest.json

@@ -1,3 +1,3 @@
 {
-  "app.css": "app-fb6170b9a0.css"
+  "app.css": "app-a262e43cb3.css"
 }

+ 1 - 1
userview/temp/manifest/app-js-manifest.json

@@ -1,3 +1,3 @@
 {
-  "app.js": "app-1103e15dc2.js"
+  "app.js": "app-8c10ed8d9b.js"
 }

+ 1 - 1
web12345/Gulpfile.js

@@ -24,7 +24,7 @@ var paths = {
             'temp/css/*'
         ],
         less: [
-            '../common/*.less',
+            // '../common/*.less',
             'src/less/*.less'
         ],
         imgs: [

+ 1 - 0
web12345/src/html/index.html

@@ -29,6 +29,7 @@
     <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=d7455920303550a45cb4e1a27bdbfc86"></script>
     <script type="text/javascript" src="https://qiyukf.com/script/acdf3e0b8a30e358652592e57b7d6a94.js"></script>
     <ui-view></ui-view>
+
 </body>
 
 </html>