xyvcard-mall-mp 0.1.21 → 0.1.22

package/lib/api/trace/types.d.ts

@@ -12,7 +12,6 @@ export interface TraceFlowModel {
     batchId?: string;
     title?: string;
     flowTime?: string;
-    flowDate?: string;
     startCode?: string;
     endCode?: string;
     desc?: string;

package/lib/components/mall/mall-book-kit-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/api/diy/types.d.ts

@@ -0,0 +1,111 @@
+export interface Comp {
+    compCode: CompCode;
+    compName: string;
+    compType: CompType;
+    compData: CompDataType;
+}
+export interface CompData {
+    showTitle: boolean;
+    titleStyle: TitleStyle;
+    titleImage?: string;
+    init: boolean;
+    style?: any;
+    showMore?: boolean;
+    showButton?: boolean;
+}
+export type CompType = "BASIC" | "VCARD" | "ORGAN" | "MALL" | "OTHER";
+export declare enum TitleStyle {
+    style1 = 0,
+    style2 = 1,
+    style3 = 2,
+    style4 = 3
+}
+export interface ImageComp extends CompData {
+    style: ImageStyle;
+    imageUrls: Array<string>;
+}
+export declare enum ImageStyle {
+    swiper = "swiper",
+    flat = "flat",
+    grid = "grid"
+}
+export interface AudioComp extends CompData {
+    url: string;
+    autoPlay: boolean;
+    hidden: boolean;
+    external: boolean;
+}
+export interface VideoComp extends CompData {
+    imageUrl: string;
+    width: number;
+    height: number;
+    size: number;
+    duration: number;
+    videoUrl: string;
+    external: boolean;
+}
+export interface MapComp extends CompData {
+}
+export interface SlotComp extends CompData {
+    slotCode: string;
+}
+export interface CmsComp extends CompData {
+    siteId: string;
+    channelId: string;
+    channelAlias: string;
+    pageSize: number;
+}
+export type CompCode = "text" | "image" | "video" | "audio" | "map" | "slot" | "news" | "product";
+export type CompDataType = MapComp | TextComp | ImageComp | VideoComp | AudioComp | SlotComp | CmsComp;
+export interface TextComp extends CompData {
+    text: string;
+}
+export interface PageData {
+    theme: ThemeStyle;
+    edition: Edition;
+    themeIndex: number;
+}
+export declare enum ThemeStyle {
+    blue = 0,
+    red = 1,
+    gray = 2,
+    while = 3
+}
+export declare enum Edition {
+    com = 0,
+    gov = 1,
+    edu = 2
+}
+export interface PageModel {
+    pageId?: string;
+    vcardId?: string;
+    pageName?: string;
+    pageCode?: string;
+    pageTemplate?: string;
+    pageImgUrl?: string;
+    pageData?: PageData;
+    pageJson: string;
+    compModels?: Array<CompModel>;
+}
+export interface CompModel {
+    compId: string;
+    pageId: string;
+    compCode: CompCode;
+    compName: string;
+    compType: CompType;
+    compData: CompDataType;
+    orderBy: number;
+}
+export interface BusiDataModel {
+}
+export interface CompEventModel {
+    pageModel: PageModel;
+    compModel: CompModel;
+    busiDataModel: BusiDataModel;
+}
+export interface OrganDataModel extends BusiDataModel {
+    latitude: number;
+    longitude: number;
+    address: string;
+    mobilePhone: string;
+}

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/basic/basic-image-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/basic/basic-none-data.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/basic/basic-text-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/basic/basic-title-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/basic/basic-video-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/custom/basic-custom-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/custom/organ-custom-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/organ/organ-contact-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/organ/organ-map-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-diy-mp@0.1.7_typescript@4.9.5/node_modules/jmash-diy-mp/src/components/organ/organ-notice-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/src/api/trace/types.d.ts

@@ -12,7 +12,6 @@ export interface TraceFlowModel {
     batchId?: string;
     title?: string;
     flowTime?: string;
-    flowDate?: string;
     startCode?: string;
     endCode?: string;
     desc?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-mall-mp",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,7 +19,7 @@
     "vue-i18n-bridge": "^9.2.2",
     "vue-router": "^3.1.3",
     "jmash-core-mp": "^0.1.15",
-    "jmash-diy-mp": "^0.1.6"
+    "jmash-diy-mp": "^0.1.7"
   },
   "devDependencies": {
     "@types/node": "^18.19.0",

package/src/api/trace/types.ts

@@ -24,8 +24,6 @@ export interface TraceFlowModel {
   title?: string;
   // 流转时间
   flowTime?: string;
-  // 流转日期
-  flowDate?: string;
   // 起始编号
   startCode?: string;
   // 结束编号

package/src/packages/goods/components/goods/goods-list.mpx

@@ -2,8 +2,8 @@
 * 商品列表组件
 * @param goodsParams 商品参数
 Object:GoodsListReq {tenant: string, categoryIds: string, brandIds: string, labelIds: string, likeSpuName: string}
+* @param showButton 是否显示加购按钮 默认显示true
 * @event goodsInfo 商品详情点击事件,参数为商品详情ID spuId
-* @event navigateToLogin 跳转登录事件
 * @event navigateToCart 跳转购物车事件
 */
 <template>
@@ -22,8 +22,8 @@ Object:GoodsListReq {tenant: string, categoryIds: string, brandIds: string, labe
           <view class="spu-name">{{ item.spuName }}</view>
           <view class="two-price">
             <view class="min-price">¥{{ item.minPrice }}</view>
-            <image class="car-img" src="{{ resourceUrl + 'buy_icon.png' }}" data-item="{{ item }}"
-              catch:tap="handleCar" />
+            <image class="car-img" wx:if="{{ showButton }}" src="{{ resourceUrl + 'buy_icon.png' }}"
+              data-item="{{ item }}" catch:tap="handleCar" />
           </view>
         </view>
       </view>
@@ -77,6 +77,11 @@ createComponent({
         }
       }
     },
+    // 是否显示加购按钮
+    showButton: {
+      type: Boolean,
+      value: true,
+    },
   },
   setup() {
     // 接口图片资源
@@ -209,7 +214,7 @@ createComponent({
             content: "请先登录！",
             success: (ress) => {
               if (ress.confirm) {
-                this.triggerEvent("navigateToLogin");
+                mpx.navigateTo({ url: mallConfig.loginUrl });
               }
             }
           })

package/src/packages/goods/components/goods-brands/brands-tab.mpx

@@ -2,7 +2,6 @@
 * 品牌tab栏组件
 * @param tenant 租户 String
 * @param goodsParams 商品参数 Object:GoodsReq
-* @event brandsTabHeight 品牌tab栏高度事件,参数为品牌tab组件高度 height
 * @event brands 品牌标签点击事件,参数为品牌ID brandId
 */
 <template>
@@ -64,9 +63,6 @@ createComponent({
             this.curentIndex = res.data.results.findIndex((i) => i.brandId === this.goodsParams.brandId);
           }
           this.goodsBrandInfoList = res.data.results;
-          // 品牌tab组件高度
-          const length = this.goodsBrandInfoList.length ? "66rpx" : "0rpx";
-          this.triggerEvent("brandsTabHeight", length);
         }
       })
     },

