update fyx 05.12.00:50

更新了aboutUs和opinion页面

miniprogram/app.json

@@ -1,8 +1,10 @@
 {
   "pages": [
+    "pages/user/user",
+    "pages/opinion/opinion",
+    "pages/aboutUs/aboutUs",
     "pages/myQuestion/myQuestion",
     "pages/main/main",
-    "pages/user/user",
     "pages/message/message",
     "pages/search/search",
     "pages/setting/setting",
@@ -14,8 +16,6 @@
     "pages/activityPublish/activityPublish",
     "pages/receivedQuestion/receivedQuestion",
     "pages/publisherInfoChange/publisherInfoChange",
-    "pages/aboutUs/aboutUs",
-    "pages/opinion/opinion",
     "pages/myPublish/myPublish",
     "pages/administratorSetting/administratorSetting",
     "pages/myColor/myColor",

miniprogram/pages/aboutUs/aboutUs.js

@@ -1,66 +1,175 @@
-// pages/aboutUs/aboutUs.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    currentTab: 0,
+    winWidth: 0,
+    winHeight: 0,
+    inviteCode: "",
+    publisherName: "",
+    publisherContact: "",
+    publisherIntro: "",
+    publisherType: "",
+    publisherAvatar: [],
+    types: ["校级", "园级", "院级"],
+    stars: ["一星级", "二星级", "三星级", "四星级", "五星级"],
   },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
+  stopTouchMove: function () {
+    return false;
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+  updateRadio: function (e) {
+    this.setData({
+      publisherType: e.detail.value
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
+  updatePublishAvatar: function (e) {
+    this.setData({
+      publisherAvatar: e.detail.images
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  switch1: function (e) {
+    this.setData({
+      currentTab: 1
+    })
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+  switch2: function (e) {
+    this.setData({
+      currentTab: 2
+    })
+  },
 
+  switch3: function (e) {
+    this.setData({
+      currentTab: 3
+    })
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+  switch4: function (e) {
+    this.setData({
+      currentTab: 4
+    })
+  },
 
+  switch4_1: function (e) {
+    this.setData({
+      currentTab: 41
+    })
   },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+  switchend: function (e) {
+    if (this.data.inviteCode == "" || this.data.publisherName == "" || this.data.publisherContact == "" ||
+      this.data.publisherIntro == "" || this.data.publisherType == "" || this.data.publisherAvatar.length == 0) {
+      wx.showToast({
+        title: "请确认信息填写完整",
+        icon: "none"
+      })
+      return
+    }
+    const db = wx.cloud.database()
+    const _ = db.command
+    db.collection("inviteCodeData").where({
+      code: this.data.inviteCode,
+      used: false
+    }).get({
+      success: function (code) {
+        if (code.data.length == 0) {
+          wx.showToast({
+            title: "邀请码不存在",
+            icon: "none"
+          })
+          return
+        }
+        db.collection("publisherInfoData").where({
+          publisherName: this.data.publisherName
+        }).get({
+          success: function (res) {
+            if (res.data.length != 0) {
+              wx.showToast({
+                title: "名称已使用",
+                icon: "none"
+              })
+              return
+            }
+            wx.showLoading({
+              title: "入驻中"
+            })
+            wx.cloud.uploadFile({
+              cloudPath: "publisherAvater/" + this.data.publisherName + '.jpg',
+              filePath: this.data.publisherAvatar[0],
+              success: function (res) {
+                db.collection("publisherInfoData").add({
+                  data: {
+                    publisherAttribute: [this.data.currentTab == 2 ? "组织" : "社团"],
+                    publisherAvatar: res.fileID,
+                    publisherContact: this.data.publisherContact,
+                    publisherIntro: this.data.publisherIntro,
+                    publisherName: this.data.publisherName,
+                    publisherType: this.data.publisherType
+                  },
+                  success: function (res) {
+                    db.collection("inviteCodeData").doc(code.data[0]._id).update({
+                      data: {
+                        used: true,
+                        publisherId: res._id
+                      },
+                      success: function () {
+                        db.collection("userInfoData").get({
+                          success: function (user) {
+                            db.collection("userInfoData").doc(user.data[0]._id).update({
+                              data: {
+                                publisherId: _.push(res._id)
+                              },
+                              success: function () {
+                                this.setData({
+                                  currentTab: end
+                                })
+                                wx.hideLoading()
+                              }.bind(this)
+                            })
+                          }.bind(this)
+                        })
+                      }.bind(this)
+                    })
+                  }.bind(this)
+                })
+              }.bind(this)
+            })
+          }.bind(this)
+        })
+      }.bind(this)
+    })
+  },
 
+  returnToUser: function (e) {
+    wx.navigateBack()
   },
 
   /**
-   * 用户点击右上角分享
+   * 生命周期函数--监听页面加载
    */
-  onShareAppMessage: function () {
+  onLoad: function (e) {
+    wx.getSystemInfo({
+      success: function (res) {
+        this.setData({
+          winWidth: res.windowWidth
+        })
+        this.setData({
+          winHeight: res.windowHeight
+        })
+      }.bind(this),
+    })
+  },
 
+  updatePage: function (e) {
+    this.setData({
+      currentTab: e.detail.current
+    })
   }
 })

miniprogram/pages/aboutUs/aboutUs.wxml

@@ -1,2 +1,11 @@
 <!--为我的-关于我们页面-->
-<text>pages/aboutUs/aboutUs.wxml</text>
+<view class="con">
+  <view class="title2 primary-text-color">Tin Link</view>
+</view>
+
+<view><button class="button primary-background-color white-text-color" bindtap="switch1">汇听建立初衷</button></view>
+<view><button class="button primary-background-color white-text-color" bindtap="switch2">汇听游玩指南</button></view>
+<view><button class="button primary-background-color white-text-color" bindtap="switch3">汇听更新目录</button></view>
+<view><button class="button primary-background-color white-text-color" bindtap="switch4">联系我们</button></view>
+<view><button class="button primary-background-color white-text-color" bindtap="switch5">商务合作</button></view>
+<view><button class="button primary-background-color white-text-color" bindtap="switch6">隐私保护指引</button></view>

miniprogram/pages/aboutUs/aboutUs.wxss

@@ -1 +1,115 @@
-/* pages/aboutUs/aboutUs.wxss */
+.title {
+  font-size: 40rpx;
+  padding: 15px 20px;
+  height: 30px;
+  font-weight: 800;
+}
+
+.subTitle {
+  font-size: 35rpx;
+  margin: 20rpx 40rpx;
+  font-weight: 900;
+}
+
+.thirdTitle {
+  font-size: 35rpx;
+  margin: 20rpx 40rpx;
+  font-weight: 600;
+}
+
+.radio {
+  transform: scale(0.8);
+  margin-left: 10rpx;
+}
+
+.radio-group {
+  width: 450rpx;
+}
+
+.text {
+  font-size: 30rpx;
+  margin: 10rpx 40rpx;
+}
+
+.button {
+  margin-top: 40rpx;
+  margin-bottom: 40rpx;
+  font-size: 35rpx;
+  margin: 20rpx 40rpx;
+  font-weight: 900;
+  border-radius: 98rpx;
+}
+
+.title2 {
+  align-self: center;
+  font-size: 45rpx;
+  font-weight: 900;
+  margin-top: 100rpx;
+  margin-bottom: 100rpx;
+}
+
+.page2 {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+
+.block {
+  display: flex;
+  flex-direction: row;
+  margin: 20rpx 40rpx;
+  font-size: 35rpx;
+  align-items: center;
+}
+
+.block2 {
+  display: flex;
+  flex-direction: row;
+  margin: 20rpx 40rpx;
+  font-size: 35rpx;
+}
+
+.block22 {
+  display: flex;
+  flex-direction: row;
+}
+
+.input {
+  border-radius: 10rpx;
+  width: 450rpx;
+  padding: 0 20rpx;
+}
+
+.textarea {
+  border-radius: 10rpx;
+  width: 450rpx;
+  height: 200rpx;
+  padding: 0 20rpx;
+}
+
+.cate {
+  width: 140rpx;
+  text-align: right;
+}
+
+.con {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.con1 {
+  margin: 40rpx;
+  font-size: 50rpx;
+  font-weight: 900;
+}
+
+.con2 {
+  font-size: 35rpx;
+  margin: 50rpx;
+}
+
+.pic {
+  width: 200rpx;
+  height: 200rpx;
+}

miniprogram/pages/myQuestion/myQuestion.wxml

@@ -6,9 +6,11 @@
     <view class="title primary-text-color">{{item.title}}</view>
     <view class="question primary-text-color">提出的问题：{{item.question}}</view>
     <view class="question primary-text-color">收到的回复：{{item.answer}}</view>
-    <textarea class="answer primary-background-color" value="{{item.answer}}" placeholder="回复" data-index="{{index}}" bindinput="updateText"></textarea>
-    <view class="save-btn primary-background-color white-text-color" data-id="{{item._id}}" data-answer="{{item.answer}}" bindtap="saveQuestion">保存</view>
-    <icon style="position: absolute; top: 0; right: 0;" type="cancel" size="20" data-id="{{item._id}}" catchtap="removeQuestion"></icon>
+    <textarea class="answer primary-background-color" value="{{item.answer}}" placeholder="回复" data-index="{{index}}"
+      bindinput="updateText"></textarea>
+    <view class="save-btn primary-background-color white-text-color" data-id="{{item._id}}"
+      data-answer="{{item.answer}}" bindtap="saveQuestion">保存</view>
+    <icon style="position: absolute; top: 0; right: 0;" type="cancel" size="20" data-id="{{item._id}}"
+      catchtap="removeQuestion"></icon>
   </view>
-</view>
-
+</view>

miniprogram/pages/opinion/opinion.js

@@ -4,50 +4,68 @@ Page({
    * 页面的初始数据
    */
   data: {
-    currentTab:0,
-    winWidth:0,
-    winHeight:0,
-    inviteCode:"",
-    publisherName:"",
-    publisherContact:"",
-    publisherIntro:"",
-    publisherType:"",
-    publisherAvatar:[],
-    types:["校级", "园级", "院级"],
-    stars:["一星级", "二星级", "三星级", "四星级", "五星级"],
+    currentTab: 0,
+    winWidth: 0,
+    winHeight: 0,
+    inviteCode: "",
+    publisherName: "",
+    publisherContact: "",
+    publisherIntro: "",
+    publisherType: "",
+    publisherAvatar: [],
+    types: ["校级", "园级", "院级"],
+    stars: ["一星级", "二星级", "三星级", "四星级", "五星级"],
   },
 
-  stopTouchMove:function(){
+  stopTouchMove: function () {
     return false;
   },
 
-  updateRadio:function(e){
-    this.setData({publisherType: e.detail.value})
+  updateRadio: function (e) {
+    this.setData({
+      publisherType: e.detail.value
+    })
   },
 
-  updatePublishAvatar:function(e){
-    this.setData({publisherAvatar: e.detail.images})
+  updatePublishAvatar: function (e) {
+    this.setData({
+      publisherAvatar: e.detail.images
+    })
   },
 
-  switch1:function(e){
-    this.setData({currentTab:1})
+  switch1: function (e) {
+    this.setData({
+      currentTab: 1
+    })
   },
 
-  switch2:function(e){
-    this.setData({currentTab:2})
+  switch2: function (e) {
+    this.setData({
+      currentTab: 2
+    })
   },
 
-  switch3:function(e){
-    this.setData({currentTab:3})
+  switch3: function (e) {
+    this.setData({
+      currentTab: 3
+    })
   },
 
-  switch4:function(e){
-    this.setData({currentTab:4})
+  switch4: function (e) {
+    this.setData({
+      currentTab: 4
+    })
   },
 
-  switchend:function(e){
+  switch4_1: function (e) {
+    this.setData({
+      currentTab: 41
+    })
+  },
+
+  switchend: function (e) {
     if (this.data.inviteCode == "" || this.data.publisherName == "" || this.data.publisherContact == "" ||
-    this.data.publisherIntro == "" || this.data.publisherType == "" || this.data.publisherAvatar.length == 0) {
+      this.data.publisherIntro == "" || this.data.publisherType == "" || this.data.publisherAvatar.length == 0) {
       wx.showToast({
         title: "请确认信息填写完整",
         icon: "none"
@@ -109,7 +127,9 @@ Page({
                                 publisherId: _.push(res._id)
                               },
                               success: function () {
-                                this.setData({currentTab:end})
+                                this.setData({
+                                  currentTab: end
+                                })
                                 wx.hideLoading()
                               }.bind(this)
                             })
@@ -127,7 +147,7 @@ Page({
     })
   },
 
-  returnToUser:function(e){
+  returnToUser: function (e) {
     wx.navigateBack()
   },
 
@@ -137,13 +157,17 @@ Page({
   onLoad: function (e) {
     wx.getSystemInfo({
       success: function (res) {
-        this.setData({winWidth:res.windowWidth})
-        this.setData({winHeight:res.windowHeight})
+        this.setData({
+          winWidth: res.windowWidth
+        })
+        this.setData({
+          winHeight: res.windowHeight
+        })
       }.bind(this),
     })
   },
-  
-  updatePage: function(e) {
+
+  updatePage: function (e) {
     this.setData({
       currentTab: e.detail.current
     })

miniprogram/pages/opinion/opinion.wxml

@@ -1,86 +1,109 @@
 <!--为我的-意见反馈页面-->
 
 <view class="con">
-  <view class="title2">请选择反馈类型</view>
+  <view class="title2 primary-text-color">请选择反馈类型</view>
 </view>
-<view class="subTitle">向开发者反馈</view>
+<view class="subTitle primary-text-color">向开发者反馈</view>
 <view class="con">
-    <view class="buttons">
-      <view><button class="button primary-background-color white-text-color" bindtap="switch1">功能异常</button></view>
-      <view><button class="button primary-background-color white-text-color" bindtap="switch2">支付问题</button></view>
-      <view><button class="button primary-background-color white-text-color" bindtap="switch3">产品建议</button></view>
-    </view>
+  <view class="buttons">
+    <view><button class="button primary-background-color white-text-color" bindtap="switch1">功能异常</button></view>
+    <view><button class="button primary-background-color white-text-color" bindtap="switch2">支付问题</button></view>
+    <view><button class="button primary-background-color white-text-color" bindtap="switch3">产品建议</button></view>
+  </view>
 </view>
-<view class="subTitle">向微信平台投诉</view>
+<view class="subTitle primary-text-color">向微信平台投诉</view>
 <view class="con">
-    <view class="buttons">
-      <view><button class="button primary-background-color white-text-color" bindtap="switch4">违规举报</button></view>
-    </view>
+  <view class="buttons">
+    <view><button class="button primary-background-color white-text-color" bindtap="switch4">违规举报</button></view>
+  </view>
 </view>
 
-<view wx:if="{{currentTab == 1}}" scroll-y style="height: {{winHeight - 60}}px;">
+<view wx:if="{{currentTab == 1}}" class="con">
   <view class="con">
     <view class="title2">请选择反馈内容</view>
-      <view class="buttons">
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_1">无法打开小程序</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_2">小程序闪退</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_3">卡顿</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_4">黑屏白屏</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_5">死机</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_6">界面错位</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_7">界面加载慢</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch1_8">其他异常</button></view>
-      </view>
+    <view class="buttons">
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_1">无法打开小程序</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_2">小程序闪退</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_3">卡顿</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_4">黑屏白屏</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_5">死机</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_6">界面错位</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_7">界面加载慢</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch1_8">其他异常</button></view>
+    </view>
   </view>
 </view>
 
-<view wx:if="{{currentTab == 2}}" scroll-y style="height: {{winHeight - 60}}px;">
+<view wx:if="{{currentTab == 2}}" class="con">
   <view class="con">
-    <view class="title2">请选择反馈内容</view>
-      <view class="buttons">
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch2_1">支付失败</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch2_2">支付成功未生效</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch2_3">退款问题</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch2_4">其他</button></view>
-      </view>
+    <view class="title2 primary-text-color">请选择反馈内容</view>
+    <view class="buttons">
+      <view><button class="button primary-background-color white-text-color" bindtap="switch2_1">支付失败</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch2_2">支付成功未生效</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch2_3">退款问题</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch2_4">其他</button></view>
+    </view>
   </view>
 </view>
 
-<view wx:if="{{currentTab == 3}}" scroll-y style="height: {{winHeight - 60}}px;">
+<view wx:if="{{currentTab == 3}}" class="con">
   <view class="block">
     <view class="cate">产品建议</view>：
-    <input class="input block-background-color" placeholder="请填写10个字以上的问题描述以便我们提供更好的帮助" model:value="{{inviteCode}}"/>
+    <input class="input block-background-color" placeholder="请填写10个字以上的问题描述以便我们提供更好的帮助" model:value="{{inviteCode}}" />
   </view>
   <view class="block2">
-    <view class="block22"><view class="cate">相关截图（选填）</view>：</view>
-    <imagePicker images="{{publisherAvatar}}" max="1" image-width="450" image-height="450" bindchange="updatePublishAvatar" />
+    <view class="block22">
+      <view class="cate">相关截图（选填）</view>：
+    </view>
+    <imagePicker images="{{publisherAvatar}}" max="1" image-width="450" image-height="450"
+      bindchange="updatePublishAvatar" />
   </view>
   <view class="block">
     <view class="cate">联系方式</view>：
-    <input class="input block-background-color" placeholder="邮箱/手机号" model:value="{{publisherContact}}"/>
+    <input class="input block-background-color" placeholder="邮箱/手机号" model:value="{{publisherContact}}" />
   </view>
-  <button class="button dark-primary-color white-text-color" bindtap="switchend">提交</button>
+  <button class="button primary-background-color white-text-color" bindtap="switchend">提交</button>
 </view>
 
-<view wx:if="{{currentTab == 4}}" scroll-y style="height: {{winHeight - 60}}px;">
+<view wx:if="{{currentTab == 4}}" class="con">
   <view class="con">
-    <view class="title2">请选择投诉原因</view>
-      <view class="buttons">
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_1">新冠肺炎疫情相关</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_2">se</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_3">卡顿</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_4">黑屏白屏</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_5">死机</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_6">界面错位</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_7">界面加载慢</button></view>
-        <view><button class="button dark-primary-color white-text-color" bindtap="switch4_8">其他异常</button></view>
+    <view class="title2 primary-text-color">请选择投诉原因</view>
+    <view class="buttons">
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_1">新冠肺炎疫情相关</button>
       </view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_2">色情</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_3">卡顿</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_4">黑屏白屏</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_5">死机</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_6">界面错位</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_7">界面加载慢</button></view>
+      <view><button class="button primary-background-color white-text-color" bindtap="switch4_8">其他异常</button></view>
+    </view>
   </view>
 </view>
 
+<view wx:if="{{currentTab == 41}}" class="con">
+  <view class="block">
+    <view class="cate">新冠肺炎疫情相关</view>：
+    <input class="input block-background-color" placeholder="请输入投诉内容" model:value="{{inviteCode}}" />
+  </view>
+  <view class="block2">
+    <view class="block22">
+      <view class="cate">相关截图（选填）</view>：
+    </view>
+    <imagePicker images="{{publisherAvatar}}" max="1" image-width="450" image-height="450"
+      bindchange="updatePublishAvatar" />
+  </view>
+  <view class="block">
+    <view class="cate">联系方式</view>：
+    <input class="input block-background-color" placeholder="邮箱/手机号" model:value="{{publisherContact}}" />
+  </view>
+  <button class="button primary-background-color white-text-color" bindtap="switchend">提交</button>
+</view>
+
 <view wx:if="{{currentTab == end}}" class="con">
-  <view class="con1 dark-primary-color-font">恭喜您完成填写！</view>
-  <image  class="pic" src="../../images/finish.png" mode="aspectFill"/>
+  <view class="con1 primary-background-color-font">恭喜您完成填写！</view>
+  <image class="pic" src="../../images/finish.png" mode="aspectFill" />
   <view class="con2">感谢您的入驻</view>
-  <button class="button dark-primary-color white-text-color" bindtap="returnToUser">返回</button>
-</view>
+  <button class="button primary-background-color white-text-color" bindtap="returnToUser">返回</button>
+</view>

miniprogram/pages/opinion/opinion.wxss

@@ -8,7 +8,7 @@
 }
 
 .subTitle {
-  font-size:35rpx;
+  font-size: 35rpx;
   margin: 20rpx 40rpx;
   font-weight: 900;
 }
@@ -20,12 +20,12 @@
 }
 
 .radio {
-  transform:scale(0.8);
-  margin-left:10rpx;
+  transform: scale(0.8);
+  margin-left: 10rpx;
 }
 
 .radio-group {
-  width:450rpx;
+  width: 450rpx;
 }
 
 .text {
@@ -34,8 +34,12 @@
 }
 
 .button {
-  margin-top:40rpx;
+  margin-top: 40rpx;
   margin-bottom: 40rpx;
+  font-size: 35rpx;
+  margin: 20rpx 40rpx;
+  font-weight: 900;
+  border-radius: 98rpx;
 }
 
 .title2 {