jufubao-base 1.0.186 → 1.0.187-beta3

package/src/components/JfbBaseAddress/Attr.js

@@ -1,5 +1,6 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
+import IConList from "@/ICONS"
 let styleForm = new StyleForm(
   {border: null, shadow: null, spacing: '',  bgColor:'',  margin: null},
   null,
@@ -11,6 +12,35 @@ export default {
   advanced: [],
   content: (data)=>{
     return [
+      {
+        label: "布局样式配置",
+        ele: "xd-radio",
+        valueKey: "layout_style",
+        value: data.layout_style || 'old',
+        list: [
+          {label: '布局1', value: 'old'},
+          {label: '布局2', value: 'tfk'},
+        ],
+        groupKey: "style",
+      },
+      {
+        label: "编辑图标",
+        ele: "xd-select-list",
+        valueKey: "edit_icon",
+        value: data.edit_icon || 'iconbianji-01',
+        list: IConList,
+        className: 'input80',
+        groupKey: "content",
+      },
+      {
+        label: "删除图标",
+        ele: "xd-select-list",
+        valueKey: "delete_icon",
+        value: data.delete_icon || 'iconshanchu-01',
+        list: IConList,
+        className: 'input80',
+        groupKey: "content",
+      },
       {
         label: '选取地区路径:',
         ele: 'xd-select-pages-path',
@@ -23,7 +53,85 @@ export default {
         },
         inline: false,
       },
-      ...styleForm.getForm(data, '内容列表样式配置')
+      ...styleForm.getForm(data, '内容列表样式配置'),
+      {
+        label: "圆角设置",
+        ele: 'xd-site-select-list',
+        valueKey: 'cardRadius',
+        value: data['cardRadius'] || '',
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: "底部按钮配置",
+        ele: "title",
+        groupKey: "style",
+        size: "small"
+      },
+      {
+        label: "容器内边距:",
+        ele: "xd-margin-padding",
+        valueKey: "bottomPadding",
+        value: data.bottomPadding || null,
+        groupKey: "style",
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "容器背景颜色:",
+        ele: "xd-color",
+        valueKey: "bottomBgColor",
+        value: data.bottomBgColor || null,
+        groupKey: "style",
+      },
+      {
+        label: "按钮背景颜色:",
+        ele: "xd-color",
+        valueKey: "bottomBtnBgColor",
+        value: data.bottomBtnBgColor || null,
+        groupKey: "style",
+      },
+      {
+        label: "按钮文字颜色:",
+        ele: "xd-color",
+        valueKey: "bottomBtnTextColor",
+        value: data.bottomBtnTextColor || null,
+        groupKey: "style",
+      },
+      {
+        label: "按钮圆角:",
+        ele: "xd-site-select-list",
+        valueKey: "bottomBtnRadius",
+        value: data['bottomBtnRadius'] || '',
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      }
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -26,81 +26,108 @@
         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)"
-          :key="index"
-        >
-          <view class="jfb-base-address__body-address-item-top">
-            <view
-              v-if="item.is_default === 'Y'"
-              :style="{
-                backgroundColor: mainColor,
-                color: '#fff',
-                fontSize: '24rpx',
-                padding: '4rpx 10rpx',
-                borderRadius: '4rpx',
-                marginRight: '20rpx',
-              }"
-              >默认</view
-            >
+        <template v-if="layout_style === 'old'">
+          <view
+            :style="{
+              marginBottom: jfbListSpacing + 'rpx',
+              boxShadow: jfbListShadowComputed,
+              border: jfbListBorderComputed,
+              backgroundColor: jfbListBgColor,
+              borderRadius: cardRadius + 'rpx'
+            }"
+            class="jfb-base-address__body-address-item"
+            v-for="(item, index) in addressList"
+            @click="handleSelectAddress(item)"
+            :key="index"
+          >
+            <view class="jfb-base-address__body-address-item-top">
+              <view
+                v-if="item.is_default === 'Y'"
+                :style="{
+                  backgroundColor: mainColor,
+                  color: '#fff',
+                  fontSize: '24rpx',
+                  padding: '4rpx 10rpx',
+                  borderRadius: '4rpx',
+                  marginRight: '20rpx',
+                }"
+                >默认</view
+              >
+              <view
+                :style="{
+                  color: '#999999',
+                  flex: 1,
+                  paddingRight: item.is_valid === 'N' ? '40rpx' : '',
+                }"
+              >
+                <view>
+                  {{ item | getCodeName }}
+                </view>
+              </view>
+              <view
+                style="position: absolute; right: 40rpx; width: 50rpx"
+                v-if="item.is_valid === 'N'"
+              >
+                <xd-font-icon
+                  size="32"
+                  :color="dangerColor"
+                  icon="iconmingchengtubiao"
+                ></xd-font-icon>
+              </view>
+            </view>
+            <view class="jfb-base-address__body-address-item-middle">
+              {{ item.address_detail }} {{ item.house_number }}
+            </view>
             <view
               :style="{
