xiaoe_mp_npm 0.5.26-alpha6 → 0.5.26-alpha8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/miniprogram_dist/CustomPopup/index.js +4 -0
  2. package/miniprogram_dist/CustomPopup/index.wxml +1 -0
  3. package/miniprogram_dist/GoodsItem/index.js +1 -1
  4. package/miniprogram_dist/LiveGoodsList/index.js +4 -0
  5. package/miniprogram_dist/LiveGoodsList/index.wxml +2 -1
  6. package/package.json +1 -1
  7. package/src/CustomPopup/index.js +4 -0
  8. package/src/CustomPopup/index.wxml +1 -0
  9. package/src/GoodsItem/index.js +1 -1
  10. package/src/LiveGoodsList/index.js +4 -0
  11. package/src/LiveGoodsList/index.wxml +2 -1
package/miniprogram_dist/CustomPopup/index.js CHANGED
@@ -43,6 +43,10 @@ Component({
43
43
  zIndex:{
44
44
  type: Number,
45
45
  value: 100
46
+ },
47
+ overlayStyle: {
48
+ type: String,
49
+ value: ''
46
50
  }
47
51
  },
48
52
 
package/miniprogram_dist/CustomPopup/index.wxml CHANGED
@@ -6,6 +6,7 @@
6
6
  round="{{ round }}"
7
7
  overlay="{{ overlay }}"
8
8
  custom-style="{{ customStyle }}"
9
+ overlay-style="{{ overlayStyle }}"
9
10
  bind:close="onClose"
10
11
  bind:click-overlay="onOverlayClick"
11
12
  z-index="{{zIndex}}"
package/miniprogram_dist/GoodsItem/index.js CHANGED
@@ -497,7 +497,7 @@ Component({
497
497
  let params = encodeURIComponent(`img_url=${img_url}&title=${title}&params_url=${this.data.params_url}`)
498
498
  console.log("urlurlurl", `/page/customerService/customerService?params=${params}`)
499
499
  if (this.data.goodsItem.resource_type === 4) {
500
- wx && wx.navigateTo({
500
+ wx && wx.redirectTo({
501
501
  url: `/pages/webView/webView?appId=${this.properties.aliveInfo.app_id}&aliveId=${this.data.goodsItem.id}&refreshAliveId=${this.properties.aliveInfo.alive_id}`,
502
502
  })
503
503
 
package/miniprogram_dist/LiveGoodsList/index.js CHANGED
@@ -95,6 +95,10 @@ Component({
95
95
  orderDialogIndex: {
96
96
  type: Number,
97
97
  value: 100
98
+ },
99
+ overlayStyle: {
100
+ type: String,
101
+ value: ''
98
102
  }
99
103
  },
100
104
  data: {
package/miniprogram_dist/LiveGoodsList/index.wxml CHANGED
@@ -15,7 +15,8 @@
15
15
  round="{{ round }}"
16
16
  customStyle="{{ customStyle }}"
17
17
  bind:onClose="closePop"
18
- overlay="{{popPosition === 'bottom' ? false : true}}"
18
+ overlay="{{popPosition === 'bottom' && !overlayStyle ? false : true}}"
19
+ overlay-style="{{ overlayStyle }}"
19
20
  zIndex="{{zIndex}}"
20
21
  bind:onOverlayClick="onOverlayClick">
21
22
  <view slot="header">
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "0.5.26-alpha6",
3
+ "version": "0.5.26-alpha8",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/CustomPopup/index.js CHANGED
@@ -43,6 +43,10 @@ Component({
43
43
  zIndex:{
44
44
  type: Number,
45
45
  value: 100
46
+ },
47
+ overlayStyle: {
48
+ type: String,
49
+ value: ''
46
50
  }
47
51
  },
48
52
 
package/src/CustomPopup/index.wxml CHANGED
@@ -6,6 +6,7 @@
6
6
  round="{{ round }}"
7
7
  overlay="{{ overlay }}"
8
8
  custom-style="{{ customStyle }}"
9
+ overlay-style="{{ overlayStyle }}"
9
10
  bind:close="onClose"
10
11
  bind:click-overlay="onOverlayClick"
11
12
  z-index="{{zIndex}}"
package/src/GoodsItem/index.js CHANGED
@@ -497,7 +497,7 @@ Component({
497
497
  let params = encodeURIComponent(`img_url=${img_url}&title=${title}&params_url=${this.data.params_url}`)
498
498
  console.log("urlurlurl", `/page/customerService/customerService?params=${params}`)
499
499
  if (this.data.goodsItem.resource_type === 4) {
500
- wx && wx.navigateTo({
500
+ wx && wx.redirectTo({
501
501
  url: `/pages/webView/webView?appId=${this.properties.aliveInfo.app_id}&aliveId=${this.data.goodsItem.id}&refreshAliveId=${this.properties.aliveInfo.alive_id}`,
502
502
  })
503
503
 
package/src/LiveGoodsList/index.js CHANGED
@@ -95,6 +95,10 @@ Component({
95
95
  orderDialogIndex: {
96
96
  type: Number,
97
97
  value: 100
98
+ },
99
+ overlayStyle: {
100
+ type: String,
101
+ value: ''
98
102
  }
99
103
  },
100
104
  data: {
package/src/LiveGoodsList/index.wxml CHANGED
@@ -15,7 +15,8 @@
15
15
  round="{{ round }}"
16
16
  customStyle="{{ customStyle }}"
17
17
  bind:onClose="closePop"
18
- overlay="{{popPosition === 'bottom' ? false : true}}"
18
+ overlay="{{popPosition === 'bottom' && !overlayStyle ? false : true}}"
19
+ overlay-style="{{ overlayStyle }}"
19
20
  zIndex="{{zIndex}}"
20
21
  bind:onOverlayClick="onOverlayClick">
21
22
  <view slot="header">