Merge refs/remotes/nsgk_entry/master into refs/heads/master

pages/index/index.wxml

@@ -4,6 +4,7 @@
     <view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
     <!--账户信息-->
     <view class="information_header">
+        <navigator url="/pages/user/login/login" class="setup" style="background:url('../../image/index/setup.png') no-repeat; background-size: 100%  100%;"></navigator> 
         <view class="portrait_head"></view>
         <view class="information_main">
             <view class="name_wrap">

pages/index/index.wxss

@@ -8,6 +8,15 @@
   /* padding: 30rpx 32rpx 54rpx; */
   padding: 10rpx 32rpx 54rpx;
   display: flex;
+  position: relative;
+}
+.information_header .setup{
+  width: 38rpx;
+  height: 38rpx;
+  position: absolute;
+  right: 34rpx;
+  top: 15rpx;
+  display: block;
 }
 .information_header .portrait_head{
   width: 110rpx;

project.config.json

@@ -52,6 +52,10 @@
   "libVersion": "2.23.2",
   "appid": "wxaace54cc2cf8924b",
   "projectname": "WXMB",
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
   "condition": {
     "search": {
       "list": []
@@ -71,9 +75,5 @@
     "miniprogram": {
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }