jufubao-base 1.0.28-beta99 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.28-beta99",
+  "version": "1.0.28",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -50,7 +50,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.8-beta40",
+    "gxd-uni-library-editx": "1.0.8-beta60",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/common/getBusinessImageUrl.js

@@ -24,7 +24,7 @@ function stringToNumber(str) {
 function getBusinessImageUrl(path, size = 'size8') {
   if (Object.prototype.toString.call(path)!== '[object String]' || path === '') {
     console.error('传入的路径（path）非字符串类型，请确认路径是否正确');
-    throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
+    //throw new Error('传入的路径（path）非字符串类型，请确认路径是否正确');
   }
 
   let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;

package/src/components/JfbBaseAddress/Attr.js

@@ -1,19 +1,23 @@
 'use strict';
-
+import StyleForm from "@/utils/StyleForm";
+let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,}, null, 'list');
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: '选取地区路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'location_url', //form[valueKey]
-      placeholder: '请选择选取地区路径',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+  content: (data)=>{
+    return [
+      {
+        label: '选取地区路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'location_url', //form[valueKey]
+        placeholder: '请选择选取地区路径',
+        value: data.location_url || '',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
-      inline: false,
-    },
-  ],
+      ...styleForm.getForm(data, '内容配置')
+    ].filter(i=>i)
+  },
 }

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -22,10 +22,17 @@
       :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
     >
       <view
+        :style="{ margin: jfbListMarginComputed }"
         class="jfb-base-address__body-address"
         v-if="addressList && addressList.length > 0"
       >
         <view
+          :style="{
+            marginBottom: jfbListSpacing + 'rpx',
+            boxShadow: jfbListShadowComputed,
+            border: jfbListBorderComputed,
+            backgroundColor: jfbListBgColor,
+          }"
           class="jfb-base-address__body-address-item"
           v-for="(item, index) in addressList"
           @click="handleSelectAddress(item)"
@@ -42,16 +49,16 @@
                 borderRadius: '4rpx',
                 marginRight: '20rpx',
               }"
-              >默认
-            </view>
+              >默认</view
+            >
             <view style="color: #999999">{{ item | getCodeName }}</view>
           </view>
           <view class="jfb-base-address__body-address-item-middle">
-            {{ item.address_detail }}
+            {{ item.address_detail }} {{ item.house_number }}
           </view>
           <view
             :style="{
-              backgroundColor: item.is_select === 'Y' ? mainColor : '#C2C2C2',
+              backgroundColor: item.is_select === 'Y' ? mainColor : '#CCC',
             }"
             class="jfb-base-address__body-address-item-bottom"
           >
@@ -92,17 +99,17 @@
           v-if="showAddress"
           :show.sync="showAddress"
           :z-index="2500"
-          :is-close="false"
-          :is-body-close="false"
+          :is-close="true"
+          :is-body-close="true"
           :fullscreen="true"
         >
           <xd-address
             v-if="showAddress"
             @close="handleClose"
-            @getCity="handleGetCity"
             @save="handleSave"
             @onToLocation="handleToLocation"
             @onAddressToCode="handleAddressToCode"
+            @getCity="handleGetCity"
             :default-value="defaultValue"
             :mainColor="mainColor"
           ></xd-address>
@@ -119,9 +126,26 @@ import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
 import XdAddress from "./XdAddress";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseAddressMixin from "./JfbBaseAddressMixin";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins"
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import StyleForm from "@/utils/StyleForm";
 import { getContainerPropsValue } from "@/utils/xd.base";
