xiaoe_mp_npm 1.1.11-test02 → 1.1.12-test01
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.
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* @LastEditTime: 2021-11-18 19:52:02
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
import { getGoodsList, requestChangeShow, requestChangePrice } from "../common/api/liveGoodsList"
|
|
10
|
+
import { getGoodsList, getGoodsListNew, requestChangeShow, requestChangePrice } from "../common/api/liveGoodsList"
|
|
11
11
|
const computedBehavior = require('miniprogram-computed').behavior
|
|
12
12
|
|
|
13
13
|
let activityCountdownTimer = null // 活动倒计时计时器
|
|
@@ -725,13 +725,14 @@ Component({
|
|
|
725
725
|
},
|
|
726
726
|
getGoodsList() {
|
|
727
727
|
let params = {
|
|
728
|
+
app_id: this.data.aliveInfo.app_id,
|
|
728
729
|
alive_id: this.data.aliveInfo.alive_id,
|
|
729
|
-
|
|
730
|
+
user_id: this.data.aliveInfo.user_id,
|
|
730
731
|
page_size: this.data.page_size,
|
|
731
732
|
page: this.data.page_index,
|
|
732
|
-
port:
|
|
733
|
+
port: 1
|
|
733
734
|
}
|
|
734
|
-
|
|
735
|
+
getGoodsListNew(params).then(res => {
|
|
735
736
|
let { data, code } = res.data
|
|
736
737
|
if (code === 0) {
|
|
737
738
|
var total = data[0] ? data[0].total : this.data.total
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.goods-bubble{background-color:transparent;position:absolute;top:-7.73333vmin;transform:translateX(66.66667vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:33.33333vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:33.33333vmin;display:flex;height:6.4vmin;box-sizing:border-box;border-radius:6.66667vmin 0 0 6.66667vmin;padding:.26667vmin .26667vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:5.33333vmin;height:5.33333vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:3.73333vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:3.73333vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:4.26667vmin;font-style:italic}@media screen and (min-width: 768px) and (orientation: portrait){.goods-bubble{background-color:transparent;position:absolute;top:-3.77604vmin;transform:translateX(32.55208vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:16.27604vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:16.27604vmin;display:flex;height:3.125vmin;box-sizing:border-box;border-radius:3.25521vmin 0 0 3.25521vmin;padding:.13021vmin .13021vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:2.60417vmin;height:2.60417vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:1.82292vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:1.82292vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:2.08333vmin;font-style:italic}}@media screen and (min-height: 768px) and (orientation: landscape){.goods-bubble{background-color:transparent;position:absolute;top:-3.77604vmin;transform:translateX(32.55208vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:16.27604vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:16.27604vmin;display:flex;height:3.125vmin;box-sizing:border-box;border-radius:3.25521vmin 0 0 3.25521vmin;padding:.13021vmin .13021vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:2.60417vmin;height:2.60417vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:1.82292vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:1.82292vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:2.08333vmin;font-style:italic}}
|
|
1
|
+
.goods-bubble{background-color:transparent;position:absolute;top:-7.73333vmin;transform:translateX(66.66667vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:33.33333vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:33.33333vmin;display:flex;height:6.4vmin;box-sizing:border-box;border-radius:6.66667vmin 0 0 6.66667vmin;padding:.26667vmin .26667vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:5.33333vmin;height:5.33333vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:3.73333vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:3.73333vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:4.26667vmin;font-style:italic}@media screen and (min-width: 768px) and (orientation: portrait){.goods-bubble{background-color:transparent;position:absolute;top:-3.77604vmin;transform:translateX(32.55208vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:16.27604vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:16.27604vmin;display:flex;height:3.125vmin;box-sizing:border-box;border-radius:3.25521vmin 0 0 3.25521vmin;padding:.13021vmin .13021vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:2.60417vmin;height:2.60417vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:1.82292vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:1.82292vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:2.08333vmin;font-style:italic}}@media screen and (min-height: 768px) and (orientation: landscape){.goods-bubble{background-color:transparent;position:absolute;top:-3.77604vmin;transform:translateX(32.55208vmin);opacity:1;transition:transform 0.3s, opacity 0.3s;z-index:100;min-width:16.27604vmin;font-family:PingFang SC}.goods-bubble .goods-bubble-wrapper{min-width:16.27604vmin;display:flex;height:3.125vmin;box-sizing:border-box;border-radius:3.25521vmin 0 0 3.25521vmin;padding:.13021vmin .13021vmin}.goods-bubble .goods-bubble-info{display:flex;align-items:center;justify-content:center}.goods-bubble .goods-info-img{width:2.60417vmin;height:2.60417vmin}.goods-bubble .goods-info-desc,.goods-bubble .goods-info-multiple,.goods-bubble .goods-info-num{color:#fff;font-weight:600}.goods-bubble .goods-info-desc{font-size:1.82292vmin;white-space:nowrap}.goods-bubble .goods-info-multiple{font-size:1.82292vmin}.goods-bubble .goods-info-flex{display:flex;align-items:center}.goods-bubble .goods-info-num{font-size:2.08333vmin;font-style:italic}}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* @LastEditTime: 2021-11-18 19:52:02
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
import { getGoodsList, requestChangeShow, requestChangePrice } from "../common/api/liveGoodsList"
|
|
10
|
+
import { getGoodsList, getGoodsListNew, requestChangeShow, requestChangePrice } from "../common/api/liveGoodsList"
|
|
11
11
|
const computedBehavior = require('miniprogram-computed').behavior
|
|
12
12
|
|
|
13
13
|
let activityCountdownTimer = null // 活动倒计时计时器
|
|
@@ -725,13 +725,14 @@ Component({
|
|
|
725
725
|
},
|
|
726
726
|
getGoodsList() {
|
|
727
727
|
let params = {
|
|
728
|
+
app_id: this.data.aliveInfo.app_id,
|
|
728
729
|
alive_id: this.data.aliveInfo.alive_id,
|
|
729
|
-
|
|
730
|
+
user_id: this.data.aliveInfo.user_id,
|
|
730
731
|
page_size: this.data.page_size,
|
|
731
732
|
page: this.data.page_index,
|
|
732
|
-
port:
|
|
733
|
+
port: 1
|
|
733
734
|
}
|
|
734
|
-
|
|
735
|
+
getGoodsListNew(params).then(res => {
|
|
735
736
|
let { data, code } = res.data
|
|
736
737
|
if (code === 0) {
|
|
737
738
|
var total = data[0] ? data[0].total : this.data.total
|