Merge branch 'master' of http://101.37.147.115:3000/mz666/bocai_supplyChain_pc

src/components/userinfo/accountsetting/components/boundtel.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="boundtel-container">
-    <div class="contenttitle" style="border-bottom: none;margin-top: 16px;margin-bottom: 0;">
+    <div class="contenttitle g_pl_16" style="margin-top: 16px;margin-bottom: 0px;">
       <!-- <span v-if="!istelshow" style="font-size: 14px;">绑定手机</span>
       <span v-else style="font-size: 14px;">已绑定手机</span> -->
-      <span style="font-size: 20px;margin-bottom: 32px;color: #333;font-weight: 600;">基本信息</span>
+      <span style="font-size: 20px;margin-bottom: 0px;color: #333;font-weight: 600;">基本信息</span>
     </div>
-    <div>
+    <div class="g_pl_16 g_pr_16 g_pt_16">
       <a-form
         :form="form"
         layout="horizontal"
@@ -27,7 +27,7 @@
         </a-form-item>
 
         <a-form-item style="margin-top: -5px;">
-          <a-button type="primary" style="height: 32px;overflow: hidden;">更新基本信息</a-button>
+          <a-button type="primary" style="height: 32px;overflow: hidden;margin-left: 55.38px;">更新基本信息</a-button>
         </a-form-item>
       </a-form>
     </div>

src/components/userinfo/accountsetting/components/boundwx.vue

@@ -4,10 +4,12 @@
       <span v-if="!userinfo.openIdAppDTDL" style="font-size: 14px;">打开小程序</span>
       <span v-else style="font-size: 14px;">已绑定微信</span>
     </div> -->
-    <div class="contenttitle" style="border-bottom: none;margin-top: 16px;margin-bottom: 0;padding-bottom: 0;">
+    <div class="contenttitle g_pl_16" style="margin-top: 16px;margin-bottom: 0px;">
-      <span style="font-size: 20px;margin-bottom: 32px;color: #333;font-weight: 600;">打开小程序</span>
+      <!-- <span v-if="!istelshow" style="font-size: 14px;">绑定手机</span>
+      <span v-else style="font-size: 14px;">已绑定手机</span> -->
+      <span style="font-size: 20px;margin-bottom: 0px;color: #333;font-weight: 600;">打开小程序</span>
     </div>
-    <div class="contentbody" v-if="!userinfo.openIdAppDTDL">
+    <div class="contentbody" v-if="!userinfo.openIdAppDTDL" style="padding-top: 16px;">
       <div>
         <a-spin tip="加载中..." :spinning="isspinning"></a-spin>
 

src/components/userinfo/accountsetting/components/loginpsw.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="loginpsw-containerd">
-    <div class="contenttitle" style="border-bottom: none;margin-top: 16px;margin-bottom: 0;padding-bottom: 0;">
+    <div class="contenttitle g_pl_16" style="margin-top: 16px;margin-bottom: 0px;">
       <!-- <span v-if="!istelshow" style="font-size: 14px;">绑定手机</span>
       <span v-else style="font-size: 14px;">已绑定手机</span> -->
-      <span style="font-size: 20px;margin-bottom: 32px;color: #333;font-weight: 600;">安全设置</span>
+      <span style="font-size: 20px;margin-bottom: 0px;color: #333;font-weight: 600;">安全设置</span>
     </div>
-    <div class="new-form">
+    <div class="new-form g_pl_16 g_pr_16 g_pt_16">
       <div class="new-item g_pb_16 g_mb_16" style="border-bottom: 1px solid rgb(238, 238, 238);">
         <div class="label g_fs_14 g_mb_12 g_c_3 g_fw_600">账户密码</div>
         <div class="result g_flex_row_start">

src/components/userinfo/accountsetting/inedex.vue

@@ -687,7 +687,7 @@ export default {
   .rightcontent {
     width: 640px;
     min-height: 600px;
-    padding: 0 32px;
+    // padding: 0 32px;
     background-color: #fff;
     border: 1px solid #ededed;
   }