+let styleForm = new StyleForm(
+  {
+    border: null,
+    shadow: null,
+    spacing: 24,
+    bgColor: "#FFFFFF",
+    margin: {
+      bottom: 20,
+      left: 20,
+      right: 20,
+      top: 20,
+    },
+  },
+  getContainerPropsValue,
+  "list"
+);
 
 export default {
   name: "JfbBaseAddress",
@@ -131,7 +155,7 @@ export default {
     XdDownDrawer,
     XdAddress,
   },
-  mixins: [componentsMixins,extsMixins,JfbBaseAddressMixin],
+  mixins: [componentsMixins, extsMixins, JfbBaseAddressMixin],
   data() {
     return {
       showAddress: false,
@@ -139,6 +163,7 @@ export default {
       backStatus: false,
       location_url: "",
       addressList: null,
+      ...styleForm.getDataItem(),
     };
   },
   filters: {
@@ -155,17 +180,19 @@ export default {
     },
   },
   created() {
+    console.log(this, "dsadas");
     this.init(this.container);
   },
   computed: {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    ...styleForm.getComputedItem(),
   },
   methods: {
     onJfbLoad(options) {
       let { back } = options;
-      this.backStatus = back === "true";
+      this.backStatus = back;
       this.getList();
     },
     /**
@@ -178,6 +205,7 @@ export default {
         "content.location_url",
         { value: "" }
       ).value;
+      styleForm.getInitItem(this, value);
     },
     getList(callback) {
       this.$xdShowLoading({});
@@ -241,9 +269,15 @@ export default {
      * @description 打开地图定位
      */
     handleToLocation() {
-      this.$xdUniHelper.navigateTo({
-        url: this.location_url,
-      });
+      if (this.defaultValue) {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.location_url}?latitude=${this.defaultValue.latitude}&longitude=${this.defaultValue.longitude}`,
+        });
+      } else {
+        this.$xdUniHelper.navigateTo({
+          url: this.location_url,
+        });
+      }
     },
     /**
      * @description 保存事件
@@ -255,14 +289,15 @@ export default {
         return;
       }
       let params = this.getParams(address);
+      console.log(params, "321321321");
       params["tag"] = 0;
-      params["latitude"] = address.latitude + "" || "";
-      params["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";
-        let address_nnid = params["address_nnid"]
-        delete params["address_nnid"]
+        let address_nnid = params["address_nnid"];
+        delete params["address_nnid"];
         jfbRootExec("updateAddress", {
           vm: this,
           data: {
@@ -272,6 +307,7 @@ export default {
         })
           .then((res) => {
             console.log(33333, params);
+            this.showAddress = false;
             setTimeout(() => {
               this.getList((list) => {
                 if (this.backStatus) {
@@ -295,6 +331,7 @@ export default {
           },
         })
           .then((res) => {
+            this.showAddress = false;
             setTimeout(() => {
               this.getList((list) => {
                 if (this.backStatus) {
@@ -312,7 +349,6 @@ export default {
           });
       }
       this.defaultValue = null;
-      this.showAddress = false;
     },
     /**
      * @description 反解析地址获取数据
@@ -320,15 +356,37 @@ export default {
      * @param callback 成功回调方法
      */
     handleAddressToCode(address, callback) {
+      let { latitude, longitude } = address;
+      let { title, city, province } = address["sourceData"];
+      let prefix = `${province}${city}`;
+      if (province === city) {
+        prefix = province;
+      }
+      let lastTitle;
+      if (
+        province &&
+        city &&
+        address["sourceData"]["address"].indexOf(prefix) === 0
+      ) {
+        lastTitle = address["sourceData"]["address"];
+      } else {
+        lastTitle = `${prefix}${title}${address["sourceData"]["address"]}`;
+      }
+      // 当原始title不在查询数据中 自动补全。
+      if (lastTitle.indexOf(title) === -1) {
+        lastTitle += title;
+      }
       jfbRootExec("getJdCode", {
         vm: this,
         data: {
-          latitude: address.latitude,
-          longitude: address.longitude,
+          address: lastTitle,
+          latitude: latitude,
+          longitude: longitude,
         },
       })
         .then((res) => {
           console.log(res, "4545454545");
+          res.data.receipt_region_name = `${res.data.province_name}${res.data.city_name}${res.data.area_name}${res.data.street_name}`;
           res.data.city_name = [
             res.data.province_name,
             res.data.city_name,
@@ -341,13 +399,20 @@ export default {
             res.data.area_code,
             res.data.street_code,
           ];
-          res.data.receipt_region_name = `${res.data.province_name}${res.data.city_name}${res.data.area_name}${res.data.street_name}`;
           callback(res.data);
         })
         .catch(this.$xdLog.catch);
     },
     handleSelectAddress(item) {
       console.log("handleSelectAddress", item);
+      if (item.is_valid === "N") {
+        this.$xdAlert({
+          content: "因版本升级，为了确保您能正常收货，请您重新编辑收货地址!",
+          zIndex: 3200,
+          isClose: false,
+        });
+        return;
+      }
       item.is_select = "Y";
       this.$xdShowLoading({});
       jfbRootExec("selectAddress", {
@@ -401,6 +466,7 @@ export default {
         id: item["address_nnid"],
         latitude: item["latitude"] || null,
         longitude: item["longitude"] || null,
+        house_number: item["house_number"],
       };
 
       console.log("handleEdit", item, this.defaultValue);
@@ -409,6 +475,7 @@ export default {
     handleDel(item) {
       console.log("handleDel", item);
       this.$xdConfirm({
+        $vm: this,
         content: "确定删除当前配送地址吗?",
         width: "80%",
         success: (res) => {
@@ -445,6 +512,7 @@ export default {
         area_name: address["receipt_city_name"][2],
         street_name: address["receipt_city_name"][3],
         is_default: address["receipt_default"] ? "Y" : "N",
+        house_number: address["house_number"],
       };
     },
     isCheck({
@@ -531,8 +599,6 @@ export default {
 
 .jfb-base-address {
   &__body {
-    margin: unit(20, rpx);
-
     &-empty {
       display: flex;
       flex-direction: column;
@@ -560,7 +626,7 @@ export default {
           display: flex;
           align-items: center;
           font-size: unit(28, rpx);
-          padding: unit(40, rpx);
+          padding: unit(40, rpx) unit(40, rpx) unit(24, rpx) unit(40, rpx);
         }
 
         &-middle {
@@ -592,7 +658,7 @@ export default {
       right: 0;
       padding-top: unit(20, rpx);
       background: #fff;
-      height: unit(100,rpx);
+      height: unit(100, rpx);
     }
   }
 }

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -57,26 +57,39 @@
               receipt_region_name
             }}</view>
           </view>
-          <view @click="toLocation">
+          <!-- <view @click="toLocation">
             <xd-font-icon
               size="30"
               icon="iconshouhuodizhi"
               color="#999"
             ></xd-font-icon>
-          </view>
+          </view> -->
           <view
             class="xd-address__body-item-line"
             :style="{ borderColor: styleMainColor, width: '95%' }"
           ></view>
         </view>
         <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>
+            <view v-else class="xd-address__body-content">
+              {{ receipt_address }}
+            </view>
+          </view>
+          <view
+            class="xd-address__body-item-line"
+            :style="{ borderColor: styleMainColor }"
+          ></view>
+        </view>
+        <!-- <view class="xd-address__body-item" v-else>
           <view class="xd-address__body-item-label">详细地址</view>
           <view class="xd-address__body-item-input">
             <textarea
               class="xd-address__body-item-input-textarea"
               placeholder-class="xd-address__body-item-input-placeholder"
               @confirm="doneInput"
-              placeholder="如道路、门牌号、小区、楼栋号、单元室等"
+              placeholder="详细地址"
               :adjust-position="false"
               :focus="focus"
               auto-height
@@ -84,6 +97,27 @@
               :selection-start="focusNumber"
               v-model="receipt_address"
             ></textarea>
+          </view>
+          <view
+            class="xd-address__body-item-line"
+            :style="{ borderColor: styleMainColor }"
+          ></view>
+        </view> -->
+        <view class="xd-address__body-item">
+          <view class="xd-address__body-item-label">门牌号</view>
+          <view class="xd-address__body-item-input">
+            <textarea
+              class="xd-address__body-item-input-textarea"
+              placeholder-class="xd-address__body-item-input-placeholder"
+              @confirm="doneInput"
+              placeholder="如道路、门牌号、小区、楼栋号、单元室等"
+              :adjust-position="false"
+              :focus="focus"
+              auto-height
+              maxlength="100"
+              :selection-start="focusNumber"
+              v-model="house_number"
+            ></textarea>
             <div class="xd-address__body-item-input-tips" v-if="showTips">
               记得完善门牌号
             </div>
@@ -98,7 +132,11 @@
         <view>设为默认地址</view>
         <view>
           <switch
-            @change="(event)=>{receipt_default=event.detail.value}"
+            @change="
+              (event) => {
+                receipt_default = event.detail.value;
+              }
+            "
             :checked="receipt_default"
             style="transform: scale(0.5)"
             size="small"
@@ -201,6 +239,7 @@ export default {
       receipt_region: {}, //所在地址
       receipt_region_name: "", //城市地址
       receipt_default: false, //是否默认
+      house_number: "", //门牌号
 
       //切换添加收货地址与切换城市UI
       isShowAddress: true, //是否显示添加地址
@@ -226,6 +265,8 @@ export default {
       styleMainColor: "",
 
       random: new Date().getTime(),
+
+      needHand: false, //是否需要手动选择所在地区
     };
   },
   computed: {
@@ -242,6 +283,7 @@ export default {
         region_name: this.receipt_region_name,
         latitude: this.latitude,
         longitude: this.longitude,
+        house_number: this.house_number,
       };
     },
   },
@@ -257,7 +299,7 @@ export default {
       this.location = location;
       this.latitude = location["latitude"];
       this.longitude = location["longitude"];
-      this.receipt_address = location["sourceData"]["address"];
+      this.receipt_address = location["sourceData"]["title"]?location["sourceData"]["title"]:'';
 
       this.handleParse(location);
       this.showTips = true;
@@ -284,20 +326,29 @@ export default {
 
   methods: {
     handleRegion() {
-      if (!this.location) {
-        this.toLocation();
-      } else {
+      if (this.needHand) {
         this.isShowAddress = !this.isShowAddress;
+      } else {
+        this.toLocation();
       }
     },
 
     handleParse(location) {
       this.$emit("onAddressToCode", location, (res) => {
-        console.log(res, "454545");
+        console.log(res, location, "454545");
         this.city_name = res["city_name"] || [];
         this.city_code = res["city_code"] || [];
         this.city_selected_data = res["city_selected_data"] || [];
         this.receipt_region_name = res["receipt_region_name"];
+        if (!res.province_code) {
+          this.$xdAlert({
+            content: "定位失败，请您手动选择!",
+            zIndex: 3200,
+            time: 2000,
+            isClose: false,
+          });
+          this.needHand = true;
+        }
       });
     },
 
@@ -413,6 +464,7 @@ export default {
      * @description 保存事件
      */
     save() {
+      console.log(this.getAddress, "this.getAddressthis.getAddress");
       this.$emit("save", this.getAddress);
     },