xiaoe_mp_npm 0.5.45 → 0.5.46

package/miniprogram_dist/ConfirmOrder/components/AddressSelect/index.js

@@ -1,7 +1,7 @@
 // src/ConfirmOrder/components/AddressSelect/index.js
 const computedBehavior = require('miniprogram-computed').behavior
 import {
-  ENTITY_GOODS
+  ENTITY_GOODS,COP_GOODS
 } from '../../../common/utils/constants';
 import {
   isEmptyObject
@@ -101,6 +101,7 @@ Component({
     showAddressSelect(data) {
       return (
         data.baseInfoQuery.spu_type === ENTITY_GOODS ||
+        data.baseInfoQuery.spu_type === COP_GOODS ||
         (data.goodsInfo.is_goods_package && data.hasEntityGoods) ||
         (data.isCart &&
           data.cartGoodsList.some((goodsInfo) => {

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -85,7 +85,7 @@ Component({
    */
   data: {
     activeMode: 0, // 0：快递配送，1：自提
-    express_type: 1, // 接口下发配送信息 1-快递配送 2-商品自提
+    express_type: 0, // 接口下发配送信息 1-快递配送 2-商品自提
     userCanPick: 1, // 商家是否支持自提 1支持 0不支持
     shopConf: {},
     confirmOrderInfo: {
@@ -260,6 +260,14 @@ Component({
         this.setData({
           express_type: val
         })
+      }else if (val === 0) {
+        this.setData({
+          express_type: val
+        })
+      }else if (val === -1) {
+        this.setData({
+          express_type: 1
+        })
       }
     },
     marketingData(marketingData) {
@@ -805,6 +813,11 @@ Component({
             distributionMode: res.data.goods_info.distribution_pattern
           })
         }
+        if(this.data.baseInfoQuery.spu_type == "COP"){
+          this.setData({
+            distributionMode: res.data.goods_info.sku_info.distribution_pattern
+          })
+        }
         if (!this.data.isCart) {
           let addressInfo = res.data.address_info;
           this.setData({

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/CopGoodsList/index.js

@@ -0,0 +1,130 @@
+const computedBehavior = require('miniprogram-computed').behavior;
+import {
+  getGoodsList
+} from "../../../../../common/api/confirmOrder"
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    spuId:{
+      type: String,
+      value: ''
+    },
+    skuId:{
+      type: String,
+      value: ''
+    },
+    isFullScreen: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    showList: false,
+    goodsList: [],
+    // item: {
+    //   "master_spu_id": "SPU_COP_1694610367Pn9ZXbFK6glLT",
+    //   "master_sku_id": "SKU_COP_1698052496eW4Bk4af1v1mi",
+    //   "spu_id": "i_647f4d72e4b09d723799c040",
+    //   "resource_id": "i_647f4d72e4b09d723799c040",
+    //   "sku_id": "SKU_ITX_6860644988815AFbtG77",
+    //   "sku_business_id": "",
+    //   "spu_type": "ITX",
+    //   "resource_type": 1,
+    //   "is_public": 1,
+    //   "is_free": 0,
+    //   "is_password": 0,
+    //   "goods_name": "1-商家独立车-旗舰版（内灰）1-商家独立车-旗舰版（内灰）1-商家独立车-旗舰版（内灰）",
+    //   "sale_status": 1,
+    //   "is_display": 1,
+    //   "is_stop_sell": 0,
+    //   "stock_deduct_mode": 0,
+    //   "freight": 0,
+    //   "distribution_pattern": 1,
+    //   "is_uniform_freight": 0,
+    //   "freight_template_id": 0,
+    //   "img_url_compressed": "http://wechatapppro-1252524126.file.myqcloud.com/appegbzh7h16457/image/compress/414320701l1a507dv0a9c.png",
+    //   "is_single": 1,
+    //   "is_deleted": 0,
+    //   "is_forbid": 0,
+    //   "order_stock_limit": 0,
+    //   "sku_state": 1,
+    //   "new_period_value": "",
+    //   "new_period_type": -1,
+    //   "period_value": "-1",
+    //   "period_type": 0,
+    //   "limit_purchase": 0,
+    //   "limit_purchase_type": 0,
+    //   "goods_img": [
+    //     "https://wechatapppro-1252524126.file.myqcloud.com/appegbzh7h16457/image/b_u_61de508a8916c_18VwY3Or/l1a507dv0a9c.png"
+    //   ],
+    //   "sell_type": 1,
+    //   "sku_price": 2200,
+    //   "price_low": 2200,
+    //   "spu_extend": "",
+    //   "goods_sn": "",
+    //   "can_sold_start": "0001-01-01 00:00:00",
+    //   "can_sold_end": "0001-01-01 00:00:00",
+    //   "sku_img": "https://wechatapppro-1252524126.file.myqcloud.com/appegbzh7h16457/image/b_u_61de508a8916c_18VwY3Or/l1a507dv0a9c.png",
+    //   "sku_cost_price": 0,
+    //   "sku_weight": "",
+    //   "sku_volume": "",
+    //   "sku_spec_code": "",
+    //   "sku_num": 1,
+    //   "sku_min_purchase": 0,
+    //   "sku_desc": "",
+    //   "sku_name": "1-商家独立车-旗舰版（内灰）1-商家独立车-旗舰版（内灰）1-商家独立车-旗舰版（内灰）",
+    //   "left_stock": 999999,
+    //   "sales": 0,
+    //   "attr_value_list": null,
+    //   "goods_state": 0
+    // }
+  },
+  lifetimes: {
+    attached: function () {
+      //this.getGoodsList();
+      // if (this.data.spuId) {
+      //   this.getGoodsList();
+      // }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onClose() {
+      this.setData({
+        showList: false,
+        goodsList: []
+        
+      })
+    },
+    openCombinedList() {
+      this.getGoodsList();
+      this.setData({
+        showList: true
+      })
+    },
+    getGoodsList(){
+      const params = {
+        spu_id: this.data.spuId,
+        sku_id: this.data.skuId,
+      }
+      getGoodsList(params).then(res => {
+        const { data, code } = res.data
+        if(code == 0 ){
+          this.setData({
+            goodsList: Array.isArray(data) ? data : []
+          })
+        }
+      })
+    },
+  }
+})

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/CopGoodsList/index.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-loading": "@vant/weapp/loading/index",
+    "CustomPopup": "../../../../../CustomPopup/index",
+    "CopGoodsCard": "../../../../../CopGoodsCard/index"
+  }
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/CopGoodsList/index.scss

@@ -0,0 +1,59 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin combined-goods-list{
+  width: 100%;
+  overflow: hidden;
+  .combined-goods-select{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 vmin(32);
+    padding-bottom: vmin(32);
+    background: #fff;
+    .combined-goods-desc{
+      font-size: vmin(28);
+      color: #333;
+    }
+    .arron-right{
+      width: vmin(32);
+      height: vmin(32);
+    }
+  }
+  .header-cont {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+  
+    .header-title {
+      color: rgba(51, 51, 51, 1);
+      font-size: 4.27vmin;
+      font-weight: 600;
+    }
+  
+    .img {
+      width: 4.27vmin;
+      height: 4.27vmin;
+      position: absolute;
+      right: 4.27vmin;
+      top: 4.27vmin;
+    }
+    .img-left{
+      width: 4.27vmin;
+      height: 4.27vmin;
+      position: absolute;
+      top: 4.27vmin;
+      left: 4.27vmin;
+    }
+  }
+  .cop-goods-card{
+    margin: 0 vmin(32)
+  }
+}
+.combined-goods-list{
+  @include combined-goods-list
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/CopGoodsList/index.wxml

@@ -0,0 +1,25 @@
+<view class="combined-goods-list">
+   <view class="combined-goods-select" bindtap="openCombinedList">
+      <view class="combined-goods-desc">内含商品</view>
+      <image src="../../../../../common/assets/images/zhixiang.png" class="iconfont arron-right"></image>
+  </view>
+  <CustomPopup
+      showPopup="{{ showList }}" 
+      bind:onClose="onClose"
+      round="{{ !isFullScreen }}"
+      customStyle="{{ isFullScreen ? 'height: 100%;width: 100vmin;' : 'height: 80%;' }}"
+      overlay="{{ !isFullScreen }}"
+  >
+    <view slot="header" class="header-cont">
+      <image src="../../../../../common/assets/images/left.png" class="img-left" bindtap="onClose" wx:if="{{ isFullScreen }}"></image>
+      <view class="header-title">内含商品</view>
+      <image src="../../../../../common/assets/images/close.png" class="img" bindtap="onClose" wx:if="{{ !isFullScreen }}"></image>
+    </view>
+    <view slot="content">
+      <view class="cop-goods-card" wx:for="{{goodsList}}" wx:for-item="item" wx:key="index">
+         <CopGoodsCard goodsInfo="{{ item }}"></CopGoodsCard>
+      </view>
+    </view>
+  </CustomPopup>
+</view>
+

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/components/CopGoodsList/index.wxss

@@ -0,0 +1,49 @@
+.combined-goods-list {
+  width: 100%;
+  overflow: hidden;
+}
+.combined-goods-list .combined-goods-select {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 4.26667vmin;
+  padding-bottom: 4.26667vmin;
+  background: #fff;
+}
+.combined-goods-list .combined-goods-select .combined-goods-desc {
+  font-size: 3.73333vmin;
+  color: #333;
+}
+.combined-goods-list .combined-goods-select .arron-right {
+  width: 4.26667vmin;
+  height: 4.26667vmin;
+}
+.combined-goods-list .header-cont {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.combined-goods-list .header-cont .header-title {
+  color: #333;
+  font-size: 4.27vmin;
+  font-weight: 600;
+}
+.combined-goods-list .header-cont .img {
+  width: 4.27vmin;
+  height: 4.27vmin;
+  position: absolute;
+  right: 4.27vmin;
+  top: 4.27vmin;
+}
+.combined-goods-list .header-cont .img-left {
+  width: 4.27vmin;
+  height: 4.27vmin;
+  position: absolute;
+  top: 4.27vmin;
+  left: 4.27vmin;
+}
+.combined-goods-list .cop-goods-card {
+  margin: 0 4.26667vmin;
+}

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.js

@@ -94,6 +94,9 @@ Component({
     first: true,
   },
   computed: {
+    isCop(data){
+      return data.goodsInfo?.spu_type == 'COP'
+    },
     historyBuy(data) {
       return data.goodsInfo?.has_buy_num
     },

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.json

@@ -4,6 +4,7 @@
     "ImageData": "./components/ImageData/index",
     "van-tag": "@vant/weapp/tag/index",
     "van-stepper": "@vant/weapp/stepper/index",
-    "GoodsCommerce": "./components/GoodsCommerce/index"
+    "GoodsCommerce": "./components/GoodsCommerce/index",
+    "CopGoodsList": "./components/CopGoodsList/index"
   }
 }

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.wxml

@@ -10,7 +10,7 @@
     <view class="goods-wrapper">
       <view class="goods-thumbnail">
         <ImageData class="img" wx:if="{{ goodsImgSrc }}" src="{{ goodsImgSrc }}" compressWidth="120" compressHeight="120" showCompress="true"></ImageData>
-        <view class="goods-type" wx:if="{{ goodsInfo.goods_tag_is_show }}">{{ goodsTag }}</view>
+        <view class="goods-type" wx:if="{{ goodsInfo.goods_tag_is_show || goodsInfo.spu_type == 'COP'}}">{{ goodsTag }}</view>
         <view class="svip-tag svip-tag-text" wx:if="{{ useSvipPrice }}">超级会员</view>
       </view>
       <view class="goods-detail">
@@ -66,11 +66,17 @@
   </view>
   <GoodsCommerce
     class="goods-commerce"
-    wx:if="{{ !isCart }}"
+    wx:if="{{ !isCart && !isCop}}"
     spuId="{{ baseInfo.id }}"
     resourceId="{{ baseInfo.resource_id }}"
     resourceType="{{ baseInfo.resource_type }}"
     isAlive="{{ baseInfo.isAlive }}"
     isFullScreen="{{ isFullScreen }}"
   ></GoodsCommerce>
+  <CopGoodsList
+    wx-if="{{isCop}}" 
+    spuId="{{goodsInfo.spu_id}}" 
+    skuId="{{goodsInfo.sku_id}}"
+  >
+  </CopGoodsList>
 </view>

package/miniprogram_dist/ConfirmOrder/components/PayBar/index.js

@@ -133,8 +133,8 @@ Component({
       return {
         ...data.pickerUserInfo,
         express_type: data.express_type,
-        place_id: data.picksiteInfo?.place_id,
-        picker_id: data.pickerUserInfo.id,
+        place_id:  data.express_type == 2 ? data.picksiteInfo?.place_id : '',
+        picker_id:  data.express_type == 2 ? data.pickerUserInfo.id : '',
         ...data.addressInfo,
         ...data.baseInfo,
         pre_pay_type: data.baseInfo?.pre_pay_type || 1,