拉取

.gitlab-ci.yml

@@ -58,9 +58,15 @@ build_push_image_pred:
 remote_run_image_dev:
     stage: deploy
     script:
+<<<<<<< HEAD
       - bash ~/.local/bin/f200.sh   $CONTAINER_NAME    7084 80   $DEV_REPO:$CONTAINER_NAME  guojia   192.168.10.200
     tags:
       - shell-200
+=======
+      - bash ~/.local/bin/f200.sh $CONTAINER_NAME  8066 80  $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
+    tags:
+        - shell-200
+>>>>>>> 6aaa93d5bffd52579c8177bf216a345ea00d2eab
     only:
       - dev 
     when: on_success
@@ -69,7 +75,11 @@ remote_run_image_pred:
     stage: deploy
   
     script:
+<<<<<<< HEAD
       - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  7084 80  $PRED_REPO:$CONTAINER_NAME zp  39.106.144.161
+=======
+      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  8066  80  $PROD_REPO:$CONTAINER_NAME   zp 39.106.144.161
+>>>>>>> 6aaa93d5bffd52579c8177bf216a345ea00d2eab
     tags:
         - shell-prod 
     only:

css/index.css

@@ -21,15 +21,8 @@
 /* logo */
 #top_nav .logo {
     cursor: pointer;
+    background: url('../images/logo-02.svg')
 }
-
-#top_nav .logo img {
-    display: block;
-    margin-right: 12px;
-    width: 239px;
-
-}
-
 /* 导航栏 */
 #top_nav .nav {
     margin-top: 11px;