style: 更新代码

.drone.yml

@@ -61,7 +61,7 @@ steps:
       key_path: /root/.ssh/id_rsa
       rm: true # true则会删除目标目录重建
       target: /home/tall/v4.0.0
-      source: dist/**/*
+      source: dist/*
       strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target
 
   # - name: run-ssh
@@ -124,7 +124,7 @@ steps:
         - success
 
 trigger:
-  branch: develop
+  branch: feat
   # - name: notify-dingtalk
   #   image: lddsb/drone-dingtalk-message
   #   environment:

CHANGELOG.md

@@ -30,6 +30,7 @@
 范围|描述|commitId
 --|--|--
  - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
+ - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
  - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
 
 

README.md

@@ -0,0 +1,3 @@
+# 时物链条
+
+[![Build Status](http://101.201.226.163:3001/api/badges/TALL/TALL-MUI-4/status.svg)](http://101.201.226.163:3001/TALL/TALL-MUI-4)

hooks/user/userMixin.js

@@ -94,7 +94,7 @@ export default function userMixin() {
 
   //有图片验证码的值
   function hasvalue(form) {
-    if(form.smsCode || dataObj.showPaste) return
+    if(form.smsCode || form.showPaste) return
     if (!verifyPhone(form.phone)) {
       uni.$ui.showToast('请输入正确的手机号');
       return;
@@ -122,6 +122,7 @@ export default function userMixin() {
       getCodeInterval();
       dataObj.showPaste = true;
     } catch (err) {
+      getImageCode();
       throw err;
     }
   }

pages/user/login.vue

@@ -64,8 +64,10 @@
     loginForm.value.setRules(mixinInit.rules);
   });
 
-  const submit = () => {
+  function submit() {
+    console.log('111111')
     loginForm.value.validate(valid => {
+      console.log('22222', valid)
       if (valid) {
         login()
       }

store/user/actions.js

@@ -24,9 +24,9 @@ const actions = {
    * @param {object} params 要提交的数据
    * @param {string} params.phone 手机号
    */
-  sendCode({ commit }, params) {
+  async sendCode({ commit }, params) {
     try{
-      uni.$u.api.getSmsCode(params);
+      const res = await uni.$u.api.getSmsCode(params);
       uni.$ui.showToast('验证码发送成功');
     } catch (error) {
       uni.$ui.showToast(error.msg || '发送失败');