jufubao-mall 2.0.32-beta6 → 2.0.32

package/package.json

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

package/src/components/CusCouponChose/CusCouponChose.vue

@@ -485,26 +485,27 @@ export default {
     //选卡弹出项
     useCardPop(data) {
       return new Promise((resolve, reject) => {
-        uni.showModal({
-          title: "提示",
+        this.$xdConfirm({
+          title: '提示',
           content: data.pop_message,
           confirmText: data.confirm_text,
           cancelText: data.cancel_text,
-          success: function (res) {
+          width: '85%',
+          isTitle: true,
+          success: (res) => {
             if (res.confirm) {
               resolve(2);
             } else if (res.cancel) {
-              // reject("取消支付");
-              if (data.pop_type == "confirm") {
+              if(data.pop_type == 'confirm'){
                 resolve();
-              } else {
+              }else{
                 resolve(3);
               }
             }
           },
           fail: function (res) {
             reject(res);
-          },
+          }
         });
       });
     },
@@ -662,9 +663,11 @@ export default {
           err_tip = "优惠券和密码不能为空";
       }
       if (err_tip) {
-        return uni.showToast({
-          title: err_tip,
-          icon: "none",
+        return this.$xdAlert({
+          content: err_tip,
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
         });
       }
       let callThis = this;

package/src/components/CusEnter/CusEnter.vue

@@ -43,7 +43,7 @@
                 @click.stop="handlePosterClick(brand,index)"
               >
                 <view :style="[itemImageComp]" class="list-image" >
-                  <image v-if="brand['error-status']===false" :style="[config['iconStyle']]" :src="getCNDUrl(brand.brand_icon)" :alt="brand.label"></image>
+                  <image v-if="brand['error-status']===false" :style="[config['iconStyle']]" :src="brand.brand_icon" :alt="brand.label"></image>
                   <image v-else :style="[config['iconStyle']]" :src="iconErrorUrl" :alt="brand.label"></image>
                 </view>
                 <view class="list-title" :style="[config['titleStyle']]">{{brand.label}}</view>
@@ -60,7 +60,6 @@
 
 import CusSwiperDot from "@/components/CusSwiperDot/CusSwiperDot.vue";
 import Color from "color";
-import getServiceUrl from "@/common/getServiceUrl";
 
 export default {
   name: "CusEnter",
@@ -239,9 +238,6 @@ export default {
     }
   },
   methods:{
-    getCNDUrl(url) {
-      return getServiceUrl(url,'size3')
-    },
     styleBox(out='out'){
       let boxPaddingBT = this.config.wrapperPaddingTB * this.$rpxNum
       let height = this.itemWidth * (this.row);
@@ -341,10 +337,6 @@ export default {
     flex-flow: wrap;
     flex-shrink: 0;
 
-    & > view {
-      flex-shrink: 0;
-    }
-
     .list-image {
       display: flex;
       justify-content: center;

package/src/components/CusPoster/CusPoster.vue

@@ -10,10 +10,9 @@
     >
       <image
         @click.stop="handlePosterClick(posterList[0],0)"
-        :style="{width: '100%', height: styleObj.posterSize.height + 'rpx', borderRadius: imageRadius + 'rpx' }"
-        :src="getCNDUrl(posterList[0].image_url)"
+        :style="{width: '100%', height: styleObj.posterSize.height + 'rpx' }"
+        :src="posterList[0].image_url"
         :alt="posterList[0].content_name"
-        mode="widthFix"
       ></image>
     </view>
 
@@ -40,9 +39,8 @@
         >
           <swiper-item v-for="(item,index) in posterList" :key="index" @click.stop="handlePosterClick(item,index)">
             <image
-              :style="{width: '100%', height: styleObj.posterSize.height + 'rpx', borderRadius: imageRadius + 'rpx' }"
-              :src="getCNDUrl(item['image_url'])"
-              mode="widthFix"
+              :style="{width: '100%', height: styleObj.posterSize.height + 'rpx' }"
+              :src="item['image_url']"
             ></image>
           </swiper-item>
         </swiper>
@@ -54,16 +52,13 @@
 <script>
 
 import CusSwiperDot from "@/components/CusSwiperDot/CusSwiperDot.vue";
-import posterMixins from "@/mixins/posterMixins";
 import Color from "color";
-import getServiceUrl from "@/common/getServiceUrl";
 
 export default {
   name: "CusPoster",
   components: {
     CusSwiperDot
   },
-  mixins:[posterMixins],
   props:{
     styleObj:{
       type: Object,
@@ -82,11 +77,7 @@ export default {
     mainColor:{
       type:String,
       required: true
-    },
-    imageRadius:{
-      type: String|Number,
-      default: '0'
-    },
+    }
   },
 
   computed:{
@@ -96,7 +87,6 @@ export default {
   },
 
   data(){
-
     return {
       current:0,
       dotStyleDataConf(){
@@ -145,8 +135,63 @@ export default {
     }
   },
   methods:{
-    getCNDUrl(url) {
-      return getServiceUrl(url,'size8')
+    handlePosterClick(item,index){
+      if(!item.redirect_data) {
+        console.warn(`未配置链接地址: ${item.redirect_data}`);
+        console.error(`未配置链接地址: ${item.redirect_data}`);
+        return
+      }
+
+      //内部链接跳转地址
+      if (item.redirect_type === 'INN') {
+        try {
+          let url = JSON.parse(item.redirect_data);
+          let params = '';
+          if(url.page) {
+            if (item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({url: url.page + params})
+          }
+          else {
+            console.error(`应用链接配置错误: ${url.page}`)
+          }
+        } catch (e) {
+          console.error(`应用链接配置错误: ${item.redirect_data}`)
+        }
+      }
+
+      //外部链接
+      if (item.redirect_type === 'URL') {
+        let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
+        let spReg = /(-apiuri\/v)/;
+        //#ifdef MP-WEIXIN
+        try {
+          let url = JSON.parse(item.redirect_data);
+          if (reg.test(url.url) || spReg.test(url.url)) {
+            console.warn(`广告跳转外站: ${url.url}`)
+            this.$xdUniHelper.navigateTo(url);
+          } else {
+            console.error(`广告跳转外站配置错误: ${url.url}`)
+          }
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+        //#ifdef H5
+        try {
+          let url = JSON.parse(item.redirect_data);
+          console.warn(`广告跳转外站: ${url.url}`);
+          this.$xdUniHelper.redirectTo(url, false)
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+
+      }
+
+      //无跳转地址
+      if(item.redirect_type === 'EMP') {
+        console.warn(`无跳转地址`);
+      }
     },
 
     handleChange(e){