xyvcard-mall-order 0.0.76 → 0.0.78

package/dist/api/order/types.d.ts

@@ -69,7 +69,6 @@ export interface OrderInfoModel {
     paidPrice?: number;
     salesPrice?: number;
     refundPrice?: number;
-    spuClass?: string;
 }
 export interface OrderItemList {
     results: Array<OrderItemModel>;
@@ -150,6 +149,7 @@ export interface OrderInfoCreateReq {
     userMessage?: string;
     userAddressId?: string;
     orderItems?: Array<OrderItemCreateReq>;
+    refereeUserId?: string;
 }
 export interface OrderItemCreateReq {
     skuId?: string;

package/dist/components/common/cascader-region/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "@vant/weapp/popup/index",
-    "van-cascader": "@vant/weapp/cascader/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-cascader": "@vant/weapp/cascader/index"
+  }
 }

package/dist/components/common/cascader-region/index.wxml

@@ -1,19 +1,19 @@
-<input
-  class="weui-input"
-  value="{{ cascaderValue }}"
-  placeholder="请选择所在地区"
-  disabled
-  bind:tap="handleRegionShow"
-/>
-<van-popup show="{{ show }}" round position="bottom">
-  <van-cascader
-    wx:if="{{ show }}"
-    value="{{ cascaderValue }}"
-    title="请选择所在地区"
-    active-color="#D91D10"
-    options="{{ regionOption }}"
-    bind:close="handleClose"
-    bind:change="handleChange"
-    bind:finish="handleFinish"
-  />
-</van-popup>
+<input
+  class="weui-input"
+  value="{{ cascaderValue }}"
+  placeholder="请选择所在地区"
+  disabled
+  bind:tap="handleRegionShow"
+/>
+<van-popup show="{{ show }}" round position="bottom">
+  <van-cascader
+    wx:if="{{ show }}"
+    value="{{ cascaderValue }}"
+    title="请选择所在地区"
+    active-color="#D91D10"
+    options="{{ regionOption }}"
+    bind:close="handleClose"
+    bind:change="handleChange"
+    bind:finish="handleFinish"
+  />
+</van-popup>

package/dist/components/order/order-delivery/index.js

