jufubao-base 1.0.242-beta3 → 1.0.242-beta5

package/package.json

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

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -55,6 +55,19 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '选取城市路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cityPath',
+        placeholder: '请选择选取城市路径',
+        value: data.cityPath || null,
+        className: 'input100',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -115,6 +115,21 @@
         <XdButton @click="handleConfirm" size="small" type="primary">确认</XdButton>
       </view>
     </XdDialog>
+    <XdDialog class="location-dialog-title" width="80%" :show.sync="showLocationDialog" :showClose="false"
+      :showTitle="true">
+      <view slot="title">
+        <xd-font-icon icon="icondingweixiao" color="#999999" size="60"></xd-font-icon>
+        <text style="font-size: 32rpx;color: #333;margin-top: 12rpx;">定位请求</text>
+      </view>
+      <view class="location-dialog-content">
+        <view>为了给您提供更好的服务需要获取您的位置信息</view>
+      </view>
+      <view class="dialog-btns" slot="btn">
+        <XdButton @click="showLocationDialog=false" bgColor="#EEEEEE" color="#888888" size="small" type="info">取消
+        </XdButton>
+        <XdButton @click="handleToCity" size="small" type="primary">允许</XdButton>
+      </view>
+    </XdDialog>
   </view>
 </template>
 
@@ -131,6 +146,9 @@
   import { mapState } from 'vuex';
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseConsumpCode",
     components: {
       XdFontIcon,
@@ -176,6 +194,8 @@
         isPreview: false,
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
+        showLocationDialog: false,
+        cityPath: ''
       }
     },
     watch: {
@@ -241,9 +261,12 @@
 
           if (Object.keys(this.stateLocation).length === 0) {
             this.tip = '为了给您提供更好的服务需要获取您的位置信息'
+            this.showLocationDialog = true;
             this.showMask = true;
             this.showDialog = false;
             return
+          } else{
+            this.showLocationDialog = false
           }
         }
         if (!this.options.shop_id) {
@@ -293,6 +316,13 @@
         ).value;
         this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }
         ).value;
+        this.successPath = getContainerPropsValue(
+          container,
+          "content.successPath",
+          { value: "" }
+        ).value;
+        this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }
+        ).value;
       },
       getUserInfo() {
         jfbRootExec("getConsumpBaseUserInfo", {
@@ -740,6 +770,11 @@
           this.price = "";
         }
       },
+      handleToCity() {
+        this.$xdUniHelper.navigateTo({
+          url: this.cityPath
+        },true);
+      },
       handleNumberChange(num) {
         let curTag = this.curTag;
         this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
@@ -1046,8 +1081,29 @@
     .dialog-btns {
       width: 100%;
       display: flex;
-      justify-content: space-between;
+      justify-content: space-around;
+
+    }
+
+    .location-dialog-content {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 2rpx dashed #E5E5E5;
+      padding-bottom: 30rpx;
+
+      &>view:first-child {
+        font-size: 26rpx;
+        color: #999999;
+        width: 60%;
+      }
+    }
 
+    .location-dialog-title ::v-deep .xd-dailog__body-title {
+      padding-top: 40rpx;
+      padding-bottom: 32rpx;
+      height: auto;
+      line-height: inherit;
     }
   }
 </style>

package/src/components/JfbBaseFooter/Attr.js

@@ -56,6 +56,18 @@ export default {
         },
         classNmae: 'input80',
       },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'borderColor',
+        groupKey:'content',
+        value: data['borderColor'] || '',
+        placeholder: '请选择边框颜色',
+        setting: {
+          isAlpha: false
+        },
+        classNmae: 'input80',
+      },
       {
         label: '菜单文字颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -19,6 +19,7 @@
     <view class="jfb-base-footer__body">
       <view :style="[bodyStyle]">
         <xd-footer-bar
+          class="footer-bar-deep"
           style="height:100%"
           v-if="list !== null"
           :height="height"
@@ -48,6 +49,9 @@
   import getServiceUrl from "@/common/getServiceUrl";
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseFooter",
     components: {
       XdFontIcon,
@@ -61,6 +65,7 @@
           backgroundSize: '100% 100%',
           backgroundRepeat: 'no-repeat',
           backgroundPosition: 'top center',
+          '--border-color': this.borderColor
         }
 
         if(this.backgroundImage && this.backgroundImage.url) {
@@ -78,6 +83,7 @@
         footerBarKey: 'footerBarKey', //刷新
         baseUrl: '',
         backgroundImage: '',
+        borderColor: ''
       }
     },
     watch: {
@@ -197,6 +203,7 @@
         let bar = getContainerPropsValue(value, 'content.footer-setting', []);
         let imageIcons = getContainerPropsValue(value, 'content.footerSettingImage', []);
         this.backgroundImage = getContainerPropsValue(value, 'content.backgroundImage', '');
+        this.borderColor = getContainerPropsValue(value, 'content.borderColor', '');
         this.list = {
           bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
           bodyStyle: this.bodyStyle,
@@ -222,6 +229,12 @@
 
 <style scoped lang="less">
   @import "./JfbBaseFooterLess.less";
+  .footer-bar-deep {
+    ::v-deep .xd-footer-tabbar__border {
+      border-color: var(--border-color);
+    }
+  }
+  
 
   .jfb-base-footer {