jufubao-base 1.0.142 → 1.0.143-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.142",
+  "version": "1.0.143-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -308,23 +308,23 @@ export default {
       if (this.isCheck(address)) {
         return;
       }
-      if(!address.latitude||!address.longitude) {
-        this.$xdConfirm({
-          content: "因版本升级，为了确保您能正常收货，请重新选取所在地区!",
-          zIndex: 3200,
-          isClose: false,
-          cancel: false,
-          showClose: false,
-          confirmText: "我知道了",
-          $vm: this
-        });
-        return
-      }
+      // if(!address.latitude||!address.longitude) {
+      //   this.$xdConfirm({
+      //     content: "因版本升级，为了确保您能正常收货，请重新选取所在地区!",
+      //     zIndex: 3200,
+      //     isClose: false,
+      //     cancel: false,
+      //     showClose: false,
+      //     confirmText: "我知道了",
+      //     $vm: this
+      //   });
+      //   return
+      // }
       let params = this.getParams(address);
       console.log(params, "321321321");
       params["tag"] = 0;
-      params["latitude"] = address.latitude ? address.latitude + "" : "";
-      params["longitude"] = address.longitude ? address.longitude + "" : "";
+      // params["latitude"] = address.latitude ? address.latitude + "" : "";
+      // params["longitude"] = address.longitude ? address.longitude + "" : "";
       this.$xdShowLoading({});
       if (params["address_nnid"]) {
         params["is_select"] = "Y";

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -21,7 +21,8 @@
               @confirm="doneInput"
               placeholder="收货人"
               :adjust-position="false"
-              maxlength="20"
+              @blur="handleUsername"
+              maxlength="25"
               v-model="receipt_username"
             />
           </view>
@@ -39,7 +40,9 @@
               @confirm="doneInput"
               placeholder="手机号码"
               :adjust-position="false"
+              maxlength="11"
               v-model="receipt_phone"
+              @blur="handlePhone"
             />
           </view>
           <view
@@ -69,7 +72,7 @@
             :style="{ borderColor: styleMainColor, width: '95%' }"
           ></view>
         </view>
-        <view class="xd-address__body-item">
+        <!-- <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">详细地址</view>
           <view class="xd-address__body-item-input">
             <view style="color: #bbb" v-if="!receipt_address">详细地址</view>
@@ -81,8 +84,8 @@
             class="xd-address__body-item-line"
             :style="{ borderColor: styleMainColor }"
           ></view>
-        </view>
-        <!-- <view class="xd-address__body-item" v-else>
+        </view> -->
+        <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">详细地址</view>
           <view class="xd-address__body-item-input">
             <textarea
@@ -93,7 +96,7 @@
               :adjust-position="false"
               :focus="focus"
               auto-height
-              maxlength="100"
+              maxlength="50"
               :selection-start="focusNumber"
               v-model="receipt_address"
             ></textarea>
@@ -102,8 +105,8 @@
             class="xd-address__body-item-line"
             :style="{ borderColor: styleMainColor }"
           ></view>
-        </view> -->
-        <view class="xd-address__body-item">
+        </view>
+        <!-- <view class="xd-address__body-item">
           <view class="xd-address__body-item-label">门牌号</view>
           <view class="xd-address__body-item-input">
             <textarea
@@ -126,7 +129,7 @@
             class="xd-address__body-item-line"
             :style="{ borderColor: styleMainColor }"
           ></view>
-        </view>
+        </view> -->
       </view>
       <view class="xd-address__set">
         <view>设为默认地址</view>
@@ -266,7 +269,7 @@ export default {
 
       random: new Date().getTime(),
 
-      needHand: false, //是否需要手动选择所在地区
+      needHand: true, //是否需要手动选择所在地区
     };
   },
   computed: {
@@ -470,6 +473,14 @@ export default {
       });
     },
 
+    handleUsername(e) {
+      this.receipt_username = e.detail.value.replace(/[^\u4e00-\u9fa5\w]/g, '');
+    },
+
+    handlePhone(e) {
+      this.receipt_phone = e.detail.value.replace(/[^\d]/g, '');
+    },
+
     /**
      * @description 保存事件
      */

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -394,7 +394,7 @@ export default {
             flex: none;
           }
         }
-        & > :last-child{
+        & > view:last-child{
           .skeleton-wrap &{
             .skeleton-item(300rpx);
           }

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -96,7 +96,7 @@
               <view
                 class="jfb-base-order-list__body-order-item-content"
                 v-for="(Sitem, Sindex) in item.products"
-                :key="getKey(Sitem.product_id,Sindex)"
+                :key="Sitem.key"
                 v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
                 <image
                   :src="Sitem.product_thumb"
@@ -175,7 +175,7 @@
               class="jfb-base-order-list__body-order-item-pay"
               v-if="item.buttons.length"
             >
-              <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
+              <view v-for="(btn,index) in item.buttons" :key="btn.key">
                 <xd-button
                   :type="getBtnType(btn.action)"
                   size="mini"
@@ -457,12 +457,17 @@ export default {
           console.log(res.list, "list");
           let list = res.list.map((item) => {
             item["isOpen"] = false;
-            item.products = item.products.map((prod) => {
+            item.products = item.products.map((prod, i) => {
+              prod['key'] = prod.product_id + i;
               prod["product_thumb"] = prod.product_thumb
                 ? getServiceUrl(prod.product_thumb)
                 : "";
               return prod;
             });
+            item.buttons = item.buttons.map((btn, i) => {
+              btn["key"] = btn.action + i;
+              return btn;
+            })
             item["created_time_text"] = this.$xdUniHelper.getDate(
               item["created_time"] * 1000
             ).fullTime;

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -17,16 +17,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-search__body" :style="{height:layoutInfo.bodyMinHeightRpx+'rpx'}" v-if="layoutInfo!==null">
+      <!--#ifdef H5-->
       <xd-baidu-search
         @onSelect="handleSelect"
       ></xd-baidu-search>
+      <!-- #endif -->
+
+      <!-- #ifdef MP-WEIXIN -->
+      base Search
+      <!-- #endif -->
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  // #ifdef H5
   import XdBaiduSearch from "./XdBaiduSearch";
+  // #endif
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseSearchMixin from "./JfbBaseSearchMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -37,7 +45,9 @@
     name: "JfbBaseSearch",
     components: {
       XdFontIcon,
-      XdBaiduSearch
+      // #ifdef H5
+      XdBaiduSearch,
+      // #endif
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {