xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,130 +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 : []
-          })
-        }
-      })
-    },
-  }
+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

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "@vant/weapp/popup/index",
-    "van-loading": "@vant/weapp/loading/index",
-    "CustomPopup": "../../../../../CustomPopup/index",
-    "CopGoodsCard": "../../../../../CopGoodsCard/index"
-  }
+{
+  "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

@@ -1,59 +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
+$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

@@ -1,25 +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>
-
+<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>
+