zhaoxiaohai 4 years ago
parent
commit
9286736d0a

+ 4 - 0
README.md

@@ -16,6 +16,8 @@
 
 ​	supplyAndDemand -- index-供应与需求  particulars-供需详情
 
+​	tradeShow -- 展会
+
 # 自定义组件:
 
 ​	My_Background -- 背景图片 //登录页面背景
@@ -90,6 +92,8 @@
 
 ​	verify.js 表单验证
 
+​	processingData.js 处理供需数据
+
 # UI组件库修改
 
 ​	van-cell -- wxss -- 注释了 -- padding:var(--cell-vertical-padding,10px) var(--cell-horizontal-padding,16px)

+ 2 - 1
app.json

@@ -36,7 +36,8 @@
         "pages/tabbar-pages/supplyAndDemand/index",
         "pages/tabbar-pages/message/index",
         "pages/tabbar-pages/user/index",
-        "pages/tabbar-pages/supplyAndDemand/particulars"
+        "pages/tabbar-pages/supplyAndDemand/particulars",
+        "pages/tradeShow/index"
     ],
     "usingComponents": {
         "van-button": "@vant/weapp/button/index",

+ 6 - 0
components/My_SupplyAndDemandItemBox/index.js

@@ -18,6 +18,9 @@ Component({
         imageList: {
             type: Array,
             value: []
+        },
+        stopOnShow: {
+            type: Function
         }
     },
     lifetimes: {
@@ -54,6 +57,9 @@ Component({
                 urls: urls,
                 current: index
             })
+            setTimeout(() => {
+                this.triggerEvent('stopOnShow');
+            }, 100)
         }
     }
 })

+ 1 - 1
components/My_SupplyAndDemandItemBox/index.wxml

@@ -10,7 +10,7 @@
     <view class="time-content">
         <view class="supply-and-demand-time">{{time}}</view>
         <view class="supply-and-demand-content">
-            <image wx:for="{{imageList}}" wx:if="{{index<3}}" src="{{item.fobsurl}}" mode="aspectFill" data-index="{{index}}" bindtap="previewImage"></image>
+            <image wx:for="{{imageList}}" wx:if="{{index<3}}" src="{{item.fobsurl}}" mode="aspectFill" data-index="{{index}}" catchtap="previewImage"></image>
         </view>
     </view>
     <!-- 数据,按钮 -->

+ 13 - 0
pages/announceDemand/index.js

