展会报名

app.js

@@ -81,15 +81,15 @@ App({
   getUserProfile() {
     if (wx.getStorageSync('getUserInfo')) return;
     wx.getUserProfile({
-        desc: '用于完善客户信息资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-        success: (res) => {
-            wx.setStorageSync('getUserInfo', true)
-        },
-        fail: (err) => {
-            wx.setStorageSync('getUserInfo', false)
-        }
+      desc: '用于完善客户信息资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+      success: (res) => {
+        wx.setStorageSync('getUserInfo', true)
+      },
+      fail: (err) => {
+        wx.setStorageSync('getUserInfo', false)
+      }
     })
-},
+  },
   globalData: {
     myNavBorHeight: 0, //自定义头部导航高度
     safeAreaBottom: 0, //底部安全距离

components/My_BannerSwiper/index.js

@@ -44,9 +44,10 @@ Component({
                     url: bannerData.fhyperlink,
                 })
             } else if (bannerData.flinktype == 'DATA' && bannerData.fdatatable == "tactivity") {
+                let url = (wx.getStorageSync('userData').token) ? '/pages/tradeShow/index?id=' : '/pages/scanQRCodes/register?id='
                 //活动类型跳转展会
                 wx.navigateTo({
-                    url: '/pages/tradeShow/index?id=' + bannerData.fdataid,
+                    url: url + bannerData.fdataid,
                 })
             }
         }

components/My_BannerSwiper/index.wxss

@@ -16,6 +16,7 @@
 }
 
 .swiperBanner swiper-item,
+.swiperBanner swiper,
 .swiperBanner image {
     width: 702rpx;
     height: 286rpx;

pages/scanQRCodes/register.js

@@ -8,14 +8,16 @@ import {
 const _Verify = new TestVerify();
 const utilMd5 = require('../../utils/md5');
 let countDownTime1 = null;
+const QR = require('../../miniprogram_npm/qrcode-base64/index.js');
+import {
+    base64src
+} from '../../components/My_TwoDimensionalCode/base64src';
 Page({
-
     /**
      * 页面的初始数据
      */
     data: {
-        tabsList: ['身份信息'], //tabs
-        pageType: 0, //0报名 1查看二维码
+        pageType: 0, //0报名 1查看二维码 2
         rulesChecked: true, //同意用户隐私协议
         isNoToken: false, //是否存在登录
         countDownTime: 30, //倒计时
@@ -37,26 +39,47 @@ Page({
             fcompname: false, //公司
             frole: false, //职位
             findustry: false, //行业
+            faddress: false,
+            fchannel: false,
         },
         throttle: false, //截流
         msg: null,
         myShowModel: false, //角色选择
         userIndex: null, //选择账号下标
+        qrcodeURL: null,
+        butText: '下一步',
+        fquestionnaire: [],
+        surveysList: [{
+            title: '你所在的公司来自哪里（where does your compangy come from）？',
+            arr: ['中国大陆公司（Mainland China company）', '海外公司中国大陆分支机构（Overseas company mailand China branch）', '海外公司（含港、澳、台地区）Overseas companies（including Hong Kong，Macao and Taiwan）']
+        }, {
+            title: '您的工作性质（what is your function）？',
+            arr: ['管理（Management）', '采购（Purchasing）', '市场/销售（Marketing/Sales)', '生产/制造（Production/Manufacturing）', '设计师（Designer）', '研发（Research/Development）', '零售（Retailing）', '广告/推广/传媒（Advertising/Promotion）', '政府/管理人员（Government/Administration）', '原料供应商（Material Suppliers）']
+        }, {
+            title: '公司主要经营范围（what is your company’sprimary activity）？',
+            arr: ['面料（Material）', '辅料（Accessory）', '家用纺织品（Famliy textile)', '家具（Furniture）', '纤维/纱线（Fiber/Yarn）', '流行趋势（Fashion trend）', '检测（Tset）', '服务/咨询（Service/Consultant）', '媒体广告（Media advertisement）', '行业协会（Tradeassociation）']
+        }, {
+            title: '感兴趣的产品（which products are you in terested in）？',
+            arr: ['窗帘布面料（Curtain Fabric)', '沙发布面料（Sofa Fabric)', '墙布面料（Wallcloth Fabric)', '功能性纺织品（Functional Textile)', '各类辅料（Accessory）', '趋势（trend)']
+        }, {
+            title: '通过以下什么途径知道本展会（How did you learm about the exhibition）？',
+            arr: ['主办单位邀请函（Directmai/Invitation）', '报纸广告（Newspaper)', '杂志（Magazine Advertisement)', '网络（Internet)', '供应商/参展商邀请（Invitation From Supplier/Exhibitor）', '朋友/同事/同行（Friends/Colleagues Business/Associates）', '行业协会（Trade Association)']
+        }]
     },
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        /* this.setData({
+        this.setData({
             tactivityid: options.id
-        }) */
+        })
         //判断是否存在登录态
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,
             "classname": "customer.activity.activitysignup",
             "method": "getsignupmsg",
             "content": {
-                "tactivityid": 2
+                "tactivityid": options.id
             }
         }).then(res => {
             console.log("获取个人信息", res)
@@ -65,15 +88,48 @@ Page({
                     isNoToken: true
                 })
             } else {
+                this.setData({
+                    fphonenumber: wx.getStorageSync('userData').fphonenumber
+                })
                 if (res.data.length >= 1) {
                     this.setData({
                         pageType: 1,
                         msg: res.data[0]
                     })
+                    this.qrCode();
+                    this.goTop();
                 }
             }
         })
     },
