1
0

4 Commity da697d5196 ... 04a4367675

Autor SHA1 Správa Dátum
  wxd 04a4367675 wxd 1 mesiac pred
  wxd a8f70a4b3f Merge branch 'master' of http://121.28.134.38:2039/wxd/jiliangxiaochengxu into wxd 1 mesiac pred
  杜迪迪 b2b27c5235 Merge branch 'master' of http://121.28.134.38:2039/wxd/jiliangxiaochengxu into dudidi 1 mesiac pred
  杜迪迪 4b667d0b28 8-2 1 mesiac pred

+ 32 - 19
components/companiesRegistered/authorizer.vue

@@ -19,6 +19,16 @@
             height="180"
           >
             <view class="uploadTipcContent">
+              <view class="cardImg">
+                <image
+                  style="height: 180rpx; width: 400rpx"
+                  mode="widthFix"
+                  :src="require('@/static/images/cardzm.png')"
+                ></image>
+                <view class="topic"> 请上传被授权人身份证人像照片 </view>
+              </view>
+            </view>
+            <!-- <view class="uploadTipcContent">
               <view>
                 <view style="display: flex; justify-content: center">
                   <u-icon
@@ -35,7 +45,7 @@
                 >
               </view>
               <view class="topic"> 请上传被授权人身份证正面照片 </view>
-            </view>
+            </view> -->
           </u-upload>
         </view>
       </view>
@@ -52,22 +62,14 @@
             height="180"
           >
             <view class="uploadTipcContent">
-              <view>
-                <view style="display: flex; justify-content: center">
-                  <u-icon
-                    name="arrow-upward"
-                    color="#2979ff"
-                    size="28"
-                  ></u-icon>
-                </view>
-                <u-button
-                  :customStyle="{ color: '#3c9cff', fontSize: '26rpx' }"
-                  type="text"
-                  size="small"
-                  >点击上传</u-button
-                >
+              <view class="cardImg">
+                <image
+                  style="height: 180rpx; width: 430rpx; margin-left: 30rpx"
+                  mode="widthFix"
+                  :src="require('@/static/images/cardbm.png')"
+                ></image>
+                <view class="topic"> 请上传被授权人身份证国徽照片 </view>
               </view>
-              <view class="topic"> 请上传被授权人身份证背面照片 </view>
             </view>
           </u-upload>
         </view>
