合并个人中心

app.json

@@ -1,7 +1,7 @@
 {
     "pages": [
-        "pages/user/index",
         "pages/welcome/index",
+        "pages/user/index",
         "pages/config/config",
         "pages/company/index",
         "pages/company/search/search",

pages/home/index.js

@@ -86,7 +86,7 @@ Page({
    */
   goMall(e) {
     console.log('1111')
-    wx.switchTab({
+    wx.navigateTo({
       url: '/pages/mall/index',
     })
   }

pages/mall/mall_address/mall_address.wxss

@@ -117,7 +117,7 @@
     height: 90rpx;
     margin: 20rpx 0;
     text-align: center;
-    background: #224bf6;
+    background: #378fff;
     font-size: 30rpx;
     color: white;
     border-radius: 60rpx;

pages/user/index.wxml

@@ -65,9 +65,9 @@
             </view>
             <text>我的购物车</text>
         </navigator>
-        <view class="userTool-label" >
+        <view class="userTool-label">
             <button class="userTool-label-img-button" size="mini" open-type="contact" bindcontact="handleContact"
-            style='border:0;background-color:#fff;width:94rpx;height:94rpx;padding:0;margin:0;margin-bottom:10rpx;'>
+                style='border:0;background-color:#fff;width:94rpx;height:94rpx;padding:0;margin:0;margin-bottom:10rpx;'>
                 <image src="/static/user_iocn/userTool_03.png"></image>
             </button>
             <view>客服服务</view>
@@ -91,12 +91,12 @@
             </view>
             <text>区块链证书</text>
         </navigator>
-        <view class="userTool-label ">
+        <navigator class="userTool-label" hover-class="none" url="/pages/company/index">
             <view class="userTool-label-img">
                 <image src="/static/user_iocn/userTool_08.png"></image>
             </view>
             <text>企获客广场</text>
-        </view>
+        </navigator>
         <navigator hover-class="none" url="/pages/user/setting/setting" class="userTool-label">
             <view class="userTool-label-img">
                 <image src="/static/user_iocn/userTool_07.png"></image>

pages/user/setting/aboutAdvice/aboutAdvice.wxml

@@ -1 +1,4 @@
-yijian
+<view class="content">
+  <textarea placeholder="输入您的意见与建议"></textarea>
+  <view>确认提交</view>
+</view>

pages/user/setting/aboutAdvice/aboutAdvice.wxss

@@ -1,17 +1,26 @@
-.item {
+.content {
+  width: 100%;
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
-  justify-content: flex-start;
+  justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  padding: 30rpx 30rpx;
-  color: #333;
-  font-weight: 400;
-  background-color: #fff;
-  border-top: #f7f7f7 solid 1rpx;
 }
 
-.item image {
+.content textarea {
-  width: 50rpx;
+  width: 100%;
-  margin-right: 10rpx;
+  min-height: 500rpx;
+  background-color: #fff;
+  padding: 30rpx;
+  box-sizing: border-box;
+}
+
+.content>view {
+  background-color: #378fff;
+  color: #fff;
+  font-size: 30rpx;
+  font-weight: 500;
+  padding: 20rpx 200rpx;
+  border-radius: 60rpx;
+  margin-top: 30rpx;
 }

pages/user/setting/aboutMine/aboutMine.wxml

@@ -43,7 +43,7 @@
     <view class="end" bindtap="goUrl">
       <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
         <view class="picker">
-          当前选择: {{date}}
+          {{date}}
         </view>
       </picker>
       <image src="/static/icons/arrow_right.png" mode="widthFix" style="width:30rpx;"></image>
@@ -53,10 +53,10 @@
     <view class="info_list_title">所在区域</view>
     <view class="end" bindtap="goUrl">
       <picker mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
-    <view class="picker">
+        <view class="picker">
-      当前选择：{{region[0]}}，{{region[1]}}，{{region[2]}}
+          {{region[0]}}-{{region[1]}}-{{region[2]}}
-    </view>
+        </view>
-  </picker>
+      </picker>
       <image src="/static/icons/arrow_right.png" mode="widthFix" style="width:30rpx;"></image>
     </view>
   </view>

pages/user/setting/aboutUs/aboutUs.js

@@ -1,3 +1,7 @@
 Page({
-  data: {}
+  data: {
+    nodes: {
+
+    }
+  }
 })

pages/user/setting/aboutUs/aboutUs.wxml

@@ -1 +1,2 @@
-关于我们
+<image src="/static/images/company_bg4.png" mode="widthFix" style="width:100%;"></image>
+<rich-text nodes="{{nodes}}"></rich-text>

project.config.json

@@ -113,6 +113,29 @@
           "pathName": "pages/home/index",
           "query": "orderid=20201229132338964625",
           "scene": null
+        },
+        {
+          "name": "pages/user/setting/setting",
+          "pathName": "pages/user/setting/setting",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/user/setting/aboutMine/aboutMine",
+          "pathName": "pages/user/setting/aboutMine/aboutMine",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/user/setting/aboutAdvice/aboutAdvice",
+          "pathName": "pages/user/setting/aboutAdvice/aboutAdvice",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/user/setting/aboutUs/aboutUs",
+          "pathName": "pages/user/setting/aboutUs/aboutUs",
+          "scene": null
         }
       ]
     }