Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…

….com/w-front-end/select_good into version_2.0.0_optimization_mall_update

Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…
….com/w-front-end/select_good into version_2.0.0_optimization_mall_update
王强
2 parents fef4a4fa 297a5f01
Showing 4 changed files with 12 additions and 36 deletions
src/pages/goodDetails/goodDetails.vue
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
src/pages/pointsMall/pointsMall.less
src/pages/pointsMall/pointsMall.vue
@@ -390,21 +390,11 @@ export default {
   mounted () {
     // 如果是App外，设置唤起App和微信内分享参数
     if (!this.isCNLive.value) {
-
-      // 唤起详情页
-      if (typeof this.$parent.getOpenApp === "function") {
-        this.$parent.getOpenApp({
-          type: 38,
-          id: this.$route.query.id || 1,
-          url: ""
-        });
-      }
-
-      // 分享详情页
+      // 设置分享详情页唤起参数
       if (typeof this.$parent.getShareData === "function") {
         this.$parent.getShareData({
-          type: 38,
-          id: this.$route.query.id || 1,
+          type: 46,
+          id: "",
           url: ""
         });
       }
@@ -82,8 +82,7 @@ export default {
   methods: {
     // 跳转原生商品详情页
     jumpOrderDes (item) {
-
-      if (item.shop_type == 1 && item.address_name && item.address_phone && address_address) {  // 1实物 2是虚拟商品 3红包
+      if (item.shop_type == 1 && item.address_name && item.address_phone && item.address_address) {  // 1实物 2是虚拟商品 3红包        
         // 判断APP内
         if (this.isCNLive.value) {
           // （判断app内是否有该方法）
@@ -135,7 +134,6 @@ export default {
         let obj = item;
         for (let key in obj) {
           if (item.id == orderInfo.id) {
-            this.$set(item, "shop_type", 2);
             this.$set(item, "address_name", addressInfo.name);
             this.$set(item, "address_phone", addressInfo.phone);
             this.$set(item, "address_address", addressInfo.address);
@@ -18,9 +18,7 @@
   z-index: 2;
 }
 .back-box{
-  background-color: #FFF;
-  position:fixed;
-  z-index:1
+  background-color: transparent;
 }
 .main_box{
   width: 100%;
@@ -9,18 +9,17 @@
             :callApps="$parent.callApps"
         >
         </call-app-box>
+                    <!-- pl -->
+        <div class="pl" :class="{'is-open-app': $parent.isOpenApp.value, 'hide': $route.query.hideBack == true}"></div>
+        <div class="main_box">
         <back-box
             v-if="isCNLive.value"
             :class="{'hide': $route.query.hideBack == true}"
             class="back-box"
             :style="'padding-top: ' + $parent.top.value + 'px'"
             @back="back"
-            :backs="backs"
-        >
+            :backs="backs">
         </back-box>
-                <!-- pl -->
-        <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'hide': $route.query.hideBack == true}"></div>
-        <div class="main_box">
             <div class="top_main">
               <!-- 头部 -->
               <div class="top">
@@ -330,20 +329,11 @@ export default {
     // 如果是App外，设置唤起App和微信内分享参数
     if (!this.isCNLive.value) {
-      // 唤起详情页
+      // 设置积分首页唤起app参数
       if (typeof this.$parent.getOpenApp === "function") {
         this.$parent.getOpenApp({
-          type: 38,
-          id: this.$route.query.id || 1,
-          url: ""
-        });
-      }
-
-      // 分享详情页
-      if (typeof this.$parent.getShareData === "function") {
-        this.$parent.getShareData({
-          type: 38,
-          id: this.$route.query.id || 1,
+          type: 45,
+          id: "",
           url: ""
         });
       }