Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store

src/views/login/index.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <el-form
-      ref="loginForm"
-      :model="state.loginForm"
-      :rules="state.loginRules"
-      label-position="left"
-      label-width="0px"
-      class="login-form"
-    >
+    <el-form ref="loginForm" :model="state.loginForm" :rules="state.loginRules" label-position="left" label-width="0px"
+      class="login-form">
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
         <el-radio-group v-model="state.loginForm.loginType">
@@ -16,39 +10,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input
-          v-model="state.loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="商户号"
-        ></el-input>
+        <el-input v-model="state.loginForm.username" type="text" auto-complete="off" placeholder="商户号"></el-input>
       </el-form-item>
       <el-form-item prop="staffUserName" v-if="state.loginForm.loginType == 1">
-        <el-input
-          v-model="state.loginForm.staffUserName"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        ></el-input>
+        <el-input v-model="state.loginForm.staffUserName" type="text" auto-complete="off" placeholder="账号"></el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="state.loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        ></el-input>
+        <el-input v-model="state.loginForm.password" type="password" auto-complete="off" placeholder="密码"
+          @keyup.enter="handleLogin"></el-input>
       </el-form-item>
       <el-form-item prop="code">
         <div class="code_wrap">
-          <el-input
-            v-model="state.loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter="handleLogin"
-          ></el-input>
+          <el-input v-model="state.loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
+            @keyup.enter="handleLogin"></el-input>
           <div class="login-code">
             <img :src="state.codeUrl" @click="getCode" />
           </div>
@@ -56,13 +30,8 @@
       </el-form-item>
 
       <el-form-item style="width: 100%">
-        <el-button
-          :loading="state.loading"
-          size="default"
-          type="primary"
-          style="width: 100%"
-          @click.prevent="handleLogin"
-        >
+        <el-button :loading="state.loading" size="default" type="primary" style="width: 100%"
+          @click.prevent="handleLogin">
           <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -198,13 +167,12 @@ function handleLogin() {
             loginName: userStore.userInfo.phone,
             token,
           }).then((checkInfo) => {
-            console.log("checkInfo", checkInfo.userInfo);
+            console.log("checkInfo", checkInfo);
             userStore.meituan_douyin_info = checkInfo.userInfo;
             setDouyinToken(checkInfo.userInfo.token);
           });
           localStorage.removeItem("shopName")
 
-          await userStore.getUserInfo();
 
           const { path, queryParams } = parseRedirect();
           console.log(path, queryParams);

src/views/shop/list/components/addShop.vue

@@ -379,7 +379,7 @@ function show(obj,type) {
     state.form = { ...obj };
   }
   if (obj && obj.mainId) {
-    state.form = { ...obj };
+    Object.assign(state.form, obj);
   }
   if( type ){
     state.type = type