@@ -412,18 +414,29 @@ export default {
 </script>
 
 <style lang="scss">
+.cardImg {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
 .topic {
   color: #909399;
   font-size: 24rpx;
   width: 400rpx;
   margin: 20rpx auto 0;
   font-family: "宋体";
+  position: absolute;
+  bottom: 20rpx;
+  left: 50%;
+  transform: translateX(-43%);
 }
 .uploadTipcContent {
-  width: 555rpx;
+  width: 600rpx;
   height: 260rpx;
-  padding: 30rpx;
-  border: 1px dotted#909399;
+  position: relative;
+  // padding: 30rpx;
+
+  // border: 1px dotted#909399;
 }
 .updateContent {
   display: flex;

+ 9 - 8
components/companiesRegistered/companiesInformation.vue

@@ -130,7 +130,7 @@
           </view>
 
           <view class="content">
-            <u-form-item prop="location" :required="true" label="单位地理位置:">
+            <u-form-item prop="location" :required="true" label="单位通讯地址:">
               <view
                 class="iconMap"
                 v-if="!formdData.companiesOrcResult.location"
@@ -143,26 +143,27 @@
                   size="30"
                 ></u-icon>
               </view>
-              <view v-else>{{ formdData.companiesOrcResult.location }}</view>
+              <!-- <view v-else>{{ formdData.companiesOrcResult.location }}</view> -->
+              <u-input
+                v-else
+                disabled
+                :value="formdData.companiesOrcResult.postalAddress"
+              ></u-input>
             </u-form-item>
           </view>
 
-          <view class="content">
+          <!-- <view class="content">
             <u-form-item
               prop="postalAddress"
               :required="true"
               label="单位通讯地址:"
             >
-              <!-- <view class="message">{{
-                formdData.companiesOrcResult.postalAddress
-              }}</view> -->
-
               <u-input
                 disabled
                 :value="formdData.companiesOrcResult.postalAddress"
               ></u-input>
             </u-form-item>
-          </view>
+          </view> -->
         </u-form>
       </view>
     </view>

+ 2 - 0
components/personRegistered/authorizer.vue

@@ -60,6 +60,7 @@
               prop="pwd"
             >
               <u-input
+                type="password"
                 @blur="handleUpadteSync('pwd')"
                 v-model="form.pwd"
                 placeholder="请输入密码"
@@ -75,6 +76,7 @@
               prop="pwdReset"
             >
               <u-input
+                type="password"
                 @blur="handleUpadteSync('pwdReset')"
                 v-model="form.pwdReset"
                 placeholder="保持两次密码一致"

+ 35 - 36
components/personRegistered/uploadLicense.vue

@@ -3,7 +3,7 @@
 <template>
   <view class="container">
     <view style="color: #3c9cff" class="informationTitle"
-      >上传身份信息 (需要先验证企业代码才能上传个人证件照)</view
+      >上传身份信息 (个人注册前需要先注册企业账号)</view
     >
 
     <view class="cardImage">
@@ -25,11 +25,12 @@
           </u-form>
         </view>
       </view>
+
       <view class="updateContent" :style="{ opacity: !isPass ? '0.5' : 1 }">
         <view style="margin: 0 auto">
           <u-upload
-            :disabled="!isPass"
             name="1"
+            :disabled="!isPass"
             :fileList="fileList1"
             @afterRead="afterRead"
             @delete="deletePic"
@@ -38,27 +39,18 @@
             height="180"
           >
             <view class="uploadTipcContent">
-              <view>
-                <view style="display: flex; justify-content: center">
-                  <u-icon
-                    name="arrow-upward"
-                    color="#2979ff"
-                    size="28"
-                  ></u-icon>
-                </view>
-                <u-button
-                  :customStyle="{ color: '#3c9cff', fontSize: '26rpx' }"
-                  type="text"
-                  size="small"
-                  >点击上传</u-button
-                >
+              <view class="cardImg">
+                <image
+                  style="height: 180rpx; width: 400rpx"
+                  mode="widthFix"
+                  :src="require('@/static/images/cardzm.png')"
+                ></image>
+                <view class="topic"> 请上传被授权人身份证人像照片 </view>
               </view>
-              <view class="topic"> 请上传被授权人身份证正面照片 </view>
             </view>
           </u-upload>
         </view>
       </view>
-
       <view class="updateContent" :style="{ opacity: !isPass ? '0.5' : 1 }">
         <view style="margin: 0 auto">
           <u-upload
@@ -72,22 +64,14 @@
             height="180"
           >
             <view class="uploadTipcContent">
-              <view>
-                <view style="display: flex; justify-content: center">
-                  <u-icon
-                    name="arrow-upward"
-                    color="#2979ff"
-                    size="28"
-                  ></u-icon>
-                </view>
-                <u-button
-                  :customStyle="{ color: '#3c9cff', fontSize: '26rpx' }"
-                  type="text"
-                  size="small"
-                  >点击上传</u-button
-                >
+              <view class="cardImg">
+                <image
+                  style="height: 180rpx; width: 430rpx; margin-left: 30rpx"
+                  mode="widthFix"
+                  :src="require('@/static/images/cardbm.png')"
+                ></image>
+                <view class="topic"> 请上传被授权人身份证国徽照片 </view>
               </view>
-              <view class="topic"> 请上传被授权人身份证背面照片 </view>
             </view>
           </u-upload>
         </view>
@@ -224,6 +208,15 @@ export default {
 </script>
 
 <style lang="scss">
+.container {
+  height: 100vh;
+  background: #fff;
+}
+.cardImg {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
 .conmpan {
   width: 100%;
   margin: 0 auto;
@@ -235,19 +228,25 @@ export default {
   width: 400rpx;
   margin: 20rpx auto 0;
   font-family: "宋体";
+  position: absolute;
+  bottom: 20rpx;
+  left: 50%;
+  transform: translateX(-43%);
 }
 
 .uploadTipcContent {
   width: 600rpx;
   height: 260rpx;
-  padding: 30rpx;
-  border: 1px dotted#909399;
+  position: relative;
+  // padding: 30rpx;
+
+  // border: 1px dotted#909399;
 }
 
 .updateContent {
   display: flex;
   background: #fff;
-  padding: 30rpx;
+  padding: 20rpx;
 }
 
 .informationTitle {

+ 6 - 6
pages/assay/index.vue

@@ -31,7 +31,7 @@
         </view>
         <view class="content">
           <view class="title"
-            >备案单编号
+            >备案单编号:
             <text
               class="message"
               style="
@@ -58,13 +58,13 @@
 				</view> -->
         <view style="display: flex; justify-content: space-between" class="">
           <view class="content">
-            <view class="title">发起人</view>
-            <view style="width: 120rpx" class="message">{{
+            <view class="title">发起人:</view>
+            <view style="width: 100rpx" class="message">{{
               item.userName
             }}</view>
           </view>
           <view class="content">
-            <view class="title">发起时间</view>
+            <view class="title">发起时间:</view>
             <view style="padding-top: 5rpx" class="message">{{
               item.createTime
             }}</view>
@@ -72,13 +72,13 @@
         </view>
         <view style="display: flex; justify-content: space-between" class="">
           <view style="display: flex" class="content">
-            <view class="title">联系电话</view>
+            <view class="title">联系电话:</view>
             <view style="padding-top: 5rpx" class="message">{{
               item.userMobile
             }}</view>
           </view>
           <view style="display: flex; align-items: center" class="content">
-            <view class="title">器具数量</view>
+            <view class="title">器具数量:</view>
             <view style="padding-top: 5rpx" class="message">{{
               item.instrCount
             }}</view>

+ 12 - 8
pages/bindweixin.vue

@@ -2,23 +2,27 @@
 
 <template>
   <view class="container">
+    <u-alert
+      type="warning"
+      :show-icon="true"
+      title="第一次用微信登录需要绑定用户,如果没有账号请先到登录页进行注册。"
+    ></u-alert>
     <u-form ref="uForm" :model="form" labelWidth="160" labelPosition="top">
       <u-form-item :required="true" label="用户名" prop="name">
         <u-input placeholder="请输入用户名" v-model="form.name"></u-input>
       </u-form-item>
       <u-form-item :required="true" label="密码" prop="password">
-        <u-input placeholder="请输入密码" v-model="form.password"> </u-input>
+        <u-input
+          type="password"
+          placeholder="请输入密码"
+          v-model="form.password"
+        >
+        </u-input>
       </u-form-item>
       <u-form-item>
-        <u-button type="primary" @click="onSubmit">提交</u-button>
+        <u-button type="primary" @click="onSubmit">绑定</u-button>
       </u-form-item>
     </u-form>
-
-    <u-alert
-      type="warning"
-      :show-icon="true"
-      title="第一次用微信登录需要绑定用户,如果没有账号请先到登录页进行注册。"
-    ></u-alert>
   </view>
 </template>
 <script>

+ 1 - 1
pages/companiesRegistered/companiesNotify.vue

@@ -6,7 +6,7 @@
       <u-alert
         type="warning"
         :show-icon="true"
-        :title="`单位类别除计量器具使用单位,证件类别为授权委托书的请前往PC端进行注册。`"
+        :title="`小程序只能注册计量器具使用单位,证件类别只支持营业执照和法人证书,授权委托书请前往PC端进行注册。`"
       ></u-alert>
 
       <view style="margin-top: 30rpx">

+ 1 - 1
pages/companiesRegistered/index.vue

@@ -5,7 +5,7 @@
     <view class="setps">
       <u-steps :current="current">
         <u-steps-item title="第一步"> </u-steps-item>
-        <u-steps-item title="第二"></u-steps-item>
+        <u-steps-item title="第二"></u-steps-item>
         <u-steps-item title="第三步"></u-steps-item>
         <u-steps-item title="注册完成"></u-steps-item>
       </u-steps>

+ 312 - 272
pages/login.vue

@@ -1,311 +1,351 @@
 <!-- @format -->
 
 <template>
-	<view class="normal-login-container">
-		<view class="logo-content align-center justify-center flex">
-			<text class="title" style="margin-top: 100rpx">河北省计量业务应用平台</text>
-		</view>
-		<view class="tabs justify-center" style="padding-bottom: 10rpx; margin-top: 100rpx">
-			<u-tabs :itemStyle="{ width: '250rpx', marginBottom: '20rpx' }" :lineWidth="60" :lineHeight="3"
+  <view class="normal-login-container">
+    <view class="logo-content align-center justify-center flex">
+      <text class="title" style="margin-top: 100rpx"
+        >河北省计量业务应用平台</text
+      >
+    </view>
+    <view
+      class="tabs justify-center"
+      style="padding-bottom: 10rpx; margin-top: 100rpx"
+    >
+      <!-- <u-tabs :itemStyle="{ width: '250rpx', marginBottom: '20rpx' }" :lineWidth="60" :lineHeight="3"
 				:inactiveStyle="{ fontSize: '34rpx', color: 'black' }"
 				:activeStyle="{ color: '#3c9cff', fontSize: '34rpx' }" :list="tabsList"
-				@click="handleChangeTabs"></u-tabs>
-		</view>
-		<view class="login-form-content">
-			<view class="" v-if="activeTab == '用户名登录'">
-				<view class="input-item flex align-center">
-					<view class="iconfont icon-user icon"></view>
-					<input v-model="loginForm.username" class="input" type="text" placeholder="用户名" maxlength="30" />
-				</view>
-				<view class="input-item flex align-center">
-					<view class="iconfont icon-password icon"></view>
-					<input v-model="loginForm.password" type="password" class="input" placeholder="密码" maxlength="20" />
-				</view>
-			</view>
-			<view class="" v-else>
-				<view class="input-item flex align-center">
-					<u-icon class="iconfont icon" name="phone-fill" size="19"></u-icon>
-					<input v-model="loginForm.username" class="input" type="text" placeholder="手机号" maxlength="30" />
-				</view>
-				<view class="input-item flex align-center">
-					<u-icon class="iconfont icon" name="chat" size="19"></u-icon>
-					<input v-model="loginForm.password" type="password" class="input" placeholder="验证码"
-						maxlength="20" />
-				</view>
-			</view>
+				@click="handleChangeTabs"></u-tabs> -->
+    </view>
+    <view class="login-form-content">
+      <view class="" v-if="activeTab == '用户名登录'">
+        <view class="input-item flex align-center">
+          <view class="iconfont icon-user icon"></view>
+          <input
+            v-model="loginForm.username"
+            class="input"
+            type="text"
+            placeholder="用户名"
+            maxlength="30"
+          />
+        </view>
+        <view class="input-item flex align-center">
+          <view class="iconfont icon-password icon"></view>
+          <input
+            v-model="loginForm.password"
+            type="password"
+            class="input"
+            placeholder="密码"
+            maxlength="20"
+          />
+        </view>
+      </view>
+      <view class="" v-else>
+        <view class="input-item flex align-center">
+          <u-icon class="iconfont icon" name="phone-fill" size="19"></u-icon>
+          <input
+            v-model="loginForm.username"
+            class="input"
+            type="text"
+            placeholder="手机号"
+            maxlength="30"
+          />
+        </view>
+        <view class="input-item flex align-center">
+          <u-icon class="iconfont icon" name="chat" size="19"></u-icon>
+          <input
+            v-model="loginForm.password"
+            type="password"
+            class="input"
+            placeholder="验证码"
+            maxlength="20"
+          />
+        </view>
+      </view>
 
-			<view class="action-btn">
-				<u-button @click="handleLogin" class="login-btn" style="font-size: 17px" type="primary"
-					shape="circle">登录
-				</u-button>
-			</view>
+      <view class="action-btn">
+        <u-button
+          @click="handleLogin"
+          class="login-btn"
+          style="font-size: 17px"
+          type="primary"
+          shape="circle"
+          >登录
+        </u-button>
+      </view>
 
-			<view class="enroll">
-				<view @click="handlePersonRegistered">个人注册</view>
-				<view @click="handleCompaniesRegistration">企业注册</view>
-			</view>
+      <view class="enroll">
+        <view @click="handlePersonRegistered">个人注册</view>
+        <view @click="handleCompaniesRegistration">企业注册</view>
+      </view>
 
-			<view style="margin-top: 60rpx">
-				<u-divider text="微信登录" :hairline="true"></u-divider>
+      <view style="margin-top: 60rpx">
+        <u-divider text="微信登录" :hairline="true"></u-divider>
 
-				<view>
-					<uni-icons @click="showModal = true" type="weixin" size="35"></uni-icons>
-				</view>
-			</view>
-			<!-- <view class="reg text-center" v-if="register">
+        <view>
+          <uni-icons
+            @click="showModal = true"
+            type="weixin"
+            size="35"
+          ></uni-icons>
+        </view>
+      </view>
+      <!-- <view class="reg text-center" v-if="register">
 				<text class="text-grey1">没有账号?</text>
 				<text @click="handleUserRegister" class="text-blue">立即注册</text>
 			</view> -->
-			<!-- <view class="xieyi text-center">
+      <!-- <view class="xieyi text-center">
 				<text class="text-grey1">登录即代表同意</text>
 				<text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
 				<text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
 			</view> -->
-		</view>
-		<u-modal showCancelButton cancelText="取消" @cancel="showModal = false" @close="showModal = false"
-			confirmText="确认" @confirm="handleWeixinLogin" :show="showModal" :title="'提示'" :content="content"></u-modal>
-	</view>
+    </view>
+    <u-modal
+      showCancelButton
+      cancelText="取消"
+      @cancel="showModal = false"
+      @close="showModal = false"
+      confirmText="确认"
+      @confirm="handleWeixinLogin"
+      :show="showModal"
+      :title="'提示'"
+      :content="content"
+    ></u-modal>
+  </view>
 </template>
 
 <script>
-	import {
-		wxLogin
-	} from "@/api/login";
-	export default {
-		data() {
-			return {
-				content: "使用当前微信登录,如果微信没有绑定用户需要先去绑定。",
-				showModal: false,
-				activeTab: "",
-				tabsList: [{
-						name: "用户登录",
-					},
-					// {
-					//   name: "手机号登录",
-					// },
-				],
-				codeUrl: "",
-				captchaEnabled: true,
-				// 用户注册开关
-				register: false,
-				globalConfig: getApp().globalData.config,
-				loginForm: {
-					username: "999901234567890HPG",
-					password: "hpg123789",
-					code: "",
-					uuid: "",
-				},
-			};
-		},
-		created() {},
-		methods: {
-			//微信授权登录
-			handleWeixinLogin() {
-				uni.getProvider({
-					service: "oauth",
-					success: (res) => {
-						if (~res.provider.indexOf("weixin")) {
-							uni.login({
-								provider: "weixin",
-								success: (loginRes) => {
-									wxLogin({
-										code: loginRes.code,
-									}).then(({
-										data
-									}) => {
-										uni.setStorageSync("unionId", data.unionId);
-										if (!data.token) {
-											uni.navigateTo({
-												url: `/pages/bindweixin?openid=${data.openid}&unionId=${data.unionId}`,
-												success: (res) => {},
-												fail: () => {},
-												complete: () => {},
-											});
-										} else {
-											this.$store
-												.dispatch("weixinLogin", data.token)
-												.then((res) => {
-													this.loginSuccess();
-												});
-										}
-									});
-								},
-							});
-						}
-					},
-				});
-			},
-			//个人注册
-			handlePersonRegistered() {
-				this.$tab.navigateTo(
-					`/pages/personRegistered/index`
-				);
-				// uni.navigateTo({
-				// 	url: "/pages/personRegistered/index",
-				// 	success: (res) => {},
-				// 	fail: () => {},
-				// 	complete: () => {},
-				// });
-			},
-			//企业注册
-			handleCompaniesRegistration() {
+import { wxLogin } from "@/api/login";
+export default {
+  data() {
+    return {
+      content: "使用当前微信登录,如果微信没有绑定用户需要先去绑定。",
+      showModal: false,
+      activeTab: "",
+      tabsList: [
+        {
+          name: "用户登录",
+        },
+        // {
+        //   name: "手机号登录",
+        // },
+      ],
+      codeUrl: "",
+      captchaEnabled: true,
+      // 用户注册开关
+      register: false,
+      globalConfig: getApp().globalData.config,
+      loginForm: {
+        username: "999901234567890HPG",
+        password: "hpg123789",
+        code: "",
+        uuid: "",
+      },
+    };
+  },
+  created() {},
+  methods: {
+    //微信授权登录
+    handleWeixinLogin() {
+      uni.getProvider({
+        service: "oauth",
+        success: (res) => {
+          if (~res.provider.indexOf("weixin")) {
+            uni.login({
+              provider: "weixin",
+              success: (loginRes) => {
+                wxLogin({
+                  code: loginRes.code,
+                }).then(({ data }) => {
+                  uni.setStorageSync("unionId", data.unionId);
+                  if (!data.token) {
+                    uni.navigateTo({
+                      url: `/pages/bindweixin?openid=${data.openid}&unionId=${data.unionId}`,
+                      success: (res) => {},
+                      fail: () => {},
+                      complete: () => {},
+                    });
+                  } else {
+                    this.$store
+                      .dispatch("weixinLogin", data.token)
+                      .then((res) => {
+                        this.loginSuccess();
+                      });
+                  }
+                });
+              },
+            });
+          }
+        },
+      });
+    },
+    //个人注册
+    handlePersonRegistered() {
+      this.$tab.navigateTo(`/pages/personRegistered/index`);
+      // uni.navigateTo({
+      // 	url: "/pages/personRegistered/index",
+      // 	success: (res) => {},
+      // 	fail: () => {},
+      // 	complete: () => {},
+      // });
+    },
+    //企业注册
+    handleCompaniesRegistration() {
+      uni.navigateTo({
+        url: "/pages/companiesRegistered/companiesNotify",
+      });
+    },
+    //tabs切换
+    handleChangeTabs(row) {
+      this.activeTab = row.name;
+    },
+    // 用户注册
+    handleUserRegister() {
+      this.$tab.redirectTo(`/pages/register`);
+    },
+    // 隐私协议
+    handlePrivacy() {
+      let site = this.globalConfig.appInfo.agreements[0];
+      this.$tab.navigateTo(
+        `/pages/common/webview/index?title=${site.title}&url=${site.url}`
+      );
+    },
+    // 用户协议
+    handleUserAgrement() {
+      let site = this.globalConfig.appInfo.agreements[1];
+      this.$tab.navigateTo(
+        `/pages/common/webview/index?title=${site.title}&url=${site.url}`
+      );
+    },
 
-				uni.navigateTo({
-					url: "/pages/companiesRegistered/companiesNotify",
-				});
-			},
-			//tabs切换
-			handleChangeTabs(row) {
-				this.activeTab = row.name;
-			},
-			// 用户注册
-			handleUserRegister() {
-				this.$tab.redirectTo(`/pages/register`);
-			},
-			// 隐私协议
-			handlePrivacy() {
-				let site = this.globalConfig.appInfo.agreements[0];
-				this.$tab.navigateTo(
-					`/pages/common/webview/index?title=${site.title}&url=${site.url}`
-				);
-			},
-			// 用户协议
-			handleUserAgrement() {
-				let site = this.globalConfig.appInfo.agreements[1];
-				this.$tab.navigateTo(
-					`/pages/common/webview/index?title=${site.title}&url=${site.url}`
-				);
-			},
-
-			// 登录方法
-			async handleLogin() {
-				if (this.loginForm.username === "") {
-					this.$modal.msgError("请输入您的账号");
-				} else if (this.loginForm.password === "") {
-					this.$modal.msgError("请输入您的密码");
-				} else {
-					this.$modal.loading("登录中,请耐心等待...");
-					this.pwdLogin();
-				}
-			},
-			// 密码登录
-			async pwdLogin() {
-				this.$store
-					.dispatch("Login", this.loginForm)
-					.then(() => {
-						this.$modal.closeLoading();
-						this.loginSuccess();
-					})
-					.catch(() => {});
-			},
-			// 登录成功后,处理函数
-			loginSuccess(result) {
-				// 设置用户信息
-				this.$store.dispatch("GetInfo").then((res) => {
-					this.$tab.reLaunch("/pages/index");
-				});
-			},
-		},
-	};
+    // 登录方法
+    async handleLogin() {
+      if (this.loginForm.username === "") {
+        this.$modal.msgError("请输入您的账号");
+      } else if (this.loginForm.password === "") {
+        this.$modal.msgError("请输入您的密码");
+      } else {
+        this.$modal.loading("登录中,请耐心等待...");
+        this.pwdLogin();
+      }
+    },
+    // 密码登录
+    async pwdLogin() {
+      this.$store
+        .dispatch("Login", this.loginForm)
+        .then(() => {
+          this.$modal.closeLoading();
+          this.loginSuccess();
+        })
+        .catch(() => {});
+    },
+    // 登录成功后,处理函数
+    loginSuccess(result) {
+      // 设置用户信息
+      this.$store.dispatch("GetInfo").then((res) => {
+        this.$tab.reLaunch("/pages/index");
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #ffffff;
-	}
+page {
+  background-color: #ffffff;
+}
 
-	.enroll {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 50rpx;
-		color: #3c9cff;
-		font-size: 30rpx;
-		font-weight: bold;
-	}
+.enroll {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 50rpx;
+  color: #3c9cff;
+  font-size: 30rpx;
+  font-weight: bold;
+}
 
-	.normal-login-container {
-		height: 100vh;
-		width: 100%;
-		background-image: url("../static/images/loginBg.png");
-		background-size: cover;
+.normal-login-container {
+  height: 100vh;
+  width: 100%;
+  background-image: url("../static/images/loginBg.png");
+  background-size: cover;
 
-		.logo-content {
-			width: 100%;
-			font-size: 21px;
-			text-align: center;
-			padding-top: 25%;
+  .logo-content {
+    width: 100%;
+    font-size: 21px;
+    text-align: center;
+    padding-top: 25%;
 
-			image {
-				border-radius: 4px;
-			}
+    image {
+      border-radius: 4px;
+    }
 
-			.title {
-				font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
-					"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
-					"Helvetica Neue", sans-serif;
-				font-weight: bold;
+    .title {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+        "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
+        "Helvetica Neue", sans-serif;
+      font-weight: bold;
 
-				margin-left: 10px;
-				font-size: 50rpx;
-			}
-		}
+      margin-left: 10px;
+      font-size: 50rpx;
+    }
+  }
 
-		.login-form-content {
-			text-align: center;
-			margin: 40rpx auto;
-			width: 80%;
+  .login-form-content {
+    text-align: center;
+    margin: 40rpx auto;
+    width: 80%;
 
-			.input-item {
-				margin: 20px auto;
-				background-color: #f5f6f7;
-				height: 45px;
-				border-radius: 10px;
+    .input-item {
+      margin: 20px auto;
+      background-color: #f5f6f7;
+      height: 45px;
+      border-radius: 10px;
 
-				.icon {
-					font-size: 38rpx;
-					margin-left: 10px;
-					color: #999;
-				}
+      .icon {
+        font-size: 38rpx;
+        margin-left: 10px;
+        color: #999;
+      }
 
-				.input {
-					width: 100%;
-					font-size: 14px;
-					line-height: 20px;
-					text-align: left;
-					padding-left: 15px;
-				}
-			}
+      .input {
+        width: 100%;
+        font-size: 14px;
+        line-height: 20px;
+        text-align: left;
+        padding-left: 15px;
+      }
+    }
 
-			.login-btn {
-				margin-top: 40px;
-				height: 45px;
-			}
+    .login-btn {
+      margin-top: 40px;
+      height: 45px;
+    }
 
-			.reg {
-				margin-top: 15px;
-			}
+    .reg {
+      margin-top: 15px;
+    }
 
-			.xieyi {
-				color: #333;
-				margin-top: 20px;
-			}
+    .xieyi {
+      color: #333;
+      margin-top: 20px;
+    }
 
-			.login-code {
-				height: 38px;
-				float: right;
+    .login-code {
+      height: 38px;
+      float: right;
 
-				.login-code-img {
-					height: 38px;
-					position: absolute;
-					margin-left: 10px;
-					width: 200rpx;
-				}
-			}
-		}
-	}
+      .login-code-img {
+        height: 38px;
+        position: absolute;
+        margin-left: 10px;
+        width: 200rpx;
+      }
+    }
+  }
+}
 
-	.tabs {
-		display: flex;
-		margin: 40rpx auto;
-	}
-</style>
+.tabs {
+  display: flex;
+  margin: 40rpx auto;
+}
+</style>

+ 3 - 2
pages/personRegistered/index.vue

@@ -5,7 +5,7 @@
     <view class="setps">
       <u-steps :current="current">
         <u-steps-item title="第一步"> </u-steps-item>
-        <u-steps-item title="第二"></u-steps-item>
+        <u-steps-item title="第二"></u-steps-item>
         <u-steps-item title="注册完成"></u-steps-item>
       </u-steps>
     </view>
@@ -157,7 +157,7 @@ export default {
         });
 
         await submitMiUser({
-          idCardUP: this.formdData.cardFrontImg,
+          idCardUp: this.formdData.cardFrontImg,
           idCardDown: this.formdData.cardBackImg,
           idCard: this.formdData.personCardOrcResult.idNum,
           name: this.formdData.personCardOrcResult.name,
@@ -209,6 +209,7 @@ export default {
 }
 
 .btn {
+  z-index: 99;
   display: flex;
   justify-content: space-between;
   align-items: center;

BIN
static/images/cardbm.png


BIN
static/images/cardzm.png