Merge branch 'master' of http://git.scdxtc.com/chen/huaxia
						commit
						a36a77e3e6
					
				| 
						 | 
				
			
			@ -8,7 +8,7 @@
 | 
			
		|||
        <title>关于我们</title>
 | 
			
		||||
        <link rel="stylesheet" type="text/css" href="../../css/swiper-bundle.min.css" />
 | 
			
		||||
        <link rel="stylesheet" href="../../css/aboutUs.css">
 | 
			
		||||
 | 
			
		||||
        <link rel="stylesheet" href="../../css/centerHead.css">
 | 
			
		||||
        <script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
        <script src="../../js/swiper-bundle.min.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
        <script src="../../js/huaxia.js"></script>
 | 
			
		||||
| 
						 | 
				
			
			@ -18,14 +18,7 @@
 | 
			
		|||
                height: 285px;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            .ty_moban {
 | 
			
		||||
                width: 100%;
 | 
			
		||||
                box-shadow: 0px 3px 4px rgb(0 0 0 / 6%);
 | 
			
		||||
                padding-bottom: 7px;
 | 
			
		||||
                position: relative;
 | 
			
		||||
                height: 2px;
 | 
			
		||||
                z-index: 2;
 | 
			
		||||
            }
 | 
			
		||||
        
 | 
			
		||||
            .foot-iframe {
 | 
			
		||||
                width: 100%;
 | 
			
		||||
                height: 400px;
 | 
			
		||||
| 
						 | 
				
			
			@ -34,8 +27,26 @@
 | 
			
		|||
    </head>
 | 
			
		||||
 | 
			
		||||
    <body>
 | 
			
		||||
        <iframe src="../../public/center-head.html" class="ty_topifrane" frameborder="0" scrolling="no"></iframe>
 | 
			
		||||
        <P class="ty_moban"></P>
 | 
			
		||||
        <header class="ty_herader">
 | 
			
		||||
            <img src="../../img/grzx/topimg.jpg" title="图1" alt="图片已缺失">
 | 
			
		||||
            <nav class="ty_w ty_w1220 ty_ds">
 | 
			
		||||
                <img src="../../img/logo.png" title="图2" alt="图片已缺失">
 | 
			
		||||
                <ul class="ty_listnav">
 | 
			
		||||
    
 | 
			
		||||
                    <li> 123</li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../../index.html">网站首页</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" class="ty_gr" href="../aboutUs/aboutUs.html">关于我们</a></li>
 | 
			
		||||
                
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../logshoppingcar/shopcar.html"><img class="ty_topicon" title="图3" src="../../img/sy-scart.png" alt="图片已缺失">我的购物车</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../artNetwork/pointsMall.html">积分商城</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../contactUs/contactUs.html">联系我们</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../grzx/personalData.html" >个人中心</a></li>
 | 
			
		||||
                    <li><a target="_parent" href="../logshoppingcar/login.html">【退出】</a></li>
 | 
			
		||||
    
 | 
			
		||||
                </ul>
 | 
			
		||||
            </nav>
 | 
			
		||||
        </header>
 | 
			
		||||
       
 | 
			
		||||
        <div class="ty_her ty_pd">
 | 
			
		||||
            关于我们
 | 
			
		||||
        </div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,7 @@
 | 
			
		|||
        <title>艺术家个人中心</title>
 | 
			
		||||
        <link rel="stylesheet" href="../../css/institutions/institutions.css">
 | 
			
		||||
		<link rel="stylesheet" type="text/css" href="../../css/huaxia.css"/>
 | 
			
		||||
        <link rel="stylesheet" href="../css/centerHead.css">
 | 
			
		||||
		<script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
		<script src="../../js/artistCenter/artistCenter.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
		<script src="https://unpkg.com/wangeditor/dist/wangEditor.min.js"></script>
 | 
			
		||||
| 
						 | 
				
			
			@ -45,7 +46,25 @@
 | 
			
		|||
    </head>
 | 
			
		||||
 | 
			
		||||
    <body class="ty_co">
 | 
			
		||||
        <iframe src="../../public/center-head.html" class="ty_topifrane" frameborder="0" scrolling="no"></iframe>
 | 
			
		||||
        <header class="ty_herader">
 | 
			
		||||
            <img src="../../img/grzx/topimg.jpg" title="图1" alt="图片已缺失">
 | 
			
		||||
            <nav class="ty_w ty_w1220 ty_ds">
 | 
			
		||||
                <img src="../../img/logo.png" title="图2" alt="图片已缺失">
 | 
			
		||||
                <ul class="ty_listnav">
 | 
			
		||||
    
 | 
			
		||||
                    <li> 123</li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../../index.html">网站首页</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" class="ty_gr" href="../aboutUs/aboutUs.html">关于我们</a></li>
 | 
			
		||||
                
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../logshoppingcar/shopcar.html"><img class="ty_topicon" title="图3" src="../../img/sy-scart.png" alt="图片已缺失">我的购物车</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../artNetwork/pointsMall.html">积分商城</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../contactUs/contactUs.html">联系我们</a></li>
 | 
			
		||||
                    <li><span class="ty_di"></span><a target="_parent" href="../grzx/personalData.html" >个人中心</a></li>
 | 
			
		||||
                    <li><a target="_parent" href="../logshoppingcar/login.html">【退出】</a></li>
 | 
			
		||||
    
 | 
			
		||||
                </ul>
 | 
			
		||||
            </nav>
 | 
			
		||||
        </header>
 | 
			
		||||
        <div class="mian ">
 | 
			
		||||
            <div class="ty_ds">
 | 
			
		||||
                <button class="naliu">菜单</button>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,6 +10,7 @@
 | 
			
		|||
        <title>联系我们</title>
 | 
			
		||||
        <link rel="stylesheet" type="text/css" href="../../css/swiper-bundle.min.css" />
 | 
			
		||||
        <link rel="stylesheet" href="../../css/aboutUs.css">
 | 
			
		||||
        <link rel="stylesheet" href="../../css/centerHead.css">
 | 
			
		||||
        <script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
        <script src="../../js/swiper-bundle.min.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
        <script type="text/javascript" src="http://api.map.baidu.com/geocoder/v2/?ak=mDcZsWM7gGKb7MC1bC8Mo33FScjYEr0I&output=json&address=百度大厦&city=北京市"></script>
 | 
			
		||||
| 
						 | 
				
			
			@ -40,25 +41,33 @@
 | 
			
		|||
                height: 400px;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            .ty_moban {
 | 
			
		||||
                width: 100%;
 | 
			
		||||
                box-shadow: 0px 3px 6px rgb(0 0 0 / 6%);
 | 
			
		||||
                padding-bottom: 7px;
 | 
			
		||||
                position: relative;
 | 
			
		||||
                height: 2px;
 | 
			
		||||
                z-index: 2;
 | 
			
		||||
            }
 | 
			
		||||
     
 | 
			
		||||
        </style>
 | 
			
		||||
    </head>
 | 
			
		||||
 | 
			
		||||
    <body>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        <body>
 | 
			
		||||
            <iframe src="../../public/center-head.html" class="ty_topifrane" frameborder="0" scrolling="no"></iframe>
 | 
			
		||||
            <p class="ty_moban"></p>
 | 
			
		||||
            <header class="ty_herader">
 | 
			
		||||
                <img src="../../img/grzx/topimg.jpg" title="图1" alt="图片已缺失">
 | 
			
		||||
                <nav class="ty_w ty_w1220 ty_ds">
 | 
			
		||||
                    <img src="../../img/logo.png" title="图2" alt="图片已缺失">
 | 
			
		||||
                    <ul class="ty_listnav">
 | 
			
		||||
        
 | 
			
		||||
                        <li> 123</li>
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent" href="../../index.html">网站首页</a></li>
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent"  href="../aboutUs/aboutUs.html">关于我们</a></li>
 | 
			
		||||
                    
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent" href="../logshoppingcar/shopcar.html"><img class="ty_topicon" title="图3" src="../../img/sy-scart.png" alt="图片已缺失">我的购物车</a></li>
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent" href="../artNetwork/pointsMall.html">积分商城</a></li>
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent" class="ty_gr" href="../contactUs/contactUs.html">联系我们</a></li>
 | 
			
		||||
                        <li><span class="ty_di"></span><a target="_parent" href="../grzx/personalData.html" >个人中心</a></li>
 | 
			
		||||
                        <li><a target="_parent" href="../logshoppingcar/login.html">【退出】</a></li>
 | 
			
		||||
        
 | 
			
		||||
                    </ul>
 | 
			
		||||
                </nav>
 | 
			
		||||
            </header>
 | 
			
		||||
       
 | 
			
		||||
            <div class="ty_her ty_pd">
 | 
			
		||||
                联系我们
 | 
			
		||||
            </div>
 | 
			
		||||
| 
						 | 
				
			
			@ -118,20 +127,52 @@
 | 
			
		|||
                });
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
          LoadBaiduMapScript().then((BMap)=>{
 | 
			
		||||
            LoadBaiduMapScript().then((BMap) => {
 | 
			
		||||
                // 百度地图API功能
 | 
			
		||||
 | 
			
		||||
                var map = new BMap.Map("allmap");    // 创建Map实例
 | 
			
		||||
            map.centerAndZoom(new BMap.Point(116.404, 39.915), 11);  // 初始化地图,设置中心点坐标和地图级别
 | 
			
		||||
            //添加地图类型控件
 | 
			
		||||
            map.addControl(new BMap.MapTypeControl({
 | 
			
		||||
                mapTypes: [
 | 
			
		||||
                    BMAP_NORMAL_MAP,
 | 
			
		||||
                    BMAP_HYBRID_MAP
 | 
			
		||||
                ]
 | 
			
		||||
            }));
 | 
			
		||||
            map.setCurrentCity("成都");          // 设置地图显示的城市 此项是必须设置的
 | 
			
		||||
            map.enableScrollWheelZoom(true);     //开启鼠标滚轮缩放
 | 
			
		||||
          })
 | 
			
		||||
 | 
			
		||||
                map.centerAndZoom(new BMap.Point(104.067923463, 30.6799428454), 11);  // 初始化地图,设置中心点坐标和地图级别
 | 
			
		||||
                //添加地图类型控件
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
                map.addControl(new BMap.MapTypeControl({
 | 
			
		||||
                    mapTypes: [
 | 
			
		||||
                        BMAP_NORMAL_MAP,
 | 
			
		||||
                        BMAP_HYBRID_MAP
 | 
			
		||||
                    ]
 | 
			
		||||
                }));
 | 
			
		||||
 | 
			
		||||
                map.setCurrentCity("武汉");          // 设置地图显示的城市 此项是必须设置的
 | 
			
		||||
                map.enableScrollWheelZoom(true);     //开启鼠标滚轮缩放
 | 
			
		||||
                var points = [
 | 
			
		||||
                    [104.016235, 30.67775],
 | 
			
		||||
                    [104.069554, 30.601504],
 | 
			
		||||
 | 
			
		||||
                ];
 | 
			
		||||
                // 向地图添加标注
 | 
			
		||||
                for (var i = 0; i < points.length; i++) {
 | 
			
		||||
                    var myIcon = new BMap.Icon("../../img/public/dwionv.png", new BMap.Size(50, 50), {
 | 
			
		||||
                        // 指定定位位置
 | 
			
		||||
                        offset: new BMap.Size(50, 205),
 | 
			
		||||
                        // 当需要从一幅较大的图片中截取某部分作为标注图标时,需要指定大图的偏移位置   
 | 
			
		||||
                        imageOffset: new BMap.Size(0, 0 - i * 0) // 设置图片偏移  
 | 
			
		||||
                    });
 | 
			
		||||
                    var point = new BMap.Point(points[i][0], points[i][1]);
 | 
			
		||||
                    // 创建标注对象并添加到地图 
 | 
			
		||||
                    var marker = new BMap.Marker(point, { icon: myIcon });
 | 
			
		||||
                    map.addOverlay(marker);
 | 
			
		||||
                };
 | 
			
		||||
            })
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
          var iframe = document.getElementById('getop')
 | 
			
		||||
            console.log(iframe);
 | 
			
		||||
    var body = iframe.contentWindow.document.body
 | 
			
		||||
 | 
			
		||||
   console.log( $(body).nextAll(".ty_gr").css("color","#000"));
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        </script>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,7 @@
 | 
			
		|||
	<link rel="stylesheet" type="text/css" href="../../css/logshoppingcar/login_cart.css"/>
 | 
			
		||||
    <script src="../../js/swiper-bundle.min.js"></script>
 | 
			
		||||
    <link rel="stylesheet" type="text/css" href="../../css/foot.min.css" />
 | 
			
		||||
    <link rel="stylesheet" href="../../css/centerHead.css">
 | 
			
		||||
    <script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
	<script src="../../js/login_cart/login_cart.js" type="text/javascript" charset="utf-8"></script>
 | 
			
		||||
