Merge refs/remotes/origin/master into refs/heads/master

miniprogram/app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/opinion/opinion",
     "pages/main/main",
     "pages/publisher/publisher",
     "pages/publisherPage/publisherPage",
@@ -15,7 +16,6 @@
     "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.wxml

@@ -1,15 +1,26 @@
 <!--为我的-关于我们页面-->
 <view wx:if="{{currentTab == 0}}" class="con">
-  <view class="title2">Tin Link</view>
+  <image class="icon" src="/images/Tin.png"></image>
 </view>
 
-<view wx:if="{{currentTab == 0}}">
-  <view><button class="button" bindtap="switch1" plain="true">汇听建立初衷</button></view>
-  <view><button class="button" bindtap="switch2" plain="true">汇听游玩指南</button></view>
-  <view><button class="button" bindtap="switch3" plain="true">汇听更新目录</button></view>
-  <view><button class="button" bindtap="switch4" plain="true">联系我们</button></view>
-  <view><button class="button" bindtap="switch5" plain="true">商务合作</button></view>
-  <view><button class="button" bindtap="switch6" plain="true">隐私保护指引</button></view>
+<view wx:if="{{currentTab == 0}}" class="con">
+  <view class="btn-row">
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch1"
+        plain="true"><text>汇听\n建立初衷</text></button></view>
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch2"
+        plain="true"><text>汇听\n游玩指引</text></button></view>
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch3"
+        plain="true"><text>汇听\n更新目录</text></button></view>
+  </view>
+
+  <view class="btn-row">
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch4"
+        plain="true"><text>联系我们</text></button></view>
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch5"
+        plain="true"><text>商务合作</text></button></view>
+    <view><button class="button  primary-background-color white-text-color" bindtap="switch6"
+        plain="true"><text>隐私\n保护指南</text></button></view>
+  </view>
 </view>
 
 <view wx:if="{{currentTab == 1}}" class="con">

miniprogram/pages/aboutUs/aboutUs.wxss

@@ -1,133 +1,35 @@
-.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;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
-  align-items: center;
-}
-
-.block2 {
-  display: flex;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
-}
-
-.block22 {
-  display: flex;
-}
-
-.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;
-}
-
-.detail-text {
-  text-indent: 2em;
-}
-
 .activity-detail {
   margin: 15rpx 50rpx;
   font-size: 30rpx;
 }
 
-.btn-text {
-  position: relative;
-  float: left;
-  left: 50rpx;
-  line-height: 100rpx;
-  font-size: 35rpx;
+.icon {
+  height: 150rpx;
+  width: 300rpx;
+  margin-top: 200rpx;
+  margin-bottom: 200rpx;
 }
 
-.line {
-  height: 5rpx;
+.btn-row {
+  display: flex;
+}
+
+.button {
+  padding: 0rpx;
+  font-size: 30rpx;
+  border-radius: 30rpx;
+  width: 200rpx !important;
+  height: 100rpx !important;
+  margin: 10rpx 10rpx !important;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: normal !important;
+  border: none !important;
 }

miniprogram/pages/opinion/opinion.wxml

@@ -1,5 +1,25 @@
 <!--为我的-意见反馈页面-->
-<view wx:if="{{currentTab == 0}}">
+<view class="main">
+  <view class="block">
+    <view class="cate">问题类型</view>
+    <input class="input" placeholder="请选择问题类型" model:value="{{inviteCode}}" />
+    >
+  </view>
+  <view class="block2">
+    <textarea class="textarea" placeholder="说说你的意见和问题，上传截图会更快解决哦~" model:value="{{publisherName}}" />
+    </view>
+  <view class="block3">
+    <view class="cate">上传图片</view>
+    <imagePicker images="{{publisherAvatar}}" max="1" image-width="450" image-height="450"
+      bindchange="bindAvatarChange" />
+  </view>
+  <view class="block">
+    <view class="cate">联系方式</view>
+    <input class="input" placeholder="解决问题后会及时给您回复" model:value="{{publisherContact}}" />
+  </view>
+  <button class="button primary-background-color white-text-color" bindtap="switch4">提交</button>
+</view>
+<view wx:if="{{currentTab == 1}}">
   <view class="con">
     <view class="title2">请选择反馈类型</view>
   </view>
@@ -23,44 +43,6 @@
   </view>
 </view>
 
-<!-- <scroll-view wx:if="{{currentTab == 1}}" scroll-y style="height: {{winHeight - 60}}px;">
-  <view class="subTitle">组织入驻</view>
-  <view class="block">
-    <view class="cate">邀请码</view>：
-    <input class="input block-background-color" placeholder="请输入邀请码" model:value="{{inviteCode}}" />
-  </view>
-  <view class="block">
-    <view class="cate">组织名称</view>：
-    <input class="input block-background-color" placeholder="请输入组织名" model:value="{{publisherName}}" />
-  </view>
-  <view class="block">
-    <view class="cate">组织类型</view>：
-    <radio-group class="radio-group" bindchange="updateRadio">
-      <label wx:for="{{types}}" wx:for-item="item" wx:key="*this">
-        <radio class="radio" value="{{item}}" color="#469298">{{item}}</radio>
-      </label>
-    </radio-group>
-  </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>
-  <view class="block2">
-    <view class="block22">
-      <view class="cate">组织介绍</view>：
-    </view>
-    <textarea class="textarea block-background-color" placeholder="请输入组织介绍" model:value="{{publisherIntro}}" />
-    </view>
-  <button class="button primary-background-color white-text-color" bindtap="switch4">提交</button>
-</scroll-view> -->
-
 <view wx:if="{{currentTab == 1}}" class="con">
   <view class="title2">请选择反馈内容</view>
   <view><button class="button2 primary-border-color" bindtap="switch1_1">无法打开小程序</button></view>

miniprogram/pages/opinion/opinion.wxss

@@ -1,5 +1,3 @@
-/* pages/opinion/opinion.wxss */
-/* miniprogram/pages/publisherLogin/publisherLogin.wxss */
 .title {
   font-size: 40rpx;
   padding: 15px 20px;
@@ -66,38 +64,40 @@
 }
 
 .block {
+  margin: 20rpx 0rpx;
+  padding: 20rpx 40rpx 20rpx 40rpx;
   display: flex;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
+  font-size: 30rpx;
+  background-color: #ffffff;
   align-items: center;
 }
 
 .block2 {
+  padding: 20rpx 40rpx 20rpx 40rpx;
   display: flex;
-  margin: 20rpx 40rpx;
-  font-size: 35rpx;
+  font-size: 30rpx;
+  background-color: #ffffff;
+  align-items: center;
 }
 
-.block22 {
+.block3 {
+  padding: 20rpx 40rpx 20rpx 40rpx;
   display: flex;
+  font-size: 30rpx;
+  background-color: #ffffff;
+  margin-top: 4rpx;
 }
 
 .input {
-  border-radius: 10rpx;
-  width: 450rpx;
-  padding: 0 20rpx;
+  width: 500rpx;
 }
 
 .textarea {
-  border-radius: 10rpx;
-  width: 450rpx;
   height: 200rpx;
-  padding: 0 20rpx;
 }
 
 .cate {
-  width: 140rpx;
-  text-align: right;
+  width: 150rpx;
 }
 
 .con {
@@ -120,8 +120,4 @@
 .pic {
   width: 200rpx;
   height: 200rpx;
-}
-
-.line {
-  height: 5rpx;
 }