:twisted_rightwards_arrows: Merge branch 'dev_base' into online_angelbell

src/res/tpl/GlobalGoodDetail.tpl

@@ -1,10 +1,7 @@
 <div id="GlobalGoodDetailScene" fe-role="Switch">
     <div class="control-panel">
-        <!-- <div class="search-btn-frame" fe-role="Widget">
-            <img src="./assets/img/CLScene/search.png" />
-        </div> -->
         <div class="shopping-cart-btn-frame" fe-role="Widget">
-            <img src="./assets/img/CLScene/shopping_cart.png" />
+            <img src="./assets/img/CLScene/icon_shopcart.png" />
         </div>
         <div class="cart-num"></div>
     </div>
@@ -16,12 +13,6 @@
             <p id="ggd-detail-desc" class="desc">...
             </p>
             <div class="detail-control-panel" id="detail-control-panel">
-                <!-- <div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget">
-                    <img src="./assets/img/GlobalGoodDetail/add_shop_cart.png" />
-                </div>
-                <div id="goto-course-btn" class="play-btn-frame" fe-role="Widget" >
-                    <img src="./assets/img/GlobalGoodDetail/play_course.png" />
-                </div> -->
             </div>
         </div>
     </div>
@@ -29,9 +20,6 @@
         <p id="ggd-concerned-goods-count" class="concerned-goods-count"></p>
         <div id="ggd-concerned-goods-scroll" fe-role="Scroll" fe-cfg="scroll_dir:h, auto_list_width:yes">
             <ul id="ggd-concerned-goods-list" class="scroll-list" >
-                <!--<li class="item" fe-role="Widget">
-                    <img src="https://placeholdit.imgix.net/~text?txtsize=28&txt=Cover&w=114&h=114" />
-                </li>-->
             </ul>
         </div>
     </div>

src/stage/index/index.html

@@ -73,6 +73,17 @@
 		var globalUseDurationRecord = 0;
 		setInterval('globalUseDurationRecord += 1', 1000);
 	</script>
+	<script>
+		//解决startsWith、endsWith在webview上不能使用问题
+		String.prototype.startsWith=function(str){
+			var reg=new RegExp("^"+str);
+			return reg.test(this);
+		}
+		String.prototype.endsWith=function(str){
+			var reg=new RegExp(str+"$");
+			return reg.test(this);
+		}
+	</script>
 </body>
 
 </html>

src/stage/index/scene/GlobalGoodDetailScene.js

@@ -41,7 +41,7 @@ class GlobalGoodDetailScene extends scene {
 
         let btnWrapper = document.getElementById('detail-control-panel');
         let addCartHTML = `<div id="add-cart-btn" data-goodsId="${goodsItem.id}" class="add-shop-cart-btn-frame add-cart" fe-role="Widget"><img src="./assets/img/GlobalGoodDetail/add_shop_cart.png" /></div>`;
-        let addCartBoughtHTML = `<div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget"><img src="./assets/img/course/detail/periphery_added.png" /></div>`;
+        let addCartBoughtHTML = `<div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget"><img src="./assets/img/CourseScene/detail/periphery_added.png" /></div>`;
 
         if (relatedCourses && relatedCourses.length) {
             //可能会有多个相关的课程,这里只取第一个
@@ -59,7 +59,7 @@ class GlobalGoodDetailScene extends scene {
             let addCartBtn = FocusEngine.getWidgetById('add-cart-btn');
             addCartBtn.con.classList.add('added');
             addCartBtn.con.classList.remove('add-cart');
-            addCartBtn.con.children[0].src = goodsItem.isInCart ? './assets/img/course/detail/periphery_added.png' : './assets/img/GlobalGoodDetail/add_shop_cart.png';
+            addCartBtn.con.children[0].src = goodsItem.isInCart ? './assets/img/CourseScene/detail/periphery_added.png' : './assets/img/GlobalGoodDetail/add_shop_cart.png';
         }
     }
 

src/stage/index/style/GlobalGoodDetail.less

@@ -4,7 +4,7 @@
     position: absolute;
     width: 100%;
     height: 100%;
-    background: url('./assets/img/GlobalGoodDetail/bg.jpg') center no-repeat;
+    background: url('./assets/img/GlobalGoodDetail/background.jpg') center no-repeat;
     background-size: 100% 100%;
 
     .control-panel {

src/stage/index/style/ImageWareFullScreen.less

@@ -1,4 +1,4 @@
-#ImageWareFullScreen {
+#wareImg {
 	position: absolute;
 	left: 0;
 	top: 0;