@@ -30,6 +30,11 @@ Component({
     goodsSpuClass: {
       type: String,
       value: ""
+    },
+    // 是否门店自提
+    isBranchPickup: {
+      type: Boolean,
+      value: false
     }
   },
   /**
@@ -69,6 +74,11 @@ Component({
               this.setData({
                 deliveryWayArray: values.filter((_i, index) => index < 2)
               });
+              if (this.data.isBranchPickup) {
+                this.setData({
+                  deliveryWayArray: values.filter((_i, index) => index < 1)
+                });
+              }
               break;
             case OrderConstant.SPUCLASS[1].key:
               this.setData({
@@ -177,10 +187,11 @@ Component({
     },
     // 获取门店信息
     getBranchItem(e) {
+      const branchItem = e.detail;
       this.setData({
-        branchArray: e.detail.branchItem
+        branchArray: [branchItem]
       });
-      this.triggerEvent("branchId", this.data.branchArray[0].branchId);
+      this.triggerEvent("branchId", branchItem.branchId);
     }
   }
 });

package/dist/components/order/order-delivery/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "@vant/weapp/icon/index",
-    "shop-branch-popup": "xyvcard-mall-shop/components/shop-branch/popup/branch-popup/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "shop-branch-popup": "xyvcard-mall-shop/components/shop-branch/popup/branch-popup/index"
+  }
 }

package/dist/components/order/order-delivery/index.wxml

@@ -1,71 +1,71 @@
-<view class="address-choose">
-  <!-- 切换配送方式 -->
-  <radio-group bindchange="handleChange" class="address-choose-group">
-    <label
-      class="address-choose-item"
-      wx:for="{{ deliveryWayArray }}"
-      wx:key="index"
-    >
-      <radio
-        value="{{ item.key }}"
-        color="#D91D10"
-        checked="{{ item.key == deliveryWay }}"
-      />
-      <text>{{ item.value }}</text>
-    </label>
-  </radio-group>
-</view>
-
-<block wx:if="{{ deliveryWay !== deliveryWayStoreVerification && deliveryWay !== deliveryWayVirtualShipping }}">
-  <!-- 收货地址 -->
-  <block wx:if="{{ deliveryWay == deliveryWayExpress }}">
-    <view
-      class="address-add"
-      wx:if="{{ defaultAdressList.length > 0 || addressId }}"
-    >
-      <view class="address-box-l">
-        <view class="address-box-l-t">
-          <text class="address-name">{{ defaultAdressList[0].userName }}</text>
-          <text class="address-mobile"
-            >{{ defaultAdressList[0].mobilePhone }}</text
-          >
-          <text class="default-sign" wx:if="{{ defaultAdressList[0].isDefault }}"
-            >默认</text
-          >
-        </view>
-        <view class="address">{{ defaultAdressList[0].detailInfo }}</view>
-      </view>
-      <view class="address-add-r" bind:tap="changeAddress">更换</view>
-    </view>
-    <view class="address-add" wx:else>
-      <view class="address-add-l" bind:tap="handleAdd">
-        <image src="{{ resourceUrl }}/address_add.png" class="add-icon"></image>
-        <text>填写收货地址</text>
-      </view>
-    </view>
-  </block>
-  <!-- 自提门店地址 -->
-  <block wx:else>
-    <view class="address-add" wx:if="{{ branchArray.length > 0 }}">
-      <view class="address-add-l"> 自提地址：{{ branchArray[0].address }} </view>
-      <view class="address-add-r" bind:tap="handleShopChoose">
-        更换<van-icon name="arrow" />
-      </view>
-    </view>
-    <view class="address-add" wx:else bind:tap="handleShopChoose">
-      <view class="address-add-l">
-        <image src="{{ resourceUrl }}/adress_icon.png" class="add-icon"></image>
-        <text>选择自提门店</text>
-      </view>
-      <van-icon name="arrow" />
-    </view>
-  </block>
-</block>
-
-<!-- 门店列表弹框 -->
-<shop-branch-popup
-  tenant="{{ tenant }}"
-  branchShow="{{ branchShow }}"
-  bind:branchItem="getBranchItem"
-  bind:close="handleShopChoose"
-/>
+<view class="address-choose">
+  <!-- 切换配送方式 -->
+  <radio-group bindchange="handleChange" class="address-choose-group">
+    <label
+      class="address-choose-item"
+      wx:for="{{ deliveryWayArray }}"
+      wx:key="index"
+    >
+      <radio
+        value="{{ item.key }}"
+        color="#D91D10"
+        checked="{{ item.key == deliveryWay }}"
+      />
+      <text>{{ item.value }}</text>
+    </label>
+  </radio-group>
+</view>
+
+<block wx:if="{{ deliveryWay !== deliveryWayStoreVerification && deliveryWay !== deliveryWayVirtualShipping }}">
+  <!-- 收货地址 -->
+  <block wx:if="{{ deliveryWay == deliveryWayExpress }}">
+    <view
+      class="address-add"
+      wx:if="{{ defaultAdressList.length > 0 || addressId }}"
+    >
+      <view class="address-box-l">
+        <view class="address-box-l-t">
+          <text class="address-name">{{ defaultAdressList[0].userName }}</text>
+          <text class="address-mobile"
+            >{{ defaultAdressList[0].mobilePhone }}</text
+          >
+          <text class="default-sign" wx:if="{{ defaultAdressList[0].isDefault }}"
+            >默认</text
+          >
+        </view>
+        <view class="address">{{ defaultAdressList[0].detailInfo }}</view>
+      </view>
+      <view class="address-add-r" bind:tap="changeAddress">更换</view>
+    </view>
+    <view class="address-add" wx:else>
+      <view class="address-add-l" bind:tap="handleAdd">
+        <image src="{{ resourceUrl }}/address_add.png" class="add-icon"></image>
+        <text>填写收货地址</text>
+      </view>
+    </view>
+  </block>
+  <!-- 自提门店地址 -->
+  <block wx:else>
+    <view class="address-add" wx:if="{{ branchArray.length > 0 }}">
+      <view class="address-add-l"> 自提地址：{{ branchArray[0].address }} </view>
+      <view class="address-add-r" bind:tap="handleShopChoose">
+        更换<van-icon name="arrow" />
+      </view>
+    </view>
+    <view class="address-add" wx:else bind:tap="handleShopChoose">
+      <view class="address-add-l">
+        <image src="{{ resourceUrl }}/adress_icon.png" class="add-icon"></image>
+        <text>选择自提门店</text>
+      </view>
+      <van-icon name="arrow" />
+    </view>
+  </block>
+</block>
+
+<!-- 门店列表弹框 -->
+<shop-branch-popup
+  tenant="{{ tenant }}"
+  branchShow="{{ branchShow }}"
+  bind:branchItem="getBranchItem"
+  bind:close="handleShopChoose"
+/>

package/dist/components/order-address/address-edit/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "cascader-region": "../../../components/common/cascader-region/index",
-    "auth-single-btn": "xyvcard-wechat-auth/components/common/auth-btn/single-btn/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "cascader-region": "../../../components/common/cascader-region/index",
+    "auth-single-btn": "xyvcard-wechat-auth/components/common/auth-btn/single-btn/index"
+  }
 }

package/dist/components/order-address/address-edit/index.wxml

@@ -1,87 +1,87 @@
-<!-- 新增/修改收货地址页 -->
-<view class="page-main">
-  <!-- 获取微信收货地址按钮-新增页才有 -->
-  <view class="form-add" style="margin-bottom: 20rpx" wx:if="{{ !addressId }}">
-    <view class="form-item" bind:tap="exportWxAddress">
-      <view class="item-label">
-        <image
-          class="item-label-icon"
-          src="{{ resourceUrl }}/wechat_icon.png"
-          mode="aspectFit"
-        />
-        获取微信收货地址
-      </view>
-      <van-icon class="item-icon" nam e="arrow" />
-    </view>
-  </view>
-  <!-- 表单 -->
-  <view class="form-add">
-    <view class="form-item">
-      <view class="item-label">
-        <text class="red-required">*</text>
-        姓名
-      </view>
-      <input
-        class="weui-input"
-        placeholder="请输入姓名"
-        value="{{ form.userName }}"
-        bind:input="getNameValue"
-      />
-    </view>
-    <view class="form-item">
-      <view class="item-label">
-        <text class="red-required">*</text>
-        电话
-      </view>
-      <input
-        class="weui-input"
-        placeholder="请输入电话"
-        value="{{ form.mobilePhone }}"
-        bind:input="getMobileValue"
-      />
-    </view>
-    <view class="form-item">
-      <view class="item-label">
-        <text class="red-required">*</text>
-        地区
-      </view>
-      <cascader-region
-        class="full-w"
-        value="{{ cascaderValue }}"
-        bind:cascaderValue="getCascaderValue"
-      ></cascader-region>
-      <van-icon class="item-icon" name="arrow" />
-    </view>
-    <view class="form-item">
-      <view class="item-label">
-        <text class="red-required">*</text>
-        详细地址
-      </view>
-      <input
-        class="weui-input"
-        placeholder="请输入详细地址"
-        value="{{ form.detailInfo }}"
-        bind:input="getDetailValue"
-      />
-    </view>
-  </view>
-  <!-- 是否设置默认地址 -->
-  <view class="form-add" style="margin-top: 20rpx">
-    <view class="form-item">
-      <view class="item-label">设置默认地址</view>
-      <switch
-        class="weui-switch"
-        checked="{{ form.isDefault }}"
-        bind:change="getIsDefaultValue"
-      />
-    </view>
-  </view>
-</view>
-<!-- 保存按钮 -->
-<view class="footer-btn">
-  <auth-single-btn
-    text="立即保存"
-    buttonStyle="background-color: #D91D10;color: #fff;"
-    bind:click="handleSubmit"
-  />
-</view>
+<!-- 新增/修改收货地址页 -->
+<view class="page-main">
+  <!-- 获取微信收货地址按钮-新增页才有 -->
+  <view class="form-add" style="margin-bottom: 20rpx" wx:if="{{ !addressId }}">
+    <view class="form-item" bind:tap="exportWxAddress">
+      <view class="item-label">
+        <image
+          class="item-label-icon"
+          src="{{ resourceUrl }}/wechat_icon.png"
+          mode="aspectFit"
+        />
+        获取微信收货地址
+      </view>
+      <van-icon class="item-icon" nam e="arrow" />
+    </view>
+  </view>
+  <!-- 表单 -->
+  <view class="form-add">
+    <view class="form-item">
+      <view class="item-label">
+        <text class="red-required">*</text>
+        姓名
+      </view>
+      <input
+        class="weui-input"
+        placeholder="请输入姓名"
+        value="{{ form.userName }}"
+        bind:input="getNameValue"
+      />
+    </view>
+    <view class="form-item">
+      <view class="item-label">
+        <text class="red-required">*</text>
+        电话
+      </view>
+      <input
+        class="weui-input"
+        placeholder="请输入电话"
+        value="{{ form.mobilePhone }}"
+        bind:input="getMobileValue"
+      />
+    </view>
+    <view class="form-item">
+      <view class="item-label">
+        <text class="red-required">*</text>
+        地区
+      </view>
+      <cascader-region
+        class="full-w"
+        value="{{ cascaderValue }}"
+        bind:cascaderValue="getCascaderValue"
+      ></cascader-region>
+      <van-icon class="item-icon" name="arrow" />
+    </view>
+    <view class="form-item">
+      <view class="item-label">
+        <text class="red-required">*</text>
+        详细地址
+      </view>
+      <input
+        class="weui-input"
+        placeholder="请输入详细地址"
+        value="{{ form.detailInfo }}"
+        bind:input="getDetailValue"
+      />
+    </view>
+  </view>
+  <!-- 是否设置默认地址 -->
+  <view class="form-add" style="margin-top: 20rpx">
+    <view class="form-item">
+      <view class="item-label">设置默认地址</view>
+      <switch
+        class="weui-switch"
+        checked="{{ form.isDefault }}"
+        bind:change="getIsDefaultValue"
+      />
+    </view>
+  </view>
+</view>
+<!-- 保存按钮 -->
+<view class="footer-btn">
+  <auth-single-btn
+    text="立即保存"
+    buttonStyle="background-color: #D91D10;color: #fff;"
+    bind:click="handleSubmit"
+  />
+</view>

package/dist/components/order-address/address-list/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
-    "auth-none-data-image": "xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+    "auth-none-data-image": "xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index"
+  }
 }

package/dist/components/order-address/address-list/index.wxml

@@ -1,17 +1,17 @@
-<block wx:if="{{ addressList.length }}">
-  <van-swipe-cell right-width="{{ 65 }}" wx:for="{{ addressList }}" wx:key="index">
-    <view class="address-box" data-id="{{ item.addressId }}" bind:tap="{{ noSelect ? 'handleEdit' : 'handleChange' }}"> 
-      <view class="address-box-l">
-        <view class="address-box-l-t">
-          <text class="address-name">{{ item.userName }}</text>
-          <text class="address-mobile">{{ item.mobilePhone }}</text>
-          <text class="default-sign" wx:if="{{ item.isDefault }}">默认</text>
-        </view>
-        <view class="address">{{ item.detailInfo }}</view>
-      </view>
-      <image class="edit-icon" src="{{ resourceUrl }}/edit_icon.png" mode="aspectFit" data-id="{{ item.addressId }}" catch:tap="handleEdit" />
-    </view>
-    <view slot="right" class="delete" data-id="{{ item.addressId }}" data-default="{{ item.isDefault }}" catch:tap="handleDel">删除</view>
-  </van-swipe-cell>
-</block>
+<block wx:if="{{ addressList.length }}">
+  <van-swipe-cell right-width="{{ 65 }}" wx:for="{{ addressList }}" wx:key="index">
+    <view class="address-box" data-id="{{ item.addressId }}" bind:tap="{{ noSelect ? 'handleEdit' : 'handleChange' }}"> 
+      <view class="address-box-l">
+        <view class="address-box-l-t">
+          <text class="address-name">{{ item.userName }}</text>
+          <text class="address-mobile">{{ item.mobilePhone }}</text>
+          <text class="default-sign" wx:if="{{ item.isDefault }}">默认</text>
+        </view>
+        <view class="address">{{ item.detailInfo }}</view>
+      </view>
+      <image class="edit-icon" src="{{ resourceUrl }}/edit_icon.png" mode="aspectFit" data-id="{{ item.addressId }}" catch:tap="handleEdit" />
+    </view>
+    <view slot="right" class="delete" data-id="{{ item.addressId }}" data-default="{{ item.isDefault }}" catch:tap="handleDel">删除</view>
+  </van-swipe-cell>
+</block>
 <auth-none-data-image wx:else imgUrl="/mall/no_img.png" content="暂无收货地址" contentColor="#333" />

package/dist/components/order-car-page/car/index.json

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "auth-search": "xyvcard-wechat-auth/components/common/auth-search/index",
-    "van-stepper": "@vant/weapp/stepper/index",
-    "auth-none-data-image": "xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index",
-    "goods-submit-bar": "xyvcard-mall-goods/components/goods-action/submit-bar/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "auth-search": "xyvcard-wechat-auth/components/common/auth-search/index",
+    "van-stepper": "@vant/weapp/stepper/index",
+    "auth-none-data-image": "xyvcard-wechat-auth/components/common/auth-none-data/none-data-image/index",
+    "goods-submit-bar": "xyvcard-mall-goods/components/goods-action/submit-bar/index"
+  }
 }