-                color: '#999999',
-                flex: 1,
-                paddingRight: item.is_valid === 'N' ? '40rpx' : '',
+                backgroundColor: item.is_select === 'Y' ? mainColor : '#CCC',
               }"
+              class="jfb-base-address__body-address-item-bottom"
             >
               <view>
-                {{ item | getCodeName }}
+                <view style="margin-right: 40rpx">{{ item.name }}</view>
+                <view>{{ item.phone }}</view>
+              </view>
+              <view>
+                <xd-font-icon
+                  @click.native.stop="handleEdit(item)"
+                  style="margin-right: 40rpx"
+                  icon="iconbianji-01"
+                  size="32"
+                ></xd-font-icon>
+                <xd-font-icon
+                  @click.native.stop="handleDel(item)"
+                  icon="iconshanchu-01"
+                  size="32"
+                ></xd-font-icon>
               </view>
-            </view>
-            <view
-              style="position: absolute; right: 40rpx; width: 50rpx"
-              v-if="item.is_valid === 'N'"
-            >
-              <xd-font-icon
-                size="32"
-                :color="dangerColor"
-                icon="iconmingchengtubiao"
-              ></xd-font-icon>
             </view>
           </view>
-          <view class="jfb-base-address__body-address-item-middle">
-            {{ item.address_detail }} {{ item.house_number }}
-          </view>
+        </template>
+        <template v-else>
           <view
             :style="{
-              backgroundColor: item.is_select === 'Y' ? mainColor : '#CCC',
+              marginBottom: jfbListSpacing + 'rpx',
+              boxShadow: jfbListShadowComputed,
+              border: jfbListBorderComputed,
+              backgroundColor: jfbListBgColor,
+              borderRadius: cardRadius + 'rpx'
             }"
-            class="jfb-base-address__body-address-item-bottom"
+            v-for="(item, index) in addressList"
+            @click="handleSelectAddress(item)"
+            :key="index"
           >
-            <view>
-              <view style="margin-right: 40rpx">{{ item.name }}</view>
-              <view>{{ item.phone }}</view>
-            </view>
-            <view>
-              <xd-font-icon
-                @click.native.stop="handleEdit(item)"
-                style="margin-right: 40rpx"
-                icon="iconbianji-01"
-                size="32"
-              ></xd-font-icon>
-              <xd-font-icon
-                @click.native.stop="handleDel(item)"
-                icon="iconshanchu-01"
-                size="32"
-              ></xd-font-icon>
-            </view>
+            <xd-tfk-item
+              :edit_icon="edit_icon"
+              :delete_icon="delete_icon"
+              :item="item"
+              :dangerColor="dangerColor"
+              @editAddress="handleEdit(item)"
+              @delAddress="handleDel(item)"
+              @setDefault="handleSetDefault(item)"
+            ></xd-tfk-item>
           </view>
