w-front-end / select_good · Commits

Commit 015f004be8a8115f6cbd961b6e6a89164caadb20

Authored by 王强
2 parents fef4a4fa 297a5f01

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
Inline Side-by-side
Showing 4 changed files with 12 additions and 36 deletions
src/pages/goodDetails/goodDetails.vue
  View file @015f004
... ... @@ -390,21 +390,11 @@ export default {
390 390 mounted () {
391 391 // 如果是App外，设置唤起App和微信内分享参数
392 392 if (!this.isCNLive.value) {
393   -
394   - // 唤起详情页
395   - if (typeof this.$parent.getOpenApp === "function") {
396   - this.$parent.getOpenApp({
397   - type: 38,
398   - id: this.$route.query.id || 1,
399   - url: ""
400   - });
401   - }
402   -
403   - // 分享详情页
  393 + // 设置分享详情页唤起参数
404 394 if (typeof this.$parent.getShareData === "function") {
405 395 this.$parent.getShareData({
406   - type: 38,
407   - id: this.$route.query.id || 1,
  396 + type: 46,
  397 + id: "",
408 398 url: ""
409 399 });
410 400 }
... ...
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
  View file @015f004
... ... @@ -82,8 +82,7 @@ export default {
82 82 methods: {
83 83 // 跳转原生商品详情页
84 84 jumpOrderDes (item) {
85   -
86   - if (item.shop_type == 1 && item.address_name && item.address_phone && address_address) { // 1实物 2是虚拟商品 3红包
  85 + if (item.shop_type == 1 && item.address_name && item.address_phone && item.address_address) { // 1实物 2是虚拟商品 3红包
87 86 // 判断APP内
88 87 if (this.isCNLive.value) {
89 88 // （判断app内是否有该方法）
... ... @@ -135,7 +134,6 @@ export default {
135 134 let obj = item;
136 135 for (let key in obj) {
137 136 if (item.id == orderInfo.id) {
138   - this.$set(item, "shop_type", 2);
139 137 this.$set(item, "address_name", addressInfo.name);
140 138 this.$set(item, "address_phone", addressInfo.phone);
141 139 this.$set(item, "address_address", addressInfo.address);
... ...
src/pages/pointsMall/pointsMall.less
  View file @015f004
... ... @@ -18,9 +18,7 @@
18 18 z-index: 2;
19 19 }
20 20 .back-box{
21   - background-color: #FFF;
22   - position:fixed;
23   - z-index:1
  21 + background-color: transparent;
24 22 }
25 23 .main_box{
26 24 width: 100%;
... ...
src/pages/pointsMall/pointsMall.vue
  View file @015f004
... ... @@ -9,18 +9,17 @@
9 9 :callApps="$parent.callApps"
10 10 >
11 11 </call-app-box>
  12 + <!-- pl -->
  13 + <div class="pl" :class="{'is-open-app': $parent.isOpenApp.value, 'hide': $route.query.hideBack == true}"></div>
  14 + <div class="main_box">
12 15 <back-box
13 16 v-if="isCNLive.value"
14 17 :class="{'hide': $route.query.hideBack == true}"
15 18 class="back-box"
16 19 :style="'padding-top: ' + $parent.top.value + 'px'"
17 20 @back="back"
18   - :backs="backs"
19   - >
  21 + :backs="backs">
20 22 </back-box>
21   - <!-- pl -->
22   - <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'hide': $route.query.hideBack == true}"></div>
23   - <div class="main_box">
24 23 <div class="top_main">
25 24 <!-- 头部 -->
26 25 <div class="top">
... ... @@ -330,20 +329,11 @@ export default {
330 329 // 如果是App外，设置唤起App和微信内分享参数
331 330 if (!this.isCNLive.value) {
332 331  
333   - // 唤起详情页
  332 + // 设置积分首页唤起app参数
334 333 if (typeof this.$parent.getOpenApp === "function") {
335 334 this.$parent.getOpenApp({
336   - type: 38,
337   - id: this.$route.query.id || 1,
338   - url: ""
339   - });
340   - }
341   -
342   - // 分享详情页
343   - if (typeof this.$parent.getShareData === "function") {
344   - this.$parent.getShareData({
345   - type: 38,
346   - id: this.$route.query.id || 1,
  335 + type: 45,
  336 + id: "",
347 337 url: ""
348 338 });
349 339 }
... ...