@@ -135,6 +135,19 @@ Page({
                 tattachmentid: 0
             };
             this.selectComponent("#UploadFiles").saveTheChanges(content);
+            if (res.data[0].fstatus == '新建') {
+                _Http.basic({
+                    "accesstoken": wx.getStorageSync('userData').token,
+                    "classname": "customer.supplyanddemand.supplyanddemand",
+                    "method": "updatesupplyanddemandstatus",
+                    "content": {
+                        "tsupplyanddemandid": res.data[0].tsupplyanddemandid,
+                        "fstatus": "发布"
+                    }
+                }).then(res => {
+                    console.log(res)
+                })
+            }
             wx.showToast({
                 title: '保存成功',
             })

+ 104 - 102
pages/tabbar-pages/supplyAndDemand/index.js

@@ -2,11 +2,13 @@ import {
     ApiModel
 } from "../../../utils/api";
 const _Http = new ApiModel();
+const handleList = require("../../../utils/processingData");
 Page({
     /**
      * 页面的初始数据
      */
     data: {
+        isOnShow: true, //是否触发onshow中的刷新列表
         searchFocus: false, //我的需求搜索框焦点
         searchText: "", //我的需求搜索内容
         pageNumber: 1, //获取第几页
@@ -14,6 +16,7 @@ Page({
         active: 0, //tabs 选中下标
         ftypeList: [], //分类列表
         ftype: "", //当前查询分类
+        ifShowCommunicationOfNumber: false,
         /* 供需列表 */
         productList: [],
         //轮播图列表
@@ -30,36 +33,6 @@ Page({
             url: "/static/userImage.png",
             src: ''
         }],
-        /* 宫格列表 */
-        gridList: [{
-            id: '001',
-            text: '寻找面料',
-            icon: '/static/login/Phone.png'
-        }, {
-            id: '002',
-            text: '面料设计',
-            icon: '/static/login/identity.png'
-        }, {
-            id: '003',
-            text: '平面设计',
-            icon: '/static/login/username.png'
-        }, {
-            id: '004',
-            text: '产品策划',
-            icon: '/static/login/verificationcode.png'
-        }, {
-            id: '005',
-            text: '寻找主播',
-            icon: '/static/login/verificationcode.png'
-        }, {
-            id: '006',
-            text: '摄影摄像',
-            icon: '/static/login/identity.png'
-        }, {
-            id: '007',
-            text: '商业培训',
-            icon: '/static/login/username.png'
-        }],
     },
 
     /**
@@ -78,13 +51,19 @@ Page({
                 ftypeList: res.data
             })
         })
-
+    },
+    /* tabs切换接口 */
+    getList() {
+        if (this.data.active == 0) return this.getSupplyAndDemand();
+        if (this.data.active == 1) return this.getSupplyAndDemand(true);
+        if (this.data.active == 2) return this.myNeed();
     },
     /* 宫格区点击事件 */
     switchScreenType(even) {
         let {
             type
         } = even.currentTarget.dataset;
+        this.InitializeDataPaging();
         /* 第二次触发同一个,查询全部 */
         if (type == this.data.ftype) type = "";
         this.setData({
@@ -98,48 +77,71 @@ Page({
     onReady: function () {
 
     },
-
     /**
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
         this.getTabBar().init();
         //获取列表
-        this.getList();
+        if (this.data.isOnShow) {
+            this.getList();
+        } else {
+            this.setData({
+                isOnShow: true
+            })
+        }
     },
-    /* tabs切换接口 */
-    getList() {
-        if (this.data.active == 0) return this.getSupplyAndDemand();
-        if (this.data.active == 2) return this.myNeed();
+    /* 显示沟通数量 */
+    showCommunicationOfNumber() {
+        this.setData({
+            ifShowCommunicationOfNumber: !this.data.ifShowCommunicationOfNumber
+        })
+    },
+    /* 阻止冒泡 */
+    stop() {
+
+    },
+    /* 一键联系 */
+    contact() {
+        console.log('一键联系')
     },
     /* 供需下架 */
     soldOut(e) {
+        const that = this;
         const {
             index
-        } = e.target.dataset
-        console.log(index)
-        _Http.basic({
-            "accesstoken": wx.getStorageSync('userData').token,
-            "classname": "customer.supplyanddemand.supplyanddemand",
-            "method": "deletesupplyanddemand",
-            "content": {
-                "tsupplyanddemandid": this.data.productList[index].tsupplyanddemandid
-            }
-        }).then(res => {
-            console.log(res)
-            if (res.msg != "成功") {
-                wx.showToast({
-                    title: res.data,
-                    icon: "error"
-                })
-            } else {
-                console.log("删除产品")
+        } = e.target.dataset;
+        wx.showModal({
+            title: '提示',
+            content: '是否确定下架该需求',
+            success: function (res) {
+                if (res.confirm) {
+                    _Http.basic({
+                        "accesstoken": wx.getStorageSync('userData').token,
+                        "classname": "customer.supplyanddemand.supplyanddemand",
+                        "method": "updatesupplyanddemandstatus",
+                        "content": {
+                            "tsupplyanddemandid": that.data.productList[index].tsupplyanddemandid,
+                            "fstatus": "已解决"
+                        }
+                    }).then(res => {
+                        console.log(res)
+                        if (res.msg != "成功") return;
+                        let productList = that.data.productList;
+                        productList[index].fstatus = "已解决"
+                        that.setData({
+                            productList
+                        })
+                        wx.showToast({
+                            title: "下架成功"
+                        })
+                    })
+                }
             }
-        })
+        });
     },
     /* 获取供需列表 */
     getSupplyAndDemand(fstatus) {
-        if (this.data.pageNumber > this.data.pageTotal) return;
         let condition = "";
         let where = {
             "condition": condition, //模糊搜索
@@ -151,7 +153,7 @@ Page({
                 "condition": condition, //模糊搜索
                 "ftype": this.data.ftype, //数据类型
                 "fissupply": 0, // 0需 1供
-                "fstatus": "对接"
+                "fstatus": "正在对接"
             }
         };
         _Http.basic({
@@ -165,24 +167,8 @@ Page({
                 "where": where
             }
         }).then(res => {
-            console.log(res)
             if (res.msg != "成功") return;
-            //替换或拼接
-            if (res.pageNumber == 1) {
-                this.InitializeDataPaging()
-                //第一页直接替换list
-                this.setData({
-                    productList: res.data,
-                    pageTotal: res.pageTotal
-                });
-            } else {
-                //第二页开始拼接列表
-                let productList = this.data.productList.concat(res.data);
-                this.setData({
-                    productList
-                })
-            };
-            this.PageDemanding()
+            this.returnList(res);
         })
     },
     /* tabs */
@@ -194,10 +180,19 @@ Page({
         this.InitializeDataPaging();
         this.getList();
     },
+    /* 跳转商品详情页 */
+    jumpForDetails(e) {
+        const {
+            index
+        } = e.currentTarget.dataset,
+            id = this.data.productList[index].tsupplyanddemandid;
+        wx.navigateTo({
+            url: '/pages/tabbar-pages/supplyAndDemand/particulars?tsupplyanddemandid=' + id + '&type=' + this.data.active,
+        })
+    },
     /* 我的需求 */
     myNeed() {
         //全部加载完成退出请求
-        if (this.data.pageTotal < this.data.pageNumber) return;
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,
             "classname": "customer.supplyanddemand.supplyanddemand",
@@ -213,26 +208,33 @@ Page({
                 }
             }
         }).then(res => {
-            console.log(res);
             if (res.msg != "成功") return;
-            //替换或拼接
-            if (res.pageNumber == 1) {
-                //第一页直接替换list
-                this.setData({
-                    productList: res.data
-                })
-                this.InitializeDataPaging()
-            } else {
-                //第二页开始拼接列表
-                let productList = this.data.productList.concat(res.data);
-                this.setData({
-                    productList
-                })
-                console.log(321651)
-            }
-            this.PageDemanding()
+            this.returnList(res);
         })
     },
+    /* 返回列表 */
+    returnList(res) {
+        const data = handleList.checkdate(res.data)
+        const productList = handleList.listOrdering(data);
+        let pageNumber = this.data.pageNumber + 1;
+        //替换或拼接
+        if (res.pageNumber == 1) {
+            this.InitializeDataPaging()
+            //第一页直接替换list
+            this.setData({
+                productList,
+                pageTotal: res.pageTotal,
+                pageNumber
+            });
+        } else {
+            //第二页开始拼接列表
+            let list = this.data.productList.concat(productList);
+            this.setData({
+                productList: list,
+                pageNumber
+            })
+        };
+    },
     /* 我的需求编辑按钮跳转 */
     productEdit(e) {
         console.log(e)
@@ -275,19 +277,19 @@ Page({
             pageNumber: 1
         })
     },
-    /* 分页 */
-    PageDemanding() {
-        let pageNumber = this.data.pageNumber + 1;
-        this.setData({
-            pageNumber
-        })
-    },
-
     /**
      * 生命周期函数--监听页面隐藏
      */
     onHide: function () {
-
+        this.setData({
+            isOnShow: true
+        })
+    },
+    /* 阻止刷新列表 */
+    stopOnShow() {
+        this.setData({
+            isOnShow: false
+        })
     },
 
     /**

+ 19 - 8
pages/tabbar-pages/supplyAndDemand/index.wxml

@@ -23,15 +23,16 @@
                 </view>
             </view>
             <!-- 列表 -->
-            <My_SupplyAndDemandItemBox wx:for="{{productList}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}">
+            <My_SupplyAndDemandItemBox data-index="{{index}}" bindtap="jumpForDetails" wx:for="{{productList}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" bindstopOnShow="stopOnShow">
                 <!-- 内容信息插槽 -->
                 <view slot="dataAndBut">
                     <view class="dataAndBut">
                         <view class="dataAndBut_data">
-                            浏览次数:245次 意向沟通人数:134
+                            浏览次数:{{item.freadtimes}}次 意向沟通人数:{{item.fcommunicationtimes}}
                         </view>
                         <view class="dataAndBut_but">
-                            <van-button color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut">一键联系</van-button>
+                            <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="contact">一键联系</van-button>
+                            <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut" catchtap="stop">{{item.fstatus}}</van-button>
                         </view>
                     </view>
                 </view>
@@ -58,20 +59,20 @@
                 </view>
             </view>
             <!-- 列表 -->
-            <My_SupplyAndDemandItemBox wx:for="{{productList}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}">
+            <My_SupplyAndDemandItemBox wx:for="{{productList}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" data-index="{{index}}" bindtap="jumpForDetails">
                 <!-- 下架按钮插槽 -->
                 <view slot="soldOutBut">
-                    <van-button data-index="{{index}}" plain color="#4DC2D4" custom-class="soldOutBut" bindtap="soldOut">下架</van-button>
+                    <van-button data-index="{{index}}" plain color="#4DC2D4" custom-class="soldOutBut" catchtap="soldOut">下架</van-button>
                 </view>
                 <!-- 内容信息插槽 -->
                 <view slot="dataAndBut">
                     <view class="dataAndBut">
                         <view class="dataAndBut_data">
-                            浏览次数:245次<text>意向沟通人数</text>:134
+                            浏览次数:{{item.freadtimes}}<text catchtap="showCommunicationOfNumber">意向沟通人数</text>:{{item.fcommunicationtimes}}
                         </view>
                         <view class="dataAndBut_but">
-                            <van-button color="#4DC2D4" data-index="{{index}}" custom-class="custom-slotBut" bindtap="productEdit">编辑</van-button>
-                            <van-button color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut">{{item.fstatus}}</van-button>
+                            <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="contact">一键联系</van-button>
+                            <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut" catchtap="stop">{{item.fstatus}}</van-button>
                         </view>
                     </view>
                 </view>
@@ -79,6 +80,16 @@
         </van-tab>
     </van-tabs>
 </view>
+<!-- 我的需求弹框 -->
+<van-action-sheet show="{{ ifShowCommunicationOfNumber }}" bind:close="showCommunicationOfNumber">
+    <view class="CommunicationOfNumber">
+        <view class="CommunicationOfNumber-title">沟通列表</view>
+        <view class="CommunicationOfNumber-list">
+            <view wx:for="{{5}}">2021-02-13 16:34:45<text>用户:啊9999</text>发起联系,遗憾未达成合作</view>
+        </view>
+    </view>
+    <view style="height: 50px;"></view>
+</van-action-sheet>
 <!-- 右侧吸附按钮 -->
 <My_adsorbRight></My_adsorbRight>
 <!-- 触底展示 -->

+ 38 - 1
pages/tabbar-pages/supplyAndDemand/index.wxss

@@ -107,6 +107,7 @@
     margin-left: 8rpx;
 }
 
+/* 按钮 */
 .dataAndBut_but {
     display: flex;
     align-items: center;
@@ -118,7 +119,16 @@
     background: linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%) !important;
     box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.1) !important;
     border-radius: 10rpx !important;
-    color: 20rpx !important;
+    padding: 0 14rpx !important;
+    border: 0 !important;
+}
+
+.custom-NoSlotBut {
+    height: 44rpx !important;
+    background: linear-gradient(180deg, #D3D3D3 0%, #A7A8A8 100%) !important;
+    box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.1) !important;
+    border-radius: 10rpx !important;
+    color: #FFFFFF;
     padding: 0 14rpx !important;
     border: 0 !important;
 }
@@ -226,4 +236,31 @@
 .grid_item_title {
     font-size: 28rpx;
     color: #000000;
+}
+
+
+/* 沟通列表 */
+.CommunicationOfNumber{
+    padding-bottom: 30rpx;
+}
+
+.CommunicationOfNumber-title {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #000000;
+    margin: 40rpx 0 30rpx 54rpx;
+}
+
+.CommunicationOfNumber-list>view {
+    width: 100%;
+    padding: 0 20rpx;
+    font-size: 24rpx;
+    color: #000000;
+    margin-bottom: 20rpx;
+    box-sizing: border-box;
+}
+
+.CommunicationOfNumber-list text {
+    color: #4DC2D4;
+    padding: 0 8rpx;
 }

+ 73 - 3
pages/tabbar-pages/supplyAndDemand/particulars.js

@@ -1,20 +1,90 @@
-// pages/tabbar-pages/supplyAndDemand/particulars.js
+import {
+    ApiModel
+} from "../../../utils/api";
+const _Http = new ApiModel();
+const handleList = require("../../../utils/processingData");
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-
+        recommendationList: [], //推荐列表
+        particulars: {}, //详情
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        let method = "query_supplyanddemandMain";
+        if (options.type == 2) method = "query_mysupplyanddemandMain";
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.supplyanddemand.supplyanddemand",
+            "method": method,
+            "content": {
+                "tsupplyanddemandid": options.tsupplyanddemandid
+            }
+        }).then(res => {
+            let checkdate = res.data[0].checkdate;
+            res.data[0].checkdate = checkdate.slice(0, checkdate.lastIndexOf('.'));
+            this.setData({
+                particulars: res.data[0]
+            })
+        });
+        /* 获取推荐列表 */
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.supplyanddemand.supplyanddemand",
+            "method": "query_supplyanddemandList",
+            "content": {
+                "getdatafromdbanyway": true,
+                "pageNumber": 1,
+                "pageSize": 10,
+                "where": {}
+            }
+        }).then(res => {
+            const data = handleList.checkdate(res.data)
+            const productList = handleList.listOrdering(data);
+            this.setData({
+                recommendationList: productList
+            })
+        })
+    },
+    /* 跳转商品详情页 */
+    jumpForDetails(e) {
+        const {
+            index
+        } = e.currentTarget.dataset,
+            id = this.data.recommendationList[index].tsupplyanddemandid;
+        wx.navigateTo({
+            url: '/pages/tabbar-pages/supplyAndDemand/particulars?tsupplyanddemandid=' + id,
+        })
     },
+    /* 预览图片 */
+    previewImage(e) {
+        let imageList = this.data.particulars.attinfos,
+            urls = [];
+        for (let i = 0; i < imageList.length; i++) {
+            urls.push(imageList[i].fobsurl)
+        }
+        const {
+            index
+        } = e.currentTarget.dataset
+        wx.previewImage({
+            urls: urls,
+            current: index
+        })
+    },
+    /* 阻止冒泡 */
+    stop() {
 
+    },
+    /* 一键联系 */
+    contact() {
+        console.log('一键联系')
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

+ 18 - 10
pages/tabbar-pages/supplyAndDemand/particulars.wxml

@@ -2,32 +2,40 @@
     <!-- 供需标题和用户信息 -->
     <view class="title-and-usercenter">
         <view class="title-and-userMessage">
-            <view class="header-title">家纺城产业互联平台上线</view>
+            <view class="header-title">{{particulars.ftitle}}</view>
             <view class="header-userMessage">
-                <view class="header-userMessage-img"></view>
-                <view class="header-userMessage-textMsg">家纺城-小布 12-07 12:24</view>
+                <view class="header-userMessage-img">
+                    <image src="{{particulars.headportraiturl}}" mode="aspectFit"></image>
+                </view>
+                <view class="header-userMessage-textMsg">{{particulars.createby}} {{particulars.checkdate}}</view>
             </view>
         </view>
+        <!-- 产品详情 -->
+        <view style="margin-bottom: 15rpx;">{{particulars.fcontent}}</view>
+        <view class="detailed-description">
+            <image wx:for="{{particulars.attinfos}}" src="{{item.fobsurl}}" mode="widthFix" catchtap="previewImage"></image>
+        </view>
+        <!-- <van-button color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut">一键联系</van-button> -->
+        <van-button wx:if="{{particulars.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut">一键联系</van-button>
+        <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut details-custom-slotBut">{{particulars.fstatus}}</van-button>
     </view>
 </view>
 <!-- 更多推荐 -->
 <view class="venter-the-title">
-    <view></view><text>654654654654</text>
+    <view></view><text>其他推荐</text>
     <view></view>
 </view>
 
-
 <!-- 列表 -->
-<My_SupplyAndDemandItemBox wx:for="{{3}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}">
+<My_SupplyAndDemandItemBox wx:for="{{recommendationList}}" title="【{{item.ftitle}}】{{item.fcontent}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" data-index="{{index}}" bindtap="jumpForDetails">
     <!-- 内容信息插槽 -->
     <view slot="dataAndBut">
         <view class="dataAndBut">
             <view class="dataAndBut_data">
-                浏览次数:245次 意向沟通人数:134次
-            </view>
-            <view class="dataAndBut_but">
-                <van-button color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut">一键联系</van-button>
+                浏览次数:{{item.freadtimes}}次 意向沟通人数:{{item.fcommunicationtimes}}次
             </view>
+            <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="contact">一键联系</van-button>
+            <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut" catchtap="stop">{{item.fstatus}}</van-button>
         </view>
     </view>
 </My_SupplyAndDemandItemBox>

+ 39 - 3
pages/tabbar-pages/supplyAndDemand/particulars.wxss

@@ -33,11 +33,10 @@
     opacity: 0.5;
 }
 
-
-
 .title-and-userMessage {
     width: 100%;
     margin-left: 6rpx;
+    margin-bottom: 15rpx;
 }
 
 .header-title {
@@ -53,9 +52,15 @@
 }
 
 .header-userMessage-img {
+    display: flex;
     width: 28rpx;
     height: 28rpx;
-    background-color: aqua;
+    padding: 0;
+}
+
+.header-userMessage-img>image {
+    width: 100%;
+    height: 100%;
     border-radius: 50%;
 }
 
@@ -105,4 +110,35 @@
     color: 20rpx !important;
     padding: 0 14rpx !important;
     border: 0 !important;
+}
+
+.detailed-description>image {
+    width: 100%;
+}
+
+/* 按钮 */
+.custom-slotBut {
+    height: 44rpx !important;
+    background: linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%) !important;
+    box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.1) !important;
+    border-radius: 10rpx !important;
+    color: 20rpx !important;
+    padding: 0 14rpx !important;
+    border: 0 !important;
+}
+
+.custom-NoSlotBut {
+    height: 44rpx !important;
+    background: linear-gradient(180deg, #D3D3D3 0%, #A7A8A8 100%) !important;
+    box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.1) !important;
+    border-radius: 10rpx !important;
+    color: #FFFFFF;
+    padding: 0 14rpx !important;
+    border: 0 !important;
+}
+
+.details-custom-slotBut {
+    float: right !important;
+    margin-right: 16rpx;
+    margin-top: 15rpx;
 }

+ 66 - 0
pages/tradeShow/index.js

@@ -0,0 +1,66 @@
+// pages/tradeShow/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+ 3 - 0
pages/tradeShow/index.json

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

+ 2 - 0
pages/tradeShow/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/tradeShow/index.wxml-->
+<text>pages/tradeShow/index.wxml</text>

+ 1 - 0
pages/tradeShow/index.wxss

@@ -0,0 +1 @@
+/* pages/tradeShow/index.wxss */

+ 1 - 1
project.config.json

@@ -47,7 +47,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.19.6",
-    "appid": "wx210f6f5080f20d0c",
+    "appid": "wx5dc7fd18b6335214",
     "projectname": "%E5%B8%83%E4%B8%87%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F",
     "debugOptions": {
         "hidedInDevtools": []

+ 26 - 0
utils/processingData.js

@@ -0,0 +1,26 @@
+/* 格式化时间 */
+function checkdate(data) {
+    for (let i = 0; i < data.length; i++) {
+        let checkdate = data[i].checkdate;
+        data[i].checkdate = checkdate.slice(0, checkdate.lastIndexOf('.'));
+    }
+    return data;
+}
+
+/* 供需列表数据排序 */
+function listOrdering(data) {
+    /* 处理排序 */
+    const typeList = ['待对接', '正在对接', '已解决', '已过期'];
+    let productList = [];
+    for (let i = 0; i < typeList.length; i++) {
+        for (let k = 0; k < data.length; k++) {
+            if (typeList[i] == data[k].fstatus) productList[productList.length] = data[k];
+        }
+    };
+    return productList;
+}
+
+module.exports = {
+    checkdate,
+    listOrdering
+}