Merge branch 'master' into cyl/master-im

components/package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "components",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

pages.json

@@ -127,6 +127,13 @@
             "navigationBarTitleText": " "
           }
         },
+            {
+          "path": "changeUser",
+          "style": {
+            "navigationBarTitleText": " "
+          }
+        },
+        
         {
           "path": "pwdForget",
           "style": {

root/person/changeUser.vue

@@ -25,7 +25,7 @@
 					 class="g_text_r g_w_all" 
 					 placeholder-style="color:#999999;font-size:32rpx;line-height:1" 
 					 v-model="info.value"
-					 style="width: calc(100vw - (106px);flex: none;"
+					 style="width: calc(100vw - 106px);flex: none;"
 					/>
 					<!-- #endif -->
 					<!-- #ifdef MP-WEIXIN -->
@@ -40,7 +40,7 @@
 					<!-- #endif -->
 				</slot>
 			</g-panel-form-slot>
-			<view class="g_mt_90 g_flex_row_center">
+			<view class="g_flex_row_center" style="margin-top:90px">
 				<g-button btnText="提交" type="primary" @clickBtn="submitForm" />
 			</view>
 		</view>

root/person/info.vue

@@ -116,14 +116,14 @@ export default {
 					icon: "",
 					label: "用户名",
 					result: that.userinfo.userName,
-					path: "/root/person/change?title=设置用户名&remark=好的花名，让团队成员更好记住你&value=" + that.userinfo.userName,
+					path: "/root/person/changeUser?title=设置用户名&remark=好的花名，让团队成员更好记住你&value=" + that.userinfo.userName,
 					tip: "username",
 				},
 				{
 					icon: "",
 					label: "手机号",
 					result: that.userinfo.tel,
-					path: "/root/person/change?title=设置手机号&remark=&value=" + that.userinfo.tel,
+					path: "/root/person/changeUser?title=设置手机号&remark=&value=" + that.userinfo.tel,
 					tip: "mobile",
 				},
 			];

static/css/base.scss

@@ -622,7 +622,12 @@ $max-mp: 20;
 .g_pl_40 {
 	padding-left: 40px;
 }
-
+.g_mt_32{
+	margin-top: 32px;
+}
+.g_mt_90{
+	margin-top: 90px;
+}
 .g_mb_32{
 	margin-bottom: 32px;
 }