Merge branch 'dev' into dev-fix/#14

.gitlab-ci.yml

@@ -58,7 +58,7 @@ build_push_image_pred:
 remote_run_image_dev:
     stage: deploy
     script:
-      - bash ~/.local/bin/f200.sh $CONTAINER_NAME  8066 80  $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
+      - bash ~/.local/bin/f200.sh $CONTAINER_NAME  7084 80  $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
     tags:
         - shell-200
     only:
@@ -69,7 +69,7 @@ remote_run_image_pred:
     stage: deploy
   
     script:
-      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  8066  80  $PROD_REPO:$CONTAINER_NAME   zp 39.106.144.161
+      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  7084  80  $PRED_REPO:$CONTAINER_NAME   zp 39.106.144.161
     tags:
         - shell-prod 
     only:

css/index.css

@@ -1633,13 +1633,6 @@
 }
 
 /* 千家大地图 */
-#qj_map .map_content {
-    width: 100%;
-    height: 900px;
-    margin-top: 60px;
-    background: url('../images/map.jpg') no-repeat center;
-}
-
 /* 底部 */
 #footer {
     height: 220px;