Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/pages/home/index.vue

@@ -75,6 +75,9 @@
           <div v-if="item.componentCode == 'live-broadcast' && item.componentInfo.visible == 1">
 			      <live-broadcast :datas="item"></live-broadcast>
           </div>
+          <div v-if="item.componentCode == 'information' && item.componentInfo.visible == 1">
+			      <!-- <information :datas="item"></information> -->
+          </div>
           <div v-if="item.componentCode == 'share-picture' && item.componentInfo.visible == 1">
 			      <share-picture :datas="item"></share-picture>
           </div>
@@ -94,6 +97,7 @@ import interval from '@/components/basicTool/interval/index.vue'
 import partition from '@/components/basicTool/partition/index.vue'
 import shopPopup from '@/components/basicTool/shop-popup/index.vue'
 import transverseLabel from '@/components/basicTool/transverse-label/index.vue'
+// import information from '@/components/content/information/index.vue'
 import text from '@/components/content/text'
 import imgText from '@/components/content/imgText'
 import coupon from '@/components/activity/coupon'
@@ -125,7 +129,8 @@ export default {
     'img-text':imgText,
     coupon,
     integralTurntable,
-    transverseLabel
+    transverseLabel,
+    // information
   },
   onShareAppMessage(res) {
     let shareVal={};

static/nativeComponents/TimeLimitedDiscount/index.js

@@ -260,7 +260,7 @@ const componentOptions = {
         type: 1,
         link: `/goods/${productId}?limitedLime=true&endTime=${
           this.data.datas.componentData.endTime
-        }&terminalProductId="${terminalProductId}&terminalGoodsMixId=${terminalGoodsMixId}`
+        }&terminalProductId=${terminalProductId}&terminalGoodsMixId=${terminalGoodsMixId}`
       });
     },
     onclickOrder(e) {