jufubao-base 1.0.258-beta2 → 1.0.258

package/package.json

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

package/src/components/JfbBasePosterType/Attr.js

@@ -307,7 +307,6 @@ export default {
         list: [
           {"label": "焦点图显示", "value": 1},
           {"label": "轮播图显示", "value": 2},
-          {"label": "滑块", "value": 3},
         ]
       },
       params['isCarousel'] === 2 && {
@@ -362,8 +361,6 @@ export default {
         valueKey: 'jdRows',
         groupKey:'content',
         value: params.jdRows,
-        defaultValue: params['isCarousel']===3?1:params.jdRows,
-        disabled: params['isCarousel']===3,
         className: 'input60',
         labelInline: true,
         list: [

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="sreen">
-    <view v-if="!config['carouselType']">
-      <view
+		<view
 			class="sreen__box notCarousel"
 			:class="{
 				cell4: config['column'] === 4,
@@ -129,30 +128,6 @@
         <!--#endif-->
 			</xd-swiper-dot>
 		</view>
-    </view>
-    <view v-else>
-      <scroll-view scroll-x="true">
-        <view class="scroll-box">
-          <view
-          v-for="item in content"
-          :key="item['content_id']"
-          @click="handleClick(item)"
-          :style="[config['iconItemStyleComp']]"
-        >
-            <view :style="[config['iconItemBoxStyleComp']]">
-              <view :style="[config['iconStyleComp']]" class="image">
-                <image :src="item.image_url"></image>
-              </view>
-            </view>
-            <view
-              class="content_name"
-              v-if="item['content_name']"
-              :style="[config['titleStyle']]"
-            >{{item['content_name']}}</view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
 	</view>
 </template>
 
@@ -232,8 +207,6 @@
 
     },
     created() {
-      console.log(this.content,'content');
-      
       this.isPreview = this.$configProject.isPreview;
       this.init();
     },
@@ -371,12 +344,6 @@
         }
       }
 		}
-    .scroll-box {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      white-space: nowrap;
-    }
 	}
 
 

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -83,7 +83,6 @@
         bgColor:'rgba(0,0,0,0)',
         bgRadius: 0,
         bgImage: "",
-        carouselType: ''
       }
     },
 		computed: {
@@ -148,8 +147,7 @@
           height: this.iconWH.height,
           width: this.iconWH.width,
           titleStyle: this.titleStyle,
-          dotStyleData: this.dotStyleData,
-          carouselType: this.carouselType
+          dotStyleData: this.dotStyleData
 				}
 			},
       iconItemStyleComp(){
@@ -244,11 +242,7 @@
 
         //content
         this.mode = getContainerPropsValue(container, 'content.dot_type', 'round');
-        this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1);
-        if(this.isCarousel===3){
-          this.carouselType='slider'
-        }
-        this.isCarousel = this.isCarousel=== 2
+        this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1) === 2;
         this.carouselTime = Number(getContainerPropsValue(container, 'content.carouselTime', 5)) * 1000;
         let useNumberDefault = 20;
         if(this.isCarousel === false) useNumberDefault = this.row * this.column;

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -137,6 +137,28 @@ export default {
           scanType: ["qrCode"],
           // 扫描成功后的回调函数
           success: (res) => {
+            console.log(res.resultStr,'res.resultStr');
+            // 判断res.resultStr是否包含'wx/cake/index/'
+            if(res.resultStr.includes('wx/cake/index/')){
+              // 将res.resultStr以'wx/cake/index/'分割，取分割后的第一个元素
+              let shop_id=res.resultStr.split('wx/cake/index/')[1]
+              // 将shop_id以'_'分割，取分割后的第一个元素
+              shop_id = shop_id.split('_')[0]
+              // 将shop_id转换为整数，并加上100000
+              shop_id = parseInt(shop_id)+100000
+              // 将shop_id转换为Base64编码的URI
+              let xParams = `shop_id:${shop_id}`
+              xParams = Base64.encodeURI(xParams)
+              // 拼接change_url和x-params参数
+              let path = `${this.change_url}?x-params=${xParams}&referrer=official`;
+              // 打印xParams和path
+              console.log(xParams,'pathpath');      
+              // 跳转到指定路径
+              this.$xdUniHelper.navigateTo({
+                url: path,
+              });
+              return
+            }
             // 定义一个变量params，将url按照"?"进行分割，获取到参数部分
             let params = res.resultStr.split("?")[1]
               ? res.resultStr.split("?")[1]
@@ -225,6 +247,27 @@ export default {
       uni.scanCode({
         scanType: ["qrCode"],
         success: (res) => {
+          // 判断res.resultStr是否包含'wx/cake/index/'
+          if(res.result.includes('wx/cake/index/')){
+            // 将res.resultStr以'wx/cake/index/'分割，取分割后的第一个元素
+            let shop_id=res.result.split('wx/cake/index/')[1]
+            // 将shop_id以'_'分割，取分割后的第一个元素
+            shop_id = shop_id.split('_')[0]
+            // 将shop_id转换为整数，并加上100000
+            shop_id = parseInt(shop_id)+100000
+            // 将shop_id转换为Base64编码的URI
+            let xParams = `shop_id:${shop_id}`
+            xParams = Base64.encodeURI(xParams)
+            // 拼接change_url和x-params参数
+            let path = `${this.change_url}?x-params=${xParams}&referrer=official`;
+            // 打印xParams和path
+            console.log(xParams,'pathpath');      
+            // 跳转到指定路径
+            this.$xdUniHelper.navigateTo({
+              url: path,
+            });
+            return
+          }
           // 定义一个变量params，将url按照"?"进行分割，获取到参数部分
           let params = res.result.split("?")[1] ? res.result.split("?")[1] : "";
           // 将参数部分按照"&"进行分割，获取到每个参数