门户

components/My_Checkbox/index.js

@@ -3,7 +3,7 @@ import {
 } from "../../utils/api"
 const _Http = new ApiModel();
 Component({
-    options:{
+    options: {
         addGlobalClass: true
     },
     /**
@@ -79,7 +79,6 @@ Component({
             console.log(dataList, saleprodclass)
             console.log(this.data.dataList)
             if (dataList.length == 0 || saleprodclass == 0) return;
-
         }
     },
 
@@ -111,6 +110,13 @@ Component({
             this.setData({
                 dataList
             })
+        },
+        /* 商户全选或指定范围 */
+        allOrPart(e) {
+            const {
+                value
+            } = e.detail;
+            console.log(value)
         }
     }
 })

components/My_Checkbox/index.wxml

@@ -23,7 +23,11 @@
     </view>
 </checkbox-group>
 <view class="checkbox_but">
-    <view>
+    <radio-group wx:if="{{type=='annunciate'}}" class="radio" bindchange='allOrPart'>
+        <radio color='#4EBFCF' value="全部">全部</radio>
+        <radio color='#4EBFCF' value="指定" style="margin-left: 18rpx;">指定</radio>
+    </radio-group>
+    <view class="button">
         <van-button type="info" size="large" color="#4EBFCF" custom-class="customClass" bindtap="confirm">确定</van-button>
     </view>
 </view>

components/My_Checkbox/index.wxss

@@ -40,12 +40,22 @@
 
 /* 按钮 */
 .checkbox_but {
+    position: relative;
     width: 100vw;
     margin: 30rpx 0 80rpx 0;
     box-sizing: border-box;
 }
 
-.checkbox_but>view {
+.checkbox_but .radio {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    width: 380rpx;
+    height: 64rpx;
+    left: 60rpx;
+}
+
+.checkbox_but .button {
     position: absolute;
     width: 188rpx;
     height: 64rpx;

pages/annunciate/newAndChange.js

@@ -42,11 +42,11 @@ Page({
                     "tnoticeid": options.id
                 }
             }).then(res => {
-                console.log(res)
                 if (res.msg != '成功') return wx.showToast({
                     title: res.data,
                     icon: "none"
                 });
+                console.log(res.data[0].fisspecifiedrange)
                 let data = res.data[0],
                     attinfos = res.data[0].attinfos,
                     coverFiles = [],

pages/liveStreaming/index.js

@@ -397,11 +397,10 @@ Page({
   },
   /* 查看合作商直播 */
   toLive(e) {
-    const {
-      fliveshowurl
-    } = e.currentTarget.dataset;
+    let str = e.currentTarget.dataset.fliveshowurl;
+    const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8);
     wx.navigateTo({
-      url: '/pages/webView/index?url=' + fliveshowurl,
+      url: '/pages/webView/index?url=' + url,
     })
   },
   /**
@@ -440,9 +439,11 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
+    let str = this.data.accountMsg.fliveshowurl;
+    const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8)
     return {
       title: this.data.accountMsg.channelname,
-      path: "/pages/webView/index?url=" + this.data.accountMsg.fliveshowurl,
+      path: "/pages/webView/index?url=" + url,
       imageUrl: this.data.accountMsg.channelcoverimageurl
     }
   }

pages/portal/index.js

@@ -73,11 +73,11 @@ Page({
         this.getHotAgentsList('沙发布')
         //获取轮播图
         setTimeout(() => {
-            this.getBanner(1)
+            this.getBanner()
         }, 300)
     },
     /* 获取轮播图 */
-    getBanner(count) {
+    getBanner() {
         let imgList = wx.getStorageSync('bannerDataList');
         if (imgList != "") {
             const bannerList = imgList.filter(value => value.flocation == 'portal_head');
@@ -93,9 +93,8 @@ Page({
                 portal_middle_4: portal_middle_4[0].banner,
             });
         } else {
-            if (count == 2) return;
             setTimeout(() => {
-                this.getBanner(2)
+                this.getBanner()
             }, 500)
         }
     },

pages/portal/index.wxml

@@ -181,6 +181,7 @@
     <image src="{{portal_middle_4[0].attinfos[0].fobsurl}}" mode="aspectFill"></image>
 </view>
 <view style="height: 50px;"></view>
+<!-- 吸底 -->
 <view class="footer">
     <van-button custom-class='footer-button' bindtap="toLogin">欢迎登录布万家</van-button>
 </view>