jufubao-base 1.0.169-beta2 → 1.0.169-beta20

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -110,7 +110,7 @@
         partnerName: "",
         useSearch: "N",   //Y:用于搜索;  N:用于跳转搜索页面
         searchPagePath: "",
-        placeholder: "搜索商品名称",
+        placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
 
 
@@ -166,7 +166,7 @@
         this.showBack = getContainerPropsValue(container, "content.showBack", "Y");
         this.showPartner = getContainerPropsValue(container, "content.showPartner", "N")
         this.showPartnerName = getContainerPropsValue(container, "content.showPartnerName", "N");
-        this.placeholder = getContainerPropsValue(container, "content.placeholder");
+        this.placeholder = getContainerPropsValue(container, "content.placeholder",'请输入关键词');
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;

package/src/components/JfbBaseLogin/Attr.js

@@ -29,6 +29,7 @@ export default {
         value: data.authLoginBtnText ||"",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "授权登录按钮前缀图标:",
@@ -37,6 +38,7 @@ export default {
         value: data.authLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "账号登录按钮文案:",
@@ -45,6 +47,7 @@ export default {
         value: data.accountLoginBtnText ||"",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "账号登录按钮前缀图标:",
@@ -53,6 +56,7 @@ export default {
         value: data.accountLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "手机号登录按钮文案:",
@@ -61,6 +65,7 @@ export default {
         value: data.phoneLoginBtnText || "登录",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号登录按钮前缀图标:",
@@ -69,10 +74,11 @@ export default {
         value: data.phoneLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
-        label: '协议内容配置',
+        label: '协议内容配置 - 通用',
         size: 'small',
         groupKey: 'content',
       },
@@ -544,6 +550,7 @@ export default {
         label: '账号登录内容配置',
         size: 'small',
         groupKey: 'content',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号自定义提示语:",
@@ -553,6 +560,7 @@ export default {
         groupKey:'content',
         placeholder: "请输入手机号自定义提示语",
         className: 'input80',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "验证码自定义提示语:",
@@ -562,6 +570,13 @@ export default {
         groupKey:'content',
         placeholder: "请输入验证码自定义提示语",
         className: 'input80',
+        hidden: data.previewCurrent !== "account",
+      },
+      {
+        ele: 'title',
+        label: '其他',
+        size: 'small',
+        groupKey: 'content',
       },
       {
         label: '是否使用体验码功能:',
@@ -582,6 +597,7 @@ export default {
         label: 'logo样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "logo区域高度:",
@@ -592,6 +608,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo区域高度",
         className: 'input60',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "logo图片高度:",
@@ -602,6 +619,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo图片高度",
         className: 'input60',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: 'logo圆角设置:',
@@ -621,12 +639,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== "auth",
       },
       {
         ele: "title",
         label: "表单样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "输入框样式:",
@@ -640,7 +660,8 @@ export default {
         list: [
           {label: '线性', value: "linear"},
           {label: '面性', value: "face"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "表单边框颜色:",
@@ -649,6 +670,7 @@ export default {
         value: data.formBorderColor || "#F9F9F9",
         groupKey:'style',
         placeholder: "请选择表单边框颜色",
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "表单边框宽度:",
@@ -659,6 +681,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入表单边框宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "表单背景颜色:",
@@ -667,6 +690,7 @@ export default {
         value: data.formBgColor || "#FFFFFF",
         groupKey:'style',
         placeholder: "请选择表单背景颜色",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: '表单容器设置内边距:',
@@ -680,12 +704,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '标签样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签文字对齐方式:",
@@ -700,7 +726,8 @@ export default {
           {label: '左对齐', value: "left"},
           {label: '右对齐', value: "right"},
           {label: '居中', value: "center"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签位置:",
@@ -714,7 +741,8 @@ export default {
         list: [
           {label: '居左', value: "left"},
           {label: '居上', value: "top"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签宽度:",
@@ -725,6 +753,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入标签宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号图标:",
@@ -734,6 +763,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入手机号图标",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "验证码图标:",
@@ -743,6 +773,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入验证码图标",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "标签字体样式设置:",
@@ -753,13 +784,6 @@ export default {
         setting: {
           align: false,
           lineHeight: false,
-          //color:true, //颜色
-          //fontSize: true, //字体大小
-          //style:true, //字体：nomarl|italic
-          //align:true, //左，中，右
-          //weight: true, //粗细
-          //lineHeight: true, //行高
-          //decoration: true, //样式，none |underline ｜line-through | overline
         },
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
@@ -773,12 +797,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '输入框设置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "占位符字体样式设置:",
@@ -806,6 +832,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "内容字体样式设置:",
@@ -829,12 +856,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '获取验证码',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "获取验证码字体样式设置:",
@@ -862,6 +891,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "获取验证码展示方式:",
@@ -874,7 +904,8 @@ export default {
         list: [
           {label: '文字', value: 'text'},
           {label: '按钮', value: 'button'},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
@@ -908,9 +939,10 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
-        label: "按钮圆角",
+        label: "按钮圆角 - 通用",
         ele: 'xd-site-select-list',
         valueKey: 'btnRadius',
         value: data['btnRadius'] || '',
@@ -930,7 +962,7 @@ export default {
       },
       {
         ele: 'title',
-        label: '条款协议',
+        label: '条款协议 - 通用',
         size: 'small',
         groupKey: 'style',
       },
@@ -999,7 +1031,7 @@ export default {
         ]
       },
       {
-        label: "外边距设置:",
+        label: "条款协议外边距设置 - 账号登录",
         groupKey:'style',
         ele: 'xd-margin-padding',
         valueKey: 'agreePadding',
@@ -1015,12 +1047,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account"
       },
       {
         ele: "title",
         label: "授权登录页设置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: "授权登录按钮组边距设置:",
@@ -1034,6 +1068,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: "隐私协议外边距设置:",
@@ -1047,6 +1082,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         ele: 'title',
@@ -1066,7 +1102,8 @@ export default {
         list: [
           {label: '显示', value: "Y"},
           {label: '隐藏', value: "N"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: '站点名称颜色:',
@@ -1076,6 +1113,7 @@ export default {
         groupKey:'style',
         placeholder: '请选择站点名称颜色',
         classNmae: 'input60',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: '快速授权失败访问地址:', //label

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -651,7 +651,7 @@ export default {
       this.formBgColor = getContainerPropsValue(value, "content.formBgColor", '#FFFFFF');
       this.labelAlign = getContainerPropsValue(value, "content.labelAlign", 'left');
       this.labelWidth = getContainerPropsValue(value, "content.labelWidth", '180');
-      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'top');
+      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'left');
       this.formPadding = getContainerPropsValue(value, "content.formPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.agreePadding = getContainerPropsValue(value, "content.agreePadding", {});
       this.authAgreePadding = getContainerPropsValue(value, "content.authAgreePadding", {top: 20, left: 20, right: 20, bottom: 20});
@@ -799,6 +799,8 @@ export default {
 
       let { redirect_url, callback_url } = this;
 
+      redirect_url = redirect_url || callback_url || this.$settings.index;
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)

package/src/components/JfbBaseMapSearch/MapSearchMp.vue

@@ -46,7 +46,7 @@
 			this.BMap = new bmap.BMapWX({
 				ak: this.ak
 			})
-			uni.getLocation({
+			wx.getFuzzyLocation({
 				type: "gcj08",
 				success: res => {
 					console.log("getLocation", res);

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -14,7 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice__body">
-      <view class="jfb-base-notice__body-line"></view>
+      <view class="jfb-base-notice__body-line" v-if="contentList.length > 0"></view>
       <view>
         <template v-if="style === '3' && isPreview">
           <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位)，在线上此模块不显</view>
@@ -23,7 +23,7 @@
           <template v-if="contentList.length === 0 && isPreview">
             <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">接口无数返回，请检查是否配置成功!</view>
           </template>
-          <view v-else class="jfb-base-notice__body-scroll">
+          <view v-if="contentList.length > 0" class="jfb-base-notice__body-scroll">
             <view
               class="upAndDown"
               :style="{

package/src/components/JfbBaseOrderDetail/Api.js

@@ -1,13 +1,7 @@
 'use strict';
 
 /**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
+ * @description 订单详情模块
  * @type {*[]}
  */
 module.exports = [
@@ -45,4 +39,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'deleteBaseOrder', //自定义方法名字（必选）
+    title: '删除订单',
+    path: '/order/v1/order/delete-main-order',
+    isRule: false,
+    data: {
+      main_order_id: ['id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -22,20 +22,6 @@ export default {
         inline: false,
         notice: '前台页面展示会根据返回数据类型进行页面渲染'
       },
-      {
-        label: '是否需要客服电话:',
-        ele: 'xd-radio',
-        valueKey: 'is_hot',
-        value: data['is_hot'] || 'N',
-        groupKey:'content',
-        placeholder: '请选择是否需要客服电话',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
-      },
       {
         label: '自定义内容:',
         ele: 'xd-site-news',
@@ -260,6 +246,20 @@ export default {
           }
         },
       },
+      {
+        label: '是否需要客服电话:',
+        ele: 'xd-radio',
+        valueKey: 'is_hot',
+        value: data['is_hot'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否需要客服电话',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         label: "是否展示可用门店:",
         ele: 'xd-radio',
@@ -274,6 +274,20 @@ export default {
           { label: '否', value: 'N' },
         ]
       },
+      {
+        label: "是否允许删除订单:",
+        ele: 'xd-radio',
+        valueKey: "is_show_delete_order",
+        value: data['is_show_delete_order'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否允许删除订单',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '允许', value: 'Y' },
+          { label: '不允许', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -683,9 +683,8 @@
           <view v-else>
             <xd-button
               size="small"
-              type="primary"
+              :type="item.type !== undefined ? item.type: 'primary'"
               radius="40rpx"
-              :bg-color="mainColor"
               @click="handleAction(item)"
             >{{ item.text }}</xd-button>
           </view>
@@ -741,6 +740,7 @@ import { mapState } from "vuex";
 import bizMock from "./bizMock";
 import Color from "color";
 
+
 export default {
   name: "JfbBaseOrderDetail",
   components: {
@@ -774,6 +774,7 @@ export default {
       is_not_show_price: "",
       brandTextColor:'',
       is_show_support_shop: "",
+      is_show_delete_order:'N', //删除订单
 
       showPassword: false,
       dialogPassword: "",
@@ -822,6 +823,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_show_delete_order(){
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     ...mapState(['siteInfo']),
@@ -857,8 +863,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.main_order_id =
-        options.id || options.order_id || options.main_order_id;
+      this.main_order_id = options.id || options.order_id || options.main_order_id;
       this.getOrderDetail();
     },
 
@@ -993,6 +998,20 @@ export default {
             ).fullTime;
             res.film_show.thumb = getServiceUrl(res.film_show.thumb);
           }
+
+          //增加删除订单按钮
+          if(this.is_show_delete_order  === 'Y') {
+            let pay = (res.buttons||[]).filter(item => item.action === 'pay');
+            let del = [{action:'delete', text:'删除订单', type: 'info'}];
+            if(pay.length === 1) del = []
+            res.buttons = del.concat(res.buttons || []).map(item=>{
+              if(item.action === 'view_logistics' && !item.type) {
+                item.type = 'default';
+              }
+              return item
+            });
+          }
+
           if (res.product) {
             jfbRootExec("getBaseProductDetail", {
               vm: this,
@@ -1011,7 +1030,8 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
-          } else {
+          }
+          else {
             this.info = res;
             if (this.info.status.loading_timeout != "-1") {
               this.timeDown();
@@ -1051,6 +1071,7 @@ export default {
       this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
+      this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1135,25 +1156,15 @@ export default {
     },
     handleAction(item) {
       if (item.action === "view_logistics") {
-        // if (
-        //   this.info.extras.first_logistics_package_id &&
-        //   this.info.extras.logistics_count === 1
-        // ) {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.logisticsPath}?package_id=${this.info.extras.first_logistics_package_id}`,
-        //   });
-        // } else {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.packageListPath}?order_id=${this.main_order_id}`,
-        //   });
-        // }
         this.$xdUniHelper.navigateTo({
           url: `${this.packageListPath}?order_id=${this.main_order_id}`,
         });
-      } else {
+      }
+      else if(item.action === 'cancel_unpaid') {
         this.$xdConfirm({
           styles: this.styles,
           content: "是否取消订单",
+          zIndex: 3000,
           success: (action) => {
             if (action.confirm) {
               jfbRootExec("cancelBaseOrder", {
@@ -1175,6 +1186,45 @@ export default {
           },
         });
       }
+      else if(item.action === 'delete'){
+        this.$xdConfirm({
+          styles: this.styles,
+          content: "订单删除后将无法找到订单<br/>您确认删除吗？",
+          cancelText:'我在看看',
+          isHtml: true,
+          zIndex: 3000,
+          success: (action) => {
+            if (action.confirm) {
+              this.handleDeleteOrder();
+            }
+          },
+        });
+      }
+      else {
+        console.error(`item.action=${item.action}, 此action不可用`)
+      }
+    },
+
+    handleDeleteOrder(){
+      jfbRootExec("deleteBaseOrder", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+        },
+      })
+        .then((res) => {
+          this.$xdAlert({
+            content: "删除成功",
+            time: 2000,
+            zIndex: 3000,
+          });
+          setTimeout(()=>{
+            this.$xdUniHelper.navigateBack()
+          },3000)
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
 
     onJfbShow(options) {

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -95,5 +95,7 @@ module.exports = {
       "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 "
     },
     "request_id": "6178d3499b91f274"
-  }
+  },
+  cancelBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
+  deleteBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
 }