xiaoe_mp_npm 0.1.7 → 0.1.10

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

@@ -219,6 +219,17 @@ Component({
     },
   },
   observers: {
+    distributionMode(val) {
+      if (val === 1) {
+        this.setData({
+          express_type: val
+        })
+      } else if (val === 2) {
+        this.setData({
+          express_type: val
+        })
+      }
+    },
     marketingData(marketingData) {
       // 这里的逻辑应该是存在拼团的时候那么payment_type就要赋值为13，如果是限时折扣或者是单买的话，payment_type不做赋值默认为2
       if (

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.less

@@ -1,9 +1,24 @@
 .pickup-select-content {
   .van-cell__value {
     flex: 3;
-    text-align: right;
   }
-  .custom-title {
-    margin-left: 16rpx;
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
   }
 }

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

@@ -5,8 +5,10 @@
       <view slot="title">
         <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
       </view>
-      <view class="custom-title">{{ setPlace_name }}</view>
-      <view class="custom-site">{{ setPlace_area }}</view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
     </van-cell>
   </van-cell-group>
 </view>

package/miniprogram_dist/ConfirmOrder/components/PickupSelect/index.wxss

@@ -1,7 +1,22 @@
 .pickup-select-content .van-cell__value {
   flex: 3;
-  text-align: right;
 }
-.pickup-select-content .custom-title {
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   margin-left: 16rpx;
 }

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

@@ -1,5 +1,5 @@
 import {connect} from '../../store/index'
-import {toast} from '../../utils'
+import {toast, hasKey} from '../../utils'
 
 const computedBehavior = require('miniprogram-computed').behavior
 
@@ -8,6 +8,8 @@ const mapState = state => ({
   addressInfo: state.addressInfo,
   addressSubmitCallback: state.addressSubmitCallback
 })
+
+
 Component(
   connect(mapState)({
     behaviors: [computedBehavior],
@@ -20,7 +22,11 @@ Component(
         return Object.keys(data.addressQuery).length > 0
       },
       isAddressInfoReady(data) {
-        return data.addressInfo.addressInfo && Object.keys(data.addressInfo.addressInfo).length > 0;
+        const { addressInfo } = data
+        if(addressInfo.express_type === 2) {
+          return hasKey(addressInfo.pickerUserInfo) && hasKey(addressInfo.picksiteInfo)
+        }
+        return hasKey(addressInfo.addressInfo) 
       }
     },
     observers: {},
@@ -45,16 +51,13 @@ Component(
       onStateChange({detail: isEntry}) {
         this.setData({isEntry})
       },
-      hasKey(obj) {
-        return obj && Object.keys(obj).length > 0
-      },
       validateSubmitInfo() {
         const info = this.data.addressInfo
-        if (info.express_type === 1 && !this.hasKey(info.addressInfo)) {
+        if (info.express_type === 1 && !hasKey(info.addressInfo)) {
           toast('请先添加收货地址')
           return false
         }
-        if (info.express_type === 2 && !(this.hasKey(info.pickerUserInfo) && this.hasKey(info.picksiteInfo))) {
+        if (info.express_type === 2 && !(hasKey(info.pickerUserInfo) && hasKey(info.picksiteInfo))) {
           toast('请完善提货信息')
           return false
         }
@@ -67,4 +70,4 @@ Component(
       }
     }
   })
-)
+)

package/miniprogram_dist/Lottery/utils.js

@@ -62,3 +62,7 @@ export function delay(duration = 0) {
     }, duration)
   })
 }
+
+export function hasKey(obj) {
+  return obj && Object.keys(obj).length > 0
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

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

@@ -219,6 +219,17 @@ Component({
     },
   },
   observers: {
+    distributionMode(val) {
+      if (val === 1) {
+        this.setData({
+          express_type: val
+        })
+      } else if (val === 2) {
+        this.setData({
+          express_type: val
+        })
+      }
+    },
     marketingData(marketingData) {
       // 这里的逻辑应该是存在拼团的时候那么payment_type就要赋值为13，如果是限时折扣或者是单买的话，payment_type不做赋值默认为2
       if (

package/src/ConfirmOrder/components/PickupSelect/index.less

@@ -1,9 +1,24 @@
 .pickup-select-content {
   .van-cell__value {
     flex: 3;
-    text-align: right;
   }
-  .custom-title {
-    margin-left: 16rpx;
+  .right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    .custom-title {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
+    .custom-site {
+      max-width: 450rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 16rpx;
+    }
   }
 }

package/src/ConfirmOrder/components/PickupSelect/index.wxml

@@ -5,8 +5,10 @@
       <view slot="title">
         <van-tag color="#EBF1FF" text-color="#105CFB">自提</van-tag>
       </view>
-      <view class="custom-title">{{ setPlace_name }}</view>
-      <view class="custom-site">{{ setPlace_area }}</view>
+      <view class="right">
+        <view class="custom-title">{{ setPlace_name }}</view>
+        <view class="custom-site">{{ setPlace_area }}</view>
+      </view>
     </van-cell>
   </van-cell-group>
 </view>

package/src/ConfirmOrder/components/PickupSelect/index.wxss

@@ -1,7 +1,22 @@
 .pickup-select-content .van-cell__value {
   flex: 3;
-  text-align: right;
 }
-.pickup-select-content .custom-title {
+.pickup-select-content .right {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.pickup-select-content .right .custom-title {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-left: 16rpx;
+}
+.pickup-select-content .right .custom-site {
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   margin-left: 16rpx;
 }

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

@@ -1,5 +1,5 @@
 import {connect} from '../../store/index'
-import {toast} from '../../utils'
+import {toast, hasKey} from '../../utils'
 
 const computedBehavior = require('miniprogram-computed').behavior
 
@@ -8,6 +8,8 @@ const mapState = state => ({
   addressInfo: state.addressInfo,
   addressSubmitCallback: state.addressSubmitCallback
 })
+
+
 Component(
   connect(mapState)({
     behaviors: [computedBehavior],
@@ -20,7 +22,11 @@ Component(
         return Object.keys(data.addressQuery).length > 0
       },
       isAddressInfoReady(data) {
-        return data.addressInfo.addressInfo && Object.keys(data.addressInfo.addressInfo).length > 0;
+        const { addressInfo } = data
+        if(addressInfo.express_type === 2) {
+          return hasKey(addressInfo.pickerUserInfo) && hasKey(addressInfo.picksiteInfo)
+        }
+        return hasKey(addressInfo.addressInfo) 
       }
     },
     observers: {},
@@ -45,16 +51,13 @@ Component(
       onStateChange({detail: isEntry}) {
         this.setData({isEntry})
       },
-      hasKey(obj) {
-        return obj && Object.keys(obj).length > 0
-      },
       validateSubmitInfo() {
         const info = this.data.addressInfo
-        if (info.express_type === 1 && !this.hasKey(info.addressInfo)) {
+        if (info.express_type === 1 && !hasKey(info.addressInfo)) {
           toast('请先添加收货地址')
           return false
         }
-        if (info.express_type === 2 && !(this.hasKey(info.pickerUserInfo) && this.hasKey(info.picksiteInfo))) {
+        if (info.express_type === 2 && !(hasKey(info.pickerUserInfo) && hasKey(info.picksiteInfo))) {
           toast('请完善提货信息')
           return false
         }
@@ -67,4 +70,4 @@ Component(
       }
     }
   })
-)
+)

package/src/Lottery/utils.js

@@ -62,3 +62,7 @@ export function delay(duration = 0) {
     }, duration)
   })
 }
+
+export function hasKey(obj) {
+  return obj && Object.keys(obj).length > 0
+}