xyvcard-mall-order 0.0.21 → 0.0.23

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 (35) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +2 -1
  3. package/miniprogram/index.ts +1 -1
  4. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/api/goods/index.d.ts +2 -1
  5. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/api/goods/index.js +10 -0
  6. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/api/goods/types.d.ts +23 -0
  7. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-info-page/goods-tags-item/index.d.ts +1 -0
  8. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-info-page/goods-tags-item/index.js +28 -0
  9. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-info-page/goods-tags-item/index.json +4 -0
  10. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-info-page/goods-tags-item/index.wxml +15 -0
  11. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-info-page/goods-tags-item/index.wxss +1 -0
  12. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-list-page/popup/select-specification/index.js +16 -1
  13. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-list-page/popup/select-specification/index.wxml +3 -3
  14. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-order/goods-order-info/index.wxss +1 -1
  15. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/components/goods-order/goods-order-info-list/index.wxss +1 -1
  16. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/index.d.ts +2 -2
  17. package/miniprogram/miniprogram_npm/xyvcard-mall-goods/index.js +2 -1
  18. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-avatar/avatar-edit/index.wxml +1 -1
  19. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-avatar/avatar-edit/index.wxss +1 -1
  20. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-btn/double-btn/index.wxml +1 -1
  21. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-btn/double-btn/index.wxss +1 -1
  22. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-btn/single-btn/index.wxml +1 -1
  23. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-btn/single-btn/index.wxss +1 -1
  24. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index.wxml +1 -1
  25. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index.wxss +1 -1
  26. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-popup/index.wxml +2 -2
  27. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-popup/index.wxss +1 -1
  28. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-search/index.wxml +1 -1
  29. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-search/index.wxss +1 -1
  30. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-top-navigation/index.wxml +1 -1
  31. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/components/common/auth-top-navigation/index.wxss +1 -1
  32. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/index.d.ts +3 -2
  33. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/index.js +6 -1
  34. package/miniprogram/miniprogram_npm/xyvcard-wechat-auth/utils/config.js +1 -1
  35. package/package.json +3 -3
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export { orderConfig } from "./utils/config";
1
+ export { orderConfig, initOrderConfig } from "./utils/config";
2
2
  export type { OrderConfig } from "./utils/config";
3
3
  export { orderConstant } from "./utils/orderConstant";
4
4
  export { orderApi } from "./api/order/index";
package/dist/index.js CHANGED
@@ -1,8 +1,9 @@
1
- import { orderConfig } from "./utils/config.js";
1
+ import { initOrderConfig, orderConfig } from "./utils/config.js";
2
2
  import { orderConstant } from "./utils/orderConstant.js";
3
3
  import { orderApi } from "./api/order/index.js";
4
4
  import { shopApi } from "./api/shop/index.js";
5
5
  export {
6
+ initOrderConfig,
6
7
  orderApi,
7
8
  orderConfig,
8
9
  orderConstant,
@@ -1,5 +1,5 @@
1
1
  // 变量
2
- export { orderConfig } from "./utils/config";
2
+ export { orderConfig, initOrderConfig } from "./utils/config";
3
3
  export type { OrderConfig } from "./utils/config";
4
4
  // 常量
5
5
  export { orderConstant } from "./utils/orderConstant";
@@ -1,5 +1,5 @@
1
1
  import type { ResponseData } from "xyvcard-wechat-auth/index";
2
- import { GoodsCategoryReq, GoodsCategoryList, GoodsBrandInfoReq, GoodsBrandInfoList, GoodsReq, GoodsPage, GoodsLabelInfoReq, GoodsLabelInfoList, GoodsSpuKey, GoodsSpuModel, GoodsEnsures, GoodsSpuSpecReq, GoodsSpuSpecList } from "./types";
2
+ import { GoodsCategoryReq, GoodsCategoryList, GoodsBrandInfoReq, GoodsBrandInfoList, GoodsReq, GoodsPage, GoodsLabelInfoReq, GoodsLabelInfoList, GoodsSpuKey, GoodsSpuModel, GoodsEnsures, GoodsSpuSpecReq, GoodsSpuSpecList, GoodsGroupInfoReq, GoodsGroupInfoList } from "./types";
3
3
  declare class GoodsApiImpl {
4
4
  findGoodsCategoryList(query: GoodsCategoryReq): Promise<ResponseData<GoodsCategoryList>>;
5
5
  findGoodsBrandInfoList(query: GoodsBrandInfoReq): Promise<ResponseData<GoodsBrandInfoList>>;
@@ -9,6 +9,7 @@ declare class GoodsApiImpl {
9
9
  findById(query: GoodsSpuKey): Promise<ResponseData<GoodsSpuModel>>;
10
10
  findEnsuresList(query: GoodsSpuKey): Promise<ResponseData<GoodsEnsures>>;
11
11
  findGoodsSpuSpecList(query: GoodsSpuSpecReq): Promise<ResponseData<GoodsSpuSpecList>>;
12
+ findGoodsGroupInfoList(query: GoodsGroupInfoReq): Promise<ResponseData<GoodsGroupInfoList>>;
12
13
  }
13
14
  declare const goodsApi: GoodsApiImpl;
14
15
  export { goodsApi };
@@ -118,6 +118,16 @@ class GoodsApiImpl {
118
118
  data: query
119
119
  });
120
120
  }
