Merge branch 'hotfix/fix-jump-to-miniapp' into 'release/6.9.0'

增加一步直接判断是否在小程序中打开



See merge request !1733

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.9.0-2",
+  "version": "6.9.0-3",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -14,7 +14,10 @@
                 <div class="price"
                 <div class="price"
                     style="{{#if ../productStyle.priceFontColor}}color:{{../productStyle.priceFontColor}};{{/if}}">
                     style="{{#if ../productStyle.priceFontColor}}color:{{../productStyle.priceFontColor}};{{/if}}">
                     <span class="seckill-price">¥{{secKillPrice}}</span>
                     <span class="seckill-price">¥{{secKillPrice}}</span>
-                    <span class="market-price">¥{{marketPrice}}</span>
+                    {{#if marketPrice}}
+                        <span class="market-price">¥{{marketPrice}}</span>
+                    {{/if}}
+
                 </div>
                 </div>
                 <div class="status-type">
                 <div class="status-type">
                     {{#if over}}
                     {{#if over}}
@@ -28,6 +31,6 @@
                 <div class="status-bg {{#if over}}status-over{{else if wait}}status-wait{{else}}status-go{{/if}}"></div>
                 <div class="status-bg {{#if over}}status-over{{else if wait}}status-wait{{else}}status-go{{/if}}"></div>
             </div>
             </div>
         </div>
         </div>
-    </a>            
+    </a>
 </div>
 </div>
-{{/ list}}
+{{/ list}}

@@ -990,7 +990,9 @@ $(function() {
     getShopProductLinks();
     getShopProductLinks();
 
 
     // 小程序相关处理
     // 小程序相关处理
-    if (!window.WeixinJSBridge || !window.WeixinJSBridge.invoke) {
+    if (navigator.userAgent.match(/MicroMessenger/i) && navigator.userAgent.match(/miniProgram/i)) {
+        miniProgramHandleInit();
+    } else if (!window.WeixinJSBridge || !window.WeixinJSBridge.invoke) {
         document.addEventListener('WeixinJSBridgeReady', miniProgramHandleInit, false);
         document.addEventListener('WeixinJSBridgeReady', miniProgramHandleInit, false);
     } else {
     } else {
         miniProgramHandleInit();
         miniProgramHandleInit();