</head>
 | 
			
		||||
| 
						 | 
				
			
			@ -27,7 +28,25 @@
 | 
			
		|||
 | 
			
		||||
<body>
 | 
			
		||||
    <!-- 头部导航 -->
 | 
			
		||||
	<iframe src="../../public/center-head.html" class="ty_herader" width="100%" height="285px" frameborder="0" scrolling="no"></iframe>
 | 
			
		||||
    <header class="ty_herader">
 | 
			
		||||
        <img src="../../img/grzx/topimg.jpg" title="图1" alt="图片已缺失">
 | 
			
		||||
        <nav class="ty_w ty_w1220 ty_ds">
 | 
			
		||||
            <img src="../../img/logo.png" title="图2" alt="图片已缺失">
 | 
			
		||||
            <ul class="ty_listnav">
 | 
			
		||||
 | 
			
		||||
                <li> 123</li>
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent" href="../../index.html">网站首页</a></li>
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent"  href="../aboutUs/aboutUs.html">关于我们</a></li>
 | 
			
		||||
            
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent" class="ty_gr" href="../logshoppingcar/shopcar.html"><img class="ty_topicon" title="图3" src="../../img/sy-scart.png" alt="图片已缺失">我的购物车</a></li>
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent" href="../artNetwork/pointsMall.html">积分商城</a></li>
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent" href="../contactUs/contactUs.html">联系我们</a></li>
 | 
			
		||||
                <li><span class="ty_di"></span><a target="_parent" href="../grzx/personalData.html" >个人中心</a></li>
 | 
			
		||||
                <li><a target="_parent" href="../logshoppingcar/login.html">【退出】</a></li>
 | 
			
		||||
 | 
			
		||||
            </ul>
 | 
			
		||||
        </nav>
 | 
			
		||||
    </header>
 | 
			
		||||
	<div class="zhanw"></div>
 | 
			
		||||
    <section>
 | 
			
		||||
        <div class="whoil padding-zy320">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 998 B  | 
| 
						 | 
				
			
			@ -350,7 +350,7 @@ $(function(){
 | 
			
		|||
		$(e.target).next().css('display','inline')
 | 
			
		||||
		console.log($(e.target).next().attr("class"));
 | 
			
		||||
		if ($(e.target).next().attr("class")!="upImg") {
 | 
			
		||||
			console.log(123);
 | 
			
		||||
			
 | 
			
		||||
			$(".uptoux").attr('src',$filePath);
 | 
			
		||||
			$(".ty_topimgtx").css("display","block")
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue