xiaoe_mp_npm 0.1.13 → 0.1.14

package/src/LiveGoodsList/index.json

@@ -1,10 +1,10 @@
-{
-  "component": true,
-  "usingComponents": {
-    "goods-item": "../GoodsItem/index",
-    "header": "./Header/index",
-    "custom-popup": "../CustomPopup",
-    "coupon-list": "../CouponList/couponColumn/index",
-    "van-dialog": "@vant/weapp/dialog/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "goods-item": "../GoodsItem/index",
+    "header": "./Header/index",
+    "custom-popup": "../CustomPopup",
+    "coupon-list": "../CouponList/couponColumn/index",
+    "van-dialog": "@vant/weapp/dialog/index"
+  }
+}

package/src/LiveGoodsList/index.less

@@ -1,53 +1,53 @@
-
-.box {
-  margin: 0 12px;
-}
-
-.title {
-  margin: 0;
-  padding: 32px 16px 16px;
-  color: rgba(69, 90, 100, 0.6);
-  font-weight: normal;
-  font-size: 18px;
-  line-height: 20px;
-  text-align: center;
-}
-
-.btn {
-  display: block;
-  width: 100%;
-  margin: 10px 0;
-  background-color: #fff;
-}
-.page-main{
-  height: 100%;
-}
-  .goods-list{
-    box-sizing: border-box;
-    min-height: 300px;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    .finished-text{
-      display: flex;
-      justify-content: center;
-      color: #999;
-      font-size: 28rpx;
-      padding-bottom: 20rpx;
-    }
-    .no-data{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      margin-top: 80rpx;
-      .no-data-png{
-        width: 176rpx;
-        height: 176rpx;
-      }
-      .no-data-text{
-        color: #999999;
-        font-size: 28rpx;
-        margin-top: 32rpx;
-      }
-    }
-}
+
+.box {
+  margin: 0 12px;
+}
+
+.title {
+  margin: 0;
+  padding: 32px 16px 16px;
+  color: rgba(69, 90, 100, 0.6);
+  font-weight: normal;
+  font-size: 18px;
+  line-height: 20px;
+  text-align: center;
+}
+
+.btn {
+  display: block;
+  width: 100%;
+  margin: 10px 0;
+  background-color: #fff;
+}
+.page-main{
+  height: 100%;
+}
+  .goods-list{
+    box-sizing: border-box;
+    min-height: 300px;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    .finished-text{
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: 28rpx;
+      padding-bottom: 20rpx;
+    }
+    .no-data{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-top: 80rpx;
+      .no-data-png{
+        width: 176rpx;
+        height: 176rpx;
+      }
+      .no-data-text{
+        color: #999999;
+        font-size: 28rpx;
+        margin-top: 32rpx;
+      }
+    }
+}

package/src/LiveGoodsList/index.wxml

@@ -1,74 +1,74 @@
-<!-- 
-  /*
-  * @Descripttion: 
-  * @version: 
-  * @Author: conlinchen
-  * @Date: 2021-10-28 15:32:24
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-18 19:51:34
-  */ 
- -->
-<view>
-  <custom-popup
-    showPopup="{{ show }}"
-    customStyle="height: calc(100% - 422rpx);"
-    bind:close="closePop"
-    overlay="{{false}}">
-    <view slot="header">
-      <!-- 弹窗头部 start-->
-      <header bind:closePop="closePop" bind:gotoPayRecords="gotoPayRecords"></header>
-      <!-- 弹窗头部 end-->
-    </view>
-    <view slot="content" class="page-main">
-      <!-- 商品列表 start-->
-      <scroll-view class="goods-list"  scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
-      <!-- 优惠券列表 start -->
-      <coupon-list aliveInfo="{{ aliveInfo }}" bind:showPopup="showInfoCollection" bind:receivedSuccess="receivedSuccess" sensorReportParams="{{sensorReportParams}}"></coupon-list>
-      <!-- 优惠券列表 end -->
-      <!-- 讲解中的商品 start -->
-        <block wx:if="{{showExplainingGoods}}">
-          <goods-item
-              aliveInfo="{{aliveInfo}}"
-              goodsInfo="{{formExplainingGoods}}"
-              index="{{explainingGoodsIndex}}"
-              coupon_switch="{{coupon_switch}}"
-              bind:sendNewMsg="sendNewMsg"
-              bind:showConfirmOrder="showConfirmOrder"
-              bind:showSku="showSku"
-              explainingGoods="{{explainingGoods}}"
-              bind:showDialog="showDialog"
-              class="goods-item"
-              envName="{{ENV_NAME}}"
-              sensorReportParams="{{sensorReportParams}}"
-          ></goods-item>
-        </block>
-      <!-- 讲解中的商品 end -->
-        <goods-item
-            wx:for="{{goodsInfo}}"
-            wx:for-item="goodsItem"
-            wx:key="index"
-            goodsInfo="{{goodsItem}}"
-            index="{{index}}"
-            coupon_switch="{{coupon_switch}}"
-            bind:sendNewMsg="sendNewMsg"
-            bind:showConfirmOrder="showConfirmOrder"
-            bind:showSku="showSku"
-            aliveInfo="{{aliveInfo}}"
-            explainingGoods="{{explainingGoods}}"
-            bind:showDialog="showDialog"
-            bind:toDetails="toDetails"
-            class="goods-item"
-            envName="{{ENV_NAME}}"
-            sensorReportParams="{{sensorReportParams}}"
-        ></goods-item>
-        <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
-        <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
-          <image class="no-data-png" src="../common/assets/images/liveGoodsList/no-data.png" />
-          <text class="no-data-text">请等待商品上架</text>
-        </view>
-      </scroll-view>
-      <!-- 商品列表 end-->
-    </view>
-  </custom-popup>
-</view>
+<!-- 
+  /*
+  * @Descripttion: 
+  * @version: 
+  * @Author: conlinchen
+  * @Date: 2021-10-28 15:32:24
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-18 19:51:34
+  */ 
+ -->
+<view>
+  <custom-popup
+    showPopup="{{ show }}"
+    customStyle="height: calc(100% - 422rpx);"
+    bind:close="closePop"
+    overlay="{{false}}">
+    <view slot="header">
+      <!-- 弹窗头部 start-->
+      <header bind:closePop="closePop" bind:gotoPayRecords="gotoPayRecords"></header>
+      <!-- 弹窗头部 end-->
+    </view>
+    <view slot="content" class="page-main">
+      <!-- 商品列表 start-->
+      <scroll-view class="goods-list"  scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
+      <!-- 优惠券列表 start -->
+      <coupon-list aliveInfo="{{ aliveInfo }}" bind:showPopup="showInfoCollection" bind:receivedSuccess="receivedSuccess" sensorReportParams="{{sensorReportParams}}"></coupon-list>
+      <!-- 优惠券列表 end -->
+      <!-- 讲解中的商品 start -->
+        <block wx:if="{{showExplainingGoods}}">
+          <goods-item
+              aliveInfo="{{aliveInfo}}"
+              goodsInfo="{{formExplainingGoods}}"
+              index="{{explainingGoodsIndex}}"
+              coupon_switch="{{coupon_switch}}"
+              bind:sendNewMsg="sendNewMsg"
+              bind:showConfirmOrder="showConfirmOrder"
+              bind:showSku="showSku"
+              explainingGoods="{{explainingGoods}}"
+              bind:showDialog="showDialog"
+              class="goods-item"
+              envName="{{ENV_NAME}}"
+              sensorReportParams="{{sensorReportParams}}"
+          ></goods-item>
+        </block>
+      <!-- 讲解中的商品 end -->
+        <goods-item
+            wx:for="{{goodsInfo}}"
+            wx:for-item="goodsItem"
+            wx:key="index"
+            goodsInfo="{{goodsItem}}"
+            index="{{index}}"
+            coupon_switch="{{coupon_switch}}"
+            bind:sendNewMsg="sendNewMsg"
+            bind:showConfirmOrder="showConfirmOrder"
+            bind:showSku="showSku"
+            aliveInfo="{{aliveInfo}}"
+            explainingGoods="{{explainingGoods}}"
+            bind:showDialog="showDialog"
+            bind:toDetails="toDetails"
+            class="goods-item"
+            envName="{{ENV_NAME}}"
+            sensorReportParams="{{sensorReportParams}}"
+        ></goods-item>
+        <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
+        <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
+          <image class="no-data-png" src="../common/assets/images/liveGoodsList/no-data.png" />
+          <text class="no-data-text">请等待商品上架</text>
+        </view>
+      </scroll-view>
+      <!-- 商品列表 end-->
+    </view>
+  </custom-popup>
+</view>
 <van-dialog id="van-dialog" confirm-button-color="#105cfb"/>

package/src/LiveGoodsList/index.wxss

