jufubao-food 1.0.15 → 1.0.16-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15",
+  "version": "1.0.16-beta1",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -84,12 +84,12 @@
       </view>
 
       <!-- 展示vip -->
-      <view v-if="is_show_vip_card_list === 'Y'" class="section">
+      <!-- <view v-if="is_show_vip_card_list === 'Y'" class="section">
         <cus-vip-list :list="vipCardList"
           :vip_card_id="vip_card_id"
           :plus_saving_money="plus_saving_money"
           @choseVipCard="handleChoseVipCard"></cus-vip-list>
-      </view>
+      </view> -->
 
       <view class="section">
         <xd-list-item label="商品价格" paddingLR="60rpx" size="small">
@@ -98,7 +98,7 @@
       </view>
       <view v-if="isShowPlusSaveMoney" class="section">
         <xd-list-item label="" paddingLR="60rpx" size="small">
-          <view slot="label" style="color: #86541E;">PLUS专享立减</view>
+          <view slot="label" style="color: #86541E;">PLUS会员立减</view>
           <xd-unit :price="-plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
       </view>
@@ -240,6 +240,13 @@
           <xd-button type="primary" size="small" style="margin-left: 40rpx;" @click="handleSwitchShop">继续更换</xd-button>
         </view>
       </XdDailog>
+      <CusVipOpenDialog
+        v-if="!isVip"
+        :bgImg="openVipBgImg"
+        :btnBgImg="openVipBtnBgImg"
+        @onOpen="handleToOpen"
+        @onClose="handleCloseOpenVip"
+      ></CusVipOpenDialog>
     </view>
   </view>
 </template>
@@ -262,6 +269,9 @@
   import OrderMixin from "./orderMixin"
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex";
+  import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
+  import getServiceUrl from "@/common/getServiceUrl";
+
   export default {
     name: "JfbFoodConfirmV2",
     components: {
@@ -274,7 +284,8 @@
       XdWalletChose,
       CusCouponChose,
       XdDailog,
-      CusVipList
+      CusVipList,
+      CusVipOpenDialog
     },
     mixins: [
       componentsMixins, extsMixins, JfbFoodConfirmV2Mixin, OrderMixin
@@ -341,6 +352,9 @@
         paySuccessPath: "",
         switchStorePath: "",
         productListPath: "",
+        openPath: "",
+        openVipBtnBgImg: "",
+        openVipBgImg: "",
       }
     },
     computed: {
@@ -423,7 +437,10 @@
     created() {
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
-      this.isVip = this.getTokenForKey('user_level') === 'VIP';
+      this.isVip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? true : false;
+      if (this.$configProject['isPreview']) {
+        this.isVip=true
+      }
       //todo
     },
     methods: {
@@ -480,7 +497,13 @@
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
-
+        this.openPath = getContainerPropsValue(container, 'content.openPath', {value: ""}).value;
+        this.openVipBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
+        );
+        this.openVipBtnBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBtnBgImg", { url: "" }).url
+        );
         this.$nextTick(()=>{
           let time = 500;
           //#ifdef H5
@@ -810,6 +833,14 @@
           meal_method: this.meal_method,
         };
       },
+      handleToOpen() {
+        this.$xdUniHelper.navigateTo({
+          url: this.openPath
+        });
+      },
+      handleCloseOpenVip() {
+        this.$xdUniHelper.navigateBack()
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -818,6 +849,10 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
+        this.isVip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? true : false;
+        if (this.$configProject['isPreview']) {
+          this.isVip=true
+        }
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)

package/src/components/JfbFoodConfirmV2/cusAttr/advanced.js

@@ -54,7 +54,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
-
+    {
+      label: '开通会员',
+      ele: 'xd-select-pages-path',
+      valueKey: 'openPath',
+      placeholder: '请选择开通会员跳转页面',
+      value: data.openPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      groupKey: 'advanced',
+      className: 'input100',
+    },
     {
       label: '版本号:',
       ele: 'el-input',

package/src/components/JfbFoodConfirmV2/cusAttr/style.js

@@ -557,6 +557,48 @@ export default function (data={},gValue={},gColor={},oldData) {
         showAlpha: true
       },
     },
-    {ele: "group_end"},
+    { ele: "group_end" },
+    {
+      label: "开通PLUS背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBgImg",
+      groupKey: "style",
+      labelInline: true,
+      value: data.openVipBgImg || {},
+      defaultValue: data.openVipBgImg || null,
+      slot: true,
+      oneWidth: 355,
+      oneHeight: 355,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>，高度为<span style="color:red">710px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
+    {
+      label: "开通PLUS按钮背景图",
+      ele: 'xd-upload',
+      valueKey: "openVipBtnBgImg",
+      groupKey: "style",
+      labelInline: true,
+      value: data.openVipBtnBgImg || {},
+      defaultValue: data.openVipBtnBgImg || null,
+      slot: true,
+      oneWidth: 223,
+      oneHeight: 44,
+      elinputClassName: 'input40',
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">446px</span>，宽度为<span style="color:red">88px</span>',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      size: 5,
+      action: 'action',
+      sort: true,
+      maxlen: 100,
+    },
   ]
 }