121
+ // 查询列表信息商品套装组合
122
+ findGoodsGroupInfoList(query) {
123
+ query.tenant = query.tenant || config.tenant;
124
+ clearEmpty(query);
125
+ return request({
126
+ url: "/v1/front/goods/goods_group_info/list/" + query.tenant,
127
+ method: "GET",
128
+ data: query
129
+ });
130
+ }
121
131
  }
122
132
  const goodsApi = new GoodsApiImpl();
123
133
  export {
@@ -43,6 +43,8 @@ export interface GoodsReq {
43
43
  brandId?: string;
44
44
  labelIds?: string[];
45
45
  likeSpuName?: string;
46
+ goodsType?: string;
47
+ byUser?: boolean;
46
48
  }
47
49
  export interface GoodsPage {
48
50
  results: Array<GoodsModel>;
@@ -138,3 +140,24 @@ export interface SkuMapModel {
138
140
  picUrl?: string;
139
141
  status?: boolean;
140
142
  }
143
+ export interface GoodsGroupInfoReq {
144
+ tenant?: string;
145
+ goodsId?: string;
146
+ }
147
+ export interface GoodsGroupInfoList {
148
+ results: Array<GoodsGroupInfoModel>;
149
+ }
150
+ export interface GoodsGroupInfoModel {
151
+ tenantId?: string;
152
+ goodsId?: string;
153
+ skuId?: string;
154
+ spuId?: string;
155
+ skuName?: string;
156
+ picUrl?: string;
157
+ picUrlFirst?: string;
158
+ saleNum?: number;
159
+ salePrice?: number;
160
+ totalPrice?: number;
161
+ labelIds?: Array<string>;
162
+ labelNames?: Array<string>;
163
+ }
@@ -0,0 +1,28 @@
1
+ import { config } from "xyvcard-wechat-auth/index";
2
+ Component({
3
+ /**
4
+ * 组件的属性列表
5
+ */
6
+ properties: {
7
+ // 商品详情
8
+ item: {
9
+ type: Object,
10
+ value: []
11
+ }
12
+ },
13
+ /**
14
+ * 组件的初始数据
15
+ */
16
+ data: {
17
+ imageUrl: config.baseUrl + "/v1/file/image/clip/0/0/"
18
+ },
19
+ /**
20
+ * 组件的方法列表
21
+ */
22
+ methods: {
23
+ // 查看详情
24
+ handleInfo() {
25
+ this.triggerEvent("handleInfo", this.data.item);
26
+ }
27
+ }
28
+ });
@@ -0,0 +1,4 @@
1
+ {
2
+ "component": true,
3
+ "usingComponents": {}
4
+ }
@@ -0,0 +1,15 @@
1
+ <!-- 商品详情-多商品(标签)列表 -->
2
+ <view class="goods-tags-item-l" bind:tap="handleInfo">
3
+ <image class="goods-tags-item-img" src="{{ imageUrl + item.picUrlFirst }}" mode="aspectFit" />
4
+ <view class="goods-tags-item-t">
5
+ <view class="goods-tags-item-title">{{ item.skuName }}</view>
6
+ <!-- 标签 -->
7
+ <view class="goods-tags-item-tag-main">
8
+ <view class="goods-tags-item-tag-name" wx:for="{{ item.labelNames }}" wx:key="index" wx:for-item="ite">{{ ite }}</view>
9
+ </view>
10
+ <view class="goods-tags-item-num">
11
+ <text class="goods-tags-item-num-price">¥{{ item.salePrice }}</text>
12
+ <text class="goods-tags-item-num-num">×{{ item.saleNum }}</text>
13
+ </view>
14
+ </view>
15
+ </view>
@@ -0,0 +1 @@
1
+ .goods-tags-item-l{display:flex;align-items:center;padding:30rpx;background-color:#fff;box-shadow:0px 2px 4px 0px rgba(0,0,0,.05);border-radius:15rpx;box-sizing:border-box;margin:20rpx 30rpx 0;width:690rpx}.goods-tags-item-l .goods-tags-item-img{width:180rpx;height:170rpx;border-radius:10rpx;margin-right:30rpx}.goods-tags-item-l .goods-tags-item-t{display:flex;flex-direction:column;gap:10rpx;flex:1}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-title{font-size:28rpx;color:#000;font-weight:bold}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-tag-main{display:flex;align-items:center;flex-wrap:wrap;gap:10rpx}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-tag-main .goods-tags-item-tag-name{font-size:24rpx;color:#dc2626;border-radius:6px;padding:3rpx 14rpx;box-sizing:border-box;background:#fff0f0;display:flex;align-items:center;justify-content:center}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-num{display:flex;justify-content:space-between;margin-top:10rpx;font-size:28rpx;line-height:42rpx}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-num .goods-tags-item-num-price{color:#ef4444}.goods-tags-item-l .goods-tags-item-t .goods-tags-item-num .goods-tags-item-num-num{color:#6b7280}
@@ -17,6 +17,11 @@ Component({
17
17
  type: Object,
18
18
  value: {}
19
19
  },
20
+ // skuId
21
+ skuId: {
22
+ type: String,
23
+ value: "35cb27dd-71f0-4f0c-96e0-934818d460bb"
24
+ },
20
25
  // 商品规格的选择
21
26
  goodsSpecsShow: {
22
27
  type: Object,
@@ -95,6 +100,7 @@ Component({
95
100
  tenant: this.data.tenant
96
101
  }).then(({ data }) => data.results)
97
102
  ]).then(([goodsData, ensures, spuSpecs]) => {
103
+ var _a;
98
104
  const { picUrls, description } = goodsData;
99
105
  goodsData.picUrls = picUrls.substring(
100
106
  0,
@@ -124,6 +130,14 @@ Component({
124
130
  }
125
131
  });
126
132
  }
133
+ if (this.data.skuId) {
134
+ const defaultSelectSku = (_a = goodsData.skuList) == null ? void 0 : _a.results.find(
135
+ (iit) => iit.skuId === this.data.skuId
136
+ );
137
+ defaultSelectSku == null ? void 0 : defaultSelectSku.specValues.forEach((spec) => {
138
+ selectedSpecs[spec.specId] = spec.specValueId;
139
+ });
140
+ }
127
141
  this.setData({
128
142
  selectedSpecs,
129
143
  goodsInfoData: goodsData,
@@ -175,7 +189,8 @@ Component({
175
189
  const { selectedSpecs, spuSpecsArray, skuMap } = this.data;
176
190
  const keys = Object.keys(selectedSpecs);
177
191
  console.log(
178
- "1111111111spuSpecsArray,keys,skuMap",
192
+ "1111111111selectedSpecs,spuSpecsArray,keys,skuMap",
193
+ selectedSpecs,
179
194
  spuSpecsArray,
180
195
  keys,
181
196
  skuMap
@@ -39,7 +39,7 @@
39
39
  </view>
40
40
  <!-- 按钮 -->
41
41
  <view class="goods-list-specs-btn">
42
- <auth-single-btn wx:if="{{ !isSpecFlag }}" text="确定" fontColor="#fff" btnBgColor="#d91d10" bind:click="handleOrderConfirm" />
43
- <auth-single-btn wx:else text="{{ selectedSku.stock==0 ? '该规格库存为0' : '该规格已下架' }}" fontColor="#fff" btnBgColor="#999" />
44
- </view>
42
+ <auth-single-btn wx:if="{{ !isSpecFlag }}" text="确定" buttonStyle="background-color: #d91d10;color: #fff;;border-radius: 10rpx;" bind:click="handleOrderConfirm" />
43
+ <auth-single-btn wx:else text="{{ selectedSku.stock==0 ? '该规格库存为0' : '该规格已下架' }}" buttonStyle="background-color: #999;color: #fff;;border-radius: 10rpx;" />
44
+ </view>
45
45
  </van-action-sheet>
@@ -1 +1 @@
1
- .goods-order-info{background-color:#fff;border-radius:10rpx;padding:30rpx;box-sizing:border-box;margin:20rpx 30rpx 0;width:690rpx}.goods-order-info .goods-order-info-l{display:flex;align-items:center;margin-bottom:10rpx}.goods-order-info .goods-order-info-l .goods-order-info-img{width:180rpx;height:170rpx;border-radius:10rpx;margin-right:30rpx}.goods-order-info .goods-order-info-l .goods-order-info-t{flex:1;margin-top:10rpx}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-title{font-size:28rpx;color:#333;font-weight:bold}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-spec-name{font-size:26rpx;color:#999;margin-top:4rpx}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num{display:flex;justify-content:space-between;margin-top:14rpx;font-size:28rpx;line-height:42px}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num .goods-order-info-num-price{color:#ef4444}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num .goods-order-info-num-num{color:#333}.goods-order-info .goods-order-info-order-box{font-size:28rpx;display:flex;justify-content:space-between;margin-top:20rpx}.goods-order-info .goods-order-info-order-box .goods-order-info-order-box-l{color:#999}.goods-order-info .goods-order-info-order-box .goods-order-info-order-box-r{color:#333}
1
+ .goods-order-info{background-color:#fff;border-radius:10rpx;padding:30rpx;box-sizing:border-box;margin:20rpx 30rpx 0;width:690rpx}.goods-order-info .goods-order-info-l{display:flex;align-items:center;margin-bottom:10rpx}.goods-order-info .goods-order-info-l .goods-order-info-img{width:180rpx;height:170rpx;border-radius:10rpx;margin-right:30rpx}.goods-order-info .goods-order-info-l .goods-order-info-t{display:flex;flex-direction:column;gap:10rpx;flex:1}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-title{font-size:28rpx;color:#333;font-weight:bold}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-spec-name{font-size:24rpx;color:#999}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num{display:flex;justify-content:space-between;margin-top:10rpx;font-size:28rpx;line-height:42rpx}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num .goods-order-info-num-price{color:#ef4444}.goods-order-info .goods-order-info-l .goods-order-info-t .goods-order-info-num .goods-order-info-num-num{color:#333}.goods-order-info .goods-order-info-order-box{font-size:28rpx;display:flex;justify-content:space-between;margin-top:20rpx}.goods-order-info .goods-order-info-order-box .goods-order-info-order-box-l{color:#999}.goods-order-info .goods-order-info-order-box .goods-order-info-order-box-r{color:#333}
@@ -1 +1 @@
1
- .goods-order-info-list{background-color:#fff;box-shadow:0px 2px 4px 0px rgba(0,0,0,.05);border-radius:15rpx;box-sizing:border-box;margin:20rpx 30rpx 0;width:690rpx}.goods-order-info-list .goods-order-info-list-l{display:flex;align-items:center;padding:30rpx;border-bottom:2rpx solid #f3f4f6}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-img{width:180rpx;height:170rpx;border-radius:10rpx;margin-right:30rpx}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t{flex:1;margin-top:10rpx}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-title{font-size:28rpx;color:#000;font-weight:bold}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-spec-name{font-size:26rpx;color:#6b7280;margin-top:4rpx}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num{display:flex;justify-content:space-between;margin-top:14rpx;font-size:28rpx;line-height:42px}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num .goods-order-info-list-num-price{color:#ef4444}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num .goods-order-info-list-num-num{color:#6b7280}.goods-order-info-list .goods-order-info-list-click-more{display:flex;align-items:center;justify-content:center;color:#dc2626;font-size:24rpx;font-weight:400;line-height:35rpx;padding:20rpx 0}
1
+ .goods-order-info-list{background-color:#fff;box-shadow:0px 2px 4px 0px rgba(0,0,0,.05);border-radius:15rpx;box-sizing:border-box;margin:20rpx 30rpx 0;width:690rpx}.goods-order-info-list .goods-order-info-list-l{display:flex;align-items:center;padding:30rpx;border-bottom:2rpx solid #f3f4f6}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-img{width:180rpx;height:170rpx;border-radius:10rpx;margin-right:30rpx}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t{display:flex;flex-direction:column;gap:10rpx;flex:1}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-title{font-size:28rpx;color:#000;font-weight:bold}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-spec-name{font-size:24rpx;color:#6b7280}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num{display:flex;justify-content:space-between;margin-top:14rpx;font-size:28rpx;line-height:42rpx}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num .goods-order-info-list-num-price{color:#ef4444}.goods-order-info-list .goods-order-info-list-l .goods-order-info-list-t .goods-order-info-list-num .goods-order-info-list-num-num{color:#6b7280}.goods-order-info-list .goods-order-info-list-click-more{display:flex;align-items:center;justify-content:center;color:#dc2626;font-size:24rpx;font-weight:400;line-height:35rpx;padding:20rpx 0}
@@ -1,10 +1,10 @@
1
- export { goodsConfig } from "./utils/config";
1
+ export { goodsConfig, initGoodsConfig } from "./utils/config";
2
2
  export type { GoodsConfig } from "./utils/config";
3
3
  export { goodsConstant } from "./utils/goodsConstant";
4
4
  export { GoodsCategoryBizDict } from "./utils/dict";
5
5
  export { couponsApi } from "./api/coupons/index";
6
6
  export type { MakeReq, FrontMakeList, FrontMakeModel, InfoReceiveReq, InfoModel, } from "./api/coupons/types";
7
7
  export { goodsApi } from "./api/goods/index";
8
- export type { GoodsCategoryReq, GoodsCategoryList, GoodsCategoryModel, GoodsBrandInfoReq, GoodsBrandInfoList, GoodsBrandInfoModel, GoodsReq, GoodsPage, GoodsModel, GoodsLabelInfoReq, GoodsLabelInfoList, GoodsLabelInfoModel, GoodsSpuKey, GoodsSpuModel, GoodsSkuList, GoodsSkuModel, SkuSpecValue, GoodsEnsures, GoodsSpuSpecReq, GoodsSpuSpecList, GoodsSpuSpecModel, SpecValueInfoModel, SkuMapModel, } from "./api/goods/types";
8
+ export type { GoodsCategoryReq, GoodsCategoryList, GoodsCategoryModel, GoodsBrandInfoReq, GoodsBrandInfoList, GoodsBrandInfoModel, GoodsReq, GoodsPage, GoodsModel, GoodsLabelInfoReq, GoodsLabelInfoList, GoodsLabelInfoModel, GoodsSpuKey, GoodsSpuModel, GoodsSkuList, GoodsSkuModel, SkuSpecValue, GoodsEnsures, GoodsSpuSpecReq, GoodsSpuSpecList, GoodsSpuSpecModel, SpecValueInfoModel, SkuMapModel, GoodsGroupInfoReq, GoodsGroupInfoList, GoodsGroupInfoModel, } from "./api/goods/types";
9
9
  export { orderApi } from "./api/order/index";
10
10
  export type { GoodsAppraisesReq, GoodsAppraisesPage, GoodsAppraisesModelTotal, GoodsAppraisesModel, OrderCartCreateReq, OrderCartModel, OrderUserAddressKeyList, OrderUserAddressModel, OrderCartReq, OrderCartPage, OrderCartModelTotal, } from "./api/order/types";
@@ -1,4 +1,4 @@
1
- import { goodsConfig } from "./utils/config.js";
1
+ import { goodsConfig, initGoodsConfig } from "./utils/config.js";
2
2
  import { goodsConstant } from "./utils/goodsConstant.js";
3
3
  import { GoodsCategoryBizDict } from "./utils/dict.js";
4
4
  import { couponsApi } from "./api/coupons/index.js";
@@ -10,5 +10,6 @@ export {
10
10
  goodsApi,
11
11
  goodsConfig,
12
12
  goodsConstant,
13
+ initGoodsConfig,
13
14
  orderApi
14
15
  };
@@ -1,6 +1,6 @@
1
1
  <!-- 创建卡片选择头像 样式组件 -->
2
2
  <!-- 头像背景盒子 -->
3
- <button plain class="image-box-bgc" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
3
+ <button plain class="auth-image-box-bgc" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
4
4
  <!-- 显示的头像 -->
5
5
  <image class="image-box-show" src="{{ avatar }}" mode="widthFix" />
6
6
  <!-- 提示选择头像图片 -->
@@ -1 +1 @@
1
- .image-box-bgc{position:relative;display:flex;align-items:center;justify-content:center;width:80px !important;height:80px;border:none;border-radius:10px;padding:0}.image-box-bgc .image-box-show{width:80px;height:80px}.image-box-bgc .select-image{position:absolute;width:24px;height:24px;bottom:0;right:0}.image-box-bgc[plain]{border:1px solid #e0e0e0}
1
+ .auth-image-box-bgc{position:relative;display:flex;align-items:center;justify-content:center;width:80px !important;height:80px;border:none;border-radius:10px;padding:0}.auth-image-box-bgc .image-box-show{width:80px;height:80px}.auth-image-box-bgc .select-image{position:absolute;width:24px;height:24px;bottom:0;right:0}.image-box-bgc[plain]{border:1px solid #e0e0e0}
@@ -1,4 +1,4 @@
1
- <view class="btn-box">
1
+ <view class="auth-btn-box">
2
2
  <button class="btn-left" style="background-color: {{ leftBgColor }}; color: {{ leftColor }}; border-radius: {{ btnRadius }}; border: {{ leftBorder }};" bind:tap="handleLeft">{{ leftText }}</button>
3
3
  <button class="btn-right" style="background-color: {{ rightBgColor }}; color: {{ rightColor }}; border-radius: {{ btnRadius }}; border: {{ rightBorder }};" bind:tap="handleRight">{{ rightText }}</button>
4
4
  </view>
@@ -1 +1 @@
1
- .btn-box{display:flex;align-items:center;justify-content:space-between;width:100%}.btn-box .btn-left{width:33%;margin-right:3%;height:48px;font-size:16px;line-height:48px}.btn-box .btn-right{height:48px;font-size:16px;width:64%;line-height:48px}
1
+ .auth-btn-box{display:flex;align-items:center;justify-content:space-between;width:100%}.auth-btn-box .btn-left{width:33%;margin-right:3%;height:48px;font-size:16px;line-height:48px}.auth-btn-box .btn-right{height:48px;font-size:16px;width:64%;line-height:48px}
@@ -1,6 +1,6 @@
1
1
  <button
2
2
  bind:tap="onClick"
3
- class="btn"
3
+ class="auth-btn"
4
4
  style="{{ buttonStyle }}"
5
5
  disabled="{{ disabled }}"
6
6
  >{{ text }}</button>
@@ -1 +1 @@
1
- .btn{font-size:16px;width:100% !important}
1
+ .auth-btn{font-size:16px;width:100% !important}
@@ -1,4 +1,4 @@
1
- <view class="none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
1
+ <view class="auth-none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
2
2
  <image class="holder-image" src="{{ resourceUrl + imgUrl }}" mode="heightFix" style="width: {{ imgWidth }};height: {{ imgHeight }};" />
3
3
  <view class="holder-text" style="color: {{ contentColor }};">{{ content }}</view>
4
4
  </view>
@@ -1 +1 @@
1
- .none-data{display:flex;align-items:center;justify-content:center;flex-direction:column}.none-data .holder-text{font-size:14px}
1
+ .auth-none-data{display:flex;align-items:center;justify-content:center;flex-direction:column}.auth-none-data .holder-text{font-size:14px}
@@ -1,5 +1,5 @@
1
- <view class="mask-box" wx:if="{{ show }}"></view>
2
- <view class="mask-popup" wx:if="{{ show }}" style="height: {{ height }}; background-color: {{ backColor }};">
1
+ <view class="auth-mask-box" wx:if="{{ show }}"></view>
2
+ <view class="auth-mask-popup" wx:if="{{ show }}" style="height: {{ height }}; background-color: {{ backColor }};">
3
3
  <view class="popup-title" titleShow="{{ titleShow }}">
4
4
  {{ title }}
5
5
  <image mode="widthFix" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" class="close-icon" bind:tap="closePopup"></image>
@@ -1 +1 @@
1
- .mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.mask-popup{position:fixed;bottom:0;left:0;border-top-left-radius:25px;border-top-right-radius:25px;padding:10px 4% 30px 4%;width:92%;z-index:99999}.mask-popup .popup-title{color:#333;font-size:14px;padding:10px 0;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.mask-popup .popup-title .close-icon{width:20px}
1
+ .auth-mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.auth-mask-popup{position:fixed;bottom:0;left:0;border-top-left-radius:25px;border-top-right-radius:25px;padding:10px 4% 30px 4%;width:92%;z-index:99999}.auth-mask-popup .popup-title{color:#333;font-size:14px;padding:10px 0;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.auth-mask-popup .popup-title .close-icon{width:20px}
@@ -1,4 +1,4 @@
1
- <view class="search-box" style="box-shadow: {{ isBoxShadow ? '0px 3px 3px 0px rgba(40, 65, 91, 0.1);' : '0px' }}">
1
+ <view class="auth-search-box" style="box-shadow: {{ isBoxShadow ? '0px 3px 3px 0px rgba(40, 65, 91, 0.1);' : '0px' }}">
2
2
  <image src="{{ resourceUrl + '/icon_image/icon_search.png' }}" class="search-icon"></image>
3
3
  <input class="search-input" style="background-color: {{ backColor }}; width: {{ isSearchBtn ? '60%' : '100%' }}; {{ isSearchBtn ? '' : 'padding-right: 20px' }}" placeholder="{{ placeholder }}" disabled="{{ disabled }}" value="{{ likeName }}" bindinput="handleInput" bind:tap="handleTap" />
4
4
  <view class="search-btn" wx:if="{{ isSearchBtn }}">
@@ -1 +1 @@
1
- .search-box{position:relative;width:100%;border-radius:25px;background-color:#fff;display:flex;justify-content:space-between;align-items:center;height:35px;box-sizing:border-box;overflow:hidden}.search-box .search-input{height:35px;color:#6b7280;font-size:14px;padding-left:40px}.search-box .search-icon{width:20px;height:20px;position:absolute;left:10px;transform:translate(0, -50%);top:50%}.search-box .search-btn{padding-right:3%}
1
+ .auth-search-box{position:relative;width:100%;border-radius:25px;background-color:#fff;display:flex;justify-content:space-between;align-items:center;height:35px;box-sizing:border-box;overflow:hidden}.auth-search-box .search-input{height:35px;color:#6b7280;font-size:14px;padding-left:40px}.auth-search-box .search-icon{width:20px;height:20px;position:absolute;left:10px;transform:translate(0, -50%);top:50%}.auth-search-box .search-btn{padding-right:3%}
@@ -1,5 +1,5 @@
1
1
  <view style="background-color: {{ style.color }};">
2
- <view class="top-navigation" style="padding-top: {{ style.paddingTop }}px; height: {{ style.height }}px;">
2
+ <view class="auth-top-navigation" style="padding-top: {{ style.paddingTop }}px; height: {{ style.height }}px;">
3
3
  <image src="{{ resourceUrl + '/member/arrow-left.png' }}" class="back-icon" wx:if="{{ isLeftIcon }}" bind:tap="handleBack"></image>
4
4
  <text class="title">{{ title }}</text>
5
5
  </view>
@@ -1 +1 @@
1
- .top-navigation{display:flex;align-items:center;padding:0 10px}.top-navigation .back-icon{width:13px;height:21px}.top-navigation .title{flex:1;text-align:center;font-size:14px}
1
+ .auth-top-navigation{display:flex;align-items:center;padding:0 10px}.auth-top-navigation .back-icon{width:13px;height:21px}.auth-top-navigation .title{flex:1;text-align:center;font-size:14px}
@@ -1,10 +1,11 @@
1
1
  export { clearEmpty, request, sendRequest } from "./utils/request";
2
- export { config } from "./utils/config";
2
+ export { config, initconfig } from "./utils/config";
3
3
  export { auth } from "./utils/auth";
4
4
  export { db } from "./utils/db";
5
5
  export type { BaseConfig } from "./utils/config";
6
6
  export { validateRequired, validateRules, formatDateTime, kbToMb, convertToISOString, getHeight } from "./utils/common";
7
- export type { RequestData, ResponseData, RequestHeader } from "./api/types";
7
+ export { splitOrganTenant, splitVcardTenant, splitVcardTenantReturn } from "./utils/util";
8
+ export type { RequestData, ResponseData, RequestHeader, CustomEvent } from "./api/types";
8
9
  export { Dict } from "./api/index";
9
10
  export { EntryDict, EnumDict } from "./api/dicts";
10
11
  export { authApi } from "./api/auth/index";
@@ -1,8 +1,9 @@
1
1
  import { clearEmpty, request, sendRequest } from "./utils/request.js";
2
- import { config } from "./utils/config.js";
2
+ import { config, initconfig } from "./utils/config.js";
3
3
  import { auth } from "./utils/auth.js";
4
4
  import { db } from "./utils/db.js";
5
5
  import { convertToISOString, formatDateTime, getHeight, kbToMb, validateRequired, validateRules } from "./utils/common.js";
6
+ import { splitOrganTenant, splitVcardTenant, splitVcardTenantReturn } from "./utils/util.js";
6
7
  import { Dict } from "./api/index.js";
7
8
  import { EntryDict, EnumDict } from "./api/dicts.js";
8
9
  import { authApi } from "./api/auth/index.js";
@@ -22,9 +23,13 @@ export {
22
23
  fileApi,
23
24
  formatDateTime,
24
25
  getHeight,
26
+ initconfig,
25
27
  kbToMb,
26
28
  request,
27
29
  sendRequest,
30
+ splitOrganTenant,
31
+ splitVcardTenant,
32
+ splitVcardTenantReturn,
28
33
  validateRequired,
29
34
  validateRules
30
35
  };
@@ -3,7 +3,7 @@ const host = "gh.sooyie.cn";
3
3
  const agentUrl = "/v1/file/path/wxapp";
4
4
  const config = {
5
5
  dev: true,
6
- testNewUser: false,
6
+ testNewUser: true,
7
7
  name: "Jmash框架",
8
8
  baseUrl: https + host,
9
9
  // 接口域名
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xyvcard-mall-order",
3
- "version": "0.0.21",
3
+ "version": "0.0.23",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -11,8 +11,8 @@
11
11
  "dependencies": {
12
12
  "@vant/weapp": "^1.11.7",
13
13
  "miniprogram-api-typings": "^4.1.0",
14
- "xyvcard-wechat-auth": "^0.0.6",
15
- "xyvcard-mall-goods": "^0.0.22"
14
+ "xyvcard-wechat-auth": "^0.0.9",
15
+ "xyvcard-mall-goods": "^0.0.31"
16
16
  },
17
17
  "devDependencies": {
18
18
  "typescript": "^5.8.3",