@@ -1,50 +1,50 @@
-.box {
-  margin: 0 12px;
-}
-.title {
-  margin: 0;
-  padding: 32px 16px 16px;
-  color: rgba(69, 90, 100, 0.6);
-  font-weight: normal;
-  font-size: 18px;
-  line-height: 20px;
-  text-align: center;
-}
-.btn {
-  display: block;
-  width: 100%;
-  margin: 10px 0;
-  background-color: #fff;
-}
-.page-main {
-  height: 100%;
-}
-.goods-list {
-  box-sizing: border-box;
-  min-height: 300px;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.goods-list .finished-text {
-  display: flex;
-  justify-content: center;
-  color: #999;
-  font-size: 28rpx;
-  padding-bottom: 20rpx;
-}
-.goods-list .no-data {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-top: 80rpx;
-}
-.goods-list .no-data .no-data-png {
-  width: 176rpx;
-  height: 176rpx;
-}
-.goods-list .no-data .no-data-text {
-  color: #999999;
-  font-size: 28rpx;
-  margin-top: 32rpx;
-}
+.box {
+  margin: 0 12px;
+}
+.title {
+  margin: 0;
+  padding: 32px 16px 16px;
+  color: rgba(69, 90, 100, 0.6);
+  font-weight: normal;
+  font-size: 18px;
+  line-height: 20px;
+  text-align: center;
+}
+.btn {
+  display: block;
+  width: 100%;
+  margin: 10px 0;
+  background-color: #fff;
+}
+.page-main {
+  height: 100%;
+}
+.goods-list {
+  box-sizing: border-box;
+  min-height: 300px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.goods-list .finished-text {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 28rpx;
+  padding-bottom: 20rpx;
+}
+.goods-list .no-data {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 80rpx;
+}
+.goods-list .no-data .no-data-png {
+  width: 176rpx;
+  height: 176rpx;
+}
+.goods-list .no-data .no-data-text {
+  color: #999999;
+  font-size: 28rpx;
+  margin-top: 32rpx;
+}

package/src/Lottery/components/AddressCollection/index.js

@@ -1,73 +1,73 @@
-import {connect} from '../../store/index'
-import {toast, hasKey} from '../../utils'
-
-const computedBehavior = require('miniprogram-computed').behavior
-
-const mapState = state => ({
-  addressQuery: state.addressQuery,
-  addressInfo: state.addressInfo,
-  addressSubmitCallback: state.addressSubmitCallback
-})
-
-
-Component(
-  connect(mapState)({
-    behaviors: [computedBehavior],
-    data: {
-      title: '',
-      isEntry: false // 是否为入口（选择收获地址｜选择自提地址）
-    },
-    computed: {
-      isAddressQueryReady(data) {
-        return Object.keys(data.addressQuery).length > 0
-      },
-      isAddressInfoReady(data) {
-        const { addressInfo } = data
-        if(addressInfo.express_type === 2) {
-          return hasKey(addressInfo.pickerUserInfo) && hasKey(addressInfo.picksiteInfo)
-        }
-        return hasKey(addressInfo.addressInfo) 
-      }
-    },
-    observers: {},
-    lifetimes: {
-      attached() {},
-      detached() {}
-    },
-    methods: {
-      goBackTo() {
-        if (this.data.isEntry) {
-          this.store.dispatch({type: 'set_my_lottery_content', payload: 'reward_list'})
-        } else {
-          this.selectComponent('#collection-address').changeMain()
-        }
-      },
-      onGetAddressInfo({detail: info}) {
-        this.store.dispatch({type: 'set_address_info', payload: info})
-      },
-      onTitleChange({detail: title}) {
-        this.setData({title})
-      },
-      onStateChange({detail: isEntry}) {
-        this.setData({isEntry})
-      },
-      validateSubmitInfo() {
-        const info = this.data.addressInfo
-        if (info.express_type === 1 && !hasKey(info.addressInfo)) {
-          toast('请先添加收货地址')
-          return false
-        }
-        if (info.express_type === 2 && !(hasKey(info.pickerUserInfo) && hasKey(info.picksiteInfo))) {
-          toast('请完善提货信息')
-          return false
-        }
-        return true
-      },
-      onSubmit() {
-        if (!this.validateSubmitInfo()) return
-        if (!this.data.addressSubmitCallback) return
-        this.data.addressSubmitCallback()
-      }
-    }
-  })
+import {connect} from '../../store/index'
+import {toast, hasKey} from '../../utils'
+
+const computedBehavior = require('miniprogram-computed').behavior
+
+const mapState = state => ({
+  addressQuery: state.addressQuery,
+  addressInfo: state.addressInfo,
+  addressSubmitCallback: state.addressSubmitCallback
+})
+
+
+Component(
+  connect(mapState)({
+    behaviors: [computedBehavior],
+    data: {
+      title: '',
+      isEntry: false // 是否为入口（选择收获地址｜选择自提地址）
+    },
+    computed: {
+      isAddressQueryReady(data) {
+        return Object.keys(data.addressQuery).length > 0
+      },
+      isAddressInfoReady(data) {
+        const { addressInfo } = data
+        if(addressInfo.express_type === 2) {
+          return hasKey(addressInfo.pickerUserInfo) && hasKey(addressInfo.picksiteInfo)
+        }
+        return hasKey(addressInfo.addressInfo) 
+      }
+    },
+    observers: {},
+    lifetimes: {
+      attached() {},
+      detached() {}
+    },
+    methods: {
+      goBackTo() {
+        if (this.data.isEntry) {
+          this.store.dispatch({type: 'set_my_lottery_content', payload: 'reward_list'})
+        } else {
+          this.selectComponent('#collection-address').changeMain()
+        }
+      },
+      onGetAddressInfo({detail: info}) {
+        this.store.dispatch({type: 'set_address_info', payload: info})
+      },
+      onTitleChange({detail: title}) {
+        this.setData({title})
+      },
+      onStateChange({detail: isEntry}) {
+        this.setData({isEntry})
+      },
+      validateSubmitInfo() {
+        const info = this.data.addressInfo
+        if (info.express_type === 1 && !hasKey(info.addressInfo)) {
+          toast('请先添加收货地址')
+          return false
+        }
+        if (info.express_type === 2 && !(hasKey(info.pickerUserInfo) && hasKey(info.picksiteInfo))) {
+          toast('请完善提货信息')
+          return false
+        }
+        return true
+      },
+      onSubmit() {
+        if (!this.validateSubmitInfo()) return
+        if (!this.data.addressSubmitCallback) return
+        this.data.addressSubmitCallback()
+      }
+    }
+  })
 )

package/src/Lottery/components/AddressCollection/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-button": "@vant/weapp/button/index",
-    "collection-address": "../../../CollectionAddress/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-button": "@vant/weapp/button/index",
+    "collection-address": "../../../CollectionAddress/index"
+  }
 }

package/src/Lottery/components/AddressCollection/index.less

@@ -1,39 +1,39 @@
-.address-collection {
-  position: relative;
-  .go-back-icon {
-    position: absolute;
-    top: 36rpx;
-    left: 24rpx;
-    width: 18rpx;
-    height: 28rpx;
-  }
-  .title-box {
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    background: #fff;
-    .title {
-      height: 100rpx;
-      display: flex;
-      align-items: center;
-      color: #333;
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-  }
-  .submit-btn-box {
-    position: fixed;
-    margin: auto;
-    left: 0;
-    right: 0;
-    background: #fff;
-    bottom: 0;
-    box-sizing: border-box;
-    padding: 16rpx 28rpx 72rpx 28rpx;
-    .submit-btn {
-      background: #1472FF;
-      width: 100%;
-      height: 80rpx;
-    }
-  }
+.address-collection {
+  position: relative;
+  .go-back-icon {
+    position: absolute;
+    top: 36rpx;
+    left: 24rpx;
+    width: 18rpx;
+    height: 28rpx;
+  }
+  .title-box {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    background: #fff;
+    .title {
+      height: 100rpx;
+      display: flex;
+      align-items: center;
+      color: #333;
+      font-size: 32rpx;
+      font-weight: 500;
+    }
+  }
+  .submit-btn-box {
+    position: fixed;
+    margin: auto;
+    left: 0;
+    right: 0;
+    background: #fff;
+    bottom: 0;
+    box-sizing: border-box;
+    padding: 16rpx 28rpx 72rpx 28rpx;
+    .submit-btn {
+      background: #1472FF;
+      width: 100%;
+      height: 80rpx;
+    }
+  }
 }

package/src/Lottery/components/AddressCollection/index.wxml

@@ -1,16 +1,16 @@
-<view wx:if="{{isAddressQueryReady}}" class="address-collection">
-  <image class="go-back-icon" src="../../../common/assets/images/lottery/icon_back_black.png" bind:tap="goBackTo" />
-  <view class="title-box">
-    <view class="title">{{title}}</view>
-  </view>
-  <collection-address
-    id="collection-address"
-    baseInfoQuery="{{addressQuery}}"
-    bind:outData="onGetAddressInfo"
-    bind:changeTitle="onTitleChange"
-    bind:changeState="onStateChange"
-  ></collection-address>
-  <view wx:if="{{isEntry}}" class="submit-btn-box">
-    <van-button custom-class="submit-btn" round type="info" disabled="{{!isAddressInfoReady}}" bind:click="onSubmit">提交</van-button>
-  </view>
+<view wx:if="{{isAddressQueryReady}}" class="address-collection">
+  <image class="go-back-icon" src="../../../common/assets/images/lottery/icon_back_black.png" bind:tap="goBackTo" />
+  <view class="title-box">
+    <view class="title">{{title}}</view>
+  </view>
+  <collection-address
+    id="collection-address"
+    baseInfoQuery="{{addressQuery}}"
+    bind:outData="onGetAddressInfo"
+    bind:changeTitle="onTitleChange"
+    bind:changeState="onStateChange"
+  ></collection-address>
+  <view wx:if="{{isEntry}}" class="submit-btn-box">
+    <van-button custom-class="submit-btn" round type="info" disabled="{{!isAddressInfoReady}}" bind:click="onSubmit">提交</van-button>
+  </view>
 </view>