-        </view>
+        </template>
       </view>
       <view class="jfb-base-address__body-empty" v-else>
         <xd-font-icon icon="iconbianzu-01" size="120"></xd-font-icon>
@@ -108,13 +135,19 @@
       </view>
       <view style="height: 110rpx"></view>
       <view class="jfb-base-address__body-footer" :style="prod_bottom">
-        <xd-button
-          width="80%"
-          type="primary"
-          :bg-color="mainColor"
-          @click="showAddress = !showAddress"
-          >+新增收货地址
-        </xd-button>
+        <view :style="[bottomBoxStyle]">
+          <xd-button
+            width="100%"
+            type="primary"
+            :style="{
+              background: bottomBtnBgColor,
+              color: bottomBtnTextColor
+            }"
+            :radius="bottomBtnRadius+'rpx'"
+            @click="showAddress = !showAddress"
+            >+新增收货地址
+          </xd-button>
+        </view>
         <xd-down-drawer
           v-if="showAddress"
           :show.sync="showAddress"
@@ -150,6 +183,7 @@ import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import StyleForm from "@/utils/StyleForm";
 import { getContainerPropsValue } from "@/utils/xd.base";
+import XdTfkItem from "./XdTfkItem"
 let styleForm = new StyleForm(
   {
     border: null,
@@ -174,6 +208,7 @@ export default {
     XdButton,
     XdDownDrawer,
     XdAddress,
+    XdTfkItem,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseAddressMixin],
   data() {
@@ -184,7 +219,17 @@ export default {
       location_url: "",
       addressList: null,
       ...styleForm.getDataItem(),
-      version: ''
+      version: '',
+
+      layout_style: "old",
+      edit_icon: "",
+      delete_icon: "",
+      cardRadius: 16,
+      bottomPadding: "",
+      bottomBgColor: "",
+      bottomBtnBgColor: "",
+      bottomBtnTextColor: "",
+      bottomBtnRadius: "",
     };
   },
   filters: {
@@ -210,6 +255,16 @@ export default {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     ...styleForm.getComputedItem(),
+    bottomBoxStyle(){
+      let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
+      return {
+        padding: padding,
+        backgroundColor: this.bottomBgColor,
+      }
+    }
   },
   methods: {
     onJfbLoad(options) {
@@ -236,6 +291,16 @@ export default {
         { value: "" }
       ).value;
       styleForm.getInitItem(this, value);
+      this.layout_style = getContainerPropsValue(value, "content.layout_style", "old");
+      this.edit_icon = getContainerPropsValue(value, "content.edit_icon", "iconbianji-01");
+      this.delete_icon = getContainerPropsValue(value, "content.delete_icon", "iconshanchu-01");
+      this.cardRadius = getContainerPropsValue(value, "content.cardRadius", 16);
+      this.bottomPadding = getContainerPropsValue(value, "content.bottomPadding", {});
+      this.bottomBgColor = getContainerPropsValue(value, "content.bottomBgColor", "#FFFFFF");
+      this.bottomBtnBgColor = getContainerPropsValue(value, "content.bottomBtnBgColor", this.mainColor);
+      this.bottomBtnTextColor = getContainerPropsValue(value, "content.bottomBtnTextColor", "#FFFFFF");
+      this.bottomBtnRadius = getContainerPropsValue(value, "content.bottomBtnRadius", 40);
+      console.log("bottomBtnRadius", this.bottomBtnRadius)
     },
     getList(callback) {
       this.$xdShowLoading({});
@@ -490,7 +555,8 @@ export default {
         })
         .catch(this.$xdLog.catch);
     },
-    handleEdit(item) {
+    //接口数据接口映射到组件数据接口
+    apiDataMapCompData(item){
       let city_name = [
         item["province_name"],
         item["city_name"],
@@ -503,13 +569,15 @@ export default {
         item["area_code"],
         item["street_code"],
       ];
-      this.defaultValue = {
+      return {
         receipt_username: item["name"],
         receipt_address: item["address_detail"],
         receipt_phone: item["phone"],
         receipt_default: item["is_default"] === "Y" ? true : false,
         city_name: city_name,
         city_code: city_code,
+        receipt_city_code: city_code,
+        receipt_city_name: city_name,
         receipt_region_name: city_name.join("  "),
         city_selected_data: city_name.map((item, index) => {
           return { label: item, value: city_code[index] };
@@ -518,11 +586,20 @@ export default {
         latitude: item["latitude"] || null,
         longitude: item["longitude"] || null,
         house_number: item["house_number"],
-      };
+      }
+    },
+    handleEdit(item) {
+      this.defaultValue = this.apiDataMapCompData(item);
 
       console.log("handleEdit", item, this.defaultValue);
       this.showAddress = true;
     },
+    handleSetDefault(item){
+      let is_default = item.is_default === "Y" ? "N" : "Y";
+      this.$set(item, 'is_default', is_default);
+      let saveData = this.apiDataMapCompData({...item, is_default});
+      this.handleSave(saveData);
+    },
     handleDel(item) {
       console.log("handleDel", item);
       this.$xdConfirm({
@@ -670,9 +747,10 @@ export default {
 
     &-address {
       &-item {
-        border-radius: unit(16, rpx);
+        // border-radius: unit(16, rpx);
         margin-bottom: unit(20, rpx);
         box-shadow: 0px 0px unit(20, rpx) 0px rgba(0, 0, 0, 0.1);
+        overflow: hidden;
 
         &-top {
           display: flex;
@@ -695,7 +773,7 @@ export default {
           padding: unit(20, rpx) unit(40, rpx);
           font-size: unit(28, rpx);
           color: #fff;
-          border-radius: 0px 0px unit(16, rpx) unit(16, rpx);
+          // border-radius: 0px 0px unit(16, rpx) unit(16, rpx);
 
           & > view {
             display: flex;
@@ -709,9 +787,7 @@ export default {
       position: fixed;
       left: 0;
       right: 0;
-      padding-top: unit(20, rpx);
       background: #fff;
-      height: unit(100, rpx);
     }
   }
 }

package/src/components/JfbBaseAddress/XdTfkItem.vue

@@ -0,0 +1,117 @@
+<template>
+  <view class="xd-tfk-item" @click="handleSelectAddress">
+    <view class="item_top">
+      <view class="user_info">
+        {{ item.name }} <text style="margin-left: 20rpx;">{{ item.phone }}</text>
+        <view v-if="item.is_valid === 'N'"
+          style="position: absolute; right: 40rpx;top: 0;"
+        >
+          <xd-font-icon
+            size="32"
+            :color="dangerColor"
+            icon="iconmingchengtubiao"
+          ></xd-font-icon>
+        </view>
+      </view>
+      <view class="user_adr">{{item.province_name}}{{item.city_name}}{{item.area_name}}{{item.street_name}}{{ item.address_detail }} {{ item.house_number }}</view>
+    </view>
+    <view class="item_bottom">
+      <view class="is_default" @click.native.stop="setDefault">
+        <xd-radio :value="item.is_default === 'Y'" :width="52" :height="52" :iconSize="20"></xd-radio>
+        <view v-if="item.is_default === 'Y'">默认地址</view>
+        <view v-else>设为默认</view>
+      </view>
+      <view class="item_opera">
+        <view class="o_i" style="margin-right: 30rpx;" @click.native.stop="handleEdit">
+          <xd-font-icon class="icon" :icon="edit_icon" :size="26"></xd-font-icon> 编辑
+        </view>
+        <view class="o_i" @click.native.stop="handleDel">
+          <xd-font-icon class="icon" :icon="delete_icon" :size="26"></xd-font-icon> 删除
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  import XdRadio from "@/components/XdRadio/XdRadio"
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+  export default{
+    name:"XdTfkItem",
+    components: {
+      XdRadio,
+      XdFontIcon,
+    },
+    props:{
+      edit_icon: String,
+      delete_icon: String,
+      item: Object,
+      dangerColor: String,
+    },
+    data(){
+      return{
+      }
+    },
+    created(){
+    },
+    methods:{
+      handleSelectAddress(){
+        this.$emit("selectAddress")
+      },
+      handleEdit(){
+        this.$emit("editAddress", this.item)
+      },
+      handleDel(){
+        this.$emit("delAddress", this.item)
+      },
+      setDefault(){
+        this.$emit("setDefault", this.item)
+      }
+    },
+  }
+</script>
+<style lang="less" scoped>
+  .xd-tfk-item{
+    .item_top{
+      padding: 30rpx;
+    }
+    .user_info{
+      color: #191a1b;
+      font-size: 30rpx;
+      position: relative;
+    }
+    .user_adr{
+      color: #797d82;
+      font-size: 26rpx;
+      margin-top: 6rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .item_bottom{
+      display: flex;
+      justify-content: space-between;
+      padding: 20rpx;
+      border-top: 1px solid #ededed;
+    }
+    .item_opera{
+      display: flex;
+      color: #797d82;
+      align-items: center;
+      .o_i{
+        display: flex;
+        align-items: center;
+        font-size: 26rpx;
+
+        .icon{
+          margin-right: 10rpx;
+        }
+      }
+    }
+    .is_default{
+      display: flex;
+      align-items: center;
+      font-size: 26rpx;
+      color: #797d82;
+    }
+  }
+</style>

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -391,8 +391,11 @@ export default {
       //外站配置地址
       if(entry.redirect_type === 'URL') {
         if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          let urlPath = entry.redirect_data['path'];
+          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
           this.$xdUniHelper.redirectTo({
-            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+            url:urlPath
           }, false)
         }
         else {

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -706,7 +706,7 @@ export default {
      */
     handleBindLogin(item , entry) {
       //卡券登录
-      if (this.tabIndex === 1||this.tabIndex === 2) {
+      if (this.tabIndex === 1 || this.tabIndex === 2) {
         if (item["is_valid"] !== "Y") {
           return;
         }
@@ -719,6 +719,7 @@ export default {
           }, false);
           return
         }
+
         jfbRootExec("loginEntryCardBind", {
           vm: this,
           data: { card_number: item["card_number"] },
@@ -736,7 +737,6 @@ export default {
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
             }
-
             else {
               this.handleClick(entry);
             }
@@ -775,7 +775,15 @@ export default {
     },
 
     handleClick(entry){
-      if (this.$configProject['isPreview']) return
+      if (this.$configProject['isPreview']) return;
+
+      //登陆成功，有回调地址返回回调地址
+      if(this.inCallbackUrlOrg) {
+        this.$xdUniHelper.redirectTo({
+          url:this.inCallback
+        }, false);
+        return;
+      }
 
       const {dir, path, host, appType} = entry['redirect_data'];
       let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
@@ -787,8 +795,11 @@ export default {
       //外站配置地址
       if(entry.redirect_type === 'URL') {
         if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          let urlPath = entry.redirect_data['path'];
+          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
           this.$xdUniHelper.redirectTo({
-            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+            url:urlPath
           }, false)
         }
         else {
@@ -845,7 +856,7 @@ export default {
       if(options['x-test'] === 'jfb-console') this.showIndex = true;
       this.options = options;
       let { inCallback } = options;
-      this.force = inCallback?true:false;
+      this.force = !!inCallback;
       if(!inCallback) this.$storage.remove("inCallback"); //作为入口
       else {
         this.$storage.set("inCallback", inCallback);
@@ -947,6 +958,7 @@ export default {
           this.handleCardInit(this.ajaxCardList, type);
           this.cardPageNum = 1;
           this.$xdHideLoading();
+
         })
         .catch(() => this.$xdHideLoading());
     },