package/src/packages/goods/components/goods-brands-catalog.mpx

@@ -5,7 +5,6 @@
 * @props likeName 关键字模糊查询 string
 * @events goodsInfo 商品详情事件，参数为当前商品数据e.detail=>spuId
 * @events navigateToCart 跳转购物车事件
-* @events navigateToLogin 跳转登录事件
 */
 <template>
   <!-- 商品列表页-品牌 -->
@@ -28,7 +27,7 @@
         <goods-label-tags tenant="{{ tenant }}" bind:label="handleLabel" />
         <!-- 商品列表 -->
         <goods-list class="good-list" id="goods-list" goodsParams="{{ goodsParams }}" bind:goodsInfo="handleInfo"
-          bind:navigateToCart="navigateToCart" bind:navigateToLogin="navigateToLogin" />
+          bind:navigateToCart="navigateToCart" />
       </view>
     </view>
   </view>
@@ -131,11 +130,6 @@ createComponent({
     navigateToCart() {
       this.triggerEvent("navigateToCart");
     },
-
-    // 跳转登录页
-    navigateToLogin() {
-      this.triggerEvent("navigateToLogin");
-    },
   }
 })
 </script>
@@ -160,14 +154,14 @@ createComponent({
 
   .goods-catalog-left {
     width: 150rpx;
-    padding-bottom: calc(env(safe-area-inset-bottom));
+    padding-bottom: 0;
     box-sizing: border-box;
     border-right: 2rpx solid $border-line;
   }
 
   .goods-catalog-right {
     width: 600rpx;
-    padding: 30rpx 30rpx env(safe-area-inset-bottom);
+    padding: 30rpx;
     box-sizing: border-box;
     background-color: #f9fafb;
     display: flex;

package/src/packages/goods/components/goods-catalog.mpx

@@ -6,7 +6,6 @@
 * @props likeName 关键字模糊查询 string
 * @events goodsInfo 商品详情事件，参数为当前商品数据e.detail=>spuId
 * @events navigateToCart 跳转购物车事件
-* @events navigateToLogin 跳转登录事件
 */
 <template>
   <!-- 商品列表页-分类 -->
@@ -24,13 +23,12 @@
       </view>
       <view class="goods-catalog-right">
         <!-- 商品品牌tab栏 -->
-        <goods-brands-tab tenant="{{ tenant }}" bind:brands="handleBrands" bind:brandsTabHeight="getBrandsTabHeight" />
+        <goods-brands-tab tenant="{{ tenant }}" bind:brands="handleBrands" />
         <!-- 商品标签tab栏 -->
-        <goods-label-tags tenant="{{ tenant }}" bind:label="handleLabel" bind:labelTagsHeight="getLabelTagsHeight" />
+        <goods-label-tags tenant="{{ tenant }}" bind:label="handleLabel" />
         <!-- 商品列表 -->
-        <goods-list class="good-list" id="goods-list" brandsTabHeight="{{ brandsTabHeight }}"
-          labelTagsHeight="{{ labelTagsHeight }}" goodsParams="{{ goodsParams }}" bind:goodsInfo="handleInfo"
-          bind:navigateToCart="navigateToCart" bind:navigateToLogin="navigateToLogin" />
+        <goods-list class="good-list" id="goods-list" goodsParams="{{ goodsParams }}" bind:goodsInfo="handleInfo"
+          bind:navigateToCart="navigateToCart" />
       </view>
     </view>
   </view>
@@ -70,24 +68,15 @@ createComponent({
   setup() {
     // 商品分类
     let categoryItem = ref({} as GoodsCategoryModel);
-    // 商品分类列表
-    let goodsCategoryList = ref([] as GoodsCategoryModel[]);
     // 商品列表参数
     let goodsParams = ref({} as GoodsReq);
-    // 标签组件高度
-    let labelTagsHeight = ref("0rpx");
-    // 品牌tab组件高度
-    let brandsTabHeight = ref("0rpx");
     // 保存初始的categoryId（用于"查看更多"进来时点击全部仍保留原categoryId）
     let initialCategoryId = ref("");
 
     return {
       categoryItem,
-      goodsCategoryList,
       goodsParams,
-      labelTagsHeight,
-      brandsTabHeight,
-      initialCategoryId
+      initialCategoryId,
     }
   },
   lifetimes: {
@@ -186,20 +175,6 @@ createComponent({
     navigateToCart() {
       this.triggerEvent("navigateToCart");
     },
-
-    // 跳转登录页
-    navigateToLogin() {
-      this.triggerEvent("navigateToLogin");
-    },
-
-    // 品牌tab组件高度
-    getBrandsTabHeight(e: EventBase) {
-      this.brandsTabHeight = e.detail;
-    },
-    // 标签组件高度
-    getLabelTagsHeight(e: EventBase) {
-      this.labelTagsHeight = e.detail;
-    }
   }
 })
 </script>
@@ -224,7 +199,7 @@ createComponent({
 
   .goods-catalog-left {
     width: 150rpx;
-    padding-bottom: calc(env(safe-area-inset-bottom));
+    padding-bottom: 0;
     box-sizing: border-box;
     border-right: 2rpx solid $border-line;
     height: 100%;
@@ -232,7 +207,7 @@ createComponent({
 
   .goods-catalog-right {
     width: 600rpx;
-    padding: 30rpx 30rpx env(safe-area-inset-bottom);
+    padding: 30rpx;
     box-sizing: border-box;
     background-color: #f9fafb;
     display: flex;

package/src/packages/goods/components/goods-spec/spec-popup.mpx

@@ -204,7 +204,7 @@ createComponent({
             icon: "none",
             duration: 2000,
           });
-          this.triggerEvent("refresh", res.statusCode === 200);
+          this.triggerEvent("refresh");
         } else {
           mpx.showToast({
             title: (res.data as any).message,

package/src/packages/goods/pages/goods-info.mpx

@@ -365,11 +365,21 @@ createPage({
     this.formCart.quantity = 1;
     this.formCart.requestId = Math.random() * 10 + "";
     orderApi.createOrderCart(this.formCart).then((res) => {
+      if (res.statusCode !== 200) {
+        mpx.showToast({
+          title: (res.data as any).message,
+          icon: "none",
+          duration: 2000,
+        });
+        return;
+      }
       mpx.showToast({
-        title: res.statusCode !== 200 ? (res.data as any).message : "加入成功",
+        title: "加入成功",
         icon: "none",
         duration: 2000,
       });
+      // 加入购物车--刷新
+      this.refresh();
     });
   },
   // 加入购物车-多规格商品
@@ -395,10 +405,8 @@ createPage({
     }
   },
   // 加入购物车--刷新
-  refresh(e: EventBase) {
-    if (e.detail) {
-      this.selectComponent("#actionComponent").queryCartNum();
-    }
+  refresh() {
+    this.selectComponent("#actionComponent").queryCartNum();
   },
   // 跳转地址选择页
   navigateToAddress() {

package/src/packages/goods/pages/goods-list.mpx

@@ -6,11 +6,11 @@
     <!-- 分类产品列表 -->
     <goods-catalog wx:ref id="goods-catalog" class="goods-catalog" ismore="{{ ismore }}" categoryId="{{ categoryId }}"
       tenant="{{ tenant }}" likeName="{{ likeSpuName }}" wx:if="{{ type === 'categories' }}" bind:goodsInfo="handleInfo"
-      bind:navigateToCart="navigateToCart" bind:navigateToLogin="navigateToLogin" />
+      bind:navigateToCart="navigateToCart" />
     <!-- 品牌产品列表 -->
     <goods-brands-catalog wx:ref id="goods-brands-catalog" class="goods-catalog" tenant="{{ tenant }}"
       brandId="{{ brandId }}" likeName="{{ likeSpuName }}" wx:if="{{ type === 'brand' }}" bind:goodsInfo="handleInfo"
-      bind:navigateToCart="navigateToCart" bind:navigateToLogin="navigateToLogin" />
+      bind:navigateToCart="navigateToCart" />
   </view>
   <!-- 底部导航 -->
   <mall-tab-bar class="mall-tab-bar" wx:show="{{ tabbarShow }}" wx:ref="mallTabBar" />
@@ -19,7 +19,6 @@
 <script lang="ts">
 import mpx, { createPage, ref, computed, onLoad } from "@mpxjs/core";
 import { EventBase } from "jmash-core-mp";
-import { mallConfig } from "../../../utils/config";
 
 createPage({
   setup() {
@@ -97,10 +96,6 @@ createPage({
   navigateToCart() {
     mpx.switchTab({ url: "/pages/tabbar/cart" });
   },
-  // 跳转登录页
-  navigateToLogin() {
-    mpx.navigateTo({ url: mallConfig.loginUrl });
-  },
 
   // 加购-关闭选中规格弹窗
   closeSpecShow() {
@@ -135,14 +130,6 @@ page {
   overflow: hidden;
 }
 
-.goods-catalog-left {
-  padding-bottom: 0 !important;
-}
-
-.goods-catalog-right {
-  padding-bottom: 30rpx !important;
-}
-
 .mall-tab-bar {
   position: fixed;
   bottom: 0;

package/src/packages/order/components/order-cart/cart-culture.mpx

@@ -35,10 +35,13 @@
           bind:handleInfo="handleInfo" />
       </block>
       <!-- 暂无数据 -->
-      <jmash-none-data wx:else content="购物车为空" marginTop="0" paddingTop="300" />
+      <!-- <jmash-none-data wx:else imgUrl="" content="购物车为空" marginTop="0" paddingTop="300" /> -->
+      <jmash-none-data wx:else imgUrl="/culture/cartEmpty.png" imgTextGap="10" content="您的购物车空空如也" contentColor="#693E1E" imgWidth="196rpx" imgHeight="242rpx" marginTop="0" paddingTop="300" />
+       <view class="go-shopping-btn" bind:tap="navigateToLogin">去逛逛
+         <cube-icon style="margin-left: 20rpx;" type="arrow" size="28rpx" />
+       </view>
     </scroll-view>
 
-    <!-- 结算/删除bar -->
     <!--price-color 价钱颜色" btn-bg-color 结算按钮背景颜色 -->
     <order-submit-bar wx:if="{{ cartList.length }}" selected-all="{{ selectedAll }}" is-submit-bar="{{ isSubmitBar }}"
       disabled="{{ disabled }}" total-size="{{ total }}" total-price="{{ totalPrice }}" price-color="{{ '#FA6A59' }}"
@@ -53,6 +56,7 @@ import mpx, { createComponent, ref } from "@mpxjs/core";
 import { useUserStore, config } from "jmash-core-mp";
 import { goodsApi } from "../../../../api/goods/index";
 import { orderApi } from "../../../../api/order/index";
+import { mallConfig } from "../../../../utils/config";
 import { OrderCartModel, OrderCartReq } from "../../../../api/order/types";
 
 createComponent({
@@ -61,6 +65,7 @@ createComponent({
     styleIsolation: "apply-shared",
   },
   setup() {
+     let resourceUrl = mallConfig.resourceUrl + "/images/mall/";
     const imageUrl = config.baseUrl + "/v1/file/image/clip/220/210/";
     const likeSpuName = ref("");
     const queryParams = ref({
@@ -83,6 +88,7 @@ createComponent({
     const userStore = useUserStore();
 
     return {
+      resourceUrl,
       imageUrl,
       likeSpuName,
       queryParams,
@@ -474,16 +480,30 @@ radio {
   align-items: center;
   justify-content: center;
 }
+
+.go-shopping-btn {
+  background-color: #FC8E24;
+  color: #fff;
+  font-size: 28rpx;
+  width: 220rpx;
+  height: 66rpx;
+  margin: 30rpx auto;
+  border-radius: 44rpx;
+  line-height: 66rpx;
+  text-align: center;
+}
 </style>
 
 <script type="application/json">
 {
   "component": true,
   "usingComponents": {
+    "cube-icon": "@mpxjs/mpx-cube-ui/src/components/icon/index",
     "jmash-search": "jmash-core-mp/src/components/common/jmash-search",
     "jmash-none-data": "jmash-core-mp/src/components/common/jmash-none-data",
     "order-submit-bar": "../../components/submit-bar",
-    "cart-item": "./cart-item.mpx"
+    "cart-item": "./cart-item.mpx",
+    "jmash-single-btn": "jmash-core-mp/src/components/common/jmash-single-btn"
   }
 }
 </script>

package/src/packages/order/components/order-cart/cart-mall.mpx

@@ -356,7 +356,7 @@ createComponent({
       });
       this.disabled = cartFilterList.length === 0;
       this.total = cartFilterList.length;
-      this.totalPrice = totalPrice;
+      this.totalPrice = Number(totalPrice.toFixed(2));
     },
 
     // 批量删除

package/src/pages/tabbar/category.mpx

@@ -104,19 +104,6 @@ createPage({
 .search-box {
   padding: 20rpx;
 }
-
-.goods-catalog {
-  flex: 1;
-  overflow: hidden;
-}
-
-.goods-catalog-left {
-  padding-bottom: 0 !important;
-}
-
-.goods-catalog-right {
-  padding-bottom: 30rpx !important;
-}
 </style>
 
 <script type="application/json">