+    qrCode() {
+        let codeText = this.data.msg.tactivitysignupid + '';
+        console.log(codeText)
+        var imgData = QR.drawImg(codeText, {
+            typeNumber: 4,
+            errorCorrectLevel: 'M',
+            size: 500
+        })
+        base64src(imgData, res => {
+            this.setData({
+                qrcodeURL: res
+            });
+        });
+    },
+    radioChange(e) {
+        const {
+            name,
+            index
+        } = e.currentTarget.dataset;
+        const data = {
+            "question": name,
+            "answer": e.detail
+        }
+        let fquestionnaire = this.data.fquestionnaire;
+        fquestionnaire[index] = data;
+        console.log(fquestionnaire);
+
+    },
     /* 获取验证码 */
     getVerifyCode() {
         //验证手机号码
@@ -128,56 +184,103 @@ Page({
                 }
             }
         };
+        if (this.data.fidcard.length != 18) {
+            errTips.fidcard = true;
+            result = true;
+        }
         this.setData({
             errTips
         })
         return result;
     },
     /* 提交表单 */
-    submitData() {
-        if (this.verify()) return wx.showToast({
-            title: '请完善表格必填项',
-            icon: "none"
-        });
+    submitData(e) {
         if (this.data.throttle) return;
-        if (!this.data.isNoToken) {
-            //存在登录态，直接提交
-            this.signup(wx.getStorageSync('userData').token);
-        } else {
-            //未存在登录态，先登录在提交
-            if (!this.data.password) {
+        if (!this.data.rulesChecked) return wx.showToast({
+            title: '请先勾选《用户隐私协议》',
+            icon: "none"
+        })
+        if (e.target.dataset.text == '下一步') {
+            if (this.verify()) return wx.showToast({
+                title: '请完善表格必填项',
+                icon: "none"
+            });
+            if (!this.data.isNoToken) {
+                //存在登录态，直接提交
+                // this.signup(wx.getStorageSync('userData').token);
                 this.setData({
-                    "errTips.password": true
+                    pageType: 2,
+                    butText: '立即报名'
                 })
-                return wx.showToast({
-                    title: '还未填写验证码',
-                    icon: "none"
-                });
-            };
-            _Http.login({
-                "phonenumber": this.data.fphonenumber,
-                "password": utilMd5.hexMD5(this.data.password),
-                "client": "wechat_customer"
-            }).then(res => {
-                /* 结果验证 */
-                if (res.msg != '成功') {
+                this.goTop();
+            } else {
+                //未存在登录态，先登录在提交
+                if (!this.data.password) {
                     this.setData({
                         "errTips.password": true
-                    });
+                    })
                     return wx.showToast({
-                        title: '账号或验证码错误!',
+                        title: '还未填写验证码',
                         icon: "none"
                     });
-                }
-                console.log("用户登录", res)
-                if (res.account_list.length == 1) {
-                    this.signup(res.account_list[0].token);
-                } else {
-                    this.setData({
-                        account_list: res.account_list,
-                        myShowModel: true
-                    })
-                }
+                };
+                _Http.login({
+                    "phonenumber": this.data.fphonenumber,
+                    "password": utilMd5.hexMD5(this.data.password),
+                    "client": "wechat_customer"
+                }).then(res => {
+                    /* 结果验证 */
+                    if (res.msg != '成功') {
+                        this.setData({
+                            "errTips.password": true
+                        });
+                        return wx.showToast({
+                            title: '账号或验证码错误!',
+                            icon: "none"
+                        });
+                    }
+                    console.log("用户登录", res)
+                    if (res.account_list.length == 1) {
+                        // this.signup(res.account_list[0].token);
+                        wx.setStorageSync('userData', res.account_list[0]);
+                        this.setData({
+                            pageType: 2,
+                            butText: '立即报名'
+                        })
+                        this.goTop();
+                    } else {
+                        this.setData({
+                            account_list: res.account_list,
+                            myShowModel: true
+                        })
+                    }
+                })
+            }
+        } else {
+            let c = 0;
+            for (let i = 0; i < this.data.fquestionnaire.length; i++) {
+                if (typeof (this.data.fquestionnaire[i]) == 'object') c += 1;
+            }
+            if (c != this.data.surveysList.length) {
+                wx.showToast({
+                    title: '请完善问卷调查',
+                    icon: "none"
+                })
+            } else {
+                this.signup(wx.getStorageSync('userData').token)
+            }
+        }
+    },
+    //回到顶部
+    goTop: function (e) { // 一键回到顶部
+        if (wx.pageScrollTo) {
+            wx.pageScrollTo({
+                scrollTop: 0
+            })
+        } else {
+            wx.showModal({
+                title: '提示',
+                content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
             })
         }
     },
@@ -204,7 +307,17 @@ Page({
             if (!_Verify.phoneNumber(this.data.fphonenumber, 1)) return this.setData({
                 "errTips.fphonenumber": true
             })
-        };
+        } else if (name == 'fidcard') {
+            if (this.data.fidcard.length != 18) {
+                wx.showToast({
+                    title: '身份证号码格式错误',
+                    icon: "none"
+                })
+                return this.setData({
+                    "errTips.fidcard": true
+                })
+            }
+        }
         if (value.trim() == "") {
             let errTips = this.data.errTips;
             errTips[name] = true;
@@ -215,48 +328,96 @@ Page({
     },
     /* 选择用户 */
     userSelect(e) {
-        console.log(e)
-        const {index,item} = e.currentTarget.dataset;
+        const {
+            index,
+            item
+        } = e.currentTarget.dataset;
         this.setData({
-            userIndex:index
+            userIndex: index
         })
         wx.setStorageSync('userData', item);
-        this.signup(item.token)
+        this.setData({
+            pageType: 2,
+            butText: '立即报名'
+        })
+        this.goTop();
     },
     /* 提交报名表 */
     signup(token) {
         _Http.basic({
             "accesstoken": token,
             "classname": "customer.activity.activitysignup",
-            "method": "signup",
+            "method": "getsignupmsg",
             "content": {
-                "fname": this.data.fname,
-                "fidcard": this.data.fidcard,
-                "fphonenumber": this.data.fphonenumber,
-                "fcompname": this.data.fcompname,
-                "frole": this.data.frole,
-                "findustry": this.data.findustry,
-                "faddress": this.data.faddress,
-                "fchannel": this.data.fchannel,
                 "tactivityid": this.data.tactivityid
             }
         }).then(res => {
-            console.log("提交报名", res)
             if (res.msg != '成功') return wx.showToast({
                 title: res.data,
                 icon: "none"
             })
-            this.setData({
-                throttle: true
-            });
-            wx.showToast({
-                title: '报名成功'
-            })
-            setTimeout(() => {
-                wx.navigateBack({
-                    delta: 1,
+            if (res.data.length >= 1) {
+                this.setData({
+                    pageType: 1,
+                    msg: res.data[0]
                 })
-            }, 500);
+                this.qrCode();
+                this.goTop();
+            } else {
+                _Http.basic({
+                    "accesstoken": token,
+                    "classname": "customer.activity.activitysignup",
+                    "method": "signup",
+                    "content": {
+                        "fname": this.data.fname,
+                        "fidcard": this.data.fidcard,
+                        "fphonenumber": this.data.fphonenumber,
+                        "fcompname": this.data.fcompname,
+                        "frole": this.data.frole,
+                        "findustry": this.data.findustry,
+                        "faddress": this.data.faddress,
+                        "fchannel": this.data.fchannel,
+                        "tactivityid": this.data.tactivityid,
+                        "fquestionnaire": this.data.fquestionnaire
+                    }
+                }).then(res => {
+                    console.log("提交报名", res)
+                    if (res.msg != '成功') return wx.showToast({
+                        title: res.data,
+                        icon: "none"
+                    })
+                    this.setData({
+                        throttle: true
+                    });
+                    _Http.basic({
+                        "accesstoken": token,
+                        "classname": "customer.activity.activitysignup",
+                        "method": "getsignupmsg",
+                        "content": {
+                            "tactivityid": this.data.tactivityid
+                        }
+                    }).then(res => {
+                        if (res.msg != '成功') return wx.showToast({
+                            title: res.data,
+                            icon: "none"
+                        })
+                        this.setData({
+                            pageType: 1,
+                            msg: res.data[0]
+                        })
+                        this.qrCode();
+                        this.goTop();
+                        wx.showToast({
+                            title: '报名成功'
+                        })
+                    })
+                    /* setTimeout(() => {
+                        wx.navigateBack({
+                            delta: 1,
+                        })
+                    }, 500); */
+                })
+            }
         })
     },
     /* input事件剔除特殊字符 */
@@ -303,13 +464,11 @@ Page({
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady: function () {
-    },
+    onReady: function () {},
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow: function () {
-    },
+    onShow: function () {},
     /**
      * 生命周期函数--监听页面隐藏
      */

pages/scanQRCodes/register.json

@@ -4,6 +4,8 @@
     "My_RectangularFrame": "../../components/My_RectangularFrame/index",
     "van-count-down": "@vant/weapp/count-down/index",
     "van-checkbox": "@vant/weapp/checkbox/index",
-    "My_TwoDimensionalCode": "/components/My_TwoDimensionalCode/index"
+    "My_TwoDimensionalCode": "/components/My_TwoDimensionalCode/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index"
   }
 }

pages/scanQRCodes/register.wxml

@@ -17,14 +17,14 @@
             <view class="input_text_title">身份证<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field value="{{ fidcard }}" bind:input='eliminate' type='idcard' data-name="fidcard" bind:focus='inputFocus' bind:blur='inputBlur' input-class="input-class" placeholder="请填写姓名身份证" error='{{errTips.fidcard}}' border="{{ false }}" />
+                    <van-field value="{{ fidcard }}" bind:input='eliminate' type='idcard' data-name="fidcard" bind:focus='inputFocus' bind:blur='inputBlur' input-class="input-class" placeholder="请填写身份证" error='{{errTips.fidcard}}' border="{{ false }}" />
                 </view>
             </view>
             <!-- 手机号 -->
             <view class="input_text_title">手机号<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field model:value="{{ fphonenumber }}" data-name="fphonenumber" bind:focus='inputFocus' bind:blur='inputBlur' type='number' input-class="input-class" error='{{errTips.fphonenumber}}' placeholder="请输入手机号" border="{{ false }}" />
+                    <van-field model:value="{{ fphonenumber }}" data-name="fphonenumber" bind:focus='inputFocus' bind:blur='inputBlur' type='number' input-class="input-class" error='{{errTips.fphonenumber}}' placeholder="请填写手机号" border="{{ false }}" />
                 </view>
             </view>
             <block wx:if="{{isNoToken}}">
@@ -32,7 +32,7 @@
                 <view class="input_text_title">验证码<text>*</text></view>
                 <view class="input_text_box box_mar_bot">
                     <view class="input_text_input marLeft" style="display: flex;">
-                        <van-field model:value="{{ password }}" data-name="password" type='number' input-class="input-class password-css" bind:focus='inputFocus' bind:blur='inputBlur' error='{{errTips.password}}' placeholder="请输入验证码" border="{{ false }}" />
+                        <van-field model:value="{{ password }}" data-name="password" type='number' input-class="input-class password-css" bind:focus='inputFocus' bind:blur='inputBlur' error='{{errTips.password}}' placeholder="请填写验证码" border="{{ false }}" />
                         <view class="get-password" bindtap="getVerifyCode">
                             <text></text>
                             <view>{{countDownTime=='30'?'发送验证码':countDownTime+'s'}}</view>
@@ -51,28 +51,28 @@
             <view class="input_text_title">职位<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field model:value="{{ frole }}" bind:input='eliminate' error='{{errTips.frole}}' data-name="frole" bind:focus='inputFocus' bind:blur='inputBlur' input-class="input-class" placeholder="请输入职位" border="{{ false }}" />
+                    <van-field model:value="{{ frole }}" bind:input='eliminate' error='{{errTips.frole}}' data-name="frole" bind:focus='inputFocus' bind:blur='inputBlur' input-class="input-class" placeholder="请填写职位" border="{{ false }}" />
                 </view>
             </view>
             <!-- 行业 -->
             <view class="input_text_title">行业<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field model:value="{{ findustry }}" bind:input='eliminate' error='{{errTips.findustry}}' bind:focus='inputFocus' bind:blur='inputBlur' data-name="findustry" input-class="input-class" placeholder="请输入行业" border="{{ false }}" />
+                    <van-field model:value="{{ findustry }}" bind:input='eliminate' error='{{errTips.findustry}}' bind:focus='inputFocus' bind:blur='inputBlur' data-name="findustry" input-class="input-class" placeholder="请填写行业" border="{{ false }}" />
                 </view>
             </view>
             <!-- 住址 -->
-            <view class="input_text_title">住址</view>
+            <view class="input_text_title">住址<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field value="{{ faddress }}" bind:input='eliminate' data-name="faddress" input-class="input-class" placeholder="请输入住址" border="{{ false }}" />
+                    <van-field value="{{ faddress }}" bind:input='eliminate' error='{{errTips.faddress}}' bind:focus='inputFocus' bind:blur='inputBlur' data-name="faddress" input-class="input-class" placeholder="请填写所在住址" border="{{ false }}" />
                 </view>
             </view>
             <!-- 入会渠道 -->
-            <view class="input_text_title">入会渠道</view>
+            <view class="input_text_title">入会渠道<text>*</text></view>
             <view class="input_text_box box_mar_bot">
                 <view class="input_text_input marLeft">
-                    <van-field value="{{ fchannel }}" bind:input='eliminate' data-name="fchannel" input-class="input-class" placeholder="请输入入会渠道" border="{{ false }}" />
+                    <van-field value="{{ fchannel }}" bind:input='eliminate' error='{{errTips.fchannel}}' bind:focus='inputFocus' bind:blur='inputBlur' data-name="fchannel" input-class="input-class" placeholder="请填写入会渠道" border="{{ false }}" />
                 </view>
             </view>
         </view>
@@ -81,25 +81,56 @@
             <view class="view" bindtap="viewRules">《<text>阅读用户隐私协议</text>》</view>
         </view>
     </My_RectangularFrame>
-    <!-- 提交按钮 -->
-    <view class="input_text_but">
-        <van-button custom-class='login-custom-class' data-name="{{pageType}}" bindtap="submitData" size='large' round color="linear-gradient(180deg, #83E0E9 0%, #4CBECF 100%)">
-            立即报名
-        </van-button>
-    </view>
-    <!-- 背景图片 -->
-    <My_Background></My_Background>
     <!-- 弹出层 -->
     <van-action-sheet show="{{ popups }}" bind:close="showPop">
         <My_Checkbox title="经营类目" bind:saleprodChange="saleprodChange" dataList="{{dataList}}" isRequest='{{false}}'></My_Checkbox><!-- saleprodclass="{{saleprodclass}}" -->
         <view style="height: 34rpx;"></view>
     </van-action-sheet>
 </block>
+<!-- 信息 -->
 <block wx:if="{{pageType==1}}">
-    <!-- tabs -->
-    <My_NavTabs tabsList="{{tabsList}}" leftJustifying='true' bindsetIndex="setIndex"></My_NavTabs>
-    <My_TwoDimensionalCode title="我的身份码" codeName="{{'ID：'+msg.tactivitysignupid}}" tactivitysignupid='{{msg.tactivitysignupid}}'></My_TwoDimensionalCode>
+    <view style="width: 100vw; height:100vh; background: #fff;padding-top: 70rpx;">
+        <view class="introduce">感谢您登记参观2022海宁家纺采购节专业买家日。请凭下方二维码在展馆入口处扫码进场。</view>
+        <view class="card">
+            <view class="title">{{msg.fname}}</view>
+            <view class="firm">{{msg.fcompname}}</view>
+        </view>
+        <view class="notarize">确认码</view>
+        <view class="qr-code-URL">
+            <image src="{{qrcodeURL}}" mode="aspectFit"></image>
+        </view>
+        <view class="userID">{{msg.tactivitysignupid}}</view>
+    </view>
+</block>
+<!-- 问卷调查 -->
+<block wx:if="{{pageType==2}}">
+    <view style="height: 20rpx; width: 100vw;"></view>
+    <view class="surveys-box" wx:for="{{surveysList}}" wx:key="index">
+        <view class="surveys-img">
+            <image src="/static/Surveys.png"></image>
+        </view>
+        <view class="surveys-content">
+            <van-radio-group value="{{ radio }}" data-name="{{item.title}}" data-index="{{index}}" bind:change="radioChange">
+                <view class="radio">
+                    <view class="surveys-content-title">
+                        {{index+1}}.{{item.title}}<text>（只能单选）</text>
+                    </view>
+                    <van-radio wx:for="{{item.arr}}" wx:for-item="items" wx:for-index="indexs" icon-size='22rpx' custom-class='radio-custom-class' wx:key="item.arr" checked-color='#55C3D0' name="{{items}}" label-class="radio-label-class">{{items}}</van-radio>
+                </view>
+            </van-radio-group>
+        </view>
+    </view>
+</block>
+<!-- 背景图片 -->
+<block wx:if="{{pageType!=1}}">
+    <My_Background></My_Background>
 </block>
+<!-- 提交按钮 -->
+<view class="input_text_but" wx:if="{{pageType!=1}}">
+    <van-button custom-class='login-custom-class' data-name="{{pageType}}" data-text="{{butText}}" bindtap="submitData" size='large' round color="linear-gradient(180deg, #83E0E9 0%, #4CBECF 100%)">
+        {{butText}}
+    </van-button>
+</view>
 <view class="model" wx:if="{{myShowModel}}">
     <view class="role-selector">
         <view class="title">
@@ -112,7 +143,7 @@
                 <view class="text_box">
                     <view class="user_name u-line-1">
                         {{item.fname}}
-                       <!--  <view class="u-line-1"></view>
+                        <!--  <view class="u-line-1"></view>
                         <view class="u-line-1">{{item.fname}}</view> -->
                     </view>
                     <view class="user_identity u-line-1">

pages/scanQRCodes/register.wxss

@@ -95,6 +95,7 @@
     left: 0;
     z-index: 9999;
 }
+
 .role-selector {
     position: absolute;
     width: 590rpx;
@@ -105,6 +106,7 @@
     top: 50%;
     transform: translate(-50%, -50%);
 }
+
 .role-selector .title {
     width: 100%;
     height: 50rpx;
@@ -116,11 +118,13 @@
     text-align: center;
     margin-top: 40rpx;
 }
+
 .role-selector .scroll-view {
     width: 510rpx;
     height: 410rpx;
     margin: 30rpx auto 0;
 }
+
 .user_text_box {
     display: flex;
     align-items: center;
@@ -130,11 +134,13 @@
     border-radius: 70rpx;
     margin-bottom: 40rpx;
 }
+
 .user_text_box .input_text_img {
     width: 76rpx;
     height: 76rpx;
     margin-left: 24rpx;
 }
+
 .text_box {
     display: flex;
     justify-content: space-between;
@@ -143,6 +149,7 @@
     height: 64rpx;
     margin-left: 10rpx;
 }
+
 .user_identity {
     text-align: right;
     flex-shrink: 0;
@@ -152,16 +159,156 @@
     color: #000000;
     opacity: .7;
 }
+
 .user_name {
     width: 230rpx;
     font-size: 28rpx;
     font-family: PingFangSC-Regular, PingFang SC;
     color: #333333;
 }
+
 .pitch-on {
     background-color: #7AC9D4;
 }
+
 .pitch-on .user_name,
 .pitch-on .user_identity {
     color: #FFFFFF;
+}
+
+/* 介绍 */
+.introduce {
+    width: 664rpx;
+    height: 150rpx;
+    font-size: 36rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    line-height: 50rpx;
+    margin: 0 auto;
+}
+
+.card {
+    width: 670rpx;
+    height: 184rpx;
+    background: #7AC9D4;
+    border-radius: 20rpx;
+    margin: 90rpx auto 0;
+    text-align: center;
+    padding-top: 36rpx;
+    box-sizing: border-box;
+}
+
+.card .title {
+    height: 58rpx;
+    font-size: 42rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 550;
+    color: #FFFFFF;
+    line-height: 58rpx;
+    margin-bottom: 20rpx;
+}
+
+.card .firm {
+    height: 40rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(255, 255, 255, .8);
+    line-height: 40rpx;
+}
+
+.notarize {
+    width: 100vw;
+    text-align: center;
+    height: 50rpx;
+    font-size: 36rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 550;
+    color: #000000;
+    line-height: 50rpx;
+    margin-top: 50rpx;
+}
+
+.userID {
+    width: 100vw;
+    text-align: center;
+    height: 44rpx;
+    font-size: 32rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #000000;
+    line-height: 44rpx;
+}
+
+.qr-code-URL {
+    width: 254rpx;
+    height: 254rpx;
+    margin: 30rpx auto;
+}
+
+.qr-code-URL image {
+    width: 100%;
+    height: 100%;
+}
+
+/* 问卷调查 */
+.surveys-box {
+    width: 670rpx;
+    margin: 40rpx auto 0;
+}
+
+.surveys-img,
+.surveys-img image {
+    width: 100%;
+    height: 52rpx;
+}
+
+.surveys-content {
+    width: 100%;
+    background-color: #FFFFFF;
+    border-radius: 0px 0px 20rpx 20rpx;
+    padding: 22rpx 0 40rpx 0;
+}
+
+.radio{
+    display: block;
+    width: 610rpx !important;
+    margin-left: 40rpx !important;
+    word-break: break-all;
+}
+
+.radio-label-class{
+    font-size: 24rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    line-height: 34rpx;
+    opacity: .4;
+    word-break: break-all;
+}
+
+.radio-custom-class{
+    margin-top: 20rpx;
+}
+
+.active-radio-label-class{
+    color: #55C3D0 !important;
+}
+
+.surveys-content-title {
+    font-size: 28rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    line-height: 40rpx;
+}
+
+.surveys-content-title text {
+    height: 34rpx;
+    font-size: 24rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #333333;
+    line-height: 34rpx;
+    opacity: .4;
 }

pages/tabbar-pages/home/index.wxss

@@ -7,10 +7,10 @@
 }
 
 .grid-text-class {
-    height: 40rpx;
-    font-size: 28rpx;
-    color: #333333;
-    line-height: 40rpx;
+    height: 40rpx !important;
+    font-size: 24rpx !important;
+    color: #333333 !important;
+    line-height: 40rpx !important;
     padding-top: 12rpx !important;
 }
 

pages/tabbar-pages/supplyAndDemand/index.wxml

@@ -3,102 +3,106 @@
 <!-- 轮播图 -->
 <My_BannerSwiper swiperBannerList="{{swiperBannerList}}"></My_BannerSwiper>
 <!-- tabs切换栏 -->
-<view class="tabs_box">
-    <van-tabs active="{{ active }}" bind:change="tabsChange" custom-class="tabs-custom-class" tab-active-class="tabs-active-class" ellipsis="{{false}}" line-width="30px" color="#4DC2D4" title-active-color="#4DC2D4" swipeable>
-        <view style="height: 10rpx;"></view>
-        <van-tab title="所有信息">
-            <!-- 搜索 -->
-            <view class="my-need-search">
-                <input class="my-need-search-input {{searchFocus?'my-need-search-inputfocus':''}}" confirm-type="search" placeholder="搜索关键字" type="text" bindfocus="needSearchFocus" bindblur="needSearchBlur" bindconfirm='needSearchBlur' />
-                <view class="my-need-search-but">
-                    <van-icon name="search" />
-                </view>
-            </view>
-            <!-- 宫格 -->
-            <view class="grid_box">
-                <view class="grid_item" wx:for="{{ftypeList}}" wx:key="index" data-type="{{item.ftype}}" bindtap="switchScreenType">
-                    <view class="grid_item_image" wx:if="{{ftype==item.ftype}}">
-                        <image src="{{item.attinfos[1].fobsurl}}"></image>
-                    </view>
-                    <view wx:else class="grid_item_image">
-                        <image src="{{item.attinfos[0].fobsurl}}"></image>
+<view style="min-height: 70vh;">
+    <view class="tabs_box">
+        <van-tabs active="{{ active }}" bind:change="tabsChange" custom-class="tabs-custom-class" tab-active-class="tabs-active-class" ellipsis="{{false}}" line-width="30px" color="#4DC2D4" title-active-color="#4DC2D4" swipeable>
+            <view style="height: 10rpx;"></view>
+            <van-tab title="所有信息">
+                <!-- 搜索 -->
+                <view class="my-need-search">
+                    <input class="my-need-search-input {{searchFocus?'my-need-search-inputfocus':''}}" confirm-type="search" placeholder="搜索关键字" type="text" bindfocus="needSearchFocus" bindblur="needSearchBlur" bindconfirm='needSearchBlur' />
+                    <view class="my-need-search-but">
+                        <van-icon name="search" />
                     </view>
-                    <view class="grid_item_title u-line-1">{{item.ftype}}</view>
                 </view>
-            </view>
-            <!-- 列表 -->
-            <My_SupplyAndDemandItemBox data-index="{{index}}" bindtap="jumpForDetails" wx:for="{{productList}}" wx:key="index" title="[{{item.ftype}}]{{item.ftitle}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" type='{{item.ftype}}' content="{{item.fcontent}}" bindstopOnShow="stopOnShow">
-                <!-- 内容信息插槽 -->
-                <view slot="dataAndBut">
-                    <view class="dataAndBut">
-                        <view class="dataAndBut_data">
-                            浏览次数:{{item.freadtimes}}次 沟通人数:{{item.fcommunicationtimes}}次
+                <!-- 宫格 -->
+                <view class="grid_box">
+                    <view class="grid_item" wx:for="{{ftypeList}}" wx:key="index" data-type="{{item.ftype}}" bindtap="switchScreenType">
+                        <view class="grid_item_image" wx:if="{{ftype==item.ftype}}">
+                            <image src="{{item.attinfos[1].fobsurl}}"></image>
+                        </view>
+                        <view wx:else class="grid_item_image">
+                            <image src="{{item.attinfos[0].fobsurl}}"></image>
                         </view>
-                        <!-- <view class="dataAndBut_but">
+                        <view class="grid_item_title u-line-1">{{item.ftype}}</view>
+                    </view>
+                </view>
+                <!-- 列表 -->
+                <My_SupplyAndDemandItemBox data-index="{{index}}" bindtap="jumpForDetails" wx:for="{{productList}}" wx:key="index" title="[{{item.ftype}}]{{item.ftitle}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" type='{{item.ftype}}' content="{{item.fcontent}}" bindstopOnShow="stopOnShow">
+                    <!-- 内容信息插槽 -->
+                    <view slot="dataAndBut">
+                        <view class="dataAndBut">
+                            <view class="dataAndBut_data">
+                                浏览次数:{{item.freadtimes}}次 沟通人数:{{item.fcommunicationtimes}}次
+                            </view>
+                            <!-- <view class="dataAndBut_but">
                             <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" data-item="{{item}}" catchtap="toLinkUp">一键联系</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>
-                </view>
-            </My_SupplyAndDemandItemBox>
-        </van-tab>
-        <van-tab title="正在对接">
-            <view class="abutting-joint-box" wx:for="{{productList}}" wx:key="index">
-                <view class="abutting-joint-titleAndMsg">
-                    <view class="abutting-joint-title u-line-1">[{{item.ftype}}]{{item.ftitle}}</view>
-                    <view class="abutting-joint-msg u-line-1"><text wx:if="{{item.imdialogs[0].funreadmsgcount!=0}}" style="color: #FF0000; opacity: .5;">[{{item.imdialogs[0].funreadmsgcount}}条]</text>
-                        <view style="display: inline-block;" wx:if="{{item.imdialogs[0].latestnews.length!=0}}">{{item.imdialogs[0].latestnews[0].fname}}：<text wx:if="{{item.imdialogs[0].latestnews[0].fmessagetype=='text'}}">{{item.imdialogs[0].latestnews[0].message.data.fcontent}}</text>
-                            <text wx:else>[图片]</text>
+                </My_SupplyAndDemandItemBox>
+            </van-tab>
+            <van-tab title="正在对接">
+                <view class="abutting-joint-box" wx:for="{{productList}}" wx:key="index">
+                    <view class="abutting-joint-titleAndMsg">
+                        <view class="abutting-joint-title u-line-1">[{{item.ftype}}]{{item.ftitle}}</view>
+                        <view class="abutting-joint-msg u-line-1"><text wx:if="{{item.imdialogs[0].funreadmsgcount!=0}}" style="color: #FF0000; opacity: .5;">[{{item.imdialogs[0].funreadmsgcount}}条]</text>
+                            <view style="display: inline-block;" wx:if="{{item.imdialogs[0].latestnews.length!=0}}">{{item.imdialogs[0].latestnews[0].fname}}：<text wx:if="{{item.imdialogs[0].latestnews[0].fmessagetype=='text'}}">{{item.imdialogs[0].latestnews[0].message.data.fcontent}}</text>
+                                <text wx:else>[图片]</text>
+                            </view>
                         </view>
                     </view>
-                </view>
-                <view class="abutting-joint-timeAndBut">
-                    <view class="abutting-joint-time">{{item.checkdate}}</view>
-                    <van-button custom-class="abutting-joint-but" data-fdatastatus="2" data-timdialogid="{{item.imdialogs[0].timdialogid}}" catchtap="toLinkUpPage"><text class="abutting-joint-but-text">继续沟通</text></van-button>
-                </view>
-            </view>
-            <view style="width: 100vw; height: 30rpx;"></view>
-        </van-tab>
-        <van-tab title="我的需求">
-            <!-- 搜索 -->
-            <view class="my-need-search">
-                <input class="my-need-search-input {{searchFocus?'my-need-search-inputfocus':''}}" confirm-type="search" placeholder="搜索关键字" type="text" bindfocus="needSearchFocus" bindblur="needSearchBlur" bindconfirm='needSearchBlur' />
-                <view class="my-need-search-but">
-                    <van-icon name="search" />
-                </view>
-            </view>
-            <!-- 列表 -->
-            <My_SupplyAndDemandItemBox wx:for="{{productList}}" wx:key="index" title="【{{item.ftype}}】{{item.ftitle}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" data-index="{{index}}" bindtap="jumpForDetails" type='{{item.ftype}}' content="{{item.fcontent}}" bindstopOnShow="stopOnShow">
-                <!-- 我的需求左上状态插槽 -->
-                <view slot="myState" class="myState">
-                    <view class="myShowState {{item.fstatus=='正在对接'?'myNoSoldOut':''}}{{item.fstatus=='对接中'?'myNoSoldOut':''}} {{item.fstatus=='待对接'?'myNoSoldOut':''}}">
-                        <view wx:if="{{item.fstatus=='已解决'}}">已下架</view>
-                        <view wx:elif="{{item.fstatus=='新建'}}">未上架</view>
-                        <view wx:elif="{{item.fstatus=='待对接'}}">上架中</view>
-                        <view wx:elif="{{item.fstatus=='对接中'}}">对接中</view>
-                        <view wx:elif="{{item.fstatus=='正在对接'}}">对接中</view>
-                        <view wx:else>已下架</view>
+                    <view class="abutting-joint-timeAndBut">
+                        <view class="abutting-joint-time">{{item.checkdate}}</view>
+                        <van-button custom-class="abutting-joint-but" data-fdatastatus="2" data-timdialogid="{{item.imdialogs[0].timdialogid}}" catchtap="toLinkUpPage"><text class="abutting-joint-but-text">继续沟通</text></van-button>
                     </view>
                 </view>
-                <!-- 下架按钮插槽 -->
-                <view slot="soldOutBut">
-                    <van-button data-index="{{index}}" plain color="#4DC2D4" custom-class="soldOutBut" catchtap="soldOut">下架</van-button>
+                <view style="width: 100vw; height: 30rpx;"></view>
+            </van-tab>
+            <van-tab title="我的需求">
+                <!-- 搜索 -->
+                <view class="my-need-search">
+                    <input class="my-need-search-input {{searchFocus?'my-need-search-inputfocus':''}}" confirm-type="search" placeholder="搜索关键字" type="text" bindfocus="needSearchFocus" bindblur="needSearchBlur" bindconfirm='needSearchBlur' />
+                    <view class="my-need-search-but">
+                        <van-icon name="search" />
+                    </view>
                 </view>
-                <!-- 内容信息插槽 -->
-                <view slot="dataAndBut">
-                    <view class="dataAndBut">
-                        <view class="dataAndBut_data">
-                            浏览次数:{{item.freadtimes}} 沟通人数:{{item.fcommunicationtimes}}次
+                <!-- 列表 -->
+                <My_SupplyAndDemandItemBox wx:for="{{productList}}" wx:key="index" title="【{{item.ftype}}】{{item.ftitle}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" data-index="{{index}}" bindtap="jumpForDetails" type='{{item.ftype}}' content="{{item.fcontent}}" bindstopOnShow="stopOnShow">
+                    <!-- 我的需求左上状态插槽 -->
+                    <view slot="myState" class="myState">
+                        <view class="myShowState {{item.fstatus=='正在对接'?'myNoSoldOut':''}}{{item.fstatus=='对接中'?'myNoSoldOut':''}} {{item.fstatus=='待对接'?'myNoSoldOut':''}}">
+                            <view wx:if="{{item.fstatus=='已解决'}}">已下架</view>
+                            <view wx:elif="{{item.fstatus=='新建'}}">未上架</view>
+                            <view wx:elif="{{item.fstatus=='待对接'}}">上架中</view>
+                            <view wx:elif="{{item.fstatus=='对接中'}}">对接中</view>
+                            <view wx:elif="{{item.fstatus=='正在对接'}}">对接中</view>
+                            <view wx:else>已下架</view>
                         </view>
-                        <view class="dataAndBut_but">
-                            <van-button color="#4DC2D4" data-item="{{item}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="showCommunicationOfNumber">沟通详情</van-button>
-                            <van-button color="#4DC2D4" data-index="{{index}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="productEdit">编辑</van-button>
+                    </view>
+                    <!-- 下架按钮插槽 -->
+                    <view slot="soldOutBut">
+                        <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">
+                                浏览次数:{{item.freadtimes}} 沟通人数:{{item.fcommunicationtimes}}次
+                            </view>
+                            <view class="dataAndBut_but">
+                                <van-button color="#4DC2D4" data-item="{{item}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="showCommunicationOfNumber">沟通详情</van-button>
+                                <van-button color="#4DC2D4" data-index="{{index}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="productEdit">编辑</van-button>
+                            </view>
                         </view>
                     </view>
-                </view>
-            </My_SupplyAndDemandItemBox>
-        </van-tab>
-    </van-tabs>
+                </My_SupplyAndDemandItemBox>
+            </van-tab>
+        </van-tabs>
+    </view>
+    <!-- 触底展示 -->
+<My_pageReachBottom dummyStatus="{{productList.length>=1}}" loadMore="{{pageNumber>=pageTotal}}"></My_pageReachBottom>
 </view>
 <!-- 我的需求弹框 -->
 <van-action-sheet show="{{ ifShowCommunicationOfNumber }}" bind:close="endShowCommunicationOfNumber">
@@ -110,8 +114,7 @@
     </view>
     <view style="height: 50px;"></view>
 </van-action-sheet>
-<!-- 触底展示 -->
-<My_pageReachBottom dummyStatus="{{productList.length>=1}}" loadMore="{{pageNumber>=pageTotal}}"></My_pageReachBottom>
+
 <!-- 安全距离 -->
 <view style="height: 34px;"></view>
 <!-- 右侧吸附固定按钮 -->

pages/tradeShow/index.js

@@ -129,6 +129,7 @@ Page({
                     liveClassifyList: ClassifyList,
                     fagentcount: res.data.fagentcount,
                     flivecount: res.data.flivecount,
+                    fcustcount: res.data.fcustcount,
                     ftotalcustcount: res.data.ftotalcustcount,
                     pageNumber: res.data.pageNumber + 1,
                     pageTotal: res.data.pageTotal

pages/tradeShow/index.wxml

@@ -13,7 +13,7 @@
     </view>
     <view>
         <view class="data-display-title">正在观看</view>
-        <view class="data-display-num">{{ftotalcustcount}}</view>
+        <view class="data-display-num">{{fcustcount}}</view>
     </view>
 </view>
 <!-- wx:if="{{liveList.length>=1}}" -->
@@ -40,9 +40,15 @@
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-06.png" mode="aspectFit"></image>
     <!-- 主要展示 -->
-    <scroll-view scroll-y class="live-scroll-view" bindscrolltolower='scrolltolower'>
+    <scroll-view wx:if="{{liveList.length}}" scroll-y class="live-scroll-view" bindscrolltolower='scrolltolower'>
         <liveList list="{{liveList}}" isShow='{{true}}' />
     </scroll-view>
+    <van-empty wx:else class="custom-image" image="/static/zhanhui.png" description="暂未开放,敬请期待!" />
+    <!-- <view wx:else style="width: 100%; display: flex; justify-content: center; flex-direction: column; align-items: center;">
+        <image style="height: 454rpx; width:480rpx;" src="/static/zhanh.png"></image>
+        <view style="padding:15rpx 0 ; opacity: 0.6;">暂未开发,敬请期待!</view>
+        <view style="width: 10px; height: 30rpx;"></view>
+    </view> -->
     <!-- <swiper class="exhibition-swiper" style="height: {{showLiveList[0].length>2?'700':'355'}}rpx;" indicator-dots indicator-active-color="#4DC2D4" indicator-color="#D8D8D8">
         <swiper-item wx:for="{{showLiveList}}" class="exhibition-swiper-item">
             <view wx:for="{{item}}" class="exhibition" style="float: right;">

pages/tradeShow/index.wxss

@@ -218,4 +218,8 @@
 .live-scroll-view {
     width: 100%;
     height: 50vh;
+}
+
+.custom-image{
+    padding-bottom: 0px !important;
 }

project.private.config.json

@@ -33,6 +33,15 @@
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "condition": {
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
         "miniprogram": {
             "list": [
                 {
@@ -291,8 +300,8 @@
                     "name": "扫码注册登记",
                     "pathName": "pages/scanQRCodes/register",
                     "query": "",
-                    "scene": null,
-                    "launchMode": "default"
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }