xiaoe_mp_npm 1.0.8 → 1.0.9-alpha.1

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.
@@ -1,68 +1,72 @@
1
- // src/ConfirmOrder/components/PayDetail/index.js
2
- import { ENTITY_GOODS } from "../../../common/utils/constants";
3
- const computedBehavior = require('miniprogram-computed').behavior
4
-
5
- Component({
6
- behaviors: [computedBehavior],
7
- /**
8
- * 组件的属性列表
9
- */
10
- properties: {
11
- prePayInfo: {
12
- type: Object,
13
- value: () => {}
14
- },
15
- activeMode: {
16
- type: Number,
17
- value: 1,
18
- },
19
- baseInfo: {
20
- type: Object,
21
- value: () => {},
22
- },
23
- isCart: {
24
- type: Number,
25
- value: 0,
26
- },
27
- cartGoodsList: {
28
- type: Array,
29
- value: () => [],
30
- },
31
- },
32
-
33
- /**
34
- * 组件的初始数据
35
- */
36
- data: {
37
-
38
- },
39
- computed: {
40
- showFreight(data) {
41
- if (data.activeMode === 1) {
42
- return false;
43
- } else {
44
- return (
45
- data.baseInfo?.spu_type === ENTITY_GOODS ||
46
- (data.isCart &&
47
- data.cartGoodsList.length && data.cartGoodsList.some((goodsInfo) => {
48
- return goodsInfo.spu_type === ENTITY_GOODS;
49
- }))
50
- );
51
- }
52
- },
53
- goodsCount(data) {
54
- return data.cartGoodsList.length && data.cartGoodsList.reduce((count, goodsInfo) => {
55
- return count + goodsInfo.count;
56
- }, 0);
57
- },
58
- allPriceText(data) {
59
- return data.isCart ? `小计(共${data.goodsCount}件)` : "商品金额";
60
- },
61
- },
62
- /**
63
- * 组件的方法列表
64
- */
65
- methods: {
66
-
67
- }
68
- })
1
+ // src/ConfirmOrder/components/PayDetail/index.js
2
+ import { ENTITY_GOODS } from "../../../common/utils/constants";
3
+ const computedBehavior = require('miniprogram-computed').behavior
4
+
5
+ Component({
6
+ behaviors: [computedBehavior],
7
+ /**
8
+ * 组件的属性列表
9
+ */
10
+ properties: {
11
+ prePayInfo: {
12
+ type: Object,
13
+ value: () => {}
14
+ },
15
+ activeMode: {
16
+ type: Number,
17
+ value: 1,
18
+ },
19
+ baseInfo: {
20
+ type: Object,
21
+ value: () => {},
22
+ },
23
+ isCart: {
24
+ type: Number,
25
+ value: 0,
26
+ },
27
+ cartGoodsList: {
28
+ type: Array,
29
+ value: () => [],
30
+ },
31
+ },
32
+
33
+ /**
34
+ * 组件的初始数据
35
+ */
36
+ data: {
37
+ showTips: false
38
+ },
39
+ computed: {
40
+ showFreight(data) {
41
+ if (data.activeMode === 1) {
42
+ return false;
43
+ } else {
44
+ return (
45
+ data.baseInfo?.spu_type === ENTITY_GOODS ||
46
+ (data.isCart &&
47
+ data.cartGoodsList.length && data.cartGoodsList.some((goodsInfo) => {
48
+ return goodsInfo.spu_type === ENTITY_GOODS;
49
+ }))
50
+ );
51
+ }
52
+ },
53
+ goodsCount(data) {
54
+ return data.cartGoodsList.length && data.cartGoodsList.reduce((count, goodsInfo) => {
55
+ return count + goodsInfo.count;
56
+ }, 0);
57
+ },
58
+ allPriceText(data) {
59
+ return data.isCart ? `小计(共${data.goodsCount}件)` : "商品金额";
60
+ },
61
+ },
62
+ /**
63
+ * 组件的方法列表
64
+ */
65
+ methods: {
66
+ onClose(){
67
+ this.setData({
68
+ showTips: false
69
+ })
70
+ }
71
+ }
72
+ })
@@ -1,4 +1,6 @@
1
- {
2
- "component": true,
3
- "usingComponents": {}
4
- }
1
+ {
2
+ "component": true,
3
+ "usingComponents": {
4
+ "van-popup": "@vant/weapp/popup/index"
5
+ }
6
+ }
@@ -1,16 +1,39 @@
1
- .price-wrapper {
2
- padding: 0 4vmin;
3
- background: #fff;
4
- font-size: 3.73vmin;
5
-
6
- .price-item {
7
- padding: 3.73vmin 0;
8
- display: flex;
9
- align-items: center;
10
- justify-content: space-between;
11
- }
12
-
13
- .price-item:not(:last-child) {
14
- border-bottom: 0.13vmin solid rgba(240, 240, 240, 0.6);
15
- }
16
- }
1
+ .price-wrapper {
2
+ padding: 0 4vmin;
3
+ background: #fff;
4
+ font-size: 3.73vmin;
5
+
6
+ .price-item {
7
+ padding: 3.73vmin 0;
8
+ display: flex;
9
+ align-items: center;
10
+ justify-content: space-between;
11
+ }
12
+
13
+ .price-item:not(:last-child) {
14
+ border-bottom: 0.13vmin solid rgba(240, 240, 240, 0.6);
15
+ }
16
+ }
17
+
18
+ .favorable-tip-title{
19
+ text-align: center;
20
+ margin-bottom: 7.47vmin;
21
+ font-weight: 500;
22
+ font-size: 4.27vmin;
23
+ margin-top: 3.2vmin;
24
+ }
25
+
26
+ .favorable-tip-content{
27
+ letter-spacing: 0.27vmin;
28
+ line-height: 7.47vmin;
29
+ font-size: 3.73vmin;
30
+ font-weight: 400;
31
+ }
32
+
33
+ .tips-icon {
34
+ width: 3.73vmin;
35
+ height: 3.73vmin;
36
+ margin-left: 1.07vmin;
37
+ color: #999;
38
+ padding-top: 0.27vmin;
39
+ }
@@ -1,18 +1,45 @@
1
- <!--src/ConfirmOrder/components/PayDetail/index.wxml-->
2
- <wxs src="./filter.wxs" module="tools" />
3
- <view class="price-wrapper">
4
- <view class="price-item">
5
- <view class="item-left">{{ allPriceText }}</view>
6
- <view class="item-right">{{ tools.centToYuan(prePayInfo.goods_price, 1) }}</view>
7
- </view>
8
- <view class="price-item" wx:if="{{ showFreight }}">
9
- <view class="item-left">运费</view>
10
- <view class="item-right">{{ tools.centToYuan(prePayInfo.freight, 1) }}</view>
11
- </view>
12
- <view class="price-item" wx:if="{{ prePayInfo.discount_price }}">
13
- <view class="item-left">优惠合计</view>
14
- <view class="item-right">
15
- {{ tools.symbolFilter(tools.centToYuan(prePayInfo.discount_price, 1)) }}
16
- </view>
17
- </view>
18
- </view>
1
+ <!--src/ConfirmOrder/components/PayDetail/index.wxml-->
2
+ <wxs src="./filter.wxs" module="tools" />
3
+ <view class="price-wrapper">
4
+ <view class="price-item">
5
+ <view class="item-left">{{ allPriceText }}</view>
6
+ <view class="item-right">{{ tools.centToYuan(prePayInfo.goods_price, 1) }}</view>
7
+ </view>
8
+ <view class="price-item" wx:if="{{ showFreight }}">
9
+ <view class="item-left">运费</view>
10
+ <view class="item-right">{{ tools.centToYuan(prePayInfo.freight, 1) }}</view>
11
+ </view>
12
+ <view class="price-item" wx:if="{{ prePayInfo.discount_price }}">
13
+ <view class="item-left">优惠合计</view>
14
+ <view class="item-right">
15
+ {{ tools.symbolFilter(tools.centToYuan(prePayInfo.discount_price, 1)) }}
16
+ </view>
17
+ </view>
18
+ <view class="price-item" wx:if="{{ prePayInfo.floor_fix_price }}">
19
+ <view class="item-left">
20
+ 底价补差
21
+ <image src="../../../common/assets/images/icon-tip.png" class="tips-icon" catchtap="onClose"></image>
22
+ </view>
23
+ <view class="item-right">
24
+ {{ tools.symbolFilter(tools.centToYuan(prePayInfo.floor_fix_price, 1)) }}
25
+ </view>
26
+ </view>
27
+ <van-popup
28
+ show="{{ showTips }}"
29
+ round
30
+ position="bottom"
31
+ bind:close="onClose"
32
+ >
33
+ <view>
34
+ <view class="favorable-tip-title">
35
+ 优惠合计
36
+ </view>
37
+ <view class="favorable-tip-content">
38
+ 因商家设置了商品底价,所以优惠后下单仍需支付商品底价金额(即差价);
39
+ </view>
40
+ <view class="favorable-tip-content">
41
+ 您可以适当调整优惠卷/码、积分的使用
42
+ </view>
43
+ </view>
44
+ </van-popup>
45
+ </view>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.8",
3
+ "version": "1.0.9-alpha.1",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
@@ -1,68 +1,72 @@
1
- // src/ConfirmOrder/components/PayDetail/index.js
2
- import { ENTITY_GOODS } from "../../../common/utils/constants";
3
- const computedBehavior = require('miniprogram-computed').behavior
4
-
5
- Component({
6
- behaviors: [computedBehavior],
7
- /**
8
- * 组件的属性列表
9
- */
10
- properties: {
11
- prePayInfo: {
12
- type: Object,
13
- value: () => {}
14
- },
15
- activeMode: {
16
- type: Number,
17
- value: 1,
18
- },
19
- baseInfo: {
20
- type: Object,
21
- value: () => {},
22
- },
23
- isCart: {
24
- type: Number,
25
- value: 0,
26
- },
27
- cartGoodsList: {
28
- type: Array,
29
- value: () => [],
30
- },
31
- },
32
-
33
- /**
34
- * 组件的初始数据
35
- */
36
- data: {
37
-
38
- },
39
- computed: {
40
- showFreight(data) {
41
- if (data.activeMode === 1) {
42
- return false;
43
- } else {
44
- return (
45
- data.baseInfo?.spu_type === ENTITY_GOODS ||
46
- (data.isCart &&
47
- data.cartGoodsList.length && data.cartGoodsList.some((goodsInfo) => {
48
- return goodsInfo.spu_type === ENTITY_GOODS;
49
- }))
50
- );
51
- }
52
- },
53
- goodsCount(data) {
54
- return data.cartGoodsList.length && data.cartGoodsList.reduce((count, goodsInfo) => {
55
- return count + goodsInfo.count;
56
- }, 0);
57
- },
58
- allPriceText(data) {
59
- return data.isCart ? `小计(共${data.goodsCount}件)` : "商品金额";
60
- },
61
- },
62
- /**
63
- * 组件的方法列表
64
- */
65
- methods: {
66
-
67
- }
68
- })
1
+ // src/ConfirmOrder/components/PayDetail/index.js
2
+ import { ENTITY_GOODS } from "../../../common/utils/constants";
3
+ const computedBehavior = require('miniprogram-computed').behavior
4
+
5
+ Component({
6
+ behaviors: [computedBehavior],
7
+ /**
8
+ * 组件的属性列表
9
+ */
10
+ properties: {
11
+ prePayInfo: {
12
+ type: Object,
13
+ value: () => {}
14
+ },
15
+ activeMode: {
16
+ type: Number,
17
+ value: 1,
18
+ },
19
+ baseInfo: {
20
+ type: Object,
21
+ value: () => {},
22
+ },
23
+ isCart: {
24
+ type: Number,
25
+ value: 0,
26
+ },
27
+ cartGoodsList: {
28
+ type: Array,
29
+ value: () => [],
30
+ },
31
+ },
32
+
33
+ /**
34
+ * 组件的初始数据
35
+ */
36
+ data: {
37
+ showTips: false
38
+ },
39
+ computed: {
40
+ showFreight(data) {
41
+ if (data.activeMode === 1) {
42
+ return false;
43
+ } else {
44
+ return (
45
+ data.baseInfo?.spu_type === ENTITY_GOODS ||
46
+ (data.isCart &&
47
+ data.cartGoodsList.length && data.cartGoodsList.some((goodsInfo) => {
48
+ return goodsInfo.spu_type === ENTITY_GOODS;
49
+ }))
50
+ );
51
+ }
52
+ },
53
+ goodsCount(data) {
54
+ return data.cartGoodsList.length && data.cartGoodsList.reduce((count, goodsInfo) => {
55
+ return count + goodsInfo.count;
56
+ }, 0);
57
+ },
58
+ allPriceText(data) {
59
+ return data.isCart ? `小计(共${data.goodsCount}件)` : "商品金额";
60
+ },
61
+ },
62
+ /**
63
+ * 组件的方法列表
64
+ */
65
+ methods: {
66
+ onClose(){
67
+ this.setData({
68
+ showTips: false
69
+ })
70
+ }
71
+ }
72
+ })
@@ -1,4 +1,6 @@
1
- {
2
- "component": true,
3
- "usingComponents": {}
4
- }
1
+ {
2
+ "component": true,
3
+ "usingComponents": {
4
+ "van-popup": "@vant/weapp/popup/index"
5
+ }
6
+ }
@@ -1,16 +1,39 @@
1
- .price-wrapper {
2
- padding: 0 4vmin;
3
- background: #fff;
4
- font-size: 3.73vmin;
5
-
6
- .price-item {
7
- padding: 3.73vmin 0;
8
- display: flex;
9
- align-items: center;
10
- justify-content: space-between;
11
- }
12
-
13
- .price-item:not(:last-child) {
14
- border-bottom: 0.13vmin solid rgba(240, 240, 240, 0.6);
15
- }
16
- }
1
+ .price-wrapper {
2
+ padding: 0 4vmin;
3
+ background: #fff;
4
+ font-size: 3.73vmin;
5
+
6
+ .price-item {
7
+ padding: 3.73vmin 0;
8
+ display: flex;
9
+ align-items: center;
10
+ justify-content: space-between;
11
+ }
12
+
13
+ .price-item:not(:last-child) {
14
+ border-bottom: 0.13vmin solid rgba(240, 240, 240, 0.6);
15
+ }
16
+ }
17
+
18
+ .favorable-tip-title{
19
+ text-align: center;
20
+ margin-bottom: 7.47vmin;
21
+ font-weight: 500;
22
+ font-size: 4.27vmin;
23
+ margin-top: 3.2vmin;
24
+ }
25
+
26
+ .favorable-tip-content{
27
+ letter-spacing: 0.27vmin;
28
+ line-height: 7.47vmin;
29
+ font-size: 3.73vmin;
30
+ font-weight: 400;
31
+ }
32
+
33
+ .tips-icon {
34
+ width: 3.73vmin;
35
+ height: 3.73vmin;
36
+ margin-left: 1.07vmin;
37
+ color: #999;
38
+ padding-top: 0.27vmin;
39
+ }
@@ -1,18 +1,45 @@
1
- <!--src/ConfirmOrder/components/PayDetail/index.wxml-->
2
- <wxs src="./filter.wxs" module="tools" />
3
- <view class="price-wrapper">
4
- <view class="price-item">
5
- <view class="item-left">{{ allPriceText }}</view>
6
- <view class="item-right">{{ tools.centToYuan(prePayInfo.goods_price, 1) }}</view>
7
- </view>
8
- <view class="price-item" wx:if="{{ showFreight }}">
9
- <view class="item-left">运费</view>
10
- <view class="item-right">{{ tools.centToYuan(prePayInfo.freight, 1) }}</view>
11
- </view>
12
- <view class="price-item" wx:if="{{ prePayInfo.discount_price }}">
13
- <view class="item-left">优惠合计</view>
14
- <view class="item-right">
15
- {{ tools.symbolFilter(tools.centToYuan(prePayInfo.discount_price, 1)) }}
16
- </view>
17
- </view>
18
- </view>
1
+ <!--src/ConfirmOrder/components/PayDetail/index.wxml-->
2
+ <wxs src="./filter.wxs" module="tools" />
3
+ <view class="price-wrapper">
4
+ <view class="price-item">
5
+ <view class="item-left">{{ allPriceText }}</view>
6
+ <view class="item-right">{{ tools.centToYuan(prePayInfo.goods_price, 1) }}</view>
7
+ </view>
8
+ <view class="price-item" wx:if="{{ showFreight }}">
9
+ <view class="item-left">运费</view>
10
+ <view class="item-right">{{ tools.centToYuan(prePayInfo.freight, 1) }}</view>
11
+ </view>
12
+ <view class="price-item" wx:if="{{ prePayInfo.discount_price }}">
13
+ <view class="item-left">优惠合计</view>
14
+ <view class="item-right">
15
+ {{ tools.symbolFilter(tools.centToYuan(prePayInfo.discount_price, 1)) }}
16
+ </view>
17
+ </view>
18
+ <view class="price-item" wx:if="{{ prePayInfo.floor_fix_price }}">
19
+ <view class="item-left">
20
+ 底价补差
21
+ <image src="../../../common/assets/images/icon-tip.png" class="tips-icon" catchtap="onClose"></image>
22
+ </view>
23
+ <view class="item-right">
24
+ {{ tools.symbolFilter(tools.centToYuan(prePayInfo.floor_fix_price, 1)) }}
25
+ </view>
26
+ </view>
27
+ <van-popup
28
+ show="{{ showTips }}"
29
+ round
30
+ position="bottom"
31
+ bind:close="onClose"
32
+ >
33
+ <view>
34
+ <view class="favorable-tip-title">
35
+ 优惠合计
36
+ </view>
37
+ <view class="favorable-tip-content">
38
+ 因商家设置了商品底价,所以优惠后下单仍需支付商品底价金额(即差价);
39
+ </view>
40
+ <view class="favorable-tip-content">
41
+ 您可以适当调整优惠卷/码、积分的使用
42
+ </view>
43
+ </view>
44
+ </van-popup>
45
+ </view>