zhaoxiaohai 3 tahun lalu
induk
melakukan
d365bdff58

+ 2 - 0
README.md

@@ -20,6 +20,8 @@
 
 ​	businessPartner -- index-合作伙伴 details-合作详情 applyFor-合作申请
 
+​	annunciate -- 通告
+
 # 自定义组件:
 
 ​	My_Background -- 背景图片 //登录页面背景

+ 8 - 2
app.json

@@ -47,7 +47,9 @@
         "pages/storeMessage/editor/editor",
         "pages/webView/index",
         "pages/teamManagement/applyFor",
-        "pages/instantMessaging/index"
+        "pages/instantMessaging/index",
+        "pages/annunciate/index",
+        "pages/annunciate/newAndChange"
     ],
     "usingComponents": {
         "van-button": "@vant/weapp/button/index",
@@ -69,7 +71,11 @@
         "My_VerticalBox": "/components/My_VerticalBox/index",
         "My_NavTabs": "/components/My_NavTabs/index",
         "My_BannerSwiper": "/components/My_BannerSwiper/index",
-        "My_showModel": "/components/My_showModel/index"
+        "My_showModel": "/components/My_showModel/index",
+        "My_DisplayItem": "/components/My_DisplayItem/index",
+        "My_fixedButton": "/components/My_fixedButton/index",
+        "van-popup": "@vant/weapp/popup/index",
+        "My_MultipleChoice": "/components/My_MultipleChoice/index"
     },
     "window": {
         "backgroundTextStyle": "light",

+ 3 - 6
components/My_MultipleChoice/index.js

@@ -30,18 +30,15 @@ Component({
         attached: function () {
             // 在组件实例进入页面节点树时执行
             //选择合作方式
-            if (this.data.type == 'cooperation') {
+            if (this.data.type == 'annunciate') {
                 const res = {
                     msg: "成功",
                     data: [{
-                        ftype: "上游"
+                        ftype: "商户公告"
                     }, {
-                        ftype: "下游"
-                    }, {
-                        ftype: "双向合作"
+                        ftype: "团队公告"
                     }]
                 }
-                console.log(res)
                 return this.returnClassify(res)
             };
             //默认供需分类

+ 12 - 7
components/My_RoundedCornerButtonTabs/index.wxss

@@ -5,16 +5,21 @@
 
 .RoundedCornerButtonTabs-item {
     display: inline-block;
-    width: 120rpx;
-    height: 40rpx;
-    line-height: 40rpx;
+    width: 152rpx;
+    height: 50rpx;
+    line-height: 46rpx;
     text-align: center;
-    border-radius: 40rpx;
-    border: 2rpx solid #979797;
-    opacity: 0.6;
-    font-size: 20rpx;
+    font-size: 24rpx;
     color: rgba(0, 0, 0, .36);
+    border: 2rpx solid #979797;
+    border-radius: 25rpx;
     margin-left: 12rpx;
+    box-sizing: border-box;
+    opacity: 0.6;
+}
+
+.RoundedCornerButtonTabs-item:first-child {
+    margin-left: 6rpx !important;
 }
 
 .RoundedCornerButtonTabs>.active {

+ 35 - 13
components/My_UploadFiles/index.js

@@ -7,11 +7,16 @@ Component({
      * 组件的属性列表
      */
     properties: {
+        /* 附件类型 */
+        filesType: {
+            type: String,
+            value: "image"
+        },
         /* 图片列表 */
         fileList: {
             type: Array
         },
-        /* 上传类型 Logo-品牌logo userImage-用户头像  productImage-产品图片 SupplyAndDemand-供需 LogoCover-产品展示图*/
+        /* 上传类型 Logo-品牌logo userImage-用户头像  productImage-产品图片 SupplyAndDemand-供需 LogoCover-产品展示图  annunciate-公告类型*/
         upType: {
             type: String
         },
@@ -29,7 +34,6 @@ Component({
         Tips: {
             type: String
         },
-
         /* 显示隐藏 */
         UploadShow: {
             type: Number,
@@ -119,16 +123,18 @@ Component({
                     return callback(false)
                 }
                 /* 校验文件格式 */
-                const suffix = ['jpg', 'jpeg', 'png', 'gif', 'pdf'],
-                    index = file[i].url.lastIndexOf("."),
-                    ext = file[i].url.substr(index + 1);
-                if (!suffix.some((value) => value == ext)) {
-                    wx.showToast({
-                        title: '错误文件格式',
-                        icon: "none",
-                        duration: 3000
-                    })
-                    return callback(false)
+                if (this.data.filesType == 'image') {
+                    const suffix = ['jpg', 'jpeg', 'png', 'gif', 'pdf'],
+                        index = file[i].url.lastIndexOf("."),
+                        ext = file[i].url.substr(index + 1);
+                    if (!suffix.some((value) => value == ext)) {
+                        wx.showToast({
+                            title: '错误文件格式',
+                            icon: "none",
+                            duration: 3000
+                        })
+                        return callback(false)
+                    }
                 }
                 callback(true)
             }
@@ -285,6 +291,22 @@ Component({
                         "ftype": "brandcover"
                     }
                 }
+            } else if (this.data.upType == 'annunciate') {
+                let type = (this.data.filesType == 'file') ? "default" : "cover";
+                console.log(type)
+                //通告封面上传
+                return {
+                    "accesstoken": wx.getStorageSync('userData').token,
+                    "classname": "system.system.docManage",
+                    "method": "getFileName",
+                    "content": {
+                        "filename": timestamp,
+                        "filetype": ext,
+                        "ownertable": this.data.forTheTimeId,
+                        "ownerid": 0,
+                        "ftype": type
+                    }
+                }
             }
         },
         /* 删除文件 */
@@ -293,7 +315,7 @@ Component({
             const that = this;
             wx.showModal({
                 title: '提示',
-                content: '删除图片不可恢复,是否继续',
+                content: '删除不可恢复,是否继续',
                 success: function (res) {
                     if (res.confirm) {
                         const {

+ 1 - 1
components/My_UploadFiles/index.wxml

@@ -1,4 +1,4 @@
-<van-uploader file-list="{{ upType!='userImage'?fileList:'' }}" disabled="{{fisadministrator}}" preview-size='{{previewSize}}' max-count="{{maxCount}}" bind:after-read="afterRead" deletable="{{ true }}" use-before-read bind:before-read="beforeRead" bind:delete="imagesDelete" multiple="{{true}}">
+<van-uploader preview-full-image="{{filesType=='image'}}" accept='{{filesType}}' file-list="{{ upType!='userImage'?fileList:'' }}" disabled="{{fisadministrator}}" preview-size='{{previewSize}}' max-count="{{maxCount}}" bind:after-read="afterRead" deletable="{{ true }}" use-before-read bind:before-read="beforeRead" bind:delete="imagesDelete" multiple="{{true}}">
     <!-- 默认样式 -->
     <view wx:if="{{UploadShow===1}}" style="height: 100%; display: flex; align-items: center;">
         <view class="upImage_ltem">

+ 31 - 0
components/My_fixedButton/index.js

@@ -0,0 +1,31 @@
+// components/My_fixedButton/index.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        click: {
+            type: Function
+        },
+        titel: {
+            type: String,
+            value: "发布"
+        }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        toPage() {
+            this.triggerEvent('click')
+        }
+    }
+})

+ 4 - 0
components/My_fixedButton/index.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 7 - 0
components/My_fixedButton/index.wxml

@@ -0,0 +1,7 @@
+<view class="fixedButton" catchtap="toPage">
+    <van-button custom-class="custom-fixedButton" color="#FFB600" />
+    <view class="fixedButtonText">
+        <image src="/static/icon-01.png"></image>
+        <view>{{titel}}</view>
+    </view>
+</view>

+ 42 - 0
components/My_fixedButton/index.wxss

@@ -0,0 +1,42 @@
+/* components/My_fixedButton/index.wxss */
+/* 右侧吸附按钮 */
+.fixedButton {
+    position: fixed;
+    width: 132rpx;
+    height: 68rpx;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    box-shadow: 0px 6rpx 6rpx 0px rgba(0, 0, 0, 0.1);
+    border-radius: 34rpx 0 0 34rpx;
+    top: 65%;
+    right: 0;
+    z-index: 999;
+    overflow: hidden;
+}
+
+.custom-fixedButton {
+    position: absolute !important;
+    width: 100% !important;
+    height: 100% !important;
+    top: 0;
+}
+
+.fixedButtonText {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    z-index: 9;
+    pointer-events: none;
+}
+
+.fixedButtonText image {
+    width: 26rpx;
+    height: 26rpx;
+    margin-left: 18rpx;
+}
+
+.fixedButtonText view {
+    margin: -3.5rpx 10rpx 0;
+}

+ 126 - 0
pages/annunciate/index.js

@@ -0,0 +1,126 @@
+import {
+    ApiModel
+} from "../../utils/api";
+const _Http = new ApiModel();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        swiperBannerList: [], //轮播图
+        tabsList: ['通告列表', '历史发布'], //tab列表
+        tabsIndex: 0, //tab选中项
+        /* 圆角按钮tabs列表 */
+        roundedList: ["家纺城通告", "合作商通告", "团队通告"],
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        /* //分类
+         _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "enterprise.system.notice",
+            "method": "query_typeselectList",
+            "content": {}
+        }).then(res => {
+            console.log(res)
+        }) */
+        this.getList();
+
+        /* 获取轮播图 */
+        const bannerList = wx.getStorageSync('bannerDataList').filter(value => value.flocation == 'home_head');
+        this.setData({
+            swiperBannerList: bannerList[0].banner
+        });
+    },
+    /* 获取列表 */
+    getList() {
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.noticemag.noticemag",
+            "method": "query_noticeList",
+            "content": {
+                "getdatafromdbanyway": true,
+                "pageNumber": 1,
+                "pageSize": 20,
+                "where": {
+                    "condition": ""
+                }
+            }
+        }).then(res => {
+            console.log(res)
+        })
+    },
+    /* 发布公告 */
+    toAnnounce() {
+        wx.navigateTo({
+            url: '/pages/annunciate/newAndChange',
+        })
+    },
+    /* tab切换 */
+    setIndex({
+        detail
+    }) {
+        this.setData({
+            tabsIndex: detail
+        })
+    },
+    /* tabs回调 */
+    tabsSelectedIitem({
+        detail
+    }) {
+        console.log(detail)
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+ 5 - 0
pages/annunciate/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "My_RoundedCornerButtonTabs": "/components/My_RoundedCornerButtonTabs/index"
+  }
+}

+ 19 - 0
pages/annunciate/index.wxml

@@ -0,0 +1,19 @@
+<My_BannerSwiper swiperBannerList="{{swiperBannerList}}"></My_BannerSwiper>
+<My_NavTabs tabsList="{{tabsList}}" tabsIndex="{{tabsIndex}}" bindsetIndex="setIndex" />
+<view class="annunciatr_box">
+    <!-- 圆角按钮tabs -->
+    <My_RoundedCornerButtonTabs list="{{roundedList}}" bind:tabsSelectedIitem="tabsSelectedIitem"></My_RoundedCornerButtonTabs>
+    <!-- 列表展示区 -->
+    <view slot="display-box-showList">
+        <My_DisplayItem wx:for="{{productList}}" content="{{item}}" padTop="{{index==0?'0':'20'}}" borTop="{{index==0?'0':'2'}}" anonymity="true">
+            <!-- <view class="display-box-showList-button-box" slot="button">
+                <van-button custom-class="display-box-showList-button" catchtap="contact" color="linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%)"></van-button>
+                <view class="display-box-showList-button-text">
+                    一键联系
+                </view>
+            </view> -->
+        </My_DisplayItem>
+    </view>
+</view>
+<!-- 右侧吸附固定按钮 -->
+<My_fixedButton bindclick='toAnnounce' />

+ 11 - 0
pages/annunciate/index.wxss

@@ -0,0 +1,11 @@
+/* 通告盒子 */
+.annunciatr_box {
+    width: 710rpx;
+    min-height: 500rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    margin: 20rpx auto 0;
+    padding: 24rpx;
+    padding-top: 40rpx;
+    box-sizing: border-box;
+}

+ 211 - 0
pages/annunciate/newAndChange.js

@@ -0,0 +1,211 @@
+import {
+    ApiModel
+} from "../../utils/api";
+const _Http = new ApiModel;
+import {
+    TestVerify
+} from "../../utils/verify";
+const _Verify = new TestVerify();
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        tnoticeid: 0, //通告id
+        ftitle: "", //通告标题
+        fsummary: "", //概述
+        fcontent: "", //通告内容
+        ftype: "", //通告类型
+        popups: false,
+        errTips: {
+            ftitle: false,
+            fsummary: false,
+            fcontent: false
+        }
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+    /* 提交代码 */
+    submit() {
+        if (!this.formVerify()) return wx.showToast({
+            title: '请检查表单内容',
+            icon: "error"
+        });
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.noticemag.noticemag",
+            "method": "insertOrModify",
+            "content": {
+                "tnoticeid": this.data.tnoticeid,
+                "ftype": this.data.ftype,
+                "ftitle": this.data.ftitle,
+                "fsummary": this.data.fsummary,
+                "fcontent": this.data.fcontent,
+            }
+        }).then(res => {
+            console.log(res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            });
+            wx.showToast({
+                title: '保存成功',
+            });
+            let content = {
+                ownerid: res.data[0].tnoticeid,
+                ownertable: "tnotice",
+                tattachmentid: 0
+            };
+            this.selectComponent("#UploadFiles").saveTheChanges(content);
+            this.selectComponent("#UpFiles").saveTheChanges(content);
+            setTimeout(() => {
+                wx.navigateBack()
+            }, 500)
+        })
+    },
+    /* 表单验证 */
+    formVerify() {
+        let errTips = this.data.errTips,
+            verify = true;
+        /* 验证标题  */
+        if (!_Verify.required(this.data.ftitle)) {
+            errTips.ftitle = true;
+            verify = false;
+        }
+        /* 验证概述 */
+        if (!_Verify.required(this.data.fsummary)) {
+            errTips.fsummary = true;
+            verify = false;
+        }
+        /* 验证内容  */
+        if (!_Verify.required(this.data.fcontent)) {
+            errTips.fcontent = true;
+            verify = false;
+        }
+        this.setData({
+            errTips
+        })
+        return verify;
+    },
+    /* 获取焦点 */
+    inputFocus(e) {
+        const {
+            name
+        } = e.currentTarget.dataset;
+        let errTips = this.data.errTips;
+        errTips[name] = false;
+        this.setData({
+            errTips
+        })
+    },
+    /* 失去焦点 */
+    inputBlur(e) {
+        const {
+            name
+        } = e.currentTarget.dataset;
+        const {
+            value
+        } = e.detail;
+        if (value.trim() == "") {
+            let errTips = this.data.errTips;
+            errTips[name] = true;
+            this.setData({
+                errTips
+            })
+        }
+    },
+    /* input事件剔除特殊字符 */
+    eliminate(value) {
+        const {
+            name
+        } = value.target.dataset;
+        this.setData({
+            [name]: _Verify.Eliminate(value.detail)
+        })
+    },
+    /* 发布范围回调 */
+    radioChange({
+        detail
+    }) {
+        this.setData({
+            ftype: detail,
+            popups: false
+        })
+    },
+    /* 打开类目选择 */
+    showPop() {
+        this.setData({
+            popups: !this.data.popups
+        })
+    },
+    /* 跳转富文本 */
+    toRichText() {
+        const that = this;
+        const fcontent = encodeURIComponent(this.data.fcontent);
+        wx.navigateTo({
+            url: '/pages/storeMessage/editor/editor?fintroduction=' + fcontent,
+            events: {
+                richTextCallBack: function (richText) {
+                    let fcontent = null;
+                    (richText.richText == '<p><br></p>') ? fcontent = "": fcontent = richText.richText;
+                    that.setData({
+                        fcontent: fcontent,
+                        'errTips.fcontent': false
+                    })
+                }
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+ 3 - 0
pages/annunciate/newAndChange.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 34 - 0
pages/annunciate/newAndChange.wxml

@@ -0,0 +1,34 @@
+<My_GeneralTemplate padBot="20rpx">
+    <view class="store_message">
+        <My_GreyRectangleForm title="通告标题" required>
+            <van-field value="{{ ftitle }}" bind:input='eliminate' data-name="ftitle" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.ftitle}}" input-class="input-class" placeholder="点击填写" border="{{ false }}" />
+        </My_GreyRectangleForm>
+        <My_GreyRectangleForm title="概述" required>
+            <van-field value="{{ fsummary }}" bind:input='eliminate' data-name="fsummary" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.fsummary}}" input-class="input-class" placeholder="点击填写" border="{{ false }}" />
+        </My_GreyRectangleForm>
+        <My_GreyRectangleForm title="通告内容" required>
+            <view style="width: 400rpx; text-align: right; color:{{errTips.fcontent?'#EF2855':'#4BBECF'}} ; text-decoration: underline;" catchtap="toRichText">
+                编辑/预览
+            </view>
+        </My_GreyRectangleForm>
+        <My_GreyRectangleForm title="通告封面">
+            <My_UploadFiles id="UploadFiles" fileList="{{attinfos}}" upType="annunciate" UploadShow="2" previewSize="60px" maxCount="1" previewSize="65px" bindimageChange="imageChange"></My_UploadFiles>
+        </My_GreyRectangleForm>
+        <My_GreyRectangleForm title="上传附件">
+            <My_UploadFiles filesType='file' id="UpFiles" fileList="{{attinfos}}" upType="annunciate" UploadShow="2" previewSize="60px" maxCount="3" previewSize="65px" bindimageChange="imageChange"></My_UploadFiles>
+        </My_GreyRectangleForm>
+        <My_GreyRectangleForm title="发布范围">
+            <view class="clickPop {{ftype==''?'':'selected'}}" style="color: {{errTips.ftype?'#EF2C48':'#000'}};" bindtap="showPop">{{ftype?ftype:"点击选择"}}</view>
+        </My_GreyRectangleForm>
+    </view>
+</My_GeneralTemplate>
+
+<!-- 弹出层 -->
+<van-action-sheet show="{{ popups }}" bind:close="showPop">
+    <My_MultipleChoice type='annunciate' title="发布范围" pitchOnItem="{{ftype}}" bind:optionChange="radioChange"></My_MultipleChoice>
+</van-action-sheet>
+
+<!-- 提交按钮 -->
+<view class="submit_but">
+    <van-button bindtap="submit" custom-class="custom-class" round color="linear-gradient(180deg, #82E0E9 0%, #4BBECF 100%);">发 布</van-button>
+</view>

+ 18 - 0
pages/annunciate/newAndChange.wxss

@@ -0,0 +1,18 @@
+@import "/css/form2.wxss";
+.store_message {
+    padding: 0 30rpx;
+}
+
+.clickPop {
+    text-align: right;
+    width: 380rpx;
+    height: 40rpx;
+    font-size: 32rpx;
+    color: #000000;
+    opacity: .3;
+}
+
+/* 已选择分类和时间 */
+.selected {
+    opacity: 1;
+}

+ 0 - 1
pages/storeMessage/editor/editor.js

@@ -56,7 +56,6 @@ Page({
           }
         })
       }, duration)
-
     })
   },
   updatePosition(keyboardHeight) {

+ 8 - 3
pages/tabbar-pages/home/index.js

@@ -20,11 +20,12 @@ Page({
         }, {
             text: '私域直播',
             icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
+        }, {
+            text: '通告',
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
         }],
         /* 圆角按钮tabs列表 */
-        roundedList: [
-            "兴趣爱好", "关注板块", "最新发布"
-        ],
+        roundedList: ["兴趣爱好", "关注板块", "最新发布"],
         partnerList: [], //合作商家列表
         codeMsg: {}, //二维码信息
         MyModelShow: false, //二维码二次确认
@@ -47,6 +48,10 @@ Page({
             wx.navigateTo({
                 url: '/pages/liveStreaming/index',
             })
+        } else if (name == '通告') {
+            wx.navigateTo({
+                url: '/pages/annunciate/index',
+            })
         } else {
             wx.showToast({
                 title: '功能开发中',

+ 2 - 2
pages/tabbar-pages/home/index.wxml

@@ -4,7 +4,7 @@
 <My_BannerSwiper swiperBannerList="{{swiperBannerList}}"></My_BannerSwiper>
 <!-- 宫格区域 -->
 <view class="grid_box">
-    <van-grid border="{{false}}" column-num="2" icon-size='40' bindtap="gridJumpPage">
+    <van-grid border="{{false}}" column-num="3" icon-size='40' bindtap="gridJumpPage">
         <van-grid-item wx:for="{{gridList}}" data-name="{{item.text}}" icon="{{item.icon}}" text="{{item.text}}" text-class="grid-text-class" />
     </van-grid>
 </view>
@@ -22,7 +22,7 @@
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-03.png" mode="aspectFit"></image>
     <!-- 圆角按钮tabs -->
-    <!-- <My_RoundedCornerButtonTabs list="{{roundedList}}" bind:tabsSelectedIitem="tabsSelectedIitem"></My_RoundedCornerButtonTabs> -->
+    <My_RoundedCornerButtonTabs list="{{roundedList}}" bind:tabsSelectedIitem="tabsSelectedIitem"></My_RoundedCornerButtonTabs>
     <!-- 列表展示区 -->
     <view slot="display-box-showList">
         <My_DisplayItem wx:for="{{productList}}" content="{{item}}" padTop="{{index==0?'0':'20'}}" borTop="{{index==0?'0':'2'}}" anonymity="true">

+ 3 - 10
pages/tabbar-pages/supplyAndDemand/index.wxml

@@ -96,16 +96,9 @@
     </view>
     <view style="height: 50px;"></view>
 </van-action-sheet>
-<!-- 右侧吸附固定按钮 -->
-<view class="fixedButton" catchtap="postDemand">
-    <van-button custom-class="custom-fixedButton" color="#FFB600">
-    </van-button>
-    <view class="fixedButtonText">
-        <image src="/static/icon-01.png"></image>
-        <view>发布</view>
-    </view>
-</view>
 <!-- 触底展示 -->
 <My_pageReachBottom dummyStatus="{{productList.length>=1}}" loadMore="{{pageNumber>=pageTotal}}"></My_pageReachBottom>
 <!-- 安全距离 -->
-<view style="height: 34px;"></view>
+<view style="height: 34px;"></view>
+<!-- 右侧吸附固定按钮 -->
+<My_fixedButton bindclick='postDemand' />

+ 0 - 43
pages/tabbar-pages/supplyAndDemand/index.wxss

@@ -245,49 +245,6 @@
     color: #4DC2D4;
     padding: 0 8rpx;
 }
-
-/* 右侧吸附按钮 */
-.fixedButton {
-    position: fixed;
-    width: 132rpx;
-    height: 68rpx;
-    font-size: 32rpx;
-    color: #FFFFFF;
-    box-shadow: 0px 6rpx 6rpx 0px rgba(0, 0, 0, 0.1);
-    border-radius: 34rpx 0 0 34rpx;
-    top: 65%;
-    right: 0;
-    z-index: 999;
-    overflow: hidden;
-}
-
-.custom-fixedButton {
-    position: absolute !important;
-    width: 100% !important;
-    height: 100% !important;
-    top: 0;
-}
-
-.fixedButtonText {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    z-index: 9;
-    pointer-events: none;
-}
-
-.fixedButtonText image {
-    width: 26rpx;
-    height: 26rpx;
-    margin-left: 18rpx;
-}
-
-.fixedButtonText view {
-    margin: -3.5rpx 10rpx 0;
-}
-
 /* 我的供需 状态 */
 .myState {
     height: 40rpx;

+ 14 - 0
project.private.config.json

@@ -149,6 +149,20 @@
                     "name": "",
                     "pathName": "pages/webView/index",
                     "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "通告",
+                    "pathName": "pages/annunciate/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "发布通告",
+                    "pathName": "pages/annunciate/newAndChange",
+                    "query": "",
                     "scene": null,
                     "launchMode": "default"
                 }