jufubao-mall 2.0.71 → 2.0.72-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.71",
+  "version": "2.0.72-beta2",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallShop/Api.js

@@ -184,4 +184,15 @@ module.exports = [
     },
     disabled: true,
   },
+  {
+    path: "/store/v1/order/show-brand-tip",
+    title: "显示品牌提示",
+    mapFnName: "showBrandTip",
+    isRule: false,
+    params: {
+      shop_id: ['门店id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -204,6 +204,25 @@
         </view>
       </template>
     </xd-down-drawer>
+
+    <!-- 温馨提示弹框 -->
+    <view class="warm_dialog" v-if="showTipDialog">
+      <view class="warm_mask" @click="doHideDialog" @touchmove.stop.prevent="moveHandle"></view>
+      <view class="warm_content">
+        <view class="warm_header">
+          <view class="h_l">
+            <xd-font-icon icon='icontongzhi1' :size="28" style="margin-right: 8rpx;"></xd-font-icon> {{ notice_title }}
+          </view>
+          <view>
+            <xd-font-icon @click="doHideDialog" icon="iconguanbi"></xd-font-icon>
+          </view>
+        </view>
+        <view class="warm_body" v-html="notice_content"></view>
+        <view class="warm_foot">
+          <view class="warm_btn" @click="doHideDialog">确定</view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -322,6 +341,9 @@
         showBrandDetailDialog:false,
         brandLogo:'',
         successPath:'',
+        showTipDialog: false,
+        notice_title: '',
+        notice_content: '',
       }
     },
     watch: {
@@ -531,6 +553,7 @@
           this.$xdLog.catch(error);
           this.$xdHideLoading();
         })
+        this.getShowBrandTip(options['shop_id'])
       },
       /**
        * @description 监听事件变化
@@ -677,6 +700,20 @@
         .exec(); 
     
       },
+      getShowBrandTip(shop_id){
+        jfbRootExec("showBrandTip", {
+          vm: this,
+          data: {
+            shop_id: shop_id
+          }
+        }).then(res => {
+          if(res.confirm_notice&&res.prompt_method === 1){
+            this.showTipDialog = true;
+            this.notice_title = res.notice_title;
+            this.notice_content = res.notice_content;
+          }
+        })
+      },
       handleError(){
         this.errorStatus = true;
       },
@@ -804,6 +841,12 @@
       handleShowBrandDetail(){
         this.showBrandDetailDialog = true;
       },
+      doHideDialog(){
+        this.showTipDialog = false;
+      },
+      moveHandle(){
+        // 阻止默认滚动事件
+      },
     }
   }
 
@@ -1129,4 +1172,75 @@
       color: #666666;
     }
   }
+  .warm_dialog{
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 3000;
+    .warm_mask{
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      background: rgba(0, 0, 0, 0.3);
+    }
+    .warm_content{
+      width: 590rpx;
+      box-sizing: border-box;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      display: flex;
+      flex-direction: column;
+      border-radius: 16rpx;
+      overflow: hidden;
+      .warm_header{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: #FF8D1A;
+        color: #FFFFFF;
+        height: 88rpx;
+        padding: 0 32rpx;
+        font-size: 28rpx;
+        .h_l{
+          display: flex;
+          align-items: center;
+        }
+      }
+      .warm_body{
+        display: flex;
+        text-align: center;
+        background-color: #FFFFFF;
+        padding: 52rpx 32rpx;
+        font-size: 32rpx;
+        max-height: 50vh;
+        overflow-y: auto;
+      }
+      .warm_foot{
+        border-top: 1px solid #F5F9FA;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #FFFFFF;
+        padding: 24rpx 0;
+        border-radius: 0 0 16rpx 16rpx;
+        .warm_btn{
+          width: 300rpx;
+          height: 72rpx;
+          font-size: 28rpx;
+          color: #FFFFFF;
+          background-color: #FF8D1A;
+          border-radius: 50rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+  }
 </style>

package/src/components/JfbMallShop/Mock.js

@@ -205,5 +205,6 @@ module.exports = {
       },
     ],
     request_id: "8560c761aa7ca2eb"
-  }
+  },
+  showBrandTip: { "confirm_notice": false, "notice_title": "", "notice_content": "", "request_id": "d8129fa759d21be2" },
 };

package/get.package.path.js

@@ -1,22 +0,0 @@
-'use strict';
-
-/**
- * @description 第三方库
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
- * @param packname {String} 包名字
- * @returns {string|*}
- */
-const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
-  if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
-  }
-
-  if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
-  }
-
-};
-
-module.exports = {
-  getPackagePath
-}