Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/layout/components/header.vue

@@ -11,6 +11,11 @@
     <img src="../../assets/images/headLogo.jpg" />
     <span>云融</span>
   </div>
+  <!-- 千海金 -->
+  <div v-else-if="isOemByEnum(OemType.qinghaijin)">
+    <img src="../../assets/images/qianhaijin_logo.jpg" />
+    <span>{{getCompanyName()}}</span>
+  </div>
   <div v-else>
     <img src="../../assets/images/logoHeader.png" />
     <span>{{getCompanyName()}}</span>

src/services/bus/login.ts

@@ -25,8 +25,11 @@ export const login = async (logidCode: string, password: string, byteArr: Uint8A
     try {
         /** 建立行情交易长链 */
         await APP.connectTrading();
+        debugger
         const account = await GetLoginID(logidCode);
+        debugger
         const loginData = await loginAction(account, password, byteArr, isEncryt);
+        debugger
         // localstorage 缓存登录信息，处理页面刷新
         setLoginData(loginData);
         await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount(), queryMarketRun()])

src/views/account/login.vue

@@ -1,42 +1,48 @@
 <template>
-    <div class="login">
-        <a-row type="flex" justify="center" align="middle">
-            <a-col>
-                <div class="login-background">
-                    <div id="img">
-                        <!-- <img src="./logo.png"
+  <div class="login">
+    <a-row type="flex"
+           justify="center"
+           align="middle">
+      <a-col>
+        <div class="login-background">
+          <div id="img">
+            <!-- <img src="./logo.png"
                         alt="" />-->
-                    </div>
-                </div>
-                <div class="login-content">
-                    <p>账号登录</p>
-                    <a-form ref="formDom" :model="form" :rules="rules">
-                        <a-form-item name="account">
-                            <a-input placeholder="用户名/账号/手机号" v-model:value="form.account">
-                                <template #prefix>
-                                    <img src="@/assets/images/user.png" alt />
-                                </template>
-                            </a-input>
-                        </a-form-item>
-                        <a-form-item name="password" class="mb20">
-                            <a-input
-                                @keyup.enter="loginAction"
-                                placeholder="请输入您的登录密码"
-                                type="password"
-                                v-model:value="form.password"
-                            >
-                                <template #prefix>
-                                    <img src="@/assets/images/password.png" alt />
-                                </template>
-                            </a-input>
-                        </a-form-item>
-                        <a-form-item>
-                            <div class="login-remember-password">
-                                <a-checkbox v-model:checked="form.isRemember">记住账号</a-checkbox>
-                                <!-- <router-link to="/resetPassword">忘记密码?</router-link> -->
-                            </div>
-                        </a-form-item>
-                        <!-- <a-form-item>
+          </div>
+        </div>
+        <div class="login-content">
+          <p>账号登录</p>
+          <a-form ref="formDom"
+                  :model="form"
+                  :rules="rules">
+            <a-form-item name="account">
+              <a-input placeholder="用户名/账号/手机号"
+                       v-model:value="form.account">
+                <template #prefix>
+                  <img src="@/assets/images/user.png"
+                       alt />
+                </template>
+              </a-input>
+            </a-form-item>
+            <a-form-item name="password"
+                         class="mb20">
+              <a-input @keyup.enter="loginAction"
+                       placeholder="请输入您的登录密码"
+                       type="password"
+                       v-model:value="form.password">
+                <template #prefix>
+                  <img src="@/assets/images/password.png"
+                       alt />
+                </template>
+              </a-input>
+            </a-form-item>
+            <a-form-item>
+              <div class="login-remember-password">
+                <a-checkbox v-model:checked="form.isRemember">记住账号</a-checkbox>
+                <!-- <router-link to="/resetPassword">忘记密码?</router-link> -->
+              </div>
+            </a-form-item>
+            <!-- <a-form-item>
               <div style="text-align:left">
                 <a-checkbox v-model:checked="form.isRead">
                   我已阅读并同意
@@ -44,18 +50,16 @@
                 <router-link to="/resetPassword">《用户协议》</router-link>
               </div>
                         </a-form-item>-->
-                        <a-form-item class="mt20">
-                            <a-button
-                                @click="loginAction"
-                                :loading="loading"
-                                :disabled="goHomeloading"
-                            >登录</a-button>
-                        </a-form-item>
-                    </a-form>
-                </div>
-            </a-col>
-        </a-row>
-    </div>
+            <a-form-item class="mt20">
+              <a-button @click="loginAction"
+                        :loading="loading"
+                        :disabled="goHomeloading">登录</a-button>
+            </a-form-item>
+          </a-form>
+        </div>
+      </a-col>
+    </a-row>
+  </div>
 </template>
 
 <script lang="ts">
@@ -172,6 +176,7 @@ export default defineComponent({
         const { getQtInfo } = qtAction();
         function loginAction() {
             formDom.value.validate().then(() => {
+                debugger;
                 loading.value = true;
                 const { account, password } = toRaw(form);
                 setLoadComplete(false);

src/views/ping_an/goods_info_p/goods_info_p_hedge/index.vue

@@ -21,7 +21,7 @@ export default defineComponent({
                 //  权限按钮 info（详情）:add（新增）:edit（修改）:del（停用启用）
                 { btnCode: 'goods_info_hedge_order', urlCode: 'user' },
             ],
-            tabIndex: 1,
+            tabIndex: 2,
         };
         return { ...handleIfameRouter(param) };
     },