Merge branch 'ming' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into fanghuisheng

src/pages/login.vue

@@ -16,8 +16,8 @@
 
     <view class="middle login">
       <view class="top">
-        <image class="logo" :src="logo"  v-if="logo" />
-        <image class="logo" src="@/static/logo200.png"  v-else />
+        <image class="logo" mode="heightFix"  :src="logo"  v-if="logo" />
+        <image class="logo" mode="heightFix"  src="@/static/logo200.png"  v-else />
         <text class="title" v-if="title">{{ title }}</text>
         <text class="title" v-else>移动端配置</text>
       </view>
@@ -171,7 +171,8 @@ function env() {
 
  //#ifdef H5
   var linkUrl=window.location.host;
-  // var linkUrl='ces.cn';
+  // var linkUrl='ces.cn'; 
+  // var linkUrl='172.16.120.165:13203'
  //#endif
 
  //#ifdef APP-PLUS
@@ -375,21 +376,28 @@ onLoad(() => {
       color:gray!important
 
     }
-    
+
+   
+
     .top {
       display: flex;
+      align-items: center;
+      justify-content:center;
       margin-bottom: 60px;
-      .logo {
-        width: 40px;
-        height: auto;
-        max-height:50px;
-        margin: 0 20px 0 auto;
+
+      ::v-deep uni-image > div {
+        
+      }
+     uni-image{
+      height:40px; 
       }
+      .logo {
+        margin-right:10px;
+        }
       .title {
         font-size: 20px;
-        text-align: center;
         color: #000;
-        margin: auto auto auto 0;
+        max-width:50%
       }
       
     }

src/pages/serveConfig.vue

@@ -3,12 +3,12 @@
         <view style="padding: 10px 40px 20px 40px;">
             <u--form :model="form" ref="uForm" :rules="rules" labelWidth="80">
                 <u-form-item label="链接地址" prop="linkUrl" required :borderBottom="true">
-                    <u-input class="configInput" v-model="form.linkUrl" placeholder="请输入链接地址" border="none">
+                    <u-input class="configInput" v-model="form.linkUrl" :placeholder='newPublicStore.serveUrl?newPublicStore.serveUrl:"请输入链接地址"' border="none">
                     </u-input>
                 </u-form-item>
                 <view >
                     <u-button type="primary" style="width: 50%; height: 36px; font-size: 14px;margin-top:20px" @click="handleSubmit()"
-                        shape="circle"> 保 存 </u-button>
+                        shape="circle"> 保 存</u-button>
                 </view>
             </u--form>
         </view>